From e10141ecc9666089575745c3ea012c02411e69b9 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Wed, 13 Oct 2004 00:39:42 +0000 Subject: [PATCH] ICU-3938 Partial incorporation of CLDR data. Some of the currency, weekend and DateTimeElements will be fixed later when the draftness is removed from some of the data. X-SVN-Rev: 16464 --- icu4c/source/common/locmap.c | 25 +- icu4c/source/common/unicode/uscript.h | 2 +- icu4c/source/data/locales/af.txt | 7 +- icu4c/source/data/locales/af_ZA.txt | 4 +- icu4c/source/data/locales/am.txt | 7 +- icu4c/source/data/locales/am_ET.txt | 4 +- icu4c/source/data/locales/ar.txt | 7 +- icu4c/source/data/locales/ar_AE.txt | 14 +- icu4c/source/data/locales/ar_BH.txt | 14 +- icu4c/source/data/locales/ar_DZ.txt | 14 +- icu4c/source/data/locales/ar_EG.txt | 14 +- icu4c/source/data/locales/ar_IN.txt | 4 +- icu4c/source/data/locales/ar_IQ.txt | 3 +- icu4c/source/data/locales/ar_JO.txt | 10 +- icu4c/source/data/locales/ar_KW.txt | 14 +- icu4c/source/data/locales/ar_LB.txt | 4 +- icu4c/source/data/locales/ar_LY.txt | 3 +- icu4c/source/data/locales/ar_MA.txt | 3 +- icu4c/source/data/locales/ar_OM.txt | 14 +- icu4c/source/data/locales/ar_QA.txt | 10 +- icu4c/source/data/locales/ar_SA.txt | 10 +- icu4c/source/data/locales/ar_SD.txt | 3 +- icu4c/source/data/locales/ar_SY.txt | 10 +- icu4c/source/data/locales/ar_TN.txt | 4 +- icu4c/source/data/locales/ar_YE.txt | 10 +- icu4c/source/data/locales/be.txt | 7 +- icu4c/source/data/locales/be_BY.txt | 3 +- icu4c/source/data/locales/bg.txt | 7 +- icu4c/source/data/locales/bg_BG.txt | 3 +- icu4c/source/data/locales/bn.txt | 7 +- icu4c/source/data/locales/bn_IN.txt | 4 +- icu4c/source/data/locales/ca.txt | 7 +- icu4c/source/data/locales/ca_ES.txt | 4 +- icu4c/source/data/locales/cs.txt | 13 +- icu4c/source/data/locales/cs_CZ.txt | 3 +- icu4c/source/data/locales/da.txt | 9 +- icu4c/source/data/locales/da_DK.txt | 3 +- icu4c/source/data/locales/de.txt | 9 +- icu4c/source/data/locales/de_AT.txt | 4 +- icu4c/source/data/locales/de_BE.txt | 4 +- icu4c/source/data/locales/de_CH.txt | 3 +- icu4c/source/data/locales/de_DE.txt | 3 +- icu4c/source/data/locales/de_LU.txt | 4 +- icu4c/source/data/locales/el.txt | 7 +- icu4c/source/data/locales/el_GR.txt | 3 +- icu4c/source/data/locales/en.txt | 32 +- 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 | 4 +- icu4c/source/data/locales/en_HK.txt | 4 +- icu4c/source/data/locales/en_IE.txt | 4 +- 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_SG.txt | 4 +- icu4c/source/data/locales/en_US.txt | 3 +- icu4c/source/data/locales/en_US_POSIX.txt | 9 +- icu4c/source/data/locales/en_VI.txt | 3 +- icu4c/source/data/locales/en_ZA.txt | 4 +- icu4c/source/data/locales/en_ZW.txt | 4 +- icu4c/source/data/locales/eo.txt | 7 +- icu4c/source/data/locales/es.txt | 9 +- icu4c/source/data/locales/es_AR.txt | 4 +- icu4c/source/data/locales/es_BO.txt | 4 +- icu4c/source/data/locales/es_CL.txt | 4 +- icu4c/source/data/locales/es_CO.txt | 4 +- icu4c/source/data/locales/es_CR.txt | 4 +- icu4c/source/data/locales/es_DO.txt | 4 +- icu4c/source/data/locales/es_EC.txt | 4 +- icu4c/source/data/locales/es_ES.txt | 4 +- 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 | 4 +- icu4c/source/data/locales/es_SV.txt | 4 +- icu4c/source/data/locales/es_US.txt | 4 +- icu4c/source/data/locales/es_UY.txt | 4 +- icu4c/source/data/locales/es_VE.txt | 4 +- icu4c/source/data/locales/et.txt | 7 +- icu4c/source/data/locales/et_EE.txt | 3 +- icu4c/source/data/locales/eu.txt | 7 +- icu4c/source/data/locales/eu_ES.txt | 4 +- icu4c/source/data/locales/fa.txt | 9 +- icu4c/source/data/locales/fa_AF.txt | 4 +- icu4c/source/data/locales/fa_IR.txt | 4 +- icu4c/source/data/locales/fi.txt | 9 +- icu4c/source/data/locales/fi_FI.txt | 3 +- icu4c/source/data/locales/fo.txt | 7 +- icu4c/source/data/locales/fo_FO.txt | 3 +- icu4c/source/data/locales/fr.txt | 9 +- 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 | 7 +- icu4c/source/data/locales/ga_IE.txt | 4 +- icu4c/source/data/locales/gl.txt | 7 +- icu4c/source/data/locales/gl_ES.txt | 4 +- icu4c/source/data/locales/gu.txt | 7 +- icu4c/source/data/locales/gu_IN.txt | 4 +- icu4c/source/data/locales/gv.txt | 7 +- icu4c/source/data/locales/gv_GB.txt | 4 +- icu4c/source/data/locales/he.txt | 10 +- icu4c/source/data/locales/he_IL.txt | 14 +- icu4c/source/data/locales/hi.txt | 7 +- icu4c/source/data/locales/hi_IN.txt | 4 +- icu4c/source/data/locales/hr.txt | 22 +- icu4c/source/data/locales/hr_HR.txt | 3 +- icu4c/source/data/locales/hu.txt | 13 +- icu4c/source/data/locales/hu_HU.txt | 3 +- icu4c/source/data/locales/hy.txt | 7 +- icu4c/source/data/locales/hy_AM.txt | 4 +- icu4c/source/data/locales/hy_AM_REVISED.txt | 4 +- icu4c/source/data/locales/id.txt | 17 +- icu4c/source/data/locales/id_ID.txt | 4 +- icu4c/source/data/locales/in.txt | 11 + icu4c/source/data/locales/in_ID.txt | 11 + icu4c/source/data/locales/is.txt | 25 +- icu4c/source/data/locales/is_IS.txt | 3 +- icu4c/source/data/locales/it.txt | 9 +- icu4c/source/data/locales/it_CH.txt | 4 +- icu4c/source/data/locales/it_IT.txt | 4 +- icu4c/source/data/locales/iw.txt | 3 +- icu4c/source/data/locales/iw_IL.txt | 3 +- icu4c/source/data/locales/ja.txt | 9 +- icu4c/source/data/locales/ja_JP.txt | 3 +- .../source/data/locales/ja_JP_TRADITIONAL.txt | 21 +- icu4c/source/data/locales/kk.txt | 7 +- icu4c/source/data/locales/kk_KZ.txt | 3 +- icu4c/source/data/locales/kl.txt | 7 +- icu4c/source/data/locales/kl_GL.txt | 4 +- icu4c/source/data/locales/kn.txt | 7 +- icu4c/source/data/locales/kn_IN.txt | 4 +- icu4c/source/data/locales/ko.txt | 10 +- icu4c/source/data/locales/ko_KR.txt | 4 +- icu4c/source/data/locales/kok.txt | 7 +- icu4c/source/data/locales/kok_IN.txt | 4 +- icu4c/source/data/locales/kw.txt | 7 +- icu4c/source/data/locales/kw_GB.txt | 4 +- icu4c/source/data/locales/lt.txt | 7 +- icu4c/source/data/locales/lt_LT.txt | 3 +- icu4c/source/data/locales/lv.txt | 7 +- icu4c/source/data/locales/lv_LV.txt | 3 +- icu4c/source/data/locales/mk.txt | 7 +- icu4c/source/data/locales/mk_MK.txt | 3 +- icu4c/source/data/locales/mr.txt | 7 +- icu4c/source/data/locales/mr_IN.txt | 4 +- icu4c/source/data/locales/ms.txt | 17 +- icu4c/source/data/locales/ms_BN.txt | 4 +- icu4c/source/data/locales/ms_MY.txt | 8 +- icu4c/source/data/locales/mt.txt | 7 +- icu4c/source/data/locales/mt_MT.txt | 3 +- icu4c/source/data/locales/nb.txt | 9 +- icu4c/source/data/locales/nb_NO.txt | 3 +- icu4c/source/data/locales/nl.txt | 9 +- icu4c/source/data/locales/nl_BE.txt | 4 +- icu4c/source/data/locales/nl_NL.txt | 3 +- icu4c/source/data/locales/nn.txt | 138 ++- icu4c/source/data/locales/nn_NO.txt | 3 +- icu4c/source/data/locales/no.txt | 3 +- icu4c/source/data/locales/no_NO.txt | 3 +- icu4c/source/data/locales/no_NO_NY.txt | 3 +- icu4c/source/data/locales/om.txt | 7 +- icu4c/source/data/locales/om_ET.txt | 4 +- icu4c/source/data/locales/om_KE.txt | 4 +- icu4c/source/data/locales/pa.txt | 7 +- icu4c/source/data/locales/pa_IN.txt | 4 +- icu4c/source/data/locales/pl.txt | 13 +- icu4c/source/data/locales/pl_PL.txt | 3 +- icu4c/source/data/locales/ps.txt | 7 +- icu4c/source/data/locales/ps_AF.txt | 4 +- icu4c/source/data/locales/pt.txt | 19 +- icu4c/source/data/locales/pt_BR.txt | 4 +- icu4c/source/data/locales/pt_PT.txt | 4 +- icu4c/source/data/locales/resfiles.mk | 147 ++-- icu4c/source/data/locales/ro.txt | 7 +- icu4c/source/data/locales/ro_RO.txt | 3 +- icu4c/source/data/locales/root.txt | 814 +----------------- icu4c/source/data/locales/ru.txt | 17 +- icu4c/source/data/locales/ru_RU.txt | 3 +- icu4c/source/data/locales/ru_UA.txt | 4 +- icu4c/source/data/locales/sh.txt | 5 +- icu4c/source/data/locales/sh_YU.txt | 5 +- icu4c/source/data/locales/sk.txt | 13 +- icu4c/source/data/locales/sk_SK.txt | 3 +- icu4c/source/data/locales/sl.txt | 9 +- icu4c/source/data/locales/sl_SI.txt | 3 +- icu4c/source/data/locales/so.txt | 7 +- icu4c/source/data/locales/so_DJ.txt | 3 +- icu4c/source/data/locales/so_ET.txt | 3 +- icu4c/source/data/locales/so_KE.txt | 3 +- icu4c/source/data/locales/so_SO.txt | 3 +- icu4c/source/data/locales/sq.txt | 7 +- icu4c/source/data/locales/sq_AL.txt | 3 +- icu4c/source/data/locales/sr.txt | 13 +- icu4c/source/data/locales/sr_Cyrl.txt | 11 + icu4c/source/data/locales/sr_Cyrl_YU.txt | 11 + icu4c/source/data/locales/sr_Latn.txt | 394 +++++++++ icu4c/source/data/locales/sr_Latn_YU.txt | 11 + icu4c/source/data/locales/sr_YU.txt | 5 +- icu4c/source/data/locales/sv.txt | 52 +- icu4c/source/data/locales/sv_FI.txt | 3 +- icu4c/source/data/locales/sv_SE.txt | 3 +- icu4c/source/data/locales/sw.txt | 7 +- icu4c/source/data/locales/sw_KE.txt | 3 +- icu4c/source/data/locales/sw_TZ.txt | 3 +- icu4c/source/data/locales/ta.txt | 7 +- icu4c/source/data/locales/ta_IN.txt | 4 +- icu4c/source/data/locales/te.txt | 7 +- icu4c/source/data/locales/te_IN.txt | 4 +- icu4c/source/data/locales/th.txt | 7 +- icu4c/source/data/locales/th_TH.txt | 3 +- .../source/data/locales/th_TH_TRADITIONAL.txt | 21 +- icu4c/source/data/locales/ti.txt | 7 +- icu4c/source/data/locales/ti_ER.txt | 4 +- icu4c/source/data/locales/ti_ET.txt | 4 +- icu4c/source/data/locales/tr.txt | 17 +- icu4c/source/data/locales/tr_TR.txt | 3 +- icu4c/source/data/locales/uk.txt | 7 +- icu4c/source/data/locales/uk_UA.txt | 3 +- icu4c/source/data/locales/vi.txt | 7 +- icu4c/source/data/locales/vi_VN.txt | 3 +- icu4c/source/data/locales/zh.txt | 9 +- icu4c/source/data/locales/zh_CN.txt | 3 +- icu4c/source/data/locales/zh_HK.txt | 3 +- icu4c/source/data/locales/zh_Hans.txt | 6 +- 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 | 17 +- 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 | 17 + icu4c/source/data/locales/zh_MO.txt | 3 +- icu4c/source/data/locales/zh_SG.txt | 3 +- icu4c/source/data/locales/zh_TW.txt | 5 +- icu4c/source/test/cintltst/cldrtest.c | 8 +- icu4c/source/test/cintltst/cloctst.c | 19 +- icu4c/source/test/testdata/structLocale.txt | 2 +- 246 files changed, 1264 insertions(+), 1810 deletions(-) create mode 100644 icu4c/source/data/locales/in.txt create mode 100644 icu4c/source/data/locales/in_ID.txt create mode 100644 icu4c/source/data/locales/sr_Cyrl.txt create mode 100644 icu4c/source/data/locales/sr_Cyrl_YU.txt create mode 100644 icu4c/source/data/locales/sr_Latn.txt create mode 100644 icu4c/source/data/locales/sr_Latn_YU.txt create mode 100644 icu4c/source/data/locales/zh_Hant_TW.txt diff --git a/icu4c/source/common/locmap.c b/icu4c/source/common/locmap.c index 6bfa06dae14..a403ee48e90 100644 --- a/icu4c/source/common/locmap.c +++ b/icu4c/source/common/locmap.c @@ -268,10 +268,11 @@ static const ILcidPosixElement hr[] = { {0x141a, "bs_BA"}, /* Bosnian, Bosnia and Herzegovina */ {0x141a, "bs"}, /* Bosnian */ {0x041a, "hr_HR"}, /* Croatian*/ - {0x081a, "sh_YU"}, /* Serbo-Croatian*/ - {0x081a, "sh"}, /* It's 0x1a or 0x081a, pick one to make the test program happy. */ - {0x0c1a, "sr_YU"}, /* Serbian*/ - {0x0c1a, "sr"}, /* It's 0x1a or 0x0c1a, pick one to make the test program happy. */ + {0x081a, "sr_Latn_YU"}, /* Serbo-Croatian*/ + {0x081a, "sr_Latn"}, /* It's 0x1a or 0x081a, pick one to make the test program happy. */ + {0x0c1a, "sr_Cyrl_YU"}, /* Serbian*/ + {0x0c1a, "sr_Cyrl"}, /* It's 0x1a or 0x0c1a, pick one to make the test program happy. */ + {0x0c1a, "sr"}, /* It's 0x1a or 0x0c1a, pick one to make the test program happy. */ }; ILCID_POSIX_ELEMENT_ARRAY(0x040e, hu, hu_HU) @@ -451,21 +452,19 @@ ILCID_POSIX_ELEMENT_ARRAY(0x046a, yo, yo_NG) /* TODO: Verify the country */ /* TODO: Make the locales with the script the primary locale once the names are implemented in the resources. */ static const ILcidPosixElement zh[] = { {0x04, "zh"}, - {0x0804, "zh_CN"}, {0x0804, "zh_Hans_CN"}, - {0x0c04, "zh_HK"}, + {0x0804, "zh_CN"}, {0x0c04, "zh_Hant_HK"}, - {0x1404, "zh_MO"}, + {0x0c04, "zh_HK"}, {0x1404, "zh_Hant_MO"}, - {0x1004, "zh_SG"}, + {0x1404, "zh_MO"}, {0x1004, "zh_Hans_SG"}, - {0x0404, "zh_TW"}, + {0x1004, "zh_SG"}, {0x0404, "zh_Hant_TW"}, - {0x30404,"zh_TW"}, /* Bopomofo order */ + {0x0404, "zh_TW"}, {0x30404,"zh_Hant_TW"}, - {0x20404,"zh_TW@collation=STROKE"}, - {0x20404,"zh_TW_STROKE"}, /* remove? */ - {0x20404,"zh_Hant_TW_STROKE"} + {0x30404,"zh_TW"}, /* Bopomofo order */ + {0x20404,"zh_TW@collation=STROKE"} }; ILCID_POSIX_ELEMENT_ARRAY(0x0435, zu, zu_ZA) /* TODO: Verify the country */ diff --git a/icu4c/source/common/unicode/uscript.h b/icu4c/source/common/unicode/uscript.h index 11f118fc6c2..5c90a8698fd 100644 --- a/icu4c/source/common/unicode/uscript.h +++ b/icu4c/source/common/unicode/uscript.h @@ -30,7 +30,7 @@ typedef enum UScriptCode { USCRIPT_BENGALI = 4, /* Beng */ USCRIPT_BOPOMOFO = 5, /* Bopo */ USCRIPT_CHEROKEE = 6, /* Cher */ - USCRIPT_COPTIC = 7, /* Qaac */ + USCRIPT_COPTIC = 7, /* Copt */ USCRIPT_CYRILLIC = 8, /* Cyrl (Cyrs) */ USCRIPT_DESERET = 9, /* Dsrt */ USCRIPT_DEVANAGARI = 10, /* Deva */ diff --git a/icu4c/source/data/locales/af.txt b/icu4c/source/data/locales/af.txt index d2d6acd9db7..ea54f774e96 100644 --- a/icu4c/source/data/locales/af.txt +++ b/icu4c/source/data/locales/af.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:41 -// * Source File: \work\locale\common\main\\af.xml +// * Source File: ../../../locale/common/main\af.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\af.xml + */ af{ Countries{ AE{"Verenigde Arabiese Emirate"} @@ -169,7 +171,6 @@ af{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "vm.", diff --git a/icu4c/source/data/locales/af_ZA.txt b/icu4c/source/data/locales/af_ZA.txt index 8e0dd56de53..7981de3ba8e 100644 --- a/icu4c/source/data/locales/af_ZA.txt +++ b/icu4c/source/data/locales/af_ZA.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:41 -// * Source File: \work\locale\common\main\\af_ZA.xml +// * Source File: ../../../locale/common/main\af_ZA.xml // * // *************************************************************************** af_ZA{ @@ -16,7 +15,6 @@ af_ZA{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a", diff --git a/icu4c/source/data/locales/am.txt b/icu4c/source/data/locales/am.txt index d332cee10fc..3eaaa41623e 100644 --- a/icu4c/source/data/locales/am.txt +++ b/icu4c/source/data/locales/am.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:41 -// * Source File: \work\locale\common\main\\am.xml +// * Source File: ../../../locale/common/main\am.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\am.xml + */ am{ Countries{ AD{"አንዶራ"} @@ -290,7 +292,6 @@ am{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 7, diff --git a/icu4c/source/data/locales/am_ET.txt b/icu4c/source/data/locales/am_ET.txt index 91042652401..b44e28881a4 100644 --- a/icu4c/source/data/locales/am_ET.txt +++ b/icu4c/source/data/locales/am_ET.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:42 -// * Source File: \work\locale\common\main\\am_ET.xml +// * Source File: ../../../locale/common/main\am_ET.xml // * // *************************************************************************** am_ET{ @@ -22,7 +21,6 @@ am_ET{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "ጡዋት", diff --git a/icu4c/source/data/locales/ar.txt b/icu4c/source/data/locales/ar.txt index d820a8aa142..d2305ad03f2 100644 --- a/icu4c/source/data/locales/ar.txt +++ b/icu4c/source/data/locales/ar.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 7:3 -// * Source File: \work\locale\common\main\\ar.xml +// * Source File: ../../../locale/common/main\ar.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\ar.xml + */ ar{ Countries{ AD{"اندورا"} @@ -351,7 +353,6 @@ ar{ } } } - gregorian{ AmPmMarkers{ "ص", diff --git a/icu4c/source/data/locales/ar_AE.txt b/icu4c/source/data/locales/ar_AE.txt index deb8a748e4a..4d2759761e8 100644 --- a/icu4c/source/data/locales/ar_AE.txt +++ b/icu4c/source/data/locales/ar_AE.txt @@ -3,21 +3,9 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:42 -// * Source File: \work\locale\common\main\\ar_AE.xml +// * Source File: ../../../locale/common/main\ar_AE.xml // * // *************************************************************************** ar_AE{ Version{"1.2"} - calendar{ - - gregorian{ - weekend:intvector{ - 5, - 0, - 7, - 0, - } - } - } } diff --git a/icu4c/source/data/locales/ar_BH.txt b/icu4c/source/data/locales/ar_BH.txt index 15344e6bd45..cee106e1f38 100644 --- a/icu4c/source/data/locales/ar_BH.txt +++ b/icu4c/source/data/locales/ar_BH.txt @@ -3,21 +3,9 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:43 -// * Source File: \work\locale\common\main\\ar_BH.xml +// * Source File: ../../../locale/common/main\ar_BH.xml // * // *************************************************************************** ar_BH{ Version{"1.2"} - calendar{ - - gregorian{ - weekend:intvector{ - 5, - 0, - 7, - 0, - } - } - } } diff --git a/icu4c/source/data/locales/ar_DZ.txt b/icu4c/source/data/locales/ar_DZ.txt index 5e398693c5f..828fb829ef7 100644 --- a/icu4c/source/data/locales/ar_DZ.txt +++ b/icu4c/source/data/locales/ar_DZ.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:43 -// * Source File: \work\locale\common\main\\ar_DZ.xml +// * Source File: ../../../locale/common/main\ar_DZ.xml // * // *************************************************************************** ar_DZ{ @@ -23,15 +22,4 @@ ar_DZ{ "+", } Version{"1.2"} - calendar{ - - gregorian{ - weekend:intvector{ - 5, - 0, - 7, - 0, - } - } - } } diff --git a/icu4c/source/data/locales/ar_EG.txt b/icu4c/source/data/locales/ar_EG.txt index ff9d00dbe95..ba9de61e0a4 100644 --- a/icu4c/source/data/locales/ar_EG.txt +++ b/icu4c/source/data/locales/ar_EG.txt @@ -3,21 +3,9 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:43 -// * Source File: \work\locale\common\main\\ar_EG.xml +// * Source File: ../../../locale/common/main\ar_EG.xml // * // *************************************************************************** ar_EG{ Version{"1.2"} - calendar{ - - gregorian{ - weekend:intvector{ - 6, - 0, - 1, - 0, - } - } - } } diff --git a/icu4c/source/data/locales/ar_IN.txt b/icu4c/source/data/locales/ar_IN.txt index c2e5e8f50b4..1c098cf5f89 100644 --- a/icu4c/source/data/locales/ar_IN.txt +++ b/icu4c/source/data/locales/ar_IN.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:44 -// * Source File: \work\locale\common\main\\ar_IN.xml +// * Source File: ../../../locale/common/main\ar_IN.xml // * // *************************************************************************** ar_IN{ @@ -16,7 +15,6 @@ ar_IN{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a z", diff --git a/icu4c/source/data/locales/ar_IQ.txt b/icu4c/source/data/locales/ar_IQ.txt index 3e1001d6a0b..bbddc2ecc1a 100644 --- a/icu4c/source/data/locales/ar_IQ.txt +++ b/icu4c/source/data/locales/ar_IQ.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:44 -// * Source File: \work\locale\common\main\\ar_IQ.xml +// * Source File: ../../../locale/common/main\ar_IQ.xml // * // *************************************************************************** ar_IQ{ diff --git a/icu4c/source/data/locales/ar_JO.txt b/icu4c/source/data/locales/ar_JO.txt index c91cb89de67..1fe5a3ae2d3 100644 --- a/icu4c/source/data/locales/ar_JO.txt +++ b/icu4c/source/data/locales/ar_JO.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:44 -// * Source File: \work\locale\common\main\\ar_JO.xml +// * Source File: ../../../locale/common/main\ar_JO.xml // * // *************************************************************************** ar_JO{ @@ -16,7 +15,6 @@ ar_JO{ } Version{"1.2"} calendar{ - gregorian{ dayNames{ format{ @@ -63,12 +61,6 @@ ar_JO{ } } } - weekend:intvector{ - 5, - 0, - 7, - 0, - } } } } diff --git a/icu4c/source/data/locales/ar_KW.txt b/icu4c/source/data/locales/ar_KW.txt index 878c33f82ab..85b078983c6 100644 --- a/icu4c/source/data/locales/ar_KW.txt +++ b/icu4c/source/data/locales/ar_KW.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:45 -// * Source File: \work\locale\common\main\\ar_KW.xml +// * Source File: ../../../locale/common/main\ar_KW.xml // * // *************************************************************************** ar_KW{ @@ -15,15 +14,4 @@ ar_KW{ "#E0", } Version{"1.2"} - calendar{ - - gregorian{ - weekend:intvector{ - 5, - 0, - 7, - 0, - } - } - } } diff --git a/icu4c/source/data/locales/ar_LB.txt b/icu4c/source/data/locales/ar_LB.txt index 5618d11939d..82834e1fbbd 100644 --- a/icu4c/source/data/locales/ar_LB.txt +++ b/icu4c/source/data/locales/ar_LB.txt @@ -3,14 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:45 -// * Source File: \work\locale\common\main\\ar_LB.xml +// * Source File: ../../../locale/common/main\ar_LB.xml // * // *************************************************************************** ar_LB{ Version{"1.2"} calendar{ - gregorian{ dayNames{ format{ diff --git a/icu4c/source/data/locales/ar_LY.txt b/icu4c/source/data/locales/ar_LY.txt index 1bf74d19ca8..51bfe656894 100644 --- a/icu4c/source/data/locales/ar_LY.txt +++ b/icu4c/source/data/locales/ar_LY.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:45 -// * Source File: \work\locale\common\main\\ar_LY.xml +// * Source File: ../../../locale/common/main\ar_LY.xml // * // *************************************************************************** ar_LY{ diff --git a/icu4c/source/data/locales/ar_MA.txt b/icu4c/source/data/locales/ar_MA.txt index f1ff29a897a..0dafac81d56 100644 --- a/icu4c/source/data/locales/ar_MA.txt +++ b/icu4c/source/data/locales/ar_MA.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:45 -// * Source File: \work\locale\common\main\\ar_MA.xml +// * Source File: ../../../locale/common/main\ar_MA.xml // * // *************************************************************************** ar_MA{ diff --git a/icu4c/source/data/locales/ar_OM.txt b/icu4c/source/data/locales/ar_OM.txt index 2904aac5e8f..a53e6e89519 100644 --- a/icu4c/source/data/locales/ar_OM.txt +++ b/icu4c/source/data/locales/ar_OM.txt @@ -3,21 +3,9 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:46 -// * Source File: \work\locale\common\main\\ar_OM.xml +// * Source File: ../../../locale/common/main\ar_OM.xml // * // *************************************************************************** ar_OM{ Version{"1.2"} - calendar{ - - gregorian{ - weekend:intvector{ - 5, - 0, - 7, - 0, - } - } - } } diff --git a/icu4c/source/data/locales/ar_QA.txt b/icu4c/source/data/locales/ar_QA.txt index b2b349f2ec3..b953f8e286e 100644 --- a/icu4c/source/data/locales/ar_QA.txt +++ b/icu4c/source/data/locales/ar_QA.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:46 -// * Source File: \work\locale\common\main\\ar_QA.xml +// * Source File: ../../../locale/common/main\ar_QA.xml // * // *************************************************************************** ar_QA{ @@ -16,7 +15,6 @@ ar_QA{ } Version{"1.2"} calendar{ - gregorian{ dayNames{ format{ @@ -49,12 +47,6 @@ ar_QA{ } } } - weekend:intvector{ - 5, - 0, - 7, - 0, - } } } } diff --git a/icu4c/source/data/locales/ar_SA.txt b/icu4c/source/data/locales/ar_SA.txt index 17fd945651f..a8e36eeec22 100644 --- a/icu4c/source/data/locales/ar_SA.txt +++ b/icu4c/source/data/locales/ar_SA.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:46 -// * Source File: \work\locale\common\main\\ar_SA.xml +// * Source File: ../../../locale/common/main\ar_SA.xml // * // *************************************************************************** ar_SA{ @@ -16,7 +15,6 @@ ar_SA{ } Version{"1.2"} calendar{ - gregorian{ dayNames{ format{ @@ -49,12 +47,6 @@ ar_SA{ } } } - weekend:intvector{ - 5, - 0, - 7, - 0, - } } } } diff --git a/icu4c/source/data/locales/ar_SD.txt b/icu4c/source/data/locales/ar_SD.txt index 1ae52aef443..58c8dab7df3 100644 --- a/icu4c/source/data/locales/ar_SD.txt +++ b/icu4c/source/data/locales/ar_SD.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:47 -// * Source File: \work\locale\common\main\\ar_SD.xml +// * Source File: ../../../locale/common/main\ar_SD.xml // * // *************************************************************************** ar_SD{ diff --git a/icu4c/source/data/locales/ar_SY.txt b/icu4c/source/data/locales/ar_SY.txt index b6808b2a406..aca97e4cb99 100644 --- a/icu4c/source/data/locales/ar_SY.txt +++ b/icu4c/source/data/locales/ar_SY.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:47 -// * Source File: \work\locale\common\main\\ar_SY.xml +// * Source File: ../../../locale/common/main\ar_SY.xml // * // *************************************************************************** ar_SY{ @@ -16,7 +15,6 @@ ar_SY{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 5, @@ -67,12 +65,6 @@ ar_SY{ } } } - weekend:intvector{ - 6, - 0, - 1, - 0, - } } } } diff --git a/icu4c/source/data/locales/ar_TN.txt b/icu4c/source/data/locales/ar_TN.txt index b7a97eb02e7..9c9edae88b7 100644 --- a/icu4c/source/data/locales/ar_TN.txt +++ b/icu4c/source/data/locales/ar_TN.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:47 -// * Source File: \work\locale\common\main\\ar_TN.xml +// * Source File: ../../../locale/common/main\ar_TN.xml // * // *************************************************************************** ar_TN{ @@ -30,7 +29,6 @@ ar_TN{ } Version{"1.2"} calendar{ - gregorian{ dayNames{ format{ diff --git a/icu4c/source/data/locales/ar_YE.txt b/icu4c/source/data/locales/ar_YE.txt index ca0e5e82381..1e0fd3a1b9c 100644 --- a/icu4c/source/data/locales/ar_YE.txt +++ b/icu4c/source/data/locales/ar_YE.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:48 -// * Source File: \work\locale\common\main\\ar_YE.xml +// * Source File: ../../../locale/common/main\ar_YE.xml // * // *************************************************************************** ar_YE{ @@ -16,7 +15,6 @@ ar_YE{ } Version{"1.2"} calendar{ - gregorian{ dayNames{ format{ @@ -49,12 +47,6 @@ ar_YE{ } } } - weekend:intvector{ - 5, - 0, - 7, - 0, - } } } } diff --git a/icu4c/source/data/locales/be.txt b/icu4c/source/data/locales/be.txt index 5a2c1b11b5d..61f1939512f 100644 --- a/icu4c/source/data/locales/be.txt +++ b/icu4c/source/data/locales/be.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:48 -// * Source File: \work\locale\common\main\\be.xml +// * Source File: ../../../locale/common/main\be.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\be.xml + */ be{ Countries{ BY{"Беларусь"} @@ -40,7 +42,6 @@ be{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/be_BY.txt b/icu4c/source/data/locales/be_BY.txt index 69a7d5e2092..66f4c9224ab 100644 --- a/icu4c/source/data/locales/be_BY.txt +++ b/icu4c/source/data/locales/be_BY.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:48 -// * Source File: \work\locale\common\main\\be_BY.xml +// * Source File: ../../../locale/common/main\be_BY.xml // * // *************************************************************************** be_BY{ diff --git a/icu4c/source/data/locales/bg.txt b/icu4c/source/data/locales/bg.txt index 4d767971dcc..8643f1046e1 100644 --- a/icu4c/source/data/locales/bg.txt +++ b/icu4c/source/data/locales/bg.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:48 -// * Source File: \work\locale\common\main\\bg.xml +// * Source File: ../../../locale/common/main\bg.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\bg.xml + */ bg{ Countries{ AD{"Андора"} @@ -311,7 +313,6 @@ bg{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/bg_BG.txt b/icu4c/source/data/locales/bg_BG.txt index d03cc1feb4b..1df6c3877b0 100644 --- a/icu4c/source/data/locales/bg_BG.txt +++ b/icu4c/source/data/locales/bg_BG.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:49 -// * Source File: \work\locale\common\main\\bg_BG.xml +// * Source File: ../../../locale/common/main\bg_BG.xml // * // *************************************************************************** bg_BG{ diff --git a/icu4c/source/data/locales/bn.txt b/icu4c/source/data/locales/bn.txt index 9447fe6775f..a41d885bf12 100644 --- a/icu4c/source/data/locales/bn.txt +++ b/icu4c/source/data/locales/bn.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:49 -// * Source File: \work\locale\common\main\\bn.xml +// * Source File: ../../../locale/common/main\bn.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\bn.xml + */ bn{ Countries{ AF{"আফগানিস্তান"} @@ -136,7 +138,6 @@ bn{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "পূর্বাহ্ণ", diff --git a/icu4c/source/data/locales/bn_IN.txt b/icu4c/source/data/locales/bn_IN.txt index 7da213a0d38..08217458b2b 100644 --- a/icu4c/source/data/locales/bn_IN.txt +++ b/icu4c/source/data/locales/bn_IN.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:49 -// * Source File: \work\locale\common\main\\bn_IN.xml +// * Source File: ../../../locale/common/main\bn_IN.xml // * // *************************************************************************** bn_IN{ @@ -16,7 +15,6 @@ bn_IN{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a z", diff --git a/icu4c/source/data/locales/ca.txt b/icu4c/source/data/locales/ca.txt index 470cc409550..6b970c679df 100644 --- a/icu4c/source/data/locales/ca.txt +++ b/icu4c/source/data/locales/ca.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:49 -// * Source File: \work\locale\common\main\\ca.xml +// * Source File: ../../../locale/common/main\ca.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\ca.xml + */ ca{ Countries{ AD{"Andorra"} @@ -379,7 +381,6 @@ ca{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "HH:mm:ss z", diff --git a/icu4c/source/data/locales/ca_ES.txt b/icu4c/source/data/locales/ca_ES.txt index 0f54a1bf8d2..896bc644d15 100644 --- a/icu4c/source/data/locales/ca_ES.txt +++ b/icu4c/source/data/locales/ca_ES.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:50 -// * Source File: \work\locale\common\main\\ca_ES.xml +// * Source File: ../../../locale/common/main\ca_ES.xml // * // *************************************************************************** ca_ES{ @@ -16,7 +15,6 @@ ca_ES{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/cs.txt b/icu4c/source/data/locales/cs.txt index c66b3160e1e..1e768fcca49 100644 --- a/icu4c/source/data/locales/cs.txt +++ b/icu4c/source/data/locales/cs.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:50 -// * Source File: \work\locale\common\main\\cs.xml +// * Source File: ../../../locale/common/main\cs.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\cs.xml + */ cs{ Countries{ AD{"Andorra"} @@ -250,12 +252,6 @@ cs{ ZM{"Zambie"} ZW{"Zimbabwe"} } - Currencies{ - CZK{ - "Kč", - "CZK", - } - } ExemplarCharacters{"[a-z ý á é í ó ú ě ů č ď ň ř š ť ž]"} Languages{ aa{"Afarština"} @@ -417,7 +413,6 @@ cs{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "dop.", diff --git a/icu4c/source/data/locales/cs_CZ.txt b/icu4c/source/data/locales/cs_CZ.txt index f4254acc8a3..7daa990519b 100644 --- a/icu4c/source/data/locales/cs_CZ.txt +++ b/icu4c/source/data/locales/cs_CZ.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:50 -// * Source File: \work\locale\common\main\\cs_CZ.xml +// * Source File: ../../../locale/common/main\cs_CZ.xml // * // *************************************************************************** cs_CZ{ diff --git a/icu4c/source/data/locales/da.txt b/icu4c/source/data/locales/da.txt index 344e6599ea5..12ec71b5cd2 100644 --- a/icu4c/source/data/locales/da.txt +++ b/icu4c/source/data/locales/da.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:52 -// * Source File: \work\locale\common\main\\da.xml +// * Source File: ../../../locale/common/main\da.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\da.xml + */ da{ Countries{ AD{"Andorra"} @@ -2119,6 +2121,7 @@ da{ Scripts{ Arab{"Arabisk"} Armn{"Armensk"} + Copt{"Koptisk"} Cprt{"Cypriotisk"} Cyrl{"Kyrillisk"} Deva{"Devanagarisk"} @@ -2132,7 +2135,6 @@ da{ Ital{"Olditalisk"} Latn{"Latinsk"} Mong{"Mongolsk"} - Qaac{"Koptisk"} Runr{"Runer"} Sinh{"Singalesisk"} Syrc{"Syrisk"} @@ -2161,7 +2163,6 @@ da{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/da_DK.txt b/icu4c/source/data/locales/da_DK.txt index b7495321081..aa1c8e399d6 100644 --- a/icu4c/source/data/locales/da_DK.txt +++ b/icu4c/source/data/locales/da_DK.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:53 -// * Source File: \work\locale\common\main\\da_DK.xml +// * Source File: ../../../locale/common/main\da_DK.xml // * // *************************************************************************** da_DK{ diff --git a/icu4c/source/data/locales/de.txt b/icu4c/source/data/locales/de.txt index bbf683d2c51..f3e892678f7 100644 --- a/icu4c/source/data/locales/de.txt +++ b/icu4c/source/data/locales/de.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:55 -// * Source File: \work\locale\common\main\\de.xml +// * Source File: ../../../locale/common/main\de.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\de.xml + */ de{ Countries{ AD{"Andorra"} @@ -1841,6 +1843,7 @@ de{ Bopo{"Bopomofo"} Brai{"Blindenschrift"} Cher{"Cherokee"} + Copt{"Koptisch"} Cprt{"Zypriotisch"} Cyrl{"Kyrillisch"} Deva{"Devanagari"} @@ -1870,7 +1873,6 @@ de{ Ogam{"Ogham"} Orya{"Oriya"} Osma{"Osmanisch"} - Qaac{"Koptisch"} Qaai{"Geerbter Schriftwert"} Runr{"Runenschrift"} Sinh{"Singhalesisch"} @@ -1907,7 +1909,6 @@ de{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "vorm.", diff --git a/icu4c/source/data/locales/de_AT.txt b/icu4c/source/data/locales/de_AT.txt index ff4021d7bfc..78a7b809d68 100644 --- a/icu4c/source/data/locales/de_AT.txt +++ b/icu4c/source/data/locales/de_AT.txt @@ -3,14 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:56 -// * Source File: \work\locale\common\main\\de_AT.xml +// * Source File: ../../../locale/common/main\de_AT.xml // * // *************************************************************************** de_AT{ Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/de_BE.txt b/icu4c/source/data/locales/de_BE.txt index d10675056da..0d4938f7d63 100644 --- a/icu4c/source/data/locales/de_BE.txt +++ b/icu4c/source/data/locales/de_BE.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:56 -// * Source File: \work\locale\common\main\\de_BE.xml +// * Source File: ../../../locale/common/main\de_BE.xml // * // *************************************************************************** de_BE{ @@ -22,7 +21,6 @@ de_BE{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/de_CH.txt b/icu4c/source/data/locales/de_CH.txt index df2ea8b2df7..f09ccd5a663 100644 --- a/icu4c/source/data/locales/de_CH.txt +++ b/icu4c/source/data/locales/de_CH.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:57 -// * Source File: \work\locale\common\main\\de_CH.xml +// * Source File: ../../../locale/common/main\de_CH.xml // * // *************************************************************************** de_CH{ diff --git a/icu4c/source/data/locales/de_DE.txt b/icu4c/source/data/locales/de_DE.txt index 71916b35294..ee7f07145ac 100644 --- a/icu4c/source/data/locales/de_DE.txt +++ b/icu4c/source/data/locales/de_DE.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:58 -// * Source File: \work\locale\common\main\\de_DE.xml +// * Source File: ../../../locale/common/main\de_DE.xml // * // *************************************************************************** de_DE{ diff --git a/icu4c/source/data/locales/de_LU.txt b/icu4c/source/data/locales/de_LU.txt index 333924a1f4f..84efb7563bb 100644 --- a/icu4c/source/data/locales/de_LU.txt +++ b/icu4c/source/data/locales/de_LU.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:58 -// * Source File: \work\locale\common\main\\de_LU.xml +// * Source File: ../../../locale/common/main\de_LU.xml // * // *************************************************************************** de_LU{ @@ -27,7 +26,6 @@ de_LU{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/el.txt b/icu4c/source/data/locales/el.txt index ddd568ca2dd..322eb80d4ce 100644 --- a/icu4c/source/data/locales/el.txt +++ b/icu4c/source/data/locales/el.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:59 -// * Source File: \work\locale\common\main\\el.xml +// * Source File: ../../../locale/common/main\el.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\el.xml + */ el{ Countries{ AD{"Ανδόρα"} @@ -355,7 +357,6 @@ el{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "ΠΜ", diff --git a/icu4c/source/data/locales/el_GR.txt b/icu4c/source/data/locales/el_GR.txt index 6a6de15fc45..de86fe46a9d 100644 --- a/icu4c/source/data/locales/el_GR.txt +++ b/icu4c/source/data/locales/el_GR.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:59 -// * Source File: \work\locale\common\main\\el_GR.xml +// * Source File: ../../../locale/common/main\el_GR.xml // * // *************************************************************************** el_GR{ diff --git a/icu4c/source/data/locales/en.txt b/icu4c/source/data/locales/en.txt index 58c8dfd6cfe..39e6d83ed42 100644 --- a/icu4c/source/data/locales/en.txt +++ b/icu4c/source/data/locales/en.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:1 -// * Source File: \work\locale\common\main\\en.xml +// * Source File: ../../../locale/common/main\en.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\en.xml + */ en{ Countries{ AD{"Andorra"} @@ -2268,6 +2270,7 @@ en{ Buhd{"Buhid"} Cans{"Unified Canadian Aboriginal Symbols"} Cher{"Cherokee"} + Copt{"Coptic"} Cprt{"Cypriot"} Cyrl{"Cyrillic"} Deva{"Devanagari"} @@ -2300,7 +2303,6 @@ en{ Ogam{"Ogham"} Orya{"Oriya"} Osma{"Osmanya"} - Qaac{"Coptic"} Qaai{"Inherited"} Runr{"Runic"} Shaw{"Shavian"} @@ -2341,7 +2343,6 @@ en{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a z", @@ -2365,6 +2366,15 @@ en{ "Fri", "Sat", } + narrow{ + "S", + "M", + "T", + "W", + "T", + "F", + "S", + } wide{ "Sunday", "Monday", @@ -2398,6 +2408,20 @@ en{ "Nov", "Dec", } + narrow{ + "J", + "F", + "M", + "A", + "M", + "J", + "J", + "A", + "S", + "O", + "N", + "D", + } wide{ "January", "February", diff --git a/icu4c/source/data/locales/en_AU.txt b/icu4c/source/data/locales/en_AU.txt index daf12a61285..befb4006e16 100644 --- a/icu4c/source/data/locales/en_AU.txt +++ b/icu4c/source/data/locales/en_AU.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:2 -// * Source File: \work\locale\common\main\\en_AU.xml +// * Source File: ../../../locale/common/main\en_AU.xml // * // *************************************************************************** en_AU{ @@ -20,7 +19,6 @@ en_AU{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a z", diff --git a/icu4c/source/data/locales/en_BE.txt b/icu4c/source/data/locales/en_BE.txt index 292d543eaf2..8bdeea23846 100644 --- a/icu4c/source/data/locales/en_BE.txt +++ b/icu4c/source/data/locales/en_BE.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:3 -// * Source File: \work\locale\common\main\\en_BE.xml +// * Source File: ../../../locale/common/main\en_BE.xml // * // *************************************************************************** en_BE{ @@ -41,7 +40,6 @@ en_BE{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/en_BW.txt b/icu4c/source/data/locales/en_BW.txt index 90efa83d78f..d9982a7d6db 100644 --- a/icu4c/source/data/locales/en_BW.txt +++ b/icu4c/source/data/locales/en_BW.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:4 -// * Source File: \work\locale\common\main\\en_BW.xml +// * Source File: ../../../locale/common/main\en_BW.xml // * // *************************************************************************** en_BW{ @@ -16,7 +15,6 @@ en_BW{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a", diff --git a/icu4c/source/data/locales/en_CA.txt b/icu4c/source/data/locales/en_CA.txt index 6885a96e74e..b0255f63b97 100644 --- a/icu4c/source/data/locales/en_CA.txt +++ b/icu4c/source/data/locales/en_CA.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:5 -// * Source File: \work\locale\common\main\\en_CA.xml +// * Source File: ../../../locale/common/main\en_CA.xml // * // *************************************************************************** en_CA{ @@ -26,7 +25,6 @@ en_CA{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a z", diff --git a/icu4c/source/data/locales/en_GB.txt b/icu4c/source/data/locales/en_GB.txt index 6c441afcd41..a57df9f79e9 100644 --- a/icu4c/source/data/locales/en_GB.txt +++ b/icu4c/source/data/locales/en_GB.txt @@ -3,14 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:6 -// * Source File: \work\locale\common\main\\en_GB.xml +// * Source File: ../../../locale/common/main\en_GB.xml // * // *************************************************************************** en_GB{ Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/en_HK.txt b/icu4c/source/data/locales/en_HK.txt index 61ca853ea05..5ecadc143e8 100644 --- a/icu4c/source/data/locales/en_HK.txt +++ b/icu4c/source/data/locales/en_HK.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:7 -// * Source File: \work\locale\common\main\\en_HK.xml +// * Source File: ../../../locale/common/main\en_HK.xml // * // *************************************************************************** en_HK{ @@ -22,7 +21,6 @@ en_HK{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a z", diff --git a/icu4c/source/data/locales/en_IE.txt b/icu4c/source/data/locales/en_IE.txt index e7914fdb899..4a0deb52589 100644 --- a/icu4c/source/data/locales/en_IE.txt +++ b/icu4c/source/data/locales/en_IE.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:8 -// * Source File: \work\locale\common\main\\en_IE.xml +// * Source File: ../../../locale/common/main\en_IE.xml // * // *************************************************************************** en_IE{ @@ -22,7 +21,6 @@ en_IE{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "a.m.", diff --git a/icu4c/source/data/locales/en_IN.txt b/icu4c/source/data/locales/en_IN.txt index 6321f8143a3..172016b9057 100644 --- a/icu4c/source/data/locales/en_IN.txt +++ b/icu4c/source/data/locales/en_IN.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:9 -// * Source File: \work\locale\common\main\\en_IN.xml +// * Source File: ../../../locale/common/main\en_IN.xml // * // *************************************************************************** en_IN{ @@ -16,7 +15,6 @@ en_IN{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a z", diff --git a/icu4c/source/data/locales/en_MT.txt b/icu4c/source/data/locales/en_MT.txt index 14c34bb459f..f6aba3cc856 100644 --- a/icu4c/source/data/locales/en_MT.txt +++ b/icu4c/source/data/locales/en_MT.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:10 -// * Source File: \work\locale\common\main\\en_MT.xml +// * Source File: ../../../locale/common/main\en_MT.xml // * // *************************************************************************** en_MT{ @@ -22,7 +21,6 @@ en_MT{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 1, diff --git a/icu4c/source/data/locales/en_NZ.txt b/icu4c/source/data/locales/en_NZ.txt index 40555ea1fc2..f7a529096a2 100644 --- a/icu4c/source/data/locales/en_NZ.txt +++ b/icu4c/source/data/locales/en_NZ.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:11 -// * Source File: \work\locale\common\main\\en_NZ.xml +// * Source File: ../../../locale/common/main\en_NZ.xml // * // *************************************************************************** en_NZ{ @@ -20,7 +19,6 @@ en_NZ{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a z", diff --git a/icu4c/source/data/locales/en_PH.txt b/icu4c/source/data/locales/en_PH.txt index 466196d08ef..d8783c04767 100644 --- a/icu4c/source/data/locales/en_PH.txt +++ b/icu4c/source/data/locales/en_PH.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:12 -// * Source File: \work\locale\common\main\\en_PH.xml +// * Source File: ../../../locale/common/main\en_PH.xml // * // *************************************************************************** en_PH{ @@ -22,7 +21,6 @@ en_PH{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a z", diff --git a/icu4c/source/data/locales/en_SG.txt b/icu4c/source/data/locales/en_SG.txt index 004bdeacd8b..a246218a811 100644 --- a/icu4c/source/data/locales/en_SG.txt +++ b/icu4c/source/data/locales/en_SG.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:12 -// * Source File: \work\locale\common\main\\en_SG.xml +// * Source File: ../../../locale/common/main\en_SG.xml // * // *************************************************************************** en_SG{ @@ -16,7 +15,6 @@ en_SG{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "a hh:mm:ss", diff --git a/icu4c/source/data/locales/en_US.txt b/icu4c/source/data/locales/en_US.txt index d9ef39bc192..a2d87018b66 100644 --- a/icu4c/source/data/locales/en_US.txt +++ b/icu4c/source/data/locales/en_US.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:13 -// * Source File: \work\locale\common\main\\en_US.xml +// * Source File: ../../../locale/common/main\en_US.xml // * // *************************************************************************** en_US{ diff --git a/icu4c/source/data/locales/en_US_POSIX.txt b/icu4c/source/data/locales/en_US_POSIX.txt index 3a6213bcbec..221ddc6ef79 100644 --- a/icu4c/source/data/locales/en_US_POSIX.txt +++ b/icu4c/source/data/locales/en_US_POSIX.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:14 -// * Source File: \work\locale\common\main\\en_US_POSIX.xml +// * Source File: ../../../locale/common/main\en_US_POSIX.xml // * // *************************************************************************** en_US_POSIX{ @@ -23,9 +22,9 @@ en_US_POSIX{ "+", } NumberPatterns{ - "###0.###;-###0.###", - "¤ ###0.00;-¤ ###0.00", - "###0%", + "0.######;-0.######", + "¤ 0.00;-¤ 0.00", + "0%", "0.000000E+000", } Version{"1.2"} diff --git a/icu4c/source/data/locales/en_VI.txt b/icu4c/source/data/locales/en_VI.txt index b482da72050..5451d4cf33c 100644 --- a/icu4c/source/data/locales/en_VI.txt +++ b/icu4c/source/data/locales/en_VI.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:15 -// * Source File: \work\locale\common\main\\en_VI.xml +// * Source File: ../../../locale/common/main\en_VI.xml // * // *************************************************************************** en_VI{ diff --git a/icu4c/source/data/locales/en_ZA.txt b/icu4c/source/data/locales/en_ZA.txt index ab30d767d1b..b7404201e1b 100644 --- a/icu4c/source/data/locales/en_ZA.txt +++ b/icu4c/source/data/locales/en_ZA.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:16 -// * Source File: \work\locale\common\main\\en_ZA.xml +// * Source File: ../../../locale/common/main\en_ZA.xml // * // *************************************************************************** en_ZA{ @@ -16,7 +15,6 @@ en_ZA{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a", diff --git a/icu4c/source/data/locales/en_ZW.txt b/icu4c/source/data/locales/en_ZW.txt index 771c75902a6..77f1045a259 100644 --- a/icu4c/source/data/locales/en_ZW.txt +++ b/icu4c/source/data/locales/en_ZW.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:17 -// * Source File: \work\locale\common\main\\en_ZW.xml +// * Source File: ../../../locale/common/main\en_ZW.xml // * // *************************************************************************** en_ZW{ @@ -22,7 +21,6 @@ en_ZW{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a", diff --git a/icu4c/source/data/locales/eo.txt b/icu4c/source/data/locales/eo.txt index 186071f64e2..9d93de737d4 100644 --- a/icu4c/source/data/locales/eo.txt +++ b/icu4c/source/data/locales/eo.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:17 -// * Source File: \work\locale\common\main\\eo.xml +// * Source File: ../../../locale/common/main\eo.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\eo.xml + */ eo{ Countries{ AD{"Andoro"} @@ -395,7 +397,6 @@ eo{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "atm", diff --git a/icu4c/source/data/locales/es.txt b/icu4c/source/data/locales/es.txt index 6d840ecf709..65e2de719bc 100644 --- a/icu4c/source/data/locales/es.txt +++ b/icu4c/source/data/locales/es.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:19 -// * Source File: \work\locale\common\main\\es.xml +// * Source File: ../../../locale/common/main\es.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\es.xml + */ es{ Countries{ AD{"Andorra"} @@ -1993,6 +1995,7 @@ es{ Buhd{"buhid"} Cans{"símbolos aborígenes canadienses unificados"} Cher{"cherokee"} + Copt{"copto"} Cprt{"chipriota"} Cyrl{"cirílico"} Deva{"devanagari"} @@ -2024,7 +2027,6 @@ es{ Ogam{"ogham"} Orya{"oriya"} Osma{"osmaniya"} - Qaac{"copto"} Runr{"rúnico"} Shaw{"shavian"} Sinh{"binhala"} @@ -2064,7 +2066,6 @@ es{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/es_AR.txt b/icu4c/source/data/locales/es_AR.txt index 9c79c2fbeef..d6537e25488 100644 --- a/icu4c/source/data/locales/es_AR.txt +++ b/icu4c/source/data/locales/es_AR.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:20 -// * Source File: \work\locale\common\main\\es_AR.xml +// * Source File: ../../../locale/common/main\es_AR.xml // * // *************************************************************************** es_AR{ @@ -34,7 +33,6 @@ es_AR{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "HH'h'''mm z", diff --git a/icu4c/source/data/locales/es_BO.txt b/icu4c/source/data/locales/es_BO.txt index 2238c000377..cccdb97ba71 100644 --- a/icu4c/source/data/locales/es_BO.txt +++ b/icu4c/source/data/locales/es_BO.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:21 -// * Source File: \work\locale\common\main\\es_BO.xml +// * Source File: ../../../locale/common/main\es_BO.xml // * // *************************************************************************** es_BO{ @@ -24,7 +23,6 @@ es_BO{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "hh:mm:ss a z", diff --git a/icu4c/source/data/locales/es_CL.txt b/icu4c/source/data/locales/es_CL.txt index 139e8356f19..068e1145819 100644 --- a/icu4c/source/data/locales/es_CL.txt +++ b/icu4c/source/data/locales/es_CL.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:22 -// * Source File: \work\locale\common\main\\es_CL.xml +// * Source File: ../../../locale/common/main\es_CL.xml // * // *************************************************************************** es_CL{ @@ -40,7 +39,6 @@ es_CL{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "HH:mm:ss z", diff --git a/icu4c/source/data/locales/es_CO.txt b/icu4c/source/data/locales/es_CO.txt index afe1cead9e7..fe8fb6d8300 100644 --- a/icu4c/source/data/locales/es_CO.txt +++ b/icu4c/source/data/locales/es_CO.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:23 -// * Source File: \work\locale\common\main\\es_CO.xml +// * Source File: ../../../locale/common/main\es_CO.xml // * // *************************************************************************** es_CO{ @@ -34,7 +33,6 @@ es_CO{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "HH:mm:ss z", diff --git a/icu4c/source/data/locales/es_CR.txt b/icu4c/source/data/locales/es_CR.txt index 9b2e9574edc..9c03672f802 100644 --- a/icu4c/source/data/locales/es_CR.txt +++ b/icu4c/source/data/locales/es_CR.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:24 -// * Source File: \work\locale\common\main\\es_CR.xml +// * Source File: ../../../locale/common/main\es_CR.xml // * // *************************************************************************** es_CR{ @@ -24,7 +23,6 @@ es_CR{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "hh:mm:ss a z", diff --git a/icu4c/source/data/locales/es_DO.txt b/icu4c/source/data/locales/es_DO.txt index 89ad6d9925d..6396cd58db4 100644 --- a/icu4c/source/data/locales/es_DO.txt +++ b/icu4c/source/data/locales/es_DO.txt @@ -3,14 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:24 -// * Source File: \work\locale\common\main\\es_DO.xml +// * Source File: ../../../locale/common/main\es_DO.xml // * // *************************************************************************** es_DO{ Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "hh:mm:ss a z", diff --git a/icu4c/source/data/locales/es_EC.txt b/icu4c/source/data/locales/es_EC.txt index f32dcc1aeff..165e39ca1e8 100644 --- a/icu4c/source/data/locales/es_EC.txt +++ b/icu4c/source/data/locales/es_EC.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:25 -// * Source File: \work\locale\common\main\\es_EC.xml +// * Source File: ../../../locale/common/main\es_EC.xml // * // *************************************************************************** es_EC{ @@ -30,7 +29,6 @@ es_EC{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "HH:mm:ss z", diff --git a/icu4c/source/data/locales/es_ES.txt b/icu4c/source/data/locales/es_ES.txt index 0322a8aa85c..1d2b9dd77e9 100644 --- a/icu4c/source/data/locales/es_ES.txt +++ b/icu4c/source/data/locales/es_ES.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:26 -// * Source File: \work\locale\common\main\\es_ES.xml +// * Source File: ../../../locale/common/main\es_ES.xml // * // *************************************************************************** es_ES{ @@ -41,7 +40,6 @@ es_ES{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "HH'H'mm''ss\" z", diff --git a/icu4c/source/data/locales/es_GT.txt b/icu4c/source/data/locales/es_GT.txt index b082fd16120..3913a92af11 100644 --- a/icu4c/source/data/locales/es_GT.txt +++ b/icu4c/source/data/locales/es_GT.txt @@ -3,14 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:27 -// * Source File: \work\locale\common\main\\es_GT.xml +// * Source File: ../../../locale/common/main\es_GT.xml // * // *************************************************************************** es_GT{ Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "hh:mm:ss a z", diff --git a/icu4c/source/data/locales/es_HN.txt b/icu4c/source/data/locales/es_HN.txt index 9fcc7b46854..26b6ee4411e 100644 --- a/icu4c/source/data/locales/es_HN.txt +++ b/icu4c/source/data/locales/es_HN.txt @@ -3,14 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:28 -// * Source File: \work\locale\common\main\\es_HN.xml +// * Source File: ../../../locale/common/main\es_HN.xml // * // *************************************************************************** es_HN{ Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "hh:mm:ss a z", diff --git a/icu4c/source/data/locales/es_MX.txt b/icu4c/source/data/locales/es_MX.txt index cd08e7d0694..9d937646cf2 100644 --- a/icu4c/source/data/locales/es_MX.txt +++ b/icu4c/source/data/locales/es_MX.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:28 -// * Source File: \work\locale\common\main\\es_MX.xml +// * Source File: ../../../locale/common/main\es_MX.xml // * // *************************************************************************** es_MX{ @@ -20,7 +19,6 @@ es_MX{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "hh:mm:ss a z", diff --git a/icu4c/source/data/locales/es_NI.txt b/icu4c/source/data/locales/es_NI.txt index 4f2d9582db3..a04d38f1558 100644 --- a/icu4c/source/data/locales/es_NI.txt +++ b/icu4c/source/data/locales/es_NI.txt @@ -3,14 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:29 -// * Source File: \work\locale\common\main\\es_NI.xml +// * Source File: ../../../locale/common/main\es_NI.xml // * // *************************************************************************** es_NI{ Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "hh:mm:ss a z", diff --git a/icu4c/source/data/locales/es_PA.txt b/icu4c/source/data/locales/es_PA.txt index 31b4ea3cbfd..2199fd23d0f 100644 --- a/icu4c/source/data/locales/es_PA.txt +++ b/icu4c/source/data/locales/es_PA.txt @@ -3,14 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:30 -// * Source File: \work\locale\common\main\\es_PA.xml +// * Source File: ../../../locale/common/main\es_PA.xml // * // *************************************************************************** es_PA{ Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "hh:mm:ss a z", diff --git a/icu4c/source/data/locales/es_PE.txt b/icu4c/source/data/locales/es_PE.txt index 15b64db7b7e..da683b6e045 100644 --- a/icu4c/source/data/locales/es_PE.txt +++ b/icu4c/source/data/locales/es_PE.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:31 -// * Source File: \work\locale\common\main\\es_PE.xml +// * Source File: ../../../locale/common/main\es_PE.xml // * // *************************************************************************** es_PE{ @@ -16,7 +15,6 @@ es_PE{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "hh:mm:ss a z", diff --git a/icu4c/source/data/locales/es_PR.txt b/icu4c/source/data/locales/es_PR.txt index c16390342a1..91523c69780 100644 --- a/icu4c/source/data/locales/es_PR.txt +++ b/icu4c/source/data/locales/es_PR.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:32 -// * Source File: \work\locale\common\main\\es_PR.xml +// * Source File: ../../../locale/common/main\es_PR.xml // * // *************************************************************************** es_PR{ @@ -16,7 +15,6 @@ es_PR{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "hh:mm:ss a z", diff --git a/icu4c/source/data/locales/es_PY.txt b/icu4c/source/data/locales/es_PY.txt index 45ecdb838a4..c67bfbcf452 100644 --- a/icu4c/source/data/locales/es_PY.txt +++ b/icu4c/source/data/locales/es_PY.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:32 -// * Source File: \work\locale\common\main\\es_PY.xml +// * Source File: ../../../locale/common/main\es_PY.xml // * // *************************************************************************** es_PY{ @@ -30,7 +29,6 @@ es_PY{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "hh:mm:ss a z", diff --git a/icu4c/source/data/locales/es_SV.txt b/icu4c/source/data/locales/es_SV.txt index 068e13ac3fd..79ae0877897 100644 --- a/icu4c/source/data/locales/es_SV.txt +++ b/icu4c/source/data/locales/es_SV.txt @@ -3,14 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:33 -// * Source File: \work\locale\common\main\\es_SV.xml +// * Source File: ../../../locale/common/main\es_SV.xml // * // *************************************************************************** es_SV{ Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "hh:mm:ss a z", diff --git a/icu4c/source/data/locales/es_US.txt b/icu4c/source/data/locales/es_US.txt index 8a51f89d896..6e7861a5ca1 100644 --- a/icu4c/source/data/locales/es_US.txt +++ b/icu4c/source/data/locales/es_US.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:34 -// * Source File: \work\locale\common\main\\es_US.xml +// * Source File: ../../../locale/common/main\es_US.xml // * // *************************************************************************** es_US{ @@ -21,7 +20,6 @@ es_US{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 1, diff --git a/icu4c/source/data/locales/es_UY.txt b/icu4c/source/data/locales/es_UY.txt index b82c954cace..2d5c68481c8 100644 --- a/icu4c/source/data/locales/es_UY.txt +++ b/icu4c/source/data/locales/es_UY.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:35 -// * Source File: \work\locale\common\main\\es_UY.xml +// * Source File: ../../../locale/common/main\es_UY.xml // * // *************************************************************************** es_UY{ @@ -30,7 +29,6 @@ es_UY{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "hh:mm:ss a z", diff --git a/icu4c/source/data/locales/es_VE.txt b/icu4c/source/data/locales/es_VE.txt index 1bc9b99bba0..e6cae53e99c 100644 --- a/icu4c/source/data/locales/es_VE.txt +++ b/icu4c/source/data/locales/es_VE.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:36 -// * Source File: \work\locale\common\main\\es_VE.xml +// * Source File: ../../../locale/common/main\es_VE.xml // * // *************************************************************************** es_VE{ @@ -30,7 +29,6 @@ es_VE{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "hh:mm:ss a z", diff --git a/icu4c/source/data/locales/et.txt b/icu4c/source/data/locales/et.txt index 0aa6be75079..75cf9f37258 100644 --- a/icu4c/source/data/locales/et.txt +++ b/icu4c/source/data/locales/et.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:36 -// * Source File: \work\locale\common\main\\et.xml +// * Source File: ../../../locale/common/main\et.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\et.xml + */ et{ Countries{ AD{"Andorra"} @@ -308,7 +310,6 @@ et{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/et_EE.txt b/icu4c/source/data/locales/et_EE.txt index 88302edd05a..b4a0c044d29 100644 --- a/icu4c/source/data/locales/et_EE.txt +++ b/icu4c/source/data/locales/et_EE.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:36 -// * Source File: \work\locale\common\main\\et_EE.xml +// * Source File: ../../../locale/common/main\et_EE.xml // * // *************************************************************************** et_EE{ diff --git a/icu4c/source/data/locales/eu.txt b/icu4c/source/data/locales/eu.txt index f4e686335d6..4369454de21 100644 --- a/icu4c/source/data/locales/eu.txt +++ b/icu4c/source/data/locales/eu.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:36 -// * Source File: \work\locale\common\main\\eu.xml +// * Source File: ../../../locale/common/main\eu.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\eu.xml + */ eu{ Countries{ AE{"Arabiar Emirrerri Batuak"} @@ -153,7 +155,6 @@ eu{ } Version{"1.2"} calendar{ - gregorian{ dayNames{ format{ diff --git a/icu4c/source/data/locales/eu_ES.txt b/icu4c/source/data/locales/eu_ES.txt index bf454c4285f..6ca358afefb 100644 --- a/icu4c/source/data/locales/eu_ES.txt +++ b/icu4c/source/data/locales/eu_ES.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:37 -// * Source File: \work\locale\common\main\\eu_ES.xml +// * Source File: ../../../locale/common/main\eu_ES.xml // * // *************************************************************************** eu_ES{ @@ -16,7 +15,6 @@ eu_ES{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/fa.txt b/icu4c/source/data/locales/fa.txt index bba4dfb10e5..a8ab22becf2 100644 --- a/icu4c/source/data/locales/fa.txt +++ b/icu4c/source/data/locales/fa.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:37 -// * Source File: \work\locale\common\main\\fa.xml +// * Source File: ../../../locale/common/main\fa.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\fa.xml + */ fa{ Countries{ AD{"آندورا"} @@ -475,6 +477,7 @@ fa{ Beng{"بنگالی"} Bopo{"بوپوموفو"} Cher{"چروکیایی"} + Copt{"قبطی"} Cyrl{"سیریلی"} Deva{"دوناگری"} Ethi{"اتیوپیایی"} @@ -495,7 +498,6 @@ fa{ Mong{"مغولی"} Mymr{"میانمار"} Orya{"اوریه‌ای"} - Qaac{"قبطی"} Qaai{"موروثی"} Runr{"رونی"} Syrc{"آسوری"} @@ -508,7 +510,6 @@ fa{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "ق.ظ.", diff --git a/icu4c/source/data/locales/fa_AF.txt b/icu4c/source/data/locales/fa_AF.txt index 6d343fc07e1..48b1ce09491 100644 --- a/icu4c/source/data/locales/fa_AF.txt +++ b/icu4c/source/data/locales/fa_AF.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:37 -// * Source File: \work\locale\common\main\\fa_AF.xml +// * Source File: ../../../locale/common/main\fa_AF.xml // * // *************************************************************************** fa_AF{ @@ -151,7 +150,6 @@ fa_AF{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 7, diff --git a/icu4c/source/data/locales/fa_IR.txt b/icu4c/source/data/locales/fa_IR.txt index 3c1a18c6598..acf4a9082ef 100644 --- a/icu4c/source/data/locales/fa_IR.txt +++ b/icu4c/source/data/locales/fa_IR.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:38 -// * Source File: \work\locale\common\main\\fa_IR.xml +// * Source File: ../../../locale/common/main\fa_IR.xml // * // *************************************************************************** fa_IR{ @@ -30,7 +29,6 @@ fa_IR{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 7, diff --git a/icu4c/source/data/locales/fi.txt b/icu4c/source/data/locales/fi.txt index b9838fe1892..f24e0ddbab2 100644 --- a/icu4c/source/data/locales/fi.txt +++ b/icu4c/source/data/locales/fi.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 7:5 -// * Source File: \work\locale\common\main\\fi.xml +// * Source File: ../../../locale/common/main\fi.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\fi.xml + */ fi{ Countries{ AD{"Andorra"} @@ -2264,6 +2266,7 @@ fi{ Armn{"Armenialainen"} Beng{"Bengalilainen"} Cans{"Yhdistetyt Kanadan aboriginaalien symbolit"} + Copt{"Koptilainen"} Cyrl{"Kyrillinen"} Ethi{"Etiopialainen"} Geor{"Georgialainen"} @@ -2275,7 +2278,6 @@ fi{ Ital{"Vanha italia"} Latn{"Latinalainen"} Mong{"Mongolialainen"} - Qaac{"Koptilainen"} Runr{"Riimukirjaimet"} Syrc{"Syyrialainen"} Tibt{"Tiibetiläinen"} @@ -2302,7 +2304,6 @@ fi{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "ap.", diff --git a/icu4c/source/data/locales/fi_FI.txt b/icu4c/source/data/locales/fi_FI.txt index 8101d2c0937..4a51966a81d 100644 --- a/icu4c/source/data/locales/fi_FI.txt +++ b/icu4c/source/data/locales/fi_FI.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:41 -// * Source File: \work\locale\common\main\\fi_FI.xml +// * Source File: ../../../locale/common/main\fi_FI.xml // * // *************************************************************************** fi_FI{ diff --git a/icu4c/source/data/locales/fo.txt b/icu4c/source/data/locales/fo.txt index b8c10dc2246..d47bd6bbfef 100644 --- a/icu4c/source/data/locales/fo.txt +++ b/icu4c/source/data/locales/fo.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:41 -// * Source File: \work\locale\common\main\\fo.xml +// * Source File: ../../../locale/common/main\fo.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\fo.xml + */ fo{ Countries{ AE{"Sameindu Emirríkini"} @@ -161,7 +163,6 @@ fo{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "HH:mm:ss z", diff --git a/icu4c/source/data/locales/fo_FO.txt b/icu4c/source/data/locales/fo_FO.txt index 98b4523c596..75aafcb5e63 100644 --- a/icu4c/source/data/locales/fo_FO.txt +++ b/icu4c/source/data/locales/fo_FO.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:41 -// * Source File: \work\locale\common\main\\fo_FO.xml +// * Source File: ../../../locale/common/main\fo_FO.xml // * // *************************************************************************** fo_FO{ diff --git a/icu4c/source/data/locales/fr.txt b/icu4c/source/data/locales/fr.txt index ff38da2a3ee..ed0a1b11c04 100644 --- a/icu4c/source/data/locales/fr.txt +++ b/icu4c/source/data/locales/fr.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 7:7 -// * Source File: \work\locale\common\main\\fr.xml +// * Source File: ../../../locale/common/main\fr.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\fr.xml + */ fr{ Countries{ AD{"Andorre"} @@ -1991,6 +1993,7 @@ fr{ Buhd{"bouhide"} Cans{"syllabaire autochthone canadien unifié"} Cher{"tchérokî"} + Copt{"copte"} Cprt{"chypriote"} Cyrl{"cyrillique"} Deva{"dévanâgarî"} @@ -2022,7 +2025,6 @@ fr{ Ogam{"ogam"} Orya{"oriyâ"} Osma{"osmanais"} - Qaac{"copte"} Qaai{"hérité"} Runr{"runique"} Shaw{"shavien"} @@ -2062,7 +2064,6 @@ fr{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "HH' h 'mm z", diff --git a/icu4c/source/data/locales/fr_BE.txt b/icu4c/source/data/locales/fr_BE.txt index 9ce4c2ae394..e38c5c18200 100644 --- a/icu4c/source/data/locales/fr_BE.txt +++ b/icu4c/source/data/locales/fr_BE.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:44 -// * Source File: \work\locale\common\main\\fr_BE.xml +// * Source File: ../../../locale/common/main\fr_BE.xml // * // *************************************************************************** fr_BE{ @@ -30,7 +29,6 @@ fr_BE{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/fr_CA.txt b/icu4c/source/data/locales/fr_CA.txt index afef3030511..a4ed7f085be 100644 --- a/icu4c/source/data/locales/fr_CA.txt +++ b/icu4c/source/data/locales/fr_CA.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:45 -// * Source File: \work\locale\common\main\\fr_CA.xml +// * Source File: ../../../locale/common/main\fr_CA.xml // * // *************************************************************************** fr_CA{ @@ -26,7 +25,6 @@ fr_CA{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "HH' h 'mm' min 'ss' s 'z", diff --git a/icu4c/source/data/locales/fr_CH.txt b/icu4c/source/data/locales/fr_CH.txt index f554f1ed02d..8bf39edd62b 100644 --- a/icu4c/source/data/locales/fr_CH.txt +++ b/icu4c/source/data/locales/fr_CH.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:46 -// * Source File: \work\locale\common\main\\fr_CH.xml +// * Source File: ../../../locale/common/main\fr_CH.xml // * // *************************************************************************** fr_CH{ @@ -30,7 +29,6 @@ fr_CH{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/fr_FR.txt b/icu4c/source/data/locales/fr_FR.txt index e383ec4cce9..9c5e4640261 100644 --- a/icu4c/source/data/locales/fr_FR.txt +++ b/icu4c/source/data/locales/fr_FR.txt @@ -3,14 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:47 -// * Source File: \work\locale\common\main\\fr_FR.xml +// * Source File: ../../../locale/common/main\fr_FR.xml // * // *************************************************************************** fr_FR{ Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/fr_LU.txt b/icu4c/source/data/locales/fr_LU.txt index 1f95027678a..5f4aa316575 100644 --- a/icu4c/source/data/locales/fr_LU.txt +++ b/icu4c/source/data/locales/fr_LU.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:48 -// * Source File: \work\locale\common\main\\fr_LU.xml +// * Source File: ../../../locale/common/main\fr_LU.xml // * // *************************************************************************** fr_LU{ @@ -34,7 +33,6 @@ fr_LU{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/ga.txt b/icu4c/source/data/locales/ga.txt index e2fab37b9ad..2b69556c62e 100644 --- a/icu4c/source/data/locales/ga.txt +++ b/icu4c/source/data/locales/ga.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:49 -// * Source File: \work\locale\common\main\\ga.xml +// * Source File: ../../../locale/common/main\ga.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\ga.xml + */ ga{ Countries{ AD{"Andóra"} @@ -1884,7 +1886,6 @@ ga{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "a.m.", diff --git a/icu4c/source/data/locales/ga_IE.txt b/icu4c/source/data/locales/ga_IE.txt index e050f24e92c..8e191ac7443 100644 --- a/icu4c/source/data/locales/ga_IE.txt +++ b/icu4c/source/data/locales/ga_IE.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:50 -// * Source File: \work\locale\common\main\\ga_IE.xml +// * Source File: ../../../locale/common/main\ga_IE.xml // * // *************************************************************************** ga_IE{ @@ -22,7 +21,6 @@ ga_IE{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "HH:mm:ss z", diff --git a/icu4c/source/data/locales/gl.txt b/icu4c/source/data/locales/gl.txt index 139da41ad30..560b35962a1 100644 --- a/icu4c/source/data/locales/gl.txt +++ b/icu4c/source/data/locales/gl.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:50 -// * Source File: \work\locale\common\main\\gl.xml +// * Source File: ../../../locale/common/main\gl.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\gl.xml + */ gl{ Countries{ ES{"España"} @@ -45,7 +47,6 @@ gl{ } Version{"1.2"} calendar{ - gregorian{ dayNames{ format{ diff --git a/icu4c/source/data/locales/gl_ES.txt b/icu4c/source/data/locales/gl_ES.txt index 92bc69f4916..64768453e61 100644 --- a/icu4c/source/data/locales/gl_ES.txt +++ b/icu4c/source/data/locales/gl_ES.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:50 -// * Source File: \work\locale\common\main\\gl_ES.xml +// * Source File: ../../../locale/common/main\gl_ES.xml // * // *************************************************************************** gl_ES{ @@ -16,7 +15,6 @@ gl_ES{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/gu.txt b/icu4c/source/data/locales/gu.txt index 40b15c27f01..4223e47f68a 100644 --- a/icu4c/source/data/locales/gu.txt +++ b/icu4c/source/data/locales/gu.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:50 -// * Source File: \work\locale\common\main\\gu.xml +// * Source File: ../../../locale/common/main\gu.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\gu.xml + */ gu{ Countries{ CN{"ચીન"} @@ -49,7 +51,6 @@ gu{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "પૂર્વ મધ્યાહ્ન", diff --git a/icu4c/source/data/locales/gu_IN.txt b/icu4c/source/data/locales/gu_IN.txt index a7410b3f8e3..c24433b9a19 100644 --- a/icu4c/source/data/locales/gu_IN.txt +++ b/icu4c/source/data/locales/gu_IN.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:51 -// * Source File: \work\locale\common\main\\gu_IN.xml +// * Source File: ../../../locale/common/main\gu_IN.xml // * // *************************************************************************** gu_IN{ @@ -16,7 +15,6 @@ gu_IN{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "hh:mm:ss a z", diff --git a/icu4c/source/data/locales/gv.txt b/icu4c/source/data/locales/gv.txt index e86ab3a6cdb..9f222ff2ba1 100644 --- a/icu4c/source/data/locales/gv.txt +++ b/icu4c/source/data/locales/gv.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:51 -// * Source File: \work\locale\common\main\\gv.xml +// * Source File: ../../../locale/common/main\gv.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\gv.xml + */ gv{ Countries{ GB{"Rywvaneth Unys"} @@ -20,7 +22,6 @@ gv{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "a.m.", diff --git a/icu4c/source/data/locales/gv_GB.txt b/icu4c/source/data/locales/gv_GB.txt index acf8bdd3f3c..89f8329456d 100644 --- a/icu4c/source/data/locales/gv_GB.txt +++ b/icu4c/source/data/locales/gv_GB.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:51 -// * Source File: \work\locale\common\main\\gv_GB.xml +// * Source File: ../../../locale/common/main\gv_GB.xml // * // *************************************************************************** gv_GB{ @@ -16,7 +15,6 @@ gv_GB{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/he.txt b/icu4c/source/data/locales/he.txt index 17b093cb489..632c1fbbd49 100644 --- a/icu4c/source/data/locales/he.txt +++ b/icu4c/source/data/locales/he.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 7:8 -// * Source File: \work\locale\common\main\\he.xml +// * Source File: ../../../locale/common/main\he.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\he.xml + */ he{ Countries{ AD{"אנדורה"} @@ -291,9 +293,11 @@ he{ LocaleScript{ "Hebr", } + Scripts{ + Hebr{"עברית"} + } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "HH:mm:ss z", diff --git a/icu4c/source/data/locales/he_IL.txt b/icu4c/source/data/locales/he_IL.txt index 03f56299a96..e67a038f3e6 100644 --- a/icu4c/source/data/locales/he_IL.txt +++ b/icu4c/source/data/locales/he_IL.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:52 -// * Source File: \work\locale\common\main\\he_IL.xml +// * Source File: ../../../locale/common/main\he_IL.xml // * // *************************************************************************** he_IL{ @@ -15,15 +14,4 @@ he_IL{ "#E0", } Version{"1.2"} - calendar{ - - gregorian{ - weekend:intvector{ - 6, - 0, - 1, - 0, - } - } - } } diff --git a/icu4c/source/data/locales/hi.txt b/icu4c/source/data/locales/hi.txt index 56f8172dd9c..9f34040f026 100644 --- a/icu4c/source/data/locales/hi.txt +++ b/icu4c/source/data/locales/hi.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:52 -// * Source File: \work\locale\common\main\\hi.xml +// * Source File: ../../../locale/common/main\hi.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\hi.xml + */ hi{ Countries{ AD{"अन्डोरा"} @@ -350,7 +352,6 @@ hi{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "पूर्वाह्न", diff --git a/icu4c/source/data/locales/hi_IN.txt b/icu4c/source/data/locales/hi_IN.txt index 0583560910a..b446fe41611 100644 --- a/icu4c/source/data/locales/hi_IN.txt +++ b/icu4c/source/data/locales/hi_IN.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:52 -// * Source File: \work\locale\common\main\\hi_IN.xml +// * Source File: ../../../locale/common/main\hi_IN.xml // * // *************************************************************************** hi_IN{ @@ -16,7 +15,6 @@ hi_IN{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a z", diff --git a/icu4c/source/data/locales/hr.txt b/icu4c/source/data/locales/hr.txt index c7b0939313a..495fe36d39e 100644 --- a/icu4c/source/data/locales/hr.txt +++ b/icu4c/source/data/locales/hr.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:52 -// * Source File: \work\locale\common\main\\hr.xml +// * Source File: ../../../locale/common/main\hr.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\hr.xml + */ hr{ Countries{ AD{"Andora"} @@ -250,12 +252,6 @@ hr{ ZM{"Zambija"} ZW{"Zimbabve"} } - Currencies{ - HRK{ - "Kn", - "HRK", - } - } ExemplarCharacters{"[a-p r-v z đ ć č ž š {lj} {nj} {dž}]"} Languages{ ar{"arapski"} @@ -308,7 +304,6 @@ hr{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, @@ -336,6 +331,15 @@ hr{ "pet", "sub", } + narrow{ + "n", + "p", + "u", + "s", + "č", + "p", + "s", + } wide{ "nedjelja", "ponedjeljak", diff --git a/icu4c/source/data/locales/hr_HR.txt b/icu4c/source/data/locales/hr_HR.txt index 6e399edd1c9..d8c23dbf005 100644 --- a/icu4c/source/data/locales/hr_HR.txt +++ b/icu4c/source/data/locales/hr_HR.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:53 -// * Source File: \work\locale\common\main\\hr_HR.xml +// * Source File: ../../../locale/common/main\hr_HR.xml // * // *************************************************************************** hr_HR{ diff --git a/icu4c/source/data/locales/hu.txt b/icu4c/source/data/locales/hu.txt index 0c5ffef491b..4fa2fa512b1 100644 --- a/icu4c/source/data/locales/hu.txt +++ b/icu4c/source/data/locales/hu.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 7:8 -// * Source File: \work\locale\common\main\\hu.xml +// * Source File: ../../../locale/common/main\hu.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\hu.xml + */ hu{ Countries{ AD{"Andorra"} @@ -250,12 +252,6 @@ hu{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Currencies{ - HUF{ - "Ft", - "HUF", - } - } ExemplarCharacters{ "[a-z á é í ó ú ö ü ő ű {cs} {dz} {dzs} {gy} {ly} {ny} {sz} {ty} {zs} {ccs} {" "ddz} {ddzs} {ggy} {lly} {nny} {ssz} {tty} {zzs}]" @@ -427,7 +423,6 @@ hu{ } } } - gregorian{ AmPmMarkers{ "DE", diff --git a/icu4c/source/data/locales/hu_HU.txt b/icu4c/source/data/locales/hu_HU.txt index 08ec01357aa..0b385a3ebad 100644 --- a/icu4c/source/data/locales/hu_HU.txt +++ b/icu4c/source/data/locales/hu_HU.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:53 -// * Source File: \work\locale\common\main\\hu_HU.xml +// * Source File: ../../../locale/common/main\hu_HU.xml // * // *************************************************************************** hu_HU{ diff --git a/icu4c/source/data/locales/hy.txt b/icu4c/source/data/locales/hy.txt index eee0a362055..b5f6ab141d7 100644 --- a/icu4c/source/data/locales/hy.txt +++ b/icu4c/source/data/locales/hy.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:54 -// * Source File: \work\locale\common\main\\hy.xml +// * Source File: ../../../locale/common/main\hy.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\hy.xml + */ hy{ Countries{ AD{"Անդորա"} @@ -231,7 +233,6 @@ hy{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "Առ․", diff --git a/icu4c/source/data/locales/hy_AM.txt b/icu4c/source/data/locales/hy_AM.txt index 7bfb0ccd84f..1a745a75be0 100644 --- a/icu4c/source/data/locales/hy_AM.txt +++ b/icu4c/source/data/locales/hy_AM.txt @@ -3,14 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:54 -// * Source File: \work\locale\common\main\\hy_AM.xml +// * Source File: ../../../locale/common/main\hy_AM.xml // * // *************************************************************************** hy_AM{ Version{"1.2"} calendar{ - gregorian{ eras{ abbreviated{ diff --git a/icu4c/source/data/locales/hy_AM_REVISED.txt b/icu4c/source/data/locales/hy_AM_REVISED.txt index f59319ee375..6a850e2b6ec 100644 --- a/icu4c/source/data/locales/hy_AM_REVISED.txt +++ b/icu4c/source/data/locales/hy_AM_REVISED.txt @@ -3,14 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:54 -// * Source File: \work\locale\common\main\\hy_AM_REVISED.xml +// * Source File: ../../../locale/common/main\hy_AM_REVISED.xml // * // *************************************************************************** hy_AM_REVISED{ Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "Առ․", diff --git a/icu4c/source/data/locales/id.txt b/icu4c/source/data/locales/id.txt index d1662e2c882..9d91d0161ee 100644 --- a/icu4c/source/data/locales/id.txt +++ b/icu4c/source/data/locales/id.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:54 -// * Source File: \work\locale\common\main\\id.xml +// * Source File: ../../../locale/common/main\id.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\id.xml + */ id{ Countries{ AD{"Andora"} @@ -506,8 +508,11 @@ id{ } Version{"1.2"} calendar{ - gregorian{ + DateTimeElements:intvector{ + 2, + 1, + } dayNames{ format{ abbreviated{ @@ -562,6 +567,12 @@ id{ } } } + weekend:intvector{ + 7, + 0, + 1, + 86400000, + } } } } diff --git a/icu4c/source/data/locales/id_ID.txt b/icu4c/source/data/locales/id_ID.txt index 0c4fe518039..18b1af4edc4 100644 --- a/icu4c/source/data/locales/id_ID.txt +++ b/icu4c/source/data/locales/id_ID.txt @@ -3,14 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:55 -// * Source File: \work\locale\common\main\\id_ID.xml +// * Source File: ../../../locale/common/main\id_ID.xml // * // *************************************************************************** id_ID{ Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "H:mm:ss", diff --git a/icu4c/source/data/locales/in.txt b/icu4c/source/data/locales/in.txt new file mode 100644 index 00000000000..8a0d1d50fad --- /dev/null +++ b/icu4c/source/data/locales/in.txt @@ -0,0 +1,11 @@ +// *************************************************************************** +// * +// * Copyright (C) 2004 International Business Machines +// * Corporation and others. All Rights Reserved. +// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java +// * Source File: deprecatedList.xml +// * +// *************************************************************************** +in{ + "%%ALIAS"{"id"} +} diff --git a/icu4c/source/data/locales/in_ID.txt b/icu4c/source/data/locales/in_ID.txt new file mode 100644 index 00000000000..bfa30ab1749 --- /dev/null +++ b/icu4c/source/data/locales/in_ID.txt @@ -0,0 +1,11 @@ +// *************************************************************************** +// * +// * Copyright (C) 2004 International Business Machines +// * Corporation and others. All Rights Reserved. +// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java +// * Source File: deprecatedList.xml +// * +// *************************************************************************** +in_ID{ + "%%ALIAS"{"id_ID"} +} diff --git a/icu4c/source/data/locales/is.txt b/icu4c/source/data/locales/is.txt index bb50b023563..c0350fa1744 100644 --- a/icu4c/source/data/locales/is.txt +++ b/icu4c/source/data/locales/is.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:55 -// * Source File: \work\locale\common\main\\is.xml +// * Source File: ../../../locale/common/main\is.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\is.xml + */ is{ Countries{ AE{"Sameinte arabísku fyrstadæmin"} @@ -19,7 +21,6 @@ is{ AT{"Austurríki"} AU{"Ástralía"} BA{"Bosnía-Hersegovína"} - BB{"Belgía"} BG{"Búlgaría"} BI{"Búrúndí"} BO{"Bólivía"} @@ -160,15 +161,9 @@ is{ YE{"Jemen"} ZA{"Suður-Afríka"} } - Currencies{ - ISK{ - "kr.", - "ISK", - } - } ExemplarCharacters{"[a-záéíóúýöæðþ]"} Languages{ - is{"íslenska"} + is{"Íslenska"} } LocaleScript{ "Latn", @@ -189,7 +184,6 @@ is{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "HH:mm:ss z", @@ -213,6 +207,15 @@ is{ "fös", "lau", } + narrow{ + "s", + "m", + "þ", + "m", + "f", + "f", + "l", + } wide{ "sunnudagur", "mánudagur", diff --git a/icu4c/source/data/locales/is_IS.txt b/icu4c/source/data/locales/is_IS.txt index d0522055bd1..c0175d40c54 100644 --- a/icu4c/source/data/locales/is_IS.txt +++ b/icu4c/source/data/locales/is_IS.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:55 -// * Source File: \work\locale\common\main\\is_IS.xml +// * Source File: ../../../locale/common/main\is_IS.xml // * // *************************************************************************** is_IS{ diff --git a/icu4c/source/data/locales/it.txt b/icu4c/source/data/locales/it.txt index cc23fd44bca..38c4c95c0d7 100644 --- a/icu4c/source/data/locales/it.txt +++ b/icu4c/source/data/locales/it.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:58 -// * Source File: \work\locale\common\main\\it.xml +// * Source File: ../../../locale/common/main\it.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\it.xml + */ it{ Countries{ AD{"Andorra"} @@ -2267,6 +2269,7 @@ it{ Buhd{"buhid"} Cans{"simboli aborigeni canadesi unificati"} Cher{"cherokee"} + Copt{"copto"} Cprt{"cipriota"} Cyrl{"cirillico"} Deva{"devanagari"} @@ -2298,7 +2301,6 @@ it{ Ogam{"ogham"} Orya{"oriya"} Osma{"osmanya"} - Qaac{"copto"} Qaai{"ereditato"} Runr{"runico"} Shaw{"shaviano"} @@ -2339,7 +2341,6 @@ it{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "m.", diff --git a/icu4c/source/data/locales/it_CH.txt b/icu4c/source/data/locales/it_CH.txt index c1a7417868b..c1d78a0905f 100644 --- a/icu4c/source/data/locales/it_CH.txt +++ b/icu4c/source/data/locales/it_CH.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:59 -// * Source File: \work\locale\common\main\\it_CH.xml +// * Source File: ../../../locale/common/main\it_CH.xml // * // *************************************************************************** it_CH{ @@ -30,7 +29,6 @@ it_CH{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "HH.mm:ss' h' z", diff --git a/icu4c/source/data/locales/it_IT.txt b/icu4c/source/data/locales/it_IT.txt index 026d62c773b..dbe2f09310f 100644 --- a/icu4c/source/data/locales/it_IT.txt +++ b/icu4c/source/data/locales/it_IT.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 23:59 -// * Source File: \work\locale\common\main\\it_IT.xml +// * Source File: ../../../locale/common/main\it_IT.xml // * // *************************************************************************** it_IT{ @@ -21,7 +20,6 @@ it_IT{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "HH:mm:ss z", diff --git a/icu4c/source/data/locales/iw.txt b/icu4c/source/data/locales/iw.txt index 06e054e6c2e..4ce502c385c 100644 --- a/icu4c/source/data/locales/iw.txt +++ b/icu4c/source/data/locales/iw.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 7:8 -// * Source File: +// * Source File: deprecatedList.xml // * // *************************************************************************** iw{ diff --git a/icu4c/source/data/locales/iw_IL.txt b/icu4c/source/data/locales/iw_IL.txt index a40671c26b0..0539cb40967 100644 --- a/icu4c/source/data/locales/iw_IL.txt +++ b/icu4c/source/data/locales/iw_IL.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:0 -// * Source File: \work\locale\common\main\\iw_IL.xml +// * Source File: deprecatedList.xml // * // *************************************************************************** iw_IL{ diff --git a/icu4c/source/data/locales/ja.txt b/icu4c/source/data/locales/ja.txt index 2ffc3a2ed04..e4ab1bf9780 100644 --- a/icu4c/source/data/locales/ja.txt +++ b/icu4c/source/data/locales/ja.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:2 -// * Source File: \work\locale\common\main\\ja.xml +// * Source File: ../../../locale/common/main\ja.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\ja.xml + */ ja{ Countries{ AD{"アンドラ"} @@ -2006,6 +2008,7 @@ ja{ Buhd{"ブヒッド文字"} Cans{"統合カナダ先住民記号"} Cher{"チェロキー文字"} + Copt{"コプト文字"} Cprt{"キプロス文字"} Cyrl{"キリル文字"} Deva{"デーバナーガリー文字"} @@ -2037,7 +2040,6 @@ ja{ Ogam{"オガム"} Orya{"オリヤー文字"} Osma{"オスマニア文字"} - Qaac{"コプト文字"} Runr{"ルーン文字"} Shaw{"ショー文字"} Sinh{"シンハラ文字"} @@ -2076,7 +2078,6 @@ ja{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "午前", diff --git a/icu4c/source/data/locales/ja_JP.txt b/icu4c/source/data/locales/ja_JP.txt index 1c285b20a20..fc74e337192 100644 --- a/icu4c/source/data/locales/ja_JP.txt +++ b/icu4c/source/data/locales/ja_JP.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:3 -// * Source File: \work\locale\common\main\\ja_JP.xml +// * Source File: ../../../locale/common/main\ja_JP.xml // * // *************************************************************************** ja_JP{ diff --git a/icu4c/source/data/locales/ja_JP_TRADITIONAL.txt b/icu4c/source/data/locales/ja_JP_TRADITIONAL.txt index 326a693fa3d..56b5102af57 100644 --- a/icu4c/source/data/locales/ja_JP_TRADITIONAL.txt +++ b/icu4c/source/data/locales/ja_JP_TRADITIONAL.txt @@ -1,16 +1,13 @@ -// *************************************************************************** +// *************************************************************************** // * -// * Copyright (C) 1997-2004, International Business Machines -// * Corporation and others. All Rights Reserved. +// * Copyright (C) 2004 International Business Machines +// * Corporation and others. All Rights Reserved. +// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java +// * Source File: deprecatedList.xml // * // *************************************************************************** - - -ja_JP_TRADITIONAL { - Version { "1.0" } - // International Calendars Data. - // NOTE (ICU 2.6) - the format of this data WILL CHANGE in future releases. - calendar{ - default{"japanese" } - } +ja_JP_TRADITIONAL{ + calendar{ + default{"japanese"} + } } diff --git a/icu4c/source/data/locales/kk.txt b/icu4c/source/data/locales/kk.txt index 62bf296c0d8..3ca1203b916 100644 --- a/icu4c/source/data/locales/kk.txt +++ b/icu4c/source/data/locales/kk.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:4 -// * Source File: \work\locale\common\main\\kk.xml +// * Source File: ../../../locale/common/main\kk.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\kk.xml + */ kk{ Countries{ KZ{"Қазақстан"} @@ -40,7 +42,6 @@ kk{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/kk_KZ.txt b/icu4c/source/data/locales/kk_KZ.txt index fc04831eb86..0b3a18c187e 100644 --- a/icu4c/source/data/locales/kk_KZ.txt +++ b/icu4c/source/data/locales/kk_KZ.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:4 -// * Source File: \work\locale\common\main\\kk_KZ.xml +// * Source File: ../../../locale/common/main\kk_KZ.xml // * // *************************************************************************** kk_KZ{ diff --git a/icu4c/source/data/locales/kl.txt b/icu4c/source/data/locales/kl.txt index 51c477a0aa1..16f6f7e8cf5 100644 --- a/icu4c/source/data/locales/kl.txt +++ b/icu4c/source/data/locales/kl.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:5 -// * Source File: \work\locale\common\main\\kl.xml +// * Source File: ../../../locale/common/main\kl.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\kl.xml + */ kl{ Countries{ GL{"Kalaallit Nunaat"} @@ -40,7 +42,6 @@ kl{ } Version{"1.2"} calendar{ - gregorian{ dayNames{ format{ diff --git a/icu4c/source/data/locales/kl_GL.txt b/icu4c/source/data/locales/kl_GL.txt index febfe54023a..92689ccc958 100644 --- a/icu4c/source/data/locales/kl_GL.txt +++ b/icu4c/source/data/locales/kl_GL.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:5 -// * Source File: \work\locale\common\main\\kl_GL.xml +// * Source File: ../../../locale/common/main\kl_GL.xml // * // *************************************************************************** kl_GL{ @@ -16,7 +15,6 @@ kl_GL{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a", diff --git a/icu4c/source/data/locales/kn.txt b/icu4c/source/data/locales/kn.txt index dcbb41560ee..20cc9496d9b 100644 --- a/icu4c/source/data/locales/kn.txt +++ b/icu4c/source/data/locales/kn.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:5 -// * Source File: \work\locale\common\main\\kn.xml +// * Source File: ../../../locale/common/main\kn.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\kn.xml + */ kn{ Countries{ AU{"ಆಸ್ಟ್ರೆಲಿಯ"} @@ -33,7 +35,6 @@ kn{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "ಪೂರ್ವಾಹ್ನ", diff --git a/icu4c/source/data/locales/kn_IN.txt b/icu4c/source/data/locales/kn_IN.txt index 027161b1689..2ea6a166963 100644 --- a/icu4c/source/data/locales/kn_IN.txt +++ b/icu4c/source/data/locales/kn_IN.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:5 -// * Source File: \work\locale\common\main\\kn_IN.xml +// * Source File: ../../../locale/common/main\kn_IN.xml // * // *************************************************************************** kn_IN{ @@ -16,7 +15,6 @@ kn_IN{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "hh:mm:ss a z", diff --git a/icu4c/source/data/locales/ko.txt b/icu4c/source/data/locales/ko.txt index 48eb19151c7..cf720100eac 100644 --- a/icu4c/source/data/locales/ko.txt +++ b/icu4c/source/data/locales/ko.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:7 -// * Source File: \work\locale\common\main\\ko.xml +// * Source File: ../../../locale/common/main\ko.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\ko.xml + */ ko{ Countries{ AD{"안도라"} @@ -1856,6 +1858,7 @@ ko{ Buhd{"부히드어"} Cans{"통합 캐나다 토착어"} Cher{"체로키어"} + Copt{"콥트어"} Cprt{"키프로스어"} Cyrl{"키릴어"} Deva{"데바니가리어"} @@ -1887,7 +1890,6 @@ ko{ Ogam{"오그함어"} Orya{"오리야어"} Osma{"오스만야어"} - Qaac{"콥트어"} Runr{"룬 문자"} Shaw{"샤비안어"} Sinh{"신할라어"} @@ -1926,7 +1928,6 @@ ko{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "오전", @@ -2244,6 +2245,7 @@ ko{ "KST", "한국표준시", "KST", + "서울", } { "Europe/Bucharest", diff --git a/icu4c/source/data/locales/ko_KR.txt b/icu4c/source/data/locales/ko_KR.txt index b19fbf623de..ae10a74d402 100644 --- a/icu4c/source/data/locales/ko_KR.txt +++ b/icu4c/source/data/locales/ko_KR.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:8 -// * Source File: \work\locale\common\main\\ko_KR.xml +// * Source File: ../../../locale/common/main\ko_KR.xml // * // *************************************************************************** ko_KR{ @@ -16,7 +15,6 @@ ko_KR{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "a hh'시' mm'분' ss'초' z", diff --git a/icu4c/source/data/locales/kok.txt b/icu4c/source/data/locales/kok.txt index 841547b62ab..5977c1949e5 100644 --- a/icu4c/source/data/locales/kok.txt +++ b/icu4c/source/data/locales/kok.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:7 -// * Source File: \work\locale\common\main\\kok.xml +// * Source File: ../../../locale/common/main\kok.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\kok.xml + */ kok{ Countries{ IN{"भारत"} @@ -165,7 +167,6 @@ kok{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "म.पू.", diff --git a/icu4c/source/data/locales/kok_IN.txt b/icu4c/source/data/locales/kok_IN.txt index 270f8cb8b36..c6e407ceada 100644 --- a/icu4c/source/data/locales/kok_IN.txt +++ b/icu4c/source/data/locales/kok_IN.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:7 -// * Source File: \work\locale\common\main\\kok_IN.xml +// * Source File: ../../../locale/common/main\kok_IN.xml // * // *************************************************************************** kok_IN{ @@ -16,7 +15,6 @@ kok_IN{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a z", diff --git a/icu4c/source/data/locales/kw.txt b/icu4c/source/data/locales/kw.txt index 641e028ad05..95a99c95e2a 100644 --- a/icu4c/source/data/locales/kw.txt +++ b/icu4c/source/data/locales/kw.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:8 -// * Source File: \work\locale\common\main\\kw.xml +// * Source File: ../../../locale/common/main\kw.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\kw.xml + */ kw{ Countries{ GB{"Rywvaneth Unys"} @@ -20,7 +22,6 @@ kw{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "a.m.", diff --git a/icu4c/source/data/locales/kw_GB.txt b/icu4c/source/data/locales/kw_GB.txt index aa2d7ed57da..898f2cfdad9 100644 --- a/icu4c/source/data/locales/kw_GB.txt +++ b/icu4c/source/data/locales/kw_GB.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:8 -// * Source File: \work\locale\common\main\\kw_GB.xml +// * Source File: ../../../locale/common/main\kw_GB.xml // * // *************************************************************************** kw_GB{ @@ -16,7 +15,6 @@ kw_GB{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/lt.txt b/icu4c/source/data/locales/lt.txt index 0503bf19b72..b71491c3533 100644 --- a/icu4c/source/data/locales/lt.txt +++ b/icu4c/source/data/locales/lt.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:9 -// * Source File: \work\locale\common\main\\lt.xml +// * Source File: ../../../locale/common/main\lt.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\lt.xml + */ lt{ Countries{ AD{"Andora"} @@ -308,7 +310,6 @@ lt{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/lt_LT.txt b/icu4c/source/data/locales/lt_LT.txt index b3e155105c3..41a95ec3055 100644 --- a/icu4c/source/data/locales/lt_LT.txt +++ b/icu4c/source/data/locales/lt_LT.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:9 -// * Source File: \work\locale\common\main\\lt_LT.xml +// * Source File: ../../../locale/common/main\lt_LT.xml // * // *************************************************************************** lt_LT{ diff --git a/icu4c/source/data/locales/lv.txt b/icu4c/source/data/locales/lv.txt index 485e5283478..9db9943ceb8 100644 --- a/icu4c/source/data/locales/lv.txt +++ b/icu4c/source/data/locales/lv.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:9 -// * Source File: \work\locale\common\main\\lv.xml +// * Source File: ../../../locale/common/main\lv.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\lv.xml + */ lv{ Countries{ AD{"Andora"} @@ -308,7 +310,6 @@ lv{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/lv_LV.txt b/icu4c/source/data/locales/lv_LV.txt index 7c8258c7bcc..7eceeaaaddf 100644 --- a/icu4c/source/data/locales/lv_LV.txt +++ b/icu4c/source/data/locales/lv_LV.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:9 -// * Source File: \work\locale\common\main\\lv_LV.xml +// * Source File: ../../../locale/common/main\lv_LV.xml // * // *************************************************************************** lv_LV{ diff --git a/icu4c/source/data/locales/mk.txt b/icu4c/source/data/locales/mk.txt index 5a2217c2d26..912e3d9895a 100644 --- a/icu4c/source/data/locales/mk.txt +++ b/icu4c/source/data/locales/mk.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:10 -// * Source File: \work\locale\common\main\\mk.xml +// * Source File: ../../../locale/common/main\mk.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\mk.xml + */ mk{ Countries{ MK{"Македонија"} @@ -40,7 +42,6 @@ mk{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/mk_MK.txt b/icu4c/source/data/locales/mk_MK.txt index 09d157c2ee0..f3da6a9bea6 100644 --- a/icu4c/source/data/locales/mk_MK.txt +++ b/icu4c/source/data/locales/mk_MK.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:10 -// * Source File: \work\locale\common\main\\mk_MK.xml +// * Source File: ../../../locale/common/main\mk_MK.xml // * // *************************************************************************** mk_MK{ diff --git a/icu4c/source/data/locales/mr.txt b/icu4c/source/data/locales/mr.txt index 2cdd412b354..c518437b1d8 100644 --- a/icu4c/source/data/locales/mr.txt +++ b/icu4c/source/data/locales/mr.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:10 -// * Source File: \work\locale\common\main\\mr.xml +// * Source File: ../../../locale/common/main\mr.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\mr.xml + */ mr{ Countries{ IN{"भारत"} @@ -166,7 +168,6 @@ mr{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "म.पू.", diff --git a/icu4c/source/data/locales/mr_IN.txt b/icu4c/source/data/locales/mr_IN.txt index 5812c86eaa1..9a7b67b4511 100644 --- a/icu4c/source/data/locales/mr_IN.txt +++ b/icu4c/source/data/locales/mr_IN.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:10 -// * Source File: \work\locale\common\main\\mr_IN.xml +// * Source File: ../../../locale/common/main\mr_IN.xml // * // *************************************************************************** mr_IN{ @@ -16,7 +15,6 @@ mr_IN{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a z", diff --git a/icu4c/source/data/locales/ms.txt b/icu4c/source/data/locales/ms.txt index f7506218947..f1246d95836 100644 --- a/icu4c/source/data/locales/ms.txt +++ b/icu4c/source/data/locales/ms.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:10 -// * Source File: \work\locale\common\main\\ms.xml +// * Source File: ../../../locale/common/main\ms.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\ms.xml + */ ms{ Countries{ AD{"Andorra"} @@ -265,8 +267,11 @@ ms{ } Version{"1.2"} calendar{ - gregorian{ + DateTimeElements:intvector{ + 2, + 1, + } dayNames{ format{ abbreviated{ @@ -321,6 +326,12 @@ ms{ } } } + weekend:intvector{ + 7, + 0, + 1, + 86400000, + } } } } diff --git a/icu4c/source/data/locales/ms_BN.txt b/icu4c/source/data/locales/ms_BN.txt index 9be5df932d4..13454c0e47f 100644 --- a/icu4c/source/data/locales/ms_BN.txt +++ b/icu4c/source/data/locales/ms_BN.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:11 -// * Source File: \work\locale\common\main\\ms_BN.xml +// * Source File: ../../../locale/common/main\ms_BN.xml // * // *************************************************************************** ms_BN{ @@ -30,7 +29,6 @@ ms_BN{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss aa", diff --git a/icu4c/source/data/locales/ms_MY.txt b/icu4c/source/data/locales/ms_MY.txt index d6185104611..574ea60ee57 100644 --- a/icu4c/source/data/locales/ms_MY.txt +++ b/icu4c/source/data/locales/ms_MY.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:11 -// * Source File: \work\locale\common\main\\ms_MY.xml +// * Source File: ../../../locale/common/main\ms_MY.xml // * // *************************************************************************** ms_MY{ @@ -16,7 +15,6 @@ ms_MY{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a z", @@ -30,10 +28,10 @@ ms_MY{ "{1} {0}", } weekend:intvector{ - 1, + 7, 0, 1, - 0, + 86400000, } } } diff --git a/icu4c/source/data/locales/mt.txt b/icu4c/source/data/locales/mt.txt index 871fc892411..64e6da9ce62 100644 --- a/icu4c/source/data/locales/mt.txt +++ b/icu4c/source/data/locales/mt.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:11 -// * Source File: \work\locale\common\main\\mt.xml +// * Source File: ../../../locale/common/main\mt.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\mt.xml + */ mt{ Countries{ AD{"Andorra"} @@ -734,7 +736,6 @@ mt{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 1, diff --git a/icu4c/source/data/locales/mt_MT.txt b/icu4c/source/data/locales/mt_MT.txt index 212117b6b53..64772192fff 100644 --- a/icu4c/source/data/locales/mt_MT.txt +++ b/icu4c/source/data/locales/mt_MT.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:12 -// * Source File: \work\locale\common\main\\mt_MT.xml +// * Source File: ../../../locale/common/main\mt_MT.xml // * // *************************************************************************** mt_MT{ diff --git a/icu4c/source/data/locales/nb.txt b/icu4c/source/data/locales/nb.txt index b9f124d8521..264000139db 100644 --- a/icu4c/source/data/locales/nb.txt +++ b/icu4c/source/data/locales/nb.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:14 -// * Source File: \work\locale\common\main\\nb.xml +// * Source File: ../../../locale/common/main\nb.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\nb.xml + */ nb{ Countries{ AD{"Andorra"} @@ -1999,6 +2001,7 @@ nb{ Buhd{"buhid"} Cans{"Unified Canadian Aboriginal Symbols"} Cher{"cherokee"} + Copt{"koptisk"} Cprt{"kypriotisk"} Cyrl{"kyrillisk"} Deva{"devanagari"} @@ -2030,7 +2033,6 @@ nb{ Ogam{"ogham"} Orya{"oriya"} Osma{"osmanya"} - Qaac{"koptisk"} Qaai{"nedarvet"} Runr{"runisk"} Shaw{"shavisk"} @@ -2071,7 +2073,6 @@ nb{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/nb_NO.txt b/icu4c/source/data/locales/nb_NO.txt index 57052af0d8a..9a818364a2f 100644 --- a/icu4c/source/data/locales/nb_NO.txt +++ b/icu4c/source/data/locales/nb_NO.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:14 -// * Source File: \work\locale\common\main\\nb_NO.xml +// * Source File: ../../../locale/common/main\nb_NO.xml // * // *************************************************************************** nb_NO{ diff --git a/icu4c/source/data/locales/nl.txt b/icu4c/source/data/locales/nl.txt index 8cb6fddc4f7..a9167fa2f50 100644 --- a/icu4c/source/data/locales/nl.txt +++ b/icu4c/source/data/locales/nl.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 7:10 -// * Source File: \work\locale\common\main\\nl.xml +// * Source File: ../../../locale/common/main\nl.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\nl.xml + */ nl{ Countries{ AD{"Andorra"} @@ -2000,6 +2002,7 @@ nl{ Buhd{"Buhid"} Cans{"Verenigde Canadese Aboriginal-symbolen"} Cher{"Cherokee"} + Copt{"Koptisch"} Cprt{"Cyprisch"} Cyrl{"Cyrillisch"} Deva{"Devanagari"} @@ -2031,7 +2034,6 @@ nl{ Ogam{"Ogham"} Orya{"Oriya"} Osma{"Osmanya"} - Qaac{"Koptisch"} Runr{"Runic"} Shaw{"Shavian"} Sinh{"Sinhala"} @@ -2070,7 +2072,6 @@ nl{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/nl_BE.txt b/icu4c/source/data/locales/nl_BE.txt index c092db51566..daca8632483 100644 --- a/icu4c/source/data/locales/nl_BE.txt +++ b/icu4c/source/data/locales/nl_BE.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:17 -// * Source File: \work\locale\common\main\\nl_BE.xml +// * Source File: ../../../locale/common/main\nl_BE.xml // * // *************************************************************************** nl_BE{ @@ -16,7 +15,6 @@ nl_BE{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/nl_NL.txt b/icu4c/source/data/locales/nl_NL.txt index 642e386f790..f49f72365c5 100644 --- a/icu4c/source/data/locales/nl_NL.txt +++ b/icu4c/source/data/locales/nl_NL.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:18 -// * Source File: \work\locale\common\main\\nl_NL.xml +// * Source File: ../../../locale/common/main\nl_NL.xml // * // *************************************************************************** nl_NL{ diff --git a/icu4c/source/data/locales/nn.txt b/icu4c/source/data/locales/nn.txt index 587f12e5532..9bc7482b833 100644 --- a/icu4c/source/data/locales/nn.txt +++ b/icu4c/source/data/locales/nn.txt @@ -3,25 +3,50 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:18 -// * Source File: \work\locale\common\main\\nn.xml +// * Source File: ../../../locale/common/main\nn.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\nn.xml + */ nn{ Countries{ + AD{"Andorra"} AE{"De forente arabiske emiratene"} + AF{"Afghanistan"} AG{"Antigua og Barbuda"} + AI{"Anguilla"} + AL{"Albania"} + AM{"Armenia"} AN{"De nederlandske antiller"} + AO{"Angola"} AQ{"Antarktis"} + AR{"Argentina"} AS{"Amerikansk Samoa"} AT{"Østerrike"} + AU{"Australia"} + AW{"Aruba"} AZ{"Aserbajdsjan"} BA{"Bosnia og Hercegovina"} + BB{"Barbados"} + BD{"Bangladesh"} BE{"Belgia"} + BF{"Burkina Faso"} + BG{"Bulgaria"} + BH{"Bahrain"} + BI{"Burundi"} + BJ{"Benin"} + BM{"Bermuda"} BN{"Brunei Darussalam"} + BO{"Bolivia"} BR{"Brasil"} + BS{"Bahamas"} + BT{"Bhutan"} BV{"Bouvetøya"} + BW{"Botswana"} BY{"Hviterussland"} + BZ{"Belize"} + CA{"Canada"} CC{"Kokosøyene (Keelingøyene)"} CD{"Kongo, Den demokratiske republikken"} CF{"Den sentralafrikanske republikk"} @@ -29,95 +54,203 @@ nn{ CH{"Sveits"} CI{"Elfenbenskysten"} CK{"Cookøyene"} + CL{"Chile"} CM{"Kamerun"} CN{"Kina"} + CO{"Colombia"} + CR{"Costa Rica"} + CU{"Cuba"} CV{"Kapp Verde"} CX{"Christmasøya"} CY{"Kypros"} CZ{"Tsjekkia"} DE{"Tyskland"} + DJ{"Djibouti"} DK{"Danmark"} + DM{"Dominica"} DO{"Den dominikanske republikk"} DZ{"Algerie"} + EC{"Ecuador"} EE{"Estland"} + EG{"Egypt"} EH{"Vest-Sahara"} + ER{"Eritrea"} ES{"Spania"} ET{"Etiopia"} + FI{"Finland"} + FJ{"Fiji"} FK{"Falklandsøyene (Malvinas)"} FM{"Mikronesiaføderasjonen"} FO{"Færøyene"} FR{"Frankrike"} + GA{"Gabon"} GB{"Storbritannia"} + GD{"Grenada"} + GE{"Georgia"} GF{"Fransk Guyana"} + GH{"Ghana"} + GI{"Gibraltar"} GL{"Grønland"} + GM{"Gambia"} + GN{"Guinea"} + GP{"Guadeloupe"} GQ{"Ekvatorial-Guinea"} GR{"Hellas"} GS{"Sør-Georgia og Sør-Sandwich-øyene"} + GT{"Guatemala"} + GU{"Guam"} + GW{"Guinea-Bissau"} + GY{"Guyana"} HK{"Hong Kong S.A.R. (Kina)"} HM{"Heard- og McDonaldsøyene"} + HN{"Honduras"} HR{"Kroatia"} + HT{"Haiti"} HU{"Ungarn"} + ID{"Indonesia"} IE{"Irland"} + IL{"Israel"} + IN{"India"} IO{"Britiske områder i det indiske hav"} IQ{"Irak"} + IR{"Iran"} IS{"Island"} IT{"Italia"} + JM{"Jamaica"} + JO{"Jordan"} + JP{"Japan"} + KE{"Kenya"} KG{"Kirgisistan"} KH{"Kambodsja"} + KI{"Kiribati"} KM{"Komorene"} KN{"St. Christopher og Nevis"} KP{"Nord-Korea"} KR{"Sør-Korea"} + KW{"Kuwait"} KY{"Caymanøyene"} KZ{"Kasakhstan"} LA{"Laos, Den folkedemokratiske republikken"} LB{"Libanon"} LC{"St. Lucia"} + LI{"Liechtenstein"} + LK{"Sri Lanka"} + LR{"Liberia"} + LS{"Lesotho"} LT{"Litauen"} + LU{"Luxembourg"} + LV{"Latvia"} + LY{"Libya"} MA{"Marokko"} + MC{"Monaco"} + MD{"Moldova"} MG{"Madagaskar"} MH{"Marshalløyene"} MK{"Makedonia, Republikken"} + ML{"Mali"} + MM{"Myanmar"} + MN{"Mongolia"} MO{"Macao S.A.R. (Kina)"} MP{"Nord-Marianene"} + MQ{"Martinique"} + MR{"Mauritania"} + MS{"Montserrat"} + MT{"Malta"} + MU{"Mauritius"} MV{"Maldivene"} + MW{"Malawi"} + MX{"Mexico"} + MY{"Malaysia"} MZ{"Mosambik"} + NA{"Namibia"} NC{"Ny-Caledonia"} + NE{"Niger"} NF{"Norfolkøyene"} + NG{"Nigeria"} + NI{"Nicaragua"} NL{"Nederland"} NO{"Noreg"} + NP{"Nepal"} + NR{"Nauru"} + NU{"Niue"} + NZ{"New Zealand"} + OM{"Oman"} + PA{"Panama"} + PE{"Peru"} PF{"Fransk Polynesia"} PG{"Papua Ny-Guinea"} PH{"Filippinene"} + PK{"Pakistan"} PL{"Polen"} PM{"St. Pierre og Miquelon"} + PN{"Pitcairn"} + PR{"Puerto Rico"} PS{"Palestinsk territorium"} + PT{"Portugal"} + PW{"Palau"} + PY{"Paraguay"} + QA{"Qatar"} RE{"Reunion"} + RO{"Romania"} RU{"Den russiske føderasjon"} + RW{"Rwanda"} + SA{"Saudi Arabia"} SB{"Salomonøyene"} SC{"Seychellene"} + SD{"Sudan"} SE{"Sverige"} + SG{"Singapore"} + SH{"Saint Helena"} + SI{"Slovenia"} SJ{"Svalbard og Jan Mayen"} + SK{"Slovakia"} + SL{"Sierra Leone"} + SM{"San Marino"} + SN{"Senegal"} + SO{"Somalia"} + SP{"Serbia"} SR{"Surinam"} ST{"Sao Tome og Principe"} + SV{"El Salvador"} + SY{"Syria"} + SZ{"Swaziland"} TC{"Turks- og Caicosøyene"} TD{"Tchad"} TF{"Franske sørområder"} + TG{"Togo"} + TH{"Thailand"} TJ{"Tadsjikistan"} + TK{"Tokelau"} TL{"Øst-Timor"} + TM{"Turkmenistan"} + TN{"Tunisia"} + TO{"Tonga"} TR{"Tyrkia"} TT{"Trinidad og Tobago"} + TV{"Tuvalu"} + TW{"Taiwan"} + TZ{"Tanzania"} UA{"Ukraina"} + UG{"Uganda"} UM{"USAs mindre øyer"} US{"USA"} + UY{"Uruguay"} UZ{"Usbekistan"} VA{"Vatikanstaten"} VC{"St. Vincent og Grenadinene"} + VE{"Venezuela"} VG{"Jomfruøyene (britisk)"} VI{"Jomfruøyene (USA)"} + VN{"Vietnam"} + VU{"Vanuatu"} WF{"Wallis og Futuna"} + WS{"Samoa"} + YE{"Yemen"} + YT{"Mayotte"} YU{"Jugoslavia"} ZA{"Sør-Afrika"} + ZM{"Zambia"} + ZW{"Zimbabwe"} } Currencies{ NOK{ @@ -150,7 +283,6 @@ nn{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/nn_NO.txt b/icu4c/source/data/locales/nn_NO.txt index 107049bed2c..09b045c85cf 100644 --- a/icu4c/source/data/locales/nn_NO.txt +++ b/icu4c/source/data/locales/nn_NO.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:19 -// * Source File: \work\locale\common\main\\nn_NO.xml +// * Source File: ../../../locale/common/main\nn_NO.xml // * // *************************************************************************** nn_NO{ diff --git a/icu4c/source/data/locales/no.txt b/icu4c/source/data/locales/no.txt index 4dcccb772d0..a5c9f534d73 100644 --- a/icu4c/source/data/locales/no.txt +++ b/icu4c/source/data/locales/no.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:21 -// * Source File: \work\locale\common\main\\no.xml +// * Source File: deprecatedList.xml // * // *************************************************************************** no{ diff --git a/icu4c/source/data/locales/no_NO.txt b/icu4c/source/data/locales/no_NO.txt index 0e67224c80c..454d1162727 100644 --- a/icu4c/source/data/locales/no_NO.txt +++ b/icu4c/source/data/locales/no_NO.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:21 -// * Source File: \work\locale\common\main\\no_NO.xml +// * Source File: deprecatedList.xml // * // *************************************************************************** no_NO{ diff --git a/icu4c/source/data/locales/no_NO_NY.txt b/icu4c/source/data/locales/no_NO_NY.txt index d6cbfd3f419..85ef60b0e09 100644 --- a/icu4c/source/data/locales/no_NO_NY.txt +++ b/icu4c/source/data/locales/no_NO_NY.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/19 22:21 -// * Source File: +// * Source File: deprecatedList.xml // * // *************************************************************************** no_NO_NY{ diff --git a/icu4c/source/data/locales/om.txt b/icu4c/source/data/locales/om.txt index bc4b6dae145..2defcfc229b 100644 --- a/icu4c/source/data/locales/om.txt +++ b/icu4c/source/data/locales/om.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:19 -// * Source File: \work\locale\common\main\\om.xml +// * Source File: ../../../locale/common/main\om.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\om.xml + */ om{ Countries{ ET{"Itoophiyaa"} @@ -27,7 +29,6 @@ om{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 7, diff --git a/icu4c/source/data/locales/om_ET.txt b/icu4c/source/data/locales/om_ET.txt index 67f27f2a6db..9218509ffad 100644 --- a/icu4c/source/data/locales/om_ET.txt +++ b/icu4c/source/data/locales/om_ET.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:19 -// * Source File: \work\locale\common\main\\om_ET.xml +// * Source File: ../../../locale/common/main\om_ET.xml // * // *************************************************************************** om_ET{ @@ -22,7 +21,6 @@ om_ET{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "WD", diff --git a/icu4c/source/data/locales/om_KE.txt b/icu4c/source/data/locales/om_KE.txt index dc207a53b3e..119fd8b7fd1 100644 --- a/icu4c/source/data/locales/om_KE.txt +++ b/icu4c/source/data/locales/om_KE.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:19 -// * Source File: \work\locale\common\main\\om_KE.xml +// * Source File: ../../../locale/common/main\om_KE.xml // * // *************************************************************************** om_KE{ @@ -16,7 +15,6 @@ om_KE{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "WD", diff --git a/icu4c/source/data/locales/pa.txt b/icu4c/source/data/locales/pa.txt index 42ecf7e61ff..e75d453e9ab 100644 --- a/icu4c/source/data/locales/pa.txt +++ b/icu4c/source/data/locales/pa.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:19 -// * Source File: \work\locale\common\main\\pa.xml +// * Source File: ../../../locale/common/main\pa.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\pa.xml + */ pa{ Countries{ IN{"ਭਾਰਤ"} @@ -46,7 +48,6 @@ pa{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "ਸਵੇਰੇ", diff --git a/icu4c/source/data/locales/pa_IN.txt b/icu4c/source/data/locales/pa_IN.txt index 9619b735587..8bb1345f9c4 100644 --- a/icu4c/source/data/locales/pa_IN.txt +++ b/icu4c/source/data/locales/pa_IN.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:19 -// * Source File: \work\locale\common\main\\pa_IN.xml +// * Source File: ../../../locale/common/main\pa_IN.xml // * // *************************************************************************** pa_IN{ @@ -16,7 +15,6 @@ pa_IN{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "hh:mm:ss a z", diff --git a/icu4c/source/data/locales/pl.txt b/icu4c/source/data/locales/pl.txt index 3ef07b1b302..59b6b2c4ff8 100644 --- a/icu4c/source/data/locales/pl.txt +++ b/icu4c/source/data/locales/pl.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:20 -// * Source File: \work\locale\common\main\\pl.xml +// * Source File: ../../../locale/common/main\pl.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\pl.xml + */ pl{ Countries{ AD{"Andora"} @@ -250,12 +252,6 @@ pl{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Currencies{ - PLN{ - "zł", - "PLN", - } - } ExemplarCharacters{"[a-z ó ą ę ć ń ś ź ł ż]"} Languages{ ar{"arabski"} @@ -308,7 +304,6 @@ pl{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/pl_PL.txt b/icu4c/source/data/locales/pl_PL.txt index 9df156bc59d..1b8e5508b84 100644 --- a/icu4c/source/data/locales/pl_PL.txt +++ b/icu4c/source/data/locales/pl_PL.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:20 -// * Source File: \work\locale\common\main\\pl_PL.xml +// * Source File: ../../../locale/common/main\pl_PL.xml // * // *************************************************************************** pl_PL{ diff --git a/icu4c/source/data/locales/ps.txt b/icu4c/source/data/locales/ps.txt index 9eacabd7efa..f84b940dd43 100644 --- a/icu4c/source/data/locales/ps.txt +++ b/icu4c/source/data/locales/ps.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:20 -// * Source File: \work\locale\common\main\\ps.xml +// * Source File: ../../../locale/common/main\ps.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\ps.xml + */ ps{ Countries{ AF{"افغانستان"} @@ -120,7 +122,6 @@ ps{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "غ.م.", diff --git a/icu4c/source/data/locales/ps_AF.txt b/icu4c/source/data/locales/ps_AF.txt index b20355dcbfd..f91492f01f6 100644 --- a/icu4c/source/data/locales/ps_AF.txt +++ b/icu4c/source/data/locales/ps_AF.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:20 -// * Source File: \work\locale\common\main\\ps_AF.xml +// * Source File: ../../../locale/common/main\ps_AF.xml // * // *************************************************************************** ps_AF{ @@ -30,7 +29,6 @@ ps_AF{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 7, diff --git a/icu4c/source/data/locales/pt.txt b/icu4c/source/data/locales/pt.txt index f38d74870f6..46836ca3e90 100644 --- a/icu4c/source/data/locales/pt.txt +++ b/icu4c/source/data/locales/pt.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:23 -// * Source File: \work\locale\common\main\\pt.xml +// * Source File: ../../../locale/common/main\pt.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\pt.xml + */ pt{ Countries{ AD{"Andorra"} @@ -2254,6 +2256,7 @@ pt{ Buhd{"buhid"} Cans{"símbolos aborígenes do Canadá Unificado"} Cher{"cheroqui"} + Copt{"cóptico"} Cprt{"cipriota"} Cyrl{"cirílico"} Deva{"devanágari"} @@ -2285,7 +2288,6 @@ pt{ Ogam{"ogâmico"} Orya{"oriya"} Osma{"osmanya"} - Qaac{"cóptico"} Qaai{"herdado"} Runr{"rúnico"} Shaw{"shaviano"} @@ -2326,8 +2328,11 @@ pt{ } Version{"1.2"} calendar{ - gregorian{ + DateTimeElements:intvector{ + 2, + 1, + } DateTimePatterns{ "HH'H'mm'm'ss's' z", "HH:mm:ss z", @@ -2422,6 +2427,12 @@ pt{ } } } + weekend:intvector{ + 7, + 0, + 1, + 86400000, + } } } zoneStrings{ diff --git a/icu4c/source/data/locales/pt_BR.txt b/icu4c/source/data/locales/pt_BR.txt index f433982f43c..23d91bf44e7 100644 --- a/icu4c/source/data/locales/pt_BR.txt +++ b/icu4c/source/data/locales/pt_BR.txt @@ -3,14 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:24 -// * Source File: \work\locale\common\main\\pt_BR.xml +// * Source File: ../../../locale/common/main\pt_BR.xml // * // *************************************************************************** pt_BR{ Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "HH'h'mm'min'ss's' z", diff --git a/icu4c/source/data/locales/pt_PT.txt b/icu4c/source/data/locales/pt_PT.txt index b1d891ad6a0..636d82d4b47 100644 --- a/icu4c/source/data/locales/pt_PT.txt +++ b/icu4c/source/data/locales/pt_PT.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:25 -// * Source File: \work\locale\common\main\\pt_PT.xml +// * Source File: ../../../locale/common/main\pt_PT.xml // * // *************************************************************************** pt_PT{ @@ -99,7 +98,6 @@ pt_PT{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/resfiles.mk b/icu4c/source/data/locales/resfiles.mk index 73ba239528b..e613d982cb6 100644 --- a/icu4c/source/data/locales/resfiles.mk +++ b/icu4c/source/data/locales/resfiles.mk @@ -22,101 +22,62 @@ # | GENRB_SOURCE = ar.txt ar_AE.txt en.txt de.txt zh.txt # # +# Generated by LDML2ICUConverter, from LDML source files. + +# Aliases which do not have a corresponding xx.xml file (see deprecatedList.xml) +GENRB_SYNTHETIC_ALIAS = in.txt in_ID.txt iw.txt iw_IL.txt\ + ja_JP_TRADITIONAL.txt no.txt no_NO.txt no_NO_NY.txt th_TH_TRADITIONAL.txt -# This is the list of locales that are built, but not considered installed in ICU. -# These are usually aliased locales or the root locale. -GENRB_ALIAS_SOURCE = \ -iw.txt iw_IL.txt\ -no.txt no_NO.txt no_NO_NY.txt \ -ja_JP_TRADITIONAL.txt th_TH_TRADITIONAL.txt \ -zh_Hans.txt zh_Hans_CN.txt zh_Hans_SG.txt \ -zh_Hant.txt zh_Hant_HK.txt zh_Hant_MO.txt +# All aliases (to not be included under 'installed'), but not including root. +GENRB_ALIAS_SOURCE = $(GENRB_SYNTHETIC_ALIAS) sh.txt sh_YU.txt zh_CN.txt zh_HK.txt\ + zh_MO.txt zh_SG.txt zh_TW.txt -# Please try to keep this list in alphabetical order -GENRB_SOURCE = \ -af.txt af_ZA.txt\ -am.txt am_ET.txt\ -ar.txt ar_AE.txt ar_BH.txt ar_DZ.txt ar_EG.txt\ -ar_IQ.txt ar_IN.txt ar_JO.txt ar_KW.txt ar_LB.txt ar_LY.txt\ -ar_MA.txt ar_OM.txt ar_QA.txt ar_SA.txt ar_SD.txt\ -ar_SY.txt ar_TN.txt ar_YE.txt\ -be.txt be_BY.txt\ -bg.txt bg_BG.txt\ -bn.txt bn_IN.txt\ -ca.txt ca_ES.txt\ -cs.txt cs_CZ.txt\ -da.txt da_DK.txt\ -de.txt de_AT.txt de_BE.txt de_CH.txt\ -de_DE.txt de_LU.txt\ -el.txt el_GR.txt\ -en.txt en_AU.txt en_BE.txt en_BW.txt en_CA.txt en_GB.txt\ -en_HK.txt en_IE.txt en_IN.txt en_NZ.txt en_PH.txt en_SG.txt en_MT.txt\ -en_US.txt en_US_POSIX.txt en_VI.txt en_ZA.txt en_ZW.txt\ -eo.txt\ -es.txt es_AR.txt es_BO.txt es_CL.txt es_CO.txt\ -es_CR.txt es_DO.txt es_EC.txt es_ES.txt\ -es_GT.txt es_HN.txt es_MX.txt es_NI.txt es_PA.txt\ -es_PE.txt es_PR.txt es_PY.txt es_SV.txt es_US.txt\ -es_UY.txt es_VE.txt\ -et.txt et_EE.txt\ -eu.txt eu_ES.txt\ -fa.txt fa_AF.txt fa_IR.txt\ -fi.txt fi_FI.txt\ -fo.txt fo_FO.txt\ -fr.txt fr_BE.txt fr_CA.txt fr_CH.txt\ -fr_FR.txt fr_LU.txt\ -ga.txt ga_IE.txt\ -gl.txt gl_ES.txt\ -gv.txt gv_GB.txt\ -gu.txt gu_IN.txt\ -he.txt he_IL.txt\ -hi.txt hi_IN.txt\ -hr.txt hr_HR.txt\ -hu.txt hu_HU.txt\ -hy.txt hy_AM.txt hy_AM_REVISED.txt\ -id.txt id_ID.txt\ -is.txt is_IS.txt\ -it.txt it_CH.txt it_IT.txt\ -ja.txt ja_JP.txt\ -kk.txt kk_KZ.txt\ -kl.txt kl_GL.txt\ -ko.txt ko_KR.txt\ -kok.txt kok_IN.txt\ -kn.txt kn_IN.txt\ -kw.txt kw_GB.txt\ -lt.txt lt_LT.txt\ -lv.txt lv_LV.txt\ -mk.txt mk_MK.txt\ -mr.txt mr_IN.txt\ -ms.txt ms_MY.txt ms_BN.txt\ -mt.txt mt_MT.txt\ -nb.txt nb_NO.txt\ -nl.txt nl_BE.txt nl_NL.txt\ -nn.txt nn_NO.txt\ -om.txt om_ET.txt om_KE.txt\ -pa.txt pa_IN.txt\ -pl.txt pl_PL.txt\ -ps.txt ps_AF.txt\ -pt.txt pt_BR.txt pt_PT.txt\ -ro.txt ro_RO.txt\ -ru.txt ru_RU.txt ru_UA.txt\ -sh.txt sh_YU.txt\ -sk.txt sk_SK.txt\ -sl.txt sl_SI.txt\ -so.txt so_DJ.txt so_ET.txt so_KE.txt so_SO.txt\ -sq.txt sq_AL.txt\ -sr.txt sr_YU.txt\ -sv.txt sv_FI.txt sv_SE.txt\ -sw.txt sw_KE.txt sw_TZ.txt\ -ta.txt ta_IN.txt\ -te.txt te_IN.txt\ -th.txt th_TH.txt\ -ti.txt ti_ET.txt ti_ER.txt\ -tr.txt tr_TR.txt\ -uk.txt uk_UA.txt\ -vi.txt vi_VN.txt\ -zh.txt zh_CN.txt zh_HK.txt zh_MO.txt zh_SG.txt zh_TW.txt - +# Ordinary resources +GENRB_SOURCE = af.txt af_ZA.txt am.txt am_ET.txt\ + ar.txt ar_AE.txt ar_BH.txt ar_DZ.txt ar_EG.txt\ + ar_IN.txt ar_IQ.txt ar_JO.txt ar_KW.txt ar_LB.txt\ + ar_LY.txt ar_MA.txt ar_OM.txt ar_QA.txt ar_SA.txt\ + ar_SD.txt ar_SY.txt ar_TN.txt ar_YE.txt be.txt\ + be_BY.txt bg.txt bg_BG.txt bn.txt bn_IN.txt\ + ca.txt ca_ES.txt cs.txt cs_CZ.txt da.txt\ + da_DK.txt de.txt de_AT.txt de_BE.txt de_CH.txt\ + de_DE.txt de_LU.txt el.txt el_GR.txt en.txt\ + en_AU.txt en_BE.txt en_BW.txt en_CA.txt en_GB.txt\ + en_HK.txt en_IE.txt en_IN.txt en_MT.txt en_NZ.txt\ + en_PH.txt en_SG.txt en_US.txt en_US_POSIX.txt en_VI.txt\ + en_ZA.txt en_ZW.txt eo.txt es.txt es_AR.txt\ + es_BO.txt es_CL.txt es_CO.txt es_CR.txt es_DO.txt\ + es_EC.txt es_ES.txt es_GT.txt es_HN.txt es_MX.txt\ + es_NI.txt es_PA.txt es_PE.txt es_PR.txt es_PY.txt\ + es_SV.txt es_US.txt es_UY.txt es_VE.txt et.txt\ + et_EE.txt eu.txt eu_ES.txt fa.txt fa_AF.txt\ + fa_IR.txt fi.txt fi_FI.txt fo.txt fo_FO.txt\ + fr.txt fr_BE.txt fr_CA.txt fr_CH.txt fr_FR.txt\ + fr_LU.txt ga.txt ga_IE.txt gl.txt gl_ES.txt\ + gu.txt gu_IN.txt gv.txt gv_GB.txt he.txt\ + he_IL.txt hi.txt hi_IN.txt hr.txt hr_HR.txt\ + hu.txt hu_HU.txt hy.txt hy_AM.txt hy_AM_REVISED.txt\ + id.txt id_ID.txt is.txt is_IS.txt it.txt\ + it_CH.txt it_IT.txt ja.txt ja_JP.txt kk.txt\ + kk_KZ.txt kl.txt kl_GL.txt kn.txt kn_IN.txt\ + ko.txt ko_KR.txt kok.txt kok_IN.txt kw.txt\ + kw_GB.txt lt.txt lt_LT.txt lv.txt lv_LV.txt\ + mk.txt mk_MK.txt mr.txt mr_IN.txt ms.txt\ + ms_BN.txt ms_MY.txt mt.txt mt_MT.txt nb.txt\ + nb_NO.txt nl.txt nl_BE.txt nl_NL.txt nn.txt\ + nn_NO.txt om.txt om_ET.txt om_KE.txt pa.txt\ + pa_IN.txt pl.txt pl_PL.txt ps.txt ps_AF.txt\ + pt.txt pt_BR.txt pt_PT.txt ro.txt ro_RO.txt\ + ru.txt ru_RU.txt ru_UA.txt sk.txt sk_SK.txt\ + sl.txt sl_SI.txt so.txt so_DJ.txt so_ET.txt\ + so_KE.txt so_SO.txt sq.txt sq_AL.txt sr.txt\ + sr_Cyrl.txt sr_Cyrl_YU.txt sr_Latn.txt sr_Latn_YU.txt sr_YU.txt\ + sv.txt sv_FI.txt sv_SE.txt sw.txt sw_KE.txt\ + sw_TZ.txt ta.txt ta_IN.txt te.txt te_IN.txt\ + th.txt th_TH.txt ti.txt ti_ER.txt ti_ET.txt\ + tr.txt tr_TR.txt uk.txt uk_UA.txt vi.txt\ + vi_VN.txt zh.txt zh_Hans.txt zh_Hans_CN.txt zh_Hans_SG.txt\ + zh_Hant.txt zh_Hant_HK.txt zh_Hant_MO.txt zh_Hant_TW.txt diff --git a/icu4c/source/data/locales/ro.txt b/icu4c/source/data/locales/ro.txt index 4a9c7083c4b..8754391ee46 100644 --- a/icu4c/source/data/locales/ro.txt +++ b/icu4c/source/data/locales/ro.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:25 -// * Source File: \work\locale\common\main\\ro.xml +// * Source File: ../../../locale/common/main\ro.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\ro.xml + */ ro{ Countries{ AD{"Andorra"} @@ -308,7 +310,6 @@ ro{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/ro_RO.txt b/icu4c/source/data/locales/ro_RO.txt index 46cb945e63b..e4007a6fc6e 100644 --- a/icu4c/source/data/locales/ro_RO.txt +++ b/icu4c/source/data/locales/ro_RO.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:25 -// * Source File: \work\locale\common\main\\ro_RO.xml +// * Source File: ../../../locale/common/main\ro_RO.xml // * // *************************************************************************** ro_RO{ diff --git a/icu4c/source/data/locales/root.txt b/icu4c/source/data/locales/root.txt index 777d271a3d2..7b068a77b09 100644 --- a/icu4c/source/data/locales/root.txt +++ b/icu4c/source/data/locales/root.txt @@ -3,253 +3,13 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 7:10 -// * Source File: \work\locale\common\main\\root.xml +// * Source File: ../../../locale/common/main\root.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\root.xml + */ root{ - Countries{ - AD{"AD"} - AE{"AE"} - AF{"AF"} - AG{"AG"} - AI{"AI"} - AL{"AL"} - AM{"AM"} - AN{"AN"} - AO{"AO"} - AQ{"AQ"} - AR{"AR"} - AS{"AS"} - AT{"AT"} - AU{"AU"} - AW{"AW"} - AZ{"AZ"} - BA{"BA"} - BB{"BB"} - BD{"BD"} - BE{"BE"} - BF{"BF"} - BG{"BG"} - BH{"BH"} - BI{"BI"} - BJ{"BJ"} - BM{"BM"} - BN{"BN"} - BO{"BO"} - BR{"BR"} - BS{"BS"} - BT{"BT"} - BV{"BV"} - BW{"BW"} - BY{"BY"} - BZ{"BZ"} - CA{"CA"} - CC{"CC"} - CD{"CD"} - CF{"CF"} - CG{"CG"} - CH{"CH"} - CI{"CI"} - CK{"CK"} - CL{"CL"} - CM{"CM"} - CN{"CN"} - CO{"CO"} - CR{"CR"} - CU{"CU"} - CV{"CV"} - CX{"CX"} - CY{"CY"} - CZ{"CZ"} - DE{"DE"} - DJ{"DJ"} - DK{"DK"} - DM{"DM"} - DO{"DO"} - DZ{"DZ"} - EC{"EC"} - EE{"EE"} - EG{"EG"} - EH{"EH"} - ER{"ER"} - ES{"ES"} - ET{"ET"} - FI{"FI"} - FJ{"FJ"} - FK{"FK"} - FM{"FM"} - FO{"FO"} - FR{"FR"} - GA{"GA"} - GB{"GB"} - GD{"GD"} - GE{"GE"} - GF{"GF"} - GH{"GH"} - GI{"GI"} - GL{"GL"} - GM{"GM"} - GN{"GN"} - GP{"GP"} - GQ{"GQ"} - GR{"GR"} - GS{"GS"} - GT{"GT"} - GU{"GU"} - GW{"GW"} - GY{"GY"} - HK{"HK"} - HM{"HM"} - HN{"HN"} - HR{"HR"} - HT{"HT"} - HU{"HU"} - ID{"ID"} - IE{"IE"} - IL{"IL"} - IN{"IN"} - IO{"IO"} - IQ{"IQ"} - IR{"IR"} - IS{"IS"} - IT{"IT"} - JM{"JM"} - JO{"JO"} - JP{"JP"} - KE{"KE"} - KG{"KG"} - KH{"KH"} - KI{"KI"} - KM{"KM"} - KN{"KN"} - KP{"KP"} - KR{"KR"} - KW{"KW"} - KY{"KY"} - KZ{"KZ"} - LA{"LA"} - LB{"LB"} - LC{"LC"} - LI{"LI"} - LK{"LK"} - LR{"LR"} - LS{"LS"} - LT{"LT"} - LU{"LU"} - LV{"LV"} - LY{"LY"} - MA{"MA"} - MC{"MC"} - MD{"MD"} - MG{"MG"} - MH{"MH"} - MK{"MK"} - ML{"ML"} - MM{"MM"} - MN{"MN"} - MO{"MO"} - MP{"MP"} - MQ{"MQ"} - MR{"MR"} - MS{"MS"} - MT{"MT"} - MU{"MU"} - MV{"MV"} - MW{"MW"} - MX{"MX"} - MY{"MY"} - MZ{"MZ"} - NA{"NA"} - NC{"NC"} - NE{"NE"} - NF{"NF"} - NG{"NG"} - NI{"NI"} - NL{"NL"} - NO{"NO"} - NP{"NP"} - NR{"NR"} - NU{"NU"} - NZ{"NZ"} - OM{"OM"} - PA{"PA"} - PE{"PE"} - PF{"PF"} - PG{"PG"} - PH{"PH"} - PK{"PK"} - PL{"PL"} - PM{"PM"} - PN{"PN"} - PR{"PR"} - PS{"PS"} - PT{"PT"} - PW{"PW"} - PY{"PY"} - QA{"QA"} - RE{"RE"} - RO{"RO"} - RU{"RU"} - RW{"RW"} - SA{"SA"} - SB{"SB"} - SC{"SC"} - SD{"SD"} - SE{"SE"} - SG{"SG"} - SH{"SH"} - SI{"SI"} - SJ{"SJ"} - SK{"SK"} - SL{"SL"} - SM{"SM"} - SN{"SN"} - SO{"SO"} - SP{"SP"} - SR{"SR"} - ST{"ST"} - SV{"SV"} - SY{"SY"} - SZ{"SZ"} - TC{"TC"} - TD{"TD"} - TF{"TF"} - TG{"TG"} - TH{"TH"} - TJ{"TJ"} - TK{"TK"} - TL{"TL"} - TM{"TM"} - TN{"TN"} - TO{"TO"} - TR{"TR"} - TT{"TT"} - TV{"TV"} - TW{"TW"} - TZ{"TZ"} - UA{"UA"} - UG{"UG"} - UM{"UM"} - US{"US"} - UY{"UY"} - UZ{"UZ"} - VA{"VA"} - VC{"VC"} - VE{"VE"} - VG{"VG"} - VI{"VI"} - VN{"VN"} - VU{"VU"} - WF{"WF"} - WS{"WS"} - YE{"YE"} - YT{"YT"} - YU{"YU"} - ZA{"ZA"} - ZM{"ZM"} - ZW{"ZW"} - } Currencies{ EUR{ "€", @@ -277,483 +37,6 @@ root{ } } ExemplarCharacters{"[]"} - Keys{ - calendar{"CALENDAR"} - collation{"COLLATION"} - currency{"CURRENCY"} - } - Languages{ - aa{"aa"} - ab{"ab"} - ace{"ace"} - ach{"ach"} - ada{"ada"} - ady{"ady"} - ae{"ae"} - af{"af"} - afa{"afa"} - afh{"afh"} - ak{"ak"} - akk{"akk"} - ale{"ale"} - alg{"alg"} - am{"am"} - an{"an"} - ang{"ang"} - apa{"apa"} - ar{"ar"} - arc{"arc"} - arn{"arn"} - arp{"arp"} - art{"art"} - arw{"arw"} - as{"as"} - ast{"ast"} - ath{"ath"} - aus{"aus"} - av{"av"} - awa{"awa"} - ay{"ay"} - az{"az"} - ba{"ba"} - bad{"bad"} - bai{"bai"} - bal{"bal"} - ban{"ban"} - bas{"bas"} - bat{"bat"} - be{"be"} - bej{"bej"} - bem{"bem"} - ber{"ber"} - bg{"bg"} - bh{"bh"} - bho{"bho"} - bi{"bi"} - bik{"bik"} - bin{"bin"} - bla{"bla"} - bm{"bm"} - bn{"bn"} - bnt{"bnt"} - bo{"bo"} - br{"br"} - bra{"bra"} - bs{"bs"} - btk{"btk"} - bua{"bua"} - bug{"bug"} - byn{"byn"} - ca{"ca"} - cad{"cad"} - cai{"cai"} - car{"car"} - cau{"cau"} - ce{"ce"} - ceb{"ceb"} - cel{"cel"} - ch{"ch"} - chb{"chb"} - chg{"chg"} - chk{"chk"} - chm{"chm"} - chn{"chn"} - cho{"cho"} - chp{"chp"} - chr{"chr"} - chy{"chy"} - cmc{"cmc"} - co{"co"} - cop{"cop"} - cpe{"cpe"} - cpf{"cpf"} - cpp{"cpp"} - cr{"cr"} - crh{"crh"} - crp{"crp"} - cs{"cs"} - csb{"csb"} - cu{"cu"} - cus{"cus"} - cv{"cv"} - cy{"cy"} - da{"da"} - dak{"dak"} - dar{"dar"} - day{"day"} - de{"de"} - del{"del"} - den{"den"} - dgr{"dgr"} - din{"din"} - doi{"doi"} - dra{"dra"} - dsb{"dsb"} - dua{"dua"} - dum{"dum"} - dv{"dv"} - dyu{"dyu"} - dz{"dz"} - ee{"ee"} - efi{"efi"} - egy{"egy"} - eka{"eka"} - el{"el"} - elx{"elx"} - en{"en"} - enm{"enm"} - eo{"eo"} - es{"es"} - et{"et"} - eu{"eu"} - ewo{"ewo"} - fa{"fa"} - fan{"fan"} - fat{"fat"} - ff{"ff"} - fi{"fi"} - fiu{"fiu"} - fj{"fj"} - fo{"fo"} - fon{"fon"} - fr{"fr"} - frm{"frm"} - fro{"fro"} - fur{"fur"} - fy{"fy"} - ga{"ga"} - gaa{"gaa"} - gay{"gay"} - gba{"gba"} - gd{"gd"} - gem{"gem"} - gez{"gez"} - gil{"gil"} - gl{"gl"} - gmh{"gmh"} - gn{"gn"} - goh{"goh"} - gon{"gon"} - gor{"gor"} - got{"got"} - grb{"grb"} - grc{"grc"} - gu{"gu"} - gv{"gv"} - gwi{"gwi"} - ha{"ha"} - hai{"hai"} - haw{"haw"} - he{"he"} - hi{"hi"} - hil{"hil"} - him{"him"} - hit{"hit"} - hmn{"hmn"} - ho{"ho"} - hr{"hr"} - hsb{"hsb"} - ht{"ht"} - hu{"hu"} - hup{"hup"} - hy{"hy"} - hz{"hz"} - ia{"ia"} - iba{"iba"} - id{"id"} - ie{"ie"} - ig{"ig"} - ii{"ii"} - ijo{"ijo"} - ik{"ik"} - ilo{"ilo"} - inc{"inc"} - ine{"ine"} - inh{"inh"} - io{"io"} - ira{"ira"} - iro{"iro"} - is{"is"} - it{"it"} - iu{"iu"} - ja{"ja"} - jbo{"jbo"} - jpr{"jpr"} - jrb{"jrb"} - jv{"jv"} - ka{"ka"} - kaa{"kaa"} - kab{"kab"} - kac{"kac"} - kam{"kam"} - kar{"kar"} - kaw{"kaw"} - kbd{"kbd"} - kg{"kg"} - kha{"kha"} - khi{"khi"} - kho{"kho"} - ki{"ki"} - kj{"kj"} - kk{"kk"} - kl{"kl"} - km{"km"} - kmb{"kmb"} - kn{"kn"} - ko{"ko"} - kok{"kok"} - kos{"kos"} - kpe{"kpe"} - kr{"kr"} - krc{"krc"} - kro{"kro"} - kru{"kru"} - ks{"ks"} - ku{"ku"} - kum{"kum"} - kut{"kut"} - kv{"kv"} - kw{"kw"} - ky{"ky"} - la{"la"} - lad{"lad"} - lah{"lah"} - lam{"lam"} - lb{"lb"} - lez{"lez"} - lg{"lg"} - li{"li"} - ln{"ln"} - lo{"lo"} - lol{"lol"} - loz{"loz"} - lt{"lt"} - lu{"lu"} - lua{"lua"} - lui{"lui"} - lun{"lun"} - luo{"luo"} - lus{"lus"} - lv{"lv"} - mad{"mad"} - mag{"mag"} - mai{"mai"} - mak{"mak"} - man{"man"} - map{"map"} - mas{"mas"} - mdf{"mdf"} - mdr{"mdr"} - men{"men"} - mg{"mg"} - mga{"mga"} - mh{"mh"} - mi{"mi"} - mic{"mic"} - min{"min"} - mis{"mis"} - mk{"mk"} - mkh{"mkh"} - ml{"ml"} - mn{"mn"} - mnc{"mnc"} - mni{"mni"} - mno{"mno"} - mo{"mo"} - moh{"moh"} - mos{"mos"} - mr{"mr"} - ms{"ms"} - mt{"mt"} - mul{"mul"} - mun{"mun"} - mus{"mus"} - mwr{"mwr"} - my{"my"} - myn{"myn"} - myv{"myv"} - na{"na"} - nah{"nah"} - nai{"nai"} - nap{"nap"} - nb{"nb"} - nd{"nd"} - nds{"nds"} - ne{"ne"} - new{"new"} - ng{"ng"} - nia{"nia"} - nic{"nic"} - niu{"niu"} - nl{"nl"} - nn{"nn"} - no{"no"} - nog{"nog"} - non{"non"} - nr{"nr"} - nso{"nso"} - nub{"nub"} - nv{"nv"} - nwc{"nwc"} - ny{"ny"} - nym{"nym"} - nyn{"nyn"} - nyo{"nyo"} - nzi{"nzi"} - oc{"oc"} - oj{"oj"} - om{"om"} - or{"or"} - os{"os"} - osa{"osa"} - ota{"ota"} - oto{"oto"} - pa{"pa"} - paa{"paa"} - pag{"pag"} - pal{"pal"} - pam{"pam"} - pap{"pap"} - pau{"pau"} - peo{"peo"} - phi{"phi"} - phn{"phn"} - pi{"pi"} - pl{"pl"} - pon{"pon"} - pra{"pra"} - pro{"pro"} - ps{"ps"} - pt{"pt"} - qu{"qu"} - raj{"raj"} - rap{"rap"} - rar{"rar"} - rm{"rm"} - rn{"rn"} - ro{"ro"} - roa{"roa"} - rom{"rom"} - root{"root"} - ru{"ru"} - rw{"rw"} - sa{"sa"} - sad{"sad"} - sah{"sah"} - sai{"sai"} - sal{"sal"} - sam{"sam"} - sas{"sas"} - sat{"sat"} - sc{"sc"} - sco{"sco"} - sd{"sd"} - se{"se"} - sel{"sel"} - sem{"sem"} - sg{"sg"} - sga{"sga"} - sgn{"sgn"} - sh{"sh"} - shn{"shn"} - si{"si"} - sid{"sid"} - sio{"sio"} - sit{"sit"} - sk{"sk"} - sl{"sl"} - sla{"sla"} - sm{"sm"} - sma{"sma"} - smi{"smi"} - smj{"smj"} - smn{"smn"} - sms{"sms"} - sn{"sn"} - snk{"snk"} - so{"so"} - sog{"sog"} - son{"son"} - sq{"sq"} - sr{"sr"} - srr{"srr"} - ss{"ss"} - ssa{"ssa"} - st{"st"} - su{"su"} - suk{"suk"} - sus{"sus"} - sux{"sux"} - sv{"sv"} - sw{"sw"} - syr{"syr"} - ta{"ta"} - tai{"tai"} - te{"te"} - tem{"tem"} - ter{"ter"} - tet{"tet"} - tg{"tg"} - th{"th"} - ti{"ti"} - tig{"tig"} - tiv{"tiv"} - tk{"tk"} - tkl{"tkl"} - tl{"tl"} - tlh{"tlh"} - tli{"tli"} - tmh{"tmh"} - tn{"tn"} - to{"to"} - tog{"tog"} - tpi{"tpi"} - tr{"tr"} - ts{"ts"} - tsi{"tsi"} - tt{"tt"} - tum{"tum"} - tup{"tup"} - tut{"tut"} - tvl{"tvl"} - tw{"tw"} - ty{"ty"} - tyv{"tyv"} - udm{"udm"} - ug{"ug"} - uga{"uga"} - uk{"uk"} - umb{"umb"} - und{"und"} - ur{"ur"} - uz{"uz"} - vai{"vai"} - ve{"ve"} - vi{"vi"} - vo{"vo"} - vot{"vot"} - wa{"wa"} - wak{"wak"} - wal{"wal"} - war{"war"} - was{"was"} - wen{"wen"} - wo{"wo"} - xal{"xal"} - xh{"xh"} - yao{"yao"} - yap{"yap"} - yi{"yi"} - yo{"yo"} - ypk{"ypk"} - za{"za"} - zap{"zap"} - zen{"zen"} - zh{"zh"} - znd{"znd"} - zu{"zu"} - zun{"zun"} - } LocaleScript{ "Zyyy", } @@ -782,87 +65,6 @@ root{ 297, 210, } - Scripts{ - Arab{"Arab"} - Armn{"Armn"} - Beng{"Beng"} - Bopo{"Bopo"} - Brai{"Brai"} - Buhd{"Buhd"} - Cans{"Cans"} - Cher{"Cher"} - Cprt{"Cprt"} - Cyrl{"Cyrl"} - Deva{"Deva"} - Dsrt{"Dsrt"} - Ethi{"Ethi"} - Geor{"Geor"} - Goth{"Goth"} - Grek{"Grek"} - Gujr{"Gujr"} - Guru{"Guru"} - Hang{"Hang"} - Hani{"Hani"} - Hano{"Hano"} - Hans{"Hans"} - Hant{"Hant"} - Hebr{"Hebr"} - Hira{"Hira"} - Hrkt{"Hrkt"} - Ital{"Ital"} - Kana{"Kana"} - Khmr{"Khmr"} - Knda{"Knda"} - Laoo{"Laoo"} - Latn{"Latn"} - Limb{"Limb"} - Linb{"Linb"} - Mlym{"Mlym"} - Mong{"Mong"} - Mymr{"Mymr"} - Ogam{"Ogam"} - Orya{"Orya"} - Osma{"Osma"} - Qaac{"Qaac"} - Qaai{"Qaai"} - Runr{"Runr"} - Shaw{"Shaw"} - Sinh{"Sinh"} - Syrc{"Syrc"} - Tagb{"Tagb"} - Tale{"Tale"} - Taml{"Taml"} - Telu{"Telu"} - Tglg{"Tglg"} - Thaa{"Thaa"} - Thai{"Thai"} - Tibt{"Tibt"} - Ugar{"Ugar"} - Yiii{"Yiii"} - Zyyy{"Zyyy"} - } - Types{ - calendar{ - buddhist{"BUDDHIST"} - chinese{"CHINESE"} - gregorian{"GREGORIAN"} - hebrew{"HEBREW"} - islamic{"ISLAMIC"} - islamic-civil{"ISLAMIC-CIVIL"} - japanese{"JAPANESE"} - } - collation{ - direct{"DIRECT"} - phonebook{"PHONEBOOK"} - pinyin{"PINYIN"} - stroke{"STROKE"} - traditional{"TRADITIONAL"} - } - } - Variants{ - POSIX{"POSIX"} - REVISED{"REVISED"} - } Version{"1.2"} calendar{ buddhist{ @@ -909,11 +111,11 @@ root{ DateTimePatterns{ "HH:mm:ss z", "HH:mm:ss z", - "HH:mm:ss ", + "HH:mm:ss", "HH:mm", - "EEEE, yyyy MMMM dd ", - "yyyy MMMM d ", - "yyyy MMM d ", + "EEEE, yyyy MMMM dd", + "yyyy MMMM d", + "yyyy MMM d", "yy/MM/dd", "{1} {0}", } diff --git a/icu4c/source/data/locales/ru.txt b/icu4c/source/data/locales/ru.txt index ab575d57a0f..ef235f91b65 100644 --- a/icu4c/source/data/locales/ru.txt +++ b/icu4c/source/data/locales/ru.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:26 -// * Source File: \work\locale\common\main\\ru.xml +// * Source File: ../../../locale/common/main\ru.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\ru.xml + */ ru{ Countries{ AD{"Андорра"} @@ -250,16 +252,6 @@ ru{ ZM{"Замбия"} ZW{"Зимбабве"} } - Currencies{ - RUR{ - "р.", - "RUR", - } - UAH{ - "грн.", - "UAH", - } - } ExemplarCharacters{"[а-я ё і ѣ ѳ ѵ]"} Languages{ aa{"Афар"} @@ -407,7 +399,6 @@ ru{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/ru_RU.txt b/icu4c/source/data/locales/ru_RU.txt index df28854f560..ddc6a86becf 100644 --- a/icu4c/source/data/locales/ru_RU.txt +++ b/icu4c/source/data/locales/ru_RU.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:26 -// * Source File: \work\locale\common\main\\ru_RU.xml +// * Source File: ../../../locale/common/main\ru_RU.xml // * // *************************************************************************** ru_RU{ diff --git a/icu4c/source/data/locales/ru_UA.txt b/icu4c/source/data/locales/ru_UA.txt index 831c4a31888..0bcd17e3568 100644 --- a/icu4c/source/data/locales/ru_UA.txt +++ b/icu4c/source/data/locales/ru_UA.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:26 -// * Source File: \work\locale\common\main\\ru_UA.xml +// * Source File: ../../../locale/common/main\ru_UA.xml // * // *************************************************************************** ru_UA{ @@ -30,7 +29,6 @@ ru_UA{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "HH:mm:ss z", diff --git a/icu4c/source/data/locales/sh.txt b/icu4c/source/data/locales/sh.txt index be75317123b..bbfb223ccea 100644 --- a/icu4c/source/data/locales/sh.txt +++ b/icu4c/source/data/locales/sh.txt @@ -3,10 +3,9 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:30 -// * Source File: +// * Source File: ../../../locale/common/main\sh.xml // * // *************************************************************************** sh{ - "%%ALIAS"{"sr"} + "%%ALIAS"{"sr_Latn"} } diff --git a/icu4c/source/data/locales/sh_YU.txt b/icu4c/source/data/locales/sh_YU.txt index 9ee1fbcd9bf..6597056f9a3 100644 --- a/icu4c/source/data/locales/sh_YU.txt +++ b/icu4c/source/data/locales/sh_YU.txt @@ -3,10 +3,9 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:30 -// * Source File: +// * Source File: ../../../locale/common/main\sh_YU.xml // * // *************************************************************************** sh_YU{ - "%%ALIAS"{"sr_YU"} + "%%ALIAS"{"sr_Latn_YU"} } diff --git a/icu4c/source/data/locales/sk.txt b/icu4c/source/data/locales/sk.txt index f5b5984d578..040377a9f71 100644 --- a/icu4c/source/data/locales/sk.txt +++ b/icu4c/source/data/locales/sk.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:27 -// * Source File: \work\locale\common\main\\sk.xml +// * Source File: ../../../locale/common/main\sk.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\sk.xml + */ sk{ Countries{ AD{"Andorra"} @@ -250,12 +252,6 @@ sk{ ZM{"Zambia"} ZW{"Zimbabwe"} } - Currencies{ - SKK{ - "Sk", - "SKK", - } - } ExemplarCharacters{"[a-z ý á é í ó ú ä ô ĺ ŕ č ď ľ ň š ť ž]"} Languages{ ar{"arabský"} @@ -308,7 +304,6 @@ sk{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/sk_SK.txt b/icu4c/source/data/locales/sk_SK.txt index c287e0503df..944bb98bd63 100644 --- a/icu4c/source/data/locales/sk_SK.txt +++ b/icu4c/source/data/locales/sk_SK.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:27 -// * Source File: \work\locale\common\main\\sk_SK.xml +// * Source File: ../../../locale/common/main\sk_SK.xml // * // *************************************************************************** sk_SK{ diff --git a/icu4c/source/data/locales/sl.txt b/icu4c/source/data/locales/sl.txt index 003e87f61cd..eb0d5bef39a 100644 --- a/icu4c/source/data/locales/sl.txt +++ b/icu4c/source/data/locales/sl.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:28 -// * Source File: \work\locale\common\main\\sl.xml +// * Source File: ../../../locale/common/main\sl.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\sl.xml + */ sl{ Countries{ AD{"Andora"} @@ -253,7 +255,7 @@ sl{ Currencies{ SIT{ "SIT", - "SIT", + "Slovenski tolar", } } ExemplarCharacters{"[a-pr-vzčšž]"} @@ -308,7 +310,6 @@ sl{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/sl_SI.txt b/icu4c/source/data/locales/sl_SI.txt index 3f601ef25fb..e5e0ab6b5e4 100644 --- a/icu4c/source/data/locales/sl_SI.txt +++ b/icu4c/source/data/locales/sl_SI.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:28 -// * Source File: \work\locale\common\main\\sl_SI.xml +// * Source File: ../../../locale/common/main\sl_SI.xml // * // *************************************************************************** sl_SI{ diff --git a/icu4c/source/data/locales/so.txt b/icu4c/source/data/locales/so.txt index 52d56867d95..26625fe8d44 100644 --- a/icu4c/source/data/locales/so.txt +++ b/icu4c/source/data/locales/so.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:28 -// * Source File: \work\locale\common\main\\so.xml +// * Source File: ../../../locale/common/main\so.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\so.xml + */ so{ Countries{ AE{"Imaaraadka Carabta ee Midoobay"} @@ -125,7 +127,6 @@ so{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "sn", diff --git a/icu4c/source/data/locales/so_DJ.txt b/icu4c/source/data/locales/so_DJ.txt index 51891b34c18..dce246b8ad2 100644 --- a/icu4c/source/data/locales/so_DJ.txt +++ b/icu4c/source/data/locales/so_DJ.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:28 -// * Source File: \work\locale\common\main\\so_DJ.xml +// * Source File: ../../../locale/common/main\so_DJ.xml // * // *************************************************************************** so_DJ{ diff --git a/icu4c/source/data/locales/so_ET.txt b/icu4c/source/data/locales/so_ET.txt index 4f0a5257811..70aeff8b8e7 100644 --- a/icu4c/source/data/locales/so_ET.txt +++ b/icu4c/source/data/locales/so_ET.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:29 -// * Source File: \work\locale\common\main\\so_ET.xml +// * Source File: ../../../locale/common/main\so_ET.xml // * // *************************************************************************** so_ET{ diff --git a/icu4c/source/data/locales/so_KE.txt b/icu4c/source/data/locales/so_KE.txt index 6cb3b8f2d0a..c41863d6165 100644 --- a/icu4c/source/data/locales/so_KE.txt +++ b/icu4c/source/data/locales/so_KE.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:29 -// * Source File: \work\locale\common\main\\so_KE.xml +// * Source File: ../../../locale/common/main\so_KE.xml // * // *************************************************************************** so_KE{ diff --git a/icu4c/source/data/locales/so_SO.txt b/icu4c/source/data/locales/so_SO.txt index 617e0add351..6ff8f6db098 100644 --- a/icu4c/source/data/locales/so_SO.txt +++ b/icu4c/source/data/locales/so_SO.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:29 -// * Source File: \work\locale\common\main\\so_SO.xml +// * Source File: ../../../locale/common/main\so_SO.xml // * // *************************************************************************** so_SO{ diff --git a/icu4c/source/data/locales/sq.txt b/icu4c/source/data/locales/sq.txt index f0197877a84..dc3b790c8eb 100644 --- a/icu4c/source/data/locales/sq.txt +++ b/icu4c/source/data/locales/sq.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:29 -// * Source File: \work\locale\common\main\\sq.xml +// * Source File: ../../../locale/common/main\sq.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\sq.xml + */ sq{ Countries{ AD{"Andorrë"} @@ -191,7 +193,6 @@ sq{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "PD", diff --git a/icu4c/source/data/locales/sq_AL.txt b/icu4c/source/data/locales/sq_AL.txt index 42fa98d5a32..79b82f7d129 100644 --- a/icu4c/source/data/locales/sq_AL.txt +++ b/icu4c/source/data/locales/sq_AL.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:29 -// * Source File: \work\locale\common\main\\sq_AL.xml +// * Source File: ../../../locale/common/main\sq_AL.xml // * // *************************************************************************** sq_AL{ diff --git a/icu4c/source/data/locales/sr.txt b/icu4c/source/data/locales/sr.txt index e2236bf9769..c20206aab43 100644 --- a/icu4c/source/data/locales/sr.txt +++ b/icu4c/source/data/locales/sr.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:30 -// * Source File: \work\locale\common\main\\sr.xml +// * Source File: ../../../locale/common/main\sr.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\sr.xml + */ sr{ Countries{ AD{"Андора"} @@ -195,12 +197,6 @@ sr{ ZM{"Замбија"} ZW{"Зимбабве"} } - Currencies{ - YUN{ - "Дин", - "YUN", - } - } ExemplarCharacters{"[а-и к-ш ђ ј љ њ ћ џ]"} Languages{ af{"Африканерски"} @@ -283,7 +279,6 @@ sr{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/sr_Cyrl.txt b/icu4c/source/data/locales/sr_Cyrl.txt new file mode 100644 index 00000000000..57d88d1ac52 --- /dev/null +++ b/icu4c/source/data/locales/sr_Cyrl.txt @@ -0,0 +1,11 @@ +// *************************************************************************** +// * +// * Copyright (C) 2004 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 +// * +// *************************************************************************** +sr_Cyrl{ + Version{"1.2"} +} diff --git a/icu4c/source/data/locales/sr_Cyrl_YU.txt b/icu4c/source/data/locales/sr_Cyrl_YU.txt new file mode 100644 index 00000000000..765d165d876 --- /dev/null +++ b/icu4c/source/data/locales/sr_Cyrl_YU.txt @@ -0,0 +1,11 @@ +// *************************************************************************** +// * +// * Copyright (C) 2004 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_YU.xml +// * +// *************************************************************************** +sr_Cyrl_YU{ + Version{"1.2"} +} diff --git a/icu4c/source/data/locales/sr_Latn.txt b/icu4c/source/data/locales/sr_Latn.txt new file mode 100644 index 00000000000..40ac326bb29 --- /dev/null +++ b/icu4c/source/data/locales/sr_Latn.txt @@ -0,0 +1,394 @@ +// *************************************************************************** +// * +// * Copyright (C) 2004 International Business Machines +// * Corporation and others. All Rights Reserved. +// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java +// * Source File: ../../../locale/common/main\sr_Latn.xml +// * +// *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\sr_Latn.xml + */ +sr_Latn{ + Countries{ + AD{"Andora"} + AE{"Ujedinjeni Arapski Emirati"} + AF{"Avganistan"} + AL{"Albanija"} + AM{"Armenija"} + AN{"Holandski Antili"} + AO{"Angola"} + AR{"Argentina"} + AT{"Austrija"} + AU{"Australija"} + AW{"Aruba"} + AZ{"Azerbejdžan"} + BA{"Bosna i Hercegovina"} + BB{"Barbados"} + BD{"Bangladeš"} + BE{"Belgija"} + BF{"Burkina Faso"} + BG{"Bugarska"} + BH{"Bahrein"} + BI{"Burundi"} + BJ{"Benin"} + BM{"Bermuda"} + BN{"Brunej"} + BO{"Bolivija"} + BR{"Brazil"} + BS{"Bahami"} + BT{"Butan"} + BW{"Bocvana"} + BY{"Belorusija"} + BZ{"Belise"} + CA{"Kanada"} + CF{"Centralno Afrička Republika"} + CG{"Kongo"} + CH{"Švajcarska"} + CI{"Obala Slonovače"} + CL{"Čile"} + CM{"Kamerun"} + CN{"Kina"} + CO{"Kolumbija"} + CR{"Kostarika"} + CU{"Kuba"} + CY{"Kipar"} + CZ{"Češka"} + DE{"Nemačka"} + DJ{"Džibuti"} + DK{"Danska"} + DM{"Dominika"} + DO{"Dominikanska Republika"} + DZ{"Alžir"} + EC{"Ekvador"} + EE{"Estonija"} + EG{"Egipat"} + EH{"Zapadna Sahara"} + ER{"Eritreja"} + ES{"Španija"} + ET{"Etiopija"} + FI{"Finska"} + FJ{"Fidži"} + FM{"Mikronezija"} + FR{"Francuska"} + GA{"Gabon"} + GB{"Velika Britanija"} + GD{"Grenada"} + GE{"Gruzija"} + GF{"Francuska Gvajana"} + GH{"Gana"} + GI{"Gibraltar"} + GM{"Gambija"} + GN{"Gvineja"} + GP{"Gvadelupe"} + GQ{"Ekvatorijalna Gvineja"} + GR{"Grčka"} + GT{"Gvatemala"} + GU{"Guam"} + GW{"Gvineja-Bisao"} + GY{"Gvajana"} + HN{"Honduras"} + HR{"Hrvatska"} + HT{"Haiti"} + HU{"Mađarska"} + ID{"Indonezija"} + IE{"Irska"} + IL{"Izrael"} + IN{"Indija"} + IO{"British Indian Ocean Territory"} + IQ{"Irak"} + IR{"Iran"} + IS{"Island"} + IT{"Italija"} + JM{"Jamajka"} + JO{"Jordan"} + JP{"Japan"} + KE{"Kenija"} + KG{"Kirgistan"} + KH{"Kambodža"} + KI{"Kiribati"} + KP{"Severna Koreja"} + KR{"Južna Koreja"} + KW{"Kuvajt"} + KZ{"Kazahstan"} + LA{"Laos"} + LB{"Liban"} + LI{"Lihenštajn"} + LK{"Šrilanka"} + LR{"Liberija"} + LS{"Lesoto"} + LT{"Litvanija"} + LU{"Luksemburg"} + LV{"Letonija"} + LY{"Libija"} + MA{"Maroko"} + MC{"Monako"} + MD{"Moldavija"} + MG{"Madagaskar"} + MK{"Makedonija"} + ML{"Mali"} + MM{"Mijnamar"} + MN{"Mongolija"} + MQ{"Martinik"} + MR{"Mauritanija"} + MS{"Montserrat"} + MT{"Malta"} + MU{"Mauricius"} + MX{"Meksiko"} + MY{"Malezija"} + MZ{"Mozambik"} + NA{"Namibija"} + NC{"Nova Kaledonija"} + NE{"Niger"} + NG{"Nigerija"} + NI{"Nikaragva"} + NL{"Holandija"} + NO{"Norveška"} + NP{"Nepal"} + NR{"Nauru"} + NU{"Niue"} + NZ{"Novi Zeland"} + OM{"Oman"} + PA{"Panama"} + PE{"Peru"} + PF{"Francuska Polinezija"} + PG{"Papua Nova Gvineja"} + PH{"Filipini"} + PK{"Pakistan"} + PL{"Poljska"} + PN{"Pitcairn"} + PR{"Porto Riko"} + PT{"Portugal"} + PW{"Palau"} + PY{"Paragvaj"} + QA{"Katar"} + RO{"Rumunija"} + RU{"Rusija"} + RW{"Ruanda"} + SA{"Saudijska Arabija"} + SB{"Solomon Islands"} + SC{"Sejšeli"} + SD{"Sudan"} + SE{"Švedska"} + SG{"Singapur"} + SH{"Saint Helena"} + SI{"Slovenija"} + SK{"Slovačka"} + SL{"Sijera Leone"} + SM{"San Marino"} + SN{"Senegal"} + SO{"Somalija"} + SP{"Srbija"} + SR{"Surinam"} + SV{"Salvador"} + SY{"Sirija"} + SZ{"Svazilend"} + TD{"Čad"} + TF{"Francuske Južne Teritorije"} + TG{"Togo"} + TH{"Tajland"} + TJ{"Tadžikistan"} + TK{"Tokelau"} + TL{"Timor-Leste"} + TM{"Turkmenistan"} + TN{"Tunis"} + TO{"Tonga"} + TR{"Turska"} + TT{"Trinidad i Tobago"} + TV{"Tuvalu"} + TW{"Tajvan"} + TZ{"Tanzanija"} + UA{"Ukrajina"} + UG{"Uganda"} + US{"Sjedinjene Američke Države"} + UY{"Urugvaj"} + UZ{"Uzbekistan"} + VA{"Vatikan"} + VE{"Venecuela"} + VG{"Britanska Devičanska Ostrva"} + VI{"S.A.D. Devičanska Ostrva"} + VN{"Vijetnam"} + VU{"Vanuatu"} + WS{"Samoa"} + YE{"Jemen"} + YT{"Mayotte"} + YU{"Jugoslavija"} + ZA{"Južna Afrika"} + ZM{"Zambija"} + ZW{"Zimbabve"} + } + Currencies{ + YUN{ + "Din", + "YUN", + } + } + ExemplarCharacters{"[a-p r-v z đ ć č ž š {lj} {nj} {dž}]"} + Languages{ + af{"Afrikanerski"} + ar{"Arapski"} + be{"Beloruski"} + bg{"Bugarski"} + br{"Bretonski"} + ca{"Katalonski"} + co{"Korzikanski"} + cs{"Češki"} + da{"Danski"} + de{"Nemački"} + el{"Grčki"} + en{"Engleski"} + es{"Španski"} + et{"Estonski"} + eu{"Baskijski"} + fa{"Persijski"} + fi{"Finski"} + fr{"Francuski"} + ga{"Irski"} + he{"Hebrejski"} + hr{"Hrvatski"} + hu{"Mađarski"} + hy{"Armenski"} + id{"Indonezijski"} + is{"Islandski"} + it{"Italijanski"} + ja{"Japanski"} + ka{"Gruzijski"} + km{"Kambodžanski"} + ko{"Korejski"} + ku{"Kurdski"} + ky{"Kirgiski"} + la{"Latinski"} + lt{"Litvanski"} + lv{"Letonski"} + mk{"Makedonski"} + mn{"Mongolski"} + mo{"Moldavski"} + my{"Burmanski"} + nl{"Holandski"} + no{"Norveški"} + pl{"Poljski"} + pt{"Portugalski"} + rm{"Reto-Romanski"} + ro{"Rumunski"} + ru{"Ruski"} + sh{"Srpsko-Hrvatski"} + sk{"Slovački"} + sl{"Slovenački"} + sq{"Albanski"} + sr{"Srpski"} + sv{"Švedski"} + sw{"Svahili"} + tr{"Turski"} + uk{"Ukrajnski"} + vi{"Vijetnamski"} + yi{"Jidiš"} + zh{"Kineski"} + } + LocaleScript{ + "Latn", + } + NumberElements{ + ",", + ".", + ";", + "%", + "0", + "#", + "-", + "E", + "‰", + "∞", + "�", + "+", + } + Version{"1.2"} + calendar{ + gregorian{ + DateTimeElements:intvector{ + 2, + 1, + } + DateTimePatterns{ + "HH.mm.ss z", + "HH.mm.ss z", + "HH.mm.ss", + "HH.mm", + "EEEE, dd. MMMM yyyy.", + "EEEE, d.MM.yyyy.", + "dd.MM.yyyy.", + "d.M.yy.", + "{1} {0}", + } + dayNames{ + format{ + abbreviated{ + "ned", + "pon", + "uto", + "sre", + "čet", + "pet", + "sub", + } + wide{ + "nedelja", + "ponedeljak", + "utorak", + "sreda", + "četvrtak", + "petak", + "subota", + } + } + } + eras{ + abbreviated{ + "p. n. e.", + "n. e.", + } + } + monthNames{ + format{ + abbreviated{ + "jan", + "feb", + "mar", + "apr", + "maj", + "jun", + "jul", + "avg", + "sep", + "okt", + "nov", + "dec", + } + wide{ + "januara", + "februara", + "marta", + "aprila", + "maja", + "juna", + "jula", + "avgusta", + "septembra", + "oktobra", + "novembra", + "decembra", + } + } + } + } + } + localPatternChars{"GanjkHmsSEDFwWxhKzAeugXZ"} + zoneStrings{ + { + "Europe/Belgrade", + "Centralno Evropsko Vreme", + "CET", + "Centralno Evropsko Letnje Vreme", + "CET", + } + } +} diff --git a/icu4c/source/data/locales/sr_Latn_YU.txt b/icu4c/source/data/locales/sr_Latn_YU.txt new file mode 100644 index 00000000000..2d3050ab520 --- /dev/null +++ b/icu4c/source/data/locales/sr_Latn_YU.txt @@ -0,0 +1,11 @@ +// *************************************************************************** +// * +// * Copyright (C) 2004 International Business Machines +// * Corporation and others. All Rights Reserved. +// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java +// * Source File: ../../../locale/common/main\sr_Latn_YU.xml +// * +// *************************************************************************** +sr_Latn_YU{ + Version{"1.2"} +} diff --git a/icu4c/source/data/locales/sr_YU.txt b/icu4c/source/data/locales/sr_YU.txt index abc53b953c9..fd4298a1481 100644 --- a/icu4c/source/data/locales/sr_YU.txt +++ b/icu4c/source/data/locales/sr_YU.txt @@ -3,10 +3,9 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:30 -// * Source File: \work\locale\common\main\\sr_YU.xml +// * Source File: ../../../locale/common/main\sr_YU.xml // * // *************************************************************************** sr_YU{ - Version{"1.2"} + "%%ALIAS"{"sr_Cyrl_YU"} } diff --git a/icu4c/source/data/locales/sv.txt b/icu4c/source/data/locales/sv.txt index 5ab6604a8ee..b6cbaf45e42 100644 --- a/icu4c/source/data/locales/sv.txt +++ b/icu4c/source/data/locales/sv.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:32 -// * Source File: \work\locale\common\main\\sv.xml +// * Source File: ../../../locale/common/main\sv.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\sv.xml + */ sv{ Countries{ AD{"Andorra"} @@ -1716,11 +1718,11 @@ sv{ "Zimbabwisk dollar", } } - ExemplarCharacters{"[a-zäöåáéëü]"} + ExemplarCharacters{"[a-zäöåàéëü]"} Keys{ - calendar{"Kalendar"} - collation{"Sortera"} - currency{"Valuta"} + calendar{"kalender"} + collation{"sorteringsordning"} + currency{"valuta"} } Languages{ aa{"afar"} @@ -2203,58 +2205,31 @@ sv{ "+", } Scripts{ - Arab{"arabiskt"} - Armn{"armeniskt"} - Beng{"bengaliskt"} Bopo{"bopomofo"} - Brai{"braille"} Buhd{"buhid"} + Cans{"kanadensiska stavelsetecken"} Cher{"cherokee"} - Cprt{"cypriotiskt"} - Cyrl{"kyrilliskt"} Deva{"devanagari"} Dsrt{"deseret"} - Ethi{"etiopiskt"} - Geor{"georgiskt"} - Goth{"gotiskt"} - Grek{"grekiskt"} Gujr{"gujarati"} Guru{"gurmukhi"} Hang{"hangul"} Hani{"han"} - Hano{"hanunoo"} Hans{"förenklad han"} Hant{"traditionell han"} - Hebr{"hebreiskt"} Hira{"hiragana"} - Ital{"fornitaliskt"} + Hrkt{"katakana/hiragana"} Kana{"katakana"} Khmr{"khmer"} - Knda{"kannada"} - Laoo{"laotiskt"} - Latn{"latinskt"} Limb{"limbu"} - Linb{"linear B"} Mlym{"malayalam"} - Mong{"mongoliskt"} - Mymr{"myanmar"} Ogam{"ogham"} Orya{"oriya"} - Osma{"osmanskt"} - Qaac{"koptiskt"} - Runr{"runskrift"} - Shaw{"shavian"} - Sinh{"sinhala"} - Syrc{"syriskt"} + Qaai{"ärvd"} Tagb{"tagbanwa"} Tale{"tai le"} - Taml{"tamilskt"} Telu{"telugu"} Tglg{"tagalog"} - Thaa{"thaana"} - Thai{"thailändskt"} - Tibt{"tibetanskt"} - Ugar{"ugaritiskt"} Yiii{"yi"} Zyyy{"vanligt"} } @@ -2281,11 +2256,10 @@ sv{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ - "fm", - "em", + "f.m.", + "e.m.", } DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/sv_FI.txt b/icu4c/source/data/locales/sv_FI.txt index ca521fac96e..16967b91579 100644 --- a/icu4c/source/data/locales/sv_FI.txt +++ b/icu4c/source/data/locales/sv_FI.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:33 -// * Source File: \work\locale\common\main\\sv_FI.xml +// * Source File: ../../../locale/common/main\sv_FI.xml // * // *************************************************************************** sv_FI{ diff --git a/icu4c/source/data/locales/sv_SE.txt b/icu4c/source/data/locales/sv_SE.txt index e5ce286c0eb..e9e63342433 100644 --- a/icu4c/source/data/locales/sv_SE.txt +++ b/icu4c/source/data/locales/sv_SE.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:34 -// * Source File: \work\locale\common\main\\sv_SE.xml +// * Source File: ../../../locale/common/main\sv_SE.xml // * // *************************************************************************** sv_SE{ diff --git a/icu4c/source/data/locales/sw.txt b/icu4c/source/data/locales/sw.txt index 84e6254b739..d89b40906f8 100644 --- a/icu4c/source/data/locales/sw.txt +++ b/icu4c/source/data/locales/sw.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:34 -// * Source File: \work\locale\common\main\\sw.xml +// * Source File: ../../../locale/common/main\sw.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\sw.xml + */ sw{ Countries{ AE{"Muugano wa Falme za Nchi za Kiarabu"} @@ -107,7 +109,6 @@ sw{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 7, diff --git a/icu4c/source/data/locales/sw_KE.txt b/icu4c/source/data/locales/sw_KE.txt index 9a4e1b848c8..a24377c2dc1 100644 --- a/icu4c/source/data/locales/sw_KE.txt +++ b/icu4c/source/data/locales/sw_KE.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:34 -// * Source File: \work\locale\common\main\\sw_KE.xml +// * Source File: ../../../locale/common/main\sw_KE.xml // * // *************************************************************************** sw_KE{ diff --git a/icu4c/source/data/locales/sw_TZ.txt b/icu4c/source/data/locales/sw_TZ.txt index e52bc2dfa0f..b8fef19a34a 100644 --- a/icu4c/source/data/locales/sw_TZ.txt +++ b/icu4c/source/data/locales/sw_TZ.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:35 -// * Source File: \work\locale\common\main\\sw_TZ.xml +// * Source File: ../../../locale/common/main\sw_TZ.xml // * // *************************************************************************** sw_TZ{ diff --git a/icu4c/source/data/locales/ta.txt b/icu4c/source/data/locales/ta.txt index 3bddfffa4bd..219944c550a 100644 --- a/icu4c/source/data/locales/ta.txt +++ b/icu4c/source/data/locales/ta.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:35 -// * Source File: \work\locale\common\main\\ta.xml +// * Source File: ../../../locale/common/main\ta.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\ta.xml + */ ta{ Countries{ AD{"அன்டோரா"} @@ -336,7 +338,6 @@ ta{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "காலை", diff --git a/icu4c/source/data/locales/ta_IN.txt b/icu4c/source/data/locales/ta_IN.txt index 968358eb0d3..54d0b4c25d5 100644 --- a/icu4c/source/data/locales/ta_IN.txt +++ b/icu4c/source/data/locales/ta_IN.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:35 -// * Source File: \work\locale\common\main\\ta_IN.xml +// * Source File: ../../../locale/common/main\ta_IN.xml // * // *************************************************************************** ta_IN{ @@ -16,7 +15,6 @@ ta_IN{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a z", diff --git a/icu4c/source/data/locales/te.txt b/icu4c/source/data/locales/te.txt index e2270928395..e538d6d69bc 100644 --- a/icu4c/source/data/locales/te.txt +++ b/icu4c/source/data/locales/te.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:35 -// * Source File: \work\locale\common\main\\te.xml +// * Source File: ../../../locale/common/main\te.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\te.xml + */ te{ Countries{ IN{"భారత దేళ౦"} @@ -40,7 +42,6 @@ te{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "పూర్వాహ్న", diff --git a/icu4c/source/data/locales/te_IN.txt b/icu4c/source/data/locales/te_IN.txt index bcb4b893210..7f708d9dd1f 100644 --- a/icu4c/source/data/locales/te_IN.txt +++ b/icu4c/source/data/locales/te_IN.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:35 -// * Source File: \work\locale\common\main\\te_IN.xml +// * Source File: ../../../locale/common/main\te_IN.xml // * // *************************************************************************** te_IN{ @@ -16,7 +15,6 @@ te_IN{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a z", diff --git a/icu4c/source/data/locales/th.txt b/icu4c/source/data/locales/th.txt index 8de1483c1f7..bf918ecd499 100644 --- a/icu4c/source/data/locales/th.txt +++ b/icu4c/source/data/locales/th.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:36 -// * Source File: \work\locale\common\main\\th.xml +// * Source File: ../../../locale/common/main\th.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\th.xml + */ th{ BreakDictionaryData:import { "../brkitr/thaidict.brk" } Countries{ @@ -380,7 +382,6 @@ th{ } } } - gregorian{ AmPmMarkers{ "ก่อนเที่ยง", diff --git a/icu4c/source/data/locales/th_TH.txt b/icu4c/source/data/locales/th_TH.txt index f013c8dcd02..65b3aeeb5f0 100644 --- a/icu4c/source/data/locales/th_TH.txt +++ b/icu4c/source/data/locales/th_TH.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:36 -// * Source File: \work\locale\common\main\\th_TH.xml +// * Source File: ../../../locale/common/main\th_TH.xml // * // *************************************************************************** th_TH{ diff --git a/icu4c/source/data/locales/th_TH_TRADITIONAL.txt b/icu4c/source/data/locales/th_TH_TRADITIONAL.txt index 5a777a64d71..b250d87f3e2 100644 --- a/icu4c/source/data/locales/th_TH_TRADITIONAL.txt +++ b/icu4c/source/data/locales/th_TH_TRADITIONAL.txt @@ -1,16 +1,13 @@ -// *************************************************************************** +// *************************************************************************** // * -// * Copyright (C) 1997-2004, International Business Machines -// * Corporation and others. All Rights Reserved. +// * Copyright (C) 2004 International Business Machines +// * Corporation and others. All Rights Reserved. +// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java +// * Source File: deprecatedList.xml // * // *************************************************************************** - -th_TH_TRADITIONAL { - Version { "1.0" } - - // International Calendars Data. - // NOTE (ICU 2.6) - the format of this data WILL CHANGE in future releases. - calendar{ - default{"buddhist" } - } +th_TH_TRADITIONAL{ + calendar{ + default{"buddhist"} + } } diff --git a/icu4c/source/data/locales/ti.txt b/icu4c/source/data/locales/ti.txt index d4d823fea77..507e1d1dbd9 100644 --- a/icu4c/source/data/locales/ti.txt +++ b/icu4c/source/data/locales/ti.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 7:10 -// * Source File: \work\locale\common\main\\ti.xml +// * Source File: ../../../locale/common/main\ti.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\ti.xml + */ ti{ Countries:alias{"am"} ExemplarCharacters{"[:Ethi:]"} @@ -16,7 +18,6 @@ ti{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "ንጉሆ ሰዓተ", diff --git a/icu4c/source/data/locales/ti_ER.txt b/icu4c/source/data/locales/ti_ER.txt index db280cd44a6..131f65f8d70 100644 --- a/icu4c/source/data/locales/ti_ER.txt +++ b/icu4c/source/data/locales/ti_ER.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:37 -// * Source File: \work\locale\common\main\\ti_ER.xml +// * Source File: ../../../locale/common/main\ti_ER.xml // * // *************************************************************************** ti_ER{ @@ -22,7 +21,6 @@ ti_ER{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a", diff --git a/icu4c/source/data/locales/ti_ET.txt b/icu4c/source/data/locales/ti_ET.txt index ca0722696ac..547be609956 100644 --- a/icu4c/source/data/locales/ti_ET.txt +++ b/icu4c/source/data/locales/ti_ET.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:37 -// * Source File: \work\locale\common\main\\ti_ET.xml +// * Source File: ../../../locale/common/main\ti_ET.xml // * // *************************************************************************** ti_ET{ @@ -22,7 +21,6 @@ ti_ET{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "h:mm:ss a", diff --git a/icu4c/source/data/locales/tr.txt b/icu4c/source/data/locales/tr.txt index 256230aa49e..df7e8be100c 100644 --- a/icu4c/source/data/locales/tr.txt +++ b/icu4c/source/data/locales/tr.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:37 -// * Source File: \work\locale\common\main\\tr.xml +// * Source File: ../../../locale/common/main\tr.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\tr.xml + */ tr{ Countries{ AD{"Andora"} @@ -250,16 +252,6 @@ tr{ ZM{"Zambiya"} ZW{"Zimbabwe"} } - Currencies{ - ITL{ - "ITL", - "ITL", - } - TRL{ - "TL", - "TRL", - } - } ExemplarCharacters{"[a-zâûöüıçşğ]"} Languages{ aa{"Afar"} @@ -420,7 +412,6 @@ tr{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/tr_TR.txt b/icu4c/source/data/locales/tr_TR.txt index c0a935efc37..b42147ea6f9 100644 --- a/icu4c/source/data/locales/tr_TR.txt +++ b/icu4c/source/data/locales/tr_TR.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:38 -// * Source File: \work\locale\common\main\\tr_TR.xml +// * Source File: ../../../locale/common/main\tr_TR.xml // * // *************************************************************************** tr_TR{ diff --git a/icu4c/source/data/locales/uk.txt b/icu4c/source/data/locales/uk.txt index 3c4ea741227..cb4977ef191 100644 --- a/icu4c/source/data/locales/uk.txt +++ b/icu4c/source/data/locales/uk.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:38 -// * Source File: \work\locale\common\main\\uk.xml +// * Source File: ../../../locale/common/main\uk.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\uk.xml + */ uk{ Countries{ AD{"Андорра"} @@ -414,7 +416,6 @@ uk{ } Version{"1.2"} calendar{ - gregorian{ DateTimeElements:intvector{ 2, diff --git a/icu4c/source/data/locales/uk_UA.txt b/icu4c/source/data/locales/uk_UA.txt index 49820d33722..2e7ef7831b7 100644 --- a/icu4c/source/data/locales/uk_UA.txt +++ b/icu4c/source/data/locales/uk_UA.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:38 -// * Source File: \work\locale\common\main\\uk_UA.xml +// * Source File: ../../../locale/common/main\uk_UA.xml // * // *************************************************************************** uk_UA{ diff --git a/icu4c/source/data/locales/vi.txt b/icu4c/source/data/locales/vi.txt index 8e36ae54cf7..4045567df0a 100644 --- a/icu4c/source/data/locales/vi.txt +++ b/icu4c/source/data/locales/vi.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:38 -// * Source File: \work\locale\common\main\\vi.xml +// * Source File: ../../../locale/common/main\vi.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\vi.xml + */ vi{ Countries{ AE{"Các Tiểu Vương quốc A-rập Thống nhất"} @@ -291,7 +293,6 @@ vi{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "SA", diff --git a/icu4c/source/data/locales/vi_VN.txt b/icu4c/source/data/locales/vi_VN.txt index c2192585da5..16e0779d8da 100644 --- a/icu4c/source/data/locales/vi_VN.txt +++ b/icu4c/source/data/locales/vi_VN.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:39 -// * Source File: \work\locale\common\main\\vi_VN.xml +// * Source File: ../../../locale/common/main\vi_VN.xml // * // *************************************************************************** vi_VN{ diff --git a/icu4c/source/data/locales/zh.txt b/icu4c/source/data/locales/zh.txt index 331402b7fbd..a88f58b7610 100644 --- a/icu4c/source/data/locales/zh.txt +++ b/icu4c/source/data/locales/zh.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:41 -// * Source File: \work\locale\common\main\\zh.xml +// * Source File: ../../../locale/common/main\zh.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\zh.xml + */ zh{ Countries{ AD{"安道尔"} @@ -2223,6 +2225,7 @@ zh{ Buhd{"布希德语"} Cans{"加拿大土著统一符号语"} Cher{"切罗基语"} + Copt{"克普特语"} Cprt{"塞浦路斯语"} Cyrl{"西里尔语"} Deva{"梵文"} @@ -2253,7 +2256,6 @@ zh{ Ogam{"欧甘语"} Orya{"奥里亚语"} Osma{"奥斯曼亚语"} - Qaac{"克普特语"} Runr{"北欧语"} Shaw{"萧伯纳式语"} Sinh{"辛哈拉语"} @@ -2292,7 +2294,6 @@ zh{ } Version{"1.2"} calendar{ - gregorian{ AmPmMarkers{ "上午", diff --git a/icu4c/source/data/locales/zh_CN.txt b/icu4c/source/data/locales/zh_CN.txt index b2c47281428..f8f3491c48d 100644 --- a/icu4c/source/data/locales/zh_CN.txt +++ b/icu4c/source/data/locales/zh_CN.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 7:40 -// * Source File: \work\locale\common\main\\zh_CN.xml +// * Source File: ../../../locale/common/main\zh_CN.xml // * // *************************************************************************** zh_CN{ diff --git a/icu4c/source/data/locales/zh_HK.txt b/icu4c/source/data/locales/zh_HK.txt index 94ddc8863dc..b2e91420d2d 100644 --- a/icu4c/source/data/locales/zh_HK.txt +++ b/icu4c/source/data/locales/zh_HK.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 7:43 -// * Source File: \work\locale\common\main\\zh_HK.xml +// * Source File: ../../../locale/common/main\zh_HK.xml // * // *************************************************************************** zh_HK{ diff --git a/icu4c/source/data/locales/zh_Hans.txt b/icu4c/source/data/locales/zh_Hans.txt index 7f648a726f0..9ea8c1da8fe 100644 --- a/icu4c/source/data/locales/zh_Hans.txt +++ b/icu4c/source/data/locales/zh_Hans.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:43 -// * Source File: \work\locale\common\main\\zh_Hans.xml +// * Source File: ../../../locale/common/main\zh_Hans.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\zh_Hans.xml + */ zh_Hans{ Version{"1.2"} } diff --git a/icu4c/source/data/locales/zh_Hans_CN.txt b/icu4c/source/data/locales/zh_Hans_CN.txt index 34fcd46e74c..d80f73f4a4d 100644 --- a/icu4c/source/data/locales/zh_Hans_CN.txt +++ b/icu4c/source/data/locales/zh_Hans_CN.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:44 -// * Source File: \work\locale\common\main\\zh_Hans_CN.xml +// * Source File: ../../../locale/common/main\zh_Hans_CN.xml // * // *************************************************************************** zh_Hans_CN{ @@ -16,7 +15,6 @@ zh_Hans_CN{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "ahh'时'mm'分'ss'秒' z", diff --git a/icu4c/source/data/locales/zh_Hans_SG.txt b/icu4c/source/data/locales/zh_Hans_SG.txt index 22a1d135736..ec1cc9e926f 100644 --- a/icu4c/source/data/locales/zh_Hans_SG.txt +++ b/icu4c/source/data/locales/zh_Hans_SG.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:44 -// * Source File: \work\locale\common\main\\zh_Hans_SG.xml +// * Source File: ../../../locale/common/main\zh_Hans_SG.xml // * // *************************************************************************** zh_Hans_SG{ @@ -30,7 +29,6 @@ zh_Hans_SG{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "a hh:mm:ss", diff --git a/icu4c/source/data/locales/zh_Hant.txt b/icu4c/source/data/locales/zh_Hant.txt index 2cddc50cbe8..d9928d828bc 100644 --- a/icu4c/source/data/locales/zh_Hant.txt +++ b/icu4c/source/data/locales/zh_Hant.txt @@ -3,10 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:48 -// * Source File: \work\locale\common\main\\zh_Hant.xml +// * Source File: ../../../locale/common/main\zh_Hant.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/main\zh_Hant.xml + */ zh_Hant{ Countries{ AD{"安道爾"} @@ -411,7 +413,7 @@ zh_Hant{ } BRC{ "BRC", - "巴西克魯賽羅", + "巴西克魯賽羅 (1986-1989)", } BRE{ "BRE", @@ -2189,12 +2191,6 @@ zh_Hant{ "Hani", "Bopo", } - NumberPatterns{ - "#,##0.###;-#,##0.###", - "¤#,##0.00;-¤#,##0.00", - "#,##0%", - "#E0", - } Scripts{ Arab{"阿拉伯文"} Armn{"亞美尼亞文"} @@ -2203,6 +2199,7 @@ zh_Hant{ Brai{"盲人用點字法"} Cans{"加拿大原住民通用字符"} Cher{"柴羅基文"} + Copt{"科普特文"} Cprt{"塞浦路斯文"} Cyrl{"斯拉夫語系"} Dsrt{"德瑟雷特文"} @@ -2230,7 +2227,6 @@ zh_Hant{ Ogam{"歐甘文"} Orya{"歐利亞文"} Osma{"歐斯曼亞文"} - Qaac{"科普特文"} Runr{"古北歐文字"} Shaw{"簫柏納字符"} Sinh{"錫蘭文"} @@ -2268,7 +2264,6 @@ zh_Hant{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "ahh'時'mm'分'ss'秒' z", diff --git a/icu4c/source/data/locales/zh_Hant_HK.txt b/icu4c/source/data/locales/zh_Hant_HK.txt index 44e3f64b0e7..2935470704b 100644 --- a/icu4c/source/data/locales/zh_Hant_HK.txt +++ b/icu4c/source/data/locales/zh_Hant_HK.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:50 -// * Source File: \work\locale\common\main\\zh_Hant_HK.xml +// * Source File: ../../../locale/common/main\zh_Hant_HK.xml // * // *************************************************************************** zh_Hant_HK{ @@ -687,7 +686,6 @@ zh_Hant_HK{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "ahh'時'mm'分'ss'秒' z", diff --git a/icu4c/source/data/locales/zh_Hant_MO.txt b/icu4c/source/data/locales/zh_Hant_MO.txt index b9d1218e62e..bee96f81186 100644 --- a/icu4c/source/data/locales/zh_Hant_MO.txt +++ b/icu4c/source/data/locales/zh_Hant_MO.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 0:53 -// * Source File: \work\locale\common\main\\zh_Hant_MO.xml +// * Source File: ../../../locale/common/main\zh_Hant_MO.xml // * // *************************************************************************** zh_Hant_MO{ @@ -687,7 +686,6 @@ zh_Hant_MO{ } Version{"1.2"} calendar{ - gregorian{ DateTimePatterns{ "ahh'時'mm'分'ss'秒' z", diff --git a/icu4c/source/data/locales/zh_Hant_TW.txt b/icu4c/source/data/locales/zh_Hant_TW.txt new file mode 100644 index 00000000000..d12b43d5b76 --- /dev/null +++ b/icu4c/source/data/locales/zh_Hant_TW.txt @@ -0,0 +1,17 @@ +// *************************************************************************** +// * +// * Copyright (C) 2004 International Business Machines +// * Corporation and others. All Rights Reserved. +// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java +// * Source File: ../../../locale/common/main\zh_Hant_TW.xml +// * +// *************************************************************************** +zh_Hant_TW{ + NumberPatterns{ + "#,##0.###;-#,##0.###", + "¤#,##0.00;-¤#,##0.00", + "#,##0%", + "#E0", + } + Version{"1.2"} +} diff --git a/icu4c/source/data/locales/zh_MO.txt b/icu4c/source/data/locales/zh_MO.txt index 1870643bfe7..b198c31f279 100644 --- a/icu4c/source/data/locales/zh_MO.txt +++ b/icu4c/source/data/locales/zh_MO.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 7:42 -// * Source File: \work\locale\common\main\\zh_MO.xml +// * Source File: ../../../locale/common/main\zh_MO.xml // * // *************************************************************************** zh_MO{ diff --git a/icu4c/source/data/locales/zh_SG.txt b/icu4c/source/data/locales/zh_SG.txt index 06efb9caaee..0393a7f8c2f 100644 --- a/icu4c/source/data/locales/zh_SG.txt +++ b/icu4c/source/data/locales/zh_SG.txt @@ -3,8 +3,7 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 7:44 -// * Source File: \work\locale\common\main\\zh_SG.xml +// * Source File: ../../../locale/common/main\zh_SG.xml // * // *************************************************************************** zh_SG{ diff --git a/icu4c/source/data/locales/zh_TW.txt b/icu4c/source/data/locales/zh_TW.txt index 8f86ac6189c..f3197debe83 100644 --- a/icu4c/source/data/locales/zh_TW.txt +++ b/icu4c/source/data/locales/zh_TW.txt @@ -3,10 +3,9 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/20 7:41 -// * Source File: \work\locale\common\main\\zh_TW.xml +// * Source File: ../../../locale/common/main\zh_TW.xml // * // *************************************************************************** zh_TW{ - "%%ALIAS"{"zh_Hant"} + "%%ALIAS"{"zh_Hant_TW"} } diff --git a/icu4c/source/test/cintltst/cldrtest.c b/icu4c/source/test/cintltst/cldrtest.c index a0fb23aa917..d82f27a6bbc 100644 --- a/icu4c/source/test/cintltst/cldrtest.c +++ b/icu4c/source/test/cintltst/cldrtest.c @@ -524,7 +524,7 @@ compareArrays(const char *keyName, static void compareConsistentCountryInfo(const char *fromLocale, const char *toLocale) { UErrorCode errorCode = U_ZERO_ERROR; - UResourceBundle *fromDateTimeElements, *toDateTimeElements, *fromWeekendData, *toWeekendData; + UResourceBundle *fromDateTimeElements, *toDateTimeElements, *fromWeekendData = NULL, *toWeekendData = NULL; UResourceBundle *fromArray, *toArray; UResourceBundle *fromLocaleBund = ures_open(NULL, fromLocale, &errorCode); UResourceBundle *toLocaleBund = ures_open(NULL, toLocale, &errorCode); @@ -548,9 +548,13 @@ compareConsistentCountryInfo(const char *fromLocale, const char *toLocale) { } fromWeekendData = ures_getByKeyWithFallback(fromGregorian, "weekend", NULL, &errorCode); + if(U_FAILURE(errorCode)){ + log_err("Did not get weekend data from the bundle %s to compare against %s\n", fromLocale, toLocale); + goto cleanup; + } toWeekendData = ures_getByKeyWithFallback(toGregorian, "weekend", NULL, &errorCode); if(U_FAILURE(errorCode)){ - log_err("Did not get weekend data from the bundle %s or %s\n", fromLocale, toLocale); + log_err("Did not get weekend data from the bundle %s to compare against %s\n", toLocale, fromLocale); goto cleanup; } diff --git a/icu4c/source/test/cintltst/cloctst.c b/icu4c/source/test/cintltst/cloctst.c index cc8d0a41100..be7e01b2397 100644 --- a/icu4c/source/test/cintltst/cloctst.c +++ b/icu4c/source/test/cintltst/cloctst.c @@ -100,7 +100,7 @@ static const char* rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = { /* display name (Catalan) */ { "angl\\u00E8s (Estats Units)", "franc\\u00E8s (Fran\\u00E7a)", "catal\\u00E0 (Espanya)", "grec (Gr\\u00E8cia)", "noruec (Noruega, NY)", "xin\\u00E9s (Hans, Xina)", - "alemany (Alemanya, COLLATION=PHONEBOOK)", "espanyol (COLLATION=TRADITIONAL)", "japon\\u00E8s (Jap\\u00F3, CALENDAR=JAPANESE)" }, + "alemany (Alemanya, collation=phonebook)", "espanyol (collation=traditional)", "japon\\u00E8s (Jap\\u00F3, calendar=japanese)" }, /* display language (Greek) */ { @@ -138,9 +138,9 @@ static const char* rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = { "\\u0395\\u03bb\\u03bb\\u03b7\\u03bd\\u03b9\\u03ba\\u03ac (\\u0395\\u03bb\\u03bb\\u03ac\\u03b4\\u03b1)", "\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03b9\\u03ba\\u03ac (\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03af\\u03b1, NY)", "\\u039A\\u03B9\\u03BD\\u03B5\\u03B6\\u03B9\\u03BA\\u03AC (Hans, \\u039A\\u03AF\\u03BD\\u03B1)", - "\\u0393\\u03B5\\u03C1\\u03BC\\u03B1\\u03BD\\u03B9\\u03BA\\u03AC (\\u0393\\u03B5\\u03C1\\u03BC\\u03B1\\u03BD\\u03AF\\u03B1, COLLATION=PHONEBOOK)", - "\\u0399\\u03C3\\u03C0\\u03B1\\u03BD\\u03B9\\u03BA\\u03AC (COLLATION=TRADITIONAL)", - "\\u0399\\u03B1\\u03C0\\u03C9\\u03BD\\u03B9\\u03BA\\u03AC (\\u0399\\u03B1\\u03C0\\u03C9\\u03BD\\u03AF\\u03B1, CALENDAR=JAPANESE)" + "\\u0393\\u03B5\\u03C1\\u03BC\\u03B1\\u03BD\\u03B9\\u03BA\\u03AC (\\u0393\\u03B5\\u03C1\\u03BC\\u03B1\\u03BD\\u03AF\\u03B1, collation=phonebook)", + "\\u0399\\u03C3\\u03C0\\u03B1\\u03BD\\u03B9\\u03BA\\u03AC (collation=traditional)", + "\\u0399\\u03B1\\u03C0\\u03C9\\u03BD\\u03B9\\u03BA\\u03AC (\\u0399\\u03B1\\u03C0\\u03C9\\u03BD\\u03AF\\u03B1, calendar=japanese)" } }; @@ -573,8 +573,8 @@ static void TestDisplayNames() "el_GR" }; const char *expect[] = { "Spanish (Calendar=Japanese Calendar, Collation=Traditional)", /* note sorted order of keywords */ "espagnol (Calendrier=Calendrier japonais, Ordonnancement=Ordre traditionnel)", - "espanyol (CALENDAR=JAPANESE, COLLATION=TRADITIONAL)", - "\\u0399\\u03C3\\u03C0\\u03B1\\u03BD\\u03B9\\u03BA\\u03AC (CALENDAR=JAPANESE, COLLATION=TRADITIONAL)" }; + "espanyol (calendar=japanese, collation=traditional)", + "\\u0399\\u03C3\\u03C0\\u03B1\\u03BD\\u03B9\\u03BA\\u03AC (calendar=japanese, collation=traditional)" }; UChar *expectBuffer; for(i=0;i