From bdc277d63093b94c18c0b571ec450ca8ebfb76f3 Mon Sep 17 00:00:00 2001 From: Naoto Sato Date: Wed, 13 May 2026 16:09:38 +0000 Subject: [PATCH] 8371842: Update CLDR to Version 48.2 Reviewed-by: jlu, iris --- make/data/cldr/common/dtd/ldml.dtd | 14 +++++++-- make/data/cldr/common/main/aa.xml | 2 +- make/data/cldr/common/main/aa_DJ.xml | 2 +- make/data/cldr/common/main/aa_ER.xml | 2 +- make/data/cldr/common/main/aa_ET.xml | 2 +- make/data/cldr/common/main/ab.xml | 2 +- make/data/cldr/common/main/ab_GE.xml | 2 +- make/data/cldr/common/main/af.xml | 2 +- make/data/cldr/common/main/af_NA.xml | 2 +- make/data/cldr/common/main/af_ZA.xml | 2 +- make/data/cldr/common/main/agq.xml | 2 +- make/data/cldr/common/main/agq_CM.xml | 2 +- make/data/cldr/common/main/ak.xml | 4 +-- make/data/cldr/common/main/ak_GH.xml | 2 +- make/data/cldr/common/main/am.xml | 4 ++- make/data/cldr/common/main/am_ET.xml | 2 +- make/data/cldr/common/main/an.xml | 2 +- make/data/cldr/common/main/an_ES.xml | 2 +- make/data/cldr/common/main/ann.xml | 2 +- make/data/cldr/common/main/ann_NG.xml | 2 +- make/data/cldr/common/main/apc.xml | 2 +- make/data/cldr/common/main/apc_SY.xml | 2 +- make/data/cldr/common/main/ar.xml | 2 +- make/data/cldr/common/main/ar_001.xml | 2 +- make/data/cldr/common/main/ar_AE.xml | 2 +- make/data/cldr/common/main/ar_BH.xml | 2 +- make/data/cldr/common/main/ar_DJ.xml | 2 +- make/data/cldr/common/main/ar_DZ.xml | 2 +- make/data/cldr/common/main/ar_EG.xml | 2 +- make/data/cldr/common/main/ar_EH.xml | 2 +- make/data/cldr/common/main/ar_ER.xml | 2 +- make/data/cldr/common/main/ar_IL.xml | 2 +- make/data/cldr/common/main/ar_IQ.xml | 2 +- make/data/cldr/common/main/ar_JO.xml | 2 +- make/data/cldr/common/main/ar_KM.xml | 2 +- make/data/cldr/common/main/ar_KW.xml | 2 +- make/data/cldr/common/main/ar_LB.xml | 2 +- make/data/cldr/common/main/ar_LY.xml | 2 +- make/data/cldr/common/main/ar_MA.xml | 2 +- make/data/cldr/common/main/ar_MR.xml | 2 +- make/data/cldr/common/main/ar_OM.xml | 2 +- make/data/cldr/common/main/ar_PS.xml | 2 +- make/data/cldr/common/main/ar_QA.xml | 2 +- make/data/cldr/common/main/ar_SA.xml | 2 +- make/data/cldr/common/main/ar_SD.xml | 2 +- make/data/cldr/common/main/ar_SO.xml | 2 +- make/data/cldr/common/main/ar_SS.xml | 2 +- make/data/cldr/common/main/ar_SY.xml | 2 +- make/data/cldr/common/main/ar_TD.xml | 2 +- make/data/cldr/common/main/ar_TN.xml | 2 +- make/data/cldr/common/main/ar_YE.xml | 2 +- make/data/cldr/common/main/arn.xml | 2 +- make/data/cldr/common/main/arn_CL.xml | 2 +- make/data/cldr/common/main/as.xml | 10 +++---- make/data/cldr/common/main/as_IN.xml | 2 +- make/data/cldr/common/main/asa.xml | 2 +- make/data/cldr/common/main/asa_TZ.xml | 2 +- make/data/cldr/common/main/ast.xml | 2 +- make/data/cldr/common/main/ast_ES.xml | 2 +- make/data/cldr/common/main/az.xml | 2 +- make/data/cldr/common/main/az_Arab.xml | 2 +- make/data/cldr/common/main/az_Arab_IQ.xml | 2 +- make/data/cldr/common/main/az_Arab_IR.xml | 2 +- make/data/cldr/common/main/az_Arab_TR.xml | 2 +- make/data/cldr/common/main/az_Cyrl.xml | 2 +- make/data/cldr/common/main/az_Cyrl_AZ.xml | 2 +- make/data/cldr/common/main/az_Latn.xml | 2 +- make/data/cldr/common/main/az_Latn_AZ.xml | 2 +- make/data/cldr/common/main/ba.xml | 2 +- make/data/cldr/common/main/ba_RU.xml | 2 +- make/data/cldr/common/main/bal.xml | 2 +- make/data/cldr/common/main/bal_Arab.xml | 2 +- make/data/cldr/common/main/bal_Arab_PK.xml | 2 +- make/data/cldr/common/main/bal_Latn.xml | 2 +- make/data/cldr/common/main/bal_Latn_PK.xml | 2 +- make/data/cldr/common/main/bas.xml | 2 +- make/data/cldr/common/main/bas_CM.xml | 2 +- make/data/cldr/common/main/be.xml | 4 +-- make/data/cldr/common/main/be_BY.xml | 2 +- make/data/cldr/common/main/be_TARASK.xml | 2 +- make/data/cldr/common/main/bem.xml | 2 +- make/data/cldr/common/main/bem_ZM.xml | 2 +- make/data/cldr/common/main/bew.xml | 2 +- make/data/cldr/common/main/bew_ID.xml | 2 +- make/data/cldr/common/main/bez.xml | 2 +- make/data/cldr/common/main/bez_TZ.xml | 2 +- make/data/cldr/common/main/bg.xml | 2 +- make/data/cldr/common/main/bg_BG.xml | 2 +- make/data/cldr/common/main/bgc.xml | 2 +- make/data/cldr/common/main/bgc_IN.xml | 2 +- make/data/cldr/common/main/bgn.xml | 2 +- make/data/cldr/common/main/bgn_AE.xml | 2 +- make/data/cldr/common/main/bgn_AF.xml | 2 +- make/data/cldr/common/main/bgn_IR.xml | 2 +- make/data/cldr/common/main/bgn_OM.xml | 2 +- make/data/cldr/common/main/bgn_PK.xml | 2 +- make/data/cldr/common/main/bho.xml | 2 +- make/data/cldr/common/main/bho_IN.xml | 2 +- make/data/cldr/common/main/blo.xml | 2 +- make/data/cldr/common/main/blo_BJ.xml | 2 +- make/data/cldr/common/main/blt.xml | 2 +- make/data/cldr/common/main/blt_VN.xml | 2 +- make/data/cldr/common/main/bm.xml | 2 +- make/data/cldr/common/main/bm_ML.xml | 2 +- make/data/cldr/common/main/bm_Nkoo.xml | 2 +- make/data/cldr/common/main/bm_Nkoo_ML.xml | 2 +- make/data/cldr/common/main/bn.xml | 2 +- make/data/cldr/common/main/bn_BD.xml | 2 +- make/data/cldr/common/main/bn_IN.xml | 2 +- make/data/cldr/common/main/bo.xml | 2 +- make/data/cldr/common/main/bo_CN.xml | 2 +- make/data/cldr/common/main/bo_IN.xml | 2 +- make/data/cldr/common/main/bqi.xml | 2 +- make/data/cldr/common/main/bqi_IR.xml | 2 +- make/data/cldr/common/main/br.xml | 2 +- make/data/cldr/common/main/br_FR.xml | 2 +- make/data/cldr/common/main/brx.xml | 2 +- make/data/cldr/common/main/brx_IN.xml | 2 +- make/data/cldr/common/main/bs.xml | 2 +- make/data/cldr/common/main/bs_Cyrl.xml | 2 +- make/data/cldr/common/main/bs_Cyrl_BA.xml | 2 +- make/data/cldr/common/main/bs_Latn.xml | 2 +- make/data/cldr/common/main/bs_Latn_BA.xml | 2 +- make/data/cldr/common/main/bss.xml | 2 +- make/data/cldr/common/main/bss_CM.xml | 2 +- make/data/cldr/common/main/bua.xml | 2 +- make/data/cldr/common/main/bua_RU.xml | 2 +- make/data/cldr/common/main/byn.xml | 2 +- make/data/cldr/common/main/byn_ER.xml | 2 +- make/data/cldr/common/main/ca.xml | 6 ++-- make/data/cldr/common/main/ca_AD.xml | 2 +- make/data/cldr/common/main/ca_ES.xml | 2 +- make/data/cldr/common/main/ca_ES_VALENCIA.xml | 2 +- make/data/cldr/common/main/ca_FR.xml | 2 +- make/data/cldr/common/main/ca_IT.xml | 2 +- make/data/cldr/common/main/cad.xml | 2 +- make/data/cldr/common/main/cad_US.xml | 2 +- make/data/cldr/common/main/cch.xml | 2 +- make/data/cldr/common/main/cch_NG.xml | 2 +- make/data/cldr/common/main/ccp.xml | 4 +-- make/data/cldr/common/main/ccp_BD.xml | 2 +- make/data/cldr/common/main/ccp_IN.xml | 2 +- make/data/cldr/common/main/ce.xml | 2 +- make/data/cldr/common/main/ce_RU.xml | 2 +- make/data/cldr/common/main/ceb.xml | 2 +- make/data/cldr/common/main/ceb_PH.xml | 2 +- make/data/cldr/common/main/cgg.xml | 2 +- make/data/cldr/common/main/cgg_UG.xml | 2 +- make/data/cldr/common/main/cho.xml | 2 +- make/data/cldr/common/main/cho_US.xml | 2 +- make/data/cldr/common/main/chr.xml | 2 +- make/data/cldr/common/main/chr_US.xml | 2 +- make/data/cldr/common/main/cic.xml | 2 +- make/data/cldr/common/main/cic_US.xml | 2 +- make/data/cldr/common/main/ckb.xml | 2 +- make/data/cldr/common/main/ckb_IQ.xml | 2 +- make/data/cldr/common/main/ckb_IR.xml | 2 +- make/data/cldr/common/main/co.xml | 2 +- make/data/cldr/common/main/co_FR.xml | 2 +- make/data/cldr/common/main/cop.xml | 2 +- make/data/cldr/common/main/cop_EG.xml | 2 +- make/data/cldr/common/main/cs.xml | 6 ++-- make/data/cldr/common/main/cs_CZ.xml | 2 +- make/data/cldr/common/main/csw.xml | 2 +- make/data/cldr/common/main/csw_CA.xml | 2 +- make/data/cldr/common/main/cu.xml | 2 +- make/data/cldr/common/main/cu_RU.xml | 2 +- make/data/cldr/common/main/cv.xml | 2 +- make/data/cldr/common/main/cv_RU.xml | 2 +- make/data/cldr/common/main/cy.xml | 2 +- make/data/cldr/common/main/cy_GB.xml | 2 +- make/data/cldr/common/main/da.xml | 2 +- make/data/cldr/common/main/da_DK.xml | 2 +- make/data/cldr/common/main/da_GL.xml | 2 +- make/data/cldr/common/main/dav.xml | 2 +- make/data/cldr/common/main/dav_KE.xml | 2 +- make/data/cldr/common/main/de.xml | 4 +-- make/data/cldr/common/main/de_AT.xml | 2 +- make/data/cldr/common/main/de_BE.xml | 2 +- make/data/cldr/common/main/de_CH.xml | 2 +- make/data/cldr/common/main/de_DE.xml | 2 +- make/data/cldr/common/main/de_IT.xml | 2 +- make/data/cldr/common/main/de_LI.xml | 2 +- make/data/cldr/common/main/de_LU.xml | 2 +- make/data/cldr/common/main/dje.xml | 2 +- make/data/cldr/common/main/dje_NE.xml | 2 +- make/data/cldr/common/main/doi.xml | 2 +- make/data/cldr/common/main/doi_IN.xml | 2 +- make/data/cldr/common/main/dsb.xml | 2 +- make/data/cldr/common/main/dsb_DE.xml | 2 +- make/data/cldr/common/main/dua.xml | 2 +- make/data/cldr/common/main/dua_CM.xml | 2 +- make/data/cldr/common/main/dv.xml | 2 +- make/data/cldr/common/main/dv_MV.xml | 2 +- make/data/cldr/common/main/dyo.xml | 2 +- make/data/cldr/common/main/dyo_SN.xml | 2 +- make/data/cldr/common/main/dz.xml | 2 +- make/data/cldr/common/main/dz_BT.xml | 2 +- make/data/cldr/common/main/ebu.xml | 2 +- make/data/cldr/common/main/ebu_KE.xml | 2 +- make/data/cldr/common/main/ee.xml | 2 +- make/data/cldr/common/main/ee_GH.xml | 2 +- make/data/cldr/common/main/ee_TG.xml | 2 +- make/data/cldr/common/main/el.xml | 6 ++-- make/data/cldr/common/main/el_CY.xml | 2 +- make/data/cldr/common/main/el_GR.xml | 2 +- make/data/cldr/common/main/el_POLYTON.xml | 2 +- make/data/cldr/common/main/en.xml | 17 ++++++----- make/data/cldr/common/main/en_001.xml | 2 +- make/data/cldr/common/main/en_150.xml | 2 +- make/data/cldr/common/main/en_AE.xml | 2 +- make/data/cldr/common/main/en_AG.xml | 2 +- make/data/cldr/common/main/en_AI.xml | 2 +- make/data/cldr/common/main/en_AS.xml | 2 +- make/data/cldr/common/main/en_AT.xml | 2 +- make/data/cldr/common/main/en_AU.xml | 2 +- make/data/cldr/common/main/en_BB.xml | 2 +- make/data/cldr/common/main/en_BE.xml | 2 +- make/data/cldr/common/main/en_BI.xml | 2 +- make/data/cldr/common/main/en_BM.xml | 2 +- make/data/cldr/common/main/en_BS.xml | 2 +- make/data/cldr/common/main/en_BW.xml | 2 +- make/data/cldr/common/main/en_BZ.xml | 2 +- make/data/cldr/common/main/en_CA.xml | 2 +- make/data/cldr/common/main/en_CC.xml | 2 +- make/data/cldr/common/main/en_CH.xml | 2 +- make/data/cldr/common/main/en_CK.xml | 2 +- make/data/cldr/common/main/en_CM.xml | 2 +- make/data/cldr/common/main/en_CX.xml | 2 +- make/data/cldr/common/main/en_CY.xml | 2 +- make/data/cldr/common/main/en_CZ.xml | 2 +- make/data/cldr/common/main/en_DE.xml | 2 +- make/data/cldr/common/main/en_DG.xml | 2 +- make/data/cldr/common/main/en_DK.xml | 2 +- make/data/cldr/common/main/en_DM.xml | 2 +- make/data/cldr/common/main/en_Dsrt.xml | 2 +- make/data/cldr/common/main/en_Dsrt_US.xml | 2 +- make/data/cldr/common/main/en_EE.xml | 2 +- make/data/cldr/common/main/en_ER.xml | 2 +- make/data/cldr/common/main/en_ES.xml | 2 +- make/data/cldr/common/main/en_FI.xml | 2 +- make/data/cldr/common/main/en_FJ.xml | 2 +- make/data/cldr/common/main/en_FK.xml | 2 +- make/data/cldr/common/main/en_FM.xml | 2 +- make/data/cldr/common/main/en_FR.xml | 2 +- make/data/cldr/common/main/en_GB.xml | 2 +- make/data/cldr/common/main/en_GD.xml | 2 +- make/data/cldr/common/main/en_GE.xml | 2 +- make/data/cldr/common/main/en_GG.xml | 2 +- make/data/cldr/common/main/en_GH.xml | 2 +- make/data/cldr/common/main/en_GI.xml | 2 +- make/data/cldr/common/main/en_GM.xml | 2 +- make/data/cldr/common/main/en_GS.xml | 2 +- make/data/cldr/common/main/en_GU.xml | 2 +- make/data/cldr/common/main/en_GY.xml | 2 +- make/data/cldr/common/main/en_HK.xml | 2 +- make/data/cldr/common/main/en_HU.xml | 2 +- make/data/cldr/common/main/en_ID.xml | 2 +- make/data/cldr/common/main/en_IE.xml | 2 +- make/data/cldr/common/main/en_IL.xml | 2 +- make/data/cldr/common/main/en_IM.xml | 2 +- make/data/cldr/common/main/en_IN.xml | 2 +- make/data/cldr/common/main/en_IO.xml | 2 +- make/data/cldr/common/main/en_IT.xml | 2 +- make/data/cldr/common/main/en_JE.xml | 2 +- make/data/cldr/common/main/en_JM.xml | 2 +- make/data/cldr/common/main/en_JP.xml | 2 +- make/data/cldr/common/main/en_KE.xml | 2 +- make/data/cldr/common/main/en_KI.xml | 2 +- make/data/cldr/common/main/en_KN.xml | 2 +- make/data/cldr/common/main/en_KY.xml | 2 +- make/data/cldr/common/main/en_LC.xml | 2 +- make/data/cldr/common/main/en_LR.xml | 2 +- make/data/cldr/common/main/en_LS.xml | 2 +- make/data/cldr/common/main/en_LT.xml | 2 +- make/data/cldr/common/main/en_LV.xml | 2 +- make/data/cldr/common/main/en_MG.xml | 2 +- make/data/cldr/common/main/en_MH.xml | 2 +- make/data/cldr/common/main/en_MO.xml | 2 +- make/data/cldr/common/main/en_MP.xml | 2 +- make/data/cldr/common/main/en_MS.xml | 2 +- make/data/cldr/common/main/en_MT.xml | 2 +- make/data/cldr/common/main/en_MU.xml | 2 +- make/data/cldr/common/main/en_MV.xml | 2 +- make/data/cldr/common/main/en_MW.xml | 2 +- make/data/cldr/common/main/en_MY.xml | 2 +- make/data/cldr/common/main/en_NA.xml | 2 +- make/data/cldr/common/main/en_NF.xml | 2 +- make/data/cldr/common/main/en_NG.xml | 2 +- make/data/cldr/common/main/en_NL.xml | 2 +- make/data/cldr/common/main/en_NO.xml | 2 +- make/data/cldr/common/main/en_NR.xml | 2 +- make/data/cldr/common/main/en_NU.xml | 2 +- make/data/cldr/common/main/en_NZ.xml | 2 +- make/data/cldr/common/main/en_PG.xml | 2 +- make/data/cldr/common/main/en_PH.xml | 2 +- make/data/cldr/common/main/en_PK.xml | 2 +- make/data/cldr/common/main/en_PL.xml | 2 +- make/data/cldr/common/main/en_PN.xml | 2 +- make/data/cldr/common/main/en_PR.xml | 2 +- make/data/cldr/common/main/en_PT.xml | 2 +- make/data/cldr/common/main/en_PW.xml | 2 +- make/data/cldr/common/main/en_RO.xml | 2 +- make/data/cldr/common/main/en_RW.xml | 2 +- make/data/cldr/common/main/en_SB.xml | 2 +- make/data/cldr/common/main/en_SC.xml | 2 +- make/data/cldr/common/main/en_SD.xml | 2 +- make/data/cldr/common/main/en_SE.xml | 2 +- make/data/cldr/common/main/en_SG.xml | 2 +- make/data/cldr/common/main/en_SH.xml | 2 +- make/data/cldr/common/main/en_SI.xml | 2 +- make/data/cldr/common/main/en_SK.xml | 2 +- make/data/cldr/common/main/en_SL.xml | 2 +- make/data/cldr/common/main/en_SS.xml | 2 +- make/data/cldr/common/main/en_SX.xml | 2 +- make/data/cldr/common/main/en_SZ.xml | 2 +- make/data/cldr/common/main/en_Shaw.xml | 2 +- make/data/cldr/common/main/en_Shaw_GB.xml | 2 +- make/data/cldr/common/main/en_TC.xml | 2 +- make/data/cldr/common/main/en_TK.xml | 2 +- make/data/cldr/common/main/en_TO.xml | 2 +- make/data/cldr/common/main/en_TT.xml | 2 +- make/data/cldr/common/main/en_TV.xml | 2 +- make/data/cldr/common/main/en_TZ.xml | 2 +- make/data/cldr/common/main/en_UA.xml | 2 +- make/data/cldr/common/main/en_UG.xml | 2 +- make/data/cldr/common/main/en_UM.xml | 2 +- make/data/cldr/common/main/en_US.xml | 2 +- make/data/cldr/common/main/en_US_POSIX.xml | 2 +- make/data/cldr/common/main/en_VC.xml | 2 +- make/data/cldr/common/main/en_VG.xml | 2 +- make/data/cldr/common/main/en_VI.xml | 2 +- make/data/cldr/common/main/en_VU.xml | 2 +- make/data/cldr/common/main/en_WS.xml | 2 +- make/data/cldr/common/main/en_ZA.xml | 2 +- make/data/cldr/common/main/en_ZM.xml | 2 +- make/data/cldr/common/main/en_ZW.xml | 2 +- make/data/cldr/common/main/eo.xml | 2 +- make/data/cldr/common/main/eo_001.xml | 2 +- make/data/cldr/common/main/es.xml | 6 ++-- make/data/cldr/common/main/es_419.xml | 4 ++- make/data/cldr/common/main/es_AR.xml | 2 +- make/data/cldr/common/main/es_BO.xml | 2 +- make/data/cldr/common/main/es_BR.xml | 2 +- make/data/cldr/common/main/es_BZ.xml | 2 +- make/data/cldr/common/main/es_CL.xml | 2 +- make/data/cldr/common/main/es_CO.xml | 2 +- make/data/cldr/common/main/es_CR.xml | 2 +- make/data/cldr/common/main/es_CU.xml | 2 +- make/data/cldr/common/main/es_DO.xml | 2 +- make/data/cldr/common/main/es_EA.xml | 2 +- make/data/cldr/common/main/es_EC.xml | 2 +- make/data/cldr/common/main/es_ES.xml | 2 +- make/data/cldr/common/main/es_GQ.xml | 2 +- make/data/cldr/common/main/es_GT.xml | 2 +- make/data/cldr/common/main/es_HN.xml | 2 +- make/data/cldr/common/main/es_IC.xml | 2 +- make/data/cldr/common/main/es_MX.xml | 2 +- make/data/cldr/common/main/es_NI.xml | 2 +- make/data/cldr/common/main/es_PA.xml | 2 +- make/data/cldr/common/main/es_PE.xml | 2 +- make/data/cldr/common/main/es_PH.xml | 2 +- make/data/cldr/common/main/es_PR.xml | 2 +- make/data/cldr/common/main/es_PY.xml | 2 +- make/data/cldr/common/main/es_SV.xml | 2 +- make/data/cldr/common/main/es_US.xml | 2 +- make/data/cldr/common/main/es_UY.xml | 2 +- make/data/cldr/common/main/es_VE.xml | 2 +- make/data/cldr/common/main/et.xml | 2 +- make/data/cldr/common/main/et_EE.xml | 2 +- make/data/cldr/common/main/eu.xml | 4 ++- make/data/cldr/common/main/eu_ES.xml | 2 +- make/data/cldr/common/main/ewo.xml | 2 +- make/data/cldr/common/main/ewo_CM.xml | 2 +- make/data/cldr/common/main/fa.xml | 6 ++-- make/data/cldr/common/main/fa_AF.xml | 2 +- make/data/cldr/common/main/fa_IR.xml | 2 +- make/data/cldr/common/main/ff.xml | 2 +- make/data/cldr/common/main/ff_Adlm.xml | 2 +- make/data/cldr/common/main/ff_Adlm_BF.xml | 2 +- make/data/cldr/common/main/ff_Adlm_CM.xml | 2 +- make/data/cldr/common/main/ff_Adlm_GH.xml | 2 +- make/data/cldr/common/main/ff_Adlm_GM.xml | 2 +- make/data/cldr/common/main/ff_Adlm_GN.xml | 2 +- make/data/cldr/common/main/ff_Adlm_GW.xml | 2 +- make/data/cldr/common/main/ff_Adlm_LR.xml | 2 +- make/data/cldr/common/main/ff_Adlm_MR.xml | 2 +- make/data/cldr/common/main/ff_Adlm_NE.xml | 2 +- make/data/cldr/common/main/ff_Adlm_NG.xml | 2 +- make/data/cldr/common/main/ff_Adlm_SL.xml | 2 +- make/data/cldr/common/main/ff_Adlm_SN.xml | 2 +- make/data/cldr/common/main/ff_Latn.xml | 2 +- make/data/cldr/common/main/ff_Latn_BF.xml | 2 +- make/data/cldr/common/main/ff_Latn_CM.xml | 2 +- make/data/cldr/common/main/ff_Latn_GH.xml | 2 +- make/data/cldr/common/main/ff_Latn_GM.xml | 2 +- make/data/cldr/common/main/ff_Latn_GN.xml | 2 +- make/data/cldr/common/main/ff_Latn_GW.xml | 2 +- make/data/cldr/common/main/ff_Latn_LR.xml | 2 +- make/data/cldr/common/main/ff_Latn_MR.xml | 2 +- make/data/cldr/common/main/ff_Latn_NE.xml | 2 +- make/data/cldr/common/main/ff_Latn_NG.xml | 2 +- make/data/cldr/common/main/ff_Latn_SL.xml | 2 +- make/data/cldr/common/main/ff_Latn_SN.xml | 2 +- make/data/cldr/common/main/fi.xml | 6 ++-- make/data/cldr/common/main/fi_FI.xml | 2 +- make/data/cldr/common/main/fil.xml | 2 +- make/data/cldr/common/main/fil_PH.xml | 2 +- make/data/cldr/common/main/fo.xml | 2 +- make/data/cldr/common/main/fo_DK.xml | 2 +- make/data/cldr/common/main/fo_FO.xml | 2 +- make/data/cldr/common/main/fr.xml | 2 +- make/data/cldr/common/main/fr_BE.xml | 2 +- make/data/cldr/common/main/fr_BF.xml | 2 +- make/data/cldr/common/main/fr_BI.xml | 2 +- make/data/cldr/common/main/fr_BJ.xml | 2 +- make/data/cldr/common/main/fr_BL.xml | 2 +- make/data/cldr/common/main/fr_CA.xml | 3 +- make/data/cldr/common/main/fr_CD.xml | 2 +- make/data/cldr/common/main/fr_CF.xml | 2 +- make/data/cldr/common/main/fr_CG.xml | 2 +- make/data/cldr/common/main/fr_CH.xml | 3 +- make/data/cldr/common/main/fr_CI.xml | 2 +- make/data/cldr/common/main/fr_CM.xml | 2 +- make/data/cldr/common/main/fr_DJ.xml | 2 +- make/data/cldr/common/main/fr_DZ.xml | 2 +- make/data/cldr/common/main/fr_FR.xml | 2 +- make/data/cldr/common/main/fr_GA.xml | 2 +- make/data/cldr/common/main/fr_GF.xml | 2 +- make/data/cldr/common/main/fr_GN.xml | 2 +- make/data/cldr/common/main/fr_GP.xml | 2 +- make/data/cldr/common/main/fr_GQ.xml | 2 +- make/data/cldr/common/main/fr_HT.xml | 2 +- make/data/cldr/common/main/fr_KM.xml | 2 +- make/data/cldr/common/main/fr_LU.xml | 2 +- make/data/cldr/common/main/fr_MA.xml | 2 +- make/data/cldr/common/main/fr_MC.xml | 2 +- make/data/cldr/common/main/fr_MF.xml | 2 +- make/data/cldr/common/main/fr_MG.xml | 2 +- make/data/cldr/common/main/fr_ML.xml | 2 +- make/data/cldr/common/main/fr_MQ.xml | 2 +- make/data/cldr/common/main/fr_MR.xml | 2 +- make/data/cldr/common/main/fr_MU.xml | 2 +- make/data/cldr/common/main/fr_NC.xml | 2 +- make/data/cldr/common/main/fr_NE.xml | 2 +- make/data/cldr/common/main/fr_PF.xml | 2 +- make/data/cldr/common/main/fr_PM.xml | 2 +- make/data/cldr/common/main/fr_RE.xml | 2 +- make/data/cldr/common/main/fr_RW.xml | 2 +- make/data/cldr/common/main/fr_SC.xml | 2 +- make/data/cldr/common/main/fr_SN.xml | 2 +- make/data/cldr/common/main/fr_SY.xml | 2 +- make/data/cldr/common/main/fr_TD.xml | 2 +- make/data/cldr/common/main/fr_TG.xml | 2 +- make/data/cldr/common/main/fr_TN.xml | 2 +- make/data/cldr/common/main/fr_VU.xml | 2 +- make/data/cldr/common/main/fr_WF.xml | 2 +- make/data/cldr/common/main/fr_YT.xml | 2 +- make/data/cldr/common/main/frr.xml | 2 +- make/data/cldr/common/main/frr_DE.xml | 2 +- make/data/cldr/common/main/fur.xml | 2 +- make/data/cldr/common/main/fur_IT.xml | 2 +- make/data/cldr/common/main/fy.xml | 2 +- make/data/cldr/common/main/fy_NL.xml | 2 +- make/data/cldr/common/main/ga.xml | 2 +- make/data/cldr/common/main/ga_GB.xml | 2 +- make/data/cldr/common/main/ga_IE.xml | 2 +- make/data/cldr/common/main/gaa.xml | 2 +- make/data/cldr/common/main/gaa_GH.xml | 2 +- make/data/cldr/common/main/gd.xml | 6 ++-- make/data/cldr/common/main/gd_GB.xml | 2 +- make/data/cldr/common/main/gez.xml | 2 +- make/data/cldr/common/main/gez_ER.xml | 2 +- make/data/cldr/common/main/gez_ET.xml | 2 +- make/data/cldr/common/main/gl.xml | 6 ++-- make/data/cldr/common/main/gl_ES.xml | 2 +- make/data/cldr/common/main/gn.xml | 2 +- make/data/cldr/common/main/gn_PY.xml | 2 +- make/data/cldr/common/main/gsw.xml | 2 +- make/data/cldr/common/main/gsw_CH.xml | 2 +- make/data/cldr/common/main/gsw_FR.xml | 2 +- make/data/cldr/common/main/gsw_LI.xml | 2 +- make/data/cldr/common/main/gu.xml | 2 +- make/data/cldr/common/main/gu_IN.xml | 2 +- make/data/cldr/common/main/guz.xml | 2 +- make/data/cldr/common/main/guz_KE.xml | 2 +- make/data/cldr/common/main/gv.xml | 2 +- make/data/cldr/common/main/gv_IM.xml | 2 +- make/data/cldr/common/main/ha.xml | 2 +- make/data/cldr/common/main/ha_Arab.xml | 2 +- make/data/cldr/common/main/ha_Arab_NG.xml | 2 +- make/data/cldr/common/main/ha_Arab_SD.xml | 2 +- make/data/cldr/common/main/ha_GH.xml | 2 +- make/data/cldr/common/main/ha_NE.xml | 2 +- make/data/cldr/common/main/ha_NG.xml | 2 +- make/data/cldr/common/main/haw.xml | 2 +- make/data/cldr/common/main/haw_US.xml | 2 +- make/data/cldr/common/main/he.xml | 4 ++- make/data/cldr/common/main/he_IL.xml | 2 +- make/data/cldr/common/main/hi.xml | 2 +- make/data/cldr/common/main/hi_IN.xml | 2 +- make/data/cldr/common/main/hi_Latn.xml | 2 +- make/data/cldr/common/main/hi_Latn_IN.xml | 2 +- make/data/cldr/common/main/hnj.xml | 2 +- make/data/cldr/common/main/hnj_Hmnp.xml | 2 +- make/data/cldr/common/main/hnj_Hmnp_US.xml | 2 +- make/data/cldr/common/main/hr.xml | 6 ++-- make/data/cldr/common/main/hr_BA.xml | 2 +- make/data/cldr/common/main/hr_HR.xml | 2 +- make/data/cldr/common/main/hsb.xml | 2 +- make/data/cldr/common/main/hsb_DE.xml | 2 +- make/data/cldr/common/main/ht.xml | 2 +- make/data/cldr/common/main/ht_HT.xml | 2 +- make/data/cldr/common/main/hu.xml | 4 ++- make/data/cldr/common/main/hu_HU.xml | 2 +- make/data/cldr/common/main/hy.xml | 6 ++-- make/data/cldr/common/main/hy_AM.xml | 2 +- make/data/cldr/common/main/ia.xml | 2 +- make/data/cldr/common/main/ia_001.xml | 2 +- make/data/cldr/common/main/id.xml | 4 +-- make/data/cldr/common/main/id_ID.xml | 2 +- make/data/cldr/common/main/ie.xml | 2 +- make/data/cldr/common/main/ie_EE.xml | 2 +- make/data/cldr/common/main/ig.xml | 2 +- make/data/cldr/common/main/ig_NG.xml | 2 +- make/data/cldr/common/main/ii.xml | 2 +- make/data/cldr/common/main/ii_CN.xml | 2 +- make/data/cldr/common/main/io.xml | 2 +- make/data/cldr/common/main/io_001.xml | 2 +- make/data/cldr/common/main/is.xml | 6 ++-- make/data/cldr/common/main/is_IS.xml | 2 +- make/data/cldr/common/main/it.xml | 6 ++-- make/data/cldr/common/main/it_CH.xml | 2 +- make/data/cldr/common/main/it_IT.xml | 2 +- make/data/cldr/common/main/it_SM.xml | 2 +- make/data/cldr/common/main/it_VA.xml | 2 +- make/data/cldr/common/main/iu.xml | 2 +- make/data/cldr/common/main/iu_CA.xml | 2 +- make/data/cldr/common/main/iu_Latn.xml | 2 +- make/data/cldr/common/main/iu_Latn_CA.xml | 2 +- make/data/cldr/common/main/ja.xml | 2 +- make/data/cldr/common/main/ja_JP.xml | 2 +- make/data/cldr/common/main/jbo.xml | 2 +- make/data/cldr/common/main/jbo_001.xml | 2 +- make/data/cldr/common/main/jgo.xml | 2 +- make/data/cldr/common/main/jgo_CM.xml | 2 +- make/data/cldr/common/main/jmc.xml | 2 +- make/data/cldr/common/main/jmc_TZ.xml | 2 +- make/data/cldr/common/main/jv.xml | 2 +- make/data/cldr/common/main/jv_ID.xml | 2 +- make/data/cldr/common/main/ka.xml | 2 +- make/data/cldr/common/main/ka_GE.xml | 2 +- make/data/cldr/common/main/kaa.xml | 2 +- make/data/cldr/common/main/kaa_Cyrl.xml | 2 +- make/data/cldr/common/main/kaa_Cyrl_UZ.xml | 2 +- make/data/cldr/common/main/kaa_Latn.xml | 2 +- make/data/cldr/common/main/kaa_Latn_UZ.xml | 2 +- make/data/cldr/common/main/kab.xml | 2 +- make/data/cldr/common/main/kab_DZ.xml | 2 +- make/data/cldr/common/main/kaj.xml | 2 +- make/data/cldr/common/main/kaj_NG.xml | 2 +- make/data/cldr/common/main/kam.xml | 2 +- make/data/cldr/common/main/kam_KE.xml | 2 +- make/data/cldr/common/main/kcg.xml | 2 +- make/data/cldr/common/main/kcg_NG.xml | 2 +- make/data/cldr/common/main/kde.xml | 2 +- make/data/cldr/common/main/kde_TZ.xml | 2 +- make/data/cldr/common/main/kea.xml | 2 +- make/data/cldr/common/main/kea_CV.xml | 2 +- make/data/cldr/common/main/kek.xml | 2 +- make/data/cldr/common/main/kek_GT.xml | 2 +- make/data/cldr/common/main/ken.xml | 2 +- make/data/cldr/common/main/ken_CM.xml | 2 +- make/data/cldr/common/main/kgp.xml | 2 +- make/data/cldr/common/main/kgp_BR.xml | 2 +- make/data/cldr/common/main/khq.xml | 2 +- make/data/cldr/common/main/khq_ML.xml | 2 +- make/data/cldr/common/main/ki.xml | 2 +- make/data/cldr/common/main/ki_KE.xml | 2 +- make/data/cldr/common/main/kk.xml | 4 +-- make/data/cldr/common/main/kk_Arab.xml | 2 +- make/data/cldr/common/main/kk_Arab_CN.xml | 2 +- make/data/cldr/common/main/kk_Cyrl.xml | 2 +- make/data/cldr/common/main/kk_Cyrl_KZ.xml | 2 +- make/data/cldr/common/main/kk_KZ.xml | 2 +- make/data/cldr/common/main/kkj.xml | 2 +- make/data/cldr/common/main/kkj_CM.xml | 2 +- make/data/cldr/common/main/kl.xml | 2 +- make/data/cldr/common/main/kl_GL.xml | 2 +- make/data/cldr/common/main/kln.xml | 2 +- make/data/cldr/common/main/kln_KE.xml | 2 +- make/data/cldr/common/main/km.xml | 6 ++-- make/data/cldr/common/main/km_KH.xml | 2 +- make/data/cldr/common/main/kn.xml | 2 +- make/data/cldr/common/main/kn_IN.xml | 2 +- make/data/cldr/common/main/ko.xml | 16 +++++++++- make/data/cldr/common/main/ko_CN.xml | 2 +- make/data/cldr/common/main/ko_KP.xml | 2 +- make/data/cldr/common/main/ko_KR.xml | 2 +- make/data/cldr/common/main/kok.xml | 2 +- make/data/cldr/common/main/kok_Deva.xml | 2 +- make/data/cldr/common/main/kok_Deva_IN.xml | 2 +- make/data/cldr/common/main/kok_Latn.xml | 2 +- make/data/cldr/common/main/kok_Latn_IN.xml | 2 +- make/data/cldr/common/main/kpe.xml | 2 +- make/data/cldr/common/main/kpe_GN.xml | 2 +- make/data/cldr/common/main/kpe_LR.xml | 2 +- make/data/cldr/common/main/ks.xml | 2 +- make/data/cldr/common/main/ks_Arab.xml | 2 +- make/data/cldr/common/main/ks_Arab_IN.xml | 2 +- make/data/cldr/common/main/ks_Deva.xml | 2 +- make/data/cldr/common/main/ks_Deva_IN.xml | 2 +- make/data/cldr/common/main/ksb.xml | 2 +- make/data/cldr/common/main/ksb_TZ.xml | 2 +- make/data/cldr/common/main/ksf.xml | 2 +- make/data/cldr/common/main/ksf_CM.xml | 2 +- make/data/cldr/common/main/ksh.xml | 2 +- make/data/cldr/common/main/ksh_DE.xml | 2 +- make/data/cldr/common/main/ku.xml | 2 +- make/data/cldr/common/main/ku_Arab.xml | 2 +- make/data/cldr/common/main/ku_Arab_IQ.xml | 2 +- make/data/cldr/common/main/ku_Arab_IR.xml | 2 +- make/data/cldr/common/main/ku_Latn.xml | 2 +- make/data/cldr/common/main/ku_Latn_IQ.xml | 2 +- make/data/cldr/common/main/ku_Latn_SY.xml | 2 +- make/data/cldr/common/main/ku_Latn_TR.xml | 2 +- make/data/cldr/common/main/ku_TR.xml | 2 +- make/data/cldr/common/main/kw.xml | 2 +- make/data/cldr/common/main/kw_GB.xml | 2 +- make/data/cldr/common/main/kxv.xml | 4 +-- make/data/cldr/common/main/kxv_Deva.xml | 2 +- make/data/cldr/common/main/kxv_Deva_IN.xml | 2 +- make/data/cldr/common/main/kxv_Latn.xml | 2 +- make/data/cldr/common/main/kxv_Latn_IN.xml | 2 +- make/data/cldr/common/main/kxv_Orya.xml | 2 +- make/data/cldr/common/main/kxv_Orya_IN.xml | 2 +- make/data/cldr/common/main/kxv_Telu.xml | 2 +- make/data/cldr/common/main/kxv_Telu_IN.xml | 2 +- make/data/cldr/common/main/ky.xml | 2 +- make/data/cldr/common/main/ky_KG.xml | 2 +- make/data/cldr/common/main/la.xml | 2 +- make/data/cldr/common/main/la_VA.xml | 2 +- make/data/cldr/common/main/lag.xml | 2 +- make/data/cldr/common/main/lag_TZ.xml | 2 +- make/data/cldr/common/main/lb.xml | 2 +- make/data/cldr/common/main/lb_LU.xml | 2 +- make/data/cldr/common/main/lg.xml | 2 +- make/data/cldr/common/main/lg_UG.xml | 2 +- make/data/cldr/common/main/lij.xml | 2 +- make/data/cldr/common/main/lij_IT.xml | 2 +- make/data/cldr/common/main/lkt.xml | 2 +- make/data/cldr/common/main/lkt_US.xml | 2 +- make/data/cldr/common/main/lld.xml | 2 +- make/data/cldr/common/main/lld_IT.xml | 2 +- make/data/cldr/common/main/lmo.xml | 2 +- make/data/cldr/common/main/lmo_IT.xml | 2 +- make/data/cldr/common/main/ln.xml | 2 +- make/data/cldr/common/main/ln_AO.xml | 2 +- make/data/cldr/common/main/ln_CD.xml | 2 +- make/data/cldr/common/main/ln_CF.xml | 2 +- make/data/cldr/common/main/ln_CG.xml | 2 +- make/data/cldr/common/main/lo.xml | 2 +- make/data/cldr/common/main/lo_LA.xml | 2 +- make/data/cldr/common/main/lrc.xml | 2 +- make/data/cldr/common/main/lrc_IQ.xml | 2 +- make/data/cldr/common/main/lrc_IR.xml | 2 +- make/data/cldr/common/main/lt.xml | 4 +-- make/data/cldr/common/main/lt_LT.xml | 2 +- make/data/cldr/common/main/ltg.xml | 2 +- make/data/cldr/common/main/ltg_LV.xml | 2 +- make/data/cldr/common/main/lu.xml | 2 +- make/data/cldr/common/main/lu_CD.xml | 2 +- make/data/cldr/common/main/luo.xml | 2 +- make/data/cldr/common/main/luo_KE.xml | 2 +- make/data/cldr/common/main/luy.xml | 2 +- make/data/cldr/common/main/luy_KE.xml | 2 +- make/data/cldr/common/main/lv.xml | 4 +-- make/data/cldr/common/main/lv_LV.xml | 2 +- make/data/cldr/common/main/lzz.xml | 2 +- make/data/cldr/common/main/lzz_TR.xml | 2 +- make/data/cldr/common/main/mai.xml | 2 +- make/data/cldr/common/main/mai_IN.xml | 2 +- make/data/cldr/common/main/mas.xml | 2 +- make/data/cldr/common/main/mas_KE.xml | 2 +- make/data/cldr/common/main/mas_TZ.xml | 2 +- make/data/cldr/common/main/mdf.xml | 2 +- make/data/cldr/common/main/mdf_RU.xml | 2 +- make/data/cldr/common/main/mer.xml | 2 +- make/data/cldr/common/main/mer_KE.xml | 2 +- make/data/cldr/common/main/mfe.xml | 2 +- make/data/cldr/common/main/mfe_MU.xml | 2 +- make/data/cldr/common/main/mg.xml | 2 +- make/data/cldr/common/main/mg_MG.xml | 2 +- make/data/cldr/common/main/mgh.xml | 2 +- make/data/cldr/common/main/mgh_MZ.xml | 2 +- make/data/cldr/common/main/mgo.xml | 2 +- make/data/cldr/common/main/mgo_CM.xml | 2 +- make/data/cldr/common/main/mhn.xml | 2 +- make/data/cldr/common/main/mhn_IT.xml | 2 +- make/data/cldr/common/main/mi.xml | 2 +- make/data/cldr/common/main/mi_NZ.xml | 2 +- make/data/cldr/common/main/mic.xml | 2 +- make/data/cldr/common/main/mic_CA.xml | 2 +- make/data/cldr/common/main/mk.xml | 6 ++-- make/data/cldr/common/main/mk_MK.xml | 2 +- make/data/cldr/common/main/ml.xml | 6 ++-- make/data/cldr/common/main/ml_IN.xml | 2 +- make/data/cldr/common/main/mn.xml | 2 +- make/data/cldr/common/main/mn_MN.xml | 2 +- make/data/cldr/common/main/mn_Mong.xml | 2 +- make/data/cldr/common/main/mn_Mong_CN.xml | 2 +- make/data/cldr/common/main/mn_Mong_MN.xml | 2 +- make/data/cldr/common/main/mni.xml | 2 +- make/data/cldr/common/main/mni_Beng.xml | 2 +- make/data/cldr/common/main/mni_Beng_IN.xml | 2 +- make/data/cldr/common/main/mni_Mtei.xml | 2 +- make/data/cldr/common/main/mni_Mtei_IN.xml | 2 +- make/data/cldr/common/main/moh.xml | 2 +- make/data/cldr/common/main/moh_CA.xml | 2 +- make/data/cldr/common/main/mr.xml | 2 +- make/data/cldr/common/main/mr_IN.xml | 2 +- make/data/cldr/common/main/ms.xml | 2 +- make/data/cldr/common/main/ms_Arab.xml | 2 +- make/data/cldr/common/main/ms_Arab_BN.xml | 2 +- make/data/cldr/common/main/ms_Arab_MY.xml | 2 +- make/data/cldr/common/main/ms_BN.xml | 2 +- make/data/cldr/common/main/ms_ID.xml | 2 +- make/data/cldr/common/main/ms_MY.xml | 2 +- make/data/cldr/common/main/ms_SG.xml | 2 +- make/data/cldr/common/main/mt.xml | 2 +- make/data/cldr/common/main/mt_MT.xml | 2 +- make/data/cldr/common/main/mua.xml | 2 +- make/data/cldr/common/main/mua_CM.xml | 2 +- make/data/cldr/common/main/mus.xml | 2 +- make/data/cldr/common/main/mus_US.xml | 2 +- make/data/cldr/common/main/mww.xml | 2 +- make/data/cldr/common/main/mww_Hmnp.xml | 2 +- make/data/cldr/common/main/mww_Hmnp_US.xml | 2 +- make/data/cldr/common/main/my.xml | 2 +- make/data/cldr/common/main/my_MM.xml | 2 +- make/data/cldr/common/main/myv.xml | 2 +- make/data/cldr/common/main/myv_RU.xml | 2 +- make/data/cldr/common/main/mzn.xml | 2 +- make/data/cldr/common/main/mzn_IR.xml | 2 +- make/data/cldr/common/main/naq.xml | 2 +- make/data/cldr/common/main/naq_NA.xml | 2 +- make/data/cldr/common/main/nb.xml | 2 +- make/data/cldr/common/main/nb_NO.xml | 2 +- make/data/cldr/common/main/nb_SJ.xml | 2 +- make/data/cldr/common/main/nd.xml | 2 +- make/data/cldr/common/main/nd_ZW.xml | 2 +- make/data/cldr/common/main/nds.xml | 2 +- make/data/cldr/common/main/nds_DE.xml | 2 +- make/data/cldr/common/main/nds_NL.xml | 2 +- make/data/cldr/common/main/ne.xml | 10 +++---- make/data/cldr/common/main/ne_IN.xml | 2 +- make/data/cldr/common/main/ne_NP.xml | 2 +- make/data/cldr/common/main/nl.xml | 2 +- make/data/cldr/common/main/nl_AW.xml | 2 +- make/data/cldr/common/main/nl_BE.xml | 2 +- make/data/cldr/common/main/nl_BQ.xml | 2 +- make/data/cldr/common/main/nl_CW.xml | 2 +- make/data/cldr/common/main/nl_NL.xml | 2 +- make/data/cldr/common/main/nl_SR.xml | 2 +- make/data/cldr/common/main/nl_SX.xml | 2 +- make/data/cldr/common/main/nmg.xml | 2 +- make/data/cldr/common/main/nmg_CM.xml | 2 +- make/data/cldr/common/main/nn.xml | 2 +- make/data/cldr/common/main/nn_NO.xml | 2 +- make/data/cldr/common/main/nnh.xml | 2 +- make/data/cldr/common/main/nnh_CM.xml | 2 +- make/data/cldr/common/main/no.xml | 2 +- make/data/cldr/common/main/nqo.xml | 2 +- make/data/cldr/common/main/nqo_GN.xml | 2 +- make/data/cldr/common/main/nr.xml | 2 +- make/data/cldr/common/main/nr_ZA.xml | 2 +- make/data/cldr/common/main/nso.xml | 2 +- make/data/cldr/common/main/nso_ZA.xml | 2 +- make/data/cldr/common/main/nus.xml | 2 +- make/data/cldr/common/main/nus_SS.xml | 2 +- make/data/cldr/common/main/nv.xml | 2 +- make/data/cldr/common/main/nv_US.xml | 2 +- make/data/cldr/common/main/ny.xml | 2 +- make/data/cldr/common/main/ny_MW.xml | 2 +- make/data/cldr/common/main/nyn.xml | 2 +- make/data/cldr/common/main/nyn_UG.xml | 2 +- make/data/cldr/common/main/oc.xml | 2 +- make/data/cldr/common/main/oc_ES.xml | 2 +- make/data/cldr/common/main/oc_FR.xml | 2 +- make/data/cldr/common/main/oka.xml | 2 +- make/data/cldr/common/main/oka_CA.xml | 2 +- make/data/cldr/common/main/oka_US.xml | 2 +- make/data/cldr/common/main/om.xml | 2 +- make/data/cldr/common/main/om_ET.xml | 2 +- make/data/cldr/common/main/om_KE.xml | 2 +- make/data/cldr/common/main/or.xml | 2 +- make/data/cldr/common/main/or_IN.xml | 2 +- make/data/cldr/common/main/os.xml | 2 +- make/data/cldr/common/main/os_GE.xml | 2 +- make/data/cldr/common/main/os_RU.xml | 2 +- make/data/cldr/common/main/osa.xml | 2 +- make/data/cldr/common/main/osa_US.xml | 2 +- make/data/cldr/common/main/pa.xml | 4 +-- make/data/cldr/common/main/pa_Arab.xml | 2 +- make/data/cldr/common/main/pa_Arab_PK.xml | 2 +- make/data/cldr/common/main/pa_Guru.xml | 2 +- make/data/cldr/common/main/pa_Guru_IN.xml | 2 +- make/data/cldr/common/main/pap.xml | 2 +- make/data/cldr/common/main/pap_AW.xml | 2 +- make/data/cldr/common/main/pap_CW.xml | 2 +- make/data/cldr/common/main/pcm.xml | 2 +- make/data/cldr/common/main/pcm_NG.xml | 2 +- make/data/cldr/common/main/pi.xml | 2 +- make/data/cldr/common/main/pi_Latn.xml | 2 +- make/data/cldr/common/main/pi_Latn_GB.xml | 2 +- make/data/cldr/common/main/pis.xml | 2 +- make/data/cldr/common/main/pis_SB.xml | 2 +- make/data/cldr/common/main/pl.xml | 2 +- make/data/cldr/common/main/pl_PL.xml | 2 +- make/data/cldr/common/main/pms.xml | 2 +- make/data/cldr/common/main/pms_IT.xml | 2 +- make/data/cldr/common/main/prg.xml | 2 +- make/data/cldr/common/main/prg_PL.xml | 2 +- make/data/cldr/common/main/ps.xml | 7 ++++- make/data/cldr/common/main/ps_AF.xml | 2 +- make/data/cldr/common/main/ps_PK.xml | 2 +- make/data/cldr/common/main/pt.xml | 6 ++-- make/data/cldr/common/main/pt_AO.xml | 2 +- make/data/cldr/common/main/pt_BR.xml | 2 +- make/data/cldr/common/main/pt_CH.xml | 2 +- make/data/cldr/common/main/pt_CV.xml | 2 +- make/data/cldr/common/main/pt_GQ.xml | 2 +- make/data/cldr/common/main/pt_GW.xml | 2 +- make/data/cldr/common/main/pt_LU.xml | 2 +- make/data/cldr/common/main/pt_MO.xml | 2 +- make/data/cldr/common/main/pt_MZ.xml | 2 +- make/data/cldr/common/main/pt_PT.xml | 2 +- make/data/cldr/common/main/pt_ST.xml | 2 +- make/data/cldr/common/main/pt_TL.xml | 2 +- make/data/cldr/common/main/qu.xml | 2 +- make/data/cldr/common/main/qu_BO.xml | 2 +- make/data/cldr/common/main/qu_EC.xml | 2 +- make/data/cldr/common/main/qu_PE.xml | 2 +- make/data/cldr/common/main/quc.xml | 2 +- make/data/cldr/common/main/quc_GT.xml | 2 +- make/data/cldr/common/main/raj.xml | 2 +- make/data/cldr/common/main/raj_IN.xml | 2 +- make/data/cldr/common/main/rhg.xml | 2 +- make/data/cldr/common/main/rhg_Rohg.xml | 2 +- make/data/cldr/common/main/rhg_Rohg_BD.xml | 2 +- make/data/cldr/common/main/rhg_Rohg_MM.xml | 2 +- make/data/cldr/common/main/rif.xml | 2 +- make/data/cldr/common/main/rif_MA.xml | 2 +- make/data/cldr/common/main/rm.xml | 2 +- make/data/cldr/common/main/rm_CH.xml | 2 +- make/data/cldr/common/main/rn.xml | 2 +- make/data/cldr/common/main/rn_BI.xml | 2 +- make/data/cldr/common/main/ro.xml | 4 +-- make/data/cldr/common/main/ro_MD.xml | 2 +- make/data/cldr/common/main/ro_RO.xml | 2 +- make/data/cldr/common/main/rof.xml | 2 +- make/data/cldr/common/main/rof_TZ.xml | 2 +- make/data/cldr/common/main/root.xml | 12 +++++--- make/data/cldr/common/main/ru.xml | 8 ++--- make/data/cldr/common/main/ru_BY.xml | 2 +- make/data/cldr/common/main/ru_KG.xml | 2 +- make/data/cldr/common/main/ru_KZ.xml | 2 +- make/data/cldr/common/main/ru_MD.xml | 2 +- make/data/cldr/common/main/ru_RU.xml | 2 +- make/data/cldr/common/main/ru_UA.xml | 2 +- make/data/cldr/common/main/rw.xml | 2 +- make/data/cldr/common/main/rw_RW.xml | 2 +- make/data/cldr/common/main/rwk.xml | 2 +- make/data/cldr/common/main/rwk_TZ.xml | 2 +- make/data/cldr/common/main/sa.xml | 2 +- make/data/cldr/common/main/sa_IN.xml | 2 +- make/data/cldr/common/main/sah.xml | 2 +- make/data/cldr/common/main/sah_RU.xml | 2 +- make/data/cldr/common/main/saq.xml | 2 +- make/data/cldr/common/main/saq_KE.xml | 2 +- make/data/cldr/common/main/sat.xml | 2 +- make/data/cldr/common/main/sat_Deva.xml | 2 +- make/data/cldr/common/main/sat_Deva_IN.xml | 2 +- make/data/cldr/common/main/sat_Olck.xml | 2 +- make/data/cldr/common/main/sat_Olck_IN.xml | 2 +- make/data/cldr/common/main/sbp.xml | 2 +- make/data/cldr/common/main/sbp_TZ.xml | 2 +- make/data/cldr/common/main/sc.xml | 2 +- make/data/cldr/common/main/sc_IT.xml | 2 +- make/data/cldr/common/main/scn.xml | 2 +- make/data/cldr/common/main/scn_IT.xml | 2 +- make/data/cldr/common/main/sd.xml | 2 +- make/data/cldr/common/main/sd_Arab.xml | 2 +- make/data/cldr/common/main/sd_Arab_PK.xml | 2 +- make/data/cldr/common/main/sd_Deva.xml | 2 +- make/data/cldr/common/main/sd_Deva_IN.xml | 2 +- make/data/cldr/common/main/sdh.xml | 2 +- make/data/cldr/common/main/sdh_IQ.xml | 2 +- make/data/cldr/common/main/sdh_IR.xml | 2 +- make/data/cldr/common/main/se.xml | 2 +- make/data/cldr/common/main/se_FI.xml | 2 +- make/data/cldr/common/main/se_NO.xml | 2 +- make/data/cldr/common/main/se_SE.xml | 2 +- make/data/cldr/common/main/seh.xml | 2 +- make/data/cldr/common/main/seh_MZ.xml | 2 +- make/data/cldr/common/main/ses.xml | 2 +- make/data/cldr/common/main/ses_ML.xml | 2 +- make/data/cldr/common/main/sg.xml | 2 +- make/data/cldr/common/main/sg_CF.xml | 2 +- make/data/cldr/common/main/sgs.xml | 2 +- make/data/cldr/common/main/sgs_LT.xml | 2 +- make/data/cldr/common/main/shi.xml | 2 +- make/data/cldr/common/main/shi_Latn.xml | 2 +- make/data/cldr/common/main/shi_Latn_MA.xml | 2 +- make/data/cldr/common/main/shi_Tfng.xml | 2 +- make/data/cldr/common/main/shi_Tfng_MA.xml | 2 +- make/data/cldr/common/main/shn.xml | 2 +- make/data/cldr/common/main/shn_MM.xml | 2 +- make/data/cldr/common/main/shn_TH.xml | 2 +- make/data/cldr/common/main/si.xml | 4 +-- make/data/cldr/common/main/si_LK.xml | 2 +- make/data/cldr/common/main/sid.xml | 2 +- make/data/cldr/common/main/sid_ET.xml | 2 +- make/data/cldr/common/main/sk.xml | 5 ++-- make/data/cldr/common/main/sk_SK.xml | 2 +- make/data/cldr/common/main/skr.xml | 2 +- make/data/cldr/common/main/skr_PK.xml | 2 +- make/data/cldr/common/main/sl.xml | 2 +- make/data/cldr/common/main/sl_SI.xml | 2 +- make/data/cldr/common/main/sma.xml | 2 +- make/data/cldr/common/main/sma_NO.xml | 2 +- make/data/cldr/common/main/sma_SE.xml | 2 +- make/data/cldr/common/main/smj.xml | 2 +- make/data/cldr/common/main/smj_NO.xml | 2 +- make/data/cldr/common/main/smj_SE.xml | 2 +- make/data/cldr/common/main/smn.xml | 2 +- make/data/cldr/common/main/smn_FI.xml | 2 +- make/data/cldr/common/main/sms.xml | 2 +- make/data/cldr/common/main/sms_FI.xml | 2 +- make/data/cldr/common/main/sn.xml | 2 +- make/data/cldr/common/main/sn_ZW.xml | 2 +- make/data/cldr/common/main/so.xml | 2 +- make/data/cldr/common/main/so_DJ.xml | 2 +- make/data/cldr/common/main/so_ET.xml | 2 +- make/data/cldr/common/main/so_KE.xml | 2 +- make/data/cldr/common/main/so_SO.xml | 2 +- make/data/cldr/common/main/sq.xml | 2 +- make/data/cldr/common/main/sq_AL.xml | 2 +- make/data/cldr/common/main/sq_MK.xml | 2 +- make/data/cldr/common/main/sq_XK.xml | 2 +- make/data/cldr/common/main/sr.xml | 6 ++-- make/data/cldr/common/main/sr_Cyrl.xml | 2 +- make/data/cldr/common/main/sr_Cyrl_BA.xml | 2 +- make/data/cldr/common/main/sr_Cyrl_ME.xml | 2 +- make/data/cldr/common/main/sr_Cyrl_RS.xml | 2 +- make/data/cldr/common/main/sr_Cyrl_XK.xml | 2 +- make/data/cldr/common/main/sr_Latn.xml | 6 ++-- make/data/cldr/common/main/sr_Latn_BA.xml | 2 +- make/data/cldr/common/main/sr_Latn_ME.xml | 2 +- make/data/cldr/common/main/sr_Latn_RS.xml | 2 +- make/data/cldr/common/main/sr_Latn_XK.xml | 2 +- make/data/cldr/common/main/ss.xml | 2 +- make/data/cldr/common/main/ss_SZ.xml | 2 +- make/data/cldr/common/main/ss_ZA.xml | 2 +- make/data/cldr/common/main/ssy.xml | 2 +- make/data/cldr/common/main/ssy_ER.xml | 2 +- make/data/cldr/common/main/st.xml | 2 +- make/data/cldr/common/main/st_LS.xml | 2 +- make/data/cldr/common/main/st_ZA.xml | 2 +- make/data/cldr/common/main/su.xml | 2 +- make/data/cldr/common/main/su_Latn.xml | 2 +- make/data/cldr/common/main/su_Latn_ID.xml | 2 +- make/data/cldr/common/main/suz.xml | 2 +- make/data/cldr/common/main/suz_Deva.xml | 2 +- make/data/cldr/common/main/suz_Deva_NP.xml | 2 +- make/data/cldr/common/main/suz_Sunu.xml | 2 +- make/data/cldr/common/main/suz_Sunu_NP.xml | 2 +- make/data/cldr/common/main/sv.xml | 2 +- make/data/cldr/common/main/sv_AX.xml | 2 +- make/data/cldr/common/main/sv_FI.xml | 2 +- make/data/cldr/common/main/sv_SE.xml | 2 +- make/data/cldr/common/main/sw.xml | 2 +- make/data/cldr/common/main/sw_CD.xml | 2 +- make/data/cldr/common/main/sw_KE.xml | 2 +- make/data/cldr/common/main/sw_TZ.xml | 2 +- make/data/cldr/common/main/sw_UG.xml | 2 +- make/data/cldr/common/main/syr.xml | 2 +- make/data/cldr/common/main/syr_IQ.xml | 2 +- make/data/cldr/common/main/syr_SY.xml | 2 +- make/data/cldr/common/main/szl.xml | 2 +- make/data/cldr/common/main/szl_PL.xml | 2 +- make/data/cldr/common/main/ta.xml | 2 +- make/data/cldr/common/main/ta_IN.xml | 2 +- make/data/cldr/common/main/ta_LK.xml | 2 +- make/data/cldr/common/main/ta_MY.xml | 2 +- make/data/cldr/common/main/ta_SG.xml | 2 +- make/data/cldr/common/main/te.xml | 2 +- make/data/cldr/common/main/te_IN.xml | 2 +- make/data/cldr/common/main/teo.xml | 2 +- make/data/cldr/common/main/teo_KE.xml | 2 +- make/data/cldr/common/main/teo_UG.xml | 2 +- make/data/cldr/common/main/tg.xml | 2 +- make/data/cldr/common/main/tg_TJ.xml | 2 +- make/data/cldr/common/main/th.xml | 2 +- make/data/cldr/common/main/th_TH.xml | 2 +- make/data/cldr/common/main/ti.xml | 8 ++--- make/data/cldr/common/main/ti_ER.xml | 2 +- make/data/cldr/common/main/ti_ET.xml | 2 +- make/data/cldr/common/main/tig.xml | 2 +- make/data/cldr/common/main/tig_ER.xml | 2 +- make/data/cldr/common/main/tk.xml | 6 ++-- make/data/cldr/common/main/tk_TM.xml | 2 +- make/data/cldr/common/main/tn.xml | 2 +- make/data/cldr/common/main/tn_BW.xml | 2 +- make/data/cldr/common/main/tn_ZA.xml | 2 +- make/data/cldr/common/main/to.xml | 2 +- make/data/cldr/common/main/to_TO.xml | 2 +- make/data/cldr/common/main/tok.xml | 2 +- make/data/cldr/common/main/tok_001.xml | 2 +- make/data/cldr/common/main/tpi.xml | 2 +- make/data/cldr/common/main/tpi_PG.xml | 2 +- make/data/cldr/common/main/tr.xml | 2 +- make/data/cldr/common/main/tr_CY.xml | 2 +- make/data/cldr/common/main/tr_TR.xml | 2 +- make/data/cldr/common/main/trv.xml | 2 +- make/data/cldr/common/main/trv_TW.xml | 2 +- make/data/cldr/common/main/trw.xml | 2 +- make/data/cldr/common/main/trw_PK.xml | 2 +- make/data/cldr/common/main/ts.xml | 2 +- make/data/cldr/common/main/ts_ZA.xml | 2 +- make/data/cldr/common/main/tt.xml | 2 +- make/data/cldr/common/main/tt_RU.xml | 2 +- make/data/cldr/common/main/twq.xml | 2 +- make/data/cldr/common/main/twq_NE.xml | 2 +- make/data/cldr/common/main/tyv.xml | 2 +- make/data/cldr/common/main/tyv_RU.xml | 2 +- make/data/cldr/common/main/tzm.xml | 2 +- make/data/cldr/common/main/tzm_MA.xml | 2 +- make/data/cldr/common/main/ug.xml | 2 +- make/data/cldr/common/main/ug_CN.xml | 2 +- make/data/cldr/common/main/uk.xml | 8 ++--- make/data/cldr/common/main/uk_UA.xml | 2 +- make/data/cldr/common/main/ur.xml | 2 +- make/data/cldr/common/main/ur_IN.xml | 2 +- make/data/cldr/common/main/ur_PK.xml | 2 +- make/data/cldr/common/main/uz.xml | 2 +- make/data/cldr/common/main/uz_Arab.xml | 2 +- make/data/cldr/common/main/uz_Arab_AF.xml | 2 +- make/data/cldr/common/main/uz_Cyrl.xml | 2 +- make/data/cldr/common/main/uz_Cyrl_UZ.xml | 2 +- make/data/cldr/common/main/uz_Latn.xml | 2 +- make/data/cldr/common/main/uz_Latn_UZ.xml | 2 +- make/data/cldr/common/main/vai.xml | 2 +- make/data/cldr/common/main/vai_Latn.xml | 2 +- make/data/cldr/common/main/vai_Latn_LR.xml | 2 +- make/data/cldr/common/main/vai_Vaii.xml | 2 +- make/data/cldr/common/main/vai_Vaii_LR.xml | 2 +- make/data/cldr/common/main/ve.xml | 2 +- make/data/cldr/common/main/ve_ZA.xml | 2 +- make/data/cldr/common/main/vec.xml | 2 +- make/data/cldr/common/main/vec_IT.xml | 2 +- make/data/cldr/common/main/vi.xml | 5 +++- make/data/cldr/common/main/vi_VN.xml | 2 +- make/data/cldr/common/main/vmw.xml | 2 +- make/data/cldr/common/main/vmw_MZ.xml | 2 +- make/data/cldr/common/main/vo.xml | 2 +- make/data/cldr/common/main/vo_001.xml | 2 +- make/data/cldr/common/main/vun.xml | 2 +- make/data/cldr/common/main/vun_TZ.xml | 2 +- make/data/cldr/common/main/wa.xml | 2 +- make/data/cldr/common/main/wa_BE.xml | 2 +- make/data/cldr/common/main/wae.xml | 2 +- make/data/cldr/common/main/wae_CH.xml | 2 +- make/data/cldr/common/main/wal.xml | 2 +- make/data/cldr/common/main/wal_ET.xml | 2 +- make/data/cldr/common/main/wbp.xml | 2 +- make/data/cldr/common/main/wbp_AU.xml | 2 +- make/data/cldr/common/main/wo.xml | 2 +- make/data/cldr/common/main/wo_SN.xml | 2 +- make/data/cldr/common/main/xh.xml | 2 +- make/data/cldr/common/main/xh_ZA.xml | 2 +- make/data/cldr/common/main/xnr.xml | 2 +- make/data/cldr/common/main/xnr_IN.xml | 2 +- make/data/cldr/common/main/xog.xml | 2 +- make/data/cldr/common/main/xog_UG.xml | 2 +- make/data/cldr/common/main/yav.xml | 2 +- make/data/cldr/common/main/yav_CM.xml | 2 +- make/data/cldr/common/main/yi.xml | 2 +- make/data/cldr/common/main/yi_UA.xml | 2 +- make/data/cldr/common/main/yo.xml | 2 +- make/data/cldr/common/main/yo_BJ.xml | 2 +- make/data/cldr/common/main/yo_NG.xml | 2 +- make/data/cldr/common/main/yrl.xml | 2 +- make/data/cldr/common/main/yrl_BR.xml | 2 +- make/data/cldr/common/main/yrl_CO.xml | 2 +- make/data/cldr/common/main/yrl_VE.xml | 2 +- make/data/cldr/common/main/yue.xml | 16 +++++----- make/data/cldr/common/main/yue_Hans.xml | 14 ++++----- make/data/cldr/common/main/yue_Hans_CN.xml | 2 +- make/data/cldr/common/main/yue_Hant.xml | 2 +- make/data/cldr/common/main/yue_Hant_CN.xml | 2 +- make/data/cldr/common/main/yue_Hant_HK.xml | 2 +- make/data/cldr/common/main/yue_Hant_MO.xml | 2 +- make/data/cldr/common/main/za.xml | 2 +- make/data/cldr/common/main/za_CN.xml | 2 +- make/data/cldr/common/main/zgh.xml | 2 +- make/data/cldr/common/main/zgh_MA.xml | 2 +- make/data/cldr/common/main/zh.xml | 2 +- make/data/cldr/common/main/zh_Hans.xml | 2 +- make/data/cldr/common/main/zh_Hans_CN.xml | 2 +- make/data/cldr/common/main/zh_Hans_HK.xml | 2 +- make/data/cldr/common/main/zh_Hans_MO.xml | 2 +- make/data/cldr/common/main/zh_Hans_MY.xml | 2 +- make/data/cldr/common/main/zh_Hans_SG.xml | 2 +- make/data/cldr/common/main/zh_Hant.xml | 29 ++++++++++--------- make/data/cldr/common/main/zh_Hant_HK.xml | 10 +++---- make/data/cldr/common/main/zh_Hant_MO.xml | 2 +- make/data/cldr/common/main/zh_Hant_MY.xml | 2 +- make/data/cldr/common/main/zh_Hant_TW.xml | 2 +- make/data/cldr/common/main/zh_Latn.xml | 2 +- make/data/cldr/common/main/zh_Latn_CN.xml | 2 +- make/data/cldr/common/main/zu.xml | 2 +- make/data/cldr/common/main/zu_ZA.xml | 2 +- .../common/supplemental/coverageLevels.xml | 3 +- .../common/supplemental/likelySubtags.xml | 6 ++-- .../cldr/common/supplemental/metaZones.xml | 2 +- .../common/supplemental/supplementalData.xml | 6 ++-- .../java/util/spi/LocaleServiceProvider.java | 6 ++-- src/java.base/share/legal/cldr.md | 2 +- src/jdk.localedata/share/legal/cldr.md | 2 +- .../Format/NumberFormat/CurrencyFormat.java | 17 ++--------- .../format/TestZoneTextPrinterParser.java | 20 ++++++++----- test/jdk/sun/text/resources/LocaleData.cldr | 4 +-- .../sun/text/resources/LocaleDataTest.java | 4 +-- .../resources/cldr/TimeZoneNamesTest.java | 6 ++-- 1135 files changed, 1321 insertions(+), 1272 deletions(-) diff --git a/make/data/cldr/common/dtd/ldml.dtd b/make/data/cldr/common/dtd/ldml.dtd index aebedd33a43..b4247f2d924 100644 --- a/make/data/cldr/common/dtd/ldml.dtd +++ b/make/data/cldr/common/dtd/ldml.dtd @@ -1,5 +1,5 @@ - + @@ -493,6 +493,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + + + + + + + diff --git a/make/data/cldr/common/main/aa.xml b/make/data/cldr/common/main/aa.xml index 3ff6fb6dd06..791c3009658 100644 --- a/make/data/cldr/common/main/aa.xml +++ b/make/data/cldr/common/main/aa.xml @@ -1,6 +1,6 @@ - @@ -1027,6 +1027,7 @@ For terms of use, see http://www.unicode.org/copyright.html + diff --git a/make/data/cldr/common/supplemental/likelySubtags.xml b/make/data/cldr/common/supplemental/likelySubtags.xml index 76e215255fd..a73b8a8c95b 100644 --- a/make/data/cldr/common/supplemental/likelySubtags.xml +++ b/make/data/cldr/common/supplemental/likelySubtags.xml @@ -1,7 +1,7 @@ - + @@ -1343,7 +1343,7 @@ not be patched by hand, as any changes made in that fashion may be lost. - + diff --git a/make/data/cldr/common/supplemental/metaZones.xml b/make/data/cldr/common/supplemental/metaZones.xml index 710934fef81..610921a8f6d 100644 --- a/make/data/cldr/common/supplemental/metaZones.xml +++ b/make/data/cldr/common/supplemental/metaZones.xml @@ -735,7 +735,7 @@ For terms of use, see http://www.unicode.org/copyright.html - + diff --git a/make/data/cldr/common/supplemental/supplementalData.xml b/make/data/cldr/common/supplemental/supplementalData.xml index 25684d36c6e..cbfe2c5e875 100644 --- a/make/data/cldr/common/supplemental/supplementalData.xml +++ b/make/data/cldr/common/supplemental/supplementalData.xml @@ -1,7 +1,7 @@ @@ -57,7 +57,7 @@ For terms of use, see https://www.unicode.org/copyright.html - + @@ -3147,7 +3147,7 @@ XXX Code for transations where no currency is involved - + diff --git a/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java index abb9f3aca38..e357665ed3c 100644 --- a/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java +++ b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java @@ -184,8 +184,8 @@ import java.util.Locale; * CLDR version * * - * JDK 26 - * CLDR 48 + * JDK 27 + * CLDR 48.2 * JDK 25 * CLDR 47 * JDK 21 @@ -208,6 +208,8 @@ import java.util.Locale; * CLDR version * * + * JDK 26 + * CLDR 48 * JDK 24 * CLDR 46 * JDK 23 diff --git a/src/java.base/share/legal/cldr.md b/src/java.base/share/legal/cldr.md index 6e609f35302..7423d3492f5 100644 --- a/src/java.base/share/legal/cldr.md +++ b/src/java.base/share/legal/cldr.md @@ -1,4 +1,4 @@ -## Unicode Common Local Data Repository (CLDR) v48 +## Unicode Common Local Data Repository (CLDR) v48.2 ### CLDR License diff --git a/src/jdk.localedata/share/legal/cldr.md b/src/jdk.localedata/share/legal/cldr.md index 6e609f35302..7423d3492f5 100644 --- a/src/jdk.localedata/share/legal/cldr.md +++ b/src/jdk.localedata/share/legal/cldr.md @@ -1,4 +1,4 @@ -## Unicode Common Local Data Repository (CLDR) v48 +## Unicode Common Local Data Repository (CLDR) v48.2 ### CLDR License diff --git a/test/jdk/java/text/Format/NumberFormat/CurrencyFormat.java b/test/jdk/java/text/Format/NumberFormat/CurrencyFormat.java index 6d7a906e394..c4113e9662f 100644 --- a/test/jdk/java/text/Format/NumberFormat/CurrencyFormat.java +++ b/test/jdk/java/text/Format/NumberFormat/CurrencyFormat.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2026, 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 @@ -24,28 +24,17 @@ /* * @test * @bug 4290801 4942982 5102005 8008577 8021121 8210153 8227313 8301991 - * 8174269 + * 8174269 8371842 * @summary Basic tests for currency formatting. * Tests both COMPAT and CLDR data. * @modules jdk.localedata * @run junit CurrencyFormat */ -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; -import java.text.ParseException; import java.util.ArrayList; import java.util.Currency; import java.util.Locale; -import java.util.Properties; -import java.util.StringTokenizer; -import java.util.TimeZone; -import java.text.DecimalFormatSymbols; import java.text.NumberFormat; -import java.text.SimpleDateFormat; import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; @@ -100,7 +89,7 @@ public class CurrencyFormat { {"1.234,56\u00a0\u20ac", "1.234,56\u00a0USD", "1.235\u00a0JPY", "1.234,56\u00a0DEM", "1.234,56\u00a0\u20ac"}, {"1.234,56\u00a0\u20ac", "1.234,56\u00a0USD", "1.235\u00a0JPY", "1.234,56\u00a0DEM", "1.234,56\u00a0\u20ac"}, {"\u20ac\u00a01.234,56", "$\u00a01.234,56", "\u00a5\u00a01.235", "DM\u00a01.234,56", "\u20ac\u00a01.234,56"}, - {"1\u202f234.56\u00a0CHF", "1\u202f234.56\u00a0$US", "1\u202f235\u00a0JPY", "1\u202f234.56\u00a0DEM", "1\u202f234.56\u00a0\u20ac"}, + {"1'234.56\u00a0CHF", "1'234.56\u00a0$US", "1'235\u00a0JPY", "1'234.56\u00a0DEM", "1'234.56\u00a0\u20ac"}, }; for (int i = 0; i < locales.length; i++) { Locale locale = locales[i]; diff --git a/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java b/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java index abe3cd6b154..5cbe9daf556 100644 --- a/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java +++ b/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2026, 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 @@ -54,7 +54,7 @@ import org.junit.jupiter.params.provider.MethodSource; /* * @test * @bug 8081022 8151876 8166875 8177819 8189784 8206980 8277049 8278434 8346948 - * 8174269 + * 8174269 8371842 * @key randomness */ @@ -92,10 +92,16 @@ public class TestZoneTextPrinterParser extends AbstractTestPrinterParser { } zdt = zdt.withZoneSameLocal(ZoneId.of(zid)); TimeZone tz = TimeZone.getTimeZone(zid); - boolean isDST = tz.inDaylightTime(new Date(zdt.toInstant().toEpochMilli())); + long epochMilli = zdt.toInstant().toEpochMilli(); + boolean isDST = tz.inDaylightTime(new Date(epochMilli)); + // Some zones now use an explicit daylight offset in CLDR without java.util.TimeZone + // reporting DST for the instant, so prefer the daylight name when the effective + // offset is greater than the raw standard offset. + boolean useDaylightName = isDST + || (tz.getDSTSavings() == 0 && tz.getOffset(epochMilli) > tz.getRawOffset()); for (Locale locale : SAMPLE_LOCALES) { - String longDisplayName = tz.getDisplayName(isDST, TimeZone.LONG, locale); - String shortDisplayName = tz.getDisplayName(isDST, TimeZone.SHORT, locale); + String longDisplayName = tz.getDisplayName(useDaylightName, TimeZone.LONG, locale); + String shortDisplayName = tz.getDisplayName(useDaylightName, TimeZone.SHORT, locale); if ((longDisplayName.startsWith("GMT+") && shortDisplayName.startsWith("GMT+")) || (longDisplayName.startsWith("GMT-") && shortDisplayName.startsWith("GMT-"))) { // exclude ROOT @@ -107,9 +113,9 @@ public class TestZoneTextPrinterParser extends AbstractTestPrinterParser { continue; } printText(locale, zdt, TextStyle.FULL, tz, - tz.getDisplayName(isDST, TimeZone.LONG, locale)); + tz.getDisplayName(useDaylightName, TimeZone.LONG, locale)); printText(locale, zdt, TextStyle.SHORT, tz, - tz.getDisplayName(isDST, TimeZone.SHORT, locale)); + tz.getDisplayName(useDaylightName, TimeZone.SHORT, locale)); } } } diff --git a/test/jdk/sun/text/resources/LocaleData.cldr b/test/jdk/sun/text/resources/LocaleData.cldr index 9d81c50ae1e..45229ad9cbd 100644 --- a/test/jdk/sun/text/resources/LocaleData.cldr +++ b/test/jdk/sun/text/resources/LocaleData.cldr @@ -1,5 +1,5 @@ # -# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2026, 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 @@ -2413,7 +2413,7 @@ FormatData/zh_HK/DatePatterns/0=y年M月d日EEEE FormatData/zh_HK/DatePatterns/1=y年M月d日 FormatData/zh_HK/DatePatterns/2=y年M月d日 FormatData/zh_HK/DatePatterns/3=d/M/y -FormatData/zh_HK/DateTimePatterns/0={1}{0} +FormatData/zh_HK/DateTimePatterns/0={1} {0} #bug #4149569 LocaleNames/tr/TR=Türkiye diff --git a/test/jdk/sun/text/resources/LocaleDataTest.java b/test/jdk/sun/text/resources/LocaleDataTest.java index 472576f327c..81a30850b58 100644 --- a/test/jdk/sun/text/resources/LocaleDataTest.java +++ b/test/jdk/sun/text/resources/LocaleDataTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2026, 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,7 +42,7 @@ * 8209775 8221432 8227127 8230284 8231273 8233579 8234288 8250665 8255086 * 8251317 8274658 8283277 8283805 8265315 8287868 8295564 8284840 8296715 * 8301206 8303472 8317979 8306116 8174269 8333582 8357075 8357882 8367021 - 8354548 + * 8354548 8371842 * @summary Verify locale data * @modules java.base/sun.util.resources * @modules jdk.localedata diff --git a/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java b/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java index 68f6c8a401b..60359b8fbd4 100644 --- a/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java +++ b/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java @@ -24,7 +24,7 @@ /* * @test * @bug 8181157 8202537 8234347 8236548 8261279 8322647 8174269 8346948 - * 8354548 8381379 8382020 8384043 + * 8354548 8381379 8382020 8384043 8371842 * @modules jdk.localedata * @summary Checks CLDR time zone names are generated correctly at * either build or runtime @@ -305,9 +305,7 @@ public class TimeZoneNamesTest { Arguments.of(ZonedDateTime.of(2026, 4, 5, 0, 0, 0, 0, ZoneId.of("Eire")), "Irish Standard Time"), Arguments.of(ZonedDateTime.of(2026, 12, 5, 0, 0, 0, 0, ZoneId.of("Eire")), "Greenwich Mean Time"), Arguments.of(ZonedDateTime.of(2026, 4, 5, 0, 0, 0, 0, ZoneId.of("America/Vancouver")), "Pacific Daylight Time"), - // This needs to change once TZDB adopts -7 offset year round, and CLDR uses explicit dst offset - // namely, "Pacific Standard Time" -> "Pacific Daylight Time" - Arguments.of(ZonedDateTime.of(2026, 12, 5, 0, 0, 0, 0, ZoneId.of("America/Vancouver")), "Pacific Standard Time") + Arguments.of(ZonedDateTime.of(2026, 12, 5, 0, 0, 0, 0, ZoneId.of("America/Vancouver")), "Pacific Daylight Time") ); }