changeset 54805:ecee8c7bb324 stats-before-this-super

Automatic merge with default
author mcimadamore
date Thu, 07 Feb 2019 22:11:35 +0100
parents 17ea507c6bcd df83034c9275
children 3b9b8721b9f9
files make/gensrc/GensrcCLDR.gmk src/java.desktop/windows/native/libawt/windows/awt_Robot.h src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTreeManager.java src/jdk.localedata/share/classes/sun/util/cldr/resources/common/bcp47/timezone.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldml.dtd src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldmlBCP47.dtd src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldmlSupplemental.dtd src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_NA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_ZA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq_CM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak_GH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/am.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/am_ET.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_001.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_AE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_BH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_DJ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_DZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_EG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_EH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_ER.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_IL.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_IQ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_JO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_KM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_KW.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_LB.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_LY.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_MA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_MR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_OM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_PS.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_QA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SD.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SS.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_SY.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_TD.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_TN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ar_YE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/as.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/as_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/asa.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/asa_TZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ast.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ast_ES.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Cyrl.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Cyrl_AZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Latn.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/az_Latn_AZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bas.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bas_CM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/be.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/be_BY.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bem.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bem_ZM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bez.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bez_TZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bg.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bg_BG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bm.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bm_ML.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn_BD.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bn_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo_CN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bo_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/br.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/br_FR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/brx.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/brx_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Cyrl.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Cyrl_BA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Latn.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/bs_Latn_BA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_AD.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_ES.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_ES_VALENCIA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_FR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ca_IT.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ccp.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ccp_BD.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ccp_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ce.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ce_RU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cgg.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cgg_UG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/chr.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/chr_US.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb_IQ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ckb_IR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cs.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cs_CZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cu.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cu_RU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cy.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/cy_GB.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da_DK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/da_GL.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dav.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dav_KE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_AT.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_BE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_CH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_DE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_IT.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_LI.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/de_LU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dje.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dje_NE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dsb.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dsb_DE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dua.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dua_CM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dyo.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dyo_SN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dz.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/dz_BT.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ebu.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ebu_KE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee_GH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ee_TG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el_CY.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/el_GR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_001.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_150.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AI.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AS.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AT.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_AU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BB.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BI.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BS.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BW.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_BZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CC.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CX.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_CY.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_DM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ER.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FI.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FJ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_FM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GB.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GD.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GI.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_GY.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_HK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IL.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_IO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_JE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_JM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KI.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_KY.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LC.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_LS.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MP.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MS.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MT.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MW.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_MY.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NF.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NL.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_NZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_PW.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_RW.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SB.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SC.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SD.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SI.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SL.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SS.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SX.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_SZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TC.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TT.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TV.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_TZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_UG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_UM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_US.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_US_POSIX.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VC.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VI.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_VU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_WS.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/en_ZW.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eo.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eo_001.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_419.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_AR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_BO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_BR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_BZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CL.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_CU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_DO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_EA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_EC.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_ES.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_GQ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_GT.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_HN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_IC.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_MX.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_NI.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_PY.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_SV.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_US.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_UY.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/es_VE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/et.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/et_EE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eu.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/eu_ES.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ewo.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ewo_CM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa_AF.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fa_IR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_CM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_GN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_MR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ff_SN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fi.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fi_FI.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fil.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fil_PH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo_DK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fo_FO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BF.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BI.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BJ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_BL.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CD.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CF.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CI.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_CM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_DJ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_DZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_FR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GF.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GP.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_GQ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_HT.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_KM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_LU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MC.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MF.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_ML.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MQ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_MU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_NC.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_NE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_PF.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_PM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_RE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_RW.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SC.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_SY.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TD.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_TN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_VU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_WF.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fr_YT.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fur.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fur_IT.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fy.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/fy_NL.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ga.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ga_IE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gd.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gd_GB.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gl.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gl_ES.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_CH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_FR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gsw_LI.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gu.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gu_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/guz.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/guz_KE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gv.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/gv_IM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_GH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_NE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ha_NG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/haw.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/haw_US.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/he.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/he_IL.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hi.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hi_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr_BA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hr_HR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hsb.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hsb_DE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hu.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hu_HU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hy.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/hy_AM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/id.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/id_ID.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ig.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ig_NG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ii.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ii_CN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/is.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/is_IS.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_CH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_IT.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_SM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/it_VA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ja.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ja_JP.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jgo.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jgo_CM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jmc.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/jmc_TZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ka.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ka_GE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kab.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kab_DZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kam.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kam_KE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kde.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kde_TZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kea.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kea_CV.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/khq.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/khq_ML.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ki.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ki_KE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kk.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kk_KZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kkj.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kkj_CM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kl.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kl_GL.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kln.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kln_KE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/km.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/km_KH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kn.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kn_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko_KP.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ko_KR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kok.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kok_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ks.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ks_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksb.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksb_TZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksf.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksf_CM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksh.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ksh_DE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kw.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/kw_GB.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ky.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ky_KG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lag.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lag_TZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lb.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lb_LU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lg.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lg_UG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lkt.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lkt_US.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_AO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CD.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CF.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ln_CG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lo.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lo_LA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc_IQ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lrc_IR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lt.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lt_LT.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lu.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lu_CD.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luo.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luo_KE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luy.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/luy_KE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lv.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/lv_LV.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas_KE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mas_TZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mer.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mer_KE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mfe.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mfe_MU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mg.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mg_MG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgh.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgh_MZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgo.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mgo_CM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mk.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mk_MK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ml.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ml_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mn.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mn_MN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mr.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mr_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_BN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_MY.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ms_SG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mt.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mt_MT.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mua.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mua_CM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/my.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/my_MM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mzn.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/mzn_IR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/naq.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/naq_NA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb_NO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nb_SJ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nd.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nd_ZW.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nds.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nds_DE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nds_NL.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ne_NP.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_AW.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_BE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_BQ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_CW.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_NL.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_SR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nl_SX.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nmg.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nmg_CM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nn.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nn_NO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nnh.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nnh_CM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nus.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nus_SS.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nyn.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/nyn_UG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om_ET.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/om_KE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/or.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/or_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os_GE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/os_RU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Arab.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Arab_PK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Guru.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pa_Guru_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pl.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pl_PL.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/prg.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/prg_001.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ps.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ps_AF.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_AO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_BR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_CH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_CV.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_GQ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_GW.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_LU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_MO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_MZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_PT.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_ST.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/pt_TL.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_BO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_EC.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/qu_PE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rm.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rm_CH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rn.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rn_BI.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro_MD.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ro_RO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rof.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rof_TZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/root.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_BY.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_KG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_KZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_MD.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_RU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ru_UA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rw.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rw_RW.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rwk.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/rwk_TZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sah.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sah_RU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/saq.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/saq_KE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sbp.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sbp_TZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sd.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sd_PK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_FI.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_NO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/se_SE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/seh.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/seh_MZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ses.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ses_ML.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sg.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sg_CF.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Latn.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Latn_MA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Tfng.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/shi_Tfng_MA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/si.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/si_LK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sk.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sk_SK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sl.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sl_SI.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/smn.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/smn_FI.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sn.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sn_ZW.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_DJ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_ET.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_KE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/so_SO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_AL.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_MK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sq_XK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_BA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_ME.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_RS.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Cyrl_XK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_BA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_ME.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_RS.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sr_Latn_XK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_AX.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_FI.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sv_SE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_CD.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_KE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_TZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/sw_UG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_LK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_MY.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ta_SG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/te.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/te_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo_KE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/teo_UG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tg.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tg_TJ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/th.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/th_TH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti_ER.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ti_ET.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tk.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tk_TM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/to.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/to_TO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr_CY.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tr_TR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tt.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tt_RU.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/twq.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/twq_NE.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tzm.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/tzm_MA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ug.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ug_CN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uk.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uk_UA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur_IN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ur_PK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Arab.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Arab_AF.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Cyrl.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Cyrl_UZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Latn.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/uz_Latn_UZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Latn.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Latn_LR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Vaii.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vai_Vaii_LR.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vi.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vi_VN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vo.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vo_001.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vun.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/vun_TZ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/wae.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/wae_CH.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/wo.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/wo_SN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/xog.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/xog_UG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yav.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yav_CM.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yi.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yi_001.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo_BJ.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yo_NG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue_HK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue_Hans.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue_Hans_CN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue_Hant.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/yue_Hant_HK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zgh.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zgh_MA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_CN.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_HK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_MO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hans_SG.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_HK.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_MO.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zh_Hant_TW.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zu.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/zu_ZA.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/attributeValueValidity.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/characters.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/coverageLevels.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/dayPeriods.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/genderList.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/languageInfo.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/likelySubtags.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/metaZones.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/numberingSystems.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/ordinals.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/pluralRanges.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/plurals.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/rgScope.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/subdivisions.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/supplementalData.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/supplementalMetadata.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/telephoneCodeData.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/common/supplemental/windowsZones.xml src/jdk.localedata/share/classes/sun/util/cldr/resources/unicode-license.txt
diffstat 1908 files changed, 1113518 insertions(+), 1111793 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jan 31 22:06:25 2019 +0100
+++ b/.hgtags	Thu Feb 07 22:11:35 2019 +0100
@@ -539,3 +539,5 @@
 e3ed960609927b5fdfd0a797159835cd83a81a31 jdk-13+5
 44f41693631f9b5ac78ff4d2bfabd6734fe46df2 jdk-12+29
 b5f05fe4a6f8b3996a000c20078b356d991ca8ec jdk-13+6
+6c377af36a5c4203f16aed8a5e4c2ecc08fcd8bd jdk-12+30
+021917019cda1c0c5853255322274f37693a2431 jdk-13+7
--- a/make/Bundles.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/Bundles.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -35,7 +35,7 @@
 # On Windows tar frequently complains that "file changed as we read it" for
 # some random source files. This seems to be cause by anti virus scanners and
 # is most likely safe to ignore. When it happens, tar returns '1'.
-ifeq ($(OPENJDK_BUILD_OS), windows)
+ifeq ($(call isBuildOs, windows), true)
   TAR_IGNORE_EXIT_VALUE := || test "$$$$?" = "1"
 endif
 
@@ -144,7 +144,7 @@
 
 # On Macosx, we bundle up the macosx specific images which already have the
 # correct base directories.
-ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release)
+ifeq ($(call isTargetOs, macosx)+$(DEBUG_LEVEL), true+release)
   JDK_IMAGE_DIR := $(JDK_MACOSX_BUNDLE_DIR)
   JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home
   JDK_BUNDLE_SUBDIR :=
@@ -167,7 +167,7 @@
 
   # Create special filter rules when dealing with unzipped .dSYM directories on
   # macosx
-  ifeq ($(OPENJDK_TARGET_OS), macosx)
+  ifeq ($(call isTargetOs, macosx), true)
     ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
       JDK_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
           $(call containing, .dSYM/, $(patsubst $(JDK_IMAGE_DIR)/%, %, $(ALL_JDK_FILES))))
--- a/make/CompileDemos.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/CompileDemos.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -234,7 +234,7 @@
 	$(call install-file)
 	$(CHMOD) -f ug+w $@
 
-ifeq ($(OPENJDK_TARGET_OS), solaris)
+ifeq ($(call isTargetOs, solaris), true)
   TARGETS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \
     $(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%, \
     $(call CacheFind, $(DEMO_SHARE_SRC)/nbproject))
--- a/make/CompileJavaModules.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/CompileJavaModules.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -51,21 +51,18 @@
 # data files and shouldn't go in the product
 java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
 
-ifneq ($(OPENJDK_TARGET_OS), solaris)
+ifeq ($(call isTargetOs, solaris), false)
   java.base_EXCLUDE_FILES += \
       SolarisLoginModule.java \
       SolarisSystem.java \
       #
 endif
 
-ifeq ($(filter $(OPENJDK_TARGET_OS), solaris macosx aix), )
-  #
-  # only solaris, macosx and aix
-  #
+ifeq ($(call isTargetOs, solaris macosx aix), false)
   java.base_EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java
 endif
 
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
   java.base_EXCLUDE_FILES += \
       sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
       #
@@ -124,7 +121,7 @@
     .template \
     #
 
-ifeq ($(OPENJDK_TARGET_OS), macosx)
+ifeq ($(call isTargetOs, macosx), true)
   # exclude all X11 on Mac.
   java.desktop_EXCLUDES += \
       sun/awt/X11 \
@@ -186,7 +183,7 @@
       sun/awt/X11/XwcTextItem.java
 endif
 
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
   java.desktop_EXCLUDES += com/sun/java/swing/plaf/gtk
 endif
 
@@ -194,8 +191,7 @@
   java.desktop_EXCLUDES += sun/applet
 endif
 
-# Used on windows and macosx
-ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx), )
+ifeq ($(call isTargetOs, windows macosx), false)
   java.desktop_EXCLUDE_FILES += sun/awt/AWTCharset.java
 endif
 
@@ -374,11 +370,11 @@
     $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \
     $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
 
-ifeq ($(OPENJDK_TARGET_OS), macosx)
+ifeq ($(call isTargetOs, macosx), true)
   jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
 endif
 
-ifeq ($(OPENJDK_TARGET_OS),aix)
+ifeq ($(call isTargetOs, aix), true)
   jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
 endif
 
--- a/make/CopyImportModules.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/CopyImportModules.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -38,7 +38,7 @@
 $(eval $(call FillCacheFind, $(LIBS_DIR) $(CMDS_DIR) $(CONF_DIR)))
 
 ifneq ($(LIBS_DIR), )
-  ifeq ($(OPENJDK_TARGET_OS), windows)
+  ifeq ($(call isTargetOs, windows), true)
     TO_BIN_FILTER := %$(SHARED_LIBRARY_SUFFIX) %.diz %.pdb %.map
 
     $(eval $(call SetupCopyFiles, COPY_LIBS_TO_BIN, \
--- a/make/CreateJmods.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/CreateJmods.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -118,7 +118,7 @@
     endif
   endif
 else # not java.base
-  ifeq ($(OPENJDK_TARGET_OS), windows)
+  ifeq ($(call isTargetOs, windows), true)
     # Only java.base needs to include the MSVC*_DLLs. Make sure no other module
     # tries to include them (typically imported ones).
     ifneq ($(MSVCR_DLL), )
--- a/make/Images.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/Images.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -144,7 +144,7 @@
       )
 
   ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
-    ifeq ($(OPENJDK_TARGET_OS), macosx)
+    ifeq ($(call isTargetOs, macosx), true)
       DEMO_FILES := $(call not-containing, .dSYM, $(DEMO_FILES))
     else
       DEMO_FILES := $(filter-out %.debuginfo %.pdb %.map, $(DEMO_FILES))
@@ -192,7 +192,7 @@
 ALL_JRE_MODULES := $(sort $(JRE_MODULES), $(foreach m, $(JRE_MODULES), \
     $(call FindTransitiveDepsForModule, $m)))
 
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
   LIBS_TARGET_SUBDIR := bin
 else
   LIBS_TARGET_SUBDIR := lib
@@ -211,7 +211,7 @@
   DEBUGINFO_SUFFIXES := .debuginfo .pdb .map
   # On Macosx, if debug symbols have not been zipped, find all files inside *.dSYM
   # dirs.
-  ifeq ($(OPENJDK_TARGET_OS), macosx)
+  ifeq ($(call isTargetOs, macosx), true)
     $(eval $(call FillCacheFind, \
         $(SUPPORT_OUTPUTDIR)/modules_cmds $(SUPPORT_OUTPUTDIR)/modules_libs))
     FindDebuginfoFiles = \
--- a/make/InitSupport.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/InitSupport.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -483,7 +483,7 @@
 	    $(TOUCH) $(SJAVAC_SERVER_DIR)/server.port.stop; true
   endef
 
-  ifeq ($(OPENJDK_BUILD_OS), windows)
+  ifeq ($(call isBuildOs, windows), true)
     # On windows we need to synchronize with the javac server to be able to
     # move or remove the build output directory. Since we have no proper
     # synchronization process, wait for a while and hope it helps. This is only
--- a/make/MacBundles.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/MacBundles.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -30,7 +30,7 @@
 default: bundles
 
 # Only macosx has bundles defined.
-ifeq ($(OPENJDK_TARGET_OS), macosx)
+ifeq ($(call isTargetOs, macosx), true)
 
   bundles: jre-bundle jdk-bundle
 
--- a/make/Main.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/Main.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -1032,7 +1032,7 @@
   endif
 endif
 
-ifeq ($(OPENJDK_TARGET_OS), macosx)
+ifeq ($(call isTargetOs, macosx), true)
   product-images: mac-jdk-bundle
 endif
 
--- a/make/ModuleWrapper.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/ModuleWrapper.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -42,7 +42,7 @@
 include $(MAKEFILE_PREFIX)-$(MODULE).gmk
 
 # Setup copy rules from the modules directories to the jdk image directory.
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
   TO_BIN_FILTER := %$(SHARED_LIBRARY_SUFFIX) %.diz %.pdb %.map
 
   $(eval $(call SetupCopyFiles, COPY_LIBS_TO_BIN, \
--- a/make/RunTests.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/RunTests.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -61,7 +61,7 @@
 endef
 
 # Setup _NT_SYMBOL_PATH on Windows
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
   ifndef _NT_SYMBOL_PATH
     # Can't use PathList here as it adds quotes around the value.
     _NT_SYMBOL_PATH := \
@@ -224,7 +224,7 @@
 
 ifeq ($(TEST_JOBS), 0)
   CORES_DIVIDER := 2
-  ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
+  ifeq ($(call isTargetCpuArch, sparc), true)
     # For smaller SPARC machines we see reasonable scaling of throughput up to
     # cpus/4 without affecting test reliability. On the bigger machines, cpus/4
     # causes intermittent timeouts.
@@ -808,7 +808,7 @@
   $1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $$(EXPR) 25 / $$($1_JTREG_JOBS))
 
   # SPARC is in general slower per core so need to scale up timeouts a bit.
-  ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
+  ifeq ($(call isTargetCpuArch, sparc), true)
     JTREG_TIMEOUT_FACTOR ?= 8
   else
     JTREG_TIMEOUT_FACTOR ?= 4
@@ -835,7 +835,7 @@
   $1_JTREG_BASIC_OPTIONS += -e:JDK8_HOME=$$(BOOT_JDK)
   # If running on Windows, propagate the _NT_SYMBOL_PATH to enable
   # symbol lookup in hserr files
-  ifeq ($$(OPENJDK_TARGET_OS), windows)
+  ifeq ($$(call isTargetOs, windows), true)
     $1_JTREG_BASIC_OPTIONS += -e:_NT_SYMBOL_PATH
   endif
 
--- a/make/TestImage.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/TestImage.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -30,7 +30,7 @@
 
 ############################################################################
 
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
   FIXPATH_COPY := $(TEST_IMAGE_DIR)/bin/fixpath.exe
 
   $(FIXPATH_COPY): $(firstword $(FIXPATH))
--- a/make/ZipSecurity.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/ZipSecurity.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -70,7 +70,7 @@
 #
 # Windows specific binary security packages.
 #
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
   # sec-windows-bin.zip is used by builds where the corresponding sources are not available
   $(eval $(call SetupZipArchive,BUILD_SEC_WINDOWS_BIN_ZIP, \
       SRC := $(JDK_OUTPUTDIR), \
@@ -80,7 +80,7 @@
   TARGETS += $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip
 
   # JGSS files contain the native Kerberos library
-  ifeq ($(OPENJDK_TARGET_CPU), x86_64)
+  ifeq ($(call isTargetCpu, x86_64), true)
     JGSS_ZIP_NAME = jgss-windows-x64-bin.zip
   else
     JGSS_ZIP_NAME = jgss-windows-i586-bin.zip
--- a/make/autoconf/build-performance.m4	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/autoconf/build-performance.m4	Thu Feb 07 22:11:35 2019 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -42,8 +42,11 @@
     NUM_CORES=`/usr/sbin/sysctl -n hw.ncpu`
     FOUND_CORES=yes
   elif test "x$OPENJDK_BUILD_OS" = xaix ; then
-    NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print [$]4 }'`
-    FOUND_CORES=yes
+    NUM_LCPU=`lparstat -m 2> /dev/null | $GREP -o "lcpu=[[0-9]]*" | $CUT -d "=" -f 2`
+    if test -n "$NUM_LCPU"; then
+      NUM_CORES=$NUM_LCPU
+      FOUND_CORES=yes
+    fi
   elif test -n "$NUMBER_OF_PROCESSORS"; then
     # On windows, look in the env
     NUM_CORES=$NUMBER_OF_PROCESSORS
--- a/make/autoconf/buildjdk-spec.gmk.in	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/autoconf/buildjdk-spec.gmk.in	Thu Feb 07 22:11:35 2019 +0100
@@ -75,6 +75,8 @@
 JVM_ASFLAGS := @OPENJDK_BUILD_JVM_ASFLAGS@
 JVM_LIBS := @OPENJDK_BUILD_JVM_LIBS@
 
+FDLIBM_CFLAGS := @OPENJDK_BUILD_FDLIBM_CFLAGS@
+
 # The compiler for the build platform is likely not warning compatible with the official
 # compiler.
 WARNINGS_AS_ERRORS := false
--- a/make/autoconf/flags-cflags.m4	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/autoconf/flags-cflags.m4	Thu Feb 07 22:11:35 2019 +0100
@@ -415,21 +415,7 @@
   FLAGS_CPU_LEGACY=$OPENJDK_BUILD_CPU_LEGACY
   FLAGS_CPU_LEGACY_LIB=$OPENJDK_BUILD_CPU_LEGACY_LIB
 
-  FLAGS_SETUP_CFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_])
-
-  COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off"
-  # Check that the compiler supports -ffp-contract=off flag
-  # Set FDLIBM_CFLAGS to -ffp-contract=off if it does. Empty
-  # otherwise.
-  # These flags are required for GCC-based builds of
-  # fdlibm with optimization without losing precision.
-  # Notably, -ffp-contract=off needs to be added for GCC >= 4.6.
-  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-    FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${COMPILER_FP_CONTRACT_OFF_FLAG}],
-	IF_TRUE: [FDLIBM_CFLAGS=${COMPILER_FP_CONTRACT_OFF_FLAG}],
-	IF_FALSE: [FDLIBM_CFLAGS=""])
-  fi
-  AC_SUBST(FDLIBM_CFLAGS)
+  FLAGS_SETUP_CFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_], [BUILD_])
 ])
 
 ################################################################################
@@ -529,15 +515,9 @@
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
     TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -fcheck-new -fstack-protector"
     TOOLCHAIN_CFLAGS_JDK="-pipe -fstack-protector"
-    TOOLCHAIN_CFLAGS_JDK_CONLY="-fno-strict-aliasing" # technically NOT for CXX (but since this gives *worse* performance, use no-strict-aliasing everywhere!)
-
-    CXXSTD_CXXFLAG="-std=gnu++98"
-    FLAGS_CXX_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$CXXSTD_CXXFLAG -Werror],
-    						 IF_FALSE: [CXXSTD_CXXFLAG=""])
-    TOOLCHAIN_CFLAGS_JDK_CXXONLY="$CXXSTD_CXXFLAG"
-    TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM $CXXSTD_CXXFLAG"
-    ADLC_CXXFLAG="$CXXSTD_CXXFLAG"
-
+    # technically NOT for CXX (but since this gives *worse* performance, use
+    # no-strict-aliasing everywhere!)
+    TOOLCHAIN_CFLAGS_JDK_CONLY="-fno-strict-aliasing"
 
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     # Restrict the debug information created by Clang to avoid
@@ -670,15 +650,13 @@
       OS_CFLAGS_JVM="$OS_CFLAGS_JVM -DNEEDS_LIBRT"
     fi
   fi
-
-  # EXPORT
-  AC_SUBST(ADLC_CXXFLAG)
 ])
 
 ################################################################################
 # $1 - Either BUILD or TARGET to pick the correct OS/CPU variables to check
 #      conditionals against.
 # $2 - Optional prefix for each variable defined.
+# $3 - Optional prefix for compiler variables (either BUILD_ or nothing).
 AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
 [
   #### CPU DEFINES, these should (in theory) be independent on toolchain
@@ -768,6 +746,13 @@
       $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer"
     fi
 
+    $1_CXXSTD_CXXFLAG="-std=gnu++98"
+    FLAGS_CXX_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${$1_CXXSTD_CXXFLAG} -Werror],
+        PREFIX: $3, IF_FALSE: [$1_CXXSTD_CXXFLAG=""])
+    $1_TOOLCHAIN_CFLAGS_JDK_CXXONLY="${$1_CXXSTD_CXXFLAG}"
+    $1_TOOLCHAIN_CFLAGS_JVM="${$1_TOOLCHAIN_CFLAGS_JVM} ${$1_CXXSTD_CXXFLAG}"
+    $2ADLC_CXXFLAG="${$1_CXXSTD_CXXFLAG}"
+
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     if test "x$FLAGS_OS" = xlinux; then
       # ppc test not really needed for clang
@@ -804,14 +789,15 @@
   fi
 
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    TOOLCHAIN_CHECK_COMPILER_VERSION(VERSION: 6, PREFIX: $2, IF_AT_LEAST: FLAGS_SETUP_GCC6_COMPILER_FLAGS($1))
+    FLAGS_SETUP_GCC6_COMPILER_FLAGS($1, $3)
     $1_TOOLCHAIN_CFLAGS="${$1_GCC6_CFLAGS}"
 
     $1_WARNING_CFLAGS_JVM="-Wno-format-zero-length -Wtype-limits -Wuninitialized"
   fi
 
   # EXPORT to API
-  CFLAGS_JVM_COMMON="$ALWAYS_CFLAGS_JVM $ALWAYS_DEFINES_JVM $TOOLCHAIN_CFLAGS_JVM \
+  CFLAGS_JVM_COMMON="$ALWAYS_CFLAGS_JVM $ALWAYS_DEFINES_JVM \
+      $TOOLCHAIN_CFLAGS_JVM ${$1_TOOLCHAIN_CFLAGS_JVM} \
       $OS_CFLAGS $OS_CFLAGS_JVM $CFLAGS_OS_DEF_JVM $DEBUG_CFLAGS_JVM \
       $WARNING_CFLAGS $WARNING_CFLAGS_JVM $JVM_PICFLAG"
 
@@ -825,7 +811,9 @@
 
   CFLAGS_JDK_COMMON_CONLY="$TOOLCHAIN_CFLAGS_JDK_CONLY  \
       $WARNING_CFLAGS_JDK_CONLY ${$2EXTRA_CFLAGS}"
-  CFLAGS_JDK_COMMON_CXXONLY="$ALWAYS_DEFINES_JDK_CXXONLY $TOOLCHAIN_CFLAGS_JDK_CXXONLY \
+  CFLAGS_JDK_COMMON_CXXONLY="$ALWAYS_DEFINES_JDK_CXXONLY \
+      $TOOLCHAIN_CFLAGS_JDK_CXXONLY \
+      ${$1_TOOLCHAIN_CFLAGS_JDK_CXXONLY} \
       $WARNING_CFLAGS_JDK_CXXONLY ${$2EXTRA_CXXFLAGS}"
 
   $1_CFLAGS_JVM="${$1_DEFINES_CPU_JVM} ${$1_CFLAGS_CPU} ${$1_CFLAGS_CPU_JVM} ${$1_TOOLCHAIN_CFLAGS} ${$1_WARNING_CFLAGS_JVM}"
@@ -843,11 +831,28 @@
   AC_SUBST($2CFLAGS_JDKEXE)
   AC_SUBST($2CXXFLAGS_JDKLIB)
   AC_SUBST($2CXXFLAGS_JDKEXE)
+  AC_SUBST($2ADLC_CXXFLAG)
+
+  COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off"
+  # Check that the compiler supports -ffp-contract=off flag
+  # Set FDLIBM_CFLAGS to -ffp-contract=off if it does. Empty
+  # otherwise.
+  # These flags are required for GCC-based builds of
+  # fdlibm with optimization without losing precision.
+  # Notably, -ffp-contract=off needs to be added for GCC >= 4.6.
+  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+    FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${COMPILER_FP_CONTRACT_OFF_FLAG}],
+        PREFIX: $3,
+        IF_TRUE: [$2FDLIBM_CFLAGS=${COMPILER_FP_CONTRACT_OFF_FLAG}],
+        IF_FALSE: [$2FDLIBM_CFLAGS=""])
+  fi
+  AC_SUBST($2FDLIBM_CFLAGS)
 ])
 
 # FLAGS_SETUP_GCC6_COMPILER_FLAGS([PREFIX])
 # Arguments:
 # $1 - Prefix for each variable defined.
+# $2 - Prefix for compiler variables (either BUILD_ or nothing).
 AC_DEFUN([FLAGS_SETUP_GCC6_COMPILER_FLAGS],
 [
   # These flags are required for GCC 6 builds as undefined behaviour in OpenJDK code
@@ -855,14 +860,11 @@
   # Notably, value range propagation now assumes that the this pointer of C++
   # member functions is non-null.
   NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks"
-  dnl Argument check is disabled until FLAGS_COMPILER_CHECK_ARGUMENTS handles cross-compilation
-  dnl FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror],
-  dnl					     IF_FALSE: [NO_DELETE_NULL_POINTER_CHECKS_CFLAG=""])
+  FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror],
+      PREFIX: $2, IF_FALSE: [NO_DELETE_NULL_POINTER_CHECKS_CFLAG=""])
   NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse"
-  dnl Argument check is disabled until FLAGS_COMPILER_CHECK_ARGUMENTS handles cross-compilation
-  dnl FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_LIFETIME_DSE_CFLAG -Werror],
-  dnl					     IF_FALSE: [NO_LIFETIME_DSE_CFLAG=""])
-  AC_MSG_NOTICE([GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} and ${NO_LIFETIME_DSE_CFLAG}])
+  FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_LIFETIME_DSE_CFLAG -Werror],
+      PREFIX: $2, IF_FALSE: [NO_LIFETIME_DSE_CFLAG=""])
   $1_GCC6_CFLAGS="${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
 ])
 
--- a/make/autoconf/flags.m4	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/autoconf/flags.m4	Thu Feb 07 22:11:35 2019 +0100
@@ -421,17 +421,20 @@
 # ------------------------------------------------------------
 # Check that the C compiler supports an argument
 BASIC_DEFUN_NAMED([FLAGS_C_COMPILER_CHECK_ARGUMENTS],
-    [*ARGUMENT IF_TRUE IF_FALSE], [$@],
+    [*ARGUMENT IF_TRUE IF_FALSE PREFIX], [$@],
 [
-  AC_MSG_CHECKING([if the C compiler supports "ARG_ARGUMENT"])
+  AC_MSG_CHECKING([if ARG_PREFIX[CC] supports "ARG_ARGUMENT"])
   supports=yes
 
   saved_cflags="$CFLAGS"
+  saved_cc="$CC"
   CFLAGS="$CFLAGS ARG_ARGUMENT"
+  CC="$ARG_PREFIX[CC]"
   AC_LANG_PUSH([C])
   AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i;]])], [],
       [supports=no])
   AC_LANG_POP([C])
+  CC="$saved_cc"
   CFLAGS="$saved_cflags"
 
   AC_MSG_RESULT([$supports])
@@ -449,17 +452,20 @@
 # ------------------------------------------------------------
 # Check that the C++ compiler supports an argument
 BASIC_DEFUN_NAMED([FLAGS_CXX_COMPILER_CHECK_ARGUMENTS],
-    [*ARGUMENT IF_TRUE IF_FALSE], [$@],
+    [*ARGUMENT IF_TRUE IF_FALSE PREFIX], [$@],
 [
-  AC_MSG_CHECKING([if the C++ compiler supports "ARG_ARGUMENT"])
+  AC_MSG_CHECKING([if ARG_PREFIX[CXX] supports "ARG_ARGUMENT"])
   supports=yes
 
   saved_cxxflags="$CXXFLAGS"
+  saved_cxx="$CXX"
   CXXFLAGS="$CXXFLAG ARG_ARGUMENT"
+  CXX="$ARG_PREFIX[CXX]"
   AC_LANG_PUSH([C++])
   AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i;]])], [],
       [supports=no])
   AC_LANG_POP([C++])
+  CXX="$saved_cxx"
   CXXFLAGS="$saved_cxxflags"
 
   AC_MSG_RESULT([$supports])
@@ -477,18 +483,22 @@
 # ------------------------------------------------------------
 # Check that the C and C++ compilers support an argument
 BASIC_DEFUN_NAMED([FLAGS_COMPILER_CHECK_ARGUMENTS],
-    [*ARGUMENT IF_TRUE IF_FALSE], [$@],
+    [*ARGUMENT IF_TRUE IF_FALSE PREFIX], [$@],
 [
   FLAGS_C_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARG_ARGUMENT],
-  					     IF_TRUE: [C_COMP_SUPPORTS="yes"],
-					     IF_FALSE: [C_COMP_SUPPORTS="no"])
+      IF_TRUE: [C_COMP_SUPPORTS="yes"],
+      IF_FALSE: [C_COMP_SUPPORTS="no"],
+      PREFIX: [ARG_PREFIX])
   FLAGS_CXX_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARG_ARGUMENT],
-  					       IF_TRUE: [CXX_COMP_SUPPORTS="yes"],
-					       IF_FALSE: [CXX_COMP_SUPPORTS="no"])
+      IF_TRUE: [CXX_COMP_SUPPORTS="yes"],
+      IF_FALSE: [CXX_COMP_SUPPORTS="no"],
+      PREFIX: [ARG_PREFIX])
 
-  AC_MSG_CHECKING([if both compilers support "ARG_ARGUMENT"])
+  AC_MSG_CHECKING([if both ARG_PREFIX[CC] and ARG_PREFIX[CXX] support "ARG_ARGUMENT"])
   supports=no
-  if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi
+  if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then
+    supports=yes;
+  fi
 
   AC_MSG_RESULT([$supports])
   if test "x$supports" = "xyes" ; then
--- a/make/autoconf/lib-freetype.m4	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/autoconf/lib-freetype.m4	Thu Feb 07 22:11:35 2019 +0100
@@ -92,7 +92,7 @@
 
   # This setup is to verify access to system installed freetype header and libraries.
   # On Windows and MacOS this does not apply and using these options will report an error.
-  # On other platforms (Linux, Solaris, and perhaps AIX), they will default to using
+  # On other platforms (Linux, Solaris), they will default to using
   # the system libraries. If they are found automatically, nothing need be done.
   # If they are not found, the configure "--with-freetype-*" options may be used to fix that.
   # If the preference is to bundle on these platforms then use --with-freetype=bundled
@@ -106,7 +106,8 @@
   fi
 
   FREETYPE_TO_USE=bundled
-  if (test "x$OPENJDK_TARGET_OS" != "xwindows" && test "x$OPENJDK_TARGET_OS" != "xmacosx"); then
+  if (test "x$OPENJDK_TARGET_OS" != "xwindows" && test "x$OPENJDK_TARGET_OS" != "xmacosx" \
+      && test "x$OPENJDK_TARGET_OS" != "xaix"); then
     FREETYPE_TO_USE=system
   fi
   if (test "x$with_freetype" != "x"); then
--- a/make/autoconf/toolchain.m4	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/autoconf/toolchain.m4	Thu Feb 07 22:11:35 2019 +0100
@@ -595,7 +595,7 @@
 AC_DEFUN([TOOLCHAIN_EXTRACT_LD_VERSION],
 [
   LINKER=[$]$1
-  LINKER_NAME=$2
+  LINKER_NAME="$2"
 
   if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
     # cc -Wl,-V output typically looks like
--- a/make/common/MakeBase.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/common/MakeBase.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -258,7 +258,7 @@
 ################################################################################
 # All install-file and related macros automatically call DecodeSpace when needed.
 
-ifeq ($(OPENJDK_TARGET_OS),solaris)
+ifeq ($(call isTargetOs, solaris), true)
   # On Solaris, if the target is a symlink and exists, cp won't overwrite.
   # Cp has to operate in recursive mode to allow for -P flag, to preserve soft links. If the
   # name of the target file differs from the source file, rename after copy.
@@ -284,7 +284,7 @@
 	  $(CP) -f '$(call DecodeSpace, $<)' '$(call DecodeSpace, $@)'; \
 	fi
   endef
-else ifeq ($(OPENJDK_TARGET_OS),macosx)
+else ifeq ($(call isTargetOs, macosx), true)
   # On mac, extended attributes sometimes creep into the source files, which may later
   # cause the creation of ._* files which confuses testing. Clear these with xattr if
   # set. Some files get their write permissions removed after being copied to the
@@ -418,7 +418,7 @@
 # unchanged.
 # This is normally not needed since we use the FIXPATH prefix for command lines,
 # but might be needed in certain circumstances.
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
   FixPath = \
       $(shell $(CYGPATH) -m $1)
 else
--- a/make/common/Modules.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/common/Modules.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -117,11 +117,11 @@
     jdk.zipfs \
     #
 
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
   PLATFORM_MODULES += jdk.crypto.mscapi
 endif
 
-ifeq ($(OPENJDK_TARGET_OS), solaris)
+ifeq ($(call isTargetOs, solaris), true)
   PLATFORM_MODULES += jdk.crypto.ucrypto
 endif
 
--- a/make/common/NativeCompilation.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/common/NativeCompilation.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -175,9 +175,9 @@
 )
 endef
 
-ifeq ($(OPENJDK_BUILD_OS_ENV), windows.cygwin)
+ifeq ($(call isBuildOsEnv, windows.cygwin), true)
   UNIX_PATH_PREFIX := /cygdrive
-else ifeq ($(OPENJDK_BUILD_OS_ENV), windows.msys)
+else ifeq ($(call isBuildOsEnv, windows.msys), true)
   UNIX_PATH_PREFIX :=
 endif
 
@@ -770,7 +770,7 @@
 	$(TOUCH) $$@
 
   # On windows we need to create a resource file
-  ifeq ($(OPENJDK_TARGET_OS), windows)
+  ifeq ($(call isTargetOs, windows), true)
     ifneq ($$($1_VERSIONINFO_RESOURCE), )
       $1_RES := $$($1_OBJECT_DIR)/$$($1_BASENAME).res
       $1_RES_DEP := $$($1_RES).d
@@ -808,7 +808,7 @@
 
   ifneq ($(DISABLE_MAPFILES), true)
     $1_REAL_MAPFILE := $$($1_MAPFILE)
-    ifneq ($(OPENJDK_TARGET_OS), windows)
+    ifeq ($(call isTargetOs, windows), false)
       ifneq ($$($1_REORDER), )
         $1_REAL_MAPFILE := $$($1_OBJECT_DIR)/mapfile
 
@@ -845,13 +845,13 @@
       # Only copy debug symbols for dynamic libraries and programs.
       ifneq ($$($1_TYPE), STATIC_LIBRARY)
         # Generate debuginfo files.
-        ifeq ($(OPENJDK_TARGET_OS), windows)
+        ifeq ($(call isTargetOs, windows), true)
           $1_EXTRA_LDFLAGS += -debug "-pdb:$$($1_OUTPUT_DIR)/$$($1_NOSUFFIX).pdb" \
               "-map:$$($1_OUTPUT_DIR)/$$($1_NOSUFFIX).map"
           $1_DEBUGINFO_FILES := $$($1_OUTPUT_DIR)/$$($1_NOSUFFIX).pdb \
               $$($1_OUTPUT_DIR)/$$($1_NOSUFFIX).map
 
-        else ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris), )
+        else ifeq ($(call isTargetOs, linux solaris), true)
           $1_DEBUGINFO_FILES := $$($1_OUTPUT_DIR)/$$($1_NOSUFFIX).debuginfo
           # Setup the command line creating debuginfo files, to be run after linking.
           # It cannot be run separately since it updates the original target file
@@ -860,13 +860,13 @@
               $(CD) $$($1_OUTPUT_DIR) && \
                   $$($1_OBJCOPY) --add-gnu-debuglink=$$($1_DEBUGINFO_FILES) $$($1_TARGET)
 
-        else ifeq ($(OPENJDK_TARGET_OS), macosx)
+        else ifeq ($(call isTargetOs, macosx), true)
           $1_DEBUGINFO_FILES := \
               $$($1_OUTPUT_DIR)/$$($1_BASENAME).dSYM/Contents/Info.plist \
               $$($1_OUTPUT_DIR)/$$($1_BASENAME).dSYM/Contents/Resources/DWARF/$$($1_BASENAME)
           $1_CREATE_DEBUGINFO_CMDS := \
               $(DSYMUTIL) --out $$($1_OUTPUT_DIR)/$$($1_BASENAME).dSYM $$($1_TARGET)
-        endif # OPENJDK_TARGET_OS
+        endif
 
         # Since the link rule creates more than one file that we want to track,
         # we have to use some tricks to get make to cooperate. To properly
@@ -952,7 +952,7 @@
       endif
     endif
 
-    ifeq ($(OPENJDK_TARGET_OS), windows)
+    ifeq ($(call isTargetOs, windows), true)
       ifeq ($$($1_EMBED_MANIFEST), true)
         $1_EXTRA_LDFLAGS += -manifest:embed
       endif
@@ -1032,7 +1032,7 @@
                 # Keep as much as possible on one execution line for best performance
                 # on Windows
 		$$(call LogInfo, Linking $$($1_BASENAME))
-                ifeq ($(OPENJDK_TARGET_OS), windows)
+                ifeq ($(call isTargetOs, windows), true)
 		  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
 		      $$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $$($1_SYSROOT_LDFLAGS) \
 		          $(LD_OUT_OPTION)$$($1_TARGET) $$($1_LD_OBJ_ARG) $$($1_RES) $$(GLOBAL_LIBS) \
@@ -1050,7 +1050,7 @@
 		  $$($1_CREATE_DEBUGINFO_CMDS)
 		  $$($1_STRIP_CMD)
                 endif
-                ifeq ($(OPENJDK_TARGET_OS), windows)
+                ifeq ($(call isTargetOs, windows), true)
                   ifneq ($$($1_MANIFEST), )
 		    $$($1_MT) -nologo -manifest $$($1_MANIFEST) -identity:"$$($1_NAME).exe, version=$$($1_MANIFEST_VERSION)" -outputresource:$$@;#1
                   endif
--- a/make/common/Utils.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/common/Utils.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -181,6 +181,23 @@
   )
 
 ################################################################################
+# Boolean operators.
+
+# Return the word "true" if all the boolean words given as argument is "true",
+# and returns "false" otherwise. Boolean words must be "true" or "false". It is
+# an error to supply a non-boolean word. An empty string is considered "true".
+And = \
+  $(strip $(if $(filter-out true false, $1), $(error Non-boolean values: $1)) \
+  $(if $(strip $(filter-out true, $1)), false, true))
+
+# Return the word "false" if all the boolean words given as argument is "false",
+# and returns "true" otherwise. Boolean words must be "true" or "false". It is
+# an error to supply a non-boolean word.  An empty string is considered "false".
+Or = \
+  $(strip $(if $(filter-out true false, $1), $(error Non-boolean values: $1)) \
+  $(if $(strip $(filter-out false, $1)), true, false))
+
+################################################################################
 # Parse a multiple-keyword variable, like FOO="KEYWORD1=val1;KEYWORD2=val2;..."
 # These will be converted into a series of variables like FOO_KEYWORD1=val1,
 # FOO_KEYWORD2=val2, etc. Unknown keywords will cause an error.
@@ -269,6 +286,50 @@
     $(if $(filter $1, $(JVM_VARIANTS)), true, false))
 
 ################################################################################
+# Check if our build or target conforms to certain restrictions. This set of
+# functions all work in similar ways, testing the property that the name
+# implies, so e.g. isTargetCpu test the CPU of the target system.
+#
+# $1 - A property, or a space separated list of properties to test for.
+#
+# Returns true if the actual property matches one of the properties in the list,
+# and false otherwise.
+#
+# Examples: $(call isTargetOs, linux solaris) will return true when executed
+# on either linux or solaris, and false otherwise.
+# $(call isBuildCpuArch, x86) will return true iff the build CPU Arch is x86.
+
+isTargetOs = \
+  $(strip $(if $(filter $(OPENJDK_TARGET_OS), $1), true, false))
+
+isTargetOsType = \
+  $(strip $(if $(filter $(OPENJDK_TARGET_OS_TYPE), $1), true, false))
+
+isTargetCpu = \
+  $(strip $(if $(filter $(OPENJDK_TARGET_CPU), $1), true, false))
+
+isTargetCpuArch = \
+  $(strip $(if $(filter $(OPENJDK_TARGET_CPU_ARCH), $1), true, false))
+
+isTargetCpuBits = \
+  $(strip $(if $(filter $(OPENJDK_TARGET_CPU_BITS), $1), true, false))
+
+isBuildOs = \
+  $(strip $(if $(filter $(OPENJDK_BUILD_OS), $1), true, false))
+
+isBuildOsType = \
+  $(strip $(if $(filter $(OPENJDK_BUILD_OS_TYPE), $1), true, false))
+
+isBuildOsEnv = \
+  $(strip $(if $(filter $(OPENJDK_BUILD_OS_ENV), $1), true, false))
+
+isBuildCpu = \
+  $(strip $(if $(filter $(OPENJDK_BUILD_CPU), $1), true, false))
+
+isBuildCpuArch = \
+  $(strip $(if $(filter $(OPENJDK_BUILD_CPU_ARCH), $1), true, false))
+
+################################################################################
 # Converts a space separated list to a comma separated list.
 #
 # Replacing double-comma with a single comma is to workaround the issue with
--- a/make/conf/jib-profiles.js	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/conf/jib-profiles.js	Thu Feb 07 22:11:35 2019 +0100
@@ -76,6 +76,7 @@
  * install_path
  * download_path
  * download_dir
+ * home_path
  *
  *
  * The output data generated by this configuration file has the following
@@ -185,7 +186,9 @@
     // Identifies the version of this format to the tool reading it.
     // 1.1 signifies that the publish, publish-src and get-src features are usable.
     // 1.2 signifies that artifact uploads should fail on missing artifacts by default.
-    data.format_version = "1.2";
+    // 1.3 input.get(<dep>, "home_path") automatically goes down into a single top
+    //     dir just like default configure_args and environment_path variables.
+    data.format_version = "1.3";
 
     // Organization, product and version are used when uploading/publishing build results
     data.organization = "";
@@ -363,7 +366,7 @@
     };
 
     common.boot_jdk_version = "11";
-    common.boot_jdk_home = input.get("boot_jdk", "home_path") + "/jdk-"
+    common.boot_jdk_home = input.get("boot_jdk", "install_path") + "/jdk-"
         + common.boot_jdk_version
         + (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");
 
@@ -486,7 +489,7 @@
     var testmakeBase = {
         dependencies: [ "ant" ],
         environment: {
-            "ANT_HOME": input.get("ant", "install_path") + "/apache-ant-1.7.1"
+            "ANT_HOME": input.get("ant", "home_path")
         }
     };
     [ "linux-x64", "macosx-x64", "solaris-sparcv9", "solaris-x64", "windows-x64"]
@@ -1003,8 +1006,7 @@
             classifier: "distribution",
             revision: "3.0-SNAPSHOT",
             environment_name: "JIB_HOME",
-            environment_value: input.get("jib", "install_path")
-                + "/jib-3.0-SNAPSHOT-distribution"
+            environment_value: input.get("jib", "home_path")
         },
 
         ant: {
--- a/make/copy/Copy-java.base.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/copy/Copy-java.base.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -31,7 +31,7 @@
 
 ################################################################################
 
-ifeq ($(OPENJDK_TARGET_OS), aix)
+ifeq ($(call isTargetOs, aix), true)
 
   TZMAPPINGS_SRC := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/conf
 
@@ -44,7 +44,7 @@
 
 ################################################################################
 # Copy the microsoft runtime libraries on windows
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
 
   # Chmod to avoid permission issues if bundles are unpacked on unix platforms.
   define copy-and-chmod
@@ -81,7 +81,7 @@
 ################################################################################
 # In jvm.cfg, the first listed KNOWN variant is the default. On most build
 # configurations, that is the server variant.
-ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), windows-x86)
+ifeq ($(call And, $(call isTargetOs, windows) $(call isTargetCpu, x86)), true)
   DEFAULT_CFG_VARIANT ?= client
 endif
 DEFAULT_CFG_VARIANT ?= server
@@ -143,7 +143,7 @@
 DEF_POLICY_SRC_LIST := $(DEF_POLICY_SRC)
 DEF_POLICY_SRC_LIST += $(CUSTOM_POLICY_SRC_LIST)
 
-ifneq ($(filter $(OPENJDK_TARGET_OS), windows solaris), )
+ifeq ($(call isTargetOs, windows solaris), true)
   DEF_POLICY_SRC_LIST += $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/lib/security/default.policy
 endif
 
@@ -183,7 +183,7 @@
 
 TARGETS += $(COPY_NET_PROPERTIES)
 
-ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux), )
+ifeq ($(call isTargetOs, solaris linux), true)
   $(eval $(call SetupCopyFiles, COPY_SDP_CONF, \
       FILES := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template, \
       DEST := $(CONF_DST_DIR)/sdp, \
--- a/make/copy/Copy-jdk.crypto.cryptoki.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/copy/Copy-jdk.crypto.cryptoki.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -27,7 +27,7 @@
 
 ################################################################################
 
-ifeq ($(OPENJDK_TARGET_OS), solaris)
+ifeq ($(call isTargetOs, solaris), true)
 
   SUNPKCS11_CFG_SRC := \
       $(TOPDIR)/src/jdk.crypto.cryptoki/solaris/conf/security/sunpkcs11-solaris.cfg
--- a/make/copy/Copy-jdk.crypto.ucrypto.gmk	Thu Jan 31 22:06:25 2019 +0100
+++ b/make/copy/Copy-jdk.crypto.ucrypto.gmk	Thu Feb 07 22:11:35 2019 +0100
@@ -27,7 +27,7 @@
 
 ################################################################################
 
-ifeq ($(OPENJDK_TARGET_OS), solaris)
+ifeq ($(call isTargetOs, solaris), true)
 
   UCRYPTO_CFG_SRC := $(TOPDIR)/src/jdk.crypto.ucrypto/solaris/conf/security/ucrypto-solaris.cfg
   UCRYPTO_CFG_DST := $(CONF_DST_DIR)/security/ucrypto-solaris.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cldr/README	Thu Feb 07 22:11:35 2019 +0100
@@ -0,0 +1,4 @@
+CLDR - Unicode Common Locale Data Repository
+http://cldr.unicode.org
+
+CLDR version installed: 33
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cldr/common/bcp47/timezone.xml	Thu Feb 07 22:11:35 2019 +0100
@@ -0,0 +1,480 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldmlBCP47 SYSTEM "../../common/dtd/ldmlBCP47.dtd">
+<!--
+Copyright © 1991-2017 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+
+<ldmlBCP47>
+    <version number="$Revision: 13421 $"/>
+    <keyword>
+        <key name="tz" description="Time zone key" alias="timezone">
+            <type name="adalv" description="Andorra" alias="Europe/Andorra"/>
+            <type name="aedxb" description="Dubai, United Arab Emirates" alias="Asia/Dubai"/>
+            <type name="afkbl" description="Kabul, Afghanistan" alias="Asia/Kabul"/>
+            <type name="aganu" description="Antigua" alias="America/Antigua"/>
+            <type name="aiaxa" description="Anguilla" alias="America/Anguilla"/>
+            <type name="altia" description="Tirane, Albania" alias="Europe/Tirane"/>
+            <type name="amevn" description="Yerevan, Armenia" alias="Asia/Yerevan"/>
+            <type name="ancur" description="Curaçao" alias="America/Curacao"/>
+            <type name="aolad" description="Luanda, Angola" alias="Africa/Luanda"/>
+            <type name="aqams" description="Amundsen-Scott Station, South Pole" deprecated="true" preferred="nzakl"/>
+            <type name="aqcas" description="Casey Station, Bailey Peninsula" alias="Antarctica/Casey"/>
+            <type name="aqdav" description="Davis Station, Vestfold Hills" alias="Antarctica/Davis"/>
+            <type name="aqddu" description="Dumont d'Urville Station, Terre Adélie" alias="Antarctica/DumontDUrville"/>
+            <type name="aqmaw" description="Mawson Station, Holme Bay" alias="Antarctica/Mawson"/>
+            <type name="aqmcm" description="McMurdo Station, Ross Island" alias="Antarctica/McMurdo"/>
+            <type name="aqplm" description="Palmer Station, Anvers Island" alias="Antarctica/Palmer"/>
+            <type name="aqrot" description="Rothera Station, Adelaide Island" alias="Antarctica/Rothera"/>
+            <type name="aqsyw" description="Syowa Station, East Ongul Island" alias="Antarctica/Syowa"/>
+            <type name="aqtrl" description="Troll Station, Queen Maud Land" alias="Antarctica/Troll" since="26"/>
+            <type name="aqvos" description="Vostok Station, Lake Vostok" alias="Antarctica/Vostok"/>
+            <type name="arbue" description="Buenos Aires, Argentina" alias="America/Buenos_Aires America/Argentina/Buenos_Aires"/>
+            <type name="arcor" description="Córdoba, Argentina" alias="America/Cordoba America/Argentina/Cordoba America/Rosario"/>
+            <type name="arctc" description="Catamarca, Argentina" alias="America/Catamarca America/Argentina/Catamarca America/Argentina/ComodRivadavia"/>
+            <type name="arirj" description="La Rioja, Argentina" alias="America/Argentina/La_Rioja"/>
+            <type name="arjuj" description="Jujuy, Argentina" alias="America/Jujuy America/Argentina/Jujuy"/>
+            <type name="arluq" description="San Luis, Argentina" alias="America/Argentina/San_Luis"/>
+            <type name="armdz" description="Mendoza, Argentina" alias="America/Mendoza America/Argentina/Mendoza"/>
+            <type name="arrgl" description="Río Gallegos, Argentina" alias="America/Argentina/Rio_Gallegos"/>
+            <type name="arsla" description="Salta, Argentina" alias="America/Argentina/Salta"/>
+            <type name="artuc" description="Tucumán, Argentina" alias="America/Argentina/Tucuman"/>
+            <type name="aruaq" description="San Juan, Argentina" alias="America/Argentina/San_Juan"/>
+            <type name="arush" description="Ushuaia, Argentina" alias="America/Argentina/Ushuaia"/>
+            <type name="asppg" description="Pago Pago, American Samoa" alias="Pacific/Pago_Pago Pacific/Samoa US/Samoa"/>
+            <type name="atvie" description="Vienna, Austria" alias="Europe/Vienna"/>
+            <type name="auadl" description="Adelaide, Australia" alias="Australia/Adelaide Australia/South"/>
+            <type name="aubhq" description="Broken Hill, Australia" alias="Australia/Broken_Hill Australia/Yancowinna"/>
+            <type name="aubne" description="Brisbane, Australia" alias="Australia/Brisbane Australia/Queensland"/>
+            <type name="audrw" description="Darwin, Australia" alias="Australia/Darwin Australia/North"/>
+            <type name="aueuc" description="Eucla, Australia" alias="Australia/Eucla"/>
+            <type name="auhba" description="Hobart, Australia" alias="Australia/Hobart Australia/Tasmania"/>
+            <type name="aukns" description="Currie, Australia" alias="Australia/Currie"/>
+            <type name="auldc" description="Lindeman Island, Australia" alias="Australia/Lindeman"/>
+            <type name="auldh" description="Lord Howe Island, Australia" alias="Australia/Lord_Howe Australia/LHI"/>
+            <type name="aumel" description="Melbourne, Australia" alias="Australia/Melbourne Australia/Victoria"/>
+            <type name="aumqi" description="Macquarie Island Station, Macquarie Island" alias="Antarctica/Macquarie" since="1.8.1"/>
+            <type name="auper" description="Perth, Australia" alias="Australia/Perth Australia/West"/>
+            <type name="ausyd" description="Sydney, Australia" alias="Australia/Sydney Australia/ACT Australia/Canberra Australia/NSW"/>
+            <type name="awaua" description="Aruba" alias="America/Aruba"/>
+            <type name="azbak" description="Baku, Azerbaijan" alias="Asia/Baku"/>
+            <type name="basjj" description="Sarajevo, Bosnia and Herzegovina" alias="Europe/Sarajevo"/>
+            <type name="bbbgi" description="Barbados" alias="America/Barbados"/>
+            <type name="bddac" description="Dhaka, Bangladesh" alias="Asia/Dhaka Asia/Dacca"/>
+            <type name="bebru" description="Brussels, Belgium" alias="Europe/Brussels"/>
+            <type name="bfoua" description="Ouagadougou, Burkina Faso" alias="Africa/Ouagadougou"/>
+            <type name="bgsof" description="Sofia, Bulgaria" alias="Europe/Sofia"/>
+            <type name="bhbah" description="Bahrain" alias="Asia/Bahrain"/>
+            <type name="bibjm" description="Bujumbura, Burundi" alias="Africa/Bujumbura"/>
+            <type name="bjptn" description="Porto-Novo, Benin" alias="Africa/Porto-Novo"/>
+            <type name="bmbda" description="Bermuda" alias="Atlantic/Bermuda"/>
+            <type name="bnbwn" description="Brunei" alias="Asia/Brunei"/>
+            <type name="bolpb" description="La Paz, Bolivia" alias="America/La_Paz"/>
+            <type name="bqkra" description="Bonaire, Sint Estatius and Saba" alias="America/Kralendijk" since="21"/>
+            <type name="braux" description="Araguaína, Brazil" alias="America/Araguaina"/>
+            <type name="brbel" description="Belém, Brazil" alias="America/Belem"/>
+            <type name="brbvb" description="Boa Vista, Brazil" alias="America/Boa_Vista"/>
+            <type name="brcgb" description="Cuiabá, Brazil" alias="America/Cuiaba"/>
+            <type name="brcgr" description="Campo Grande, Brazil" alias="America/Campo_Grande"/>
+            <type name="brern" description="Eirunepé, Brazil" alias="America/Eirunepe"/>
+            <type name="brfen" description="Fernando de Noronha, Brazil" alias="America/Noronha Brazil/DeNoronha"/>
+            <type name="brfor" description="Fortaleza, Brazil" alias="America/Fortaleza"/>
+            <type name="brmao" description="Manaus, Brazil" alias="America/Manaus Brazil/West"/>
+            <type name="brmcz" description="Maceió, Brazil" alias="America/Maceio"/>
+            <type name="brpvh" description="Porto Velho, Brazil" alias="America/Porto_Velho"/>
+            <type name="brrbr" description="Rio Branco, Brazil" alias="America/Rio_Branco America/Porto_Acre Brazil/Acre"/>
+            <type name="brrec" description="Recife, Brazil" alias="America/Recife"/>
+            <type name="brsao" description="São Paulo, Brazil" alias="America/Sao_Paulo Brazil/East"/>
+            <type name="brssa" description="Bahia, Brazil" alias="America/Bahia"/>
+            <type name="brstm" description="Santarém, Brazil" alias="America/Santarem"/>
+            <type name="bsnas" description="Nassau, Bahamas" alias="America/Nassau"/>
+            <type name="btthi" description="Thimphu, Bhutan" alias="Asia/Thimphu Asia/Thimbu"/>
+            <type name="bwgbe" description="Gaborone, Botswana" alias="Africa/Gaborone"/>
+            <type name="bymsq" description="Minsk, Belarus" alias="Europe/Minsk"/>
+            <type name="bzbze" description="Belize" alias="America/Belize"/>
+            <type name="cacfq" description="Creston, Canada" alias="America/Creston" since="21.0.1"/>
+            <type name="caedm" description="Edmonton, Canada" alias="America/Edmonton Canada/Mountain"/>
+            <type name="caffs" description="Rainy River, Canada" alias="America/Rainy_River"/>
+            <type name="cafne" description="Fort Nelson, Canada" alias="America/Fort_Nelson"/>
+            <type name="caglb" description="Glace Bay, Canada" alias="America/Glace_Bay"/>
+            <type name="cagoo" description="Goose Bay, Canada" alias="America/Goose_Bay"/>
+            <type name="cahal" description="Halifax, Canada" alias="America/Halifax Canada/Atlantic"/>
+            <type name="caiql" description="Iqaluit, Canada" alias="America/Iqaluit"/>
+            <type name="camon" description="Moncton, Canada" alias="America/Moncton"/>
+            <type name="camtr" description="Montreal, Canada" deprecated="true" alias="America/Montreal"/>
+            <type name="capnt" description="Pangnirtung, Canada" alias="America/Pangnirtung"/>
+            <type name="careb" description="Resolute, Canada" alias="America/Resolute"/>
+            <type name="careg" description="Regina, Canada" alias="America/Regina Canada/East-Saskatchewan Canada/Saskatchewan"/>
+            <type name="casjf" description="St. John's, Canada" alias="America/St_Johns Canada/Newfoundland"/>
+            <type name="canpg" description="Nipigon, Canada" alias="America/Nipigon"/>
+            <type name="cathu" description="Thunder Bay, Canada" alias="America/Thunder_Bay"/>
+            <type name="cator" description="Toronto, Canada" alias="America/Toronto Canada/Eastern"/>
+            <type name="cavan" description="Vancouver, Canada" alias="America/Vancouver Canada/Pacific"/>
+            <type name="cawnp" description="Winnipeg, Canada" alias="America/Winnipeg Canada/Central"/>
+            <type name="caybx" description="Blanc-Sablon, Canada" alias="America/Blanc-Sablon"/>
+            <type name="caycb" description="Cambridge Bay, Canada" alias="America/Cambridge_Bay"/>
+            <type name="cayda" description="Dawson, Canada" alias="America/Dawson"/>
+            <type name="caydq" description="Dawson Creek, Canada" alias="America/Dawson_Creek"/>
+            <type name="cayek" description="Rankin Inlet, Canada" alias="America/Rankin_Inlet"/>
+            <type name="cayev" description="Inuvik, Canada" alias="America/Inuvik"/>
+            <type name="cayxy" description="Whitehorse, Canada" alias="America/Whitehorse Canada/Yukon"/>
+            <type name="cayyn" description="Swift Current, Canada" alias="America/Swift_Current"/>
+            <type name="cayzf" description="Yellowknife, Canada" alias="America/Yellowknife"/>
+            <type name="cayzs" description="Atikokan, Canada" alias="America/Coral_Harbour America/Atikokan"/>
+            <type name="cccck" description="Cocos (Keeling) Islands" alias="Indian/Cocos"/>
+            <type name="cdfbm" description="Lubumbashi, Democratic Republic of the Congo" alias="Africa/Lubumbashi"/>
+            <type name="cdfih" description="Kinshasa, Democratic Republic of the Congo" alias="Africa/Kinshasa"/>
+            <type name="cfbgf" description="Bangui, Central African Republic" alias="Africa/Bangui"/>
+            <type name="cgbzv" description="Brazzaville, Republic of the Congo" alias="Africa/Brazzaville"/>
+            <type name="chzrh" description="Zurich, Switzerland" alias="Europe/Zurich"/>
+            <type name="ciabj" description="Abidjan, Côte d'Ivoire" alias="Africa/Abidjan"/>
+            <type name="ckrar" description="Rarotonga, Cook Islands" alias="Pacific/Rarotonga"/>
+            <type name="clipc" description="Easter Island, Chile" alias="Pacific/Easter Chile/EasterIsland"/>
+            <type name="clpuq" description="Punta Arenas, Chile" alias="America/Punta_Arenas" since="31"/>
+            <type name="clscl" description="Santiago, Chile" alias="America/Santiago Chile/Continental"/>
+            <type name="cmdla" description="Douala, Cameroon" alias="Africa/Douala"/>
+            <type name="cnckg" description="Chongqing, China" deprecated="true" preferred="cnsha"/>
+            <type name="cnhrb" description="Harbin, China" deprecated="true" preferred="cnsha"/>
+            <type name="cnkhg" description="Kashgar, China" deprecated="true" preferred="cnurc"/>
+            <type name="cnsha" description="Shanghai, China" alias="Asia/Shanghai Asia/Chongqing Asia/Chungking Asia/Harbin PRC"/>
+            <type name="cnurc" description="Ürümqi, China" alias="Asia/Urumqi Asia/Kashgar"/>
+            <type name="cobog" description="Bogotá, Colombia" alias="America/Bogota"/>
+            <type name="crsjo" description="Costa Rica" alias="America/Costa_Rica"/>
+            <type name="cst6cdt" description="POSIX style time zone for US Central Time" alias="CST6CDT" since="1.8"/>
+            <type name="cuhav" description="Havana, Cuba" alias="America/Havana Cuba"/>
+            <type name="cvrai" description="Cape Verde" alias="Atlantic/Cape_Verde"/>
+            <type name="cxxch" description="Christmas Island" alias="Indian/Christmas"/>
+            <type name="cyfmg" description="Famagusta, Cyprus" alias="Asia/Famagusta" since="31"/>
+            <type name="cynic" description="Nicosia, Cyprus" alias="Asia/Nicosia Europe/Nicosia"/>
+            <type name="czprg" description="Prague, Czech Republic" alias="Europe/Prague"/>
+            <type name="deber" description="Berlin, Germany" alias="Europe/Berlin"/>
+            <type name="debsngn" description="Busingen, Germany" alias="Europe/Busingen" since="23"/>
+            <type name="djjib" description="Djibouti" alias="Africa/Djibouti"/>
+            <type name="dkcph" description="Copenhagen, Denmark" alias="Europe/Copenhagen"/>
+            <type name="dmdom" description="Dominica" alias="America/Dominica"/>
+            <type name="dosdq" description="Santo Domingo, Dominican Republic" alias="America/Santo_Domingo"/>
+            <type name="dzalg" description="Algiers, Algeria" alias="Africa/Algiers"/>
+            <type name="ecgps" description="Galápagos Islands, Ecuador" alias="Pacific/Galapagos"/>
+            <type name="ecgye" description="Guayaquil, Ecuador" alias="America/Guayaquil"/>
+            <type name="eetll" description="Tallinn, Estonia" alias="Europe/Tallinn"/>
+            <type name="egcai" description="Cairo, Egypt" alias="Africa/Cairo Egypt"/>
+            <type name="eheai" description="El Aaiún, Western Sahara" alias="Africa/El_Aaiun"/>
+            <type name="erasm" description="Asmara, Eritrea" alias="Africa/Asmera Africa/Asmara"/>
+            <type name="esceu" description="Ceuta, Spain" alias="Africa/Ceuta"/>
+            <type name="eslpa" description="Canary Islands, Spain" alias="Atlantic/Canary"/>
+            <type name="esmad" description="Madrid, Spain" alias="Europe/Madrid"/>
+            <type name="est5edt" description="POSIX style time zone for US Eastern Time" alias="EST5EDT" since="1.8"/>
+            <type name="etadd" description="Addis Ababa, Ethiopia" alias="Africa/Addis_Ababa"/>
+            <type name="fihel" description="Helsinki, Finland" alias="Europe/Helsinki"/>
+            <type name="fimhq" description="Mariehamn, Åland, Finland" alias="Europe/Mariehamn"/>
+            <type name="fjsuv" description="Fiji" alias="Pacific/Fiji"/>
+            <type name="fkpsy" description="Stanley, Falkland Islands" alias="Atlantic/Stanley"/>
+            <type name="fmksa" description="Kosrae, Micronesia" alias="Pacific/Kosrae"/>
+            <type name="fmpni" description="Pohnpei, Micronesia" alias="Pacific/Ponape Pacific/Pohnpei"/>
+            <type name="fmtkk" description="Chuuk, Micronesia" alias="Pacific/Truk Pacific/Chuuk Pacific/Yap"/>
+            <type name="fotho" description="Faroe Islands" alias="Atlantic/Faeroe Atlantic/Faroe"/>
+            <type name="frpar" description="Paris, France" alias="Europe/Paris"/>
+            <type name="galbv" description="Libreville, Gabon" alias="Africa/Libreville"/>
+            <type name="gaza" description="Gaza Strip, Palestinian Territories" alias="Asia/Gaza"/>
+            <type name="gblon" description="London, United Kingdom" alias="Europe/London Europe/Belfast GB GB-Eire"/>
+            <type name="gdgnd" description="Grenada" alias="America/Grenada"/>
+            <type name="getbs" description="Tbilisi, Georgia" alias="Asia/Tbilisi"/>
+            <type name="gfcay" description="Cayenne, French Guiana" alias="America/Cayenne"/>
+            <type name="gggci" description="Guernsey" alias="Europe/Guernsey"/>
+            <type name="ghacc" description="Accra, Ghana" alias="Africa/Accra"/>
+            <type name="gigib" description="Gibraltar" alias="Europe/Gibraltar"/>
+            <type name="gldkshvn" description="Danmarkshavn, Greenland" alias="America/Danmarkshavn"/>
+            <type name="glgoh" description="Nuuk (Godthåb), Greenland" alias="America/Godthab"/>
+            <type name="globy" description="Ittoqqortoormiit (Scoresbysund), Greenland" alias="America/Scoresbysund"/>
+            <type name="glthu" description="Qaanaaq (Thule), Greenland" alias="America/Thule"/>
+            <type name="gmbjl" description="Banjul, Gambia" alias="Africa/Banjul"/>
+            <type name="gmt" description="Greenwich Mean Time" alias="Etc/GMT Etc/GMT+0 Etc/GMT-0 Etc/GMT0 Etc/Greenwich GMT GMT+0 GMT-0 GMT0 Greenwich"/>
+            <type name="gncky" description="Conakry, Guinea" alias="Africa/Conakry"/>
+            <type name="gpbbr" description="Guadeloupe" alias="America/Guadeloupe"/>
+            <type name="gpmsb" description="Marigot, Saint Martin" alias="America/Marigot"/>
+            <type name="gpsbh" description="Saint Barthélemy" alias="America/St_Barthelemy"/>
+            <type name="gqssg" description="Malabo, Equatorial Guinea" alias="Africa/Malabo"/>
+            <type name="grath" description="Athens, Greece" alias="Europe/Athens"/>
+            <type name="gsgrv" description="South Georgia and the South Sandwich Islands" alias="Atlantic/South_Georgia"/>
+            <type name="gtgua" description="Guatemala" alias="America/Guatemala"/>
+            <type name="gugum" description="Guam" alias="Pacific/Guam"/>
+            <type name="gwoxb" description="Bissau, Guinea-Bissau" alias="Africa/Bissau"/>
+            <type name="gygeo" description="Guyana" alias="America/Guyana"/>
+            <type name="hebron" description="West Bank, Palestinian Territories" alias="Asia/Hebron" since="21"/>
+            <type name="hkhkg" description="Hong Kong SAR China" alias="Asia/Hong_Kong Hongkong"/>
+            <type name="hntgu" description="Tegucigalpa, Honduras" alias="America/Tegucigalpa"/>
+            <type name="hrzag" description="Zagreb, Croatia" alias="Europe/Zagreb"/>
+            <type name="htpap" description="Port-au-Prince, Haiti" alias="America/Port-au-Prince"/>
+            <type name="hubud" description="Budapest, Hungary" alias="Europe/Budapest"/>
+            <type name="iddjj" description="Jayapura, Indonesia" alias="Asia/Jayapura"/>
+            <type name="idjkt" description="Jakarta, Indonesia" alias="Asia/Jakarta"/>
+            <type name="idmak" description="Makassar, Indonesia" alias="Asia/Makassar Asia/Ujung_Pandang"/>
+            <type name="idpnk" description="Pontianak, Indonesia" alias="Asia/Pontianak"/>
+            <type name="iedub" description="Dublin, Ireland" alias="Europe/Dublin Eire"/>
+            <type name="imdgs" description="Isle of Man" alias="Europe/Isle_of_Man"/>
+            <type name="inccu" description="Kolkata, India" alias="Asia/Calcutta Asia/Kolkata"/>
+            <type name="iodga" description="Chagos Archipelago" alias="Indian/Chagos"/>
+            <type name="iqbgw" description="Baghdad, Iraq" alias="Asia/Baghdad"/>
+            <type name="irthr" description="Tehran, Iran" alias="Asia/Tehran Iran"/>
+            <type name="isrey" description="Reykjavik, Iceland" alias="Atlantic/Reykjavik Iceland"/>
+            <type name="itrom" description="Rome, Italy" alias="Europe/Rome"/>
+            <type name="jeruslm" description="Jerusalem" alias="Asia/Jerusalem Asia/Tel_Aviv Israel"/>
+            <type name="jesth" description="Jersey" alias="Europe/Jersey"/>
+            <type name="jmkin" description="Jamaica" alias="America/Jamaica Jamaica"/>
+            <type name="joamm" description="Amman, Jordan" alias="Asia/Amman"/>
+            <type name="jptyo" description="Tokyo, Japan" alias="Asia/Tokyo Japan"/>
+            <type name="kenbo" description="Nairobi, Kenya" alias="Africa/Nairobi"/>
+            <type name="kgfru" description="Bishkek, Kyrgyzstan" alias="Asia/Bishkek"/>
+            <type name="khpnh" description="Phnom Penh, Cambodia" alias="Asia/Phnom_Penh"/>
+            <type name="kicxi" description="Kiritimati, Kiribati" alias="Pacific/Kiritimati"/>
+            <type name="kipho" description="Enderbury Island, Kiribati" alias="Pacific/Enderbury"/>
+            <type name="kitrw" description="Tarawa, Kiribati" alias="Pacific/Tarawa"/>
+            <type name="kmyva" description="Comoros" alias="Indian/Comoro"/>
+            <type name="knbas" description="Saint Kitts" alias="America/St_Kitts"/>
+            <type name="kpfnj" description="Pyongyang, North Korea" alias="Asia/Pyongyang"/>
+            <type name="krsel" description="Seoul, South Korea" alias="Asia/Seoul ROK"/>
+            <type name="kwkwi" description="Kuwait" alias="Asia/Kuwait"/>
+            <type name="kygec" description="Cayman Islands" alias="America/Cayman"/>
+            <type name="kzaau" description="Aqtau, Kazakhstan" alias="Asia/Aqtau"/>
+            <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="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"/>
+            <type name="lbbey" description="Beirut, Lebanon" alias="Asia/Beirut"/>
+            <type name="lccas" description="Saint Lucia" alias="America/St_Lucia"/>
+            <type name="livdz" description="Vaduz, Liechtenstein" alias="Europe/Vaduz"/>
+            <type name="lkcmb" description="Colombo, Sri Lanka" alias="Asia/Colombo"/>
+            <type name="lrmlw" description="Monrovia, Liberia" alias="Africa/Monrovia"/>
+            <type name="lsmsu" description="Maseru, Lesotho" alias="Africa/Maseru"/>
+            <type name="ltvno" description="Vilnius, Lithuania" alias="Europe/Vilnius"/>
+            <type name="lulux" description="Luxembourg" alias="Europe/Luxembourg"/>
+            <type name="lvrix" description="Riga, Latvia" alias="Europe/Riga"/>
+            <type name="lytip" description="Tripoli, Libya" alias="Africa/Tripoli Libya"/>
+            <type name="macas" description="Casablanca, Morocco" alias="Africa/Casablanca"/>
+            <type name="mcmon" description="Monaco" alias="Europe/Monaco"/>
+            <type name="mdkiv" description="Chişinău, Moldova" alias="Europe/Chisinau Europe/Tiraspol"/>
+            <type name="metgd" description="Podgorica, Montenegro" alias="Europe/Podgorica"/>
+            <type name="mgtnr" description="Antananarivo, Madagascar" alias="Indian/Antananarivo"/>
+            <type name="mhkwa" description="Kwajalein, Marshall Islands" alias="Pacific/Kwajalein Kwajalein"/>
+            <type name="mhmaj" description="Majuro, Marshall Islands" alias="Pacific/Majuro"/>
+            <type name="mkskp" description="Skopje, Macedonia" alias="Europe/Skopje"/>
+            <type name="mlbko" description="Bamako, Mali" alias="Africa/Bamako Africa/Timbuktu"/>
+            <type name="mmrgn" description="Yangon (Rangoon), Burma" alias="Asia/Rangoon Asia/Yangon"/>
+            <type name="mncoq" description="Choibalsan, Mongolia" alias="Asia/Choibalsan"/>
+            <type name="mnhvd" description="Khovd (Hovd), Mongolia" alias="Asia/Hovd"/>
+            <type name="mnuln" description="Ulaanbaatar (Ulan Bator), Mongolia" alias="Asia/Ulaanbaatar Asia/Ulan_Bator"/>
+            <type name="momfm" description="Macau SAR China" alias="Asia/Macau Asia/Macao"/>
+            <type name="mpspn" description="Saipan, Northern Mariana Islands" alias="Pacific/Saipan"/>
+            <type name="mqfdf" description="Martinique" alias="America/Martinique"/>
+            <type name="mrnkc" description="Nouakchott, Mauritania" alias="Africa/Nouakchott"/>
+            <type name="msmni" description="Montserrat" alias="America/Montserrat"/>
+            <type name="mst7mdt" description="POSIX style time zone for US Mountain Time" alias="MST7MDT" since="1.8"/>
+            <type name="mtmla" description="Malta" alias="Europe/Malta"/>
+            <type name="muplu" description="Mauritius" alias="Indian/Mauritius"/>
+            <type name="mvmle" description="Maldives" alias="Indian/Maldives"/>
+            <type name="mwblz" description="Blantyre, Malawi" alias="Africa/Blantyre"/>
+            <type name="mxchi" description="Chihuahua, Mexico" alias="America/Chihuahua"/>
+            <type name="mxcun" description="Cancún, Mexico" alias="America/Cancun"/>
+            <type name="mxhmo" description="Hermosillo, Mexico" alias="America/Hermosillo"/>
+            <type name="mxmam" description="Matamoros, Mexico" alias="America/Matamoros"/>
+            <type name="mxmex" description="Mexico City, Mexico" alias="America/Mexico_City Mexico/General"/>
+            <type name="mxmid" description="Mérida, Mexico" alias="America/Merida"/>
+            <type name="mxmty" description="Monterrey, Mexico" alias="America/Monterrey"/>
+            <type name="mxmzt" description="Mazatlán, Mexico" alias="America/Mazatlan Mexico/BajaSur"/>
+            <type name="mxoji" description="Ojinaga, Mexico" alias="America/Ojinaga"/>
+            <type name="mxpvr" description="Bahía de Banderas, Mexico" alias="America/Bahia_Banderas" since="1.9"/>
+            <type name="mxstis" description="Santa Isabel (Baja California), Mexico" alias="America/Santa_Isabel"/>
+            <type name="mxtij" description="Tijuana, Mexico" alias="America/Tijuana America/Ensenada Mexico/BajaNorte"/>
+            <type name="mykch" description="Kuching, Malaysia" alias="Asia/Kuching"/>
+            <type name="mykul" description="Kuala Lumpur, Malaysia" alias="Asia/Kuala_Lumpur"/>
+            <type name="mzmpm" description="Maputo, Mozambique" alias="Africa/Maputo"/>
+            <type name="nawdh" description="Windhoek, Namibia" alias="Africa/Windhoek"/>
+            <type name="ncnou" description="Noumea, New Caledonia" alias="Pacific/Noumea"/>
+            <type name="nenim" description="Niamey, Niger" alias="Africa/Niamey"/>
+            <type name="nfnlk" description="Norfolk Island" alias="Pacific/Norfolk"/>
+            <type name="nglos" description="Lagos, Nigeria" alias="Africa/Lagos"/>
+            <type name="nimga" description="Managua, Nicaragua" alias="America/Managua"/>
+            <type name="nlams" description="Amsterdam, Netherlands" alias="Europe/Amsterdam"/>
+            <type name="noosl" description="Oslo, Norway" alias="Europe/Oslo"/>
+            <type name="npktm" description="Kathmandu, Nepal" alias="Asia/Katmandu Asia/Kathmandu"/>
+            <type name="nrinu" description="Nauru" alias="Pacific/Nauru"/>
+            <type name="nuiue" description="Niue" alias="Pacific/Niue"/>
+            <type name="nzakl" description="Auckland, New Zealand" alias="Pacific/Auckland Antarctica/South_Pole NZ"/>
+            <type name="nzcht" description="Chatham Islands, New Zealand" alias="Pacific/Chatham NZ-CHAT"/>
+            <type name="ommct" description="Muscat, Oman" alias="Asia/Muscat"/>
+            <type name="papty" description="Panama" alias="America/Panama"/>
+            <type name="pelim" description="Lima, Peru" alias="America/Lima"/>
+            <type name="pfgmr" description="Gambiera Islands, French Polynesia" alias="Pacific/Gambier"/>
+            <type name="pfnhv" description="Marquesas Islands, French Polynesia" alias="Pacific/Marquesas"/>
+            <type name="pfppt" description="Tahiti, French Polynesia" alias="Pacific/Tahiti"/>
+            <type name="pgpom" description="Port Moresby, Papua New Guinea" alias="Pacific/Port_Moresby"/>
+            <type name="pgraw" description="Bougainville, Papua New Guinea" alias="Pacific/Bougainville" since="27"/>
+            <type name="phmnl" description="Manila, Philippines" alias="Asia/Manila"/>
+            <type name="pkkhi" description="Karachi, Pakistan" alias="Asia/Karachi"/>
+            <type name="plwaw" description="Warsaw, Poland" alias="Europe/Warsaw Poland"/>
+            <type name="pmmqc" description="Saint Pierre and Miquelon" alias="America/Miquelon"/>
+            <type name="pnpcn" description="Pitcairn Islands" alias="Pacific/Pitcairn"/>
+            <type name="prsju" description="Puerto Rico" alias="America/Puerto_Rico"/>
+            <type name="pst8pdt" description="POSIX style time zone for US Pacific Time" alias="PST8PDT" since="1.8"/>
+            <type name="ptfnc" description="Madeira, Portugal" alias="Atlantic/Madeira"/>
+            <type name="ptlis" description="Lisbon, Portugal" alias="Europe/Lisbon Portugal"/>
+            <type name="ptpdl" description="Azores, Portugal" alias="Atlantic/Azores"/>
+            <type name="pwror" description="Palau" alias="Pacific/Palau"/>
+            <type name="pyasu" description="Asunción, Paraguay" alias="America/Asuncion"/>
+            <type name="qadoh" description="Qatar" alias="Asia/Qatar"/>
+            <type name="rereu" description="Réunion" alias="Indian/Reunion"/>
+            <type name="robuh" description="Bucharest, Romania" alias="Europe/Bucharest"/>
+            <type name="rsbeg" description="Belgrade, Serbia" alias="Europe/Belgrade"/>
+            <type name="ruasf" description="Astrakhan, Russia" alias="Europe/Astrakhan" since="30"/>
+            <type name="rubax" description="Barnaul, Russia" alias="Asia/Barnaul" since="30"/>
+            <type name="ruchita" description="Chita Zabaykalsky, Russia" alias="Asia/Chita" since="26"/>
+            <type name="rudyr" description="Anadyr, Russia" alias="Asia/Anadyr"/>
+            <type name="rugdx" description="Magadan, Russia" alias="Asia/Magadan"/>
+            <type name="ruikt" description="Irkutsk, Russia" alias="Asia/Irkutsk"/>
+            <type name="rukgd" description="Kaliningrad, Russia" alias="Europe/Kaliningrad"/>
+            <type name="rukhndg" description="Khandyga Tomponsky, Russia" alias="Asia/Khandyga" since="23"/>
+            <type name="rukra" description="Krasnoyarsk, Russia" alias="Asia/Krasnoyarsk"/>
+            <type name="rukuf" description="Samara, Russia" alias="Europe/Samara"/>
+            <type name="rukvx" description="Kirov, Russia" alias="Europe/Kirov" since="30"/>
+            <type name="rumow" description="Moscow, Russia" alias="Europe/Moscow W-SU"/>
+            <type name="runoz" description="Novokuznetsk, Russia" alias="Asia/Novokuznetsk"/>
+            <type name="ruoms" description="Omsk, Russia" alias="Asia/Omsk"/>
+            <type name="ruovb" description="Novosibirsk, Russia" alias="Asia/Novosibirsk"/>
+            <type name="rupkc" description="Kamchatka Peninsula, Russia" alias="Asia/Kamchatka"/>
+            <type name="rurtw" description="Saratov, Russia" alias="Europe/Saratov" since="31"/>
+            <type name="rusred" description="Srednekolymsk, Russia" alias="Asia/Srednekolymsk" since="26"/>
+            <type name="rutof" description="Tomsk, Russia" alias="Asia/Tomsk" since="30"/>
+            <type name="ruuly" description="Ulyanovsk, Russia" alias="Europe/Ulyanovsk" since="30"/>
+            <type name="ruunera" description="Ust-Nera Oymyakonsky, Russia" alias="Asia/Ust-Nera" since="23"/>
+            <type name="ruuus" description="Sakhalin, Russia" alias="Asia/Sakhalin"/>
+            <type name="ruvog" description="Volgograd, Russia" alias="Europe/Volgograd"/>
+            <type name="ruvvo" description="Vladivostok, Russia" alias="Asia/Vladivostok"/>
+            <type name="ruyek" description="Yekaterinburg, Russia" alias="Asia/Yekaterinburg"/>
+            <type name="ruyks" description="Yakutsk, Russia" alias="Asia/Yakutsk"/>
+            <type name="rwkgl" description="Kigali, Rwanda" alias="Africa/Kigali"/>
+            <type name="saruh" description="Riyadh, Saudi Arabia" alias="Asia/Riyadh"/>
+            <type name="sbhir" description="Guadalcanal, Solomon Islands" alias="Pacific/Guadalcanal"/>
+            <type name="scmaw" description="Mahé, Seychelles" alias="Indian/Mahe"/>
+            <type name="sdkrt" description="Khartoum, Sudan" alias="Africa/Khartoum"/>
+            <type name="sesto" description="Stockholm, Sweden" alias="Europe/Stockholm"/>
+            <type name="sgsin" description="Singapore" alias="Asia/Singapore Singapore"/>
+            <type name="shshn" description="Saint Helena" alias="Atlantic/St_Helena"/>
+            <type name="silju" description="Ljubljana, Slovenia" alias="Europe/Ljubljana"/>
+            <type name="sjlyr" description="Longyearbyen, Svalbard" alias="Arctic/Longyearbyen Atlantic/Jan_Mayen"/>
+            <type name="skbts" description="Bratislava, Slovakia" alias="Europe/Bratislava"/>
+            <type name="slfna" description="Freetown, Sierra Leone" alias="Africa/Freetown"/>
+            <type name="smsai" description="San Marino" alias="Europe/San_Marino"/>
+            <type name="sndkr" description="Dakar, Senegal" alias="Africa/Dakar"/>
+            <type name="somgq" description="Mogadishu, Somalia" alias="Africa/Mogadishu"/>
+            <type name="srpbm" description="Paramaribo, Suriname" alias="America/Paramaribo"/>
+            <type name="ssjub" description="Juba, South Sudan" alias="Africa/Juba" since="21"/>
+            <type name="sttms" description="São Tomé, São Tomé and Príncipe" alias="Africa/Sao_Tome"/>
+            <type name="svsal" description="El Salvador" alias="America/El_Salvador"/>
+            <type name="sxphi" description="Sint Maarten" alias="America/Lower_Princes" since="21"/>
+            <type name="sydam" description="Damascus, Syria" alias="Asia/Damascus"/>
+            <type name="szqmn" description="Mbabane, Swaziland" alias="Africa/Mbabane"/>
+            <type name="tcgdt" description="Grand Turk, Turks and Caicos Islands" alias="America/Grand_Turk"/>
+            <type name="tdndj" description="N'Djamena, Chad" alias="Africa/Ndjamena"/>
+            <type name="tfpfr" description="Kerguelen Islands, French Southern Territories" alias="Indian/Kerguelen"/>
+            <type name="tglfw" description="Lomé, Togo" alias="Africa/Lome"/>
+            <type name="thbkk" description="Bangkok, Thailand" alias="Asia/Bangkok"/>
+            <type name="tjdyu" description="Dushanbe, Tajikistan" alias="Asia/Dushanbe"/>
+            <type name="tkfko" description="Fakaofo, Tokelau" alias="Pacific/Fakaofo"/>
+            <type name="tldil" description="Dili, East Timor" alias="Asia/Dili"/>
+            <type name="tmasb" description="Ashgabat, Turkmenistan" alias="Asia/Ashgabat Asia/Ashkhabad"/>
+            <type name="tntun" description="Tunis, Tunisia" alias="Africa/Tunis"/>
+            <type name="totbu" description="Tongatapu, Tonga" alias="Pacific/Tongatapu"/>
+            <type name="trist" description="Istanbul, Turkey" alias="Europe/Istanbul Asia/Istanbul Turkey"/>
+            <type name="ttpos" description="Port of Spain, Trinidad and Tobago" alias="America/Port_of_Spain"/>
+            <type name="tvfun" description="Funafuti, Tuvalu" alias="Pacific/Funafuti"/>
+            <type name="twtpe" description="Taipei, Taiwan" alias="Asia/Taipei ROC"/>
+            <type name="tzdar" description="Dar es Salaam, Tanzania" alias="Africa/Dar_es_Salaam"/>
+            <type name="uaiev" description="Kiev, Ukraine" alias="Europe/Kiev"/>
+            <type name="uaozh" description="Zaporizhia (Zaporozhye), Ukraine" alias="Europe/Zaporozhye"/>
+            <type name="uasip" description="Simferopol, Ukraine" alias="Europe/Simferopol"/>
+            <type name="uauzh" description="Uzhhorod (Uzhgorod), Ukraine" alias="Europe/Uzhgorod"/>
+            <type name="ugkla" description="Kampala, Uganda" alias="Africa/Kampala"/>
+            <type name="umawk" description="Wake Island, U.S. Minor Outlying Islands" alias="Pacific/Wake"/>
+            <type name="umjon" description="Johnston Atoll, U.S. Minor Outlying Islands" alias="Pacific/Johnston"/>
+            <type name="ummdy" description="Midway Islands, U.S. Minor Outlying Islands" alias="Pacific/Midway"/>
+            <type name="unk" description="Unknown time zone" alias="Etc/Unknown"/>
+            <type name="usadk" description="Adak (Alaska), United States" alias="America/Adak America/Atka US/Aleutian"/>
+            <type name="usaeg" description="Marengo (Indiana), United States" alias="America/Indiana/Marengo"/>
+            <type name="usanc" description="Anchorage, United States" alias="America/Anchorage US/Alaska"/>
+            <type name="usboi" description="Boise (Idaho), United States" alias="America/Boise"/>
+            <type name="uschi" description="Chicago, United States" alias="America/Chicago US/Central"/>
+            <type name="usden" description="Denver, United States" alias="America/Denver America/Shiprock Navajo US/Mountain"/>
+            <type name="usdet" description="Detroit, United States" alias="America/Detroit US/Michigan"/>
+            <type name="ushnl" description="Honolulu, United States" alias="Pacific/Honolulu US/Hawaii"/>
+            <type name="usind" description="Indianapolis, United States" alias="America/Indianapolis America/Fort_Wayne America/Indiana/Indianapolis US/East-Indiana"/>
+            <type name="usinvev" description="Vevay (Indiana), United States" alias="America/Indiana/Vevay"/>
+            <type name="usjnu" description="Juneau (Alaska), United States" alias="America/Juneau"/>
+            <type name="usknx" description="Knox (Indiana), United States" alias="America/Indiana/Knox America/Knox_IN US/Indiana-Starke"/>
+            <type name="uslax" description="Los Angeles, United States" alias="America/Los_Angeles US/Pacific US/Pacific-New"/>
+            <type name="uslui" description="Louisville (Kentucky), United States" alias="America/Louisville America/Kentucky/Louisville"/>
+            <type name="usmnm" description="Menominee (Michigan), United States" alias="America/Menominee"/>
+            <type name="usmtm" description="Metlakatla (Alaska), United States" alias="America/Metlakatla" since="1.9.1"/>
+            <type name="usmoc" description="Monticello (Kentucky), United States" alias="America/Kentucky/Monticello"/>
+            <type name="usnavajo" description="Shiprock (Navajo), United States" deprecated="true" preferred="usden"/>
+            <type name="usndcnt" description="Center (North Dakota), United States" alias="America/North_Dakota/Center"/>
+            <type name="usndnsl" description="New Salem (North Dakota), United States" alias="America/North_Dakota/New_Salem"/>
+            <type name="usnyc" description="New York, United States" alias="America/New_York US/Eastern"/>
+            <type name="usoea" description="Vincennes (Indiana), United States" alias="America/Indiana/Vincennes"/>
+            <type name="usome" description="Nome (Alaska), United States" alias="America/Nome"/>
+            <type name="usphx" description="Phoenix, United States" alias="America/Phoenix US/Arizona"/>
+            <type name="ussit" description="Sitka (Alaska), United States" alias="America/Sitka" since="1.9.1"/>
+            <type name="ustel" description="Tell City (Indiana), United States" alias="America/Indiana/Tell_City"/>
+            <type name="uswlz" description="Winamac (Indiana), United States" alias="America/Indiana/Winamac"/>
+            <type name="uswsq" description="Petersburg (Indiana), United States" alias="America/Indiana/Petersburg"/>
+            <type name="usxul" description="Beulah (North Dakota), United States" alias="America/North_Dakota/Beulah" since="1.9.1"/>
+            <type name="usyak" description="Yakutat (Alaska), United States" alias="America/Yakutat"/>
+            <type name="utc" description="UTC (Coordinated Universal Time)" alias="Etc/UTC Etc/UCT Etc/Universal Etc/Zulu UCT UTC Universal Zulu"/>
+            <type name="utce01" description="1 hour ahead of UTC" alias="Etc/GMT-1"/>
+            <type name="utce02" description="2 hours ahead of UTC" alias="Etc/GMT-2"/>
+            <type name="utce03" description="3 hours ahead of UTC" alias="Etc/GMT-3"/>
+            <type name="utce04" description="4 hours ahead of UTC" alias="Etc/GMT-4"/>
+            <type name="utce05" description="5 hours ahead of UTC" alias="Etc/GMT-5"/>
+            <type name="utce06" description="6 hours ahead of UTC" alias="Etc/GMT-6"/>
+            <type name="utce07" description="7 hours ahead of UTC" alias="Etc/GMT-7"/>
+            <type name="utce08" description="8 hours ahead of UTC" alias="Etc/GMT-8"/>
+            <type name="utce09" description="9 hours ahead of UTC" alias="Etc/GMT-9"/>
+            <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="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"/>
+            <type name="utcw03" description="3 hours behind UTC" alias="Etc/GMT+3"/>
+            <type name="utcw04" description="4 hours behind UTC" alias="Etc/GMT+4"/>
+            <type name="utcw05" description="5 hours behind UTC" alias="Etc/GMT+5 EST"/>
+            <type name="utcw06" description="6 hours behind UTC" alias="Etc/GMT+6"/>
+            <type name="utcw07" description="7 hours behind UTC" alias="Etc/GMT+7 MST"/>
+            <type name="utcw08" description="8 hours behind UTC" alias="Etc/GMT+8"/>
+            <type name="utcw09" description="9 hours behind UTC" alias="Etc/GMT+9"/>
+            <type name="utcw10" description="10 hours behind UTC" alias="Etc/GMT+10 HST"/>
+            <type name="utcw11" description="11 hours behind UTC" alias="Etc/GMT+11"/>
+            <type name="utcw12" description="12 hours behind UTC" alias="Etc/GMT+12"/>
+            <type name="uymvd" description="Montevideo, Uruguay" alias="America/Montevideo"/>
+            <type name="uzskd" description="Samarkand, Uzbekistan" alias="Asia/Samarkand"/>
+            <type name="uztas" description="Tashkent, Uzbekistan" alias="Asia/Tashkent"/>
+            <type name="vavat" description="Vatican City" alias="Europe/Vatican"/>
+            <type name="vcsvd" description="Saint Vincent, Saint Vincent and the Grenadines" alias="America/St_Vincent"/>
+            <type name="veccs" description="Caracas, Venezuela" alias="America/Caracas"/>
+            <type name="vgtov" description="Tortola, British Virgin Islands" alias="America/Tortola"/>
+            <type name="vistt" description="Saint Thomas, U.S. Virgin Islands" alias="America/St_Thomas America/Virgin"/>
+            <type name="vnsgn" description="Ho Chi Minh City, Vietnam" alias="Asia/Saigon Asia/Ho_Chi_Minh"/>
+            <type name="vuvli" description="Efate, Vanuatu" alias="Pacific/Efate"/>
+            <type name="wfmau" description="Wallis Islands, Wallis and Futuna" alias="Pacific/Wallis"/>
+            <type name="wsapw" description="Apia, Samoa" alias="Pacific/Apia"/>
+            <type name="yeade" description="Aden, Yemen" alias="Asia/Aden"/>
+            <type name="ytmam" description="Mayotte" alias="Indian/Mayotte"/>
+            <type name="zajnb" description="Johannesburg, South Africa" alias="Africa/Johannesburg"/>
+            <type name="zmlun" description="Lusaka, Zambia" alias="Africa/Lusaka"/>
+            <type name="zwhre" description="Harare, Zimbabwe" alias="Africa/Harare"/>
+        </key>
+    </keyword>
+</ldmlBCP47>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cldr/common/dtd/ldml.dtd	Thu Feb 07 22:11:35 2019 +0100
@@ -0,0 +1,2876 @@
+<!--
+Copyright © 2003-2017 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 $
+-->
+
+<!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* ) ) ) >
+<!ATTLIST ldml version CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST ldml draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!-- ######################################################### -->
+
+<!ELEMENT identity ( alias | ( version, generation?, language, script?, territory?, variant?, special* ) ) >
+<!ATTLIST identity draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!-- ######################################################### -->
+<!-- # These elements are common to almost all elements defined -->
+
+<!ELEMENT alias ( special* ) >
+<!ATTLIST alias source NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+<!ATTLIST alias path CDATA #IMPLIED >
+    <!--@VALUE-->
+<!ATTLIST alias alt NMTOKENS #IMPLIED >
+<!ATTLIST alias draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT special ANY >
+
+<!ELEMENT version EMPTY >
+<!ATTLIST version number CDATA #REQUIRED >
+    <!--@METADATA-->
+<!ATTLIST version cldrVersion CDATA #FIXED "33" >
+    <!--@VALUE-->
+<!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT generation EMPTY >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST generation date CDATA #REQUIRED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST generation draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT language ( #PCDATA ) >
+<!ATTLIST language type NMTOKEN #REQUIRED >
+<!ATTLIST language alt NMTOKENS #IMPLIED >
+<!ATTLIST language draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST language references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT script ( #PCDATA ) >
+<!ATTLIST script type NMTOKEN #REQUIRED >
+<!ATTLIST script alt NMTOKENS #IMPLIED >
+<!ATTLIST script draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST script references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT territory ( #PCDATA ) >
+<!ATTLIST territory type NMTOKEN #REQUIRED >
+<!ATTLIST territory alt NMTOKENS #IMPLIED >
+<!ATTLIST territory draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST territory references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT variant ( #PCDATA ) >
+<!ATTLIST variant type NMTOKEN #REQUIRED >
+<!ATTLIST variant alt NMTOKENS #IMPLIED >
+<!ATTLIST variant draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST variant references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!-- ######################################################### -->
+
+<!ELEMENT fallback ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST fallback alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST fallback draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST fallback references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT localeDisplayNames ( alias | ( localeDisplayPattern?, languages?, scripts?, territories?, subdivisions?, variants?, keys?, types?, transformNames?, measurementSystemNames?, codePatterns?, special* ) ) >
+<!ATTLIST localeDisplayNames draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT localeDisplayPattern ( alias | ( localePattern*, localeSeparator*, localeKeyTypePattern*, special* ) ) >
+<!ATTLIST localeDisplayPattern alt NMTOKENS #IMPLIED >
+<!ATTLIST localeDisplayPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST localeDisplayPattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT localePattern ( #PCDATA ) >
+<!ATTLIST localePattern alt NMTOKENS #IMPLIED >
+<!ATTLIST localePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST localePattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT localeSeparator ( #PCDATA ) >
+<!ATTLIST localeSeparator alt NMTOKENS #IMPLIED >
+<!ATTLIST localeSeparator draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST localeSeparator references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT localeKeyTypePattern ( #PCDATA ) >
+<!ATTLIST localeKeyTypePattern alt NMTOKENS #IMPLIED >
+<!ATTLIST localeKeyTypePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST localeKeyTypePattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!-- # Either 1 alias OR any specials, any order, zero or more language -->
+
+<!ELEMENT languages ( alias | ( language | special )* ) >
+<!ATTLIST languages draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST languages standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST languages references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST languages validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!-- # Either 1 alias OR any specials, any order, zero or more script -->
+
+<!ELEMENT scripts ( alias | ( script | special )* ) >
+<!ATTLIST scripts draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST scripts standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST scripts references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST scripts validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!-- # Either 1 alias OR any specials, any order, zero or more territory -->
+
+<!ELEMENT territories ( alias | ( territory | special )* ) >
+<!ATTLIST territories draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST territories standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST territories references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST territories validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT subdivisions ( alias | ( subdivision | special )* ) >
+<!ATTLIST subdivisions draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST subdivisions references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT subdivision ( #PCDATA ) >
+<!ATTLIST subdivision type NMTOKEN #REQUIRED >
+<!ATTLIST subdivision alt NMTOKENS #IMPLIED >
+<!ATTLIST subdivision draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!-- # Either 1 alias OR any specials, any order, zero or more variant -->
+
+<!ELEMENT variants ( alias | ( variant | special )* ) >
+<!ATTLIST variants draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST variants standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST variants references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST variants validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!-- # Either 1 alias OR any specials, any order, zero or more key -->
+
+<!ELEMENT keys ( alias | ( key | special )* ) >
+<!ATTLIST keys draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST keys standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST keys references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST keys validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT key ( #PCDATA ) >
+<!ATTLIST key type NMTOKEN #REQUIRED >
+<!ATTLIST key alt NMTOKENS #IMPLIED >
+<!ATTLIST key draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST key references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!-- # Either 1 alias OR any specials, any order, zero or more type -->
+
+<!ELEMENT types ( alias | ( type | special )* ) >
+<!ATTLIST types draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST types standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST types references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST types validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT type ( #PCDATA ) >
+<!ATTLIST type key NMTOKEN #REQUIRED >
+<!ATTLIST type type NMTOKEN #REQUIRED >
+<!ATTLIST type alt NMTOKENS #IMPLIED >
+<!ATTLIST type draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST type references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT transformNames ( alias | ( transformName | special )* ) >
+    <!--@DEPRECATED-->
+<!ATTLIST transformNames draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST transformNames references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT transformName ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST transformName type NMTOKEN #REQUIRED >
+    <!--@DEPRECATED-->
+<!ATTLIST transformName alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST transformName draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST transformName references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!-- # Either 1 alias OR any specials, any order, zero or more measurementSystemName -->
+
+<!ELEMENT measurementSystemNames ( alias | ( measurementSystemName | special )* ) >
+<!ATTLIST measurementSystemNames draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST measurementSystemNames references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST measurementSystemNames validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT measurementSystemName ( #PCDATA ) >
+<!ATTLIST measurementSystemName type (US | metric | UK) #REQUIRED >
+<!ATTLIST measurementSystemName alt NMTOKENS #IMPLIED >
+<!ATTLIST measurementSystemName draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST measurementSystemName references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT codePatterns ( alias | ( codePattern | special )* ) >
+
+<!ELEMENT codePattern ( #PCDATA ) >
+<!ATTLIST codePattern type NMTOKEN #REQUIRED >
+<!ATTLIST codePattern alt NMTOKENS #IMPLIED >
+<!ATTLIST codePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST codePattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!-- ######################################################### -->
+<!-- # layout and orientation are script specific, so validSublocales attribute is not required -->
+
+<!ELEMENT layout ( alias | ( orientation*, inList*, inText*, special* ) ) >
+<!ATTLIST layout draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST layout references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT orientation ( alias | ( characterOrder*, lineOrder*, special* ) ) >
+<!ATTLIST orientation characters (left-to-right | right-to-left | top-to-bottom | bottom-to-top) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST orientation lines (left-to-right | right-to-left | top-to-bottom | bottom-to-top) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST orientation alt NMTOKENS #IMPLIED >
+<!ATTLIST orientation draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST orientation standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST orientation references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT characterOrder ( #PCDATA ) >
+<!ATTLIST characterOrder alt NMTOKENS #IMPLIED >
+<!ATTLIST characterOrder draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT lineOrder ( #PCDATA ) >
+<!ATTLIST lineOrder alt NMTOKENS #IMPLIED >
+<!ATTLIST lineOrder draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT inList ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST inList casing (titlecase-words | titlecase-firstword | lowercase-words | mixed) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST inList alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST inList draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST inList references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT inText ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST inText type (languages | scripts | territories | variants | keys | types | measurementSystemNames | monthWidth | dayWidth | quarterWidth | long | fields | currency) #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST inText alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST inText draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST inText references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!-- ######################################################### -->
+
+<!ELEMENT contextTransforms ( alias | ( contextTransformUsage*, special* ) ) >
+<!ATTLIST contextTransforms alt NMTOKENS #IMPLIED >
+<!ATTLIST contextTransforms draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST contextTransforms references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST contextTransforms validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT contextTransformUsage ( alias | ( contextTransform*, special* ) ) >
+<!ATTLIST contextTransformUsage type CDATA #REQUIRED >
+<!ATTLIST contextTransformUsage alt NMTOKENS #IMPLIED >
+<!ATTLIST contextTransformUsage draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST contextTransformUsage references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST contextTransformUsage validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT contextTransform ( #PCDATA ) >
+<!ATTLIST contextTransform type (uiListOrMenu | stand-alone) #REQUIRED >
+<!ATTLIST contextTransform alt NMTOKENS #IMPLIED >
+<!ATTLIST contextTransform draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST contextTransform references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!-- ######################################################### -->
+
+<!ELEMENT characters ( alias | ( exemplarCharacters*, ellipsis*, moreInformation*, stopwords*, indexLabels*, mapping*, parseLenients*, special* ) ) >
+<!ATTLIST characters draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT exemplarCharacters ( #PCDATA | cp )* >
+<!ATTLIST exemplarCharacters type (auxiliary | standard | punctuation | currencySymbol | index | numbers) #IMPLIED >
+    <!--@DEPRECATED:currencySymbol-->
+<!ATTLIST exemplarCharacters alt NMTOKENS #IMPLIED >
+<!ATTLIST exemplarCharacters draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST exemplarCharacters standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST exemplarCharacters references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST exemplarCharacters validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!-- # This element can occur anywhere there may be localizable data -->
+
+<!ELEMENT cp ( special* ) >
+    <!--@DEPRECATED-->
+<!ATTLIST cp hex NMTOKEN #REQUIRED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT ellipsis ( #PCDATA ) >
+<!ATTLIST ellipsis type (initial | medial | final | word-initial | word-medial | word-final) #IMPLIED >
+<!ATTLIST ellipsis alt NMTOKENS #IMPLIED >
+<!ATTLIST ellipsis draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST ellipsis references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT moreInformation ( #PCDATA ) >
+<!ATTLIST moreInformation alt NMTOKENS #IMPLIED >
+<!ATTLIST moreInformation draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST moreInformation references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT stopwords ( stopwordList* ) >
+    <!--@DEPRECATED-->
+
+<!ELEMENT stopwordList ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST stopwordList type NMTOKEN #REQUIRED >
+    <!--@DEPRECATED-->
+<!ATTLIST stopwordList alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST stopwordList draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST stopwordList references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT indexLabels ( indexSeparator*, compressedIndexSeparator*, indexRangePattern*, indexLabelBefore*, indexLabelAfter*, indexLabel* ) >
+    <!--@DEPRECATED-->
+
+<!ELEMENT indexSeparator ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST indexSeparator alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST indexSeparator draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST indexSeparator references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT compressedIndexSeparator ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST compressedIndexSeparator alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST compressedIndexSeparator draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST compressedIndexSeparator references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT indexRangePattern ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST indexRangePattern alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST indexRangePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST indexRangePattern references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT indexLabelBefore ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabelBefore alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabelBefore draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabelBefore references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT indexLabelAfter ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabelAfter alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabelAfter draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabelAfter references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT indexLabel ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabel indexSource CDATA #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabel priority (1 | 2 | 3) #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabel alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabel draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST indexLabel references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT mapping ( special* ) >
+    <!--@DEPRECATED-->
+<!ATTLIST mapping registry NMTOKEN #REQUIRED >
+    <!--@DEPRECATED-->
+<!ATTLIST mapping type NMTOKEN #IMPLIED >
+    <!-- use choice instead -->
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST mapping choice NMTOKEN #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST mapping alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST mapping draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST mapping standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST mapping references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST mapping validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT parseLenients ( alias | ( parseLenient*, special* ) ) >
+<!ATTLIST parseLenients scope (general | number | date) #REQUIRED >
+<!ATTLIST parseLenients level (lenient | stricter) #REQUIRED >
+
+<!ELEMENT parseLenient ( #PCDATA ) >
+<!ATTLIST parseLenient sample CDATA #REQUIRED >
+<!ATTLIST parseLenient alt NMTOKENS #IMPLIED >
+<!ATTLIST parseLenient draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!-- ######################################################### -->
+
+<!ELEMENT delimiters ( alias | ( quotationStart*, quotationEnd*, alternateQuotationStart*, alternateQuotationEnd*, special* ) ) >
+<!ATTLIST delimiters alt NMTOKENS #IMPLIED >
+<!ATTLIST delimiters draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST delimiters standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST delimiters references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST delimiters validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT quotationStart ( #PCDATA | cp )* >
+<!ATTLIST quotationStart alt NMTOKENS #IMPLIED >
+<!ATTLIST quotationStart draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST quotationStart references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT quotationEnd ( #PCDATA | cp )* >
+<!ATTLIST quotationEnd alt NMTOKENS #IMPLIED >
+<!ATTLIST quotationEnd draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST quotationEnd references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT alternateQuotationStart ( #PCDATA | cp )* >
+<!ATTLIST alternateQuotationStart alt NMTOKENS #IMPLIED >
+<!ATTLIST alternateQuotationStart draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST alternateQuotationStart references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT alternateQuotationEnd ( #PCDATA | cp )* >
+<!ATTLIST alternateQuotationEnd alt NMTOKENS #IMPLIED >
+<!ATTLIST alternateQuotationEnd draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST alternateQuotationEnd references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!-- ######################################################### -->
+
+<!ELEMENT measurement ( alias | ( measurementSystem*, paperSize*, special* ) ) >
+    <!-- use measurementData in supplemental instead -->
+    <!--@DEPRECATED-->
+<!ATTLIST measurement alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST measurement draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST measurement standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST measurement references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST measurement validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT measurementSystem ( special* ) >
+    <!-- use measurementSystem in supplemental instead -->
+    <!--@DEPRECATED-->
+<!ATTLIST measurementSystem type (metric | US | UK) #REQUIRED >
+    <!-- use choice instead -->
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST measurementSystem choice (metric | US | UK) #IMPLIED >
+    <!-- really required, but needs to be optional to support type also -->
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+<!ATTLIST measurementSystem alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST measurementSystem draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST measurementSystem standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST measurementSystem references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST measurementSystem validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT paperSize ( alias | ( height*, width*, special* ) ) >
+    <!-- use paperSize in supplemental instead -->
+    <!--@DEPRECATED-->
+<!ATTLIST paperSize alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST paperSize draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST paperSize standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST paperSize references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST paperSize validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT height ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST height alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST height draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST height references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT width ( #PCDATA ) >
+    <!--@DEPRECATED-->
+<!ATTLIST width alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST width draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST width references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+
+<!-- ######################################################### -->
+
+<!ELEMENT dates ( alias | ( localizedPatternChars*, dateRangePattern*, calendars?, fields?, timeZoneNames?, special* ) ) >
+<!ATTLIST dates alt NMTOKENS #IMPLIED >
+<!ATTLIST dates draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dates standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dates references CDATA #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST dates validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT localizedPatternChars ( #PCDATA | cp )* >
+    <!--@DEPRECATED-->
+<!ATTLIST localizedPatternChars alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST localizedPatternChars draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST localizedPatternChars standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST localizedPatternChars references CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST localizedPatternChars validSubLocales CDATA #IMPLIED >
+    <!--@VALUE-->
+    <!--@DEPRECATED-->
+
+<!ELEMENT dateRangePattern ( #PCDATA ) >
+    <!-- use intervalFormats. -->
+    <!--@DEPRECATED-->
+<!ATTLIST dateRangePattern alt NMTOKENS #IMPLIED >
+    <!--@DEPRECATED-->
+<!ATTLIST dateRangePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->
+<!ATTLIST dateRangePattern standard CDATA #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED-->