From 5fb23a1b199481e475a362926eb77e87b124a859 Mon Sep 17 00:00:00 2001 From: Ram Viswanadha Date: Thu, 19 May 2005 20:28:20 +0000 Subject: [PATCH] ICU-4450 Synch data with CLDR X-SVN-Rev: 17630 --- icu4c/source/data/coll/ar.txt | 2 +- icu4c/source/data/coll/be.txt | 2 +- icu4c/source/data/coll/bg.txt | 2 +- icu4c/source/data/coll/ca.txt | 2 +- icu4c/source/data/coll/colfiles.mk | 3 +- icu4c/source/data/coll/cs.txt | 4 +- icu4c/source/data/coll/da.txt | 2 +- icu4c/source/data/coll/de.txt | 2 +- icu4c/source/data/coll/el.txt | 2 +- icu4c/source/data/coll/en.txt | 2 +- icu4c/source/data/coll/en_BE.txt | 2 +- icu4c/source/data/coll/eo.txt | 2 +- icu4c/source/data/coll/es.txt | 2 +- icu4c/source/data/coll/et.txt | 2 +- icu4c/source/data/coll/fa.txt | 2 +- icu4c/source/data/coll/fa_AF.txt | 2 +- icu4c/source/data/coll/fi.txt | 4 +- icu4c/source/data/coll/fo.txt | 2 +- icu4c/source/data/coll/fr.txt | 2 +- icu4c/source/data/coll/gu.txt | 2 +- icu4c/source/data/coll/he.txt | 2 +- icu4c/source/data/coll/hi.txt | 2 +- icu4c/source/data/coll/hr.txt | 2 +- icu4c/source/data/coll/hu.txt | 2 +- icu4c/source/data/coll/is.txt | 2 +- icu4c/source/data/coll/it.txt | 2 +- icu4c/source/data/coll/ja.txt | 108 +-- icu4c/source/data/coll/kk.txt | 2 +- icu4c/source/data/coll/kl.txt | 2 +- icu4c/source/data/coll/kn.txt | 2 +- icu4c/source/data/coll/ko.txt | 2 +- icu4c/source/data/coll/lt.txt | 2 +- icu4c/source/data/coll/lv.txt | 2 +- icu4c/source/data/coll/mk.txt | 2 +- icu4c/source/data/coll/ml.txt | 2 +- icu4c/source/data/coll/mr.txt | 2 +- icu4c/source/data/coll/mt.txt | 2 +- icu4c/source/data/coll/nb.txt | 2 +- icu4c/source/data/coll/nn.txt | 2 +- icu4c/source/data/coll/om.txt | 2 +- icu4c/source/data/coll/or.txt | 2 +- icu4c/source/data/coll/pa.txt | 2 +- icu4c/source/data/coll/pl.txt | 2 +- icu4c/source/data/coll/ps.txt | 2 +- icu4c/source/data/coll/ro.txt | 2 +- icu4c/source/data/coll/root.txt | 2 +- icu4c/source/data/coll/ru.txt | 2 +- icu4c/source/data/coll/sh.txt | 4 +- .../{locales/hr_HR.txt => coll/sh_BA.txt} | 12 +- icu4c/source/data/coll/sk.txt | 6 +- icu4c/source/data/coll/sl.txt | 2 +- icu4c/source/data/coll/sq.txt | 2 +- icu4c/source/data/coll/sr.txt | 4 +- .../{locales/sl_SI.txt => coll/sr_BA.txt} | 18 +- .../source/data/{locales => coll}/sr_Cyrl.txt | 10 +- .../ar_EG.txt => coll/sr_Cyrl_BA.txt} | 22 +- icu4c/source/data/coll/sr_Cyrl_YU.txt | 17 + icu4c/source/data/coll/sv.txt | 2 +- icu4c/source/data/coll/ta.txt | 2 +- icu4c/source/data/coll/te.txt | 2 +- icu4c/source/data/coll/th.txt | 2 +- icu4c/source/data/coll/tr.txt | 2 +- icu4c/source/data/coll/uk.txt | 2 +- icu4c/source/data/coll/vi.txt | 2 +- icu4c/source/data/coll/zh.txt | 21 +- icu4c/source/data/coll/zh_HK.txt | 2 +- icu4c/source/data/coll/zh_Hant.txt | 2 +- icu4c/source/data/coll/zh_MO.txt | 2 +- icu4c/source/data/coll/zh_TW.txt | 2 +- icu4c/source/data/locales/af.txt | 4 +- icu4c/source/data/locales/af_ZA.txt | 4 +- icu4c/source/data/locales/am.txt | 27 +- icu4c/source/data/locales/am_ET.txt | 8 +- icu4c/source/data/locales/ar.txt | 54 +- icu4c/source/data/locales/ar_AE.txt | 4 +- icu4c/source/data/locales/ar_BH.txt | 4 +- icu4c/source/data/locales/ar_DZ.txt | 4 +- icu4c/source/data/locales/ar_IN.txt | 4 +- icu4c/source/data/locales/ar_IQ.txt | 4 +- icu4c/source/data/locales/ar_JO.txt | 4 +- icu4c/source/data/locales/ar_KW.txt | 4 +- icu4c/source/data/locales/ar_LB.txt | 4 +- icu4c/source/data/locales/ar_LY.txt | 4 +- icu4c/source/data/locales/ar_MA.txt | 4 +- icu4c/source/data/locales/ar_OM.txt | 4 +- icu4c/source/data/locales/ar_QA.txt | 4 +- icu4c/source/data/locales/ar_SA.txt | 4 +- icu4c/source/data/locales/ar_SD.txt | 4 +- icu4c/source/data/locales/ar_SY.txt | 4 +- icu4c/source/data/locales/ar_TN.txt | 4 +- icu4c/source/data/locales/ar_YE.txt | 4 +- icu4c/source/data/locales/be.txt | 4 +- icu4c/source/data/locales/be_BY.txt | 4 +- icu4c/source/data/locales/bg.txt | 62 +- icu4c/source/data/locales/bg_BG.txt | 4 +- icu4c/source/data/locales/bn.txt | 6 +- icu4c/source/data/locales/bn_IN.txt | 4 +- icu4c/source/data/locales/ca.txt | 4 +- icu4c/source/data/locales/ca_ES.txt | 4 +- icu4c/source/data/locales/cs.txt | 36 +- icu4c/source/data/locales/cs_CZ.txt | 4 +- icu4c/source/data/locales/cy.txt | 54 +- icu4c/source/data/locales/cy_GB.txt | 4 +- icu4c/source/data/locales/da.txt | 63 +- icu4c/source/data/locales/da_DK.txt | 4 +- icu4c/source/data/locales/de.txt | 54 +- icu4c/source/data/locales/de_AT.txt | 4 +- icu4c/source/data/locales/de_BE.txt | 4 +- icu4c/source/data/locales/de_CH.txt | 4 +- icu4c/source/data/locales/de_DE.txt | 4 +- icu4c/source/data/locales/de_LU.txt | 4 +- icu4c/source/data/locales/el.txt | 24 +- icu4c/source/data/locales/el_GR.txt | 4 +- icu4c/source/data/locales/en.txt | 108 ++- icu4c/source/data/locales/en_AU.txt | 4 +- icu4c/source/data/locales/en_BE.txt | 4 +- icu4c/source/data/locales/en_BW.txt | 4 +- icu4c/source/data/locales/en_CA.txt | 4 +- icu4c/source/data/locales/en_GB.txt | 14 +- icu4c/source/data/locales/en_HK.txt | 4 +- icu4c/source/data/locales/en_IE.txt | 14 +- icu4c/source/data/locales/en_IN.txt | 4 +- icu4c/source/data/locales/en_MT.txt | 4 +- icu4c/source/data/locales/en_NZ.txt | 4 +- icu4c/source/data/locales/en_PH.txt | 4 +- icu4c/source/data/locales/en_PK.txt | 7 +- icu4c/source/data/locales/en_SG.txt | 14 +- icu4c/source/data/locales/en_US.txt | 4 +- icu4c/source/data/locales/en_US_POSIX.txt | 4 +- icu4c/source/data/locales/en_VI.txt | 4 +- icu4c/source/data/locales/en_ZA.txt | 4 +- icu4c/source/data/locales/en_ZW.txt | 4 +- icu4c/source/data/locales/eo.txt | 4 +- icu4c/source/data/locales/es.txt | 76 +- icu4c/source/data/locales/es_AR.txt | 18 +- icu4c/source/data/locales/es_BO.txt | 18 +- icu4c/source/data/locales/es_CL.txt | 18 +- icu4c/source/data/locales/es_CO.txt | 18 +- icu4c/source/data/locales/es_CR.txt | 18 +- icu4c/source/data/locales/es_DO.txt | 4 +- icu4c/source/data/locales/es_EC.txt | 22 +- icu4c/source/data/locales/es_ES.txt | 18 +- icu4c/source/data/locales/es_GT.txt | 4 +- icu4c/source/data/locales/es_HN.txt | 4 +- icu4c/source/data/locales/es_MX.txt | 4 +- icu4c/source/data/locales/es_NI.txt | 4 +- icu4c/source/data/locales/es_PA.txt | 4 +- icu4c/source/data/locales/es_PE.txt | 4 +- icu4c/source/data/locales/es_PR.txt | 4 +- icu4c/source/data/locales/es_PY.txt | 18 +- icu4c/source/data/locales/es_SV.txt | 4 +- icu4c/source/data/locales/es_US.txt | 10 +- icu4c/source/data/locales/es_UY.txt | 22 +- icu4c/source/data/locales/es_VE.txt | 18 +- icu4c/source/data/locales/et.txt | 4 +- icu4c/source/data/locales/et_EE.txt | 4 +- icu4c/source/data/locales/eu.txt | 4 +- icu4c/source/data/locales/eu_ES.txt | 4 +- icu4c/source/data/locales/fa.txt | 4 +- icu4c/source/data/locales/fa_AF.txt | 14 +- icu4c/source/data/locales/fa_IR.txt | 4 +- icu4c/source/data/locales/fi.txt | 63 +- icu4c/source/data/locales/fi_FI.txt | 4 +- icu4c/source/data/locales/fo.txt | 2 +- icu4c/source/data/locales/fo_FO.txt | 4 +- icu4c/source/data/locales/fr.txt | 92 ++- icu4c/source/data/locales/fr_BE.txt | 4 +- icu4c/source/data/locales/fr_CA.txt | 4 +- icu4c/source/data/locales/fr_CH.txt | 4 +- icu4c/source/data/locales/fr_FR.txt | 4 +- icu4c/source/data/locales/fr_LU.txt | 4 +- icu4c/source/data/locales/ga.txt | 12 +- icu4c/source/data/locales/ga_IE.txt | 4 +- icu4c/source/data/locales/gl.txt | 2 +- icu4c/source/data/locales/gl_ES.txt | 4 +- icu4c/source/data/locales/gu.txt | 6 +- icu4c/source/data/locales/gu_IN.txt | 4 +- icu4c/source/data/locales/gv.txt | 2 +- icu4c/source/data/locales/gv_GB.txt | 2 +- icu4c/source/data/locales/he.txt | 24 +- icu4c/source/data/locales/he_IL.txt | 4 +- icu4c/source/data/locales/hi.txt | 6 +- icu4c/source/data/locales/hi_IN.txt | 4 +- icu4c/source/data/locales/hr.txt | 24 +- icu4c/source/data/locales/hu.txt | 54 +- icu4c/source/data/locales/hu_HU.txt | 4 +- icu4c/source/data/locales/hy.txt | 6 +- icu4c/source/data/locales/hy_AM.txt | 2 +- icu4c/source/data/locales/hy_AM_REVISED.txt | 2 +- icu4c/source/data/locales/id.txt | 4 +- icu4c/source/data/locales/id_ID.txt | 4 +- icu4c/source/data/locales/is.txt | 54 +- icu4c/source/data/locales/is_IS.txt | 4 +- icu4c/source/data/locales/it.txt | 63 +- icu4c/source/data/locales/it_CH.txt | 4 +- icu4c/source/data/locales/it_IT.txt | 4 +- icu4c/source/data/locales/ja.txt | 36 +- icu4c/source/data/locales/ja_JP.txt | 4 +- icu4c/source/data/locales/kk.txt | 4 +- icu4c/source/data/locales/kk_KZ.txt | 2 +- icu4c/source/data/locales/kl.txt | 2 +- icu4c/source/data/locales/kl_GL.txt | 2 +- icu4c/source/data/locales/kn.txt | 6 +- icu4c/source/data/locales/kn_IN.txt | 4 +- icu4c/source/data/locales/ko.txt | 38 +- icu4c/source/data/locales/ko_KR.txt | 4 +- icu4c/source/data/locales/kok.txt | 16 +- icu4c/source/data/locales/kok_IN.txt | 4 +- icu4c/source/data/locales/kw.txt | 2 +- icu4c/source/data/locales/kw_GB.txt | 2 +- icu4c/source/data/locales/lt.txt | 4 +- icu4c/source/data/locales/lt_LT.txt | 4 +- icu4c/source/data/locales/lv.txt | 4 +- icu4c/source/data/locales/lv_LV.txt | 4 +- icu4c/source/data/locales/mk.txt | 54 +- icu4c/source/data/locales/mk_MK.txt | 2 +- icu4c/source/data/locales/ml.txt | 7 +- icu4c/source/data/locales/ml_IN.txt | 7 +- icu4c/source/data/locales/mr.txt | 6 +- icu4c/source/data/locales/mr_IN.txt | 4 +- icu4c/source/data/locales/ms.txt | 4 +- icu4c/source/data/locales/ms_BN.txt | 2 +- icu4c/source/data/locales/ms_MY.txt | 4 +- icu4c/source/data/locales/mt.txt | 4 +- icu4c/source/data/locales/mt_MT.txt | 2 +- icu4c/source/data/locales/nb.txt | 60 +- icu4c/source/data/locales/nb_NO.txt | 10 +- icu4c/source/data/locales/nl.txt | 62 +- icu4c/source/data/locales/nl_BE.txt | 4 +- icu4c/source/data/locales/nl_NL.txt | 4 +- icu4c/source/data/locales/nn.txt | 4 +- icu4c/source/data/locales/nn_NO.txt | 4 +- icu4c/source/data/locales/om.txt | 2 +- icu4c/source/data/locales/om_ET.txt | 2 +- icu4c/source/data/locales/om_KE.txt | 2 +- icu4c/source/data/locales/or.txt | 7 +- icu4c/source/data/locales/or_IN.txt | 7 +- icu4c/source/data/locales/pa.txt | 6 +- icu4c/source/data/locales/pa_IN.txt | 4 +- icu4c/source/data/locales/pl.txt | 48 +- icu4c/source/data/locales/pl_PL.txt | 4 +- icu4c/source/data/locales/ps.txt | 2 +- icu4c/source/data/locales/ps_AF.txt | 2 +- icu4c/source/data/locales/pt.txt | 63 +- icu4c/source/data/locales/pt_BR.txt | 4 +- icu4c/source/data/locales/pt_PT.txt | 4 +- icu4c/source/data/locales/resfiles.mk | 94 +-- icu4c/source/data/locales/ro.txt | 4 +- icu4c/source/data/locales/ro_RO.txt | 4 +- icu4c/source/data/locales/root.txt | 24 +- icu4c/source/data/locales/ru.txt | 752 +++++++++--------- icu4c/source/data/locales/ru_RU.txt | 18 +- icu4c/source/data/locales/ru_UA.txt | 18 +- icu4c/source/data/locales/sh.txt | 2 +- icu4c/source/data/locales/sh_YU.txt | 4 +- icu4c/source/data/locales/sk.txt | 54 +- icu4c/source/data/locales/sk_SK.txt | 4 +- icu4c/source/data/locales/sl.txt | 54 +- icu4c/source/data/locales/so.txt | 5 +- icu4c/source/data/locales/so_DJ.txt | 2 +- icu4c/source/data/locales/so_ET.txt | 2 +- icu4c/source/data/locales/so_KE.txt | 2 +- icu4c/source/data/locales/so_SO.txt | 2 +- icu4c/source/data/locales/sq.txt | 4 +- icu4c/source/data/locales/sq_AL.txt | 2 +- icu4c/source/data/locales/sr.txt | 55 +- icu4c/source/data/locales/sr_Cyrl_YU.txt | 4 +- icu4c/source/data/locales/sr_Latn.txt | 220 ++++- icu4c/source/data/locales/sr_Latn_YU.txt | 4 +- icu4c/source/data/locales/sr_YU.txt | 4 +- icu4c/source/data/locales/sv.txt | 63 +- icu4c/source/data/locales/sv_FI.txt | 4 +- icu4c/source/data/locales/sv_SE.txt | 4 +- icu4c/source/data/locales/sw.txt | 4 +- icu4c/source/data/locales/sw_KE.txt | 2 +- icu4c/source/data/locales/sw_TZ.txt | 12 +- icu4c/source/data/locales/ta.txt | 6 +- icu4c/source/data/locales/ta_IN.txt | 4 +- icu4c/source/data/locales/te.txt | 8 +- icu4c/source/data/locales/te_IN.txt | 4 +- icu4c/source/data/locales/th.txt | 22 +- icu4c/source/data/locales/th_TH.txt | 4 +- icu4c/source/data/locales/ti.txt | 27 +- icu4c/source/data/locales/ti_ER.txt | 2 +- icu4c/source/data/locales/ti_ET.txt | 8 +- icu4c/source/data/locales/tr.txt | 56 +- icu4c/source/data/locales/tr_TR.txt | 4 +- icu4c/source/data/locales/uk.txt | 24 +- icu4c/source/data/locales/uk_UA.txt | 4 +- icu4c/source/data/locales/vi.txt | 4 +- icu4c/source/data/locales/vi_VN.txt | 2 +- icu4c/source/data/locales/zh.txt | 76 +- icu4c/source/data/locales/zh_CN.txt | 2 +- icu4c/source/data/locales/zh_HK.txt | 2 +- icu4c/source/data/locales/zh_Hans.txt | 4 +- icu4c/source/data/locales/zh_Hans_CN.txt | 4 +- icu4c/source/data/locales/zh_Hans_SG.txt | 4 +- icu4c/source/data/locales/zh_Hant.txt | 4 +- icu4c/source/data/locales/zh_Hant_HK.txt | 4 +- icu4c/source/data/locales/zh_Hant_MO.txt | 4 +- icu4c/source/data/locales/zh_Hant_TW.txt | 4 +- icu4c/source/data/locales/zh_MO.txt | 2 +- icu4c/source/data/locales/zh_SG.txt | 2 +- icu4c/source/data/locales/zh_TW.txt | 2 +- icu4c/source/i18n/dtfmtsym.cpp | 5 +- icu4c/source/i18n/smpdtfmt.cpp | 6 +- icu4c/source/test/cintltst/creststn.c | 3 +- icu4c/source/test/cintltst/cucdapi.c | 2 +- icu4c/source/test/intltest/caltest.cpp | 6 +- icu4c/source/test/intltest/dtfmttst.cpp | 11 +- icu4c/source/test/intltest/loctest.cpp | 4 + icu4c/source/test/intltest/miscdtfm.cpp | 10 +- icu4c/source/test/testdata/structLocale.txt | 4 + icu4c/source/test/testdata/testaliases.txt | 17 +- 314 files changed, 2174 insertions(+), 2079 deletions(-) rename icu4c/source/data/{locales/hr_HR.txt => coll/sh_BA.txt} (70%) rename icu4c/source/data/{locales/sl_SI.txt => coll/sr_BA.txt} (64%) rename icu4c/source/data/{locales => coll}/sr_Cyrl.txt (71%) rename icu4c/source/data/{locales/ar_EG.txt => coll/sr_Cyrl_BA.txt} (56%) create mode 100644 icu4c/source/data/coll/sr_Cyrl_YU.txt diff --git a/icu4c/source/data/coll/ar.txt b/icu4c/source/data/coll/ar.txt index 4eab22be5af..10e12b8e298 100644 --- a/icu4c/source/data/coll/ar.txt +++ b/icu4c/source/data/coll/ar.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/ar.xml +// * Source File: ../../../cldr/common/collation/ar.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/be.txt b/icu4c/source/data/coll/be.txt index 778cd9c6702..764ccbff01f 100644 --- a/icu4c/source/data/coll/be.txt +++ b/icu4c/source/data/coll/be.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/be.xml +// * Source File: ../../../cldr/common/collation/be.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/bg.txt b/icu4c/source/data/coll/bg.txt index 6333920024f..ce0b544b8c3 100644 --- a/icu4c/source/data/coll/bg.txt +++ b/icu4c/source/data/coll/bg.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/bg.xml +// * Source File: ../../../cldr/common/collation/bg.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/ca.txt b/icu4c/source/data/coll/ca.txt index abaad2252fa..6c54191b2f9 100644 --- a/icu4c/source/data/coll/ca.txt +++ b/icu4c/source/data/coll/ca.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/ca.xml +// * Source File: ../../../cldr/common/collation/ca.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/colfiles.mk b/icu4c/source/data/coll/colfiles.mk index 24510382af4..8c391786352 100644 --- a/icu4c/source/data/coll/colfiles.mk +++ b/icu4c/source/data/coll/colfiles.mk @@ -57,7 +57,8 @@ COLLATION_EMPTY_SOURCE = ar_AE.txt ar_BH.txt ar_DZ.txt ar_EG.txt\ nb_NO.txt nl.txt nl_BE.txt nl_NL.txt nn_NO.txt\ om_ET.txt om_KE.txt pa_IN.txt pl_PL.txt ps_AF.txt\ pt.txt pt_BR.txt pt_PT.txt ro_RO.txt ru_RU.txt\ - ru_UA.txt sh_YU.txt sk_SK.txt sl_SI.txt sq_AL.txt\ + ru_UA.txt sh_BA.txt sh_YU.txt sk_SK.txt sl_SI.txt\ + sq_AL.txt sr_BA.txt sr_Cyrl.txt sr_Cyrl_BA.txt sr_Cyrl_YU.txt\ sr_YU.txt sv_FI.txt sv_SE.txt ta_IN.txt te_IN.txt\ th_TH.txt tr_TR.txt uk_UA.txt vi_VN.txt zh_CN.txt\ zh_SG.txt diff --git a/icu4c/source/data/coll/cs.txt b/icu4c/source/data/coll/cs.txt index 943d332a262..e77052ded5b 100644 --- a/icu4c/source/data/coll/cs.txt +++ b/icu4c/source/data/coll/cs.txt @@ -3,14 +3,14 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/cs.xml +// * Source File: ../../../cldr/common/collation/cs.xml // * // *************************************************************************** /** * ICU source: ./xml/collation/cs.xml */ cs{ - Version{"1.19"} + Version{"1.20"} collations{ standard{ Sequence{"&C<č<<<Č&H source: ./xml/collation/fi.xml */ fi{ - Version{"1.18"} + Version{"1.19"} collations{ standard{ Sequence{ diff --git a/icu4c/source/data/coll/fo.txt b/icu4c/source/data/coll/fo.txt index 0aaad1c783c..7430e4bb773 100644 --- a/icu4c/source/data/coll/fo.txt +++ b/icu4c/source/data/coll/fo.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/fo.xml +// * Source File: ../../../cldr/common/collation/fo.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/fr.txt b/icu4c/source/data/coll/fr.txt index 54d76ed7600..eb02bdf8a04 100644 --- a/icu4c/source/data/coll/fr.txt +++ b/icu4c/source/data/coll/fr.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/fr.xml +// * Source File: ../../../cldr/common/collation/fr.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/gu.txt b/icu4c/source/data/coll/gu.txt index 3124ef91fde..96a484df7dd 100644 --- a/icu4c/source/data/coll/gu.txt +++ b/icu4c/source/data/coll/gu.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/gu.xml +// * Source File: ../../../cldr/common/collation/gu.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/he.txt b/icu4c/source/data/coll/he.txt index 8b2fc9a32cb..2dd4637d5b9 100644 --- a/icu4c/source/data/coll/he.txt +++ b/icu4c/source/data/coll/he.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/he.xml +// * Source File: ../../../cldr/common/collation/he.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/hi.txt b/icu4c/source/data/coll/hi.txt index 2e996405362..917396b9f02 100644 --- a/icu4c/source/data/coll/hi.txt +++ b/icu4c/source/data/coll/hi.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/hi.xml +// * Source File: ../../../cldr/common/collation/hi.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/hr.txt b/icu4c/source/data/coll/hr.txt index 301e74602c1..01a04850832 100644 --- a/icu4c/source/data/coll/hr.txt +++ b/icu4c/source/data/coll/hr.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/hr.xml +// * Source File: ../../../cldr/common/collation/hr.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/hu.txt b/icu4c/source/data/coll/hu.txt index ae990bd4255..cf148109c79 100644 --- a/icu4c/source/data/coll/hu.txt +++ b/icu4c/source/data/coll/hu.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/hu.xml +// * Source File: ../../../cldr/common/collation/hu.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/is.txt b/icu4c/source/data/coll/is.txt index a31d73421f4..7457d161824 100644 --- a/icu4c/source/data/coll/is.txt +++ b/icu4c/source/data/coll/is.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/is.xml +// * Source File: ../../../cldr/common/collation/is.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/it.txt b/icu4c/source/data/coll/it.txt index 56847f5b148..73e06c799a6 100644 --- a/icu4c/source/data/coll/it.txt +++ b/icu4c/source/data/coll/it.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/it.xml +// * Source File: ../../../cldr/common/collation/it.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/ja.txt b/icu4c/source/data/coll/ja.txt index b8590438c9e..9017b796593 100644 --- a/icu4c/source/data/coll/ja.txt +++ b/icu4c/source/data/coll/ja.txt @@ -3,14 +3,14 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/ja.xml +// * Source File: ../../../cldr/common/collation/ja.xml // * // *************************************************************************** /** * ICU source: ./xml/collation/ja.xml */ ja{ - Version{"1.19"} + Version{"1.20"} collations{ standard{ Sequence{ @@ -254,58 +254,58 @@ ja{ "&¥=￥" "&¦=￤" "&¬=￢" - "&ᄀ=ﾡ" - "&ᄁ=ﾢ" - "&ᄂ=ﾤ" - "&ᄃ=ﾧ" - "&ᄄ=ﾨ" - "&ᄅ=ﾩ" - "&ᄆ=ﾱ" - "&ᄇ=ﾲ" - "&ᄈ=ﾳ" - "&ᄉ=ﾵ" - "&ᄊ=ﾶ" - "&ᄋ=ﾷ" - "&ᄌ=ﾸ" - "&ᄍ=ﾹ" - "&ᄎ=ﾺ" - "&ᄏ=ﾻ" - "&ᄐ=ﾼ" - "&ᄑ=ﾽ" - "&ᄒ=ﾾ" - "&ᄚ=ﾰ" - "&ᄡ=ﾴ" - "&ᅠ=ﾠ" - "&ᅡ=ￂ" - "&ᅢ=ￃ" - "&ᅣ=ￄ" - "&ᅤ=ￅ" - "&ᅥ=ￆ" - "&ᅦ=ￇ" - "&ᅧ=ￊ" - "&ᅨ=ￋ" - "&ᅩ=ￌ" - "&ᅪ=ￍ" - "&ᅫ=ￎ" - "&ᅬ=ￏ" - "&ᅭ=ￒ" - "&ᅮ=ￓ" - "&ᅯ=ￔ" - "&ᅰ=ￕ" - "&ᅱ=ￖ" - "&ᅲ=ￗ" - "&ᅳ=ￚ" - "&ᅴ=ￛ" - "&ᅵ=ￜ" - "&ᆪ=ﾣ" - "&ᆬ=ﾥ" - "&ᆭ=ﾦ" - "&ᆰ=ﾪ" - "&ᆱ=ﾫ" - "&ᆲ=ﾬ" - "&ᆳ=ﾭ" - "&ᆴ=ﾮ" - "&ᆵ=ﾯ" + "&ᄀ=ﾡ=ㄱ" + "&ᄁ=ﾢ=ㄲ" + "&ᄂ=ﾤ=ㄴ" + "&ᄃ=ﾧ=ㄷ" + "&ᄄ=ﾨ=ㄸ" + "&ᄅ=ﾩ=ㄹ" + "&ᄆ=ﾱ=ㅁ" + "&ᄇ=ﾲ=ㅂ" + "&ᄈ=ﾳ=ㅃ" + "&ᄉ=ﾵ=ㅅ" + "&ᄊ=ﾶ=ㅆ" + "&ᄋ=ﾷ=ㅇ" + "&ᄌ=ﾸ=ㅈ" + "&ᄍ=ﾹ=ㅉ" + "&ᄎ=ﾺ=ㅊ" + "&ᄏ=ﾻ=ㅋ" + "&ᄐ=ﾼ=ㅌ" + "&ᄑ=ﾽ=ㅍ" + "&ᄒ=ﾾ=ㅎ" + "&ᄚ=ﾰ=ㅀ" + "&ᄡ=ﾴ=ㅄ" + "&ᅠ=ﾠ=ㅤ" + "&ᅡ=ￂ=ㅏ" + "&ᅢ=ￃ=ㅐ" + "&ᅣ=ￄ=ㅑ" + "&ᅤ=ￅ=ㅒ" + "&ᅥ=ￆ=ㅓ" + "&ᅦ=ￇ=ㅔ" + "&ᅧ=ￊ=ㅕ" + "&ᅨ=ￋ=ㅖ" + "&ᅩ=ￌ=ㅗ" + "&ᅪ=ￍ=ㅘ" + "&ᅫ=ￎ=ㅙ" + "&ᅬ=ￏ=ㅚ" + "&ᅭ=ￒ=ㅛ" + "&ᅮ=ￓ=ㅜ" + "&ᅯ=ￔ=ㅝ" + "&ᅰ=ￕ=ㅞ" + "&ᅱ=ￖ=ㅟ" + "&ᅲ=ￗ=ㅠ" + "&ᅳ=ￚ=ㅡ" + "&ᅴ=ￛ=ㅢ" + "&ᅵ=ￜ=ㅣ" + "&ᆪ=ﾣ=ㄳ" + "&ᆬ=ﾥ=ㄵ" + "&ᆭ=ﾦ=ㄶ" + "&ᆰ=ﾪ=ㄺ" + "&ᆱ=ﾫ=ㄻ" + "&ᆲ=ﾬ=ㄼ" + "&ᆳ=ﾭ=ㄽ" + "&ᆴ=ﾮ=ㄾ" + "&ᆵ=ﾯ=ㄿ" "&₩=￦" "&←=￩" "&↑=￪" diff --git a/icu4c/source/data/coll/kk.txt b/icu4c/source/data/coll/kk.txt index 84298dd6f63..a82a804828c 100644 --- a/icu4c/source/data/coll/kk.txt +++ b/icu4c/source/data/coll/kk.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/kk.xml +// * Source File: ../../../cldr/common/collation/kk.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/kl.txt b/icu4c/source/data/coll/kl.txt index bf233265cbb..f902086bddf 100644 --- a/icu4c/source/data/coll/kl.txt +++ b/icu4c/source/data/coll/kl.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/kl.xml +// * Source File: ../../../cldr/common/collation/kl.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/kn.txt b/icu4c/source/data/coll/kn.txt index 5460a49e8bd..4dda0df8a55 100644 --- a/icu4c/source/data/coll/kn.txt +++ b/icu4c/source/data/coll/kn.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/kn.xml +// * Source File: ../../../cldr/common/collation/kn.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/ko.txt b/icu4c/source/data/coll/ko.txt index a3793a82afe..78f21ac4be8 100644 --- a/icu4c/source/data/coll/ko.txt +++ b/icu4c/source/data/coll/ko.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/ko.xml +// * Source File: ../../../cldr/common/collation/ko.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/lt.txt b/icu4c/source/data/coll/lt.txt index 19195910aaf..76e5c73dd35 100644 --- a/icu4c/source/data/coll/lt.txt +++ b/icu4c/source/data/coll/lt.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/lt.xml +// * Source File: ../../../cldr/common/collation/lt.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/lv.txt b/icu4c/source/data/coll/lv.txt index 4205acd7e64..3628b01a68f 100644 --- a/icu4c/source/data/coll/lv.txt +++ b/icu4c/source/data/coll/lv.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/lv.xml +// * Source File: ../../../cldr/common/collation/lv.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/mk.txt b/icu4c/source/data/coll/mk.txt index d1875477deb..b8701118cbb 100644 --- a/icu4c/source/data/coll/mk.txt +++ b/icu4c/source/data/coll/mk.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/mk.xml +// * Source File: ../../../cldr/common/collation/mk.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/ml.txt b/icu4c/source/data/coll/ml.txt index d665ab5156b..2af6ecf4fa6 100644 --- a/icu4c/source/data/coll/ml.txt +++ b/icu4c/source/data/coll/ml.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/ml.xml +// * Source File: ../../../cldr/common/collation/ml.xml // * // *************************************************************************** ml{ diff --git a/icu4c/source/data/coll/mr.txt b/icu4c/source/data/coll/mr.txt index 062ff1e89de..81821928446 100644 --- a/icu4c/source/data/coll/mr.txt +++ b/icu4c/source/data/coll/mr.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/mr.xml +// * Source File: ../../../cldr/common/collation/mr.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/mt.txt b/icu4c/source/data/coll/mt.txt index 5d5e2467549..9987781f1c2 100644 --- a/icu4c/source/data/coll/mt.txt +++ b/icu4c/source/data/coll/mt.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/mt.xml +// * Source File: ../../../cldr/common/collation/mt.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/nb.txt b/icu4c/source/data/coll/nb.txt index 2a6c4d938eb..71db9712ec5 100644 --- a/icu4c/source/data/coll/nb.txt +++ b/icu4c/source/data/coll/nb.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/nb.xml +// * Source File: ../../../cldr/common/collation/nb.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/nn.txt b/icu4c/source/data/coll/nn.txt index 7229908558b..872487e7e98 100644 --- a/icu4c/source/data/coll/nn.txt +++ b/icu4c/source/data/coll/nn.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/nn.xml +// * Source File: ../../../cldr/common/collation/nn.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/om.txt b/icu4c/source/data/coll/om.txt index 55577b5dae7..3c77fea4920 100644 --- a/icu4c/source/data/coll/om.txt +++ b/icu4c/source/data/coll/om.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/om.xml +// * Source File: ../../../cldr/common/collation/om.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/or.txt b/icu4c/source/data/coll/or.txt index ee43edd75df..c9eccc11898 100644 --- a/icu4c/source/data/coll/or.txt +++ b/icu4c/source/data/coll/or.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/or.xml +// * Source File: ../../../cldr/common/collation/or.xml // * // *************************************************************************** or{ diff --git a/icu4c/source/data/coll/pa.txt b/icu4c/source/data/coll/pa.txt index 2d3ee578177..30c8555af8d 100644 --- a/icu4c/source/data/coll/pa.txt +++ b/icu4c/source/data/coll/pa.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/pa.xml +// * Source File: ../../../cldr/common/collation/pa.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/pl.txt b/icu4c/source/data/coll/pl.txt index 58371c1ef85..3593c1f9844 100644 --- a/icu4c/source/data/coll/pl.txt +++ b/icu4c/source/data/coll/pl.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/pl.xml +// * Source File: ../../../cldr/common/collation/pl.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/ps.txt b/icu4c/source/data/coll/ps.txt index 864342fd2d9..01a047a38fe 100644 --- a/icu4c/source/data/coll/ps.txt +++ b/icu4c/source/data/coll/ps.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/ps.xml +// * Source File: ../../../cldr/common/collation/ps.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/ro.txt b/icu4c/source/data/coll/ro.txt index d86ac715ed5..9546aea040c 100644 --- a/icu4c/source/data/coll/ro.txt +++ b/icu4c/source/data/coll/ro.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/ro.xml +// * Source File: ../../../cldr/common/collation/ro.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/root.txt b/icu4c/source/data/coll/root.txt index f6a2b110615..77413606f01 100644 --- a/icu4c/source/data/coll/root.txt +++ b/icu4c/source/data/coll/root.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/root.xml +// * Source File: ../../../cldr/common/collation/root.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/ru.txt b/icu4c/source/data/coll/ru.txt index cd56fbdd8a5..fd8c62f77e6 100644 --- a/icu4c/source/data/coll/ru.txt +++ b/icu4c/source/data/coll/ru.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/ru.xml +// * Source File: ../../../cldr/common/collation/ru.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/sh.txt b/icu4c/source/data/coll/sh.txt index 13e2d826769..5bc266b83b1 100644 --- a/icu4c/source/data/coll/sh.txt +++ b/icu4c/source/data/coll/sh.txt @@ -3,13 +3,13 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/sh.xml +// * Source File: ../../../cldr/common/collation/sh.xml // * // *************************************************************************** /** * ICU source: ./xml/collation/sh.xml */ sh{ - Version{"1.18"} + Version{"1.19"} collations:alias{"hr/collations"} } diff --git a/icu4c/source/data/locales/hr_HR.txt b/icu4c/source/data/coll/sh_BA.txt similarity index 70% rename from icu4c/source/data/locales/hr_HR.txt rename to icu4c/source/data/coll/sh_BA.txt index c20444d611a..e53bd977aaf 100644 --- a/icu4c/source/data/locales/hr_HR.txt +++ b/icu4c/source/data/coll/sh_BA.txt @@ -3,9 +3,15 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/main/hr_HR.xml +// * Source File: deprecatedList.xml // * // *************************************************************************** -hr_HR{ - Version{"1.26"} +/** + * validSubLocale of "sh" + */ +sh_BA{ + /** + * so genrb doesn't issue warnings + */ + ___{""} } diff --git a/icu4c/source/data/coll/sk.txt b/icu4c/source/data/coll/sk.txt index d9767b97cc6..bf84d1f51f5 100644 --- a/icu4c/source/data/coll/sk.txt +++ b/icu4c/source/data/coll/sk.txt @@ -3,21 +3,21 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/sk.xml +// * Source File: ../../../cldr/common/collation/sk.xml // * // *************************************************************************** /** * ICU source: ./xml/collation/sk.xml */ sk{ - Version{"1.19"} + Version{"1.20"} collations{ standard{ Sequence{ "&A<ä<<<Ä" "&C<č<<<Č" "&D<đ<<<Đ" - "&H source: ./xml/collation/sr.xml */ sr{ - Version{"1.15"} + Version{"1.16"} collations:alias{"ru/collations"} } diff --git a/icu4c/source/data/locales/sl_SI.txt b/icu4c/source/data/coll/sr_BA.txt similarity index 64% rename from icu4c/source/data/locales/sl_SI.txt rename to icu4c/source/data/coll/sr_BA.txt index 5d16503211c..3e4782584f7 100644 --- a/icu4c/source/data/locales/sl_SI.txt +++ b/icu4c/source/data/coll/sr_BA.txt @@ -3,15 +3,15 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/main/sl_SI.xml +// * Source File: deprecatedList.xml // * // *************************************************************************** -sl_SI{ - NumberPatterns{ - "#,##0.###", - "#,##0.00 ¤", - "#,##0%", - "#E0", - } - Version{"1.28"} +/** + * validSubLocale of "sr" + */ +sr_BA{ + /** + * so genrb doesn't issue warnings + */ + ___{""} } diff --git a/icu4c/source/data/locales/sr_Cyrl.txt b/icu4c/source/data/coll/sr_Cyrl.txt similarity index 71% rename from icu4c/source/data/locales/sr_Cyrl.txt rename to icu4c/source/data/coll/sr_Cyrl.txt index 628865b31ad..2a2b9a869d6 100644 --- a/icu4c/source/data/locales/sr_Cyrl.txt +++ b/icu4c/source/data/coll/sr_Cyrl.txt @@ -3,9 +3,15 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/main/sr_Cyrl.xml +// * Source File: deprecatedList.xml // * // *************************************************************************** +/** + * validSubLocale of "sr" + */ sr_Cyrl{ - Version{"1.9"} + /** + * so genrb doesn't issue warnings + */ + ___{""} } diff --git a/icu4c/source/data/locales/ar_EG.txt b/icu4c/source/data/coll/sr_Cyrl_BA.txt similarity index 56% rename from icu4c/source/data/locales/ar_EG.txt rename to icu4c/source/data/coll/sr_Cyrl_BA.txt index 8f84cb61676..eb45ac0ade6 100644 --- a/icu4c/source/data/locales/ar_EG.txt +++ b/icu4c/source/data/coll/sr_Cyrl_BA.txt @@ -3,19 +3,15 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/main/ar_EG.xml +// * Source File: deprecatedList.xml // * // *************************************************************************** -ar_EG{ - Version{"1.25"} - calendar{ - gregorian{ - weekend:intvector{ - 6, - 0, - 7, - 86400000, - } - } - } +/** + * validSubLocale of "sr" + */ +sr_Cyrl_BA{ + /** + * so genrb doesn't issue warnings + */ + ___{""} } diff --git a/icu4c/source/data/coll/sr_Cyrl_YU.txt b/icu4c/source/data/coll/sr_Cyrl_YU.txt new file mode 100644 index 00000000000..1a71d880c79 --- /dev/null +++ b/icu4c/source/data/coll/sr_Cyrl_YU.txt @@ -0,0 +1,17 @@ +// *************************************************************************** +// * +// * Copyright (C) 2005 International Business Machines +// * Corporation and others. All Rights Reserved. +// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java +// * Source File: deprecatedList.xml +// * +// *************************************************************************** +/** + * validSubLocale of "sr" + */ +sr_Cyrl_YU{ + /** + * so genrb doesn't issue warnings + */ + ___{""} +} diff --git a/icu4c/source/data/coll/sv.txt b/icu4c/source/data/coll/sv.txt index 6f695c7e331..8ae97615cba 100644 --- a/icu4c/source/data/coll/sv.txt +++ b/icu4c/source/data/coll/sv.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/sv.xml +// * Source File: ../../../cldr/common/collation/sv.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/ta.txt b/icu4c/source/data/coll/ta.txt index d15309cb1ed..57ecb246b07 100644 --- a/icu4c/source/data/coll/ta.txt +++ b/icu4c/source/data/coll/ta.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/ta.xml +// * Source File: ../../../cldr/common/collation/ta.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/te.txt b/icu4c/source/data/coll/te.txt index d412c71ef2f..f05da268e4f 100644 --- a/icu4c/source/data/coll/te.txt +++ b/icu4c/source/data/coll/te.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/te.xml +// * Source File: ../../../cldr/common/collation/te.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/th.txt b/icu4c/source/data/coll/th.txt index a596e4b3691..9579e1fc2e4 100644 --- a/icu4c/source/data/coll/th.txt +++ b/icu4c/source/data/coll/th.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/th.xml +// * Source File: ../../../cldr/common/collation/th.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/tr.txt b/icu4c/source/data/coll/tr.txt index 3e877ca82f1..85eaf163b5f 100644 --- a/icu4c/source/data/coll/tr.txt +++ b/icu4c/source/data/coll/tr.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/tr.xml +// * Source File: ../../../cldr/common/collation/tr.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/uk.txt b/icu4c/source/data/coll/uk.txt index af24abc01f2..f7b190c6a32 100644 --- a/icu4c/source/data/coll/uk.txt +++ b/icu4c/source/data/coll/uk.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/uk.xml +// * Source File: ../../../cldr/common/collation/uk.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/vi.txt b/icu4c/source/data/coll/vi.txt index ad5dd2de62e..148f5e43913 100644 --- a/icu4c/source/data/coll/vi.txt +++ b/icu4c/source/data/coll/vi.txt @@ -3,7 +3,7 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/vi.xml +// * Source File: ../../../cldr/common/collation/vi.xml // * // *************************************************************************** /** diff --git a/icu4c/source/data/coll/zh.txt b/icu4c/source/data/coll/zh.txt index 5742dcd165f..d68410a7346 100644 --- a/icu4c/source/data/coll/zh.txt +++ b/icu4c/source/data/coll/zh.txt @@ -3,11 +3,14 @@ // * Copyright (C) 2005 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation/zh.xml +// * Source File: ../../../cldr/common/collation/zh.xml // * // *************************************************************************** +/** + * ICU source: ./xml/collation/zh.xml + */ zh{ - Version{"1.20"} + Version{"1.21"} collations{ big5han{ Sequence{ @@ -1261,6 +1264,20 @@ zh{ } Version{"1.3"} } + standard{ + Sequence{ + "&[before 2]a<<ā<<<Ā<<á<<<Á<<ǎ<<<Ǎ<<à<<<À" + "&[before 2]e<<ē<<<Ē<<é<<<É<<ě<<<Ě<<è<<<È" + "&e<<ê̄<<<Ê̄<<ế<<<Ế<<ê̌<<<Ê̌<<ề<<<Ề" + "&[before 2]i<<ī<<<Ī<<í<<<Í<<ǐ<<<Ǐ<<ì<<<Ì" + "&[before 2]m< gmtLen && - (text.caseCompare(start, gmtLen, gGmt, 0, gmtLen, U_FOLD_CASE_DEFAULT)) == 0) - { + if ((text.length() - start) >= gmtLen && + (text.caseCompare(start, gmtLen, gGmt, 0, gmtLen, U_FOLD_CASE_DEFAULT)) == 0) + { cal.set(UCAL_DST_OFFSET, 0); pos.setIndex(start + gmtLen); diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c index 7681f3ef6cf..141970dd383 100644 --- a/icu4c/source/test/cintltst/creststn.c +++ b/icu4c/source/test/cintltst/creststn.c @@ -2029,7 +2029,7 @@ static void TestFallback() UResourceBundle* myResB = ures_open(NULL,"no_NO_NY",&err); UResourceBundle* resLocID = ures_getByKey(myResB, "Version", NULL, &err); UResourceBundle* tResB; - static const UChar versionStr[] = { 0x0031, 0x002E, 0x0032, 0x0035, 0x0000}; + static const UChar versionStr[] = { 0x0031, 0x002E, 0x0032, 0x0037, 0x0000}; if(err != U_ZERO_ERROR){ log_data_err("Expected U_ZERO_ERROR when trying to test no_NO_NY aliased to nn_NO for Version err=%s\n",u_errorName(err)); @@ -2638,3 +2638,4 @@ static void TestCLDRStyleAliases(void) { ures_close(alias); ures_close(rb); } + diff --git a/icu4c/source/test/cintltst/cucdapi.c b/icu4c/source/test/cintltst/cucdapi.c index 287f9077650..4972e6ae76d 100644 --- a/icu4c/source/test/cintltst/cucdapi.c +++ b/icu4c/source/test/cintltst/cucdapi.c @@ -84,7 +84,7 @@ void TestUScriptCodeAPI(){ { UErrorCode err = U_ZERO_ERROR; int32_t capacity=0; - UScriptCode jaCode[]={ USCRIPT_KATAKANA,USCRIPT_HIRAGANA,USCRIPT_HAN}; + UScriptCode jaCode[]={USCRIPT_KATAKANA, USCRIPT_HIRAGANA, USCRIPT_HAN }; UScriptCode script[10]={USCRIPT_INVALID_CODE}; int32_t num = uscript_getCode("ja",script,capacity, &err); /* preflight */ diff --git a/icu4c/source/test/intltest/caltest.cpp b/icu4c/source/test/intltest/caltest.cpp index 0ec15c2d1e8..0efacb122bf 100644 --- a/icu4c/source/test/intltest/caltest.cpp +++ b/icu4c/source/test/intltest/caltest.cpp @@ -1338,7 +1338,11 @@ void CalendarTest::yearAddTest(Calendar& cal, UErrorCode& status) { int32_t woy = cal.get(UCAL_WEEK_OF_YEAR, status); int32_t dow = cal.get(UCAL_DOW_LOCAL, status); UDate t = cal.getTime(status); - + + if(U_FAILURE(status)){ + errln(UnicodeString("Failed to create Calendar for locale. Error: ") + UnicodeString(u_errorName(status))); + return; + } UnicodeString str, str2; SimpleDateFormat fmt(UnicodeString("EEE MMM dd yyyy / YYYY'-W'ww-ee"), status); fmt.setCalendar(cal); diff --git a/icu4c/source/test/intltest/dtfmttst.cpp b/icu4c/source/test/intltest/dtfmttst.cpp index 9a215aa0a63..e39cc3c5218 100644 --- a/icu4c/source/test/intltest/dtfmttst.cpp +++ b/icu4c/source/test/intltest/dtfmttst.cpp @@ -294,7 +294,10 @@ void DateFormatTest::TestFieldPosition() { } } dateFormats[3] = new SimpleDateFormat(buf, Locale::getUS(), ec); - + if(U_FAILURE(ec)){ + errln(UnicodeString("Could not create SimpleDateFormat object for locale en_US. Error: " )+ UnicodeString(u_errorName(ec))); + return; + } UDate aug13 = 871508052513.0; // Expected output field values for above DateFormats on aug13 @@ -905,11 +908,11 @@ DateFormatTest::TestDateFormatZone146() UDate greenwichdate = greenwichcalendar->getTime(status); // format every way UnicodeString DATA [] = { - UnicodeString("simple format: "), UnicodeString("04/04/97 23:00 GMT"), + UnicodeString("simple format: "), UnicodeString("04/04/97 23:00 GMT+00:00"), UnicodeString("MM/dd/yy HH:mm z"), - UnicodeString("full format: "), UnicodeString("Friday, April 4, 1997 11:00:00 o'clock PM GMT"), + UnicodeString("full format: "), UnicodeString("Friday, April 4, 1997 11:00:00 o'clock PM GMT+00:00"), UnicodeString("EEEE, MMMM d, yyyy h:mm:ss 'o''clock' a z"), - UnicodeString("long format: "), UnicodeString("April 4, 1997 11:00:00 PM GMT"), + UnicodeString("long format: "), UnicodeString("April 4, 1997 11:00:00 PM GMT+00:00"), UnicodeString("MMMM d, yyyy h:mm:ss a z"), UnicodeString("default format: "), UnicodeString("04-Apr-97 11:00:00 PM"), UnicodeString("dd-MMM-yy h:mm:ss a"), diff --git a/icu4c/source/test/intltest/loctest.cpp b/icu4c/source/test/intltest/loctest.cpp index 0ba31cf2393..cff8d4ae46d 100644 --- a/icu4c/source/test/intltest/loctest.cpp +++ b/icu4c/source/test/intltest/loctest.cpp @@ -1318,6 +1318,10 @@ LocaleTest::Test4139940() UDate mydate = date(98,3,13); // A Monday UErrorCode status = U_ZERO_ERROR; SimpleDateFormat df_full("EEEE", mylocale, status); + if(U_FAILURE(status)){ + errln(UnicodeString("Could not create SimpleDateFormat object for locale hu. Error: " )+ UnicodeString(u_errorName(status))); + return; + } UnicodeString str; FieldPosition pos(FieldPosition::DONT_CARE); df_full.format(mydate, str, pos); diff --git a/icu4c/source/test/intltest/miscdtfm.cpp b/icu4c/source/test/intltest/miscdtfm.cpp index ffb5bf34bf2..ce843ea10c5 100644 --- a/icu4c/source/test/intltest/miscdtfm.cpp +++ b/icu4c/source/test/intltest/miscdtfm.cpp @@ -338,25 +338,25 @@ DateFormatMiscTests::test4117335() int32_t rowCount, colCount; const UnicodeString **zones = symbols->getZoneStrings(rowCount, colCount); - int pos = 6; + int pos = 5; logln(UnicodeString("Long zone name = ") + zones[pos][1]); if (zones[pos][1] != jstLong) { - errln("*** Should have been " + prettify(jstLong)); + errln("*** Should have been " + prettify(jstLong)+ " but it is: " + prettify(zones[pos][1])); //throw new Exception("Error in long TZ name"); } logln(UnicodeString("Short zone name = ") + zones[pos][2]); if (zones[pos][2] != jstShort) { - errln("*** Should have been " + jstShort + " but it is: " + prettify(zones[pos][2])); + errln("*** Should have been " + prettify(jstShort) + " but it is: " + prettify(zones[pos][2])); //throw new Exception("Error in short TZ name"); } logln(UnicodeString("Long zone name = ") + zones[pos][3]); if (zones[pos][3] != jstLong) { - errln("*** Should have been " + jstLong); + errln("*** Should have been " + prettify(jstLong) + " but it is: " + prettify(zones[pos][3])); //throw new Exception("Error in long TZ name"); } logln(UnicodeString("SHORT zone name = ") + zones[pos][4]); if (zones[pos][4] != jstShort) { - errln("*** Should have been " + jstShort); + errln("*** Should have been " + prettify(jstShort)+ " but it is: " + prettify(zones[pos][4])); //throw new Exception("Error in short TZ name"); } delete symbols; diff --git a/icu4c/source/test/testdata/structLocale.txt b/icu4c/source/test/testdata/structLocale.txt index f13afb14b7e..da78132e507 100644 --- a/icu4c/source/test/testdata/structLocale.txt +++ b/icu4c/source/test/testdata/structLocale.txt @@ -576,6 +576,10 @@ structLocale{ "", "", } + CHW{ + "", + "", + } CKD{ "", "", diff --git a/icu4c/source/test/testdata/testaliases.txt b/icu4c/source/test/testdata/testaliases.txt index 510495c07ef..f46e029a3ec 100644 --- a/icu4c/source/test/testdata/testaliases.txt +++ b/icu4c/source/test/testdata/testaliases.txt @@ -45,18 +45,19 @@ testaliases // WARNING: this test assumes that on all platforms digits sort normally // if not, the test may fail testGetStringByKeyAliasing { - KeyAlias0PST:alias { "/ICUDATA/en/zoneStrings/15/0" } //"America/Los_Angeles", - KeyAlias1PacificStandardTime:alias { "/ICUDATA/en/zoneStrings/15/1" } //"Pacific Standard Time", - KeyAlias2PDT:alias { "/ICUDATA/en/zoneStrings/15/4" } //"PDT", - KeyAlias3LosAngeles:alias { "/ICUDATA/en/zoneStrings/15/5" } //"Los Angeles", + KeyAlias0PST:alias { "/ICUDATA/en/zoneStrings/14/0" } //"America/Los_Angeles", + KeyAlias1PacificStandardTime:alias { "/ICUDATA/en/zoneStrings/14/1" } //"Pacific Standard Time", + KeyAlias2PDT:alias { "/ICUDATA/en/zoneStrings/14/4" } //"PDT", + KeyAlias3LosAngeles:alias { "/ICUDATA/en/zoneStrings/14/5" } //"Los Angeles", } testGetStringByIndexAliasing { - :alias { "/ICUDATA/en/zoneStrings/15/0" } //"America/Los_Angeles", - :alias { "/ICUDATA/en/zoneStrings/15/1" } //"Pacific Standard Time", - :alias { "/ICUDATA/en/zoneStrings/15/4" } //"PDT", - :alias { "/ICUDATA/en/zoneStrings/15/5" } //"Los Angeles", + :alias { "/ICUDATA/en/zoneStrings/14/0" } //"America/Los_Angeles", + :alias { "/ICUDATA/en/zoneStrings/14/1" } //"Pacific Standard Time", + :alias { "/ICUDATA/en/zoneStrings/14/4" } //"PDT", + :alias { "/ICUDATA/en/zoneStrings/14/5" } //"Los Angeles", } + } //eof