[sword-cvs] icu-sword/source/data/locales fa_AF.txt,NONE,1.1 kk.txt,NONE,1.1 kk_KZ.txt,NONE,1.1 ms.txt,NONE,1.1 ms_BN.txt,NONE,1.1 ms_MY.txt,NONE,1.1 pa.txt,NONE,1.1 pa_IN.txt,NONE,1.1 ps.txt,NONE,1.1 ps_AF.txt,NONE,1.1 af.txt,1.1,1.2 af_ZA.txt,1.1,1.2 am.txt,1.1,1.2 ar.txt,1.1,1.2 ar_AE.txt,1.1,1.2 ar_BH.txt,1.1,1.2 ar_DZ.txt,1.1,1.2 ar_EG.txt,1.1,1.2 ar_IQ.txt,1.1,1.2 ar_JO.txt,1.1,1.2 ar_KW.txt,1.1,1.2 ar_LB.txt,1.1,1.2 ar_LY.txt,1.1,1.2 ar_MA.txt,1.1,1.2 ar_OM.txt,1.1,1.2 ar_QA.txt,1.1,1.2 ar_SA.txt,1.1,1.2 ar_SY.txt,1.1,1.2 ar_TN.txt,1.1,1.2 ar_YE.txt,1.1,1.2 be.txt,1.1,1.2 be_BY.txt,1.1,1.2 bg.txt,1.1,1.2 bg_BG.txt,1.1,1.2 bn.txt,1.1,1.2 bn_IN.txt,1.1,1.2 ca.txt,1.1,1.2 ca_ES.txt,1.1,1.2 cs.txt,1.1,1.2 cs_CZ.txt,1.1,1.2 da.txt,1.1,1.2 da_DK.txt,1.1,1.2 de.txt,1.1,1.2 de_AT.txt,1.1,1.2 de_BE.txt,1.1,1.2 de_CH.txt,1.1,1.2 de_DE.txt,1.1,1.2 de_LU.txt,1.1,1.2 de__PHONEBOOK.txt,1.1,1.2 el.txt,1.1,1.2 el_GR.txt,1.1,1.2 en.txt,1.1,1.2 en_AU.txt,1.1,1.2 en_BE.txt,1.1,1.2 en_CA.txt,1.1,1.2 en_GB.txt,1.1,1.2 en_GB_EURO.txt,1.1,1.2 en_HK.txt,1.1,1.2 en_IE.txt,1.1,1.2 en_MT.txt,1.1,1.2 en_NZ.txt,1.1,1.2 en_PH.txt,1.1,1.2 en_SG.txt,1.1,1.2 en_US.txt,1.1,1.2 en_US_POSIX.txt,1.1,1.2 en_VI.txt,1.1,1.2 en_ZA.txt,1.1,1.2 en_ZW.txt,1.1,1.2 eo.txt,1.1,1.2 es.txt,1.1,1.2 es_AR.txt,1.1,1.2 es_BO.txt,1.1,1.2 es_CL.txt,1.1,1.2 es_CO.txt,1.1,1.2 es_CR.txt,1.1,1.2 es_DO.txt,1.1,1.2 es_EC.txt,1.1,1.2 es_ES.txt,1.1,1.2 es_GT.txt,1.1,1.2 es_HN.txt,1.1,1.2 es_MX.txt,1.1,1.2 es_NI.txt,1.1,1.2 es_PA.txt,1.1,1.2 es_PE.txt,1.1,1.2 es_PR.txt,1.1,1.2 es_PY.txt,1.1,1.2 es_SV.txt,1.1,1.2 es_US.txt,1.1,1.2 es_UY.txt,1.1,1.2 es_VE.txt,1.1,1.2 es__TRADITIONAL.txt,1.1,1.2 et.txt,1.1,1.2 et_EE.txt,1.1,1.2 eu.txt,1.1,1.2 eu_ES.txt,1.1,1.2 fa.txt,1.1,1.2 fa_IR.txt,1.1,1.2 fi.txt,1.1,1.2 fi_FI.txt,1.1,1.2 fo.txt,1.1,1.2 fo_FO.txt,1.1,1.2 fr.txt,1.1,1.2 fr_BE.txt,1.1,1.2 fr_CA.txt,1.1,1.2 fr_CH.txt,1.1,1.2 fr_FR.txt,1.1,1.2 fr_LU.txt,1.1,1.2 ga.txt,1.1,1.2 ga_IE.txt,1.1,1.2 gl.txt,1.1,1.2 gl_ES.txt,1.1,1.2 gu.txt,1.1,1.2 gu_IN.txt,1.1,1.2 gv.txt,1.1,1.2 h

[sword@www.crosswire.org]

Update of /cvs/core/icu-sword/source/data/locales
In directory www:/tmp/cvs-serv8911/source/data/locales

Modified Files:
	af.txt af_ZA.txt am.txt ar.txt ar_AE.txt ar_BH.txt ar_DZ.txt 
	ar_EG.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_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 
	de__PHONEBOOK.txt el.txt el_GR.txt en.txt en_AU.txt en_BE.txt 
	en_CA.txt en_GB.txt en_GB_EURO.txt en_HK.txt en_IE.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 es__TRADITIONAL.txt et.txt et_EE.txt 
	eu.txt eu_ES.txt fa.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 he.txt he_IL.txt hi.txt hi_IN.txt hi__DIRECT.txt hr.txt 
	hr_HR.txt hu.txt hu_HU.txt hy.txt hy_AM.txt id.txt id_ID.txt 
	is.txt is_IS.txt it.txt it_CH.txt it_IT.txt ja.txt ja_JP.txt 
	kl.txt kn.txt kn_IN.txt ko.txt ko_KR.txt kok.txt kok_IN.txt 
	kw.txt lt.txt lt_LT.txt lv.txt lv_LV.txt mk.txt mk_MK.txt 
	mr.txt mr_IN.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 pl.txt pl_PL.txt 
	pt.txt pt_BR.txt pt_PT.txt pt_PT_PREEURO.txt resfiles.mk 
	ro.txt ro_RO.txt root.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 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 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 zh_TW_STROKE.txt zh__PINYIN.txt 
Added Files:
	fa_AF.txt kk.txt kk_KZ.txt ms.txt ms_BN.txt ms_MY.txt pa.txt 
	pa_IN.txt ps.txt ps_AF.txt 
Removed Files:
	fa_IN.txt 
Log Message:
ICU 2.8 sync

--- NEW FILE: fa_AF.txt ---
// ***************************************************************************
// *
// *   Copyright (C) 1997-2003, International Business Machines
// *   Corporation and others.  All Rights Reserved.
// *
// ***************************************************************************

// Created by Roozbeh Pournader <roozbeh@sharif.edu> and Michael Everson <everson@evertype.com>

fa_AF {
    Version { "1.0" }
    // Use the fa rules instead
//    AmPmMarkers {
//        "\u0642.\u0638.",
//        "\u0628.\u0638.",
//    }
    // This is a unified sort with uz_AF, fa_AF and ps.
    collations:alias { "ps" }
//    collations {
//      standard { 
//        Version { "1.0" }
//        Sequence { "[normalization on]"
//           "&\u064e<<\u0650<<\u064f<<\u064b<<\u064d<<\u064c"
//           "&\u0622<\u0627<<\u0623<<\u0672<<\u0671<<\u0625<<\u0673<\u0621"
//           "&\u062a<\u067c<<\u0679"
//           "&\u062c<\u0681<<\u062d\u0654"
//           "&\u0686<\u0685"
//           "&\u062f<\u0689<<\u0688"
//           "&\u0631<\u0693<<\u0691"
//           "&\u0698<\u0696"
//           "&\u06a9<<\u06aa<<\u0643"
//           "&\u06ab<<\u06af"
//           "&\u06bc<<\u06bb"
//           "&\u0648<<\u0624<<\u06c7<<\u06c9"
//           "&\u0647<<<\u06c0<<<\u0647\u0654<<\u06d5<<\u06c1<<\u06be<<\u0629<<\u06c3"
//           "&\u06cc<<\u0649<<\u06d2<<\u064a<<\u06d0<<\u06cd<<\u06cc\u0654<<<\u0649\u0654<<<\u0626"
//           "&'\u00a0'<<'\u200c'<<'\u200d'"  // This is NBSP << ZWNJ << ZWJ
//         }
//      }
//    }
    Countries {
        AD { "\u0627\u0646\u062f\u0648\u0631\u0627" }
        AE { "\u0627\u0645\u0627\u0631\u0627\u062a \u0645\u062a\u062d\u062f\u0647\u0654 \u0639\u0631\u0628\u06cc" }
        AG { "\u0627\u0646\u062a\u06cc\u06af\u0648\u0627 \u0648 \u0628\u0627\u0631\u0628\u0648\u062f\u0627" }
        AL { "\u0627\u0644\u0628\u0627\u0646\u06cc\u0627" }
        AO { "\u0627\u0646\u06af\u0648\u0644\u0627" }
        AR { "\u0627\u0631\u062c\u0646\u062a\u0627\u06cc\u0646" }
        AU { "\u0622\u0633\u062a\u0631\u0627\u0644\u06cc\u0627" }

        BA { "\u0628\u0648\u0633\u0646\u06cc\u0627 \u0648 \u0647\u0631\u0632\u0647\u200c\u06af\u0648\u06cc\u0646\u0627" }
        BD { "\u0628\u0646\u06af\u0644\u0647\u200c\u062f\u06cc\u0634" }
        BE { "\u0628\u0644\u062c\u06cc\u0645" }
        BG { "\u0628\u0644\u063a\u0627\u0631\u06cc\u0627" }
        BN { "\u0628\u0631\u0648\u0646\u06cc" }
        BO { "\u0628\u0648\u0644\u06cc\u0648\u06cc\u0627" }
        BR { "\u0628\u0631\u0627\u0632\u06cc\u0644" }
        BS { "\u0628\u0647\u0627\u0645\u0627\u0633" }
        BY { "\u0631\u0648\u0633\u06cc\u0647\u0654 \u0633\u0641\u06cc\u062f" }

        CD { "\u062c\u0645\u0647\u0648\u0631\u06cc \u062f\u0645\u0648\u06a9\u0631\u0627\u062a\u06cc\u06a9 \u06a9\u0627\u0646\u06af\u0648" }
        CF { "\u0627\u0641\u0631\u06cc\u0642\u0627\u06cc \u0645\u0631\u06a9\u0632\u06cc" }
        CG { "\u06a9\u0627\u0646\u06af\u0648" }
        CH { "\u0633\u0648\u06cc\u0633" }
        CL { "\u0686\u0644\u06cc" }
        CO { "\u06a9\u0648\u0644\u0645\u0628\u06cc\u0627" }
        CR { "\u06a9\u0627\u0633\u062a\u0631\u06cc\u06a9\u0627" }
        CU { "\u06a9\u06cc\u0648\u0628\u0627" }

        DK { "\u062f\u0646\u0645\u0627\u0631\u06a9" }

        EC { "\u0627\u06a9\u0648\u0627\u062f\u0648\u0631" }
        EE { "\u0627\u0633\u062a\u0648\u0646\u06cc\u0627" }
        ER { "\u0627\u0631\u06cc\u062a\u0631\u06cc\u0627" }
        ES { "\u0647\u0633\u067e\u0627\u0646\u06cc\u0647" }
        ET { "\u0627\u06cc\u062a\u0648\u067e\u06cc\u0627" }

        FI { "\u0641\u0646\u0644\u0646\u062f" }
        FM { "\u0645\u06cc\u06a9\u0631\u0648\u0646\u0632\u06cc\u0627" }

        GD { "\u06af\u0631\u06cc\u0646\u0627\u062f\u0627" }
        GN { "\u06af\u06cc\u0646\u06cc\u0627" }
        GQ { "\u06af\u06cc\u0646\u06cc\u0627 \u0627\u0633\u062a\u0648\u0627\u06cc\u06cc" }
        GT { "\u06af\u0648\u0627\u062a\u06cc\u0645\u0627\u0644\u0627" }
        GW { "\u06af\u06cc\u0646\u06cc\u0627 \u0628\u06cc\u0633\u0627\u0626\u0648" }
        GY { "\u06af\u06cc\u0627\u0646\u0627" }

        HN { "\u0647\u0627\u0646\u062f\u0648\u0631\u0627\u0633" }
        HR { "\u06a9\u0631\u0648\u0634\u06cc\u0627" }
        HT { "\u0647\u0627\u06cc\u062a\u06cc" }

        ID { "\u0627\u0646\u062f\u0648\u0646\u06cc\u0632\u06cc\u0627" }
        IE { "\u0622\u06cc\u0631\u0644\u0646\u062f" }
        IS { "\u0622\u06cc\u0633\u0644\u0646\u062f" }

        JP { "\u062c\u0627\u067e\u0627\u0646" }

        KE { "\u06a9\u06cc\u0646\u06cc\u0627" }
        KG { "\u0642\u0631\u063a\u0632\u0633\u062a\u0627\u0646" }
        KH { "\u06a9\u0645\u067e\u0648\u0686\u06cc\u0627" }
        KM { "\u06a9\u0648\u0645\u0648\u0631" }
        KN { "\u0633\u0646\u062a \u06a9\u06cc\u062a\u0633 \u0648 \u0646\u06cc\u0648\u06cc\u0633" }
        KP { "\u06a9\u0648\u0631\u06cc\u0627\u06cc \u0634\u0645\u0627\u0644\u06cc" }
        KR { "\u06a9\u0648\u0631\u06cc\u0627\u06cc \u062c\u0646\u0648\u0628\u06cc" }

        LK { "\u0633\u0631\u06cc\u0644\u0627\u0646\u06a9\u0627" }
        LS { "\u0644\u06cc\u0633\u0648\u062a\u0648" }
        LT { "\u0644\u062a\u0648\u0627\u0646\u06cc\u0627" }
        LV { "\u0644\u0627\u062a\u0648\u06cc\u0627" }
        LY { "\u0644\u06cc\u0628\u06cc\u0627" }

        MG { "\u0645\u0627\u062f\u063a\u0627\u0633\u06a9\u0631" }
        MN { "\u0645\u0646\u06af\u0648\u0644\u06cc\u0627" }
        MR { "\u0645\u0648\u0631\u06cc\u062a\u0627\u0646\u06cc\u0627" }
        MT { "\u0645\u0627\u0644\u062a\u0627" }
        MX { "\u0645\u06a9\u0633\u06cc\u06a9\u0648" }
        MY { "\u0645\u0627\u0644\u06cc\u0632\u06cc\u0627" }
        MZ { "\u0645\u0648\u0632\u0645\u0628\u06cc\u0642" }

        NG { "\u0646\u06cc\u062c\u0631\u06cc\u0627" }
        NI { "\u0646\u06cc\u06a9\u0627\u0631\u0627\u06af\u0648\u0627" }
        NL { "\u0647\u0627\u0644\u0646\u062f" }
        NO { "\u0646\u0627\u0631\u0648\u06cc" }
        NP { "\u0646\u06cc\u067e\u0627\u0644" }
        NZ { "\u0632\u06cc\u0644\u0627\u0646\u062f \u062c\u062f\u06cc\u062f" }

        PA { "\u067e\u0627\u0646\u0627\u0645\u0647" }
        PE { "\u067e\u06cc\u0631\u0648" }
        PG { "\u067e\u0627\u067e\u0648\u0627 \u0646\u06cc\u0648 \u06af\u06cc\u0646\u06cc\u0627" }
        PL { "\u067e\u0648\u0644\u0646\u062f" }
        PT { "\u067e\u0631\u062a\u06af\u0627\u0644" }
        PY { "\u067e\u0627\u0631\u0627\u06af\u0648\u0627\u06cc" }

        RO { "\u0631\u0648\u0645\u0627\u0646\u06cc\u0627" }
        RW { "\u0631\u0648\u0622\u0646\u062f\u0627" }

        SB { "\u062c\u0632\u0627\u06cc\u0631 \u0633\u0644\u0648\u0645\u0648\u0646" }
        SE { "\u0633\u0648\u06cc\u062f\u0646" }
        SG { "\u0633\u06cc\u0646\u06af\u0627\u067e\u0648\u0631" }
        SI { "\u0633\u0644\u0648\u0646\u06cc\u0627" }
        SK { "\u0633\u0644\u0648\u0627\u06a9\u06cc\u0627" }
        SL { "\u0633\u06cc\u0631\u0627\u0644\u06cc\u0648\u0646" }
        SN { "\u0633\u06cc\u0646\u06cc\u06af\u0627\u0644" }
        SO { "\u0633\u0648\u0645\u0627\u0644\u06cc\u0647" }
        ST { "\u0633\u0627\u0626\u0648 \u062a\u0648\u0645\u0647 \u0648 \u067e\u0631\u06cc\u0646\u0633\u06cc\u067e" }
        SV { "\u0627\u0644\u0633\u0644\u0648\u0627\u062f\u0648\u0631" }

        TJ { "\u062a\u0627\u062c\u06a9\u0633\u062a\u0627\u0646" }

        UA { "\u0627\u06a9\u0631\u0627\u06cc\u0646" }
        US { "\u0627\u06cc\u0627\u0644\u0627\u062a \u0645\u062a\u062d\u062f\u0647\u0654 \u0627\u0645\u0631\u06cc\u06a9\u0627" }
        UY { "\u06cc\u0648\u0631\u0648\u06af\u0648\u0627\u06cc" }

        VC { "\u0633\u0646\u062a \u0648\u06cc\u0646\u0633\u0646\u062a \u0648 \u06af\u0631\u06cc\u0646\u0627\u062f\u06cc\u0646" }
        VE { "\u0648\u0646\u0632\u0648\u06cc\u0644\u0627" }

        WS { "\u0633\u0627\u0645\u0648\u0622\u06cc \u063a\u0631\u0628\u06cc" }

        YU { "\u06cc\u0648\u06af\u0648\u0633\u0644\u0627\u0648\u06cc\u0627" }

        ZA { "\u0627\u0641\u0631\u06cc\u0642\u0627\u06cc \u062c\u0646\u0648\u0628\u06cc" }
        ZW { "\u0632\u06cc\u0645\u0628\u0627\u0628\u0648\u06cc" }
    }
    // Use the fa rules instead
//    DateTimePatterns { 
//        "H:mm:ss (z)",
//        "H:mm:ss (z)",
//        "H:mm:ss ",
//        "H:mm",
//        "EEEE\u060c d MMMM yyyy",
//        "d MMMM yyyy",
//        "yyyy/M/d",
//        "yyyy/M/d",
//        "{1} {0}",
//    }
    DateTimeElements:intvector {
        7,      // Saturday
        1,
    }
//    ExemplarCharacters {"[\u0621-\u0624\u0626-\u063a\u0641\u0642\u0644-\u0648\u064a-\u0652\u0654\u0670\u067c\u067e\u0681\u0685-\u0686\u0689\u0693\u0696\u0698\u069a\u06a9\u06ab\u06af\u06bc\u06cc-\u06cd\u06d0 \u200c\u200d\u200f\u200e]"}
    Languages {
        es  { "\u0647\u0633\u067e\u0627\u0646\u0648\u06cc" }
        fa  { "\u062f\u0631\u06cc" }
        fi  { "\u0641\u0646\u0644\u0646\u062f\u06cc" }
        ga  { "\u0622\u06cc\u0631\u0644\u0646\u062f\u06cc" }
        hr  { "\u06a9\u0631\u0648\u0634\u06cc\u0627\u06cc\u06cc" }
        id  { "\u0627\u0646\u062f\u0648\u0646\u06cc\u0632\u06cc\u0627\u06cc\u06cc" }
        is  { "\u0622\u06cc\u0633\u0644\u0646\u062f\u06cc" }
        it  { "\u0627\u06cc\u062a\u0627\u0644\u0648\u06cc" }
        ja  { "\u062c\u0627\u067e\u0627\u0646\u06cc" }
        ko  { "\u06a9\u0648\u0631\u06cc\u0627\u06cc\u06cc" }
        ky  { "\u0642\u0631\u063a\u0632\u06cc" }
        mn  { "\u0645\u063a\u0644\u06cc" }
        ne  { "\u0646\u06cc\u067e\u0627\u0644\u06cc" }
        nl  { "\u0647\u0627\u0644\u0646\u062f\u06cc" }
        no  { "\u0646\u0627\u0631\u0648\u06cc\u0698\u06cc" }
        pl  { "\u067e\u0648\u0644\u0646\u062f\u06cc" }
        pt  { "\u067e\u0631\u062a\u06af\u0627\u0644\u06cc" }
        sv  { "\u0633\u0648\u06cc\u062f\u0646\u06cc" }
        tg  { "\u062a\u0627\u062c\u06a9\u06cc" }
    }
    MonthAbbreviations { 
        "\u062c\u0646\u0648",
        "\u0641\u0628\u0631",
        "\u0645\u0627\u0631",
        "\u0627\u067e\u0631",
        "\u0645\u0640\u06cc",
        "\u062c\u0648\u0646",
        "\u062c\u0648\u0644",
        "\u0627\u06af\u0633",
        "\u0633\u067e\u062a",
        "\u0627\u06a9\u062a",
        "\u0646\u0648\u0645",
        "\u062f\u0633\u0645",
    }
    MonthNames { 
        "\u062c\u0646\u0648\u0631\u06cc",
        "\u0641\u0628\u0631\u0648\u0631\u06cc", // DoL says "\u0641\u0631\u0648\u0631\u06cc"
        "\u0645\u0627\u0631\u0686",
        "\u0627\u067e\u0631\u06cc\u0644",
        "\u0645\u06cc",
        "\u062c\u0648\u0646",
        "\u062c\u0648\u0644\u0627\u06cc",
        "\u0627\u06af\u0633\u062a",
        "\u0633\u067e\u062a\u0645\u0628\u0631", // MoIC says "\u0633\u067e\u062a\u0627\u0645\u0628\u0631"
        "\u0627\u06a9\u062a\u0648\u0628\u0631",
        "\u0646\u0648\u0645\u0628\u0631", // MoIC says "\u0646\u0648\u0627\u0645\u0628\u0631"
        "\u062f\u0633\u0645\u0628\u0631", // MoIC says "\u062f\u0633\u0627\u0645\u0628\u0631"
    }
    NumberPatterns { 
        "#,##0.###;-#,##0.###",
        "#,##0 \u00a4;-#,##0 \u00a4",
        "#,##0%", // The percent sign should appear on the right side. Academy says it should appear on the left (like fa_IR).
        "#E0",
    }
    NumberElements { 
        "\u066b",
        "\u066c",
        ";",
        "\u066a",
        "\u06f0",
        "#",
        "\u2212",
        "\u00d7\u06f1\u06f0^",
        "\u2030",
        "\u221e",
        "\ufffd",
        "\u066b",
        "+",
    }
    SpelloutRules {
        "%main:\n"
            "-x: \u0645\u0646\u0641\u06cc >>;\n"
            "x.x: << \u0639\u0634\u0627\u0631\u06cc\u0647 >>;\n"
            "\u0635\u0641\u0631; \u06cc\u06a9; \u062f\u0648; \u0633\u0647; \u0686\u0647\u0627\u0631; \u067e\u0646\u062c; \u0634\u0634; \u0647\u0641\u062a; \u0647\u0634\u062a; \u0646\u0647;\n"
            "\u062f\u0647; \u06cc\u0627\u0632\u062f\u0647; \u062f\u0648\u0627\u0632\u062f\u0647; \u0633\u06cc\u0632\u062f\u0647; \u0686\u0647\u0627\u0631\u062f\u0647; \u067e\u0627\u0646\u0632\u062f\u0647; \u0634\u0627\u0646\u0632\u062f\u0647;\n"
            "    \u0647\u0641\u062f\u0647; \u0647\u062c\u062f\u0647; \u0646\u0632\u062f\u0647;\n"
            "20: \u0628\u06cc\u0633\u062a[ \u0648 >>];\n"
            "30: \u0633\u06cc[ \u0648 >>];\n"
            "40: \u0686\u0647\u0644[ \u0648 >>];\n"
            "50: \u067e\u0646\u062c\u0627\u0647[ \u0648 >>];\n"
            "60: \u0634\u0635\u062a[ \u0648 >>];\n"
            "70: \u0647\u0641\u062a\u0627\u062f[ \u0648 >>];\n"
            "80: \u0647\u0634\u062a\u0627\u062f[ \u0648 >>];\n"
            "90: \u0646\u0648\u062f[ \u0648 >>];\n"
            "100: \u0635\u062f[ \u0648 >>];\n"
            "200: \u062f\u0648\u0635\u062f[ \u0648 >>];\n"
            "300: \u0633\u0647\u200c\u0635\u062f[ \u0648 >>];\n"
            "400: \u0686\u0647\u0627\u0631\u0635\u062f[ \u0648 >>];\n"
            "500: \u067e\u0646\u062c\u0635\u062f[ \u0648 >>];\n"
            "600: \u0634\u0634\u0635\u062f[ \u0648 >>];\n"
            "700: \u0647\u0641\u062a\u0635\u062f[ \u0648 >>];\n"
            "800: \u0647\u0634\u062a\u0635\u062f[ \u0648 >>];\n"
            "900: \u0646\u0647\u0635\u062f[ \u0648 >>];\n"
            "1000: << \u0647\u0632\u0627\u0631[ \u0648 >>];\n"
            "1,000,000: << \u0645\u06cc\u0644\u06cc\u0648\u0646[ \u0648 >>];\n"
            "1,000,000,000: << \u0645\u06cc\u0644\u06cc\u0627\u0631\u062f[ \u0648 >>];\n"
            "1,000,000,000,000: =#,##0=;\n"
    }
    zoneStrings {
        {
            "Asia/Kabul",
            "\u0648\u0642\u062a \u0627\u0641\u063a\u0627\u0646\u0633\u062a\u0627\u0646",
            "AFT",
            "\u0648\u0642\u062a \u0627\u0641\u063a\u0627\u0646\u0633\u062a\u0627\u0646",
            "AFT",
            "\u06a9\u0627\u0628\u0644",
        }
    }
}
--- NEW FILE: kk.txt ---
// ***************************************************************************
// *
// *   Copyright (C) 2001-2003, International Business Machines
// *   Corporation and others.  All Rights Reserved.
// *
// ***************************************************************************

kk {
    Version{ "1.0" }
    collations {
        standard {
            Version { "1.0" }
            Sequence { 
                "[normalization on]"
            }
        }
    }
    Countries {
        KZ { "\u049A\u0430\u0437\u0430\u049B\u0441\u0442\u0430\u043D" }
    }
    Currencies {
        KZT { "\u0442\u04A3\u0433.", "KZT" }
    }
    DateTimePatterns { 
        "HH:mm:ss z",
        "HH:mm:ss z",
        "HH:mm:ss",
        "HH:mm",
        "EEEE, d MMMM yyyy '\u0436.'",
        "d MMMM yyyy '\u0436.'",
        "dd.MM.yyyy",
        "dd.MM.yy",
        "{1} {0}",
    }
    DayAbbreviations { 
        "\u0436\u0441.",
        "\u0434\u0441.",
        "\u0441\u0441.",
        "\u0441\u0440.",
        "\u0431\u0441.",
        "\u0436\u043C.",
        "\u0441\u04BB.",
    }
    DayNames { 
        "\u0436\u0435\u043A\u0441\u0435\u043D\u0456",
        "\u0434\u0443\u0439\u0441\u0435\u043D\u0431\u0456",
        "\u0441\u0435\u0439\u0441\u0435\u043D\u0431\u0456",
        "\u0441\u04D9\u0440\u0435\u043D\u0431\u0456",
        "\u0431\u0435\u0439\u0441\u0435\u043D\u0431\u0456",
        "\u0436\u04B1\u043C\u0430",
        "\u0441\u0435\u043D\u0431\u0456",
    }
    Languages {
        kk { "\u049A\u0430\u0437\u0430\u049B" }
    }
    // \u049B should be removed if it's not in the native language and country names.
    ExemplarCharacters { "[\u0430-\u044f\u044b\u044d\u0451\u0456\u049B\u04A3\u04AF\u04B1\u04D9]" }
    LocaleScript:array { "Cyrl" }
    MonthAbbreviations { 
        "\u049B\u0430\u04A3.",
        "\u0430\u049B\u043F.",
        "\u043D\u0430\u0443.",
        "\u0441\u04D9\u0443.",
        "\u043C\u0430\u043C.",
        "\u043C\u0430\u0443.",
        "\u0448\u0456\u043B.",
        "\u0442\u0430\u043C.",
        "\u049B\u044B\u0440.",
        "\u049B\u0430\u0437.",
        "\u049B\u0430\u0440.",
        "\u0436\u0435\u043B\u0442.",
    }
    MonthNames { 
        "\u049B\u0430\u04A3\u0442\u0430\u0440",
        "\u0430\u049B\u043F\u0430\u043D",
        "\u043D\u0430\u0443\u0440\u044B\u0437",
        "\u0441\u04D9\u0443\u0456\u0440",
        "\u043C\u0430\u043C\u044B\u0440",
        "\u043C\u0430\u0443\u0441\u044B\u043C",
        "\u0448\u0456\u043B\u0434\u0435",
        "\u0442\u0430\u043C\u044B\u0437",
        "\u049B\u044B\u0440\u043A\u04AF\u0439\u0435\u043A",
        "\u049B\u0430\u0437\u0430\u043D",
        "\u049B\u0430\u0440\u0430\u0448\u0430",
        "\u0436\u0435\u043B\u0442\u043E\u049B\u0441\u0430\u043D",
    }
    NumberElements { 
        ",",
        "\u00A0",
        ";",
        "%",
        "0",
        "#",
        "-",
        "E",
        "\u2030",
        "\u221E",
        "\uFFFD",
        ",",
        "+",
    }
    DateTimeElements:intvector {
        2, // monday is the first day of the week
        1,
    }
}
--- NEW FILE: kk_KZ.txt ---
// ***************************************************************************
// *
// *   Copyright (C) 2001-2003, International Business Machines
// *   Corporation and others.  All Rights Reserved.
// *
// ***************************************************************************

kk_KZ {
    Version{ "1.0" }
    NumberPatterns { 
        "#,##0.###;-#,##0.###",
        "#,##0.00 \u00A4;-\u00A4 #,##0.00",
        "#,##0%",
        "#E0",
    }
//    DateTimeElements:intvector{
//        1,
//        2 // Probably 1
//    }

}

--- NEW FILE: ms.txt ---
// ***************************************************************************
// *
// *   Copyright (C) 2001-2003, International Business Machines
// *   Corporation and others.  All Rights Reserved.
// *   Generated from Universal Locales for Linux Project
// ***************************************************************************

ms{
    Version{ "1.0" }
    Countries {
        Fallback{ "en" }
    }
    Currencies {
        MYR { "R", "MYR" }
    }
    DayAbbreviations { 
        "Aha",
        "Isn",
        "Sel",
        "Rab",
        "Kha",
        "Jum",
        "Sab",
    }
    DayNames { 
        "Ahad",
        "Isnin",
        "Selasa",
        "Rabu",
        "Khamis",
        "Jumaat",
        "Sabtu",
    }
    ExemplarCharacters{ "[a-z]" }
    LocaleScript{ 
        "Latn",  // ISO 15924 Name 
    }
    Languages {
        ms { "bahasa Melayu" }
    }
    MonthAbbreviations { 
        "Jan",
        "Feb",
        "Mac",
        "Apr",
        "Mei",
        "Jun",
        "Jul",
        "Ogos",
        "Sept",
        "Okt",
        "Nov",
        "Dis",
    }
    MonthNames { 
        "Januari",
        "Februari",
        "Mac",
        "April",
        "Mei",
        "Jun",
        "Julai",
        "Ogos",
        "September",
        "Oktober",
        "November",
        "Disember",
    }
}
--- NEW FILE: ms_BN.txt ---
// ***************************************************************************
// *
// *   Copyright (C) 2001-2003, International Business Machines
// *   Corporation and others.  All Rights Reserved.
// *
// ***************************************************************************

ms_BN{
    Version{ "1.0" }
    NumberElements { 
        ",",
        ".",
        ";",
        "%",
        "0",
        "#",
        "-",
        "E",
        "\u2030",
        "\u221E",
        "\uFFFD",
        ",",
        "+",
    }
    DateTimePatterns{
        "h:mm:ss aa",
        "H:mm:ss",
        "H:mm:ss",
        "H:mm:ss",
        "dd MMMM yyyy",
        "dd MMMM yyyy",
        "dd/MM/yyyy",
        "dd/MM/yyyy",
        "{1} {0}",
    }
    Currencies {
        BND { "$", "BND" }
        USD { "US$", "USD" }
    }
}
--- NEW FILE: ms_MY.txt ---
// ***************************************************************************
// *
// *   Copyright (C) 2001-2003, International Business Machines
// *   Corporation and others.  All Rights Reserved.
// *   Generated from Universal Locales for Linux Project
// ***************************************************************************

ms_MY {
    Version{ "1.0" }
    DateTimePatterns { 
        "h:mm:ss a z",
        "h:mm:ss a z",
        "h:mm:ss a",
        "h:mm",
        "EEEE dd MMM yyyy",
        "dd MMMM yyyy",
        "dd MMMM yyyy",
        "dd/MM/yyyy",
        "{1} {0}",
    }

    NumberPatterns { 
        "#,##0.###;-#,##0.###",
        "\u00A4#,##0.00;(\u00A4#,##0.00)",
        "#,##0%",
        "#E0",
    }
}

--- NEW FILE: pa.txt ---
// ***************************************************************************
// *
// *   Copyright (C) 2001-2003, International Business Machines
// *   Corporation and others.  All Rights Reserved.
// *
// ***************************************************************************

pa {
    Version{ "1.0"}
    Languages {
        pa { "\u0A2A\u0A70\u0A1C\u0A3E\u0A2C\u0A40" }
    }
    Countries {
        IN { "\u0A2D\u0A3E\u0A30\u0A24" }
    }
    AmPmMarkers{
        "\u0A38\u0A35\u0A47\u0A30\u0A47",
        "\u0A36\u0A3E\u0A2E"
    }
    DayNames{
        "\u0A10\u0A24\u0A35\u0A3E\u0A30",
        "\u0A38\u0A4B\u0A2E\u0A35\u0A3E\u0A30",
        "\u0A2E\u0A70\u0A17\u0A32\u0A35\u0A3E\u0A30",
        "\u0A2C\u0A41\u0A27\u0A35\u0A3E\u0A30",
        "\u0A35\u0A40\u0A30\u0A35\u0A3E\u0A30",
        "\u0A36\u0A41\u0A71\u0A15\u0A30\u0A35\u0A3E\u0A30",
        "\u0A36\u0A28\u0A40\u0A1A\u0A30\u0A35\u0A3E\u0A30"
    }

    DayAbbreviations{
        "\u0A10\u0A24.",
        "\u0A38\u0A4B\u0A2E.",
        "\u0A2E\u0A70\u0A17\u0A32.",
        "\u0A2C\u0A41\u0A27.",
        "\u0A35\u0A40\u0A30.",
        "\u0A36\u0A41\u0A15\u0A30.",
        "\u0A36\u0A28\u0A40."
    }

    MonthNames{
        "\u0A1C\u0A28\u0A35\u0A30\u0A40",
        "\u0A5E\u0A30\u0A35\u0A30\u0A40",
        "\u0A2E\u0A3E\u0A30\u0A1A",
        "\u0A05\u0A2A\u0A4D\u0A30\u0A48\u0A32",
        "\u0A2E\u0A08",
        "\u0A1C\u0A42\u0A28",
        "\u0A1C\u0A41\u0A32\u0A3E\u0A08",
        "\u0A05\u0A17\u0A38\u0A24",
        "\u0A38\u0A24\u0A70\u0A2C\u0A30",
        "\u0A05\u0A15\u0A24\u0A42\u0A2C\u0A30",
        "\u0A28\u0A35\u0A70\u0A2C\u0A30",
        "\u0A26\u0A38\u0A70\u0A2C\u0A30",
    }

    MonthAbbreviations{
        "\u0A1C\u0A28\u0A35\u0A30\u0A40",
        "\u0A5E\u0A30\u0A35\u0A30\u0A40",
        "\u0A2E\u0A3E\u0A30\u0A1A",
        "\u0A05\u0A2A\u0A4D\u0A30\u0A48\u0A32",
        "\u0A2E\u0A08",
        "\u0A1C\u0A42\u0A28",
        "\u0A1C\u0A41\u0A32\u0A3E\u0A08",
        "\u0A05\u0A17\u0A38\u0A24",
        "\u0A38\u0A24\u0A70\u0A2C\u0A30",
        "\u0A05\u0A15\u0A24\u0A42\u0A2C\u0A30",
        "\u0A28\u0A35\u0A70\u0A2C\u0A30",
        "\u0A26\u0A38\u0A70\u0A2C\u0A30",
    }

    NumberElements{
        ".",
        ",",
        ";",
        "%",
        "\u0a66",
        "#",
        "-",
        "E",
        "\u2030",
        "\u221e",
        "\ufffd",
        ".",
        "+",
    }
    Currencies {
        INR { "\u0A30\u0A41.", "\u0a30\u0a41\u0a2a\u0a3f\u0a2f" }
    }
    NumberPatterns {
        "##,##,##0.###;-##,##,##0.###",
        "\u00A4 ##,##,##0.00;-\u00A4 ##,##,##0.00",
        "##,##,##0%",
        "#E0",
    }
    LocaleScript:array { "Guru" }

    ExemplarCharacters { "[[:Guru:]\u200c\u200d]" }
    collations {
      standard {
        Version { "1.0" }
        Sequence { 
            "[normalization on]"
        }
      }
    }
}
--- NEW FILE: pa_IN.txt ---
// ***************************************************************************
// *
// *   Copyright (C) 2001-2003, International Business Machines
// *   Corporation and others.  All Rights Reserved.
// *
// ***************************************************************************

pa_IN {
    Version { "1.0" }
    DateTimePatterns {
        "hh:mm:ss a z",
        "hh:mm:ss a z",
        "hh:mm:ss a",
        "hh:mm a",
        "EEEE d MMMM yyyy",
        "d MMMM yyyy",
        "dd-MM-yyyy",
        "d-M-yy",
        "{1} {0}"
    }
//    DateTimeElements:intvector {
//        1,
//        1
//    }
    NumberPatterns {
        "##,##,##0.###;-##,##,##0.###",
        "\u00A4##,##,##0.00;-\u00A4##,##,##0.00",
        "##,##,##0%",
        "#E0",
    }
}
--- NEW FILE: ps.txt ---
// ***************************************************************************
// *
// *   Copyright (C) 2003, International Business Machines
// *   Corporation and others.  All Rights Reserved.
// *
// ***************************************************************************
//
// Created by Roozbeh Pournader <roozbeh@sharif.edu> and Michael Everson <everson@evertype.com>

ps {
    Version { "1.0" }

    // The default clock is 24-hour time. abbreviations for AM/PM are not
    // widespread, but forms are given here in case they are required.
    AmPmMarkers {
        "\u063a.\u0645.",
        "\u063a.\u0648.",
    }
    // This is a unified sort with uz_AF, fa_AF and ps.
    collations {
      standard { 
        Version { "1.0" }
        Sequence { "[normalization on]"
           "&\u064e<<\u0650<<\u064f<<\u064b<<\u064d<<\u064c"
           "&\u0622<\u0627<<\u0623<<\u0672<<\u0671<<\u0625<<\u0673<\u0621"
           "&\u062a<\u067c<<\u0679"
           "&\u062c<\u0681<<\u062d\u0654"
           "&\u0686<\u0685"
           "&\u062f<\u0689<<\u0688"
           "&\u0631<\u0693<<\u0691"
           "&\u0698<\u0696"
           "&\u06a9<<\u06aa<<\u0643"
           "&\u06ab<<\u06af"
           "&\u06bc<<\u06bb"
           "&\u0648<<\u0624<<\u06c7<<\u06c9"
           "&\u0647<<<\u06c0<<<\u0647\u0654<<\u06d5<<\u06c1<<\u06be<<\u0629<<\u06c3"
           "&\u06cc<<\u0649<<\u06d2<<\u064a<<\u06d0<<\u06cd<<\u06cc\u0654<<<\u0649\u0654<<<\u0626"
           "&'\u00a0'<<'\u200c'<<'\u200d'"  // This is NBSP << ZWNJ << ZWJ
         }
      }
    }
    Countries {
        AF  { "\u0627\u0641\u063a\u0627\u0646\u0633\u062a\u0627\u0646" }
        AL  { "\u0627\u0644\u0628\u0627\u0646\u06cc\u0647" }
        AO  { "\u0627\u0646\u06ab\u0648\u0644\u0627" }
        AQ  { "\u0627\u0646\u062a\u0627\u0631\u06a9\u062a\u06cc\u06a9\u0627" }
        AT  { "\u0627\u062a\u0631\u06cc\u0634" }
        BD  { "\u0628\u0646\u06ab\u0644\u0647\u200c\u062f\u06cc\u0634" }
        BG  { "\u0628\u0644\u063a\u0627\u0631\u06cc\u0647" }
        CA  { "\u06a9\u0627\u0646\u0627\u0689\u0627" }
        CH  { "\u0633\u0648\u06cc\u0633" }
        CN  { "\u0686\u06cc\u0646" }
        CO  { "\u06a9\u0648\u0644\u0645\u0628\u06cc\u0627" }
        CU  { "\u06a9\u06cc\u0648\u0628\u0627" }
        DE  { "\u0627\u0644\u0645\u0627\u0646" }
        DK  { "\u0689\u0646\u0645\u0627\u0631\u06a9" }
        DZ  { "\u0627\u0644\u062c\u0632\u0627\u06cc\u0631" }
        EG  { "\u0645\u0635\u0631" }
        ES  { "\u0647\u0633\u067e\u0627\u0646\u06cc\u0647" }
        ET  { "\u062d\u0628\u0634\u0647" }
        FI  { "\u0641\u0646\u0644\u06cc\u0646\u0689" }
        FR  { "\u0641\u0631\u0627\u0646\u0633\u0647" }
        GB  { "\u0628\u0631\u062a\u0627\u0646\u06cc\u0647" }
        GH  { "\u06ab\u0627\u0646\u0627" }
        GN  { "\u06ab\u06cc\u0627\u0646\u0627" }
        GR  { "\u06cc\u0648\u0646\u0627\u0646" }
        GT  { "\u06ab\u0648\u0627\u062a\u06cc\u0645\u0627\u0644\u0627" }
        HK  { "\u0647\u0627\u0646\u06a9\u0627\u0646\u06ab" }
        HN  { "\u0647\u0627\u0646\u0689\u0648\u0631\u0627\u0633" }
        HU  { "\u0645\u062c\u0627\u0631\u0633\u062a\u0627\u0646" } //also "\u0647\u0646\u06ab\u0631\u064a"
        ID  { "\u0627\u0646\u062f\u0648\u0646\u06cc\u0632\u06cc\u0627" }
        IN  { "\u0647\u0646\u062f" } //also "\u0647\u0646\u062f\u0648\u0633\u062a\u0627\u0646"
        IQ  { "\u0639\u0631\u0627\u0642" }
        IS  { "\u0622\u06cc\u0633\u0644\u06cc\u0646\u0689" }
        IT  { "\u0627\u06cc\u067c\u0627\u0644\u06cc\u0647" }
        JM  { "\u062c\u0645\u06cc\u06a9\u0627" }
        JP  { "\u062c\u0627\u067e\u0627\u0646" }
        KH  { "\u06a9\u0645\u0628\u0648\u062f\u06cc\u0627" }
        KW  { "\u06a9\u0648\u06cc\u067c" }
        LA  { "\u0644\u0627\u0648\u0633" }
        LB  { "\u0644\u0628\u0646\u0627\u0646" }
        LR  { "\u0644\u0627\u06cc\u0628\u0631\u06cc\u0627" }
        LY  { "\u0644\u06cc\u0628\u06cc\u0627" }
        MA  { "\u0645\u0631\u0627\u06a9\u0634" }
        MN  { "\u0645\u063a\u0648\u0644\u0633\u062a\u0627\u0646" } //also "\u0645\u0646\u06ab\u0648\u0644\u06cc\u0627"
        MY  { "\u0645\u0627\u0644\u06cc\u0632\u06cc\u0627" }
        NG  { "\u0646\u0627\u06cc\u062c\u06cc\u0631\u06cc\u0627" }
        NI  { "\u0646\u06a9\u0627\u0631\u0627\u06ab\u0648\u0627" }
        NL  { "\u0647\u0627\u0644\u06d0\u0646\u0689" }
        NO  { "\u0646\u0627\u0631\u0648\u06d0" }
        NP  { "\u0646\u06cc\u067e\u0627\u0644" }
        NZ  { "\u0646\u06cc\u0648\u0632\u06cc\u0644\u0646\u0689" }
        PK  { "\u067e\u0627\u06a9\u0633\u062a\u0627\u0646" }
        PL  { "\u067e\u0648\u0644\u0646\u0689" }
        PS  { "\u0641\u0644\u0633\u0637\u06cc\u0646" }
        PT  { "\u067e\u0648\u0631\u062a\u06ab\u0627\u0644" }
        RU  { "\u0631\u0648\u0633\u06cc\u0647" }
        RW  { "\u0631\u0648\u0646\u062f\u0627" }
        SA  { "\u0633\u0639\u0648\u062f\u06cc \u0639\u0631\u0628\u0633\u062a\u0627\u0646" }
        SE  { "\u0633\u0648\u06cc\u0689\u0646" }
        SV  { "\u0633\u0627\u0644\u0648\u06d0\u0689\u0648\u0631" }
        SY  { "\u0633\u0648\u0631\u06cc\u0647" }
        TJ  { "\u062a\u0627\u062c\u06a9\u0633\u062a\u0627\u0646" }
        TZ  { "\u062a\u0646\u0632\u0627\u0646\u06cc\u0627" }
        UY  { "\u06cc\u0648\u0631\u0648\u06ab\u0648\u0627\u06cc" }
        YE  { "\u06cc\u0645\u0646" }
    }
    Currencies {
        // The Afghani symbol doesn't exist in Unicode. So we use the long name
        AFA { "\u0627\u0641\u063a\u0627\u0646\u06cd", "\u0627\u0641\u063a\u0627\u0646\u06cd" }
    }

    DateTimePatterns { 
        "H:mm:ss (z)",
        "H:mm:ss (z)",
        "H:mm:ss",
        "H:mm",
        "EEEE \u062f yyyy \u062f MMMM d",
        "\u062f yyyy \u062f MMMM d",
        "d MMMM yyyy",
        "yyyy/M/d",
        "{1} {0}",
    }
    DayAbbreviations { 
        "\u06cc.",
        "\u062f.",
        "\u0633.",
        "\u0686.",
        "\u067e.",
        "\u062c.",
        "\u0634.",
    }
    DayNames { 
        "\u06cc\u06a9\u0634\u0646\u0628\u0647",
        "\u062f\u0648\u0634\u0646\u0628\u0647",
        "\u0633\u0647\u200c\u0634\u0646\u0628\u0647",
        "\u0686\u0647\u0627\u0631\u0634\u0646\u0628\u0647", //MoE, MoIC, and PED say "\u0686\u0627\u0631" instead of "\u0686\u0647\u0627\u0631"
        "\u067e\u0646\u062c\u0634\u0646\u0628\u0647",
        "\u062c\u0645\u0639\u0647",
        "\u0634\u0646\u0628\u0647",
    }
    Eras { 
        "\u0642.\u0645.",
        "\u0645.",
    }
    ExemplarCharacters {"[\u0621-\u0624\u0626-\u063a\u0641\u0642\u0644-\u0648\u064a-\u0652\u0654\u0670\u067c\u067e\u0681\u0685-\u0686\u0689\u0693\u0696\u0698\u069a\u06a9\u06ab\u06bc\u06cc-\u06cd\u06d0 \u200c\u200d\u200f\u200e]"}

    Languages {
        ar  { "\u0639\u0631\u0628\u064a" }
        bal { "\u0628\u0644\u0648\u0685\u064a" }
        de  { "\u0627\u0644\u0645\u0627\u0646\u064a" }
        el  { "\u06cc\u0648\u0646\u0627\u0646\u064a" }
        en  { "\u0627\u0646\u06ab\u0644\u06cc\u0633\u064a" }
        et  { "\u062d\u0628\u0634\u064a" }
        fa  { "\u0641\u0627\u0631\u0633\u064a" }
        fi  { "\u0641\u06cc\u0646\u0644\u0646\u0689\u064a" }
        fr  { "\u0641\u0631\u0627\u0646\u0633\u0648\u064a" }
        he  { "\u0639\u0628\u0631\u064a" }
        hi  { "\u0647\u0646\u062f\u064a" }
        hy  { "\u0627\u0631\u0645\u0646\u064a" }
        ine { "\u0647\u0646\u062f \u0648 \u0627\u0631\u0648\u067e\u0627\u06cc\u064a" }
        it  { "\u0627\u06cc\u067c\u0627\u0644\u0648\u064a" }
        //iw  { "\u0639\u0628\u0631\u064a" }
        ja  { "\u062c\u0627\u067e\u0627\u0646\u06cc" }
        ku  { "\u06a9\u0631\u062f\u064a" }
        la  { "\u0644\u0627\u062a\u06cc\u0646\u064a" }
        mg  { "\u0645\u0644\u063a\u0627\u0633\u064a" }
        mk  { "\u0645\u0642\u062f\u0648\u0646\u064a" } 
        mn  { "\u0645\u063a\u0648\u0644\u064a" }
        ms  { "\u0645\u0644\u0627\u06cc\u0627" }
        pl  { "\u067e\u0648\u0644\u0646\u0689\u064a" }
        ps  { "\u067e\u069a\u062a\u0648" }
        pt  { "\u067e\u0648\u0631\u062a\u06ab\u0627\u0644\u064a" }
        ru  { "\u0631\u0648\u0633\u064a" }
        sa  { "\u0633\u0646\u0633\u06a9\u0631\u06cc\u067c" }
        sv  { "\u0633\u0648\u06cc\u0689\u0646\u06cc" }
        tg  { "\u062a\u0627\u062c\u06a9" }
        tk  { "\u062a\u0631\u06a9\u0645\u0646\u064a" }
        tt  { "\u062a\u0627\u062a\u0627\u0631" }
        uz  { "\u0627\u0632\u0628\u06a9\u064a" }
        zh  { "\u0686\u06cc\u0646\u064a" }
    }

    LocaleScript:array {
        "Arab"
    }

    MonthNames {
        //FIXME: check all these with PED.
        "\u062c\u0646\u0648\u0631\u064a",
        "\u0641\u0628\u0631\u0648\u0631\u064a",
        "\u0645\u0627\u0631\u0686",
        "\u0627\u067e\u0631\u06cc\u0644",
        "\u0645\u06cc", // MoE and PED say "\u0645\u06d0"
        "\u062c\u0648\u0646",
        "\u062c\u0648\u0644\u0627\u06cc",
        "\u0627\u06ab\u0633\u062a",
        "\u0633\u067e\u062a\u0645\u0628\u0631",
        "\u0627\u06a9\u062a\u0648\u0628\u0631",
        "\u0646\u0648\u0645\u0628\u0631",
        "\u062f\u0633\u0645\u0628\u0631",
    }
    MonthAbbreviations {
        "\u062c\u0646\u0648",
        "\u0641\u0628\u0631",
        "\u0645\u0627\u0631",
        "\u0627\u067e\u0631",
        "\u0645\u0640\u06cc",
        "\u062c\u0648\u0646",
        "\u062c\u0648\u0644",
        "\u0627\u06ab\u0633",
        "\u0633\u067e\u062a",
        "\u0627\u06a9\u062a",
        "\u0646\u0648\u0645",
        "\u062f\u0633\u0645",
    }

    zoneStrings {
        {
            "Asia/Kabul",
            "\u062f \u0627\u0641\u063a\u0627\u0646\u0633\u062a\u0627\u0646 \u067e\u0647 \u0648\u062e\u062a",
            "AFT",
            "\u062f \u0627\u0641\u063a\u0627\u0646\u0633\u062a\u0627\u0646 \u067e\u0647 \u0648\u062e\u062a",
            "AFT",
            "\u06a9\u0627\u0628\u0644",
        }
    }
}

--- NEW FILE: ps_AF.txt ---
// ***************************************************************************
// *
// *   Copyright (C) 2003, International Business Machines
// *   Corporation and others.  All Rights Reserved.
// *
// ***************************************************************************

// Created by Roozbeh Pournader <roozbeh@sharif.edu> and Michael Everson <everson@evertype.com>

ps_AF {
    Version { "1.0" }
    DateTimeElements:intvector {
        7,      // Saturday
        1,
    }
    NumberPatterns { 
        "#,##0.###;-#,##0.###",
        "#,##0 \u00a4;-#,##0 \u00a4",
        "#,##0%", // The percent sign appears on the right side.
                  // Acad says it should appear on the left (like fa_IR).
        "#E0",
    }
    NumberElements { 
        "\u066b",
        "\u066c",
        ";",
        "\u066a",
        "\u06f0",
        "#",
        "\u2212",
        "\u00d7\u06f1\u06f0^",
        "\u2030",
        "\u221e",
        "\ufffd",
        "\u066b",
        "+",
    }
}

Index: af.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/af.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- af.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ af.txt	6 Apr 2004 10:08:10 -0000	1.2
@@ -6,12 +6,19 @@
 // ***************************************************************************
 
 af {
-    Version { "3.0" }
+    Version { "4.0" }
 
     AmPmMarkers { 
         "VM",
         "NM",
     }
+    Countries {
+        ZA { "Suid-Afrika" }
+    }
+    // Currency display names
+    Currencies {
+        ZAR { "R", "ZAR" }
+    }
     DayAbbreviations { 
         "So",
         "Ma",
@@ -30,6 +37,9 @@
         "Vrydag",
         "Saterdag",
     }
+    Languages {
+        af { "Afrikaanse" }
+    }
     MonthAbbreviations { 
         "Jan",
         "Feb",
@@ -72,24 +82,17 @@
 //        "\u221e",
 //        "\ufffd",
 //    }
-    LocaleID:int { 0x36 }
-    ExemplarCharacters { "[a-z \u00e1 \u00e9 \u00e8 \u00e2 \u00ea \u00ee \u00f4 \u00fb \u00eb \u00ef \u00f6]" }
-//    LocaleScript{ 
-//                "Latn",  // ISO 15924 Name 
-//    }
-//    LocaleString{ "af" }
+    ExemplarCharacters { "[a-z\u00e1\u00e9\u00e8\u00e2\u00ea\u00ee\u00f4\u00fb\u00eb\u00ef\u00f6\u0149]" }
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
+    }
 
     // /**************** Info Below is needed ****************/
-    // CollationElements{}
+    // collations{}
     // Countries{}
     // Eras{}
     // Languages{}
-    // ShortLanguage { }
     // localPatternChars{}
     //
 
-    // Currency display names
-    Currencies {
-        ZAR { "R", "ZAR" }
-    }
 }

Index: af_ZA.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/af_ZA.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- af_ZA.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ af_ZA.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -25,7 +25,4 @@
         "#,##0%",
         "#E0",
     }
-    LocaleID:int { 0x0436 }
-//    LocaleString { "af_ZA" }
-//    ShortCountry{ "ZAK" }
 }

Index: am.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/am.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- am.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ am.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -57,7 +57,7 @@
         "\u12F2\u1234\u121D\u1260\u122D",
     }
     LocaleScript {
-    	"Ethi",
+        "Ethi",
     }
     ExemplarCharacters{"[:Ethi:]"}
     DateTimeElements:intvector { 
@@ -168,7 +168,7 @@
         sa { "\u1233\u1295\u1235\u12AD\u122A\u1275\u129B" }
         sd { "\u1232\u1295\u12F5\u1202\u129B" }
         sg { "\u1233\u1295\u130E\u129B" }
-        sh { "\u0073\u0068"}
+        // sh { "\u0073\u0068"} // this is an error.. we need translation for this
         si { "\u1235\u1295\u1203\u120D\u129B" }
         sk { "\u1235\u120E\u126B\u12AD\u129B" }
         sl { "\u1235\u120E\u126A\u129B" }
@@ -208,6 +208,7 @@
         za { "\u12E1\u12CB\u1295\u130D\u129B" }
         zh { "\u127B\u12ED\u1295\u129B" }
         zu { "\u12D9\u1209\u129B" }
+        byn { "\u1265\u120A\u1295" }
         gez { "\u130D\u12D5\u12DD\u129B" }
         tig { "\u1275\u130D\u1228" }
         sid { "\u1232\u12F3\u121D\u129B" }

Index: ar.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ar.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ar.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ar.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -1,4 +1,4 @@
-// ****************************************************************************
+// ****************************************************************************
 // *
 // *   Copyright (C) 1997-2003, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
@@ -11,42 +11,235 @@
         "\u0635",
         "\u0645",
     }
-    CollationElements { 
-        Version { "2.0" }
-        Sequence { "[normalization on]&  Z <  \u0621<< \u0622<< \u0623<< \u0624<< \u0625<< \u0626< \u0627< \u0628< "
-        "\u067E< \u0629= \u062A< \u062B< \u062C< \u0686< \u062D< \u062E< \u062F< \u0630<"
-        " \u0631< \u0632< \u0698< \u0633< \u0634< \u0635< \u0636< \u0637< \u0638< \u0639"
-        "< \u063A< \u0641< \u0642< \u0643< \u06AF< \u0644< \u0645< \u0646< \u0647< \u0648"
-        "< \u0649<< \u064A< \u0670< \u0671< \u0672< \u0673< \u0674< \u0675< \u0676< \u0677"
-        "< \u0678< \u0679< \u067A< \u067B< \u067C< \u067D< \u067F< \u0680< \u0681< \u0682"
-        "< \u0683< \u0684< \u0685< \u0687< \u0688< \u0689< \u068A< \u068B< \u068C< \u068D"
-        "< \u068E< \u068F< \u0690< \u0691< \u0692< \u0693< \u0694< \u0695< \u0696< \u0697"
-        "< \u0699< \u069A< \u069B< \u069C< \u069D< \u069E< \u069F< \u06A0< \u06A1< \u06A2"
-        "< \u06A3< \u06A4< \u06A5< \u06A6< \u06A7< \u06A8< \u06A9< \u06AA< \u06AB< \u06AC"
-        "< \u06AD< \u06AE< \u06B0< \u06B1< \u06B2< \u06B3< \u06B4< \u06B5< \u06B6< \u06B7"
-        "< \u06BA< \u06BB< \u06BC< \u06BD< \u06BE< \u06C0< \u06C1< \u06C2< \u06C3< \u06C4"
-        "< \u06C5< \u06C6< \u06C7< \u06C8< \u06C9< \u06CA< \u06CB< \u06CC< \u06CD< \u06CE"
-        "< \u06D0< \u06D1< \u06D2< \u06D3< \u06D5< \u0651"}
+    collations {
+      standard { 
+        // according to Ayman M. Roshdy
+        Version { "3.0" }
+        Sequence { "& ة"
+                "= ت"}
+      }
     }
     Countries { 
-        AE { "\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062A" }
-        BH { "\u0627\u0644\u0628\u062D\u0631\u064A\u0646" }
-        DZ { "\u0627\u0644\u062C\u0632\u0627\u0626\u0631" }
+        AD { "\u0627\u0646\u062f\u0648\u0631\u0627" }
+        //AE { "\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062A" }
+        AE { "\u0627\u0644\u0627\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629" }
+        AF { "\u0627\u0641\u063a\u0627\u0646\u0633\u062a\u0627\u0646" }
+        AG { "\u0627\u0646\u062a\u064a\u063a\u0648\u0627 \u0648\u0628\u0631\u0628\u0648\u062f\u0627" }
+        AI { "\u0627\u0644\u0628\u0627\u0646\u064a\u0627" }
+        AM { "\u0627\u0631\u0645\u064a\u0646\u064a\u0627" }
+        AO { "\u0627\u0646\u063a\u0648\u0644\u0627" }
+        AR { "\u0627\u0644\u0627\u0631\u062c\u0646\u062a\u064a\u0646" }
+        AT { "\u0627\u0644\u0646\u0645\u0633\u0627" }
+        AU { "\u0627\u0633\u062a\u0631\u0627\u0644\u064a\u0627" }
+        AZ { "\u0622\u0630\u0631\u0628\u064a\u062c\u0627\u0646" }
+
+        BA { "\u0627\u0644\u0628\u0648\u0633\u0646\u0629 \u0648\u0627\u0644\u0647\u0631\u0633\u0643" }
+        BB { "\u0628\u0631\u0628\u0627\u062f\u0648\u0633" }
+        BD { "\u0628\u0646\u063a\u0644\u0627\u062f\u064a\u0634" }
+        BE { "\u0628\u0644\u062c\u064a\u0643\u0627" }
+        BF { "\u0628\u0648\u0631\u0643\u064a\u0646\u0627 \u0641\u0627\u0633\u0648" }
+        BG { "\u0628\u0644\u063a\u0627\u0631\u064a\u0627" }
+        BH { "\u0627\u0644\u0628\u062d\u0631\u064a\u0646" }
+        BI { "\u0628\u0648\u0631\u0648\u0646\u062f\u064a" }
+        BJ { "\u0628\u0646\u064a\u0646" }
+        BN { "\u0628\u0631\u0648\u0646\u0627\u064a" }
+        BO { "\u0628\u0648\u0644\u064a\u0641\u064a\u0627" }
+        BR { "\u0627\u0644\u0628\u0631\u0627\u0632\u064a\u0644" }
+        BS { "\u0627\u0644\u0628\u0647\u0627\u0645\u0627" }
+        BT { "\u0628\u0648\u062a\u0627\u0646" }
+        BW { "\u0628\u0648\u062a\u0633\u0648\u0627\u0646\u0627" }
+        BY { "\u0631\u0648\u0633\u064a\u0627 \u0627\u0644\u0628\u064a\u0636\u0627\u0621" }
+        BZ { "\u0628\u0644\u064a\u0632" }
+
+        CA { "\u0643\u0646\u062f\u0627" }
+        CF { "\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0641\u0631\u064a\u0642\u064a\u0627 \u0627\u0644\u0648\u0633\u0637\u0649" }
+        CG { "\u0627\u0644\u0643\u0648\u0646\u063a\u0648" }
+        CH { "\u0633\u0648\u064a\u0633\u0631\u0627" }
+        CL { "\u062a\u0634\u064a\u0644\u064a" }
+        CM { "\u0627\u0644\u0643\u0627\u0645\u064a\u0631\u0648\u0646" }
+        CN { "\u0627\u0644\u0635\u064a\u0646" }
+        CO { "\u0643\u0648\u0644\u0648\u0645\u0628\u064a\u0627" }
+        CR { "\u0643\u0648\u0633\u062a\u0627\u0631\u064a\u0643\u0627" }
+        CU { "\u0643\u0648\u0628\u0627" }
+        CV { "\u0627\u0644\u0631\u0623\u0633 \u0627\u0644\u0627\u062e\u0636\u0631" }
+        CY { "\u0642\u0628\u0631\u0635" }
+        CZ { "\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u062a\u0634\u064a\u0643" }
+        
+        DE { "\u0627\u0644\u0645\u0627\u0646\u064a\u0627" }
+        DJ { "\u062c\u064a\u0628\u0648\u062a\u064a" }
+        DK { "\u0627\u0644\u062f\u0627\u0646\u0645\u0631\u0643" }
+        DM { "\u062f\u0648\u0645\u064a\u0646\u064a\u0643\u0627" }
+        DO { "\u0627\u0644\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u062f\u0648\u0645\u064a\u0646\u064a\u0643\u064a\u0629" }
+        DZ { "\u0627\u0644\u062c\u0632\u0627\u0626\u0631" }
+
+        EC { "\u0627\u0643\u0648\u0627\u062f\u0648\u0631" }
+        EE { "\u0627\u0633\u062a\u0648\u0646\u064a\u0627" }
         EG { "\u0645\u0635\u0631" }
+        EH { "\u0627\u0644\u0635\u062d\u0631\u0627\u0621 \u0627\u0644\u063a\u0631\u0628\u064a\u0629" }
+        ER { "\u0627\u0631\u062a\u064a\u0631\u064a\u0627" }
+        ES { "\u0627\u0633\u0628\u0627\u0646\u064a\u0627" }
+        ET { "\u0627\u062b\u064a\u0648\u0628\u064a\u0627" }
+
+        FI { "\u0641\u0646\u0644\u0646\u062f\u0627" }
+        FJ { "\u0641\u064a\u062c\u064a" }
+        FM { "\u0645\u064a\u0643\u0631\u0648\u0646\u064a\u0632\u064a\u0627" }
+        FR { "\u0641\u0631\u0646\u0633\u0627" }
+
+        GA { "\u063a\u0627\u0628\u0648\u0646" }
+        GB { "\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629" }
+        GD { "\u063a\u0631\u064a\u0646\u0627\u062f\u0627" }
+        GE { "\u062c\u0648\u0631\u062c\u064a\u0627" }
+        GH { "\u063a\u0627\u0646\u0627" }
+        GM { "\u063a\u0627\u0645\u0628\u064a\u0627" }
+        GN { "\u063a\u064a\u0646\u064a\u0627" }
+        GQ { "\u063a\u064a\u0646\u064a\u0627 \u0627\u0644\u0627\u0633\u062a\u0648\u0627\u0626\u064a\u0629" }
+        GR { "\u0627\u0644\u064a\u0648\u0646\u0627\u0646" }
+        GT { "\u063a\u0648\u0627\u062a\u064a\u0645\u0627\u0644\u0627" }
+        GW { "\u063a\u064a\u0646\u064a\u0627 \u0628\u064a\u0633\u0627\u0648" }
+        GY { "\u063a\u0648\u0627\u064a\u0627\u0646\u0627" }
+
+        HN { "\u0647\u0646\u062f\u0648\u0631\u0627\u0633" }
+        HR { "\u0643\u0631\u0648\u0627\u062a\u064a\u0627" }
+        HT { "\u0647\u0627\u064a\u062a\u064a" }
+        HU { "\u0647\u0646\u063a\u0627\u0631\u064a\u0627" }
+
+        ID { "\u0627\u0646\u062f\u0648\u0646\u064a\u0633\u064a\u0627" }
+        IE { "\u0627\u064a\u0631\u0644\u0646\u062f\u0627" }
+        IL { "\u0627\u0633\u0631\u0627\u0626\u064a\u0644" }
+        IN { "\u0627\u0644\u0647\u0646\u062f" }
         IQ { "\u0627\u0644\u0639\u0631\u0627\u0642" }
-        IN { "\u0627\u0644\u0647\u0646\u062F" }
-        JO { "\u0627\u0644\u0623\u0631\u062F\u0646" }
-        KW { "\u0627\u0644\u0643\u0648\u064A\u062A" }
+        IR { "\u0627\u064a\u0631\u0627\u0646" }
+        IS { "\u0627\u064a\u0633\u0644\u0646\u062f\u0627" }
+        IT { "\u0627\u064a\u0637\u0627\u0644\u064a\u0627" }
+
+        JM { "\u062c\u0627\u0645\u0627\u064a\u0643\u0627" }
+        //JO { "\u0627\u0644\u0623\u0631\u062F\u0646" }
+        JO { "\u0627\u0644\u0627\u0631\u062f\u0646" }
+        JP { "\u0627\u0644\u064a\u0627\u0628\u0627\u0646" }
+
+        KE { "\u0643\u064a\u0646\u064a\u0627" }
+        KG { "\u0642\u064a\u0631\u063a\u064a\u0632\u0633\u062a\u0627\u0646" }
+        KH { "\u0643\u0645\u0628\u0648\u062f\u064a\u0627" }
+        KI { "\u0643\u064a\u0631\u064a\u0628\u0627\u062a\u064a" }
+        KM { "\u062c\u0632\u0631 \u0627\u0644\u0642\u0645\u0631" }
+        KN { "\u0633\u0627\u0646\u062a \u0643\u064a\u062a\u0633 \u0648\u0646\u064a\u0641\u064a\u0633" }
+        KP { "\u0643\u0648\u0631\u064a\u0627 \u0627\u0644\u0634\u0645\u0627\u0644\u064a\u0629" }
+        KR { "\u0643\u0648\u0631\u064a\u0627 \u0627\u0644\u062c\u0646\u0648\u0628\u064a\u0629" }
+        KW { "\u0627\u0644\u0643\u0648\u064a\u062a" }
+        KZ { "\u0643\u0627\u0632\u0627\u062e\u0633\u062a\u0627\u0646" }
+
+        LA { "\u0644\u0627\u0648\u0633" }
         LB { "\u0644\u0628\u0646\u0627\u0646" }
-        LY { "\u0644\u064A\u0628\u064A\u0627" }
-        MA { "\u0627\u0644\u0645\u063A\u0631\u0628" }
-        OM { "\u0633\u0644\u0637\u0646\u0629 \u0639\u0645\u0627\u0646" }
+        LC { "\u0633\u0627\u0646\u062a \u0644\u0648\u0633\u064a\u0627" }
+        LI { "\u0644\u064a\u062e\u062a\u0646\u0634\u062a\u0627\u064a\u0646" }
+        LK { "\u0633\u0631\u064a \u0644\u0627\u0646\u0643\u0627" }
+        LR { "\u0644\u064a\u0628\u064a\u0631\u064a\u0627" }
+        LS { "\u0644\u064a\u0633\u0648\u062a\u0648" }
+        LT { "\u0644\u064a\u062a\u0648\u0627\u0646\u064a\u0627" }
+        LU { "\u0644\u0648\u0643\u0633\u0648\u0645\u0628\u0631\u063a" }
+        LV { "\u0644\u0627\u062a\u0641\u064a\u0627" }
+        LY { "\u0644\u064a\u0628\u064a\u0627" }
+
+        MA { "\u0627\u0644\u0645\u063a\u0631\u0628" }
+        MC { "\u0645\u0648\u0646\u0627\u0643\u0648" }
+        MD { "\u0645\u0648\u0644\u062f\u0648\u0641\u0627" }
+        MG { "\u0645\u062f\u063a\u0634\u0642\u0631" }
+        MH { "\u062c\u0632\u0631 \u0627\u0644\u0645\u0627\u0631\u0634\u0627\u0644"}
+        MK { "\u0645\u0642\u062f\u0648\u0646\u064a\u0627" }
+        ML { "\u0645\u0627\u0644\u064a" }
+        MM { "\u0645\u064a\u0627\u0646\u0645\u0627\u0631" }
+        MN { "\u0645\u0646\u063a\u0648\u0644\u064a\u0627" }
+        MR { "\u0645\u0648\u0631\u064a\u062a\u0627\u0646\u064a\u0627" }
+        MT { "\u0645\u0627\u0644\u0637\u0629" }
+        MU { "\u0645\u0648\u0631\u064a\u0634\u0648\u0633" }
+        MV { "\u0645\u0627\u0644\u062f\u064a\u0641" }
+        MW { "\u0645\u0644\u0627\u0648\u064a" }
+        MX { "\u0627\u0644\u0645\u0643\u0633\u064a\u0643" }
+        MY { "\u0645\u0627\u0644\u064a\u0632\u064a\u0627" }
+        MZ { "\u0645\u0648\u0632\u0645\u0628\u064a\u0642" }
+
+        NA { "\u0646\u0627\u0645\u064a\u0628\u064a\u0627" }
+        NE { "\u0627\u0644\u0646\u064a\u062c\u0631" }
+        NG { "\u0646\u064a\u062c\u064a\u0631\u064a\u0627" }
+        NI { "\u0646\u064a\u0643\u0627\u0631\u0627\u063a\u0648\u0627" }
+        NL { "\u0647\u0648\u0644\u0646\u062f\u0627" }
+        NO { "\u0627\u0644\u0646\u0631\u0648\u064a\u062c" }
+        NP { "\u0627\u0644\u0646\u064a\u0628\u0627\u0644" }
+        NR { "\u0646\u0627\u0648\u0631\u0648" }
+        NZ { "\u0632\u064a\u0644\u0646\u062f\u0627 \u0627\u0644\u062c\u062f\u064a\u062f\u0629" }
+
+        //OM { "\u0633\u0644\u0637\u0646\u0629 \u0639\u0645\u0627\u0646" }
+        OM { "\u0639\u0645\u0627\u0646" }
+
+        PA { "\u0628\u0646\u0645\u0627" }
+        PE { "\u0628\u064a\u0631\u0648" }
+        PG { "\u0628\u0627\u0628\u0648\u0627 \u063a\u064a\u0646\u064a\u0627 \u0627\u0644\u062c\u062f\u064a\u062f\u0629" }
+        PH { "\u0627\u0644\u0641\u064a\u0644\u0628\u064a\u0646" }
+        PK { "\u0627\u0644\u0628\u0627\u0643\u0633\u062a\u0627\u0646" }
+        PL { "\u0628\u0648\u0644\u0646\u062f\u0627" }
+        PT { "\u0627\u0644\u0628\u0631\u062a\u063a\u0627\u0644" }
+        PW { "\u0628\u0627\u0644\u0627\u0648" }
+        PY { "\u0628\u0627\u0631\u0627\u063a\u0648\u0627\u064a" }
+
         QA { "\u0642\u0637\u0631" }
-        SA { "\u0627\u0644\u0633\u0639\u0648\u062F\u064A\u0629" }
-        SD { "\u0627\u0644\u0633\u0648\u062F\u0627\u0646" }
-        SY { "\u0633\u0648\u0631\u064A\u0627" }
-        TN { "\u062A\u0648\u0646\u0633" }
-        YE { "\u0627\u0644\u064A\u0645\u0646" }
+
+        RO { "\u0631\u0648\u0645\u0627\u0646\u064a\u0627" }
+        RU { "\u0631\u0648\u0633\u064a\u0627" }
+        RW { "\u0631\u0648\u0627\u0646\u062f\u0627" }
+
+        //SA { "\u0627\u0644\u0633\u0639\u0648\u062F\u064A\u0629" }
+        SA { "\u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629" }
+        SB { "\u062c\u0632\u0631 \u0633\u0644\u064a\u0645\u0627\u0646" }
+        SC { "\u0633\u064a\u0634\u0644" }
+        SD { "\u0627\u0644\u0633\u0648\u062f\u0627\u0646" }
+        SE { "\u0627\u0644\u0633\u0648\u064a\u062f" }
+        SG { "\u0633\u0646\u063a\u0627\u0641\u0648\u0631\u0629" }
+        SI { "\u0633\u0644\u0648\u0641\u064a\u0646\u064a\u0627" }
+        SK { "\u0633\u0644\u0648\u0641\u0627\u0643\u064a\u0627" }
+        SL { "\u0633\u064a\u0631\u0627\u0644\u064a\u0648\u0646" }
+        SM { "\u0633\u0627\u0646 \u0645\u0627\u0631\u064a\u0646\u0648" }
+        SN { "\u0627\u0644\u0633\u0646\u063a\u0627\u0644" }
+        SO { "\u0627\u0644\u0635\u0648\u0645\u0627\u0644" }
+        SR { "\u0633\u0648\u0631\u064a\u0646\u0627\u0645" }
+        ST { "\u0633\u0627\u0646 \u062a\u0648\u0645\u064a \u0648\u0628\u0631\u064a\u0646\u0633\u064a\u0628\u064a" }
+        SV { "\u0627\u0644\u0633\u0644\u0641\u0627\u062f\u0648\u0631" }
+        //SY { "\u0633\u0648\u0631\u064A\u0627" }
+        SY { "\u0633\u0648\u0631\u064a\u0629" }
+        SZ { "\u0633\u0648\u0627\u0632\u064a\u0644\u0627\u0646\u062f" }
+
+        TD { "\u062a\u0634\u0627\u062f" }
+        TG { "\u062a\u0648\u063a\u0648" }
+        TH { "\u062a\u0627\u064a\u0644\u0646\u062f" }
+        TJ { "\u062a\u0627\u062c\u064a\u0643\u0633\u062a\u0627\u0646" }
+        //TL { "\u062a\u064a\u0645\u0648\u0631 \u0627\u0644\u0634\u0631\u0642\u064a\u0629" }    // This was called East Timor
+        TM { "\u062a\u0631\u0643\u0645\u0627\u0646\u0633\u062a\u0627\u0646" }
+        TN { "\u062a\u0648\u0646\u0633" }
+        TO { "\u062a\u0648\u0646\u063a\u0627" }
+        TR { "\u062a\u0631\u0643\u064a\u0627" }
+        TT { "\u062a\u0631\u064a\u0646\u064a\u062f\u0627\u062f \u0648\u062a\u0648\u0628\u0627\u063a\u0648" }
+        TV { "\u062a\u0648\u0641\u0627\u0644\u0648" }
+        TW { "\u062a\u0627\u064a\u0648\u0627\u0646" }
+        TZ { "\u062a\u0627\u0646\u0632\u0627\u0646\u064a\u0627" }
+
+        UA { "\u0627\u0648\u0643\u0631\u0627\u0646\u064a\u0627" }
+        UG { "\u0627\u0648\u063a\u0646\u062f\u0627" }
+        US { "\u0627\u0644\u0627\u0648\u0644\u0627\u064a\u0627\u062a \u0627\u0644\u0645\u062a\u062d\u062f\u0629 \u0627\u0644\u0627\u0645\u0631\u064a\u0643\u064a\u0629" }
+        UY { "\u0627\u0631\u0648\u063a\u0648\u0627\u064a" }
+        UZ { "\u0627\u0632\u0628\u0643\u0633\u062a\u0627\u0646" }
+
+        VA { "\u0627\u0644\u0641\u0627\u062a\u064a\u0643\u0627\u0646" }
+        VC { "\u0633\u0627\u0646\u062a \u0641\u0646\u0633\u0646\u062a \u0648\u062c\u0632\u0631 \u063a\u0631\u064a\u0646\u0627\u062f\u064a\u0646" }
+        VE { "\u0641\u0646\u0632\u0648\u064a\u0644\u0627" }
+        VN { "\u0641\u064a\u062a\u0646\u0627\u0645" }
+        VU { "\u0641\u0627\u0646\u0648\u0622\u062a\u0648" }
+
+        WS { "\u0633\u0627\u0645\u0648\u0627" }
+
+        YE { "\u0627\u0644\u064a\u0645\u0646" }
+
+        ZA { "\u062c\u0646\u0648\u0628 \u0627\u0641\u0631\u064a\u0642\u064a\u0627" }
+        ZM { "\u0632\u0627\u0645\u0628\u064a\u0627" }
+        ZW { "\u0632\u064a\u0645\u0628\u0627\u0628\u0648\u064a" }
     }
     DateTimeElements:intvector { 
         7,
@@ -64,13 +257,13 @@
         "{1} {0}",
     }
     DayAbbreviations { 
-        "\u0627\u0644\u0623\u062D\u062F",
-        "\u0627\u0644\u0627\u062B\u0646\u064A\u0646",
-        "\u0627\u0644\u062B\u0644\u0627\u062B\u0627\u0621",
-        "\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621",
-        "\u0627\u0644\u062E\u0645\u064A\u0633",
-        "\u0627\u0644\u062C\u0645\u0639\u0629",
-        "\u0627\u0644\u0633\u0628\u062A",
+        "\u062D",
+        "\u0646",
+        "\u062B",
+        "\u0631",
+        "\u062E",
+        "\u062C",
+        "\u0633",
     }
     DayNames { 
         "\u0627\u0644\u0623\u062D\u062F",
@@ -85,12 +278,56 @@
         "\u0642.\u0645",
         "\u0645",
     }
+    // Note to translator: Sometimes the hamza is optional for these translations.
     Languages { 
         ar { "\u0627\u0644\u0639\u0631\u0628\u064A\u0629" }
+        be { "\u0627\u0644\u0628\u064A\u0644\u0648\u0631\u0648\u0633\u064A\u0629" }
+        bg { "\u0627\u0644\u0628\u0644\u063A\u0627\u0631\u064A\u0629" }
+        bn { "\u0627\u0644\u0628\u0646\u063A\u0627\u0644\u064A\u0629" }
+        bo { "\u0627\u0644\u062A\u0628\u062A\u064A\u0629" }
+        ca { "\u0627\u0644\u0643\u0627\u062A\u0627\u0644\u0648\u064A\u0646\u064A\u0629" }
+        da { "\u0627\u0644\u062F\u0627\u0646\u0645\u0627\u0631\u0643\u064A\u0629" }
+        de { "\u0627\u0644\u0627\u0644\u0645\u0627\u0646\u064A\u0629" }
+        dv { "\u0627\u0644\u0645\u0627\u0644\u062F\u064A\u0641\u064A\u0629" }
+        dz { "\u0627\u0644\u0632\u0648\u0646\u062E\u0627\u064A\u0629" }
+        en { "\u0627\u0644\u0627\u0646\u062C\u0644\u064A\u0632\u064A\u0629" }
+        el { "\u0627\u0644\u064A\u0648\u0646\u0627\u0646\u064A\u0629" }
+        es { "\u0627\u0644\u0627\u0633\u0628\u0627\u0646\u064A\u0629" }
+        fa { "\u0627\u0644\u0641\u0627\u0631\u0633\u064A\u0629" }
+        fi { "\u0627\u0644\u0641\u0646\u0644\u0646\u062F\u064A\u0629" }
+        fr { "\u0627\u0644\u0641\u0631\u0646\u0633\u064A\u0629" }
+        gu { "\u0627\u0644\u063A\u0648\u062C\u0627\u0631\u0627\u062A\u064A\u0629" }
+        he { "\u0627\u0644\u0639\u0628\u0631\u064A\u0629" }
+        hi { "\u0627\u0644\u0647\u0646\u062F\u064A\u0629" }
+        hr { "\u0627\u0644\u0643\u0631\u0648\u0627\u062A\u064A\u0629" }
+        id { "\u0627\u0644\u0627\u0646\u062F\u0648\u0646\u064A\u0633\u064A\u0629" }
+        it { "\u0627\u0644\u0627\u064A\u0637\u0627\u0644\u064A\u0629" }
+        ja { "\u0627\u0644\u064A\u0627\u0628\u0627\u0646\u064A\u0629" }
+        km { "\u0627\u0644\u062E\u0645\u064A\u0631\u064A\u0629" }
+        ko { "\u0627\u0644\u0643\u0648\u0631\u064A\u0629" }
+        lt { "\u0627\u0644\u0644\u062A\u0648\u0627\u0646\u064A\u0629" }
+        mn { "\u0627\u0644\u0645\u0646\u063A\u0648\u0644\u064A\u0629" }
+        ms { "\u0644\u063A\u0629 \u0627\u0644\u0645\u0644\u0627\u064A\u0648" }
+        my { "\u0627\u0644\u0628\u0648\u0631\u0645\u064A\u0629" }
+        ne { "\u0627\u0644\u0646\u064A\u0628\u0627\u0644\u064A\u0629" }
+        nl { "\u0627\u0644\u0647\u0648\u0644\u0646\u062F\u064A\u0629" }
+        pa { "\u0627\u0644\u0628\u0646\u062C\u0627\u0628\u064A\u0629" }
+        pt { "\u0627\u0644\u0628\u0631\u062A\u063A\u0627\u0644\u064A\u0629" }
+        ro { "\u0627\u0644\u0631\u0648\u0645\u0627\u0646\u064A\u0629" }
+        ru { "\u0627\u0644\u0631\u0648\u0633\u064A\u0629" }
+        sq { "\u0627\u0644\u0627\u0644\u0628\u0627\u0646\u064A\u0629" }
+        sr { "\u0627\u0644\u0635\u0631\u0628\u064A\u0629" }
+        sw { "\u0627\u0644\u0633\u0648\u0627\u062D\u0644\u064A\u0629" }
+        th { "\u0627\u0644\u062A\u0627\u064A\u0644\u0627\u0646\u062F\u064A\u0629" }
+        tl { "\u0627\u0644\u062A\u0627\u063A\u0627\u0644\u0648\u063A\u064A\u0629" }
+        tr { "\u0627\u0644\u062A\u0631\u0643\u064A\u0629" }
+        ug { "\u0627\u0644\u0627\u063A\u0648\u0631\u064A\u0629" }
+        uk { "\u0627\u0644\u0627\u0648\u0643\u0631\u0627\u0646\u064A\u0629" }
+        ur { "\u0627\u0644\u0627\u0631\u062F\u064A\u0629" }
+        vi { "\u0627\u0644\u0641\u064A\u062A\u0646\u0627\u0645\u064A\u0629" }
+        zh { "\u0627\u0644\u0635\u064A\u0646\u064A\u0629" }
     }
-    LocaleID:int { 0x01 }
-//    LocaleString { "ar" }
-   MonthAbbreviations { 
+    MonthAbbreviations { 
         "\u064A\u0646\u0627\u064A\u0631",
         "\u0641\u0628\u0631\u0627\u064A\u0631",
         "\u0645\u0627\u0631\u0633",
@@ -118,23 +355,29 @@
         "\u0646\u0648\u0641\u0645\u0628\u0631",
         "\u062F\u064A\u0633\u0645\u0628\u0631",
     }
+    NumberElements { 
+        "\u066B",
+        "\u066C",
+        ";",
+        "\u066A",
+        "\u0660",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221E",
+        "\uFFFD",
+        "\u066B",
+        "+",
+    }    
     NumberPatterns { 
         "#,##0.###;#,##0.###-",
         "\u00A4 #,##0.00;\u00A4 #,##0.00-",
         "#,##0%",
         "#E0",
     }
-//    ShortLanguage { "ara" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
-    }
+
     LocaleScript:array {
         "Arab"
     }
@@ -165,5 +408,40 @@
     }
 
     // (ICU 2.6) International Calendar Data.  Note, THE FORMAT OF THIS DATA WILL CHANGE IN FUTURE RELEASES.
+    
     Eras_buddhist:array{ "\u0627\u0644\u062A\u0642\u0648\u064A\u0645 \u0627\u0644\u0628\u0648\u0630\u064A" }
+
+    // Islamic calendar
+    Eras_islamic:array { 
+            "\u0647\u200D"  // AH
+    }
+
+    MonthNames_islamic {
+            "\u0645\u062D\u0631\u0645",                                             // Muharram
+            "\u0635\u0641\u0631",                                                   // Safar
+            "\u0631\u0628\u064A\u0639 \u0627\u0644\u0623\u0648\u0644",              // Rabi' I
+            "\u0631\u0628\u064A\u0639 \u0627\u0644\u0622\u062E\u0631",              // Rabi' II
+            "\u062C\u0645\u0627\u062F\u0649 \u0627\u0644\u0623\u0648\u0644\u0649",  // Jumada I
+            "\u062C\u0645\u0627\u062F\u0649 \u0627\u0644\u0622\u062E\u0631\u0629",  // Jumada I
+            "\u0631\u062C\u0628",                                                   // Rajab
+            "\u0634\u0639\u0628\u0627\u0646",                                       // Sha'ban
+            "\u0631\u0645\u0636\u0627\u0646",                                       // Ramadan
+            "\u0634\u0648\u0627\u0644",                                             // Shawwal
+            "\u0630\u0648 \u0627\u0644\u0642\u0639\u062F\u0629",                    // Dhu'l-Qi'dah
+            "\u0630\u0648 \u0627\u0644\u062D\u062C\u0629"                          // Dhu'l-Hijjah
+     }
+    MonthAbbreviations_islamic:alias {  // same as MonthNames (no data)
+        "ar/MonthNames_islamic"
+    }   
+    // Civil is identical other than in calculations
+    Eras_islamic-civil:alias {
+        "ar/Eras_islamic"
+    }
+    MonthNames_islamic-civil:alias {
+        "ar/MonthNames_islamic"
+    }
+    MonthAbbreviations_islamic-civil:alias {
+        "ar/MonthAbbreviations_islamic"
+    }
+
 }

Index: ar_AE.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ar_AE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ar_AE.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ar_AE.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,7 +7,4 @@
 
 ar_AE {
     Version{"2.0"}
-//    LocaleString { "ar_AE" }
-//    ShortCountry { "ARE" }
-    LocaleID:int { 0x3801 }
 }

Index: ar_BH.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ar_BH.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ar_BH.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ar_BH.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,7 +7,4 @@
 
 ar_BH {
     Version{"2.0"}
-//    LocaleString { "ar_BH" }
-//    ShortCountry { "BHR" }
-    LocaleID:int { 0x3c01 }
 }

Index: ar_DZ.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ar_DZ.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ar_DZ.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ar_DZ.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,7 +7,19 @@
 
 ar_DZ {
     Version{"2.0"}
-//    LocaleString { "ar_DZ" }
-//    ShortCountry { "DZA" }
-    LocaleID:int { 0x1401 }
+    NumberElements { 
+        "\u066B",
+        "\u066C",
+        ";",
+        "\u066A",
+        "0",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221E",
+        "\uFFFD",
+        "\u066B",
+        "+",
+    }    
 }

Index: ar_EG.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ar_EG.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ar_EG.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ar_EG.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,7 +7,4 @@
 
 ar_EG {
     Version{"2.0"}
-//    LocaleString { "ar_EG" }
-//    ShortCountry { "EGY" }
-    LocaleID:int { 0x0c01 }
 }

Index: ar_IQ.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ar_IQ.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ar_IQ.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ar_IQ.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -13,7 +13,4 @@
         "#,##0%",
         "#E0",
     }
-//    LocaleString { "ar_IQ" }
-//    ShortCountry { "IRQ" }
-    LocaleID:int { 0x0801 }
 }

Index: ar_JO.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ar_JO.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ar_JO.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ar_JO.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -16,7 +16,6 @@
         "\u0627\u0644\u062C\u0645\u0639\u0629",
         "\u0627\u0644\u0633\u0628\u062A",
     }
-//    LocaleString { "ar_JO" }
     MonthAbbreviations { 
         "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062B\u0627\u0646\u064A",
         "\u0634\u0628\u0627\u0637",
@@ -45,8 +44,6 @@
         "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u062B\u0627\u0646\u064A",
         "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644",
     }
-//    ShortCountry { "JOR" }
-    LocaleID:int { 0x2c01 }
     NumberPatterns { 
         "#,##0.###;#,##0.###-",
         "\u00A4 #,##0.000;\u00A4 #,##0.000-",

Index: ar_KW.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ar_KW.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ar_KW.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ar_KW.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,9 +7,6 @@
 
 ar_KW {
     Version{ "2.0" }
-//    LocaleString { "ar_KW" }
-//    ShortCountry { "KWT" }
-    LocaleID:int { 0x3401 }
     NumberPatterns { 
         "#,##0.###;#,##0.###-",
         "\u00A4 #,##0.000;\u00A4 #,##0.000-",

Index: ar_LB.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ar_LB.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ar_LB.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ar_LB.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -16,7 +16,6 @@
         "\u0627\u0644\u062C\u0645\u0639\u0629",
         "\u0627\u0644\u0633\u0628\u062A",
     }
-//    LocaleString { "ar_LB" }
     MonthAbbreviations { 
         "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062B\u0627\u0646\u064A",
         "\u0634\u0628\u0627\u0637",
@@ -45,6 +44,4 @@
         "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u062B\u0627\u0646\u064A",
         "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644",
     }
-//    ShortCountry { "LBN" }
-    LocaleID:int { 0x3001 }
 }

Index: ar_LY.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ar_LY.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ar_LY.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ar_LY.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -13,7 +13,4 @@
         "#,##0%",
         "#E0",
     }
-//    LocaleString { "ar_LY" }
-//    ShortCountry { "LBY" }
-    LocaleID:int { 0x1001 }
 }

Index: ar_MA.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ar_MA.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ar_MA.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ar_MA.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,7 +7,19 @@
 
 ar_MA {
     Version{ "2.0" }
-//    LocaleString { "ar_MA" }
-//    ShortCountry { "MAR" }
-    LocaleID:int { 0x1801 }
-}
+    NumberElements { 
+        "\u066B",
+        "\u066C",
+        ";",
+        "\u066A",
+        "0",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221E",
+        "\uFFFD",
+        "\u066B",
+        "+",
+    }
+}
\ No newline at end of file

Index: ar_OM.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ar_OM.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ar_OM.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ar_OM.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,7 +7,4 @@
 
 ar_OM {
     Version{"2.0"}
-//    LocaleString { "ar_OM" }
-//    ShortCountry { "OMN" }
-    LocaleID:int { 0x2001 }
 }

Index: ar_QA.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ar_QA.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ar_QA.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ar_QA.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,23 +7,6 @@
 
 ar_QA {
     Version{"2.0"}
-//    LocaleString { "ar_QA" }
-//    ShortCountry { "QAT" }
-    LocaleID:int { 0x4001 }
-    NumberElements {
-        ",",
-        ".",
-        ";",
-        "%",
-        "0",
-        "#",
-        "-",
-        "E",
-        "\u2030",
-        "\u221e",
-        "\ufffd",
-        "."
-    }
     NumberPatterns { 
         "###0.###;###0.###-",
         "\u00a4###0.00;-\u00a4###0.00",

Index: ar_SA.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ar_SA.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ar_SA.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ar_SA.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,23 +7,6 @@
 
 ar_SA {
     Version{"2.0"}
-//    LocaleString { "ar_SA" }
-//    ShortCountry { "SAU" }
-    LocaleID:int { 0x0401 }
-    NumberElements {
-        ",",
-        ".",
-        ";",
-        "%",
-        "0",
-        "#",
-        "-",
-        "E",
-        "\u2030",
-        "\u221e",
-        "\ufffd",
-	"."
-    }
     NumberPatterns { 
         "###0.###;###0.###-",
         "\u00a4###0.00;-\u00a4###0.00",

Index: ar_SY.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ar_SY.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ar_SY.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ar_SY.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -16,7 +16,6 @@
         "\u0627\u0644\u062C\u0645\u0639\u0629",
         "\u0627\u0644\u0633\u0628\u062A",
     }
-//    LocaleString { "ar_SY" }
     MonthAbbreviations { 
         "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062B\u0627\u0646\u064A",
         "\u0634\u0628\u0627\u0637",
@@ -45,25 +44,9 @@
         "\u062A\u0634\u0631\u064A\u0646 \u0627\u0644\u062B\u0627\u0646\u064A",
         "\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644",
     }
-//    ShortCountry { "SYR" }
-    LocaleID:int { 0x2801 }
     DateTimeElements:intvector {
         5,
         1
-    }
-    NumberElements {
-        ",",
-        ".",
-        ";",
-        "%",
-        "0",
-        "#",
-        "-",
-        "E",
-        "\u2030",
-        "\u221e",
-        "\ufffd",
-        "."
     }
     NumberPatterns { 
         "###0.###;###0.###-",

Index: ar_TN.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ar_TN.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ar_TN.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ar_TN.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -8,18 +8,19 @@
 ar_TN {
     Version{ "2.0" }
     NumberElements {
-        ",",
-        ".",
+        "\u066B",
+        "\u066C",
         ";",
-        "%",
+        "\u066A",
         "0",
         "#",
         "-",
         "E",
         "\u2030",
-        "\u221e",
+        "\u221E",
         "\ufffd",
-        "."
+        "\u066B",
+        "+",
     }
     NumberPatterns { 
         "###0.###;###0.###-",
@@ -50,7 +51,4 @@
         "\u0627\u0644\u062C\u0645\u0639\u0629",
         "\u0627\u0644\u0633\u0628\u062A",
     }
-//    LocaleString { "ar_TN" }
-//    ShortCountry { "TUN" }
-    LocaleID:int { 0x1c01 }
-}
+}
\ No newline at end of file

Index: ar_YE.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ar_YE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ar_YE.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ar_YE.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,23 +7,6 @@
 
 ar_YE {
     Version{ "2.0" }
-//    LocaleString { "ar_YE" }
-//    ShortCountry { "YEM" }
-    LocaleID:int { 0x2401 }
-    NumberElements {
-        ",",
-        ".",
-        ";",
-        "%",
-        "0",
-        "#",
-        "-",
-        "E",
-        "\u2030",
-        "\u221e",
-        "\ufffd",
-        "."
-    }
     NumberPatterns { 
         "###0.###;###0.###-",
         "\u00a4###0.00;-\u00a4###0.00",

Index: be.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/be.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- be.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ be.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -10,7 +10,7 @@
 
     // We use UCA collation table optimized for Cyrillic
     // as defined in the Russian locale
-    CollationElements:alias { "ru" }
+    collations:alias { "ru" }
 
     Countries { 
         BY { "\u0411\u0435\u043B\u0430\u0440\u0443\u0441\u044C" }
@@ -55,8 +55,6 @@
     Languages { 
         be { "\u0411\u0435\u043B\u0430\u0440\u0443\u0441\u043A\u0456" }
     }
-    LocaleID:int { 0x23 }
-//    LocaleString { "be" }
     MonthAbbreviations { 
         "\u0441\u0442\u0443",
         "\u043b\u044e\u0442",
@@ -98,18 +96,10 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "bel" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
-    }
+
     LocaleScript{
         "Cyrl",     // Abbreviation 
     }

Index: be_BY.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/be_BY.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- be_BY.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ be_BY.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,13 +7,10 @@
 
 be_BY {
     Version{ "2.0" }
-//    LocaleString { "be_BY" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "\u00A4#,##0;-\u00A4#,##0",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "BLR" }
-    LocaleID:int { 0x0423 }
 }

Index: bg.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/bg.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bg.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ bg.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -8,11 +8,254 @@
 bg {
     // We use UCA collation table optimized for Cyrillic
     // as defined in the Russian locale
-    CollationElements:alias { "ru" }
+    collations:alias { "ru" }
 
     Version{ "2.0" }
-    Countries { 
+    Countries {
+        AD { "\u0410\u043D\u0434\u043E\u0440\u0430" }
+        AE { "\u041E\u0431\u0435\u0434\u0438\u043D\u0435\u043D\u0438 \u0410\u0440\u0430\u0431\u0441\u043A\u0438 \u0415\u043C\u0438\u0440\u0441\u0442\u0432\u0430" }
+        AF { "\u0410\u0444\u0433\u0430\u043D\u0438\u0441\u0442\u0430\u043D" }
+        AG { "\u0410\u043D\u0442\u0438\u0433\u0443\u0430 \u0438 \u0411\u0430\u0440\u0431\u0443\u0434\u0430" }
+        AI { "\u0410\u043D\u0433\u0443\u0438\u043B\u0430" }
+        AL { "\u0410\u043B\u0431\u0430\u043D\u0438\u044F" }
+        AM { "\u0410\u0440\u043C\u0435\u043D\u0438\u044F" }
+        AN { "\u0425\u043E\u043B\u0430\u043D\u0434\u0441\u043A\u0438 \u0410\u043D\u0442\u0438\u043B\u0438" }
+        AO { "\u0410\u043D\u0433\u043E\u043B\u0430" }
+        AQ { "\u0410\u043D\u0442\u0430\u0440\u043A\u0442\u0438\u043A\u0430" }
+        AR { "\u0410\u0440\u0436\u0435\u043D\u0442\u0438\u043D\u0430" }
+        AS { "\u0410\u043C\u0435\u0440\u0438\u043A\u0430\u043D\u0441\u043A\u043E \u0421\u0430\u043C\u043E\u0430" }
+        AT { "\u0410\u0432\u0441\u0442\u0440\u0438\u044F" }
+        AU { "\u0410\u0432\u0441\u0442\u0440\u0430\u043B\u0438\u044F" }
+        AW { "\u0410\u0440\u0443\u0431\u0430" }
+        AZ { "\u0410\u0437\u0435\u0440\u0431\u0430\u0439\u0434\u0436\u0430\u043D" }
+        BA { "\u0411\u043E\u0441\u043D\u0430 \u0438 \u0425\u0435\u0440\u0446\u0435\u0433\u043E\u0432\u0438\u043D\u0430" }
+        BB { "\u0411\u0430\u0440\u0431\u0430\u0434\u043E\u0441" }
+        BD { "\u0411\u0430\u043D\u0433\u043B\u0430\u0434\u0435\u0448" }
+        BE { "\u0411\u0435\u043B\u0433\u0438\u044F" }
+        BF { "\u0411\u0443\u0440\u043A\u0438\u043D\u0430 \u0424\u0430\u0441\u043E" }
         BG { "\u0411\u044A\u043B\u0433\u0430\u0440\u0438\u044F" }
+        BH { "\u0411\u0430\u0445\u0440\u0435\u0439\u043D" }
+        BI { "\u0411\u0443\u0440\u0443\u043D\u0434\u0438" }
+        BJ { "\u0411\u0435\u043D\u0438\u043D" }
+        BM { "\u0411\u0435\u0440\u043C\u0443\u0434\u0430" }
+        BN { "\u0411\u0440\u0443\u043D\u0435\u0439 \u0414\u0430\u0440\u0443\u0441\u0430\u043B\u0430\u043C" }
+        BO { "\u0411\u043E\u043B\u0438\u0432\u0438\u044F" }
+        BR { "\u0411\u0440\u0430\u0437\u0438\u043B\u0438\u044F" }
+        BS { "\u0411\u0430\u0445\u0430\u043C\u0438" }
+        BT { "\u0411\u0443\u0442\u0430\u043D" }
+        BV { "\u041E\u0441\u0442\u0440\u043E\u0432 \u0411\u0443\u0432\u0435" }
+        BW { "\u0411\u043E\u0442\u0441\u0443\u0430\u043D\u0430" }
+        BY { "\u0411\u0435\u043B\u0430\u0440\u0443\u0441" }
+        BZ { "\u0411\u0435\u043B\u0438\u0437" }
+        CA { "\u041A\u0430\u043D\u0430\u0434\u0430" }
+        CC { "\u041A\u043E\u043A\u043E\u0441\u043E\u0432\u0438 (\u041A\u0438\u0439\u043B\u0438\u043D\u0433) \u043E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        CD { "\u0414\u0435\u043C\u043E\u043A\u0440\u0430\u0442\u0438\u0447\u043D\u0430 \u0420\u0435\u043F\u0443\u0431\u043B\u0438\u043A\u0430 \u041A\u043E\u043D\u0433\u043E" }
+        CF { "\u0426\u0435\u043D\u0442\u0440\u0430\u043B\u043D\u043E\u0430\u0444\u0440\u0438\u043A\u0430\u043D\u0441\u043A\u0430 \u0420\u0435\u043F\u0443\u0431\u043B\u0438\u043A\u0430" }
+        CG { "\u041A\u043E\u043D\u0433\u043E" }
+        CH { "\u0428\u0432\u0435\u0439\u0446\u0430\u0440\u0438\u044F" }
+        CI { "\u041A\u043E\u0442 \u0434'\u0418\u0432\u043E\u0430\u0440" }
+        CK { "\u041E\u0441\u0442\u0440\u043E\u0432\u0438 \u041A\u0443\u043A" }
+        CL { "\u0427\u0438\u043B\u0438" }
+        CM { "\u041A\u0430\u043C\u0435\u0440\u0443\u043D" }
+        CN { "\u041A\u0438\u0442\u0430\u0439" }
+        CO { "\u041A\u043E\u043B\u0443\u043C\u0431\u0438\u044F" }
+        CR { "\u041A\u043E\u0441\u0442\u0430 \u0420\u0438\u043A\u0430" }
+        CU { "\u041A\u0443\u0431\u0430" }
+        CV { "\u041A\u0430\u0431\u043E \u0412\u0435\u0440\u0434\u0435" }
+        CX { "\u041E\u0441\u0442\u0440\u043E\u0432 \u041A\u0440\u0438\u0441\u0442\u043C\u0430\u0441" }
+        CY { "\u041A\u0438\u043F\u044A\u0440" }
+        CZ { "\u0427\u0435\u0448\u043A\u0430 \u0420\u0435\u043F\u0443\u0431\u043B\u0438\u043A\u0430" }
+        DE { "\u0413\u0435\u0440\u043C\u0430\u043D\u0438\u044F" }
+        DJ { "\u0414\u0436\u0438\u0431\u0443\u0442\u0438" }
+        DK { "\u0414\u0430\u043D\u0438\u044F" }
+        DM { "\u0414\u043E\u043C\u0438\u043D\u0438\u043A\u0430" }
+        DO { "\u0414\u043E\u043C\u0438\u043D\u0438\u043A\u0430\u043D\u0441\u043A\u0430 \u0420\u0435\u043F\u0443\u0431\u043B\u0438\u043A\u0430" }
+        DZ { "\u0410\u043B\u0436\u0438\u0440" }
+        EC { "\u0415\u043A\u0432\u0430\u0434\u043E\u0440" }
+        EE { "\u0415\u0441\u0442\u043E\u043D\u0438\u044F" }
+        EG { "\u0415\u0433\u0438\u043F\u0435\u0442" }
+        EH { "\u0417\u0430\u043F\u0430\u0434\u043D\u0430 \u0421\u0430\u0445\u0430\u0440\u0430" }
+        ER { "\u0415\u0440\u0438\u0442\u0440\u0435\u044F" }
+        ES { "\u0418\u0441\u043F\u0430\u043D\u0438\u044F" }
+        ET { "\u0415\u0442\u0438\u043E\u043F\u0438\u044F" }
+        FI { "\u0424\u0438\u043D\u043B\u0430\u043D\u0434\u0438\u044F" }
+        FJ { "\u0424\u0438\u0434\u0436\u0438" }
+        FK { "\u0424\u043E\u043B\u043A\u043B\u0435\u043D\u0434\u0441\u043A\u0438 \u043E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        FM { "\u041C\u0438\u043A\u0440\u043E\u043D\u0435\u0437\u0438\u044F, \u041E\u0431\u0435\u0434\u0438\u043D\u0435\u043D\u0438 \u0429\u0430\u0442\u0438" }
+        FO { "\u0424\u0430\u0440\u044C\u043E\u0440\u0441\u043A\u0438 \u043E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        FR { "\u0424\u0440\u0430\u043D\u0446\u0438\u044F" }
+        GA { "\u0413\u0430\u0431\u043E\u043D" }
+        GB { "\u041E\u0431\u0435\u0434\u0438\u043D\u0435\u043D\u043E \u043A\u0440\u0430\u043B\u0441\u0442\u0432\u043E" }
+        GD { "\u0413\u0440\u0435\u043D\u0430\u0434\u0430" }
+        GE { "\u0413\u0440\u0443\u0437\u0438\u044F" }
+        GF { "\u0424\u0440\u0435\u043D\u0441\u043A\u0430 \u0413\u0432\u0438\u0430\u043D\u0430" }
+        GH { "\u0413\u0430\u043D\u0430" }
+        GI { "\u0413\u0438\u0431\u0440\u0430\u043B\u0442\u0430\u0440" }
+        GL { "\u0413\u0440\u0435\u043D\u043B\u0430\u043D\u0434\u0438\u044F" }
+        GM { "\u0413\u0430\u043C\u0431\u0438\u044F" }
+        GN { "\u0413\u0432\u0438\u043D\u0435\u044F" }
+        GP { "\u0413\u0432\u0430\u0434\u0435\u043B\u0443\u043F\u0430" }
+        GQ { "\u0415\u043A\u0432\u0430\u0442\u043E\u0440\u0438\u0430\u043B\u043D\u0430 \u0413\u0432\u0438\u043D\u0435\u044F" }
+        GR { "\u0413\u044A\u0440\u0446\u0438\u044F" }
+        GS { "\u042E\u0436\u043D\u0430 \u0414\u0436\u043E\u0440\u0434\u0436\u0438\u044F \u0438 \u042E\u0436\u043D\u0438 \u0421\u0430\u043D\u0434\u0432\u0438\u0447\u0435\u0432\u0438 \u041E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        GT { "\u0413\u0432\u0430\u0442\u0435\u043C\u0430\u043B\u0430" }
+        GU { "\u0413\u0443\u0430\u043C" }
+        GW { "\u0413\u0432\u0438\u043D\u0435\u044F-\u0411\u0438\u0441\u0430\u0443" }
+        GY { "\u0413\u0432\u0438\u0430\u043D\u0430" }
+        HK { "\u0425\u043E\u043D\u0433-\u041A\u043E\u043D\u0433 \u041E.\u0410.\u0420. \u043D\u0430 \u041A\u0438\u0442\u0430\u0439" }
+        HM { "\u041E\u0441\u0442\u0440\u043E\u0432 \u0425\u044A\u0440\u0434 \u0438 \u041E\u0441\u0442\u0440\u043E\u0432\u0438 \u041C\u0430\u043A\u0434\u043E\u043D\u0430\u043B\u0434" }
+        HN { "\u0425\u043E\u043D\u0434\u0443\u0440\u0430\u0441" }
+        HR { "\u0425\u044A\u0440\u0432\u0430\u0442\u0441\u043A\u0430" }
+        HT { "\u0425\u0430\u0438\u0442\u0438" }
+        HU { "\u0423\u043D\u0433\u0430\u0440\u0438\u044F" }
+        ID { "\u0418\u043D\u0434\u043E\u043D\u0435\u0437\u0438\u044F" }
+        IE { "\u0418\u0440\u043B\u0430\u043D\u0434\u0438\u044F" }
+        IL { "\u0418\u0437\u0440\u0430\u0435\u043B" }
+        IN { "\u0418\u043D\u0434\u0438\u044F" }
+        IO { "\u0411\u0440\u0438\u0442\u0430\u043D\u0441\u043A\u0438 \u0442\u0435\u0440\u0438\u0442\u043E\u0440\u0438\u0438 \u0432 \u0418\u043D\u0434\u0438\u0439\u0441\u043A\u0438\u044F \u043E\u043A\u0435\u0430\u043D" }
+        IQ { "\u0418\u0440\u0430\u043A" }
+        IR { "\u0418\u0440\u0430\u043D, \u0418\u0441\u043B\u044F\u043C\u0441\u043A\u0430 \u0440\u0435\u043F\u0443\u0431\u043B\u0438\u043A\u0430" }
+        IS { "\u0418\u0441\u043B\u0430\u043D\u0434\u0438\u044F" }
+        IT { "\u0418\u0442\u0430\u043B\u0438\u044F" }
+        JM { "\u042F\u043C\u0430\u0439\u043A\u0430" }
+        JO { "\u0419\u043E\u0440\u0434\u0430\u043D\u0438\u044F" }
+        JP { "\u042F\u043F\u043E\u043D\u0438\u044F" }
+        KE { "\u041A\u0435\u043D\u0438\u044F" }
+        KG { "\u041A\u0438\u0440\u0433\u0438\u0437\u0441\u0442\u0430\u043D" }
+        KH { "\u041A\u0430\u043C\u0431\u043E\u0434\u0436\u0430" }
+        KI { "\u041A\u0438\u0440\u0438\u0431\u0430\u0442\u0438" }
+        KM { "\u041A\u043E\u043C\u043E\u0440\u0438" }
+        KN { "\u0421\u0435\u0439\u043D\u0442 \u041A\u0438\u0442\u0441 \u0438 \u041D\u0435\u0432\u0438\u0441" }
+        KP { "\u041A\u043E\u0440\u0435\u044F, \u0421\u0435\u0432\u0435\u0440\u043D\u0430" }
+        KR { "\u041A\u043E\u0440\u0435\u044F, \u042E\u0436\u043D\u0430" }
+        KW { "\u041A\u0443\u0432\u0435\u0439\u0442" }
+        KY { "\u041A\u0430\u0439\u043C\u0430\u043D\u043E\u0432\u0438 \u043E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        KZ { "\u041A\u0430\u0437\u0430\u0445\u0441\u0442\u0430\u043D" }
+        LA { "\u041D\u0430\u0440\u043E\u0434\u043D\u0430 \u0414\u0435\u043C\u043E\u043A\u0440\u0430\u0442\u0438\u0447\u043D\u0430 \u0420\u0435\u043F\u0443\u0431\u043B\u0438\u043A\u0430 \u041B\u0430\u043E\u0441" }
+        LB { "\u041B\u0438\u0432\u0430\u043D" }
+        LC { "\u0421\u0435\u0439\u043D\u0442 \u041B\u0443\u0441\u0438\u044F" }
+        LI { "\u041B\u0438\u0445\u0442\u0435\u043D\u0449\u0430\u0439\u043D" }
+        LK { "\u0428\u0440\u0438 \u041B\u0430\u043D\u043A\u0430" }
+        LR { "\u041B\u0438\u0431\u0435\u0440\u0438\u044F" }
+        LS { "\u041B\u0435\u0441\u043E\u0442\u043E" }
+        LT { "\u041B\u0438\u0442\u0432\u0430" }
+        LU { "\u041B\u044E\u043A\u0441\u0435\u043C\u0431\u0443\u0440\u0433" }
+        LV { "\u041B\u0430\u0442\u0432\u0438\u044F" }
+        LY { "\u041B\u0438\u0431\u0438\u0439\u0441\u043A\u0430 \u0410\u0440\u0430\u0431\u0441\u043A\u0430 \u0414\u0436\u0430\u043C\u0430\u0445\u0438\u0440\u0438\u044F" }
+        MA { "\u041C\u0430\u0440\u043E\u043A\u043E" }
+        MC { "\u041C\u043E\u043D\u0430\u043A\u043E" }
+        MD { "\u041C\u043E\u043B\u0434\u043E\u0432\u0430, \u0420\u0435\u043F\u0443\u0431\u043B\u0438\u043A\u0430" }
+        MG { "\u041C\u0430\u0434\u0430\u0433\u0430\u0441\u043A\u0430\u0440" }
+        MH { "\u041C\u0430\u0440\u0448\u0430\u043B\u043E\u0432\u0438 \u041E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        MK { "\u041C\u0430\u043A\u0435\u0434\u043E\u043D\u0438\u044F, \u0420\u0435\u043F\u0443\u0431\u043B\u0438\u043A\u0430" }
+        ML { "\u041C\u0430\u043B\u0438" }
+        MM { "\u041C\u0438\u0430\u043D\u043C\u0430\u0440" }
+        MN { "\u041C\u043E\u043D\u0433\u043E\u043B\u0438\u044F" }
+        MO { "\u041C\u0430\u043A\u0430\u043E \u041E.\u0410.\u0420. \u043D\u0430 \u041A\u0438\u0442\u0430\u0439" }
+        MP { "\u0421\u0435\u0432\u0435\u0440\u043D\u0438 \u041C\u0430\u0440\u0438\u0430\u043D\u0441\u043A\u0438 \u041E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        MQ { "\u041C\u0430\u0440\u0442\u0438\u043D\u0438\u043A\u0430" }
+        MR { "\u041C\u0430\u0432\u0440\u0438\u0442\u0430\u043D\u0438\u044F" }
+        MS { "\u041C\u043E\u043D\u0441\u0435\u0440\u0430\u0442" }
+        MT { "\u041C\u0430\u043B\u0442\u0430" }
+        MU { "\u041C\u0430\u0432\u0440\u0438\u0446\u0438\u0439" }
+        MV { "\u041C\u0430\u043B\u0434\u0438\u0432\u0438" }
+        MW { "\u041C\u0430\u043B\u0430\u0432\u0438" }
+        MX { "\u041C\u0435\u043A\u0441\u0438\u043A\u043E" }
+        MY { "\u041C\u0430\u043B\u0430\u0439\u0437\u0438\u044F" }
+        MZ { "\u041C\u043E\u0437\u0430\u043C\u0431\u0438\u043A" }
+        NA { "\u041D\u0430\u043C\u0438\u0431\u0438\u044F" }
+        NC { "\u041D\u043E\u0432\u0430 \u041A\u0430\u043B\u0435\u0434\u043E\u043D\u0438\u044F" }
+        NE { "\u041D\u0438\u0433\u0435\u0440" }
+        NF { "\u041E\u0441\u0442\u0440\u043E\u0432 \u041D\u043E\u0440\u0444\u043E\u043B\u043A" }
+        NG { "\u041D\u0438\u0433\u0435\u0440\u0438\u044F" }
+        NI { "\u041D\u0438\u043A\u0430\u0440\u0430\u0433\u0443\u0430" }
+        NL { "\u0425\u043E\u043B\u0430\u043D\u0434\u0438\u044F" }
+        NO { "\u041D\u043E\u0440\u0432\u0435\u0433\u0438\u044F" }
+        NP { "\u041D\u0435\u043F\u0430\u043B" }
+        NR { "\u041D\u0430\u0443\u0440\u0443" }
+        NU { "\u041D\u0438\u0443\u0435" }
+        NZ { "\u041D\u043E\u0432\u0430 \u0417\u0435\u043B\u0430\u043D\u0434\u0438\u044F" }
+        OM { "\u041E\u043C\u0430\u043D" }
+        PA { "\u041F\u0430\u043D\u0430\u043C\u0430" }
+        PE { "\u041F\u0435\u0440\u0443" }
+        PF { "\u0424\u0440\u0435\u043D\u0441\u043A\u0430 \u041F\u043E\u043B\u0438\u043D\u0435\u0437\u0438\u044F" }
+        PG { "\u041F\u0430\u043F\u0443\u0430 \u041D\u043E\u0432\u0430 \u0413\u0432\u0438\u043D\u0435\u044F" }
+        PH { "\u0424\u0438\u043B\u0438\u043F\u0438\u043D\u0438" }
+        PK { "\u041F\u0430\u043A\u0438\u0441\u0442\u0430\u043D" }
+        PL { "\u041F\u043E\u043B\u0448\u0430" }
+        PM { "\u0421\u0435\u043D \u041F\u0438\u0435\u0440 \u0438 \u041C\u0438\u0433\u0435\u043B\u043E\u043D" }
+        PN { "\u041F\u0438\u0442\u043A\u0430\u0439\u0440\u043D" }
+        PR { "\u041F\u0443\u0435\u0440\u0442\u043E \u0420\u0438\u043A\u043E" }
+        PS { "\u041F\u0430\u043B\u0435\u0441\u0442\u0438\u043D\u0441\u043A\u0438 \u0442\u0435\u0440\u0438\u0442\u043E\u0440\u0438\u0438" }
+        PT { "\u041F\u043E\u0440\u0442\u0443\u0433\u0430\u043B\u0438\u044F" }
+        PW { "\u041F\u0430\u043B\u0430\u0443" }
+        PY { "\u041F\u0430\u0440\u0430\u0433\u0432\u0430\u0439" }
+        QA { "\u041A\u0430\u0442\u0430\u0440" }
+        RE { "\u0420\u0435\u044E\u043D\u0438\u044A\u043D" }
+        RO { "\u0420\u0443\u043C\u044A\u043D\u0438\u044F" }
+        RU { "\u0420\u0443\u0441\u043A\u0430 \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044F" }
+        RW { "\u0420\u0443\u0430\u043D\u0434\u0430" }
+        SA { "\u0421\u0430\u0443\u0434\u0438\u0442\u0441\u043A\u0430 \u0410\u0440\u0430\u0431\u0438\u044F" }
+        SB { "\u0421\u043E\u043B\u043E\u043C\u043E\u043D\u043E\u0432\u0438 \u041E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        SC { "\u0421\u0435\u0439\u0448\u0435\u043B\u0438" }
+        SD { "\u0421\u0443\u0434\u0430\u043D" }
+        SE { "\u0428\u0432\u0435\u0446\u0438\u044F" }
+        SG { "\u0421\u0438\u043D\u0433\u0430\u043F\u0443\u0440" }
+        SH { "\u0421\u0432\u0435\u0442\u0430 \u0415\u043B\u0435\u043D\u0430" }
+        SI { "\u0421\u043B\u043E\u0432\u0435\u043D\u0438\u044F" }
+        SJ { "\u0421\u0432\u0430\u043B\u0431\u0430\u0440\u0434 \u0438 \u042F\u043D \u041C\u0430\u0439\u0435\u043D" }
+        SK { "\u0421\u043B\u043E\u0432\u0430\u043A\u0438\u044F" }
+        SL { "\u0421\u0438\u0435\u0440\u0430 \u041B\u0435\u043E\u043D\u0435" }
+        SM { "\u0421\u0430\u043D \u041C\u0430\u0440\u0438\u043D\u043E" }
+        SN { "\u0421\u0435\u043D\u0435\u0433\u0430\u043B" }
+        SO { "\u0421\u043E\u043C\u0430\u043B\u0438\u044F" }
+        SR { "\u0421\u0443\u0440\u0438\u043D\u0430\u043C" }
+        ST { "\u0421\u0430\u043E \u0422\u043E\u043C\u0435 \u0438 \u041F\u0440\u0438\u043D\u0446\u0438\u043F\u0435" }
+        SV { "\u0415\u043B \u0421\u0430\u043B\u0432\u0430\u0434\u043E\u0440" }
+        SY { "\u0421\u0438\u0440\u0438\u0439\u0441\u043A\u0430 \u0410\u0440\u0430\u0431\u0441\u043A\u0430 \u0420\u0435\u043F\u0443\u0431\u043B\u0438\u043A\u0430" }    // alternate form { "\u0421\u0438\u0440\u0438\u044F" }
+        SZ { "\u0421\u0443\u0430\u0437\u0438\u043B\u0435\u043D\u0434" }
+        TC { "\u041E\u0441\u0442\u0440\u043E\u0432\u0438 \u0422\u0443\u0440\u043A\u0441 \u0438 \u041A\u0430\u0439\u043A\u043E\u0441" }
+        TD { "\u0427\u0430\u0434" }
+        TF { "\u0424\u0440\u0435\u043D\u0441\u043A\u0438 \u042E\u0436\u043D\u0438 \u0422\u0435\u0440\u0438\u0442\u043E\u0440\u0438\u0438" }
+        TG { "\u0422\u043E\u0433\u043E" }
+        TH { "\u0422\u0430\u0439\u043B\u0430\u043D\u0434" }
+        TJ { "\u0422\u0430\u0434\u0436\u0438\u043A\u0438\u0441\u0442\u0430\u043D" }
+        TK { "\u0422\u043E\u043A\u0435\u043B\u0430\u0443" }
+        TL { "\u0418\u0437\u0442\u043E\u0447\u0435\u043D \u0422\u0438\u043C\u043E\u0440" }
+        TM { "\u0422\u0443\u0440\u043A\u043C\u0435\u043D\u0438\u0441\u0442\u0430\u043D" }
+        TN { "\u0422\u0443\u043D\u0438\u0441" }
+        TO { "\u0422\u043E\u043D\u0433\u0430" }
+        TR { "\u0422\u0443\u0440\u0446\u0438\u044F" }
+        TT { "\u0422\u0440\u0438\u043D\u0438\u0434\u0430\u0434 \u0438 \u0422\u043E\u0431\u0430\u0433\u043E" }
+        TV { "\u0422\u0443\u0432\u0430\u043B\u0443" }
+        TW { "\u0422\u0430\u0439\u0432\u0430\u043D, \u041F\u0440\u043E\u0432\u0438\u043D\u0446\u0438\u044F \u043D\u0430 \u041A\u0438\u0442\u0430\u0439" }
+        TZ { "\u0422\u0430\u043D\u0437\u0430\u043D\u0438\u044F" }
+        UA { "\u0423\u043A\u0440\u0430\u0439\u043D\u0430" }
+        UG { "\u0423\u0433\u0430\u043D\u0434\u0430" }
+        UM { "\u0421\u0410\u0429 - \u0432\u044A\u043D\u0448\u043D\u0438 \u043E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        US { "\u0421\u0410\u0429" }
+        UY { "\u0423\u0440\u0443\u0433\u0432\u0430\u0439" }
+        UZ { "\u0423\u0437\u0431\u0435\u043A\u0438\u0441\u0442\u0430\u043D" }
+        VA { "\u0421\u0432\u0435\u0449\u0435\u043D\u043E \u043C\u043E\u0440\u0435 (\u0412\u0430\u0442\u0438\u043A\u0430\u043D\u0441\u043A\u0430 \u0434\u044A\u0440\u0436\u0430\u0432\u0430)" }
+        VC { "\u0421\u0435\u0439\u043D\u0442 \u0412\u0438\u043D\u0441\u044A\u043D\u0442 \u0438 \u0413\u0440\u0435\u043D\u0430\u0434\u0438\u043D\u0438" }
+        VE { "\u0412\u0435\u043D\u0435\u0446\u0443\u0435\u043B\u0430" }
+        VG { "\u0411\u0440\u0438\u0442\u0430\u043D\u0441\u043A\u0438 \u0412\u0438\u0440\u0434\u0436\u0438\u043D\u0441\u043A\u0438 \u041E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        VI { "\u0421\u0410\u0429, \u0412\u0438\u0440\u0434\u0436\u0438\u043D\u0441\u043A\u0438 \u041E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        VN { "\u0412\u0438\u0435\u0442\u043D\u0430\u043C" }
+        VU { "\u0412\u0430\u043D\u0443\u0430\u0442\u0443" }
+        WF { "\u0423\u043E\u043B\u0438\u0441 \u0438 \u0424\u0443\u0442\u0443\u043D\u0430" }
+        WS { "\u0421\u0430\u043C\u043E\u0430" }
+        YE { "\u0419\u0435\u043C\u0435\u043D" }
+        YT { "\u041C\u0435\u0439\u043E\u0442" }
+        YU { "\u042E\u0433\u043E\u0441\u043B\u0430\u0432\u0438\u044F" }
+        ZA { "\u042E\u0436\u043D\u0430 \u0410\u0444\u0440\u0438\u043A\u0430" }
+        ZM { "\u0417\u0430\u043C\u0431\u0438\u044F" }
+        ZW { "\u0417\u0438\u043C\u0431\u0430\u0431\u0432\u0435" }
+    }
+    // Currency display names
+    Currencies {
+        BGL { "\u043B\u0432", "BGL" }
+        BGN { "\u043B\u0432.", "BGN" }
     }
     DateTimePatterns { 
         "HH:mm:ss z",
@@ -21,7 +264,7 @@
         "HH:mm",
         "dd MMMM yyyy, EEEE",
         "dd MMMM yyyy",
-        "dd.MM.yy",
+        "dd.MM.yyyy",
         "dd.MM.yy",
         "{1} {0}",
     }
@@ -51,11 +294,46 @@
         "\u043F\u0440.\u043D.\u0435.",
         "\u043D.\u0435.",
     }
-    Languages { 
-        bg { "\u0431\u044A\u043B\u0433\u0430\u0440\u0441\u043A\u0438" }
+    ExemplarCharacters { "[\u0430-\u044c \u044e\u044f\u0463\u046b]" }
+    Languages {
+        ar { "\u0410\u0440\u0430\u0431\u0441\u043A\u0438" }
+        //bg { "\u0431\u044A\u043B\u0433\u0430\u0440\u0441\u043A\u0438" } // Old value
+        bg { "\u0411\u044A\u043B\u0433\u0430\u0440\u0441\u043A\u0438" }
+        cs { "\u0427\u0435\u0448\u043A\u0438" }
+        da { "\u0414\u0430\u0442\u0441\u043A\u0438" }
+        de { "\u041D\u0435\u043C\u0441\u043A\u0438" }
+        el { "\u0413\u0440\u044A\u0446\u043A\u0438" }
+        en { "\u0410\u043D\u0433\u043B\u0438\u0439\u0441\u043A\u0438" }
+        es { "\u0418\u0441\u043F\u0430\u043D\u0441\u043A\u0438" }
+        et { "\u0415\u0441\u0442\u043E\u043D\u0441\u043A\u0438" }
+        fi { "\u0424\u0438\u043D\u0441\u043A\u0438" }
+        fr { "\u0424\u0440\u0435\u043D\u0441\u043A\u0438" }
+        he { "\u0418\u0432\u0440\u0438\u0442" }
+        hr { "\u0425\u044A\u0440\u0432\u0430\u0442\u0441\u043A\u0438" }
+        hu { "\u0423\u043D\u0433\u0430\u0440\u0441\u043A\u0438" }
+        it { "\u0418\u0442\u0430\u043B\u0438\u0430\u043D\u0441\u043A\u0438" }
+        ja { "\u042F\u043F\u043E\u043D\u0441\u043A\u0438" }
+        ko { "\u041A\u043E\u0440\u0435\u0439\u0441\u043A\u0438" }
+        lt { "\u041B\u0438\u0442\u043E\u0432\u0441\u043A\u0438" }
+        lv { "\u041B\u0430\u0442\u0432\u0438\u0439\u0441\u043A\u0438" }
+        nl { "\u0425\u043E\u043B\u0430\u043D\u0434\u0441\u043A\u0438" }
+        no { "\u041D\u043E\u0440\u0432\u0435\u0436\u043A\u0438" }
+        pl { "\u041F\u043E\u043B\u0441\u043A\u0438" }
+        pt { "\u041F\u043E\u0440\u0442\u0443\u0433\u0430\u043B\u0441\u043A\u0438" }
+        ro { "\u0420\u0443\u043C\u044A\u043D\u0441\u043A\u0438" }
+        ru { "\u0420\u0443\u0441\u043A\u0438" }
+        sk { "\u0421\u043B\u043E\u0432\u0430\u0448\u043A\u0438" }
+        sl { "\u0421\u043B\u043E\u0432\u0435\u043D\u0441\u043A\u0438" }
+        sv { "\u0428\u0432\u0435\u0434\u0441\u043A\u0438" }
+        tr { "\u0422\u0443\u0440\u0441\u043A\u0438" }
+        zh { "\u041A\u0438\u0442\u0430\u0439\u0441\u043A\u0438" }
+        //zh_cn { "\u041A\u0438\u0442\u0430\u0439\u0441\u043A\u0438 (\u041E\u043F\u0440\u043E\u0441\u0442\u0435\u043D)" }
+        //zh_tw { "\u041A\u0438\u0442\u0430\u0439\u0441\u043A\u0438 (\u0422\u0440\u0430\u0434\u0438\u0446\u0438\u043E\u043D\u0435\u043D)" }
     }
-    LocaleID:int { 0x02 }
-//    LocaleString { "bg" }
+    LocaleScript{
+        "Cyrl",     // Abbreviation 
+    }
+    localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
     MonthAbbreviations { 
         "\u044f\u043d.",
         "\u0444\u0435\u0432.",
@@ -97,28 +375,7 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "bul" }
-    localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
-//        {
-//            "Europe/Sofia",
-//        }
-    }
-    LocaleScript{
-        "Cyrl",     // Abbreviation 
-    }
-    ExemplarCharacters { "[\u0430-\u044c \u044e\u044f\u0463\u046b]" }
 
-    // Currency display names
-    Currencies {
-        BGL { "\u043B\u0432", "BGL" }
-    }
-}
+}
\ No newline at end of file

Index: bg_BG.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/bg_BG.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bg_BG.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ bg_BG.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,13 +7,10 @@
 
 bg_BG {
     Version { "2.0" }
-//    LocaleString { "bg_BG" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
-        "\u00A4#,##0.00;-\u00A4#,##0.00",
+        "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "BGR" }
-    LocaleID:int { 0x0402 }
 }

Index: bn.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/bn.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bn.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ bn.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -21,7 +21,7 @@
     DayAbbreviations { 
         "\u09B0\u09AC\u09BF",
         "\u09B8\u09CB\u09AE",
-        "\u09AE\u0999\u0997\u09B2",
+        "\u09ae\u0999\u09cd\u0997\u09b2",
         "\u09AC\u09C1\u09A7",
         "\u09AC\u09C3\u09B9\u09B8\u09CD\u09AA\u09A4\u09BF",
         "\u09B6\u09C1\u0995\u09CD\u09B0",
@@ -30,9 +30,9 @@
     DayNames { 
         "\u09B0\u09AC\u09BF\u09AC\u09BE\u09B0",
         "\u09B8\u09CB\u09AE\u09AC\u09BE\u09B0",
-        "\u09AE\u0999\u0997\u09B2\u09AC\u09BE\u09B0",
+        "\u09ae\u0999\u09cd\u0997\u09b2\u09ac\u09be\u09b0",
         "\u09AC\u09C1\u09A7\u09AC\u09BE\u09B0",
-        "\u09AC\u09C3\u09B9\u09B8\u09CD\u09AA\u09A4\u09BF\u09AC\u09BE\u09B0",
+        "\u09ac\u09c3\u09b9\u09b7\u09cd\u09aa\u09a4\u09bf\u09ac\u09be\u09b0",
         "\u09B6\u09C1\u0995\u09CD\u09B0\u09AC\u09BE\u09B0",
         "\u09B6\u09A8\u09BF\u09AC\u09BE\u09B0",
     }
@@ -64,8 +64,6 @@
         "\u09A8\u09AD\u09C7\u09AE\u09CD\u09AC\u09B0",
         "\u09A1\u09BF\u09B8\u09C7\u09AE\u09CD\u09AC\u09B0",
     }
-    //LocaleString { "bn" }
-    LocaleID:int { 0x45 }
     LocaleScript:array{
         "Beng"
     }

Index: bn_IN.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/bn_IN.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bn_IN.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ bn_IN.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -38,6 +38,4 @@
         "##,##,##0%",
         "#E0",
     }
-//    LocaleString { "bn_IN" }
-    LocaleID:int { 0x0445 }
 }

Index: ca.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ca.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ca.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ca.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -6,15 +6,354 @@
 // ***************************************************************************
 
 ca {
-    Version { "2.0" }
-    CollationElements { 
+    Version { "4.0" }
+    collations {
+      standard { 
         Version { "1.0" }
         Sequence { "[backwards 2]"
         "&C < ch <<< Ch <<< CH"
         "&L < ll <<< l\u00b7l <<< Ll <<< L\u00b7l <<< LL <<< L\u00b7L" }
+      }
     }
     Countries { 
+        AD { "Andorra" }
+        AE { "Uni\u00F3 dels Emirats \u00C0rabs" }
+        AF { "Afganistan" }
+        AI { "Anguilla" }
+        AL { "Alb\u00E0nia" }
+        AM { "Arm\u00E8nia" }
+        AN { "Antilles Holandeses" }
+        AO { "Angola" }
+        AR { "Argentina" }
+        AT { "\u00C2ustria" }
+        AU { "Austr\u00E0lia" }
+        AW { "Aruba" }
+        AZ { "Azerbaidjan" }
+        BA { "B\u00F2snia i Hercegovina" }
+        BB { "Barbados" }
+        BD { "Bangla Desh" }
+        BE { "B\u00E8lgica" }
+        BF { "Burkina Faso" }
+        BG { "Bulg\u00E0ria" }
+        BH { "Bahrain" }
+        BI { "Burundi" }
+        BJ { "Benin" }
+        BM { "Bermudes" }
+        BN { "Brunei" }
+        BO { "Bol\u00EDvia" }
+        BR { "Brasil" }
+        BS { "Bahames" }
+        BT { "Bhutan" }
+        BW { "Botswana" }
+        BY { "Bielor\u00FAssia" }
+        BZ { "Belize" }
+        CA { "Canad\u00E0" }
+        CF { "Rep\u00FAblica Centrafricana" }
+        CG { "Congo" }
+        CH { "Switzerland" }
+        CI { "Costa d'Ivori" }
+        CL { "Xile" }
+        CM { "Camerun" }
+        CN { "Xina" }
+        CO { "Col\u00F2mbia" }
+        CR { "Costa Rica" }
+        CU { "Cuba" }
+        CV { "Cap Verd" }
+        CY { "Xipre" }
+        CZ { "Rep\u00FAblica Txeca" }
+        DE { "Alemanya" }
+        DJ { "Djibouti" }
+        DK { "Dinamarca" }
+        DM { "Dominica" }
+        DO { "Rep\u00FAblica Dominicana" }
+        DZ { "Alg\u00E8ria" }
+        EC { "Equador" }
+        EE { "Est\u00F2nia" }
+        EG { "Egipte" }
+        EH { "S\u00E0hara Occidental" }
+        ER { "Eritrea" }
         ES { "Espanya" }
+        ET { "Eti\u00F2pia" }
+        FI { "Finl\u00E0ndia" }
+        FJ { "Fiji" }
+        FM { "Micron\u00E8sia" }
+        FR { "Fran\u00E7a" }
+        GA { "Gabon" }
+        GB { "Regne Unit" }
+        GE { "Ge\u00F2rgia" }
+        GF { "Guaiana Francesa" }
+        GH { "Ghana" }
+        GM { "G\u00E0mbia" }
+        GN { "Guinea" }
+        GP { "Guadeloupe" }
+        GQ { "Guinea Equatorial" }
+        GR { "Gr\u00E8cia" }
+        GT { "Guatemala" }
+        GW { "Guinea Bissau" }
+        GY { "Guyana" }
+        HK { "Hong Kong" }
+        HN { "Hondures" }
+        HR { "Cro\u00E0cia" }
+        HT { "Hait\u00ED" }
+        HU { "Hongria" }
+        ID { "Indon\u00E8sia" }
+        IE { "Irlanda" }
+        IL { "Israel" }
+        IN { "\u00CDndia" }
+        IQ { "Iraq" }
+        IR { "Iran" }
+        IS { "Isl\u00E0ndia" }
+        IT { "It\u00E0lia" }
+        JM { "Jamaica" }
+        JO { "Jord\u00E0nia" }
+        JP { "Jap\u00F3" }
+        KE { "Kenya" }
+        KG { "Kirgizistan" }
+        KH { "Cambodja" }
+        KI { "Kiribati" }
+        KM { "Comores" }
+        KP { "Corea del Nord" }
+        KR { "Corea del Sud" }
+        KW { "Kuwait" }
+        KZ { "Kazakhstan" }
+        LA { "Laos" }
+        LB { "L\u00EDban" }
+        LI { "Liechtenstein" }
+        LK { "Sri Lanka" }
+        LR { "Lib\u00E8ria" }
+        LS { "Lesotho" }
+        LT { "Litu\u00E0nia" }
+        LU { "Luxemburg" }
+        LV { "Let\u00F2nia" }
+        LY { "L\u00EDbia" }
+        MA { "Marroc" }
+        MC { "M\u00F2naco" }
+        MD { "Mold\u00E0via" }
+        MG { "Madagascar" }
+        MK { "Maced\u00F2nia" }
+        ML { "Mali" }
+        MM { "Myanmar" }
+        MN { "Mong\u00F2lia" }
+        MQ { "Martinica" }
+        MR { "Maurit\u00E0nia" }
+        MS { "Montserrat" }
+        MT { "Malta" }
+        MU { "Maurici" }
+        MX { "M\u00E8xic" }
+        MY { "Mal\u00E0isia" }
+        MZ { "Mo\u00E7ambic" }
+        NA { "Nam\u00EDbia" }
+        NC { "Nova Caled\u00F2nia" }
+        NE { "N\u00EDger" }
+        NG { "Nig\u00E8ria" }
+        NI { "Nicaragua" }
+        NL { "Pa\u00EFsos Baixos" }
+        NO { "Noruega" }
+        NP { "Nepal" }
+        NU { "Niue" }
+        NZ { "Nova Zelanda" }
+        OM { "Oman" }
+        PA { "Panam\u00E0" }
+        PE { "Per\u00FA" }
+        PF { "Polin\u00E8sia Francesa" }
+        PG { "Papua Nova Guinea" }
+        PH { "Filipines" }
+        PK { "Pakistan" }
+        PL { "Pol\u00F2nia" }
+        PR { "Puerto Rico" }
+        PT { "Portugal" }
+        PY { "Paraguai" }
+        QA { "Qatar" }
+        RO { "Romania" }
+        RU { "R\u00FAssia" }
+        RW { "Rwanda" }
+        SA { "Ar\u00E0bia Saud\u00ED" }
+        SC { "Seychelles" }
+        SD { "Sudan" }
+        SE { "Su\u00E8cia" }
+        SG { "Singapur" }
+        SI { "Eslov\u00E8nia" }
+        SK { "Eslov\u00E0quia" }
+        SL { "Sierra Leone" }
+        SN { "Senegal" }
+        SO { "Som\u00E0lia" }
+        SP { "S\u00E8rbia" }
+        SR { "Surinam" }
+        SV { "El Salvador" }
+        SY { "S\u00EDria" }
+        SZ { "Swazil\u00E0ndia" }
+        TD { "Txad" }
+        TF { "Territoris Meridionals Francesos" }
+        TG { "Togo" }
+        TH { "Tail\u00E0ndia" }
+        TJ { "Tadjikistan" }
+        TK { "Tokelau" }
+        TL { "Timor" }
+        TM { "Turkmenistan" }
+        TN { "Tun\u00EDsia" }
+        TO { "Tonga" }
+        TR { "Turquia" }
+        TT { "Trinitat i Tobago" }
+        TW { "Taiwan" }
+        TZ { "Tanz\u00E0nia" }
+        UA { "Ucra\u00EFna" }
+        UG { "Uganda" }
+        US { "Estats Units" }
+        UY { "Uruguai" }
+        UZ { "Uzbekistan" }
+        VA { "Vatic\u00E0" }
+        VE { "Vene\u00E7uela" }
+        VG { "Illes Verges Brit\u00E0niques" }
+        VI { "Illes Verges dels USA" }
+        VN { "Vietnam" }
+        VU { "Vanuatu" }
+        YE { "Iemen" }
+        YT { "Mayotte" }
+        YU { "Iugosl\u00E0via" }
+        ZA { "Sud-\u00E0frica" }
+        ZM { "Z\u00E0mbia" }
+        ZW { "Zimbabwe" }
+    }
+    Languages { 
+        aa { "\u00E0far" }
+        ab { "abkhaz" }
+        af { "afrikaans" }
+        am { "amh\u00E0ric" }
+        ar { "\u00E2rab" }
+        as { "assam\u00E8s" }
+        ay { "aimara" }
+        az { "\u00E0zeri" }
+        ba { "baixkir" }
+        be { "bielor\u00FAs" }
+        bg { "b\u00FAlgar" }
+        bh { "bihari" }
+        bi { "bislama" }
+        bn { "bengal\u00ED" }
+        bo { "tibet\u00E0" }
+        br { "bret\u00F3" }
+        ca { "catal\u00E0" }
+        co { "cors" }
+        cs { "txec" }
+        cy { "gal\u00B7l\u00E8s" }
+        da { "dan\u00E8s" }
+        de { "alemany" }
+        dz { "bhutan\u00E8s" }
+        el { "grec" }
+        en { "angl\u00E8s" }
+        eo { "esperanto" }
+        es { "espanyol" }
+        et { "estoni\u00E0" }
+        eu { "basc" }
+        fa { "persa" }
+        fi { "fin\u00E8s" }
+        fj { "fiji\u00E0" }
+        fo { "fero\u00E8s" }
+        fr { "franc\u00E8s" }
+        fy { "fris\u00F3" }
+        ga { "irland\u00E8s" }
+        gd { "escoc\u00E8s" }
+        gl { "gallec" }
+        gn { "guaran\u00ED" }
+        gu { "gujarati" }
+        ha { "hausa" }
+        he { "hebreu" }
+        hi { "hindi" }
+        hr { "croat" }
+        hu { "hongar\u00E8s" }
+        hy { "armeni" }
+        ia { "interlingua" }
+        id { "indonesi" }
+        ie { "interlingue" }
+        ik { "inupiak" }
+        is { "island\u00E8s" }
+        it { "itali\u00E0" }
+        iu { "inuktitut" }
+        ja { "japon\u00E8s" }
+        jv { "javan\u00E8s" }
+        ka { "georgi\u00E0" }
+        kk { "kazakh" }
+        kl { "greenland\u00E8s" }
+        km { "cambodj\u00E0" }
+        kn { "kannada" }
+        ko { "core\u00E0" }
+        ks { "caixmiri" }
+        ku { "kurd" }
+        ky { "kirgu\u00EDs" }
+        la { "llat\u00ED" }
+        ln { "lingala" }
+        lo { "laosi\u00E0" }
+        lt { "litu\u00E0" }
+        lv { "let\u00F3" }
+        mg { "malgaix" }
+        mi { "maori" }
+        mk { "macedoni" }
+        ml { "malaialam" }
+        mn { "mongol" }
+        mo { "moldau" }
+        mr { "marathi" }
+        ms { "malai" }
+        mt { "malt\u00E8s" }
+        my { "birm\u00E0" }
+        na { "nauru\u00E0" }
+        ne { "nepal\u00E8s" }
+        nl { "neerland\u00E8s" }
+        no { "noruec" }
+        oc { "occit\u00E0" }
+        om { "oromo (afan)" }
+        or { "oriya" }
+        pa { "panjabi" }
+        pl { "polon\u00E8s" }
+        ps { "paixto" }
+        pt { "portugu\u00E8s" }
+        qu { "qu\u00E8txua" }
+        rm { "retorom\u00E0nic" }
+        rn { "kirundi" }
+        ro { "roman\u00E8s" }
+        ru { "rus" }
+        rw { "kinyarwanda" }
+        sa { "s\u00E0nscrit" }
+        sd { "sindhi" }
+        sg { "sango" }
+        sh { "serbo-croat" }
+        si { "sinhal\u00E8s" }
+        sk { "eslovac" }
+        sl { "eslov\u00E8" }
+        sm { "samo\u00E0" }
+        sn { "shona" }
+        so { "somali" }
+        sq { "alban\u00E8s" }
+        sr { "serbi" }
+        ss { "siswati" }
+        st { "sotho" }
+        su { "sundan\u00E8s" }
+        sv { "suec" }
+        sw { "swahili" }
+        ta { "t\u00E0mil" }
+        te { "telugu" }
+        tg { "tadjik" }
+        th { "thai" }
+        ti { "tigrinya" }
+        tk { "turcman" }
+        tl { "tag\u00E0log" }
+        tn { "tswana" }
+        to { "tonga" }
+        tr { "turc" }
+        ts { "tsonga" }
+        tt { "t\u00E0tar" }
+        tw { "twi" }
+        ug { "uigur" }
+        uk { "ucra\u00EFn\u00E8s" }
+        ur { "urd\u00FA" }
+        uz { "uzbek" }
+        vi { "vietnamita" }
+        vo { "volapuk" }
+        wo { "w\u00F2lof" }
+        xh { "xosa" }
+        yi { "jiddish" }
+        yo { "ioruba" }
+        za { "zhuang" }
+        zh { "xin\u00E9s" }
+        zu { "zulu" }
     }
     DateTimePatterns { 
         "HH:mm:ss z",
@@ -45,11 +384,6 @@
         "divendres",
         "dissabte",
     }
-    Languages { 
-        ca { "catal\u00E0" }
-    }
-    LocaleID:int { 0x03 }
-//    LocaleString { "ca" }
     MonthAbbreviations { 
         "gen.",
         "feb.",
@@ -91,21 +425,13 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "cat" }
     localPatternChars { "GuMtkHmsSEDFwWahKzUe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
+
+    LocaleScript{ 
+                "Latn",  // ISO 15924 Name 
     }
-//    LocaleScript{ 
-//                "Latn",  // ISO 15924 Name 
-//    }
     ExemplarCharacters { "[a-z \u00e9 \u00ed \u00f3 \u00fa \u00e0 \u00e8 \u00f2 \u00ef \u00fc \u0140 \u00e7 \u00f1]" }
 
 

Index: ca_ES.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ca_ES.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ca_ES.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ ca_ES.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -17,7 +17,4 @@
         "#,##0%",
         "#E0",
     }
-//    LocaleString { "ca_ES" }
-//    ShortCountry { "ESP" }
-    LocaleID:int { 0x0403 }
 }

Index: cs.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/cs.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cs.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ cs.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -6,19 +6,260 @@
 // ***************************************************************************
 
 cs {
-    Version{ "2.0" }
+    Version{ "3.0" }
     AmPmMarkers { 
         "dop.",
         "odp.",
     }
-    CollationElements { 
+    collations {
+      standard { 
         Version { "1.0" }
         Sequence { "& C < c\u030C <<< C\u030C& H < "
         "ch <<< cH <<< Ch <<< CH & R < r\u030C <<< R\u030C& S < s\u030C <<< S\u030C& Z < z\u030C <<<"
         " Z\u030C" }
+      }
     }
-    Countries { 
+    Countries {
+        Fallback{"en"}
+        //AD { "Andorra" }
+        AE { "Spojen\u00E9 arabsk\u00E9 emir\u00E1ty" }
+        AF { "Afgh\u00E1nist\u00E1n" }
+        AG { "Antigua a Barbuda" }
+        AI { "Anguila" }
+        AL { "Alb\u00E1nie" }
+        AM { "Arm\u00E9nie" }
+        AN { "Nizozemsk\u00E9 Antily" }
+        //AO { "Angola" }
+        AQ { "Antarktida" }
+        //AR { "Argentina" }
+        AS { "Americk\u00E1 Samoa" }
+        AT { "Rakousko" }
+        AU { "Austr\u00E1lie" }
+        //AW { "Aruba" }
+        AZ { "\u00C1zerb\u00E1jd\u017E\u00E1n" }
+        BA { "Bosna a Hercegovina" }
+        //BB { "Barbados" }
+        BD { "Banglad\u00E9\u0161" }
+        BE { "Belgie" }
+        //BF { "Burkina Faso" }
+        BG { "Bulharsko" }
+        BH { "Bahrajn" }
+        //BI { "Burundi" }
+        //BJ { "Benin" }
+        BM { "Bermudy" }
+        BN { "Brunej Darussalam" }
+        BO { "Bol\u00EDvie" }
+        BR { "Braz\u00EDlie" }
+        BS { "Bahamy" }
+        BT { "Bh\u00FAt\u00E1n" }
+        BV { "Ostrov Bouvet" }
+        //BW { "Botswana" }
+        BY { "B\u011Blorusko" }
+        //BZ { "Belize" }
+        CA { "Kanada" }
+        CC { "Kokosov\u00E9 ostrovy" }
+        CD { "Kongo, demokratick\u00E1 republika" }
+        CF { "St\u0159edoafrick\u00E1 republika" }
+        CG { "Kongo" }
+        CH { "\u0160v\u00FDcarsko" }
+        CI { "Pob\u0159e\u017E\u00ED slonoviny" }
+        CK { "Cookovy ostrovy" }
+        //CL { "Chile" }
+        CM { "Kamerun" }
+        CN { "\u010C\u00EDna" }
+        CO { "Kolumbie" }
+        CR { "Kostarika" }
+        CU { "Kuba" }
+        CV { "Kapverdy" }
+        CX { "V\u00E1no\u010Dn\u00ED ostrovy" }
+        CY { "Kypr" }
         CZ { "\u010Cesk\u00E1 republika" }
+        DE { "N\u011Bmecko" }
+        DJ { "D\u017Eibuti" }
+        DK { "D\u00E1nsko" }
+        DM { "Dominika" }
+        DO { "Dominik\u00E1nsk\u00E1 republika" }
+        DZ { "Al\u017E\u00EDrsko" }
+        EC { "Ekv\u00E1dor" }
+        EE { "Estonsko" }
+        //EG { "Egypt" }
+        EH { "Z\u00E1padn\u00ED Sahara" }
+        //ER { "Eritrea" }
+        ES { "\u0160pan\u011Blsko" }
+        ET { "Etiopie" }
+        FI { "Finsko" }
+        FJ { "Fid\u017Ei" }
+        FK { "Falklandsk\u00E9 ostrovy" }
+        FM { "Mikron\u00E9sie, federativn\u00ED st\u00E1t" }
+        FO { "Faersk\u00E9 ostrovy" }
+        FR { "Francie" }
+        //GA { "Gabon" }
+        GB { "Velk\u00E1 Brit\u00E1nie" }
+        //GD { "Grenada" }
+        GE { "Gruzie" }
+        GF { "Francouzsk\u00E1 Guyana" }
+        //GH { "Ghana" }
+        //GI { "Gibraltar" }
+        GL { "Gr\u00F3nsko" }
+        GM { "Gambie" }
+        //GN { "Guinea" }
+        //GP { "Guadeloupe" }
+        GQ { "Rovn\u00EDkov\u00E1 Guinea" }
+        GR { "\u0158ecko" }
+        GS { "Ji\u017En\u00ED Georgie a Ji\u017En\u00ED Sandwichovy ostrovy" }
+        //GT { "Guatemala" }
+        //GU { "Guam" }
+        //GW { "Guinea-Bissau" }
+        //GY { "Guyana" }
+        HK { "Hongkong, zvl\u00E1\u0161tn\u00ED administrativn\u00ED oblast \u010C\u00EDny" }
+        HM { "Ostrovy Heard a McDonald" }
+        //HN { "Honduras" }
+        HR { "Chorvatsko" }
+        //HT { "Haiti" }
+        HU { "Ma\u010Farsko" }
+        ID { "Indon\u00E9sie" }
+        IE { "Irsko" }
+        IL { "Izrael" }
+        IN { "Indie" }
+        IO { "Britsk\u00E9 \u00FAzem\u00ED v Indick\u00E9m oce\u00E1nu" }
+        IQ { "Ir\u00E1k" }
+        IR { "\u00CDr\u00E1n" }
+        IS { "Island" }
+        IT { "It\u00E1lie" }
+        JM { "Jamajka" }
+        JO { "Jord\u00E1nsko" }
+        JP { "Japonsko" }
+        KE { "Ke\u0148a" }
+        KG { "Kyrgyzst\u00E1n" }
+        KH { "Kambod\u017Ea" }
+        //KI { "Kiribati" }
+        KM { "Komory" }
+        KN { "Svat\u00FD Kitts a Nevis" }
+        KP { "Severn\u00ED Korea" } // alternate name { "Korea, lidov\u011B demokratick\u00E1 republika" }
+        KR { "Ji\u017En\u00ED Korea" } // alternate name { "Korea, republika" }
+        KW { "Kuvajt" }
+        KY { "Kajmansk\u00E9 ostrovy" }
+        KZ { "Kazachst\u00E1n" }
+        LA { "Lidov\u011B demokratick\u00E1 republika Laos" }
+        LB { "Libanon" }
+        LC { "Svat\u00E1 Lucie" }
+        LI { "Lichten\u0161tejnsko" }
+        LK { "Sr\u00ED Lanka" }
+        LR { "Lib\u00E9rie" }
+        //LS { "Lesotho" }
+        LT { "Litva" }
+        LU { "Lucembursko" }
+        LV { "Loty\u0161sko" }
+        LY { "Libye" }    // alternate name { "Libye" }
+        MA { "Maroko" }
+        MC { "Monako" }
+        MD { "Moldavsko, republika" }
+        MG { "Madagaskar" }
+        MH { "Marshallovy ostrovy" }
+        //MK { "Makedonie, republika" }
+        //ML { "Mali" }
+        MM { "Myanmar (Burma)" }
+        MN { "Mongolsko" }
+        //MO { "\u010C\u00EDna, zvl\u00E1\u0161tn\u00ED administrativn\u00ED oblast \u010C\u00EDny" }
+        MP { "Severn\u00ED Mariany" }
+        MQ { "Martinik" }
+        MR { "Maurit\u00E1nie" }
+        //MS { "Montserrat" }
+        //MT { "Malta" }
+        MU { "Mauricius" }
+        MV { "Maladivy" }
+        //MW { "Malawi" }
+        MX { "Mexiko" }
+        MY { "Malajsie" }
+        MZ { "Mosambik" }
+        NA { "Namibie" }
+        NC { "Nov\u00E1 Kaledonie" }
+        //NE { "Niger" }
+        NF { "Norfolk" }
+        NG { "Nig\u00E9rie" }
+        NI { "Nikaragua" }
+        NL { "Nizozemsko" }
+        NO { "Norsko" }
+        NP { "Nep\u00E1l" }
+        //NR { "Nauru" }
+        //NU { "Niue" }
+        NZ { "Nov\u00FD Z\u00E9land" }
+        OM { "Om\u00E1n" }
+        //PA { "Panama" }
+        //PE { "Peru" }
+        PF { "Francouzsk\u00E1 Polyn\u00E9sie" }
+        PG { "Papua-Nov\u00E1 Guinea" }
+        PH { "Filip\u00EDny" }
+        PK { "P\u00E1kist\u00E1n" }
+        PL { "Polsko" }
+        PM { "Svat\u00FD Pierre a Miquelon" }
+        //PN { "Pitcairn" }
+        PR { "Portoriko" }
+        //PS { "Palestinsk\u00E9 \u00FAzem\u00ED" }
+        PT { "Portugalsko" }
+        //PW { "Palau" }
+        //PY { "Paraguay" }
+        QA { "Katar" }
+        //RE { "R\u00E9union" }
+        RO { "Rumunsko" }
+        RU { "Rusko" }
+        //RW { "Rwanda" }
+        SA { "Sa\u00FAdsk\u00E1 Ar\u00E1bie" }
+        SB { "\u0160alamounovy ostrovy" }
+        SC { "Seychely" }
+        SD { "S\u00FAd\u00E1n" }
+        SE { "\u0160v\u00E9dsko" }
+        SG { "Singapur" }
+        SH { "Svat\u00E1 Helena" }
+        SI { "Slovinsko" }
+        SJ { "Svalbard a Jan Mayen" }
+        SK { "Slovensko" }
+        //SL { "Sierra Leone" }
+        //SM { "San Marino" }
+        //SN { "Senegal" }
+        SO { "Som\u00E1lsko" }
+        SR { "Surinam" }
+        ST { "Svat\u00FD Tom\u00E1\u0161" }
+        //SV { "El Salvador" }
+        SY { "S\u00FDrie" }    // alternate name { "S\u00FDrie" }
+        SZ { "Svazijsko" }
+        TC { "Ostrovy Caicos a Turks" }
+        TD { "\u010Cad" }
+        TF { "Francouzsk\u00E1 ji\u017En\u00ED teritoria" }
+        //TG { "Togo" }
+        TH { "Thajsko" }
+        TJ { "T\u00E1d\u017Eikist\u00E1n" }
+        //TK { "Tokelau" }
+        TL { "V\u00FDchodn\u00ED Timor" }
+        TM { "Turkmenist\u00E1n" }
+        TN { "Tunisko" }
+        //TO { "Tonga" }
+        TR { "Turecko" }
+        TT { "Trinidad a Tobago" }
+        //TV { "Tuvalu" }
+        TW { "Tchaj-wan" }
+        TZ { "Tanzanie" }
+        UA { "Ukrajina" }
+        //UG { "Uganda" }
+        UM { "Men\u0161\u00ED odlehl\u00E9 ostrovy USA" }
+        US { "Spojen\u00E9 st\u00E1ty" }
+        //UY { "Uruguay" }
+        UZ { "Uzbekist\u00E1n" }
+        VA { "Svat\u00FD stolec" }
+        VC { "Svat\u00FD Vincent a Grenadiny" }
+        //VE { "Venezuela" }
+        VG { "Britsk\u00E9 Panensk\u00E9 ostrovy" }
+        VI { "Americk\u00E9 Panensk\u00E9 ostrovy" }
+        //VN { "Vietnam" }
+        //VU { "Vanuatu" }
+        WF { "Wallis a Futuna" }
+        //WS { "Samoa" }
+        YE { "Jemen" }
+        //YT { "Mayotte" }
+        YU { "Jugosl\u00E1vie" }
+        ZA { "Ji\u017En\u00ED Afrika" }
+        ZM { "Zambie" }
+        //ZW { "Zimbabwe" }
     }
     DateTimePatterns { 
         "H:mm:ss z",
@@ -31,6 +272,10 @@
         "d.M.yy",
         "{1} {0}",
     }
+    DateTimeElements:intvector {
+        2,
+        1, // "Minimal Days in First Week" is unknown. Root value used instead
+    }
     DayAbbreviations { 
         "ne",
         "po",
@@ -53,11 +298,178 @@
         "p\u0159.Kr.",
         "po Kr.",
     }
-    Languages { 
-        cs { "\u010De\u0161tina" }
+    Languages {
+        aa { "Afar\u0161tina" }
+        ab { "Abch\u00E1z\u0161tina" }
+        af { "Afrik\u00E1n\u0161tina" }
+        am { "Amhar\u0161tina" }
+        ar { "Arab\u0161tina" }
+        as { "Assam\u00E9\u0161tina" }
+        ay { "Aym\u00E1r\u0161tina" }
+        az { "Azerbajd\u017E\u00E1n\u0161tina" }
+
+        ba { "Baskir\u0161tina" }
+        be { "B\u011Bloru\u0161tina" }
+        bg { "Bulhar\u0161tina" }
+        bh { "Bihar\u0161tina" }
+        bi { "Bisl\u00E1m\u0161tina" }
+        bn { "Beng\u00E1l\u0161tina" }
+        bo { "Tibet\u0161tina" }
+        br { "Breta\u0148\u0161tina" }
+
+        ca { "Katal\u00E1n\u0161tina" }
+        co { "Korsi\u010Dtina" }
+        cs { "\u010Ce\u0161tina" }
+        cy { "Vel\u0161tina" }
+
+        da { "D\u00E1n\u0161tina" }
+        de { "N\u011Bm\u010Dina" }
+        dz { "Bh\u00FAt\u00E1n\u0161tina" }
+
+        el { "\u0158e\u010Dtina" }
+        en { "Angli\u010Dtina" }
+        eo { "Esperanto" }
+        es { "\u0160pan\u011Bl\u0161tina" }
+        et { "Eston\u0161tina" }
+        eu { "Baski\u010Dtina" } 
+
+        fa { "Per\u0161tina" }
+        fi { "Fin\u0161tina" }
+        fj { "Fid\u017Ei" }
+        fo { "Faer\u0161tina" }
+        fr { "Francouz\u0161tina" }
+        fy { "Fr\u00ED\u0161tina" }
+
+        ga { "Ir\u0161tina" }
+        gd { "Skotsk\u00E1 gal\u0161tina" }
+        gl { "Hali\u010D\u0161tina" }
+        gn { "Guaran\u0161tina" }
+        gu { "Gujarat\u0161tina" }
+
+        ha { "Hausa" }
+        he { "Hebrej\u0161tina" }
+        hi { "Hind\u0161tina" }
+        hr { "Chorvat\u0161tina" }
+        hu { "Ma\u010Far\u0161tina" }
+        hy { "Arm\u00E9n\u0161tina" }
+
+        
+        ia { "Interlingua" }
+        ie { "Interlingue" }
+        id { "Indon\u00E9\u0161tina" }
+        ik { "Inupiak\u0161tina" }
+        //in { "Indon\u00E9\u0161tina" }
+        is { "Island\u0161tina" }
+        it { "Ital\u0161tina" }
+        iu { "Inuktitut\u0161tina" }
+        // iw { "Hebrej\u0161tina" }
+
+        ja { "Japon\u0161tina" }
+        //ji { "Jidi\u0161" }
+        jv { "Jav\u00E1n\u0161tina" }
+        
+
+        ka { "Gruz\u00EDn\u0161tina" }
+        kk { "Kazach\u0161tina" }
+        kl { "Gr\u00F3n\u0161tina" }
+        km { "Kambod\u017E\u0161tina" }
+        kn { "Kannad\u0161tina" }      
+        ko { "Korej\u0161tina" }
+        ks { "Ka\u0161m\u00EDr\u0161tina" }
+        ku { "Kurd\u0161tina" }
+        ky { "Kirgiz\u0161tina" }
+
+        la { "Latina" }
+        ln { "Lingal\u0161tina" }
+        lo { "Lao\u0161tina" }
+        lt { "Litev\u0161tina" }
+        lv { "Loty\u0161tina" }
+
+        mg { "Malga\u0161tina" }
+        mi { "Maor\u0161tina" }
+        mk { "Makedon\u0161tina" }
+        ml { "Malabar\u0161tina" }
+        mn { "Mongol\u0161tina" }
+        mo { "Moldav\u0161tina" }
+        mr { "Marathi" }
+        ms { "Malaj\u0161tina" }
+        mt { "Malt\u0161tina" }
+        my { "Barm\u0161tina" }
+
+        na { "Nauru" }
+        nl { "Holand\u0161tina" }
+        ne { "Nep\u00E1l\u0161tina" }
+        no { "Nor\u0161tina" }
+
+        oc { "Occitan" }
+        om { "Oromo (Afan)" }
+        or { "Oriya" }
+
+        pa { "Pa\u0148d\u017E\u00E1b\u0161tina" }
+        pl { "Pol\u0161tina" }        
+        ps { "Pashto (Pushto)" }
+        pt { "Portugal\u0161tina" }
+
+        qu { "Ke\u010Du\u00E1n\u0161tina" }
+
+        rm { "R\u00E9torom\u00E1n\u0161tina" }
+        rn { "Kirundi" }
+        ro { "Rumun\u0161tina" }
+        ru { "Ru\u0161tina" }
+        rw { "Kinyarwand\u0161tina" }
+
+        sa { "Sanskrt" }
+        sd { "Sindhi" }
+        sg { "Sangho" }
+        sh { "Srbochorvat\u0161tina" }
+        si { "Sinh\u00E1l\u0161tina" }
+        sk { "Sloven\u0161tina" }
+        sl { "Slovin\u0161tina" }
+        sm { "Samoy\u0161tina" }
+        sn { "Shona" }
+        so { "Som\u00E1l\u0161tina" }
+        sq { "Alb\u00E1n\u0161tina" }
+        sr { "Srb\u0161tina" }
+        ss { "Siswat\u0161tina" }
+        st { "Sesotho" }
+        su { "Sundan\u0161tina" }
+        sv { "\u0160v\u00E9d\u0161tina" }
+        sw { "Svahil\u0161tina" }
+
+        ta { "Tamil\u0161tina" }
+        te { "Telug\u0161tina" }
+        tg { "T\u00E1d\u017Ei\u010Dtina" }
+        th { "Thaj\u0161tina" }
+        ti { "Tigrinij\u0161tina" }
+        tk { "Turkmen\u0161tina" }
+        tl { "Tagalog" }
+        tn { "Setswan\u0161tina" }
+        to { "Tonga" }
+        tr { "Ture\u010Dtina" }
+        ts { "Tsonga" }
+        tt { "Tatar\u0161tina" }
+        tw { "Twi" }
+
+        ug { "Uighur\u0161tina" }
+        uk { "Ukrajin\u0161tina" }
+        ur { "Urd\u0161tina" }
+        uz { "Uzbe\u010Dtina" }
+
+        vi { "Vietnam\u0161tina" }
+        vo { "Volapuk" }
+
+        wo { "Wolof" }
+
+        xh { "Xhosa" }
+
+        yi { "Jidi\u0161" }
+        yo { "Yoruba" }
+
+        za { "Zhuang" }
+        zu { "Zulu" }
+        zh { "\u010C\u00EDn\u0161tina" }
+       
     }
-    LocaleID:int { 0x05 }
-//    LocaleString { "cs" }
     MonthAbbreviations { 
         "I",
         "II",
@@ -99,25 +511,17 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "ces" }
     localPatternChars { "GuMtkHmsSEDFwWahKzUe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
+
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
     }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
     ExemplarCharacters { "[a-z \u00fd \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u011b \u016f \u010d \u010f \u0148 \u0159 \u0161 \u0165 \u017e]" }
 
     // Currency display names
     Currencies {
         CZK { "K\u010D", "CZK" }
     }
-}
+}
\ No newline at end of file

Index: cs_CZ.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/cs_CZ.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cs_CZ.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ cs_CZ.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,13 +7,10 @@
 
 cs_CZ {
     Version{ "2.0" }
-//    LocaleString { "cs_CZ" }
     NumberPatterns { 
         "#,##0.##;-#,##0.##",
         "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "CZE" }
-    LocaleID:int { 0x0405 }
 }

Index: da.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/da.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- da.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ da.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -1,4 +1,4 @@
-// ***************************************************************************
+// ***************************************************************************
 // *
 // *   Copyright (C) 1997-2003, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
@@ -6,15 +6,267 @@
 // ***************************************************************************
 
 da {
-    Version {"2.0"}
-    CollationElements { 
-        Version { "2.0" }
-        Sequence { "& A < \u00E6\u0301 <<< \u00C6\u0301& Z < \u00E6 <<< \u00C6<<"
-        " a\u0308 <<< A\u0308 < \u00F8 <<< \u00D8 << o\u0308 <<< O\u0308 << o\u030B<<< O\u030B< a\u030A"
-        " <<< A\u030A<<< aa <<< aA <<< Aa <<< AA & V<<< w<<< W & Y << u\u0308 <<< U\u0308 &D < \u00F0<<< \u00D0 &T < \u00FE<<< \u00DE" }
+    Version {"3.0"}
+    collations {
+      standard { 
+        Version { "3.0" }
+        Sequence { 
+            "[casefirst upper]"
+            "&D<<đ<<<Đ<<ð<<<Ð "
+            "&t<<<þ/h"
+            "&T<<<Þ/H"
+            "&Y<<ü<<<Ü<<ű<<<Ű"
+            "&[before 1]ʒ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å"
+            "<<<aa<<<Aa<<< AA"
+        }
+      }
     }
-    Countries { 
+
+    Countries {
+        Fallback{ "en"}
+        //AD { "Andorra" }
+        AE { "Forenede Arabiske Emirater" }
+        //AF { "Afghanistan" }
+        AG { "Antigua og Barbuda" }
+        //AI { "Anguilla" }
+        AL { "Albanien" }
+        AM { "Armenien" }
+        AN { "Hollandske Antiller" }
+        //AO { "Angola" }
+        AQ { "Antarktis" }
+        //AR { "Argentina" }
+        AS { "Amerikansk Samoa" }
+        AT { "\u00D8strig" }
+        AU { "Australien" }
+        //AW { "Aruba" }
+        AZ { "Aserbajdsjan" }
+        BA { "Bosnien-Hercegovina" }
+        //BB { "Barbados" }
+        //BD { "Bangladesh" }
+        BE { "Belgien" }
+        //BF { "Burkina Faso" }
+        BG { "Bulgarien" }
+        //BH { "Bahrain" }
+        //BI { "Burundi" }
+        //BJ { "Benin" }
+        //BM { "Bermuda" }
+        BN { "Brunei Darussalam" }
+        //BO { "Bolivia" }
+        BR { "Brasilien" }
+        //BS { "Bahamas" }
+        //BT { "Bhutan" }
+        //BV { "Bouvet Island" }
+        //BW { "Botswana" }
+        BY { "Hviderusland" }
+        //BZ { "Belize" }
+        //CA { "Canada" }
+        CC { "Cocos (Keeling) Islands" }
+        CD { "Den Demokratiske Republik Congo" }
+        CF { "Centralafrikanske Republik" }
+        //CG { "Congo" }
+        CH { "Schweiz" }
+        CI { "Elfenbenskysten" }
+        //CK { "Cook Islands" }
+        //CL { "Chile" }
+        CM { "Cameroun" }
+        CN { "Kina" }
+        //CO { "Colombia" }
+        //CR { "Costa Rica" }
+        //CU { "Cuba" }
+        CV { "Kap Verde" }
+        CX { "Jule\u00F8en" }
+        CY { "Cypern" }
+        CZ { "Tjekkiet" }
+        DE { "Tyskland" }
+        //DJ { "Djibouti" }
         DK { "Danmark" }
+        //DM { "Dominica" }
+        DO { "Den Dominikanske Republik" }
+        DZ { "Algeriet" }
+        //EC { "Ecuador" }
+        EE { "Estland" }
+        EG { "Egypten" }
+        EH { "Vestsahara" }
+        //ER { "Eritrea" }
+        ES { "Spanien" }
+        ET { "Etiopien" }
+        //FI { "Finland" }
+        //FJ { "Fiji" }
+        FK { "Falklands\u00F8erne" }
+        FM { "Mikronesiens Forenede Stater" }
+        FO { "F\u00E6r\u00F8erne" }
+        FR { "Frankrig" }
+        //GA { "Gabon" }
+        GB { "Storbritannien" }
+        //GD { "Grenada" }
+        GE { "Georgien" }
+        GF { "Fransk Guyana" }
+        //GH { "Ghana" }
+        //GI { "Gibraltar" }
+        GL { "Gr\u00F8nland" }
+        //GM { "Gambia" }
+        //GN { "Guinea" }
+        //GP { "Guadeloupe" }
+        GQ { "\u00C6kvatorialguinea" }
+        GR { "Gr\u00E6kenland" }
+        GS { "South Georgia og De Sydlige Sandwich\u00F8er" }
+        //GT { "Guatemala" }
+        //GU { "Guam" }
+        //GW { "Guinea-Bissau" }
+        //GY { "Guyana" }
+        //HK { "Hong Kong S.A.R. of China (Special Administrative Region)" }
+        HM { "Heard Island og McDonald Islands" }
+        //HN { "Honduras" }
+        HR { "Kroatien" }
+        //HT { "Haiti" }
+        HU { "Ungarn" }
+        ID { "Indonesien" }
+        IE { "Irland" }
+        //IL { "Israel" }
+        IN { "Indien" }
+        IO { "Det Britiske Territorium i Det Indiske Ocean" }
+        IQ { "Irak" }
+        //IR { "Den Islamiske Republik Iran" }
+        IS { "Island" }
+        IT { "Italien" }
+        //JM { "Jamaica" }
+        //JO { "Jordan" }
+        //JP { "Japan" }
+        //KE { "Kenya" }
+        KG { "Kirgisistan" }
+        KH { "Cambodja" }
+        //KI { "Kiribati" }
+        KM { "Comorerne" }
+        KN { "Saint Kitts og Nevis" }
+        KP { "Nordkorea" }    // alternate name { "Den Demokratiske Folkerepublik Korea" }
+        KR { "Sydkorea" }    // alternate name { "Republikken Korea" }
+        //KW { "Kuwait" }
+        KY { "Cayman\u00F8erne" }
+        KZ { "Kasakhstan" }
+        //LA { "Laos" }
+        LB { "Libanon" }
+        //LC { "Saint Lucia" }
+        //LI { "Liechtenstein" }
+        //LK { "Sri Lanka" }
+        //LR { "Liberia" }
+        //LS { "Lesotho" }
+        LT { "Litauen" }
+        //LU { "Luxembourg" }
+        LV { "Letland" }
+        LY { "Libyen" }
+        MA { "Marokko" }
+        //MC { "Monaco" }
+        MD { "Republikken Moldova" }
+        MG { "Madagaskar" }
+        MH { "Marshall\u00F8erne" }
+        MK { "Republikken Makedonien" }
+        //ML { "Mali" }
+        //MM { "Myanmar" }
+        MN { "Mongoliet" }
+        //MO { "Macao S.A.R. of China (Special Administrative Region)" }
+        MP { "Nordmarianerne" }
+        //MQ { "Martinique" }
+        MR { "Mauretanien" }
+        //MS { "Montserrat" }
+        //MT { "Malta" }
+        //MU { "Mauritius" }
+        MV { "Maldiverne" }
+        //MW { "Malawi" }
+        //MX { "Mexico" }
+        //MY { "Malaysia" }
+        //MZ { "Mozambique" }
+        //NA { "Namibia" }
+        NC { "Ny Caledonien" }
+        //NE { "Niger" }
+        //NF { "Norfolk Island" }
+        //NG { "Nigeria" }
+        //NI { "Nicaragua" }
+        NL { "Holland" }
+        NO { "Norge" }
+        //NP { "Nepal" }
+        //NR { "Nauru" }
+        //NU { "Niue" }
+        //NZ { "New Zealand" }
+        //OM { "Oman" }
+        //PA { "Panama" }
+        //PE { "Peru" }
+        PF { "Fransk Polynesien" }
+        PG { "Papua Ny Guinea" }
+        PH { "Filippinerne" }
+        //PK { "Pakistan" }
+        PL { "Polen" }
+        PM { "Saint Pierre og Miquelon" }
+        //PN { "Pitcairn" }
+        //PR { "Puerto Rico" }
+        PS { "De pal\u00E6stinensiske omr\u00E5der" }
+        //PT { "Portugal" }
+        //PW { "Palau" }
+        //PY { "Paraguay" }
+        //QA { "Qatar" }
+        RE { "Reunion" }
+        RO { "Rum\u00E6nien" }
+        RU { "Rusland" }
+        //RW { "Rwanda" }
+        SA { "Saudi-Arabien" }
+        SB { "Salomon\u00F8erne" }
+        SC { "Seychellerne" }
+        //SD { "Sudan" }
+        SE { "Sverige" }
+        //SG { "Singapore" }
+        SH { "St. Helena" }
+        SI { "Slovenien" }
+        SJ { "Svalbard og Jan Mayen" }
+        SK { "Slovakiet" }
+        //SL { "Sierra Leone" }
+        //SM { "San Marino" }
+        //SN { "Senegal" }
+        //SO { "Somalia" }
+        SR { "Surinam" }
+        ST { "Sao Tome og Principe" }
+        //SV { "El Salvador" }
+        SY { "Syrien" }
+        //SZ { "Swaziland" }
+        //TC { "Turks and Caicos Islands" }
+        TD { "Tchad" }
+        TF { "Franske Besiddelser i Det Sydlige Indiske Ocean" }
+        //TG { "Togo" }
+        //TH { "Thailand" }
+        TJ { "Tadsjikistan" }
+        //TK { "Tokelau" }
+        TL { "\u00D8sttimor" }
+        //TM { "Turkmenistan" }
+        TN { "Tunesien" }
+        //TO { "Tonga" }
+        TR { "Tyrkiet" }
+        TT { "Trinidad og Tobago" }
+        //TV { "Tuvalu" }
+        //TW { "Taiwan" }
+        //TZ { "Tanzania" }
+        //UA { "Ukraine" }
+        //UG { "Uganda" }
+        UM { "De Mindre Amerikanske Overs\u00f8iske \u00d8er" }
+        US { "Amerikas Forenede Stater" }
+        //UY { "Uruguay" }
+        UZ { "Usbekistan" }
+        VA { "Vatikanstaten" }
+        VC { "St. Vincent og Grenadinerne" }
+        //VE { "Venezuela" }
+        VG { "De britiske jomfru\u00F8er" }
+        VI { "De amerikanske jomfru\u00F8er" }
+        //VN { "Vietnam" }
+        //VU { "Vanuatu" }
+        WF { "Wallis og Futuna" }
+        //WS { "Samoa" }
+        //YE { "Yemen" }
+        //YT { "Mayotte" }
+        YU { "Jugoslavien" }
+        ZA { "Sydafrika" }
+        //ZM { "Zambia" }
+        //ZW { "Zimbabwe" }
+    }
+    // Currency display names
+    Currencies {
+        DKK { "kr", "DKK" }
     }
     DateTimeElements:intvector { 
         2,
@@ -25,20 +277,20 @@
         "HH:mm:ss z",
         "HH:mm:ss",
         "HH:mm",
-        "d. MMMM yyyy",
-        "d. MMMM yyyy",
+        "EEEE dd MMMM yyyy",
+        "d. MMM yyyy",
         "dd-MM-yyyy",
         "dd-MM-yy",
         "{1} {0}",
     }
     DayAbbreviations { 
-        "s\u00F8",
-        "ma",
-        "ti",
-        "on",
-        "to",
-        "fr",
-        "l\u00F8",
+        "s\u00F8n",
+        "man",
+        "tir",
+        "ons",
+        "tor",
+        "fre",
+        "l\u00F8r",
     }
     DayNames { 
         "s\u00F8ndag",
@@ -49,11 +301,76 @@
         "fredag",
         "l\u00F8rdag",
     }
-    Languages { 
-        da { "dansk" }
+    Eras { 
+        "f.Kr.",
+        "e.Kr.",
     }
-    LocaleID:int { 0x06 }
-//    LocaleString { "da" }
+    Languages {
+        am { "Amharisk" }
+        ar { "Arabisk" }
+        az { "Aserbajdsjan" }
+        be { "Hviderussisk" }
+        bg { "Bulgarsk" }
+        bn { "Bengalsk" }
+        ca { "Katalansk" }
+        cs { "Tjekkisk" }
+        da { "Dansk" }
+        //da { "dansk" } // Old value
+        de { "Tysk" }
+        el { "Gr\u00E6sk" }
+        en { "Engelsk" }
+        es { "Spansk" }
+        et { "Estisk" }
+        eu { "Baskisk" }
+        fa { "Persisk" }
+        fi { "Finsk" }
+        fo { "F\u00e6r\u00f8sk" }
+        fr { "Fransk" }
+        ga { "Irsk" }
+        gl { "Galicisk" }
+        gu { "Gujaratisk" }
+        haw { "Hawaii" }
+        he { "Hebraisk" }
+        hr { "Kroatisk" }
+        hu { "Ungarsk" }
+        hy { "Armensk" }
+        id { "Indonesisk" }
+        is { "Islandsk" }
+        it { "Italiensk" }
+        ja { "Japansk" }
+        ka { "Georgisk" }
+        kk { "Kasakhisk" }
+        ko { "Koreansk" }
+        kw { "Cornisk" }
+        ku { "Kurdisk" }
+        lt { "Litauisk" }
+        lv { "Lettisk" }
+        mk { "Makedonsk" }
+        mr { "Marathisk" }
+        mt { "Maltesisk" }
+        nl { "Hollandsk" }
+        no { "Norsk" }
+        pl { "Polsk" }
+        pt { "Portugisisk" }
+        ro { "Rum\u00E6nsk" }
+        ru { "Russisk" }
+        sh { "Serbokroatisk" }
+        sk { "Slovakisk" }
+        sl { "Slovensk" }
+        so { "Somalisk" }
+        sq { "Albansk" }
+        sr { "Serbisk" }
+        sv { "Svensk" }
+        ta { "Tamilsk" }
+        th { "Thailandsk" }
+        tr { "Tyrkisk" }
+        uk { "Ukrainsk" }
+        vi { "Vietnamesisk" }
+        zh { "Kinesisk" }
+        //zh_cn { "Kinesisk (Forkortet)" }
+        //zh_tw { "Kinesisk (Uforkortet)" }
+    }
+    localPatternChars { "GuMtkHmsSEDFwWahKzUe" }
     MonthAbbreviations { 
         "jan",
         "feb",
@@ -95,31 +412,35 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "dan" }
-    localPatternChars { "GuMtkHmsSEDFwWahKzUe" }
-    Eras { 
-        "f.Kr.",
-        "e.Kr.",
+    ExemplarCharacters { "[a-z \u00e6 \u00e5 \u00f8 \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u00fd]" }
+    LocaleScript{  
+        "Latn",  // ISO 15924 Name 
     }
-
-    zoneStrings { 
-        {
-            "Europe/Copenhagen",
-            "Central European Time",
-            "MET",
-            "Central European Time (DST)",
-            "MET",
-            "Copenhagen",
-        }
+    SpelloutRules {
+        "-x: minus >>;\n"
+        "nol; en; to; tre; fire; fem; seks; syv; otte; ni;\n"
+        "ti; elleve; tolv; tretten; fjorten; femten; seksten; sytten; atten; nitten;\n"
+        "20: [>>og]tvye;\n"
+        "30: [>>og]tredive;\n"
+        "40: [>>og]fyrre;\n"
+        "50: [>>og]femti;\n"
+        "60: [>>og]seksti;\n"
+        "70: [>>og]syvti;\n"
+        "80: [>>og]otteti;\n"
+        "90: [>>og]niti;\n"
+        "100: et hundrede[>>];\n"
+        "200: << hundrede[>>];\n"
+        "1000: et tusinde[ >>];\n"
+        "2000: << tusinde[ >>];\n"
+        "1,000,000: en million[ >>];\n"
+        "2,000,000: << million[ >>];\n"
+        "1,000,000,000: en milliarde[ >>];\n"
+        "2,000,000,000: << milliarde[ >>];\n"
+        "1,000,000,000,000: en billione[ >>];\n"
+        "2,000,000,000,000: << billione[ >>];\n"
+        "1,000,000,000,000,000: =#,##0=;"
     }
-//    LocaleScript{  
-//        "Latn",  // ISO 15924 Name 
-//    }
-    ExemplarCharacters { "[a-z \u00e6 \u00e5 \u00f8 \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u00fd]" }
 
-    // Currency display names
-    Currencies {
-        DKK { "kr", "DKK" }
-    }
-}
+}
\ No newline at end of file

Index: da_DK.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/da_DK.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- da_DK.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ da_DK.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,13 +7,10 @@
 
 da_DK {
     Version{"2.0"}
-//    LocaleString { "da_DK" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "\u00A4 #,##0.00;\u00A4 -#,##0.00",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "DNK" }
-    LocaleID:int { 0x0406 }
 }

Index: de.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/de.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- de.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ de.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -13,11 +13,11 @@
 // http://www.ifag.de/kartographie/Stagn/Staatennamen.htm
 // Date there: 1999-apr-19
 
-de {
-    Version{ "2.0" }
-
-    "%%PHONEBOOK" { "Telefonbuch-Sortierregeln" }
+// Note 2003-sep-19: The site seems to have moved to
+// http://www.bkg.bund.de/kartographie/stagn/Staatennamen.htm
 
+de {
[...1302 lines suppressed...]
+            chinese   { "Chinesischer Kalender" }
+            gregorian { "Gregorianischer Kalender" }
+        }
+    }
+    Variants{
+        Fallback{"en"}
+        REVISED { "Revidiert" }
+    }
+    zoneStrings { 
+        {
+            "Europe/Berlin", 
+            "Mitteleurop\u00E4ische Zeit", 
+            "MEZ", 
+            "Mitteleurop\u00E4ische Sommerzeit", 
+            "MESZ",
+            "Berlin",
+        }
+    }
+}
\ No newline at end of file

Index: de_AT.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/de_AT.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- de_AT.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ de_AT.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -22,8 +22,6 @@
         "dd.MM.yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x0c07 }
-//    LocaleString { "de_AT" }
     MonthAbbreviations { 
         "J\u00E4n",
         "Feb",
@@ -52,15 +50,5 @@
         "November",
         "Dezember",
     }
-    /* Discarding duplicate data for tag: NumberPatterns */
-//    ShortCountry { "AUT" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
-    }
+
 }

Index: de_BE.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/de_BE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- de_BE.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ de_BE.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -98,4 +98,8 @@
 //        Units { "mm" }
 //    }
 //    LocaleString{ "de_BE" }
+    
+    Currencies {
+        FRF { "FF",  "Franken" }
+    }
 }

Index: de_CH.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/de_CH.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- de_CH.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ de_CH.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -28,8 +28,6 @@
         ZW { "Zimbabwe" }
         GB { "Grossbritannien" }
     }
-    LocaleID:int { 0x0807 }
-//    LocaleString { "de_CH" }
     NumberElements { 
         ".",
         "'",
@@ -43,6 +41,7 @@
         "\u221E",
         "\uFFFD",
         ".",
+        "+",
     }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
@@ -50,14 +49,5 @@
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "CHE" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
-    }
+
 }

Index: de_DE.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/de_DE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- de_DE.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ de_DE.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,13 +7,10 @@
 
 de_DE {
     Version { "2.0" }
-//    LocaleString { "de_DE" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "DEU" }
-    LocaleID:int { 0x0407 }
 }

Index: de_LU.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/de_LU.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- de_LU.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ de_LU.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,15 +7,12 @@
 
 de_LU {
     Version { "2.0" }
-//    LocaleString { "de_LU" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "LUX" }
-    LocaleID:int { 0x1007 }
     DateTimeElements:intvector {
         2,
         1,

Index: de__PHONEBOOK.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/de__PHONEBOOK.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- de__PHONEBOOK.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ de__PHONEBOOK.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -1,18 +1,13 @@
 // ***************************************************************************
 // *
-// *   Copyright (C) 1997-2002, International Business Machines
+// *   Copyright (C) 1997-2003, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
 // ***************************************************************************
 
 de__PHONEBOOK {
     Version { "1.0" }
-    CollationElements { 
-        Version { "1.0" }
-        Sequence { "&ae <<< \u00E4 &AE <<< \u00C4" 
-        "&oe <<< \u00F6 &OE <<< \u00D6" 
-        "&ue <<< \u00FC &UE <<< \u00DC" }
+    collations {
+      default { "phonebook" }
     }
-    // This LCID may be de_DE_PHONEBOOK, but it's unclear in the Microsoft documentation.
-    LocaleID:int { 0x10407 }
 }

Index: el.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/el.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- el.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ el.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -8,62 +8,281 @@
 el {
     Version { "2.0" }
     AmPmMarkers { 
-        "\u03C0\u03BC",
-        "\u03BC\u03BC",
+        "\u03A0\u039C",	// The lowercase form is "\u03C0\u03BC". Both are valid. It's also been seen as mixed case too.
+        "\u039C\u039C",	// The lowercase form is "\u03BC\u03BC". Both are valid. It's also been seen as mixed case too.
     }
-    CollationElements { 
-        Version { "2.0" }
-        Sequence { "[normalization on]" }
+    collations {
+        standard {
+            Version { "2.0" }
+            Sequence { "[normalization on]" }
+        }
     }
     Countries { 
+        AD { "\u0391\u03BD\u03B4\u03CC\u03C1\u03B1" }
+        AE { "\u0397\u03BD\u03C9\u03BC\u03AD\u03BD\u03B1 \u0391\u03C1\u03B1\u03B2\u03B9\u03BA\u03AC \u0395\u03BC\u03B9\u03C1\u03AC\u03C4\u03B1" }
+        AF { "\u0391\u03C6\u03B3\u03B1\u03BD\u03B9\u03C3\u03C4\u03AC\u03BD" }
+        AG { "\u0391\u03BD\u03C4\u03AF\u03B3\u03BA\u03BF\u03C5\u03B1 \u03BA\u03B1\u03B9 \u039C\u03C0\u03B1\u03C1\u03BC\u03C0\u03BF\u03CD\u03BD\u03C4\u03B1" }
+        AI { "\u0391\u03BD\u03B3\u03BA\u03BF\u03C5\u03AF\u03BB\u03B1" }
         AL { "\u0391\u03bb\u03b2\u03b1\u03bd\u03af\u03b1" }
-        AS { "\u0391\u03c3\u03af\u03b1 (\u0391\u03b3\u03b3\u03bb\u03b9\u03ba\u03ac)" }
+        AM { "\u0391\u03C1\u03BC\u03B5\u03BD\u03AF\u03B1" }
+        AN { "\u039F\u03BB\u03BB\u03B1\u03BD\u03B4\u03B9\u03BA\u03AD\u03C2 \u0391\u03BD\u03C4\u03AF\u03BB\u03BB\u03B5\u03C2" }
+        AO { "\u0391\u03BD\u03B3\u03BA\u03CC\u03BB\u03B1" }
+        AQ { "\u0391\u03BD\u03C4\u03B1\u03C1\u03BA\u03C4\u03B9\u03BA\u03AE" }
+        AR { "\u0391\u03C1\u03B3\u03B5\u03BD\u03C4\u03B9\u03BD\u03AE" }
+        //AS { "\u0391\u03c3\u03af\u03b1 (\u0391\u03b3\u03b3\u03bb\u03b9\u03ba\u03ac)" } // Old Value
+        AS { "\u0391\u03BC\u03B5\u03C1\u03B9\u03BA\u03B1\u03BD\u03B9\u03BA\u03AE \u03A3\u03B1\u03BC\u03CC\u03B1" }
         AT { "\u0391\u03c5\u03c3\u03c4\u03c1\u03af\u03b1" }
-        AU { "\u0391\u03c5\u03c3\u03c4\u03c1\u03b1\u03bb\u03af\u03b1 (\u0391\u03b3\u03b3\u03bb\u03b9\u03ba\u03ac)" }
-        BA { "\u0392\u03bf\u03c3\u03bd\u03af\u03b1" }
+        //AU { "\u0391\u03c5\u03c3\u03c4\u03c1\u03b1\u03bb\u03af\u03b1 (\u0391\u03b3\u03b3\u03bb\u03b9\u03ba\u03ac)" } // Old Value
+        AU { "\u0391\u03C5\u03C3\u03C4\u03C1\u03B1\u03BB\u03AF\u03B1" }
+        AW { "\u0391\u03C1\u03BF\u03CD\u03BC\u03C0\u03B1" }
+        AZ { "\u0391\u03B6\u03B5\u03C1\u03BC\u03C0\u03B1\u03CA\u03C4\u03B6\u03AC\u03BD" }
+        BA { "\u0392\u03BF\u03C3\u03BD\u03AF\u03B1 - \u0395\u03C1\u03B6\u03B5\u03B3\u03BF\u03B2\u03AF\u03BD\u03B7" }
+        BB { "\u039C\u03C0\u03B1\u03C1\u03BC\u03C0\u03AC\u03BD\u03C4\u03BF\u03C2" }
+        BD { "\u039C\u03C0\u03B1\u03BD\u03B3\u03BA\u03BB\u03B1\u03BD\u03C4\u03AD\u03C2" }
         BE { "\u0392\u03ad\u03bb\u03b3\u03b9\u03bf" }
+        BF { "\u039C\u03C0\u03BF\u03C5\u03C1\u03BA\u03AF\u03BD\u03B1 \u03A6\u03AC\u03C3\u03BF" }
         BG { "\u0392\u03bf\u03c5\u03bb\u03b3\u03b1\u03c1\u03af\u03b1" }
+        BH { "\u039C\u03C0\u03B1\u03C7\u03C1\u03AD\u03B9\u03BD" }
+        BI { "\u039C\u03C0\u03BF\u03C5\u03C1\u03BF\u03CD\u03BD\u03C4\u03B9" }
+        BJ { "\u039C\u03C0\u03AD\u03BD\u03B9\u03BD" }
+        BM { "\u0392\u03B5\u03C1\u03BC\u03BF\u03CD\u03B4\u03B5\u03C2" }
+        BN { "\u039C\u03C0\u03C1\u03BF\u03C5\u03BD\u03AD\u03B9 \u039D\u03C4\u03B1\u03C1\u03BF\u03C5\u03C3\u03B1\u03BB\u03AC\u03BC" }
+        BO { "\u0392\u03BF\u03BB\u03B9\u03B2\u03AF\u03B1" }
         BR { "\u0392\u03c1\u03b1\u03b6\u03b9\u03bb\u03af\u03b1" }
+        BS { "\u039C\u03C0\u03B1\u03C7\u03AC\u03BC\u03B5\u03C2" }
+        BT { "\u039C\u03C0\u03BF\u03C5\u03C4\u03AC\u03BD" }
+        BV { "\u039D\u03AE\u03C3\u03BF\u03C2 \u039C\u03C0\u03BF\u03C5\u03B2\u03AD" }
+        BW { "\u039C\u03C0\u03BF\u03C4\u03C3\u03BF\u03C5\u03AC\u03BD\u03B1" }
+        BY { "\u039B\u03B5\u03C5\u03BA\u03BF\u03C1\u03C9\u03C3\u03AF\u03B1" }
+        BZ { "\u039C\u03C0\u03B5\u03BB\u03AF\u03B6" }
         CA { "\u039a\u03b1\u03bd\u03b1\u03b4\u03ac\u03c2" }
+        CC { "\u039D\u03AE\u03C3\u03BF\u03B9 \u039A\u03CC\u03BA\u03BF\u03C2 (\u039A\u03AE\u03BB\u03B9\u03BD\u03B3\u03BA)" }
+        CD { "\u039A\u03BF\u03BD\u03B3\u03BA\u03CC, \u039B\u03B1\u03CA\u03BA\u03AE \u0394\u03B7\u03BC\u03BF\u03BA\u03C1\u03B1\u03C4\u03AF\u03B1 \u03C4\u03BF\u03C5" }
+        CF { "\u039A\u03B5\u03BD\u03C4\u03C1\u03BF\u03B1\u03C6\u03C1\u03B9\u03BA\u03B1\u03BD\u03B9\u03BA\u03AE \u0394\u03B7\u03BC\u03BF\u03BA\u03C1\u03B1\u03C4\u03AF\u03B1" }
+        CG { "\u039A\u03BF\u03BD\u03B3\u03BA\u03CC" }
         CH { "\u0395\u03bb\u03b2\u03b5\u03c4\u03af\u03b1" }
-        CN { "\u039a\u03af\u03bd\u03b1 (\u039b.\u0394.\u039a.)" }
+        CI { "\u0391\u03BA\u03C4\u03AE \u0395\u03BB\u03B5\u03C6\u03B1\u03BD\u03C4\u03CC\u03B4\u03BF\u03BD\u03C4\u03BF\u03C2" }
+        CK { "\u039D\u03AE\u03C3\u03BF\u03B9 \u039A\u03BF\u03C5\u03BA" }
+        CL { "\u03A7\u03B9\u03BB\u03AE" }
+        CM { "\u039A\u03B1\u03BC\u03B5\u03C1\u03BF\u03CD\u03BD" }
+        //CN { "\u039a\u03af\u03bd\u03b1 (\u039b.\u0394.\u039a.)" } // Old Value
+        CN { "\u039A\u03AF\u03BD\u03B1" }
+        CO { "\u039A\u03BF\u03BB\u03BF\u03BC\u03B2\u03AF\u03B1" }
+        CR { "\u039A\u03CC\u03C3\u03C4\u03B1 \u03A1\u03AF\u03BA\u03B1" }
+        CU { "\u039A\u03BF\u03CD\u03B2\u03B1" }
+        CV { "\u039D\u03AE\u03C3\u03BF\u03B9 \u03A0\u03C1\u03AC\u03C3\u03B9\u03BD\u03BF\u03C5 \u0391\u03BA\u03C1\u03C9\u03C4\u03B7\u03C1\u03AF\u03BF\u03C5" }
+        CX { "\u039D\u03AE\u03C3\u03BF\u03C2 \u03A7\u03C1\u03B9\u03C3\u03C4\u03BF\u03C5\u03B3\u03AD\u03BD\u03BD\u03C9\u03BD" }
+        CY { "\u039A\u03CD\u03C0\u03C1\u03BF\u03C2" }
         CZ { "\u03a4\u03c3\u03b5\u03c7\u03af\u03b1" }
+        //CZ { "\u03A4\u03C3\u03B5\u03C7\u03B9\u03BA\u03AE \u0394\u03B7\u03BC\u03BF\u03BA\u03C1\u03B1\u03C4\u03AF\u03B1" } // From translation center
         DE { "\u0393\u03b5\u03c1\u03bc\u03b1\u03bd\u03af\u03b1" }
+        DJ { "\u03A4\u03B6\u03B9\u03BC\u03C0\u03BF\u03C5\u03C4\u03AF" }
         DK { "\u0394\u03b1\u03bd\u03af\u03b1" }
+        DM { "\u039D\u03C4\u03BF\u03BC\u03AF\u03BD\u03B9\u03BA\u03B1" }
+        DO { "\u0394\u03BF\u03BC\u03B9\u03BD\u03B9\u03BA\u03B1\u03BD\u03AE \u0394\u03B7\u03BC\u03BF\u03BA\u03C1\u03B1\u03C4\u03AF\u03B1" }
+        DZ { "\u0391\u03BB\u03B3\u03B5\u03C1\u03AF\u03B1" }
+        EC { "\u0399\u03C3\u03B7\u03BC\u03B5\u03C1\u03B9\u03BD\u03CC\u03C2" }
         EE { "\u0395\u03c3\u03b8\u03bf\u03bd\u03af\u03b1" }
+        EG { "\u0391\u03AF\u03B3\u03C5\u03C0\u03C4\u03BF\u03C2" }
+        EH { "\u0394\u03C5\u03C4\u03B9\u03BA\u03AE \u03A3\u03B1\u03C7\u03AC\u03C1\u03B1" }
+        ER { "\u0395\u03C1\u03C5\u03B8\u03C1\u03B1\u03AF\u03B1" }
         ES { "\u0399\u03c3\u03c0\u03b1\u03bd\u03af\u03b1" }
+        ET { "\u0391\u03B9\u03B8\u03B9\u03BF\u03C0\u03AF\u03B1" }
         FI { "\u03a6\u03b9\u03bd\u03bb\u03b1\u03bd\u03b4\u03af\u03b1" }
+        FJ { "\u03A6\u03AF\u03C4\u03B6\u03B9" }
+        FK { "\u039D\u03AE\u03C3\u03BF\u03B9 \u03A6\u03CE\u03BA\u03BB\u03B1\u03BD\u03C4" } // Is this okay?
+        FM { "\u039C\u03B9\u03BA\u03C1\u03BF\u03BD\u03B7\u03C3\u03AF\u03B1, \u039F\u03BC\u03CC\u03C3\u03C0\u03BF\u03BD\u03B4\u03B5\u03C2 \u03A0\u03BF\u03BB\u03B9\u03C4\u03B5\u03AF\u03B5\u03C2 \u03C4\u03B7\u03C2" }
+        FO { "\u039D\u03AE\u03C3\u03BF\u03B9 \u03A6\u03B5\u03C1\u03CC\u03B5\u03C2" }
         FR { "\u0393\u03b1\u03bb\u03bb\u03af\u03b1" }
+        GA { "\u0393\u03BA\u03B1\u03BC\u03C0\u03CC\u03BD" }
         GB { "\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03bf \u0392\u03b1\u03c3\u03af\u03bb\u03b5\u03b9\u03bf" }
+        GD { "\u0393\u03C1\u03B5\u03BD\u03AC\u03B4\u03B1" }
+        GE { "\u0393\u03B5\u03C9\u03C1\u03B3\u03AF\u03B1" }
+        GF { "\u0393\u03B1\u03BB\u03BB\u03B9\u03BA\u03AE \u0393\u03BF\u03C5\u03B9\u03AC\u03BD\u03B1" }
+        GH { "\u0393\u03BA\u03AC\u03BD\u03B1" }
+        GI { "\u0393\u03B9\u03B2\u03C1\u03B1\u03BB\u03C4\u03AC\u03C1" }
+        GL { "\u0393\u03C1\u03BF\u03B9\u03BB\u03B1\u03BD\u03B4\u03AF\u03B1" }
+        GM { "\u0393\u03BA\u03AC\u03BC\u03C0\u03B9\u03B1" }
+        GN { "\u0393\u03BF\u03C5\u03B9\u03BD\u03AD\u03B1" }
+        GP { "\u0393\u03BF\u03C5\u03B1\u03B4\u03B5\u03BB\u03BF\u03CD\u03C0\u03B7" }
+        GQ { "\u0399\u03C3\u03B7\u03BC\u03B5\u03C1\u03B9\u03BD\u03AE \u0393\u03BF\u03C5\u03B9\u03BD\u03AD\u03B1" }
         GR { "\u0395\u03bb\u03bb\u03ac\u03b4\u03b1" }
+        GS { "\u039D\u03CC\u03C4\u03B9\u03B1 \u0393\u03B5\u03C9\u03C1\u03B3\u03AF\u03B1 \u03BA\u03B1\u03B9 \u039D\u03AE\u03C3\u03BF\u03B9 \u039D\u03CC\u03C4\u03B9\u03B5\u03C2 \u03A3\u03AC\u03BD\u03C4\u03BF\u03C5\u03B9\u03C4\u03C2" }
+        GT { "\u0393\u03BF\u03C5\u03B1\u03C4\u03B5\u03BC\u03AC\u03BB\u03B1" }
+        GU { "\u0393\u03BA\u03BF\u03C5\u03AC\u03BC" }
+        GW { "\u0393\u03BF\u03C5\u03B9\u03BD\u03AD\u03B1-\u039C\u03C0\u03B9\u03C3\u03AC\u03BF\u03C5" }
+        GY { "\u0393\u03BF\u03C5\u03B9\u03AC\u03BD\u03B1" }
+        HK { "\u03A7\u03BF\u03BD\u03B3\u03BA \u039A\u03BF\u03BD\u03B3\u03BA, \u0395\u03B9\u03B4\u03B9\u03BA\u03AE \u0394\u03B9\u03BF\u03B9\u03BA\u03B7\u03C4\u03B9\u03BA\u03AE \u03A0\u03B5\u03C1\u03B9\u03C6\u03AD\u03C1\u03B5\u03B9\u03B1 \u03C4\u03B7\u03C2 \u039A\u03AF\u03BD\u03B1\u03C2" } // Is this okay?
+        HM { "\u039D\u03AE\u03C3\u03BF\u03B9 \u03A7\u03B5\u03C1\u03BD\u03C4 \u03BA\u03B1\u03B9 \u039C\u03B1\u03BA\u03BD\u03C4\u03CC\u03BD\u03B1\u03BB\u03BD\u03C4" }
+        HN { "\u039F\u03BD\u03B4\u03BF\u03CD\u03C1\u03B1" }
         HR { "\u039a\u03c1\u03bf\u03b1\u03c4\u03af\u03b1" }
+        HT { "\u0391\u03CA\u03C4\u03AE" }
         HU { "\u039f\u03c5\u03b3\u03b3\u03b1\u03c1\u03af\u03b1" }
+        ID { "\u0399\u03BD\u03B4\u03BF\u03BD\u03B7\u03C3\u03AF\u03B1" }
         IE { "\u0399\u03c1\u03bb\u03b1\u03bd\u03b4\u03af\u03b1" }
         IL { "\u0399\u03c3\u03c1\u03b1\u03ae\u03bb" }
+        IN { "\u0399\u03BD\u03B4\u03AF\u03B1" }
+        IO { "\u0392\u03C1\u03B5\u03C4\u03B1\u03BD\u03B9\u03BA\u03AC \u0388\u03B4\u03AC\u03C6\u03B7 \u0399\u03BD\u03B4\u03B9\u03BA\u03BF\u03CD \u03A9\u03BA\u03B5\u03B1\u03BD\u03BF\u03CD" }
+        IQ { "\u0399\u03C1\u03AC\u03BA" }
+        IR { "\u0399\u03C1\u03AC\u03BD, \u0399\u03C3\u03BB\u03B1\u03BC\u03B9\u03BA\u03AE \u0394\u03B7\u03BC\u03BF\u03BA\u03C1\u03B1\u03C4\u03AF\u03B1 \u03C4\u03BF\u03C5" }
         IS { "\u0399\u03c3\u03bb\u03b1\u03bd\u03b4\u03af\u03b1" }
         IT { "\u0399\u03c4\u03b1\u03bb\u03af\u03b1" }
+        JM { "\u03A4\u03B6\u03B1\u03BC\u03AC\u03B9\u03BA\u03B1" }
+        JO { "\u0399\u03BF\u03C1\u03B4\u03B1\u03BD\u03AF\u03B1" }
         JP { "\u0399\u03b1\u03c0\u03c9\u03bd\u03af\u03b1" }
-        KR { "\u039a\u03bf\u03c1\u03ad\u03b1" }
+        KE { "\u039A\u03AD\u03BD\u03C5\u03B1" }
+        KG { "\u039A\u03B9\u03C1\u03B3\u03B9\u03B6\u03AF\u03B1" }
+        KH { "\u039A\u03B1\u03BC\u03C0\u03CC\u03C4\u03B6\u03B7" }
+        KI { "\u039A\u03B9\u03C1\u03B9\u03BC\u03C0\u03AC\u03C4\u03B9" }
+        KM { "\u039A\u03BF\u03BC\u03CC\u03C1\u03B5\u03C2" }
+        KN { "\u03A3\u03B1\u03B9\u03BD\u03C4 \u039A\u03B9\u03C4\u03C2 \u03BA\u03B1\u03B9 \u039D\u03AD\u03B2\u03B9\u03C2" }
+        KP { "\u039A\u03BF\u03C1\u03AD\u03B1, \u0392\u03CC\u03C1\u03B5\u03B9\u03B1" }    // alternate name { "\u039A\u03BF\u03C1\u03AD\u03B1, \u039B\u03B1\u03CA\u03BA\u03AE \u0394\u03B7\u03BC\u03BF\u03BA\u03C1\u03B1\u03C4\u03AF\u03B1 \u03C4\u03B7\u03C2" }
+        KR { "\u039A\u03BF\u03C1\u03AD\u03B1, \u039D\u03CC\u03C4\u03B9\u03B1" }    // alternate name { "\u039A\u03BF\u03C1\u03AD\u03B1, \u0394\u03B7\u03BC\u03BF\u03BA\u03C1\u03B1\u03C4\u03AF\u03B1 \u03C4\u03B7\u03C2" }
+        KW { "\u039A\u03BF\u03C5\u03B2\u03AD\u03B9\u03C4" }
+        KY { "\u039D\u03AE\u03C3\u03BF\u03B9 \u039A\u03AD\u03B9\u03BC\u03B1\u03BD" }
+        KZ { "\u039A\u03B1\u03B6\u03B1\u03BA\u03C3\u03C4\u03AC\u03BD" }
         LA { "\u039b\u03b1\u03c4\u03b9\u03bd\u03b9\u03ba\u03ae \u0391\u03bc\u03b5\u03c1\u03b9\u03ba\u03ae" }
+        //LA { "\u039B\u03AC\u03BF\u03C2, \u039B\u03B1\u03CA\u03BA\u03AE \u0394\u03B7\u03BC\u03BF\u03BA\u03C1\u03B1\u03C4\u03AF\u03B1 \u03C4\u03BF\u03C5" } // From translation center
+        LB { "\u039B\u03AF\u03B2\u03B1\u03BD\u03BF\u03C2" }
+        LC { "\u0391\u03B3\u03AF\u03B1 \u039B\u03BF\u03C5\u03BA\u03AF\u03B1" }
+        LI { "\u039B\u03B9\u03C7\u03C4\u03B5\u03BD\u03C3\u03C4\u03AC\u03B9\u03BD" }
+        LK { "\u03A3\u03C1\u03B9 \u039B\u03AC\u03BD\u03BA\u03B1" }
+        LR { "\u039B\u03B9\u03B2\u03B5\u03C1\u03AF\u03B1" }
+        LS { "\u039B\u03B5\u03C3\u03CC\u03C4\u03BF" }
         LT { "\u039b\u03b9\u03b8\u03bf\u03c5\u03b1\u03bd\u03af\u03b1" }
+        LU { "\u039B\u03BF\u03C5\u03BE\u03B5\u03BC\u03B2\u03BF\u03CD\u03C1\u03B3\u03BF" }
         LV { "\u039b\u03b5\u03c4\u03bf\u03bd\u03af\u03b1" }
+        MA { "\u039C\u03B1\u03C1\u03CC\u03BA\u03BF" }
+        MC { "\u039C\u03BF\u03BD\u03B1\u03BA\u03CC" }
+        MD { "\u039C\u03BF\u03BB\u03B4\u03B1\u03B2\u03AF\u03B1, \u0394\u03B7\u03BC\u03BF\u03BA\u03C1\u03B1\u03C4\u03AF\u03B1 \u03C4\u03B7\u03C2" }
+        MG { "\u039C\u03B1\u03B4\u03B1\u03B3\u03B1\u03C3\u03BA\u03AC\u03C1\u03B7" }
+        MH { "\u039D\u03AE\u03C3\u03BF\u03B9 \u039C\u03AC\u03C1\u03C3\u03B1\u03BB" }
         MK { "\u03a0\u0393\u0394 \u039c\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03af\u03b1\u03c2" }
+        ML { "\u039C\u03AC\u03BB\u03B9" }
+        MM { "\u039C\u03B9\u03B1\u03BD\u03BC\u03AC\u03C1" }
+        MN { "\u039C\u03BF\u03B3\u03B3\u03BF\u03BB\u03AF\u03B1" }
+        MO { "\u039C\u03B1\u03BA\u03AC\u03BF, \u0395\u03B9\u03B4\u03B9\u03BA\u03AE \u0394\u03B9\u03BF\u03B9\u03BA\u03B7\u03C4\u03B9\u03BA\u03AE \u03A0\u03B5\u03C1\u03B9\u03C6\u03AD\u03C1\u03B5\u03B9\u03B1 \u03C4\u03B7\u03C2 \u039A\u03AF\u03BD\u03B1\u03C2" } // Is this okay?
+        MP { "\u039D\u03AE\u03C3\u03BF\u03B9 \u0392\u03CC\u03C1\u03B5\u03B9\u03B5\u03C2 \u039C\u03B1\u03C1\u03B9\u03AC\u03BD\u03B5\u03C2" }
+        MQ { "\u039C\u03B1\u03C1\u03C4\u03B9\u03BD\u03AF\u03BA\u03B1" }
+        MR { "\u039C\u03B1\u03C5\u03C1\u03B9\u03C4\u03B1\u03BD\u03AF\u03B1" }
+        MS { "\u039C\u03BF\u03BD\u03C3\u03B5\u03C1\u03AC\u03C4" }
+        MT { "\u039C\u03AC\u03BB\u03C4\u03B1" }
+        MU { "\u039C\u03B1\u03C5\u03C1\u03AF\u03BA\u03B9\u03BF\u03C2" }
+        MV { "\u039C\u03B1\u03BB\u03B4\u03AF\u03B2\u03B5\u03C2" }
+        MW { "\u039C\u03B1\u03BB\u03AC\u03BF\u03C5\u03B9" }
+        MX { "\u039C\u03B5\u03BE\u03B9\u03BA\u03CC" }
+        MY { "\u039C\u03B1\u03BB\u03B1\u03B9\u03C3\u03AF\u03B1" }
+        MZ { "\u039C\u03BF\u03B6\u03B1\u03BC\u03B2\u03AF\u03BA\u03B7" }
+        NA { "\u039D\u03B1\u03BC\u03AF\u03BC\u03C0\u03B9\u03B1" }
+        NC { "\u039D\u03AD\u03B1 \u039A\u03B1\u03BB\u03B7\u03B4\u03BF\u03BD\u03AF\u03B1" }
+        NE { "\u039D\u03AF\u03B3\u03B7\u03C1" }
+        NF { "\u039D\u03AE\u03C3\u03BF\u03C2 \u039D\u03CC\u03C1\u03C6\u03BF\u03BB\u03BA" }
+        NG { "\u039D\u03B9\u03B3\u03B7\u03C1\u03AF\u03B1" }
+        NI { "\u039D\u03B9\u03BA\u03B1\u03C1\u03AC\u03B3\u03BF\u03C5\u03B1" }
         NL { "\u039f\u03bb\u03bb\u03b1\u03bd\u03b4\u03af\u03b1" }
         NO { "\u039d\u03bf\u03c1\u03b2\u03b7\u03b3\u03af\u03b1" }
+        NP { "\u039D\u03B5\u03C0\u03AC\u03BB" }
+        NR { "\u039D\u03B1\u03BF\u03CD\u03C1\u03BF\u03C5" }
+        NU { "\u039D\u03B9\u03BF\u03CD\u03B5" }
         NZ { "\u039d\u03ad\u03b1 \u0396\u03b7\u03bb\u03b1\u03bd\u03b4\u03af\u03b1" }
+        OM { "\u039F\u03BC\u03AC\u03BD" }
+        PA { "\u03A0\u03B1\u03BD\u03B1\u03BC\u03AC\u03C2" }
+        PE { "\u03A0\u03B5\u03C1\u03BF\u03CD" }
+        PF { "\u0393\u03B1\u03BB\u03BB\u03B9\u03BA\u03AE \u03A0\u03BF\u03BB\u03C5\u03BD\u03B7\u03C3\u03AF\u03B1" }
+        PG { "\u03A0\u03B1\u03C0\u03BF\u03CD\u03B1 - \u039D\u03AD\u03B1 \u0393\u03BF\u03C5\u03B9\u03BD\u03AD\u03B1" }
+        PH { "\u03A6\u03B9\u03BB\u03B9\u03C0\u03C0\u03AF\u03BD\u03B5\u03C2" }
+        PK { "\u03A0\u03B1\u03BA\u03B9\u03C3\u03C4\u03AC\u03BD" }
         PL { "\u03a0\u03bf\u03bb\u03c9\u03bd\u03af\u03b1" }
+        PM { "\u03A3\u03B1\u03B9\u03BD\u03C4 \u03A0\u03B9\u03AD\u03C1 \u03BA\u03B1\u03B9 \u039C\u03B9\u03BA\u03B5\u03BB\u03CC\u03BD" }
+        PN { "\u03A0\u03AF\u03C4\u03BA\u03B5\u03C1\u03BD" }
+        PR { "\u03A0\u03BF\u03C5\u03AD\u03C1\u03C4\u03BF \u03A1\u03AF\u03BA\u03BF" }
+        PS { "\u03A0\u03B1\u03BB\u03B1\u03B9\u03C3\u03C4\u03B9\u03BD\u03B9\u03B1\u03BA\u03AC \u0395\u03B4\u03AC\u03C6\u03B7" } // Is this okay?
         PT { "\u03a0\u03bf\u03c1\u03c4\u03bf\u03b3\u03b1\u03bb\u03af\u03b1" }
+        PW { "\u03A0\u03B1\u03BB\u03AC\u03BF\u03C5" }
+        PY { "\u03A0\u03B1\u03C1\u03B1\u03B3\u03BF\u03C5\u03AC\u03B7" }
+        QA { "\u039A\u03B1\u03C4\u03AC\u03C1" }
+        RE { "\u03A1\u03B5\u03CB\u03BD\u03B9\u03CC\u03BD" }
         RO { "\u03a1\u03bf\u03c5\u03bc\u03b1\u03bd\u03af\u03b1" }
-        RU { "\u03a1\u03c9\u03c3\u03af\u03b1" }
+        RU { "\u03A1\u03C9\u03C3\u03AF\u03B1" }
+        //RU { "\u03A1\u03C9\u03C3\u03B9\u03BA\u03AE \u039F\u03BC\u03BF\u03C3\u03C0\u03BF\u03BD\u03B4\u03AF\u03B1" } // From translation center
+        RW { "\u03A1\u03BF\u03C5\u03AC\u03BD\u03C4\u03B1" }
+        SA { "\u03A3\u03B1\u03BF\u03C5\u03B4\u03B9\u03BA\u03AE \u0391\u03C1\u03B1\u03B2\u03AF\u03B1" }
+        SB { "\u039D\u03AE\u03C3\u03BF\u03B9 \u03A3\u03BF\u03BB\u03BF\u03BC\u03CE\u03BD\u03C4\u03BF\u03C2" }
+        SC { "\u03A3\u03B5\u03CB\u03C7\u03AD\u03BB\u03BB\u03B5\u03C2" }
+        SD { "\u03A3\u03BF\u03C5\u03B4\u03AC\u03BD" }
         SE { "\u03a3\u03bf\u03c5\u03b7\u03b4\u03af\u03b1" }
+        SG { "\u03A3\u03B9\u03B3\u03BA\u03B1\u03C0\u03BF\u03CD\u03C1\u03B7" }
+        SH { "\u0391\u03B3\u03AF\u03B1 \u0395\u03BB\u03AD\u03BD\u03B7" }
         SI { "\u03a3\u03bb\u03bf\u03b2\u03b5\u03bd\u03af\u03b1" }
+        SJ { "\u039D\u03AE\u03C3\u03BF\u03B9 \u03A3\u03B2\u03AC\u03BB\u03BC\u03C0\u03B1\u03C1 \u03BA\u03B1\u03B9 \u0393\u03B9\u03B1\u03BD \u039C\u03B1\u03B3\u03B9\u03AD\u03BD" }
         SK { "\u03a3\u03bb\u03bf\u03b2\u03b1\u03ba\u03af\u03b1" }
+        SL { "\u03A3\u03B9\u03AD\u03C1\u03B1 \u039B\u03B5\u03CC\u03BD\u03B5" }
+        SM { "\u0386\u03B3\u03B9\u03BF\u03C2 \u039C\u03B1\u03C1\u03AF\u03BD\u03BF\u03C2" }
+        SN { "\u03A3\u03B5\u03BD\u03B5\u03B3\u03AC\u03BB\u03B7" }
+        SO { "\u03A3\u03BF\u03BC\u03B1\u03BB\u03AF\u03B1" }
         SP { "\u03a3\u03b5\u03c1\u03b2\u03af\u03b1" }
+        SR { "\u03A3\u03BF\u03C5\u03C1\u03B9\u03BD\u03AC\u03BC" }
+        ST { "\u03A3\u03AC\u03BF \u03A4\u03BF\u03BC\u03AD \u03BA\u03B1\u03B9 \u03A0\u03C1\u03AF\u03BD\u03C3\u03B9\u03C0\u03B5" }
+        SV { "\u0395\u03BB \u03A3\u03B1\u03BB\u03B2\u03B1\u03B4\u03CC\u03C1" }
+        SY { "\u03A3\u03C5\u03C1\u03AF\u03B1, \u0391\u03C1\u03B1\u03B2\u03B9\u03BA\u03AE \u0394\u03B7\u03BC\u03BF\u03BA\u03C1\u03B1\u03C4\u03AF\u03B1 \u03C4\u03B7\u03C2" }    // alternate name { "\u03A3\u03C5\u03C1\u03AF\u03B1" }
+        SZ { "\u03A3\u03BF\u03C5\u03B1\u03B6\u03B9\u03BB\u03AC\u03BD\u03B4\u03B7" }
+        TC { "\u039D\u03AE\u03C3\u03BF\u03B9 \u03A4\u03B5\u03C1\u03BA\u03C2 \u03BA\u03B1\u03B9 \u039A\u03AC\u03B9\u03BA\u03BF\u03C2" }
+        TD { "\u03A4\u03C3\u03B1\u03BD\u03C4" }
+        TF { "\u0393\u03B1\u03BB\u03BB\u03B9\u03BA\u03AC \u039D\u03CC\u03C4\u03B9\u03B1 \u0395\u03B4\u03AC\u03C6\u03B7" }
+        TG { "\u03A4\u03CC\u03B3\u03BA\u03BF" }
         TH { "\u03a4\u03b1\u03ca\u03bb\u03ac\u03bd\u03b4\u03b7" }
+        TJ { "\u03A4\u03B1\u03C4\u03B6\u03B9\u03BA\u03B9\u03C3\u03C4\u03AC\u03BD" }
+        TK { "\u03A4\u03BF\u03BA\u03B5\u03BB\u03AC\u03BF\u03C5" }
+        TL { "\u0391\u03BD\u03B1\u03C4\u03BF\u03BB\u03B9\u03BA\u03CC \u03A4\u03B9\u03BC\u03CC\u03C1" }
+        TM { "\u03A4\u03BF\u03C5\u03C1\u03BA\u03BC\u03B5\u03BD\u03B9\u03C3\u03C4\u03AC\u03BD" }
+        TN { "\u03A4\u03C5\u03BD\u03B7\u03C3\u03AF\u03B1" }
+        TO { "\u03A4\u03CC\u03BD\u03B3\u03BA\u03B1" }
         TR { "\u03a4\u03bf\u03c5\u03c1\u03ba\u03af\u03b1" }
+        TT { "\u03A4\u03C1\u03B9\u03BD\u03B9\u03B4\u03AC\u03B4 \u03BA\u03B1\u03B9 \u03A4\u03BF\u03BC\u03C0\u03AC\u03B3\u03BA\u03BF" }
+        TV { "\u03A4\u03BF\u03C5\u03B2\u03B1\u03BB\u03BF\u03CD" }
+        //TW { "\u03A4\u03B1\u03CA\u03B2\u03AC\u03BD" } // From translation center
         TW { "\u03a4\u03b1\u03ca\u03b2\u03ac\u03bd (\u0394.\u039a.)" }
-        US { "\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03b5\u03c2 \u03a0\u03bf\u03bb\u03b9\u03c4\u03b5\u03af\u03b5\u03c2 \u0391\u03bc\u03b5\u03c1\u03b9\u03ba\u03ae\u03c2" }
-        ZA { "\u039d\u03cc\u03c4\u03b9\u03bf\u03c2 \u0391\u03c6\u03c1\u03b9\u03ba\u03ae" }
+        TZ { "\u03A4\u03B1\u03BD\u03B6\u03B1\u03BD\u03AF\u03B1" } // Is this okay?
+        UA { "\u039F\u03C5\u03BA\u03C1\u03B1\u03BD\u03AF\u03B1" }
+        UG { "\u039F\u03C5\u03B3\u03BA\u03AC\u03BD\u03C4\u03B1" }
+        UM { "\u0391\u03C0\u03BF\u03BC\u03B1\u03BA\u03C1\u03C5\u03C3\u03BC\u03AD\u03BD\u03B5\u03C2 \u039D\u03B7\u03C3\u03AF\u03B4\u03B5\u03C2 \u03C4\u03C9\u03BD \u0397\u03BD\u03C9\u03BC\u03AD\u03BD\u03C9\u03BD \u03A0\u03BF\u03BB\u03B9\u03C4\u03B5\u03B9\u03CE\u03BD" }
+        //US { "\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03b5\u03c2 \u03a0\u03bf\u03bb\u03b9\u03c4\u03b5\u03af\u03b5\u03c2 \u0391\u03bc\u03b5\u03c1\u03b9\u03ba\u03ae\u03c2" } // Old Value
+        US { "\u0397\u03BD\u03C9\u03BC\u03AD\u03BD\u03B5\u03C2 \u03A0\u03BF\u03BB\u03B9\u03C4\u03B5\u03AF\u03B5\u03C2" }
+        UY { "\u039F\u03C5\u03C1\u03BF\u03C5\u03B3\u03BF\u03C5\u03AC\u03B7" }
+        UZ { "\u039F\u03C5\u03B6\u03BC\u03C0\u03B5\u03BA\u03B9\u03C3\u03C4\u03AC\u03BD" }
+        VA { "\u0391\u03B3\u03AF\u03B1 \u0388\u03B4\u03C1\u03B1 (\u0392\u03B1\u03C4\u03B9\u03BA\u03B1\u03BD\u03CC)" }
+        VC { "\u0386\u03B3\u03B9\u03BF\u03C2 \u0392\u03B9\u03BA\u03AD\u03BD\u03C4\u03B9\u03BF\u03C2 \u03BA\u03B1\u03B9 \u0393\u03C1\u03B5\u03BD\u03B1\u03B4\u03AF\u03BD\u03B5\u03C2" }
+        VE { "\u0392\u03B5\u03BD\u03B5\u03B6\u03BF\u03C5\u03AD\u03BB\u03B1" }
+        VG { "\u0392\u03C1\u03B5\u03C4\u03B1\u03BD\u03B9\u03BA\u03AD\u03C2 \u03A0\u03B1\u03C1\u03B8\u03AD\u03BD\u03BF\u03B9 \u039D\u03AE\u03C3\u03BF\u03B9" } // Is this okay?
+        VI { "\u0391\u03BC\u03B5\u03C1\u03B9\u03BA\u03B1\u03BD\u03B9\u03BA\u03AD\u03C2 \u03A0\u03B1\u03C1\u03B8\u03AD\u03BD\u03BF\u03B9 \u039D\u03AE\u03C3\u03BF\u03B9" } // Is this okay?
+        VN { "\u0392\u03B9\u03B5\u03C4\u03BD\u03AC\u03BC" } // Is this okay?
+        VU { "\u0392\u03B1\u03BD\u03BF\u03C5\u03AC\u03C4\u03BF\u03C5" }
+        WF { "\u039D\u03AE\u03C3\u03BF\u03B9 \u039F\u03C5\u03B1\u03BB\u03BB\u03AF\u03C2 \u03BA\u03B1\u03B9 \u03A6\u03BF\u03C5\u03C4\u03BF\u03C5\u03BD\u03AC" }
+        WS { "\u03A3\u03B1\u03BC\u03CC\u03B1" }
+        YE { "\u03A5\u03B5\u03BC\u03AD\u03BD\u03B7" }
+        YT { "\u039C\u03B1\u03B3\u03B9\u03CC\u03C4" }
+        YU { "\u0393\u03B9\u03BF\u03C5\u03B3\u03BA\u03BF\u03C3\u03BB\u03B1\u03B2\u03AF\u03B1" }
+        //ZA { "\u039d\u03cc\u03c4\u03b9\u03bf\u03c2 \u0391\u03c6\u03c1\u03b9\u03ba\u03ae" } // Old Value
+        ZA { "\u039D\u03CC\u03C4\u03B9\u03B1 \u0391\u03C6\u03C1\u03B9\u03BA\u03AE" }
+        ZM { "\u0396\u03AC\u03BC\u03C0\u03B9\u03B1" }
+        ZW { "\u0396\u03B9\u03BC\u03C0\u03AC\u03BC\u03C0\u03BF\u03C5\u03B5" }
+    }
+    // Currency display names
+    Currencies {
+        EUR { "\u20AC", "\u0395\u03A5\u03A1\u03A9" } // lowercase is \u03B5\u03C5\u03C1\u03CE
+        GRD { "\u0394\u03C1\u03C7", "\u0394\u03C1\u03C7" } // Currency symbol is the same as the name. This may need to change.
+
+        // The following only have the currency names. The currency symbols are missing or need verification.
+        AUD { "AUD", "\u0394\u039F\u039B\u0391\u03A1\u0399\u039F \u0391\u03A5\u03A3\u03A4\u03A1\u0391\u039B\u0399\u0391\u03A3" }
+        CAD { "CAD", "\u0394\u039F\u039B\u0391\u03A1\u0399\u039F \u039A\u0391\u039D\u0391\u0394\u0391" }
+        CHF { "CHF", "\u03A6\u03A1\u0391\u0393\u039A\u039F \u0395\u039B\u0392\u0395\u03A4\u0399\u0391\u03A3" }
+        CYP { "CYP", "\u039B\u0399\u03A1\u0391 \u039A\u03A5\u03A0\u03A1\u039F\u03A5" }
+        DKK { "DKK", "\u039A\u039F\u03A1\u039F\u039D\u0391 \u0394\u0391\u039D\u0399\u0391\u03A3" }
+        GBP { "\u00A3", "\u039B\u0399\u03A1\u0391 \u0391\u0393\u0393\u039B\u0399\u0391\u03A3" }
+        JPY { "\u00A5", "\u0393\u0399\u0395\u039D \u0399\u0391\u03A0\u03A9\u039D\u0399\u0391\u03A3" }
+        NOK { "NOK", "\u039A\u039F\u03A1\u039F\u039D\u0391 \u039D\u039F\u03A1\u0392\u0397\u0393\u0399\u0391\u03A3" }
+        SEK { "SEK", "\u039A\u039F\u03A1\u039F\u039D\u0391 \u03A3\u039F\u03A5\u0397\u0394\u0399\u0391\u03A3" }
+        USD { "USD", "\u0394\u039F\u039B\u0391\u03A1\u0399\u039F \u0397\u03A0\u0391" }
     }
     DateTimeElements:intvector { 
         2,
@@ -73,11 +292,11 @@
         "h:mm:ss a z",
         "h:mm:ss a z",
         "h:mm:ss a",
-        "h:mm a",
-        "EEEE, d MMMM yyyy",
-        "d MMMM yyyy",
-        "d MMM yyyy",
-        "d/M/yyyy",
+        "h:mm a",   // While Greece uses both 12 and 24 hour formats, we use one for consistency due to limitations of current ICU API.
+        "EEEE, dd MMMM yyyy",
+        "dd MMMM yyyy",
+        "dd MMM yyyy",
+        "dd/MM/yyyy",
         "{1} {0}",
     }
     DayAbbreviations { 
@@ -98,23 +317,35 @@
         "\u03A0\u03B1\u03C1\u03B1\u03C3\u03BA\u03B5\u03C5\u03AE",
         "\u03A3\u03AC\u03B2\u03B2\u03B1\u03C4\u03BF",
     }
+    Eras {
+        "\u03C0.\u03A7.",
+        "\u03BC.\u03A7."
+    }
     /* These languages should be all lower case, but it doesn't seem to be lowercase */
     Languages { 
         ar { "\u0391\u03c1\u03b1\u03b2\u03b9\u03ba\u03ac" }
         bg { "\u0392\u03bf\u03c5\u03bb\u03b3\u03b1\u03c1\u03b9\u03ba\u03ac" }
         ca { "\u039a\u03b1\u03c4\u03b1\u03bb\u03b1\u03bd\u03b9\u03ba\u03ac" }
-        cs { "\u03a4\u03c3\u03ad\u03c7\u03b9\u03ba\u03b1" }
-        da { "\u0394\u03b1\u03bd\u03ad\u03b6\u03b9\u03ba\u03b1" }
+        //cs { "\u03a4\u03c3\u03ad\u03c7\u03b9\u03ba\u03b1" } // Old Value
+        cs { "\u03A4\u03C3\u03B5\u03C7\u03B9\u03BA\u03AC" }
+        //da { "\u0394\u03b1\u03bd\u03ad\u03b6\u03b9\u03ba\u03b1" } // Old Value
+        da { "\u0394\u03B1\u03BD\u03B9\u03BA\u03AC" }
         de { "\u0393\u03b5\u03c1\u03bc\u03b1\u03bd\u03b9\u03ba\u03ac" }
-        el { "\u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac" }
+        //el { "\u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac" } // Old Value
+        el { "\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC" }
         en { "\u0391\u03b3\u03b3\u03bb\u03b9\u03ba\u03ac" }
         es { "\u0399\u03c3\u03c0\u03b1\u03bd\u03b9\u03ba\u03ac" }
+        et { "\u0395\u03C3\u03B8\u03BF\u03BD\u03B9\u03BA\u03AC" }
         fi { "\u03a6\u03b9\u03bd\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac" }
         fr { "\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ac" }
         he { "\u0395\u03b2\u03c1\u03b1\u03ca\u03ba\u03ac" }
         hr { "\u039a\u03c1\u03bf\u03b1\u03c4\u03b9\u03ba\u03ac" }
         hu { "\u039f\u03c5\u03b3\u03b3\u03c1\u03b9\u03ba\u03ac" }
         it { "\u0399\u03c4\u03b1\u03bb\u03b9\u03ba\u03ac" }
+        ja { "\u0399\u03B1\u03C0\u03C9\u03BD\u03B9\u03BA\u03AC" }
+        ko { "\u039A\u03BF\u03C1\u03B5\u03B1\u03C4\u03B9\u03BA\u03AC" }
+        lt { "\u039B\u03B9\u03B8\u03BF\u03C5\u03B1\u03BD\u03B9\u03BA\u03AC" }
+        lv { "\u039B\u03B5\u03C4\u03BF\u03BD\u03B9\u03BA\u03AC" }
         mk { "\u03a3\u03bb\u03b1\u03b2\u03bf\u03bc\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03b9\u03ba\u03ac" }
         nl { "\u039f\u03bb\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac" }
         no { "\u039d\u03bf\u03c1\u03b2\u03b7\u03b3\u03b9\u03ba\u03ac" }
@@ -127,9 +358,11 @@
         sq { "\u0391\u03bb\u03b2\u03b1\u03bd\u03b9\u03ba\u03ac" }
         sr { "\u03a3\u03b5\u03c1\u03b2\u03b9\u03ba\u03ac" }
         sv { "\u03a3\u03bf\u03c5\u03b7\u03b4\u03b9\u03ba\u03ac" }
+        tr { "\u03A4\u03BF\u03C5\u03C1\u03BA\u03B9\u03BA\u03AC" }
+        zh { "\u039A\u03B9\u03BD\u03B5\u03B6\u03B9\u03BA\u03AC" }
+        //zh_cn { "\u039A\u03B9\u03BD\u03B5\u03B6\u03B9\u03BA\u03AC (\u0391\u03C0\u03BB\u03BF\u03C0\u03BF\u03B9\u03B7\u03BC\u03AD\u03BD\u03B1)" }
+        //zh_tw { "\u039A\u03B9\u03BD\u03B5\u03B6\u03B9\u03BA\u03AC (\u03A0\u03B1\u03C1\u03B1\u03B4\u03BF\u03C3\u03B9\u03B1\u03BA\u03AC)" }
     }
-    LocaleID:int { 0x08 }
-//    LocaleString { "el" }
     MonthAbbreviations { 
         "\u0399\u03B1\u03BD",
         "\u03A6\u03B5\u03B2",
@@ -149,7 +382,7 @@
         "\u03A6\u03B5\u03B2\u03C1\u03BF\u03C5\u03AC\u03C1\u03B9\u03BF\u03C2",
         "\u039C\u03AC\u03C1\u03C4\u03B9\u03BF\u03C2",
         "\u0391\u03C0\u03C1\u03AF\u03BB\u03B9\u03BF\u03C2",
-        "\u039C\u03AC\u03CA\u03BF\u03C2",
+        "\u039C\u03AC\u03B9\u03BF\u03C2",
         "\u0399\u03BF\u03CD\u03BD\u03B9\u03BF\u03C2",
         "\u0399\u03BF\u03CD\u03BB\u03B9\u03BF\u03C2",
         "\u0391\u03CD\u03B3\u03BF\u03C5\u03C3\u03C4\u03BF\u03C2",
@@ -171,18 +404,10 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "ell" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
-    }
+
     LocaleScript:array { 
         "Grek"  // ISO 15924 Name 
     }
@@ -195,35 +420,34 @@
 /*
  * omit rules for Greek until we have complete and valid data.
 
-//         * Spellout rules for Greek.  Again in Greek we have to supply the words
-//         * for the multiples of 100 because they can't be derived algorithmically.
-//         * Also, the tens digit changes form when followed by a ones digit: an
-//         * accent mark disappears from the tens digit and moves to the ones digit.
-//         * Therefore, instead of using the [] notation, we actually have to use
-//         * two separate rules for each multiple of 10 to show the two forms of
-//         * the word.
+    // * Spellout rules for Greek.  Again in Greek we have to supply the words
+    // * for the multiples of 100 because they can't be derived algorithmically.
+    // * Also, the tens digit changes form when followed by a ones digit: an
+    // * accent mark disappears from the tens digit and moves to the ones digit.
+    // * Therefore, instead of using the [] notation, we actually have to use
+    // * two separate rules for each multiple of 10 to show the two forms of
+    // * the word.
 
     // Can someone supply me with information on negatives and decimals?
-    // I'm also missing the word for zero.  Can someone clue me in?
 
     SpelloutRules {
-        "zero (incomplete data); \u03ad\u03bd\u03b1; \u03b4\u03cd\u03bf; \u03b4\u03c1\u03af\u03b1; "
+        "\u03bc\u03b7\u03b4\u03ad\u03bd; \u03ad\u03bd\u03b1; \u03b4\u03cd\u03bf; \u03c4\u03c1\u03af\u03b1; "
         "\u03c4\u03ad\u03c3\u03c3\u03b5\u03c1\u03b1; \u03c0\u03ad\u03bd\u03c4\u03b5; "
         "\u03ad\u03be\u03b9; \u03b5\u03c0\u03c4\u03ac; \u03bf\u03ba\u03c4\u03ce; "
         "\u03b5\u03bd\u03bd\u03ad\u03b1;\n"
         "10: \u03b4\u03ad\u03ba\u03b1; "
-        "\u03ad\u03bd\u03b4\u03b5\u03ba\u03b1; \u03b4\u03ce\u03b4\u03b5\u03ba\u03b1; "
-        "\u03b4\u03b5\u03ba\u03b1>>;\n"
+            "\u03ad\u03bd\u03c4\u03b5\u03ba\u03b1; \u03b4\u03ce\u03b4\u03b5\u03ba\u03b1; "
+            "\u03b4\u03b5\u03ba\u03b1>>;\n"
         "20: \u03b5\u03af\u03ba\u03bf\u03c3\u03b9; \u03b5\u03b9\u03ba\u03bf\u03c3\u03b9>>;\n"
         "30: \u03c4\u03c1\u03b9\u03ac\u03bd\u03c4\u03b1; \u03c4\u03c1\u03b9\u03b1\u03bd\u03c4\u03b1>>;\n"
         "40: \u03c3\u03b1\u03c1\u03ac\u03bd\u03c4\u03b1; \u03c3\u03b1\u03c1\u03b1\u03bd\u03c4\u03b1>>;\n"
         "50: \u03c0\u03b5\u03bd\u03ae\u03bd\u03c4\u03b1; \u03c0\u03b5\u03bd\u03b7\u03bd\u03c4\u03b1>>;\n"
         "60: \u03b5\u03be\u03ae\u03bd\u03c4\u03b1; \u03b5\u03be\u03b7\u03bd\u03c4\u03b1>>;\n"
         "70: \u03b5\u03b2\u03b4\u03bf\u03bc\u03ae\u03bd\u03c4\u03b1; "
-        "\u03b5\u03b2\u03b4\u03bf\u03bc\u03b7\u03bd\u03c4\u03b1>>;\n"
+            "\u03b5\u03b2\u03b4\u03bf\u03bc\u03b7\u03bd\u03c4\u03b1>>;\n"
         "80: \u03bf\u03b3\u03b4\u03cc\u03bd\u03c4\u03b1; \u03bf\u03b3\u03b4\u03bf\u03bd\u03c4\u03b1>>;\n"
         "90: \u03b5\u03bd\u03bd\u03b5\u03bd\u03ae\u03bd\u03c4\u03b1; "
-        "\u03b5\u03bd\u03bd\u03b5\u03bd\u03b7\u03bd\u03c4\u03b1>>;\n"
+            "\u03b5\u03bd\u03bd\u03b5\u03bd\u03b7\u03bd\u03c4\u03b1>>;\n"
         "100: \u03b5\u03ba\u03b1\u03c4\u03cc[\u03bd >>];\n"
         "200: \u03b4\u03b9\u03b1\u03ba\u03cc\u03c3\u03b9\u03b1[ >>];\n"
         "300: \u03c4\u03c1\u03b9\u03b1\u03ba\u03cc\u03c3\u03b9\u03b1[ >>];\n"
@@ -235,19 +459,14 @@
         "900: \u03b5\u03bd\u03bd\u03b9\u03b1\u03ba\u03cc\u03c3\u03b9\u03b1[ >>];\n"
         "1000: \u03c7\u03af\u03bb\u03b9\u03b1[ >>];\n"
         "2000: << \u03c7\u03af\u03bb\u03b9\u03b1[ >>];\n"
-        "1,000,000: << \u03b5\u03ba\u03b1\u03c4\u03bf\u03bc\u03bc\u03b9\u03cc\u03c1\u03b9\u03bf[ >>];\n"
-        "1,000,000,000: << \u03b4\u03b9\u03c3\u03b5\u03ba\u03b1\u03c4\u03bf\u03bc\u03bc\u03b9\u03cc\u03c1\u03b9\u03bf[ >>];\n"
+        "1,000,000: << \u03b5\u03ba\u03b1\u03c4\u03bf\u03bc\u03bc\u03cd\u03c1\u03b9\u03bf[ >>];\n"
+        "1,000,000,000: << \u03b4\u03b9\u03c3\u03b5\u03ba\u03b1\u03c4\u03bf\u03bc\u03bc\u03cd\u03c1\u03b9\u03bf[ >>];\n"
         "1,000,000,000,000: =#,##0="
-     }
+    }
 */
 
     TransliterateLATIN {
         "UNGEGN",
         "::Greek-Latin/UNGEGN;"
     }
-
-    // Currency display names
-    Currencies {
-        GRD { "\u0394\u03C1\u03C7", "GRD" }
-    }
-}
+}
\ No newline at end of file

Index: el_GR.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/el_GR.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- el_GR.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ el_GR.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,14 +7,10 @@
 
 el_GR {
     Version { "2.0" }
-//    LocaleString { "el_GR" }
-
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0.00\u00a4;-\u00a4#,##0.00",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "GRC" }
-    LocaleID:int { 0x0408 }
 }

Index: en.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/en.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en.txt	10 Sep 2003 02:42:05 -0000	1.1
+++ en.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -6,465 +6,282 @@
 // ***************************************************************************
 
 en {
-    Version { "2.0" }
-    NumberPatterns { 
-        "#,##0.###;-#,##0.###",
-        "\u00A4#,##0.00;-\u00A4#,##0.00",
-        "#,##0%",
-        "#E0",
+    Version { "3.0" }
+    collations {
[...1809 lines suppressed...]
+            "Bucharest",
+        }
+        {
+            "CTT",
+            "China Standard Time",
+            "CTT",
+            "China Standard Time",
+            "CDT",
+            "Shanghai",
+        }
+        {
+            "Asia/Shanghai",
+            "China Standard Time",
+            "CTT",
+            "China Standard Time",
+            "CDT",
+            "Shanghai",
+        }
     }
 }

Index: en_AU.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/en_AU.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en_AU.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ en_AU.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,15 +7,6 @@
 
 en_AU {
     Version { "2.0" }
-//    Duplicated in parent
-//    Countries { 
-//        US { "United States" }
-//        GB { "United Kingdom" }
-//        CA { "Canada" }
-//        IE { "Ireland" }
-//        AU { "Australia" }
-//        NZ { "New Zealand" }
-//    }
     DateTimePatterns { 
         "h:mm:ss a z",
         "h:mm:ss a",
@@ -27,14 +18,6 @@
         "d/MM/yy",
         "{1} {0}",
     }
-//    Duplicated in parent
-//    Languages { 
-//        en { "English" }
-//    }
-    LocaleID:int { 0x0c09 }
-//    LocaleString { "en_AU" }
-//    ShortCountry { "AUS" }
-
     // Currency display names
     Currencies {
         AUD { "$", "Australian Dollar" }

Index: en_BE.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/en_BE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en_BE.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ en_BE.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,10 +7,12 @@
 
 en_BE {
     Version { "2.0" }
-    CollationElements { 
-	    Version { "1.0.1" }
-		Sequence { "[backwards 2]" }
-	}
+    collations {
+      standard { 
+        Version { "1.0.1" }
+        Sequence { "[backwards 2]" }
+      }
+    }
     DateTimePatterns {
         "HH' h 'mm' min 'ss' s 'z",
         "HH:mm:ss z",
@@ -40,6 +42,7 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
 //    ShortCountry { "BEL" }
 

Index: en_CA.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/en_CA.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en_CA.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ en_CA.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,15 +7,6 @@
 
 en_CA {
     Version { "2.0" }
-//    Duplicated in parent
-//    Countries { 
-//        US { "United States" }
-//        GB { "United Kingdom" }
-//        CA { "Canada" }
-//        IE { "Ireland" }
-//        AU { "Australia" }
-//        NZ { "New Zealand" }
-//    }
     DateTimePatterns { 
         "h:mm:ss a z",
         "h:mm:ss a z",
@@ -33,150 +24,6 @@
         "#,##0%",
         "#E0",
     }
-//    Duplicated in parent
-//    Languages { 
-//        en { "English" }
-//    }
-    LocaleID:int { 0x1009 }
-//    LocaleString { "en_CA" }
-//    ShortCountry { "CAN" }
-
-// This is horrible data, just try to use the en locale data
-/*    zoneStrings {
-        {
-            "PST",
-            "Pacific Standard Time",
-            "PST",
-            "Pacific Daylight Time",
-            "PDT",
-        }
-        {
-            "MST",
-            "Mountain Standard Time",
-            "MST",
-            "Mountain Daylight Time",
-            "MDT",
-        }
-        {
-            "PNT",
-            "Mountain Standard Time",
-            "MST",
-            "Mountain Standard Time",
-            "MST",
-        }
-        {
-            "CST",
-            "Central Standard Time",
-            "CST",
-            "Central Daylight Time",
-            "CDT",
-        }
-        {
-            "EST",
-            "Eastern Standard Time",
-            "EST",
-            "Eastern Daylight Time",
-            "EDT",
-        }
-        {
-            "IET",
-            "Eastern Standard Time",
-            "EST",
-            "Eastern Standard Time",
-            "EST",
-        }
-        {
-            "HST",
-            "Hawaii Standard Time",
-            "HST",
-            "Hawaii Standard Time",
-            "HST",
-        }
-        {
-            "AST",
-            "Alaska Standard Time",
-            "AKST",
-            "Alaska Daylight Time",
-            "AKDT",
-        }
-        {
-            "CNT",
-            "Newfoundland Standard Time",
-            "NST",
-            "Newfoundland Daylight Time",
-            "NDT",
-        }
-        {
-            "America/Los_Angeles",
-            "Pacific Standard Time",
-            "PST",
-            "Pacific Daylight Time",
-            "PDT",
-        }
-        {
-            "America/Denver",
-            "Mountain Standard Time",
-            "MST",
-            "Mountain Daylight Time",
-            "MDT",
-        }
-        {
-            "America/Phoenix",
-            "Mountain Standard Time",
-            "MST",
-            "Mountain Standard Time",
-            "MST",
-        }
-        {
-            "America/Chicago",
-            "Central Standard Time",
-            "CST",
-            "Central Daylight Time",
-            "CDT",
-        }
-        {
-            "America/New_York",
-            "Eastern Standard Time",
-            "EST",
-            "Eastern Daylight Time",
-            "EDT",
-        }
-        {
-            "America/Indianapolis",
-            "Eastern Standard Time",
-            "EST",
-            "Eastern Standard Time",
-            "EST",
-        }
-        {
-            "Pacific/Honolulu",
-            "Hawaii Standard Time",
-            "HST",
-            "Hawaii Standard Time",
-            "HST",
-        }
-        {
-            "America/Anchorage",
-            "Alaska Standard Time",
-            "AKST",
-            "Alaska Daylight Time",
-            "AKDT",
-        }
-        {
-            "America/Halifax",
-            "Atlantic Standard Time",
-            "AST",
-            "Atlantic Daylight Time",
-            "ADT",
-        }
-        {
-            "America/St_Johns",
-            "Newfoundland Standard Time",
-            "NST",
-            "Newfoundland Daylight Time",
-            "NDT",
-        }
-    }*/
 
     // Currency display names
     Currencies {

Index: en_GB.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/en_GB.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en_GB.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ en_GB.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,15 +7,6 @@
 
 en_GB {
     Version { "2.0" }
-//    Duplicated in parent
-//    Countries { 
-//        US { "United States" }
-//        GB { "United Kingdom" }
-//        CA { "Canada" }
-//        IE { "Ireland" }
-//        AU { "Australia" }
-//        NZ { "New Zealand" }
-//    }
     DateTimeElements:intvector {
         2,
         1,
@@ -31,13 +22,6 @@
         "dd/MM/yyyy",
         "{1} {0}",
     }
-//    Duplicated in parent
-//    Languages { 
-//        en { "English" }
-//    }
-    LocaleID:int { 0x0809 }
-//    LocaleString { "en_GB" }
-//    ShortCountry { "GBR" }
     zoneStrings { 
         {
             "Europe/London",
@@ -64,53 +48,53 @@
 //         * value is sometimes called a "milliard," but this word seems to have
 //         * fallen into disuse.)
 
-        // Could someone please correct me if I'm wrong about "milliard" falling
-        // into disuse, or have missed any other details of how large numbers
-        // are rendered.  Also, could someone please provide me with information
-        // on which other English-speaking countries use which system?  Right now,
-        // I'm assuming that the U.S. system is used in Canada and that all the
-        // other English-speaking countries follow the British system.  Can
-        // someone out there confirm this?
+    // Could someone please correct me if I'm wrong about "milliard" falling
+    // into disuse, or have missed any other details of how large numbers
+    // are rendered.  Also, could someone please provide me with information
+    // on which other English-speaking countries use which system?  Right now,
+    // I'm assuming that the U.S. system is used in Canada and that all the
+    // other English-speaking countries follow the British system.  Can
+    // someone out there confirm this?
 
     SpelloutRules {
         "%simplified:\n"
-        "    -x: minus >>;\n"
-        "    x.x: << point >>;\n"
-        "    zero; one; two; three; four; five; six; seven; eight; nine;\n"
-        "    ten; eleven; twelve; thirteen; fourteen; fifteen; sixteen;\n"
-        "        seventeen; eighteen; nineteen;\n"
-        "    20: twenty[->>];\n"
-        "    30: thirty[->>];\n"
-        "    40: forty[->>];\n"
-        "    50: fifty[->>];\n"
-        "    60: sixty[->>];\n"
-        "    70: seventy[->>];\n"
-        "    80: eighty[->>];\n"
-        "    90: ninety[->>];\n"
-        "    100: << hundred[ >>];\n"
-        "    1000: << thousand[ >>];\n"
-        "    1,000,000: << million[ >>];\n"
-        "    1,000,000,000,000: << billion[ >>];\n"
-        "    1,000,000,000,000,000: =#,##0=;\n"
+            "-x: minus >>;\n"
+            "x.x: << point >>;\n"
+            "zero; one; two; three; four; five; six; seven; eight; nine;\n"
+            "ten; eleven; twelve; thirteen; fourteen; fifteen; sixteen;\n"
+            "    seventeen; eighteen; nineteen;\n"
+            "20: twenty[->>];\n"
+            "30: thirty[->>];\n"
+            "40: forty[->>];\n"
+            "50: fifty[->>];\n"
+            "60: sixty[->>];\n"
+            "70: seventy[->>];\n"
+            "80: eighty[->>];\n"
+            "90: ninety[->>];\n"
+            "100: << hundred[ >>];\n"
+            "1000: << thousand[ >>];\n"
+            "1,000,000: << million[ >>];\n"
+            "1,000,000,000,000: << billion[ >>];\n"
+            "1,000,000,000,000,000: =#,##0=;\n"
         "%default:\n"
-        "    -x: minus >>;\n"
-        "    x.x: << point >>;\n"
-        "    =%simplified=;\n"
-        "    100: << hundred[ >%%and>];\n"
-        "    1000: << thousand[ >%%and>];\n"
-        "    100,000>>: << thousand[>%%commas>];\n"
-        "    1,000,000: << million[>%%commas>];\n"
-        "    1,000,000,000,000: << billion[>%%commas>];\n"
-        "    1,000,000,000,000,000: =#,##0=;\n"
+            "-x: minus >>;\n"
+            "x.x: << point >>;\n"
+            "=%simplified=;\n"
+            "100: << hundred[ >%%and>];\n"
+            "1000: << thousand[ >%%and>];\n"
+            "100,000>>: << thousand[>%%commas>];\n"
+            "1,000,000: << million[>%%commas>];\n"
+            "1,000,000,000,000: << billion[>%%commas>];\n"
+            "1,000,000,000,000,000: =#,##0=;\n"
         "%%and:\n"
-        "    and =%default=;\n"
-        "    100: =%default=;\n"
+            "and =%default=;\n"
+            "100: =%default=;\n"
         "%%commas:\n"
-        "    ' and =%default=;\n"
-        "    100: , =%default=;\n"
-        "    1000: , <%default< thousand, >%default>;\n"
-        "    1,000,000: , =%default=;"
+            "' and =%default=;\n"
+            "100: , =%default=;\n"
+            "1000: , <%default< thousand, >%default>;\n"
+            "1,000,000: , =%default=;"
         "%%lenient-parse:\n"
-        "    & ' ' , ',' ;\n" 
+            "& ' ' , ',' ;\n" 
     }
 }

Index: en_GB_EURO.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/en_GB_EURO.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en_GB_EURO.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ en_GB_EURO.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,13 +7,5 @@
 
 en_GB_EURO {
     Version{"2.0"}
- 
-    NumberPatterns { 
-        "#,##0.###;-#,##0.###",
-        "\u00a4#,##0.00;-\u00a4#,##0.00",
-        "#,##0%",
-        "#E0",
-    }
-
 }
 

Index: en_HK.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/en_HK.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en_HK.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ en_HK.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -16,10 +16,10 @@
         "h:mm:ss a z",
         "h:mm:ss a",
         "h:mm a",
-        "EEEE, MMMM d, yyyy",
-        "MMMM d, yyyy",
-        "d-MMM-yy",
-        "dd/MM/yy",
+        "EEEE, d MMMM yyyy",
+        "d MMMM yyyy",
+        "d MMM yyyy",
+        "dd/MM/yyyy",
         "{1} {0}",
     }
 //    NumberElements {
@@ -40,5 +40,9 @@
         "\u00A4#,##0.00;(\u00A4#,##0.00)",
         "#,##0%",
         "#E0",
+    }
+    Currencies{
+        HKD { "$",  "Hong Kong Dollar"     } 
+        USD { "US$",     "USD" } // US Dollar
     }
 }

Index: en_IE.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/en_IE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en_IE.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ en_IE.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,18 +7,12 @@
 
 en_IE {
     Version { "2.0" }
-//    Duplicated in parent
-//    Countries { 
-//        US { "United States" }
-//        GB { "United Kingdom" }
-//        CA { "Canada" }
-//        IE { "Ireland" }
-//        AU { "Australia" }
-//        NZ { "New Zealand" }
-//    }
-    DateTimeElements:intvector { 
-        2,
-        1,
+    AmPmMarkers { 
+        "a.m.",
+        "p.m.",
+    }
+    Currencies {
+        IEP { "\u00A3","Irish Pound" } // 1922-2001
     }
     DateTimePatterns { 
         "HH:mm:ss z",
@@ -37,21 +31,14 @@
         "#,##0%",
         "#E0",
     }
-//    Duplicated in parent
-//    Languages { 
-//        en { "English" }
-//    }
-    LocaleID:int { 0x1809 }
-//    LocaleString { "en_IE" }
-//    ShortCountry { "IRL" }
     zoneStrings { 
         {
-            "Europe/London",
-            "Greenwich Mean Time",
-            "GMT",
-            "Ireland Summer Time",
+            "Europe/Dublin",
+            "Greenwich Mean Time",   // This doesn't look correct
+            "GMT",                   // This doesn't look correct
+            "Irish Summer Time",
             "IST",
+            "Dublin",
         }
     }
-
 }

Index: en_MT.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/en_MT.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en_MT.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ en_MT.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -10,9 +10,6 @@
 en_MT {
     Version{ "2.0" }
 
-//    ShortCountry { MLT }
-
-
     NumberPatterns {
         "#,##0.###;-#,##0.###",
         "\u00A4#,##0.00;(\u00A4#,##0.00)",
@@ -31,8 +28,9 @@
         "dd/MM/yy",
         "{1} {0}",
     }
-
-
-//    LocaleID {"043A"}  ??
+    Currencies{
+        MTP { "\u00A3", "Maltese Pound"} 
+        GBP { "GBP", "British Pound Sterling" } // British Pound Sterling
+    }
 
 }

Index: en_NZ.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/en_NZ.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en_NZ.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ en_NZ.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,15 +7,6 @@
 
 en_NZ {
     Version { "2.0" }
-//    Duplicated in parent
-//    Countries { 
-//        US { "United States" }
-//        GB { "United Kingdom" }
-//        CA { "Canada" }
-//        IE { "Ireland" }
-//        AU { "Australia" }
-//        NZ { "New Zealand" }
-//    }
     DateTimePatterns { 
         "h:mm:ss a z",
         "h:mm:ss a",
@@ -27,14 +18,6 @@
         "d/MM/yy",
         "{1} {0}",
     }
-//    Duplicated in parent
-//    Languages { 
-//        en { "English" }
-//    }
-    LocaleID:int { 0x1409 }
-//    LocaleString { "en_NZ" }
-//    ShortCountry { "NZL" }
-
     // Currency display names
     Currencies {
         NZD { "$", "New Zealand Dollar" }

Index: en_PH.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/en_PH.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en_PH.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ en_PH.txt	6 Apr 2004 10:08:11 -0000	1.2
@@ -7,10 +7,6 @@
 
 en_PH {
     Version{"2.0"}
-//    AmPmMarkers { 
-//        "AM",
-//        "PM",
-//    }
 
     DateTimePatterns { 
         "h:mm:ss a z",
@@ -23,6 +19,9 @@
         "M/d/yy",
         "{1} {0}",
     }
+    Currencies{
+        PHP { "PHP",  "Peso"     } 
+    }
 //    NumberElements {
 //        ".",
 //        ",",
@@ -42,6 +41,5 @@
         "#,##0%",
         "#E0",
     }
-    LocaleID:int { 0x3409 }
 
 }

Index: en_SG.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/en_SG.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en_SG.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ en_SG.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -37,5 +37,9 @@
             "Singapore"
         }
     }
+    Currencies{
+        SGD { "$",  "Singapore Dollar"     } // 8/9/1965-
+        USD { "US$",     "USD" } // US Dollar
+    }
 
 }

Index: en_US.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/en_US.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en_US.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ en_US.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -7,13 +7,23 @@
 
 en_US {
     Version{ "2.0" }
-//    LocaleString { "en_US" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "\u00A4#,##0.00;(\u00A4#,##0.00)",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "USA" }
-    LocaleID:int { 0x0409 }
+
+    // the PaperSize units are in mm
+    // these values are not exact .. they are rounded off
+    PaperSize:intvector{
+        279, // height
+        216  // width 
+    }
+    MeasurementSystem:int{ 1 } // US system
+    
+    Currencies{
+        USD { "$",   "US Dollar"            } // 04/04/1792-
+    }
+
 }

Index: en_US_POSIX.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/en_US_POSIX.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en_US_POSIX.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ en_US_POSIX.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -29,7 +29,6 @@
         "INF",
         "\uFFFD",
         ".",
+        "+",
     }
-//    LocaleString { "en_US_POSIX" }
-    LocaleID:int { 0x7F }
 }

Index: en_VI.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/en_VI.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en_VI.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ en_VI.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -7,13 +7,10 @@
 
 en_VI {
     Version{ "2.0" }
-//    LocaleString { "en_VI" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "\u00A4#,##0.00;(\u00A4#,##0.00)",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "VIR" }
-    LocaleID:int { 0x2409 }
 }

Index: en_ZA.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/en_ZA.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en_ZA.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ en_ZA.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -7,14 +7,6 @@
 
 en_ZA {
     Version { "2.0" }
-//    Duplicated in parent
-//    Countries { 
-//        US { "United States" }
-//        GB { "United Kingdom" }
-//        CA { "Canada" }
-//        IE { "Ireland" }
-//        ZA { "South Africa" }
-//    }
     DateTimePatterns { 
         "h:mm:ss a",
         "h:mm:ss a",
@@ -26,17 +18,10 @@
         "yyyy/MM/dd",
         "{1} {0}",
     }
-//    Duplicated in parent
-//    Languages { 
-//        en { "English" }
-//    }
-    LocaleID:int { 0x1c09 }
-//    LocaleString { "en_ZA" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "\u00A4#,##0.00;-\u00A4#,##0.00",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "ZAF" }
 }

Index: en_ZW.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/en_ZW.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en_ZW.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ en_ZW.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -24,5 +24,8 @@
         "#,##0%",
         "#E0",
     }
-    LocaleID:int { 0x3009 }
+    Currencies{
+        ZWD { "Z$",  "Zimbabwean Dollar"      } // 04/18/1980- Zimbabwean Dollar
+        USD { "US$",     "USD" } // US Dollar
+    }
 }

Index: eo.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/eo.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- eo.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ eo.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -7,34 +7,272 @@
 //              or better http://www.jtcsv.com/cgibin/icu-bugs
 
 eo {
-    Version { "3.0" } 
-
+    Version { "4.0" } 
     // collation: accented characters have primary (base character) differences
     // see Jitterbug 1440 http://www.jtcsv.com/cgibin/icu-bugs?findid=1440
-    CollationElements { 
-        Version { "1.0" }
-        Sequence { "&C<\u0109<<<\u0108 &G<\u011d<<<\u011c &H<\u0125<<<\u0124"
-                   "&J<\u0135<<<\u0134 &S<\u015d<<<\u015c &U<\u016d<<<\u016c" }
+    collations {
+        standard { 
+            Version { "1.0" }
+            Sequence { "&C<\u0109<<<\u0108 &G<\u011d<<<\u011c &H<\u0125<<<\u0124"
+                       "&J<\u0135<<<\u0134 &S<\u015d<<<\u015c &U<\u016d<<<\u016c" }
+        }
     }
-
+    // data comes from http://www.bertilow.com/lanlin/iso.php and http://www.geonames.de/
     Countries { 
+        AD { "Andoro" }
+        AE { "Unui\u011dintaj Arabaj Emirlandos" }
+        AF { "Afganujo" }
+        AG { "Antigvo-Barbudo" }
+        AI { "Angvilo" }
+        AL { "Albanujo" }
+        AM { "Armenujo" }
+        AN { "Nederlandaj Antiloj" }
+        AO { "Angolo" }
+        AQ { "Antarkto" }
+        AR { "Argentino" }
         AT { "A\u016dstrujo" }
+        AU { "A\u016dstralio" }
+        AW { "Arubo" }
+        AZ { "Azerbaj\u011dano" }
+
+        BA { "Bosnio-Hercegovino" }
+        BB { "Barbado" }
+        BD { "Banglade\u015do" }
         BE { "Belgujo" }
+        BF { "Burkino" }
+        BG { "Bulgarujo" }
+        BH { "Barejno" }
+        BI { "Burundo" }
+        BJ { "Benino" }
+        BM { "Bermudoj" }
+        BN { "Brunejo" }
+        BO { "Bolivio" }
+        BR { "Brazilo" }
+        BS { "Bahamoj" }
+        BT { "Butano" }
+        BW { "Bocvano" }
+        BY { "Belorusujo" }
+        BZ { "Belizo" }
+
         CA { "Kanado" }
+        CF { "Centr-Afrika Respubliko" }
+        CG { "Kongolo" }
         CH { "Svisujo" }
+        CI { "Ebur-Bordo" }
+        CK { "Kukinsuloj" }
+        CL { "\u0108ilio" }
+        CM { "Kameruno" }
+        CN { "\u0108inujo" }
+        CO { "Kolombio" }
+        CR { "Kostariko" }
+        //CS { "Serbujo kaj Montenegro" } // TODO: if we allow this, then SP must go away
+        CU { "Kubo" }
+        CV { "Kabo-Verdo" }
+        CY { "Kipro" }
+        CZ { "\u0108e\u0125ujo" } // Incomplete translation?
+
         DE { "Germanujo" }
+        DJ { "\u011cibutio" }
         DK { "Danujo" }
+        DM { "Dominiko" }
+        DO { "Domingo" } // Incomplete translation?
+        DZ { "Al\u011derio" }
+
+        EC { "Ekvadoro" }
+        EE { "Estonujo" }
+        EG { "Egipto" }
+        EH { "Okcidenta Saharo" }
+        ER { "Eritreo" }
         ES { "Hispanujo" }
+        ET { "Etiopujo" }
+
         FI { "Finnlando" }
+        FJ { "Fi\u011doj" }
+        FM { "Mikronezio" }
+        FO { "Ferooj" }
+        FR { "Francujo" }
+
+        GA { "Gabono" }
+        GB { "Unui\u011dinta Re\u011dlando" }
+        GD { "Grenado" }
+        GE { "Kartvelujo" }
+        GF { "Franca Gviano" }
+        GH { "Ganao" }
+        GI { "\u011cibraltaro" }
+        GL { "Gronlando" }
+        GM { "Gambio" }
+        GN { "Gvineo" }
+        GP { "Gvadelupo" }
+        GQ { "Ekvatora Gvineo" }
         GR { "Grekujo" }
+        GS { "Sud-Georgio kaj Sud-Sandvi\u0109insuloj" }
+        GT { "Gvatemalo" }
+        GU { "Gvamo" }
+        GW { "Gvineo-Bisa\u016do" }
+        GY { "Gujano" }
+
+        //HK { "Honkongo" } // missing S.A.R. China
+        HM { "Herda kaj Makdonaldaj Insuloj" }
+        HN { "Honduro" }
+        HR { "Kroatujo" }
+        HT { "Haitio" }
+        HU { "Hungarujo" }
+
+        ID { "Indonezio" }
+        IE { "Irlando" }
+        IL { "Israelo" }
+        //IN { "Barato" } // Alternate spelling
+        IN { "Hindujo" }
+        IO { "Brita Hindoceana Teritorio" }
+        IQ { "Irako" }
+        IR { "Irano" }
+        IS { "Islando" }
         IT { "Italujo" }
+
+        JM { "Jamajko" }
+        JO { "Jordanio" }
         JP { "Japanujo" }
+
+        KE { "Kenjo" }
+        KG { "Kirgizistano" }
+        KH { "Kambo\u011do" }
+        KI { "Kiribato" }
+        KM { "Komoroj" }
+        KN { "Sent-Kristofo kaj Neviso" }
+        KP { "Nord-Koreo" }
+        KR { "Sud-Koreo" }
+        KW { "Kuvajto" }
+        KY { "Kejmanoj" }
+        KZ { "Kaza\u0125stano" }
+
+        LA { "Laoso" }
+        LB { "Libano" }
+        LC { "Sent-Lucio" }
+        LI { "Li\u0125ten\u015dtejno" }
+        LK { "Sri-Lanko" }
+        LR { "Liberio" }
+        LS { "Lesoto" }
+        LT { "Litovujo" }
+        LU { "Luksemburgo" }
+        LV { "Latvujo" }
+        LY { "Libio" }
+
+        MA { "Maroko" }
+        MC { "Monako" }
+        MD { "Moldavujo" }
+        MG { "Madagaskaro" }
+        MH { "Mar\u015daloj" }
+        MK { "Makedonujo" }
+        ML { "Malio" }
+        MM { "Mjanmao" }
+        MN { "Mongolujo" }
+        //MO { "Makao" } // missing S.A.R. China
+        MP { "Nord-Marianoj" }
+        MQ { "Martiniko" }
+        MR { "Ma\u016dritanujo" }
+        MT { "Malto" }
+        MU { "Ma\u016dricio" }
+        MV { "Maldivoj" }
+        MW { "Malavio" }
+        MX { "Meksiko" }
+        MY { "Malajzio" }
+        MZ { "Mozambiko" }
+
+        NA { "Namibio" }
+        NC { "Nov-Kaledonio" }
+        NE { "Ni\u011dero" }
+        NF { "Norfolkinsulo" }
+        NG { "Ni\u011derio" }
+        NI { "Nikaragvo" }
         NL { "Nederlando" }
-        NO { "Norvego" }
+        NO { "Norvegujo" }
+        NP { "Nepalo" }
+        NR { "Nauro" }
+        NU { "Niuo" }
+        NZ { "Nov-Zelando" }
+
+        OM { "Omano" }
+
+        PA { "Panamo" }
+        PE { "Peruo" }
+        PF { "Franca Polinezio" }
+        PG { "Papuo-Nov-Gvineo" }
+        PH { "Filipinoj" }
+        PK { "Pakistano" }
+        PL { "Pollando" }
+        PM { "Sent-Piero kaj Mikelono" }
+        PN { "Pitkarna Insulo" }
+        PR { "Puerto-Riko" }
         PT { "Portugalujo" }
+        PW { "Bela\u016do" }
+        PY { "Paragvajo" }
+
+        QA { "Kataro" }
+
+        RE { "Reunio" }
+        RO { "Rumanujo" }
+        RU { "Rusujo" }
+        RW { "Ruando" }
+
+        SA { "Sa\u016dda Arabujo" }
+        SB { "Salomonoj" }
+        SC { "Sej\u015deloj" }
+        SD { "Sudano" }
         SE { "Svedujo" }
+        SG { "Singapuro" }
+        SH { "Sent-Heleno" }
+        SI { "Slovenujo" }
+        SJ { "Svalbardo kaj Jan-Majen-insulo" }
+        SK { "Slovakujo" }
+        SL { "Siera-Leono" }
+        SM { "San-Marino" }
+        SN { "Senegalo" }
+        SO { "Somalujo" }
+        SP { "Serbujo" }
+        SR { "Surinamo" }
+        ST { "Sao-Tomeo kaj Principeo" }
+        SV { "Salvadoro" }
+        SY { "Sirio" }
+        SZ { "Svazilando" }
+
+        TD { "\u0108ado" }
+        TG { "Togolo" } // Just plain Togo?
+        TH { "Tajlando" }
+        TJ { "Ta\u011dikujo" } // Ta\u011dikistano?
+        //TL { "Orienta Timoro" }    // This was called East Timor. Now it's Timor-Leste
+        TM { "Turkmenujo" } // Turkmenistano?
+        TN { "Tunizio" }
+        TO { "Tongo" }
         TR { "Turkujo" }
+        TT { "Trinidado kaj Tobago" }
+        TV { "Tuvalo" }
+        TW { "Tajvano" }
+        TZ { "Tanzanio" }
+
+        UA { "Ukrajno" }
+        UG { "Ugando" }
+        UM { "Usonaj malgrandaj insuloj" }
         US { "Usono" }
+        UY { "Urugvajo" }
+        UZ { "Uzbekujo" } // Uzbekistano?
+
+        VA { "Vatikano" }
+        VC { "Sent-Vincento kaj la Grenadinoj" }
+        VE { "Venezuelo" }
+        VG { "Britaj Virgulininsuloj" }
+        VI { "Usonaj Virgulininsuloj" }
+        VN { "Vjetnamo" }
+        VU { "Vanuatuo" }
+
+        WF { "Valiso kaj Futuno" }
+        WS { "Samoo" }
+
+        YE { "Jemeno" }
+        YT { "Majoto" }
+
+        ZA { "Sud-Afriko" }
+        ZM { "Zambio" }
+        ZW { "Zimbabvo" }
     }
     DateTimePatterns { 
         "H'-a horo kaj 'm z",
@@ -77,24 +315,147 @@
         "aK",
         "pK",
     }
-    Languages { 
+    // Data comes from http://www.bertilow.com/lanlin/iso.php
+    Languages {
+        aa { "afara" }
+        ab { "ab\u0125aza" }
+        af { "afrikansa" }
+        am { "amhara" }
+        ar { "araba" }
+        as { "asama" }
+        ay { "ajmara" }
+        az { "azerbaj\u011dana" }
+        ba { "ba\u015dkira" }
+        be { "belorusa" }
+        bg { "bulgara" }
+        bh { "bihara" }
+        bi { "bislamo" }
+        bn { "bengala" }
+        bo { "tibeta" }
+        br { "bretona" }
+        ca { "kataluna" }
+        co { "korsika" }
+        cs { "\u0109e\u0125a" }
+        cy { "kimra" }
         da { "dana" }
         de { "germana" }
+        dz { "dzonko" }
         el { "greka" }
         en { "angla" }
         eo { "esperanto" }
         es { "hispana" }
+        et { "estona" }
+        eu { "e\u016dska" }
+        fa { "persa" }
         fi { "finna" }
+        fj { "fi\u011dia" }
+        fo { "feroa" }
+        fr { "franca" }
+        fy { "frisa" }
+        ga { "irlanda" }
+        gd { "gaela" }
+        gl { "galega" }
+        gn { "gvarania" }
+        gu { "gu\u011darata" }
+        ha { "ha\u016dsa" }
+        he { "hebrea" }
+        hi { "hinda" }
+        hr { "kroata" }
+        hu { "hungara" }
+        hy { "armena" }
+        ia { "interlingvao" }
+        id { "indonezia" }
+        ie { "okcidentalo" }
+        ik { "eskima" }
+        is { "islanda" }
         it { "itala" }
+        iu { "inuita" }
         ja { "japana" }
+        jv { "java" }
+        ka { "kartvela" }
+        kk { "kaza\u0125a" }
+        kl { "gronlanda" }
+        km { "kmera" }
+        kn { "kanara" }
+        ko { "korea" }
+        ks { "ka\u015dmira" }
+        ku { "kurda" }
+        ky { "kirgiza" }
+        la { "latino" }
+        ln { "lingala" }
+        lo { "la\u016da" }
+        lt { "litova" }
+        lv { "latva" }
+        mg { "malagasa" }
+        mi { "maoria" }
+        mk { "makedona" }
+        ml { "malajalama" }
+        mn { "mongola" }
+        mr { "marata" }
+        ms { "malaja" }
+        mt { "malta" }
+        my { "birma" }
+        na { "naura" }
+        ne { "nepala" }
         nl { "nederlanda" }
         no { "norvega" }
+        oc { "okcitana" }
+        om { "oroma" }
+        or { "orijo" }
+        pa { "pan\u011daba" }
+        pl { "pola" }
+        ps { "pa\u015dtua" }
         pt { "portugala" }
+        qu { "ke\u0109ua" }
+        rm { "roman\u0109a" }
+        rn { "burunda" }
+        ro { "rumana" }
+        ru { "rusa" }
+        rw { "ruanda" }
+        sa { "sanskrito" }
+        sd { "sinda" }
+        sg { "sangoa" }
+        sh { "serbo-Kroata" }
+        si { "sinhala" }
+        sk { "slovaka" }
+        sl { "slovena" }
+        sm { "samoa" }
+        sn { "\u015dona" }
+        so { "somala" }
+        sq { "albana" }
+        sr { "serba" }
+        ss { "svazia" }
+        st { "sota" }
+        su { "sunda" }
         sv { "sveda" }
+        sw { "svahila" }
+        ta { "tamila" }
+        te { "telugua" }
+        tg { "ta\u011dika" }
+        th { "taja" }
+        ti { "tigraja" }
+        tk { "turkmena" }
+        tl { "filipina" }
+        tn { "cvana" }
+        to { "tongaa" }
         tr { "turka" }
+        ts { "conga" }
+        tt { "tatara" }
+        tw { "akana" }
+        ug { "ujgura" }
+        uk { "ukraina" }
+        ur { "urduo" }
+        uz { "uzbeka" }
+        vi { "vjetnama" }
+        vo { "volapuko" }
+        wo { "volofa" }
+        xh { "ksosa" }
+        yi { "jida" }
+        yo { "joruba" }
+        za { "\u011duanga" }
+        zh { "\u0109ina" }
+        zu { "zulua" }
     }
-    //LocaleID { "07e0" }
-//    LocaleString { "eo" }
     MonthAbbreviations { 
         "jan",
         "feb",
@@ -136,12 +497,12 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "epo" }
     localPatternChars { "GjMtkHmslTDUSnahKzJd" }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
+    LocaleScript:array{ 
+        "Latn",  // ISO 15924 Name 
+    }
     ExemplarCharacters { "[a-z \u016d \u0109 \u011d \u0125 \u0135 \u015d]" }
     //------------------------------------------------------------
     // Rule Based Number Format Support

Index: es.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -6,98 +6,448 @@
 // ***************************************************************************
 
 es {
-    Version { "2.0" }
-    CollationElements { 
-        Version { "1.0" }
-        Sequence { "& N < n\u0303<<< N\u0303" }
+    Version { "3.0" }
+    collations {
+        standard {
+            Version { "1.1" }
+            Sequence { "& N < n\u0303<<< N\u0303"
+                       "&A<<\u00c6/E &a<<\u00e6/e" }
+        }
+        traditional {
+            Version { "1.0" }
+            Sequence { "& N < n\u0303<<< N\u0303"
+                "&C < ch <<< Ch <<< CH"
+                "&l < ll <<< Ll <<< LL"
+            }
+        }
+    }
+    // Currency display names
+    Currencies {
+        ADP { "ADP", "Peseta Andorrana" }
+        AED { "AED", "Dirham de los Emiratos \u00C1rabes Unidos" }
+        AFA { "AFA", "Afghani" }
+        ALL { "ALL", "Lek Alban\u00E9s" }
+        AMD { "AMD", "Dram Armenio" }
+        ANG { "ANG", "Guilder de India Occidental" }
+        AOK { "AOK", "Kwanza Angol\u00E9s" }
+        ARA { "ARA", "Austral Argentino" }
+        ARS { "ARS", "Peso Argentino" }
+        ATS { "ATS", "Chel\u00EDn Austriaco" }
+        AUD { "AUD", "D\u00F3lar Australiano" }
+        AWG { "AWG", "Guilder de Aruba" }
+        AZM { "AZM", "Manat de Azerbaijan" }
+        BAD { "BAD", "Dinar de Bosnia-Herzogovinia" }
+        BBD { "BBD", "D\u00F3lar de Barbados" }
+        BDT { "BDT", "Taka de Bangladesh" }
+        BEF { "BEF", "Franco Belga" }
+        BGL { "BGL", "Lev Bulgaro" }
+        BHD { "BHD", "Dinar de Barein" }
+        BIF { "BIF", "Franco de Burundi" }
+        BMD { "BMD", "D\u00F3lar de Bermudas" }
+        BND { "BND", "D\u00F3lar de Brunei" }
+        BOB { "$b", "Boliviano de Bolivia" }
+        BRL { "BRL", "Real de Brazil" }
+        BSD { "BSD", "D\u00F3lar de Bahamas" }
+        BWP { "BWP", "Pula de Botswana" }
+        BYR { "BYR", "Rublo de Belorusia" }
+        BZD { "BZD", "D\u00F3lar de Belize" }
+        CAD { "CAD", "D\u00F3lar Canadiense" }
+        CHF { "CHF", "Franco Suizo" }
+        CLP { "CLP", "Peso Chileno" }
+        COP { "COP", "Peso de Colombia" }
+        CRC { "CRC", "Colon de Costa Rica" }
+        CUP { "CUP", "Peso Cubano" }
+        CVE { "CVE", "Escudo de Cabo Verde" }
+        CYP { "CYP", "Libra de Chipre" }
+        CZK { "CZK", "Krona Checa" }
+        DEM { "DEM", "Marco Alem\u00E1n" }
+        DJF { "DJF", "Franco de Djibouti" }
+        DKK { "DKK", "Corona Danesa" }
+        DOP { "RD$", "Peso Dominicano" }
+        // DRP { "DRP", "Peso de la Rep\u00FAblica Dominicana" } -- invalid
+        DZD { "DZD", "Dinar de Algeria" }
+        ECS { "S/.", "Sucre de Ecuador" }
+        // ECU { "ECU", "Moenda \u00DAnica Europea (EURO)" } -- invalid
+        EEK { "EEK", "Corona de Estonia" }
+        EGP { "EGP", "Libra Egipcia" }
+        ESP { "\u20A7", "Peseta Espa\u00F1ola" }
+        ETB { "ETB", "Birr de Etiop\u00EDa" }
+        EUR { "\u20AC", "Moneda de los estados miembros de EMU" }
+        FIM { "FIM", "Marco Finland\u00E9s" }
+        FJD { "FJD", "D\u00F3lar de Fiji" }
+        FKP { "FKP", "Libra de Falkland" }
+        FRF { "FRF", "Franco Franc\u00E9s" }
+        GBP { "\u00A3", "Libra Brit\u00E1nica" }
+        GEK { "GEK", "Kupon de Georgia" }
+        GHC { "GHC", "Cedi de Ghana" }
+        GIP { "GIP", "Libra de Gibraltar" }
+        GMD { "GMD", "Dalasi de Gambia" }
+        GNF { "GNF", "Franco de Guinea" }
+        GRD { "GRD", "Dracma Griego" }
+        GTQ { "Q", "Quedzal de Guatemala" }
+        GWP { "GWP", "Peso de Guinea" }
+        GYD { "GYD", "D\u00F3lar Guayan\u00E9s" }
+        HKD { "HKD", "D\u00F3lar de Hong Kong" }
+        HNL { "L.", "Lempira de Honduras" }
+        HRD { "HRD", "Dinar de Croacia" }
+        HTG { "HTG", "Gourde de Haiti" }
+        HUF { "HUF", "Flor\u00EDn H\u00FAngaro" }
+        IDR { "IDR", "Rupia Indonesia" }
+        IEP { "IEP", "Libra Irlandesa" }
+        ILS { "ILS", "Scheckel Israel\u00ED" }
+        INR { "=0#Rs.|1#Re.|1<Rs.", "Rupia India" }
+        IQD { "IQD", "Dinar Iraqu\u00ED" }
+        IRR { "IRR", "Rial Iran\u00ED" }
+        ISK { "ISK", "Corona Islandesa" }
+        ITL { "\u20A4", "Lira Italiana" }
+        JMD { "JMD", "D\u00F3lar de Jamaica" }
+        JOD { "JOD", "Dinar de Jordania" }
+        JPY { "\u00A5", "Yen Japon\u00E9s" }
+        KES { "KES", "Chel\u00EDn de Kenya" }
+        KHR { "KHR", "Riel de Camboya" }
+        // KIS { "KIS", "Som de Kirghizstan" } -- invalid
+        KMF { "KMF", "Franco de Comoros" }
+        KPW { "KPW", "Won de Corea del Norte" }
+        KRW { "KRW", "Won de Corea del Sur" }
+        KWD { "KWD", "Dinar de Kuwait" }
+        KYD { "KYD", "D\u00F3lar de las Caim\u00E1n" }
+        KZT { "KZT", "Tenge de Kazakhst\u00E1n" }
+        LAK { "LAK", "Kip de Letonia" }
+        LBP { "LBP", "Libra Libanesa" }
+        LKR { "LKR", "Rupia de Ceil\u00E1n" }
+        LRD { "LRD", "D\u00F3lar de Liberia" }
+        LSL { "LSL", "Loti de Lesotho" }
+        LTL { "LTL", "Lita de Lituania" }
+        LUF { "LUF", "Franco de Luxemburgo" }
+        LVL { "LVL", "Lat Latonia" }
+        LYD { "LYD", "Dinar Libio" }
+        MAD { "MAD", "Dirham Marroqu\u00ED" }
+        MDL { "MDL", "Lei de Moldavia" }
+        MGF { "MGF", "Franco de Madagascar" }
+        MNT { "MNT", "Tugrik de Mongolia" }
+        MOP { "MOP", "Pataca de Macao" }
+        MRO { "MRO", "Ouguiya de Mauritania" }
+        MTL { "MTL", "Lira de Malta" }
+        MUR { "MUR", "Rupia de Mauritius" }
+        MVR { "MVR", "Rufia de Maldivas" }
+        MWK { "MWK", "Kwacha de Malawi" }
+        MXN { "MXN", "Peso Mexicano (nuevo)" }
+        MXP { "MXP", "Peso Mexicano (viejo)" }
+        MYR { "MYR", "Ringgit de Malaysia" }
+        MZM { "MZM", "Metical de Mozambique" }
+        NGN { "NGN", "Naira de Nigeria" }
+        NIO { "C$", "Cordoba de Nicaragua" }
+        NLG { "NLG", "Guilder de Holanda" }
+        NOK { "NOK", "C\u00F3rona Noruega" }
+        NPR { "NPR", "Rupia de Nepal" }
+        NZD { "NZD", "D\u00F3lar de Nueva Zelanda" }
+        OMR { "OMR", "Rial de Om\u00E1n" }
+        PAB { "B/", "Balboa de Panam\u00E1" }
+        PEI { "PEI", "Inti de Per\u00FA" }
+        PEN { "S/", "Sol de Per\u00FA - Nuevo" }
+        PES { "PES", "Sol de Per\u00FA" }
+        PGK { "PGK", "Kina de Papua Nueva Guinea" }
+        PHP { "PHP", "Peso Filipino" }
+        PKR { "PKR", "Rupia de Pakist\u00E1n" }
+        PLN { "PLN", "Zloty de Polonia" }
+        PTE { "PTE", "Escudo Portugu\u00E9s" }
+        PYG { "Gs", "Guarani de Paraguay" }
+        QAR { "QAR", "Riyal de Qatar" }
+        // RMB { "RMB", "Remnminbi Yuan de China" } -- invalid
+        ROL { "ROL", "Lei de Rumania" }
+        RUR { "RUR", "Rublo Ruso" }
+        RWF { "RWF", "Franco de Rwanda" }
+        SAR { "SAR", "Riyal de Arabia Saud\u00ED" }
+        SBD { "SBD", "D\u00F3lar de las Islas Solomon" }
+        SCR { "SCR", "Rupias de Seychelles" }
+        SDP { "SDP", "Libra de Sud\u00E1n" }
+        SEK { "SEK", "C\u00F3rona Sueca" }
+        SGD { "SGD", "D\u00F3lar de Singapur" }
+        SHP { "SHP", "Libra de St.Helena" }
+        SIT { "SIT", "Tolar de Eslovenia" }
+        SKK { "SKK", "C\u00F3rona Eslovaca" }
+        SLL { "SLL", "Sierra Le\u00F3n" }
+        SOS { "SOS", "Chell\u00EDn de Somalia" }
+        SRG { "SRG", "Guilder de Surinam" }
+        STD { "STD", "Sao Tome / Principe Dobra" }
+        SUR { "SUR", "Rublo Ruso (viejo)" }
+        SVC { "SVC", "Colon de El Salvador" }
+        SYP { "SYP", "libra de Siria" }
+        SZL { "SZL", "Lilangeni de Swaziland" }
+        THB { "THB", "Baht de Tailandia" }
+        TJR { "TJR", "Rublo de Tadzikist\u00E1n" }
+        TMM { "TMM", "Manat de Turkmenist\u00E1n" }
+        TND { "TND", "Dinar de Tun\u00EDcia" }
+        TOP { "TOP", "Pa'anga de Tonga" }
+        TPE { "TPE", "Escudo de Timor" }
+        TRL { "TRL", "Lira de Turqu\u00EDa" }
+        TTD { "TTD", "D\u00F3lar de Trinidad y Tobagor" }
+        TWD { "TWD", "D\u00F3lar de Nuevo Taiw\u00E1n" }
+        TZS { "TZS", "Chell\u00EDn de Tanzania" }
+        UAK { "UAK", "karbowanez de Ucrainia" }
+        UGS { "UGS", "Chell\u00EDn de Uganda" }
+        USD { "$", "D\u00F3lar Americano" }
+        UYP { "UYP", "Nuevo Peso de Uruguay" }
+        UYU { "NU$", "UYU" }
+        VEB { "Bs", "Bolivar de Venezuela" }
+        VND { "\u0111", "Dong de Vietn\u00E1m" }
+        VUV { "VUV", "Vatu de Vanuatu" }
+        WST { "WST", "Tala de Samoa" }
+        XAF { "XAF", "Franco de Gab\u00F3n" }
+        XCD { "XCD", "D\u00F3lar de Caribe Oriental" }
+        XOF { "XOF", "Franco de Benin (C.f.A.)" }
+        YER { "YER", "Ryal de Yemen" }
+        ZAR { "ZAR", "Rand de Sur \u00C1frica" }
+        ZMK { "ZMK", "Kwacha de Zambia" }
+        ZWD { "ZWD", "D\u00F3lar de Zimbawe" }
     }
     /* Duplicates from root commented out. */
     Countries { 
+        Fallback{ "en"}
         AE { "Emiratos \u00C1rabes Unidos" }
-        AS { "Samoa Americana" }
+        AF { "Afganist\u00E1n" }
+        AG { "Antigua y Barbuda" }
+        AI { "Anguila" }
+        //AL { "Albania" }
+        //AM { "Armenia" }
+        AN { "Antillas Neerlandesas" }
+        //AO { "Angola" }
+        AQ { "Ant\u00E1rtica" }
         //AR { "Argentina" }
+        AS { "Samoa Americana" }
+        //AT { "Austria" }
+        //AU { "Australia" }
+        //AW { "Aruba" }
+        AZ { "Azerbaiy\u00E1n" }
+        BA { "Bosnia y Hercegovina" }
+        //BB { "Barbados" }
+        //BD { "Bangladesh" }
         BE { "B\u00E9lgica" }
+        //BF { "Burkina Faso" }
+        //BG { "Bulgaria" }
         BH { "Bahr\u00E1in" }
+        //BI { "Burundi" }
+        BJ { "Ben\u00EDn" }
+        BM { "Bermudas" }
+        BN { "Brun\u00E9i" }
         //BO { "Bolivia" }
         BR { "Brasil" }
-        BZ { "Belice" }
+        //BS { "Bahamas" }
+        BT { "But\u00E1n" }
+        BV { "Isla Bouvet" }
+        BW { "Botsuana" }
         BY { "Bielorrusia" }
+        BZ { "Belice" }
         CA { "Canad\u00E1" }
+        CC { "Islas Cocos (Keeling)" }
+        CD { "Rep\u00FAblica Democr\u00E1tica del Congo" }
+        CF { "Rep\u00FAblica Centroafricana" }
+        //CG { "Congo" }
         CH { "Suiza" }
+        CI { "Costa de Marfil" }
+        CK { "Islas Cook" }
         //CL { "Chile" }
+        CM { "Camer\u00FAn" }
+        //CN { "China" }
         //CO { "Colombia" }
         //CR { "Costa Rica" }
-        CZ { "Chequia" }
+        //CU { "Cuba" }
+        CV { "Cabo Verde" }
+        CX { "Isla de Christmas" }
+        CY { "Chipre" }
+        CZ { "Rep\u00FAblica Checa" }
+        //CZ { "Chequia" } // Old value
         DE { "Alemania" }
+        DJ { "Yibuti" }
         DK { "Dinamarca" }
+        //DM { "Dominica" }
         DO { "Rep\u00FAblica Dominicana" }
         DZ { "Argelia" }
         //EC { "Ecuador" }
+        //EE { "Estonia" }
         EG { "Egipto" }
+        EH { "S\u00E1hara Occidental" }
+        //ER { "Eritrea" }
         ES { "Espa\u00F1a" }
+        ET { "Etiop\u00EDa" }
         FI { "Finlandia" }
+        FJ { "Fidji" }
+        FK { "Islas Falkland (Malvinas)" }    // alternate name { "Islas Malvinas" }
+        //FM { "Micronesia, Estados Federados de" }
         FO { "Islas Feroe" }
         FR { "Francia" }
+        GA { "Gab\u00F3n" }
         GB { "Reino Unido" }
-        GL { "Groenlanida" }
+        GD { "Granada" }
+        //GE { "Georgia" }
+        GF { "Guayana Francesa" }
+        //GH { "Ghana" }
+        //GI { "Gibraltar" }
+        GL { "Groenlandia" }
+        //GM { "Gambia" }
+        //GN { "Guinea" }
+        GP { "Guadalupe" }
+        GQ { "Guinea Ecuatorial" }
         GR { "Grecia" }
+        GS { "Islas Georgia del Sur y Sandwich del Sur" }
         //GT { "Guatemala" }
+        //GU { "Guam" }
+        //GW { "Guinea-Bissau" }
+        //GY { "Guyana" }
+        HK { "Hong Kong, Regi\u00F3n administrativa especial de China" }
+        HM { "Islas Heard y McDonald" }
         //HN { "Honduras" }
         HR { "Croacia" }
+        HT { "Hait\u00ED" }
         HU { "Hungr\u00EDa" }
+        //ID { "Indonesia" }
         IE { "Irlanda" }
+        //IL { "Israel" }
+        //IN { "India" }
+        IO { "Territorios Brit\u00E1nicos del Oc\u00E9ano \u00CDndico" }
         IQ { "Irak" }
         IR { "Ir\u00E1n" }
         IS { "Islandia" }
         IT { "Italia" }
+        //JM { "Jamaica" }
         JO { "Jordania" }
         JP { "Jap\u00F3n" }
         KE { "Kenia" }
-        KP { "Corea del Norte" }
-        KR { "Corea del Sur" }
+        KG { "Kirguizist\u00E1n" }
+        KH { "Camboya" }
+        //KI { "Kiribati" }
+        KM { "Comores" }
+        KN { "San Crist\u00F3bal y Nieves" }
+        KP { "Corea del Norte" }    // alternate name { "Corea, Rep\u00FAblica Popular Democr\u00E1tica de" }
+        KR { "Corea del Sur" }    // alternate name { "Corea, Rep\u00FAblica de " }
+        //KW { "Kuwait" }
+        KY { "Islas Caim\u00E1n" }
+        KZ { "Kazajist\u00E1n" }
+        //LA { "Rep\u00FAblica Democr\u00E1tica Popular Lao" } // From translation center
         LB { "L\u00EDbano" }
+        //LC { "Santa Lucia" }
+        //LI { "Liechtenstein" }
+        //LK { "Sri Lanka" }
+        //LR { "Liberia" }
+        LS { "Lesoto" }
         LT { "Lituania" }
         LU { "Luxemburgo" }
         LV { "Letonia" }
+        LY { "Libia" }
         MA { "Marruecos" }
+        MC { "M\u00F3naco" }
+        //MD { "Moldavia, Rep\u00FAblica de" }
+        //MG { "Madagascar" }
         MH { "Islas Marshall" }
+        //MK { "Macedonia, Antigua Rep\u00FAblica Yugoslava de" }    // alternate name { "Macedonia, Rep\u00FAblica de" }
+        ML { "Mal\u00ED" }
+        //MM { "Myanmar" }
+        //MN { "Mongolia" }
+        MO { "Macao, Regi\u00F3n administrativa especial de China" }
         MP { "Islas Marianas del Norte" }
+        MQ { "Martinica" }
+        //MR { "Mauritania" }
+        //MS { "Montserrat" }
+        //MT { "Malta" }
+        MU { "Mauricio" }
+        MV { "Maldivas" }
+        MW { "Malaui" }
         MX { "M\u00E9xico" }
+        MY { "Malasia" }
+        //MZ { "Mozambique" }
+        //NA { "Namibia" }
+        NC { "Nueva Caledonia" }
+        NE { "N\u00EDger" }
+        NF { "Isla Norfolk" }
+        //NG { "Nigeria" }
         //NI { "Nicaragua" }
         NL { "Pa\u00EDses Bajos" }
         NO { "Noruega" }
+        //NP { "Nepal" }
+        //NR { "Nauru" }
+        //NU { "Niue" }
         NZ { "Nueva Zelanda" }
         OM { "Om\u00E1n" }
         PA { "Panam\u00E1" }
         PE { "Per\u00FA" }
-        PH { "Islas Filipinas" }
+        PF { "Polinesia Francesa" }
+        PG { "Pap\u00FAa Nueva Guinea" }
+        //PH { "Islas Filipinas" }  // Original value
+        PH { "Filipinas" }
         PK { "Pakist\u00E1n" }
         PL { "Polonia" }
+        PM { "San Pedro y Miquel\u00F3n" }
+        //PN { "Pitcairn" }
         //PR { "Puerto Rico" }
+        PS { "Territorios Palestinos" }
+        //PT { "Portugal" }
+        //PW { "Palau" }
         //PY { "Paraguay" }
+        //QA { "Qatar" }
+        //RE { "Reuni\u00F3n" }
         RO { "Rumania" }
         RU { "Rusia" }
+        //RU { "Federaci\u00F3n Rusa" } // From translation center
+        RW { "Ruanda" }
         SA { "Arabia Saud\u00ED" }
+        SB { "Islas Salom\u00F3n" }
+        //SC { "Seychelles" }
         SD { "Sud\u00E1n" }
         SE { "Suecia" }
         SG { "Singapur" }
+        SH { "Santa Elena" } // From translation center
         SI { "Eslovenia" }
+        SJ { "Svalbard y Jan Mayen" }
         SK { "Eslovaquia" }
-        SP { "Servia" }
+        SL { "Sierra Leona" }
+        //SM { "San Marino" }
+        //SN { "Senegal" }
+        //SO { "Somalia" }
+        SP { "Serbia" }
+        //SR { "Surinam" }
+        ST { "Santo Tom\u00E9 y Pr\u00EDncipe" }
         //SV { "El Salvador" }
         SY { "Siria" }
+        SZ { "Suazilandia" }
+        TC { "Islas Turcas y Caicos" }
+        //TD { "Chad" }
+        TF { "Territorios Australes Franceses" }
+        //TG { "Togo" }
         TH { "Tailandia" }
+        TJ { "Tayikist\u00E1n" }
+        //TK { "Tokelau" }
+        TL { "Timor Oriental" }
+        TM { "Turkmenist\u00E1n" }
         TN { "T\u00FAnez" }
+        //TO { "Tonga" }
         TR { "Turqu\u00EDa" }
         TT { "Trinidad y Tabago" }
-        TW { "Taiw\u00E1n" }
-        UA { "Ucraina" }
-        UM { "Islas Perif\u00E9ricas Menores de los Estados Unidos" }
+        //TV { "Tuvalu" }
+        TW { "Taiw\u00E1n, Rep\u00FAblica de China" }
+        //TZ { "Tanzania" }
+        UA { "Ucrania" }
+        //UG { "Uganda" }
+        UM { "Islas menores alejadas de Estados Unidos" }
+        //UM { "Islas Perif\u00E9ricas Menores de los Estados Unidos" } // Old value
         US { "Estados Unidos" }
         //UY { "Uruguay" }
+        UZ { "Uzbekist\u00E1n" }
+        //VA { "Santa Sede (Ciudad del Vaticano)" }
+        VA { "Ciudad del Vaticano" }
+        VC { "San Vicente y las Granadinas" }
         //VE { "Venezuela" }
+        VG { "Islas V\u00EDrgenes Brit\u00E1nicas" }
         VI { "Islas V\u00EDrgenes de los Estados Unidos" }
+        //VN { "Vietnam" }
+        //VU { "Vanuatu" }
+        WF { "Wallis y Futuna" }
+        //WS { "Samoa" }
+        //YE { "Yemen" }
+        //YT { "Mayotte" }
+        //YU { "Yugoslavia" }
         ZA { "Sud\u00E1frica" }
+        //ZM { "Zambia" }
+        ZW { "Zimbabue" }
     }
     DateTimeElements:intvector { 
         2,
@@ -140,16 +490,23 @@
     Languages {
         root{"ra\u00EDz" }    // The only exception to ISO-639
 
+        aa { "afar" }
         af { "afrikaans" }
-        am { "amharic" }
+        am { "am\u00E1rico" }
         ar { "\u00E1rabe" }
+        as { "asam\u00E9s" }
         az { "azerbayano" }
         be { "bielorruso" }
         bg { "b\u00FAlgaro" }
         bh { "bihari" }
+        bi { "bislama" }
         bn { "bengal\u00ED" }
+        bo { "tibetano" }
+        br { "bret\u00F3n" }
         ca { "catal\u00E1n" }
+        co { "corso" }
         cs { "checo" }
+        cy { "gal\u00E9s" }
         da { "dan\u00E9s" }
         de { "alem\u00E1n" }
         el { "griego" }
@@ -160,67 +517,108 @@
         eu { "vasco" }
         fa { "farsi" }
         fi { "finland\u00E9s" }
-        fo { "faro\u00E9s" }
+        fo { "fero\u00E9s" }
         fr { "franc\u00E9s" }
         ga { "irland\u00E9s" }
+        gd { "ga\u00E9lico escoc\u00E9s" }
         gl { "gallego" }
-        gu { "goujarat\u00ED" }
+        gu { "goujarat\u00ED" } // If this changes, then change Gujr in Scripts too.
+        gv { "ga\u00E9lico man\u00E9s" }
+        ha { "hausa" }
+        haw { "hawaiano" }
         he { "hebreo" }
         hi { "hindi" }
         hr { "croata" }
         hu { "h\u00FAngaro" }
         hy { "armenio" }
         id { "indonesio" }
+        ie { "interlingue" }
+        ik { "inupiak" }
         is { "island\u00e9s" }
         it { "italiano" }
+        iu { "inuktitut" }
         ja { "japon\u00E9s" }
         ka { "georgiano" }
         kk { "kazajo" }
         kl { "groenland\u00E9s" }
-        km { "kmer" }
-        kn { "canara" }
+        km { "kmer" } // If this changes, then change Khmr in Scripts too.
+        kn { "canara" } // If this changes, then change Knda in Scripts too.
         ko { "coreano" }
         ku { "kurdo" }
         kw { "c\u00F3rnico" }
         ky { "kirghiz" }
         la { "lat\u00EDn" }
+        ln { "lingala" }
+        lo { "laosiano" }
         lt { "lituano" }
-        lv { "let\u00F3n" }
+        //lv { "let\u00F3n" } // Old value
+        lv { "letonio" }
+        mg { "malgache" }
+        mi { "maor\u00ED" }
         mk { "macedonio" }
+        ml { "malayalam" }
         mn { "mongol" }
+        mo { "moldavo" }
         mr { "marathi" }
-        ms { "malaisio" }
+        ms { "malayo" }
         mt { "malt\u00e9s" }
         my { "birmano" }
+        na { "nauruano" }
         nl { "holand\u00E9s" }
+        nb { "bokmal noruego" }
+        ne { "nepal\u00ED" }
         no { "noruego" }
+        nn { "nynorsk noruego" }
+        om { "oromo" }
+        or { "oriya" }
         pa { "punjab\u00ED" }
         pl { "polaco" }
+        ps { "pashto" }
         pt { "portugu\u00E9s" }
+        qu { "quechua" }
         ro { "rumano" }
         ru { "ruso" }
-        sh { "serbo-croata" }
+        sa { "s\u00E1nscrito" }
+        sg { "sango" }
+        sh { "serbocroata" }
+        si { "cingal\u00E9s" }
         sk { "eslovaco" }
         sl { "esloveno" }
+        sm { "samoano" }
         so { "somal\u00ED" }
         sq { "alban\u00E9s" }
-        sr { "servio" }
+        sr { "serbio" }
+        su { "sundan\u00E9s" }
         sv { "sueco" }
         sw { "swahili" }
+        ta { "tamil" }
         te { "telugu" }
         th { "tailand\u00E9s" }
         ti { "tigrinya" }
+        tl { "tagalo" }
         tr { "turco" }
-        tt { "tataro" }
-        vi { "vietnam\u00E9s" }
+        ts { "tsonga" }
+        tt { "t\u00E1taro" }
+        ug { "uigur" }
         uk { "ucraniano" }
         ur { "urdu" }
         uz { "uzbeko" }
+        vi { "vietnamita" }
+        vo { "volapuk" }
+        wo { "uolof" }
+        xh { "xhosa" }
+        yo { "yoruba" }
+        za { "zhuang" }
         zh { "chino" }
         zu { "zul\u00FA" }
     }
-    LocaleID:int { 0x0a }
-//    LocaleString { "es" }
+    localPatternChars { "GuMtkHmsSEDFwWahKzUe" }
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
+    }
+    // u umlaut \u00fc is a rare character.
+    // It can be found in words like multilig\u00fce, ag\u00fcita and Itag\u00fc\u00ed
+    ExemplarCharacters { "[a-z \u00f1 \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u00fc]" }
     MonthAbbreviations { 
         "ene",
         "feb",
@@ -255,38 +653,79 @@
         "#,##0%",
         "#E0",
     }
-//    ShortLanguage { "spa" }
-    localPatternChars { "GuMtkHmsSEDFwWahKzUe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
+    Scripts {
+        Arab { "\u00E1rabe" }
+        Armn { "armenio" }
+        Beng { "bengal\u00ED" }
+        // ? Bopo { "Bopomofo" }
+        Brai { "braille" } // Lowercase?
+        // ? Buhd { "Buhid" }
+        // ? Cans { "Unified Canadian Aboriginal Symbols" }
+        // ? Cher { "Cherokee" }
+        Cprt { "chipriota" } // grecochipriota?
+        Cyrl { "cir\u00EDlico" }
+        // ? Deva { "Devanagari" }
+        // ? Dsrt { "Deseret" }
+        // ? Ethi { "et\u00EDopico" }
+        Geor { "georgiano" }
+        Goth { "g\u00F3tico" }
+        Grek { "griego" }
+        Gujr { "goujarat\u00ED" }
+        // ? Guru { "Gurmukhi" }
+        // ? Hang { "Hangul" }
+        // ? Hano { "Hanunoo" }
+        // ? Hani { "han" }
+        // ? Hans { "simplificado han" } // Not a formal part of ISO-15924 yet
+        // ? Hant { "tradicional han" } // Not a formal part of ISO-15924 yet
+        Hebr { "hebreo" }
+        // ? Hira { "Hiragana" }
+        // ? Ital { "antigua bastardilla" } // Probably right.
+        // ? Kana { "Katakana" }
+        Khmr { "kmer" }
+        Knda { "canara" }
+        // ? Laoo { "Lao" }
+        Latn { "lat\u00EDn" }
+        // ? Limb { "Limbu" }
+        // ? Linb { "Linear B" }
+        // ? Mlym { "Malayalam" }
+        Mong { "mongoliano" }
+        Mymr { "myanmar" }
+        // ? Ogam { "Ogham" }
+        // ? Orya { "Oriya" }
+        // ? Osma { "Osmanya" }
+        // ? Qaac { "Coptic" } // Coptic is not a formal part of ISO-15924 yet
+        // ? Qaai { "Inherited" } // PUA  Difficult to translate
+        // ? Runr { "Runic" }
+        // ? Shaw { "Shavian" }
+        // ? Sinh { "Sinhala" }
+        // ? Syrc { "Syriac" }
+        // ? Tagb { "Tagbanwa" }
+        // ? Tale { "Tai Le" }
+        Taml { "tamil" }
+        Telu { "telugu" }
+        Tglg { "tagalo" }
+        // ? Thaa { "Thaana" }
+        Thai { "tailand\u00E9s" }
+        Tibt { "tibetano" }
+        // ? Ugar { "Ugaritic" }
+        // ? Yiii { "Yi" }
+        // ? Zyyy { "com\u00FAn" } // This may need to become "undetermined script"
     }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
-    // u umlaut \u00fc is a rare character.
-    // It can be found in words like multilig\u00fce, ag\u00fcita and Itag\u00fc\u00ed
-    ExemplarCharacters { "[a-z \u00f1 \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u00fc]" }
- 
+
     //------------------------------------------------------------
     // Rule Based Number Format Support
     //------------------------------------------------------------
 
-//         * Spellout rules for Spanish.  The Spanish rules are quite similar to
-//         * the English rules, but there are some important differences:
-//         * First, we have to provide separate rules for most of the twenties
-//         * because the ones digit frequently picks up an accent mark that it
-//         * doesn't have when standing alone.  Second, each multiple of 100 has
-//         * to be specified separately because the multiplier on 100 very often
-//         * changes form in the contraction: 500 is "quinientos," not
-//         * "cincocientos."  In addition, the word for 100 is "cien" when
-//         * standing alone, but changes to "ciento" when followed by more digits.
-//         * There also some other differences.
+    // * Spellout rules for Spanish.  The Spanish rules are quite similar to
+    // * the English rules, but there are some important differences:
+    // * First, we have to provide separate rules for most of the twenties
+    // * because the ones digit frequently picks up an accent mark that it
+    // * doesn't have when standing alone.  Second, each multiple of 100 has
+    // * to be specified separately because the multiplier on 100 very often
+    // * changes form in the contraction: 500 is "quinientos," not
+    // * "cincocientos."  In addition, the word for 100 is "cien" when
+    // * standing alone, but changes to "ciento" when followed by more digits.
+    // * There also some other differences.
 
     // The Spanish rules are incomplete.  I'm missing information on negative
     // numbers and numbers with fractional parts.  I also don't have
@@ -336,186 +775,32 @@
         "2,000,000: << mill\u00f3n[ >>];\n"
         // overflow rule
         "1,000,000,000: =#,##0= (incomplete data);" 
-     }
-
-    // Currency display names
-    Currencies {
-        ADP { "ADP", "Peseta Andorrana" }
-        AED { "AED", "Dirham de los Emiratos \u00C1rabes Unidos" }
-        AFA { "AFA", "Afghani" }
-        ALL { "ALL", "Lek Alban\u00E9s" }
-        AMD { "AMD", "Dram Armenio" }
-        ANG { "ANG", "Guilder de India Occidental" }
-        AOK { "AOK", "Kwanza Angol\u00E9s" }
-        ARA { "ARA", "Austral Argentino" }
-        ARS { "ARS", "Peso Argentino" }
-        ATS { "ATS", "Chel\u00EDn Austriaco" }
-        AUD { "AUD", "D\u00F3lar Australiano" }
-        AWG { "AWG", "Guilder de Aruba" }
-        AZM { "AZM", "Manat de Azerbaijan" }
-        BAD { "BAD", "Dinar de Bosnia-Herzogovinia" }
-        BBD { "BBD", "D\u00F3lar de Barbados" }
-        BDT { "BDT", "Taka de Bangladesh" }
-        BEF { "BEF", "Franco Belga" }
-        BGL { "BGL", "Lev Bulgaro" }
-        BHD { "BHD", "Dinar de Barein" }
-        BIF { "BIF", "Franco de Burundi" }
-        BMD { "BMD", "D\u00F3lar de Bermudas" }
-        BND { "BND", "D\u00F3lar de Brunei" }
-        BOB { "$b", "Boliviano de Bolivia" }
-        BRL { "BRL", "Real de Brazil" }
-        BSD { "BSD", "D\u00F3lar de Bahamas" }
-        BWP { "BWP", "Pula de Botswana" }
-        BYR { "BYR", "Rublo de Belorusia" }
-        BZD { "BZD", "D\u00F3lar de Belize" }
-        CAD { "CAD", "D\u00F3lar Canadiense" }
-        CHF { "CHF", "Franco Suizo" }
-        CLP { "CLP", "Peso Chileno" }
-        COP { "COP", "Peso de Colombia" }
-        CRC { "CRC", "Colon de Costa Rica" }
-        CUP { "CUP", "Peso Cubano" }
-        CVE { "CVE", "Escudo de Cabo Verde" }
-        CYP { "CYP", "Libra de Chipre" }
-        CZK { "CZK", "Krona Checa" }
-        DEM { "DEM", "Marco Alem\u00E1n" }
-        DJF { "DJF", "Franco de Djibouti" }
-        DKK { "DKK", "Corona Danesa" }
-        DOP { "RD$", "Peso Dominicano" }
-        // DRP { "DRP", "Peso de la Rep\u00FAblica Dominicana" } -- invalid
-        DZD { "DZD", "Dinar de Algeria" }
-        ECS { "S/.", "Sucre de Ecuador" }
-        // ECU { "ECU", "Moenda \u00DAnica Europea (EURO)" } -- invalid
-        EEK { "EEK", "Corona de Estonia" }
-        EGP { "EGP", "Libra Egipcia" }
-        ESP { "\u20A7", "Peseta Espa\u00F1ola" }
-        ETB { "ETB", "Birr de Etiop\u00EDa" }
-        EUR { "\u20AC", "Moneda de los estados miembros de EMU" }
-        FIM { "FIM", "Marco Finland\u00E9s" }
-        FJD { "FJD", "D\u00F3lar de Fiji" }
-        FKP { "FKP", "Libra de Falkland" }
-        FRF { "FRF", "Franco Franc\u00E9s" }
-        GBP { "\u00A3", "Libra Brit\u00E1nica" }
-        GEK { "GEK", "Kupon de Georgia" }
-        GHC { "GHC", "Cedi de Ghana" }
-        GIP { "GIP", "Libra de Gibraltar" }
-        GMD { "GMD", "Dalasi de Gambia" }
-        GNF { "GNF", "Franco de Guinea" }
-        GRD { "GRD", "Dracma Griego" }
-        GTQ { "Q", "Quedzal de Guatemala" }
-        GWP { "GWP", "Peso de Guinea" }
-        GYD { "GYD", "D\u00F3lar Guayan\u00E9s" }
-        HKD { "HKD", "D\u00F3lar de Hong Kong" }
-        HNL { "L.", "Lempira de Honduras" }
-        HRD { "HRD", "Dinar de Croacia" }
-        HTG { "HTG", "Gourde de Haiti" }
-        HUF { "HUF", "Flor\u00EDn H\u00FAngaro" }
-        IDR { "IDR", "Rupia Indonesia" }
-        IEP { "IEP", "Libra Irlandesa" }
-        ILS { "ILS", "Scheckel Israel\u00ED" }
-        INR { "=0#Rs.|1#Re.|1<Rs.", "Rupia India" }
-        IQD { "IQD", "Dinar Iraqu\u00ED" }
-        IRR { "IRR", "Rial Iran\u00ED" }
-        ISK { "ISK", "Corona Islandesa" }
-        ITL { "\u20A4", "Lira Italiana" }
-        JMD { "JMD", "D\u00F3lar de Jamaica" }
-        JOD { "JOD", "Dinar de Jordania" }
-        JPY { "\u00A5", "Yen Japon\u00E9s" }
-        KES { "KES", "Chel\u00EDn de Kenya" }
-        KHR { "KHR", "Riel de Camboya" }
-        // KIS { "KIS", "Som de Kirghizstan" } -- invalid
-        KMF { "KMF", "Franco de Comoros" }
-        KPW { "KPW", "Won de Corea del Norte" }
-        KRW { "KRW", "Won de Corea del Sur" }
-        KWD { "KWD", "Dinar de Kuwait" }
-        KYD { "KYD", "D\u00F3lar de las Caim\u00E1n" }
-        KZT { "KZT", "Tenge de Kazakhst\u00E1n" }
-        LAK { "LAK", "Kip de Letonia" }
-        LBP { "LBP", "Libra Libanesa" }
-        LKR { "LKR", "Rupia de Ceil\u00E1n" }
-        LRD { "LRD", "D\u00F3lar de Liberia" }
-        LSL { "LSL", "Loti de Lesotho" }
-        LTL { "LTL", "Lita de Lituania" }
-        LUF { "LUF", "Franco de Luxemburgo" }
-        LVL { "LVL", "Lat Latonia" }
-        LYD { "LYD", "Dinar Libio" }
-        MAD { "MAD", "Dirham Marroqu\u00ED" }
-        MDL { "MDL", "Lei de Moldavia" }
-        MGF { "MGF", "Franco de Madagascar" }
-        MNT { "MNT", "Tugrik de Mongolia" }
-        MOP { "MOP", "Pataca de Macao" }
-        MRO { "MRO", "Ouguiya de Mauritania" }
-        MTL { "MTL", "Lira de Malta" }
-        MUR { "MUR", "Rupia de Mauritius" }
-        MVR { "MVR", "Rufia de Maldivas" }
-        MWK { "MWK", "Kwacha de Malawi" }
-        MXN { "MXN", "Peso Mexicano (nuevo)" }
-        MXP { "MXP", "Peso Mexicano (viejo)" }
-        MYR { "MYR", "Ringgit de Malaysia" }
-        MZM { "MZM", "Metical de Mozambique" }
-        NGN { "NGN", "Naira de Nigeria" }
-        NIO { "C$", "Cordoba de Nicaragua" }
-        NLG { "NLG", "Guilder de Holanda" }
-        NOK { "NOK", "C\u00F3rona Noruega" }
-        NPR { "NPR", "Rupia de Nepal" }
-        NZD { "NZD", "D\u00F3lar de Nueva Zelanda" }
-        OMR { "OMR", "Rial de Om\u00E1n" }
-        PAB { "B/", "Balboa de Panam\u00E1" }
-        PEI { "PEI", "Inti de Per\u00FA" }
-        PEN { "S/", "Sol de Per\u00FA - Nuevo" }
-        PES { "PES", "Sol de Per\u00FA" }
-        PGK { "PGK", "Kina de Papua Nueva Guinea" }
-        PHP { "PHP", "Peso Filipino" }
-        PKR { "PKR", "Rupia de Pakist\u00E1n" }
-        PLN { "PLN", "Zloty de Polonia" }
-        PTE { "PTE", "Escudo Portugu\u00E9s" }
-        PYG { "Gs", "Guarani de Paraguay" }
-        QAR { "QAR", "Riyal de Qatar" }
-        // RMB { "RMB", "Remnminbi Yuan de China" } -- invalid
-        ROL { "ROL", "Lei de Rumania" }
-        RUR { "RUR", "Rublo Ruso" }
-        RWF { "RWF", "Franco de Rwanda" }
-        SAR { "SAR", "Riyal de Arabia Saud\u00ED" }
-        SBD { "SBD", "D\u00F3lar de las Islas Solomon" }
-        SCR { "SCR", "Rupias de Seychelles" }
-        SDP { "SDP", "Libra de Sud\u00E1n" }
-        SEK { "SEK", "C\u00F3rona Sueca" }
-        SGD { "SGD", "D\u00F3lar de Singapur" }
-        SHP { "SHP", "Libra de St.Helena" }
-        SIT { "SIT", "Tolar de Eslovenia" }
-        SKK { "SKK", "C\u00F3rona Eslovaca" }
-        SLL { "SLL", "Sierra Le\u00F3n" }
-        SOS { "SOS", "Chell\u00EDn de Somalia" }
-        SRG { "SRG", "Guilder de Surinam" }
-        STD { "STD", "Sao Tome / Principe Dobra" }
-        SUR { "SUR", "Rublo Ruso (viejo)" }
-        SVC { "SVC", "Colon de El Salvador" }
-        SYP { "SYP", "libra de Siria" }
-        SZL { "SZL", "Lilangeni de Swaziland" }
-        THB { "THB", "Baht de Tailandia" }
-        TJR { "TJR", "Rublo de Tadzikist\u00E1n" }
-        TMM { "TMM", "Manat de Turkmenist\u00E1n" }
-        TND { "TND", "Dinar de Tun\u00EDcia" }
-        TOP { "TOP", "Pa'anga de Tonga" }
-        TPE { "TPE", "Escudo de Timor" }
-        TRL { "TRL", "Lira de Turqu\u00EDa" }
-        TTD { "TTD", "D\u00F3lar de Trinidad y Tobagor" }
-        TWD { "TWD", "D\u00F3lar de Nuevo Taiw\u00E1n" }
-        TZS { "TZS", "Chell\u00EDn de Tanzania" }
-        UAK { "UAK", "karbowanez de Ucrainia" }
-        UGS { "UGS", "Chell\u00EDn de Uganda" }
-        USD { "$", "D\u00F3lar Americano" }
-        UYP { "UYP", "Nuevo Peso de Uruguay" }
-        UYU { "NU$", "UYU" }
-        VEB { "Bs", "Bolivar de Venezuela" }
-        VND { "\u20AB", "Dong de Vietn\u00E1m" }
-        VUV { "VUV", "Vatu de Vanuatu" }
-        WST { "WST", "Tala de Samoa" }
-        XAF { "XAF", "Franco de Gab\u00F3n" }
-        XCD { "XCD", "D\u00F3lar de Caribe Oriental" }
-        XOF { "XOF", "Franco de Benin (C.f.A.)" }
-        YER { "YER", "Ryal de Yemen" }
-        ZAR { "ZAR", "Rand de Sur \u00C1frica" }
-        ZMK { "ZMK", "Kwacha de Zambia" }
-        ZWD { "ZWD", "D\u00F3lar de Zimbawe" }
     }
+    Keys{
+         collation { "Colaci\u00f3n" }
+         calendar  { "Calendario" }
+    }
+    // The following should probably be all lowercase.
+    Types {
+        collation{
+            direct      { "Directo Orden" }
+            phonebook   { "Gu\u00FDa Orden" }
+            // PINYIN      { "PINYIN" }
+            stroke      { "Pincelada Orden" }
+            traditional { "Tradicional Orden" }
+        }
+        calendar{
+            //traditional { "Tradicional" }
+            japanese    { "Japon\u00E9s" }
+            buddhist    { "Budista" }
+            islamic     { "Isl\u00E1mico" }
+            hebrew      { "Hebreo" }
+            chinese     { "Chino" }
+            gregorian   { "Gregoriano" }
+        }
+    }
+    Variants {
+        REVISED { "Revisado" }
+    }
+
 }

Index: es_AR.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_AR.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_AR.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_AR.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -31,11 +31,8 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-    LocaleID:int { 0x2c0a }
-//    LocaleString { "es_AR" }
-//    ShortCountry { "ARG" }
-
     // Currency display names
     Currencies {
         ARS { "$", "Peso Argentino" }

Index: es_BO.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_BO.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_BO.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_BO.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -18,8 +18,6 @@
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x400a }
-//    LocaleString { "es_BO" }
     NumberElements { 
         ",",
         ".",
@@ -33,6 +31,6 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortCountry { "BOL" }
 }

Index: es_CL.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_CL.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_CL.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_CL.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -18,8 +18,6 @@
         "dd-MM-yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x340a }
-//    LocaleString { "es_CL" }
     NumberElements {
         ",",
         ".",
@@ -33,6 +31,7 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
@@ -40,8 +39,6 @@
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "CHL" }
-
     // Currency display names
     Currencies {
         CLP { "$", "Peso Chileno" }

Index: es_CO.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_CO.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_CO.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_CO.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -18,8 +18,6 @@
         "d/MM/yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x240a }
-//    LocaleString { "es_CO" }
     NumberElements { 
         ",",
         ".",
@@ -33,9 +31,8 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortCountry { "COL" }
-
     // Currency display names
     Currencies {
         COP { "$", "Peso de Colombia" }

Index: es_CR.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_CR.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_CR.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_CR.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -18,8 +18,6 @@
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x140a }
-//    LocaleString { "es_CR" }
     NumberElements { 
         ",",
         ".",
@@ -33,6 +31,6 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortCountry { "CRI" }
 }

Index: es_DO.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_DO.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_DO.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_DO.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -18,8 +18,6 @@
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x1c0a }
-//    LocaleString { "es_DO" }
 //    NumberElements {
 //        ".",
 //        ",",
@@ -33,5 +31,4 @@
 //        "\u221E",
 //        "\uFFFD",
 //    }
-//    ShortCountry { "DOM" }
 }

Index: es_EC.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_EC.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_EC.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_EC.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -18,8 +18,6 @@
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x300a }
-//    LocaleString { "es_EC" }
     NumberElements { 
         ",",
         ".",
@@ -33,6 +31,7 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
@@ -40,5 +39,4 @@
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "ECU" }
 }

Index: es_ES.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_ES.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_ES.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_ES.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -7,7 +7,6 @@
 
 es_ES {
     Version { "2.0" }
-//    LocaleString { "es_ES" }
     NumberElements {
         ",",
         ".",
@@ -21,6 +20,7 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
     DateTimePatterns { 
         "HH'H'mm''ss\" z",
@@ -39,6 +39,4 @@
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "ESP" }
-    LocaleID:int { 0x0c0a }
 }

Index: es_GT.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_GT.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_GT.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_GT.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -18,8 +18,6 @@
         "d/MM/yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x100a }
-//    LocaleString { "es_GT" }
 //    NumberElements { 
 //        ".",
 //        ",",
@@ -33,5 +31,4 @@
 //        "\u221E",
 //        "\uFFFD",
 //    }
-//    ShortCountry { "GTM" }
 }

Index: es_HN.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_HN.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_HN.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_HN.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -18,8 +18,6 @@
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x480a }
-//    LocaleString { "es_HN" }
 //    NumberElements {
 //        ".",
 //        ",",
@@ -33,5 +31,4 @@
 //        "\u221E",
 //        "\uFFFD",
 //    }
-//    ShortCountry { "HND" }
 }

Index: es_MX.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_MX.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_MX.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_MX.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -18,8 +18,6 @@
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x080a }
-//    LocaleString { "es_MX" }
 //    NumberElements { 
 //        ".",
 //        ",",
@@ -33,7 +31,6 @@
 //        "\u221E",
 //        "\uFFFD",
 //    }
-//    ShortCountry { "MEX" }
 
     // Currency display names
     Currencies {

Index: es_NI.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_NI.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_NI.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_NI.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -18,8 +18,6 @@
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x4c0a }
-//    LocaleString { "es_NI" }
 //    NumberElements {
 //        ".",
 //        ",",
@@ -33,5 +31,4 @@
 //        "\u221E",
 //        "\uFFFD",
 //    }
-//    ShortCountry { "NIC" }
 }

Index: es_PA.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_PA.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_PA.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_PA.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -18,8 +18,6 @@
         "MM/dd/yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x180a }
-//    LocaleString { "es_PA" }
 //    NumberElements { 
 //        ".",
 //        ",",
@@ -33,5 +31,4 @@
 //        "\u221E",
 //        "\uFFFD",
 //    }
-//    ShortCountry { "PAN" }
 }

Index: es_PE.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_PE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_PE.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_PE.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -18,8 +18,6 @@
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x280a }
-//    LocaleString { "es_PE" }
 //    NumberElements { 
 //        ".",
 //        ",",
@@ -39,5 +37,4 @@
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "PER" }
 }

Index: es_PR.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_PR.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_PR.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_PR.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -18,8 +18,6 @@
         "MM/dd/yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x500a }
-//    LocaleString { "es_PR" }
 //    NumberElements { 
 //        ".",
 //        ",",
@@ -33,8 +31,6 @@
 //        "\u221E",
 //        "\uFFFD",
 //    }
-//    ShortCountry { "PRI" }
-
     // Currency display names
     Currencies {
         USD { "$", "D\u00F3lar Americano" }

Index: es_PY.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_PY.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_PY.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_PY.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -31,6 +31,7 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
@@ -38,7 +39,4 @@
         "#,##0%",
         "#E0",
     }
-    LocaleID:int { 0x3c0a }
-//    LocaleString { "es_PY" }
-//    ShortCountry { "PRY" }
 }

Index: es_SV.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_SV.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_SV.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_SV.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -18,7 +18,6 @@
         "dd/MM/yy",
         "{1} {0}",
     }
-//    LocaleString { "es_SV" }
 //    NumberElements { 
 //        ".",
 //        ",",
@@ -32,6 +31,4 @@
 //        "\u221E",
 //        "\uFFFD",
 //    }
-//    ShortCountry { "SLV" }
-    LocaleID:int { 0x440a }
 }

Index: es_US.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_US.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_US.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_US.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -41,4 +41,12 @@
         "#,##0%",
         "#E0",
     }
+
+    // the PaperSize units are in mm
+    // these values are not exact .. they are rounded off
+    PaperSize:intvector{
+        279, // height
+        216  // width 
+    }
+    MeasurementSystem:int{ 1 } // US system
 }

Index: es_UY.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_UY.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_UY.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_UY.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -18,8 +18,6 @@
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x380a }
-//    LocaleString { "es_UY" }
     NumberElements {
         ",",
         ".",
@@ -33,6 +31,7 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
@@ -40,5 +39,4 @@
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "URY" }
 }

Index: es_VE.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es_VE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es_VE.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es_VE.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -18,8 +18,6 @@
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x200a }
-//    LocaleString { "es_VE" }
     NumberElements {
         ",",
         ".",
@@ -33,6 +31,7 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
@@ -40,5 +39,4 @@
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "VEN" }
 }

Index: es__TRADITIONAL.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/es__TRADITIONAL.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es__TRADITIONAL.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ es__TRADITIONAL.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -7,12 +7,7 @@
 
 es__TRADITIONAL {
     Version { "2.0" }
-    CollationElements { 
-        Version { "1.0" }
-        Sequence { "& N < n\u0303<<< N\u0303"
-            "&C < ch <<< Ch <<< CH"
-            "&l < ll <<< Ll <<< LL"
-        }
+    collations {
+      default { "traditional" }
     }
-    LocaleID:int { 0x040a }
 }

Index: et.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/et.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- et.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ et.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -1,4 +1,4 @@
-// ***************************************************************************
+// ***************************************************************************
 // *
 // *   Copyright (C) 1997-2003, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
@@ -6,16 +6,292 @@
 // ***************************************************************************
 
 et {
-    Version{ "2.0" }
-    CollationElements { 
-        Version { "1.0" }
-        Sequence { "@& S < s\u030C<<< S\u030C < z <<< Z < z\u030C <<< Z\u030C & V"
-            " << w <<< W < o\u0303 <<< O\u0303< a\u0308 <<< A\u0308 < o\u0308 <<< O\u0308 << w\u0302 <<<"
-            " W\u0302< u\u0308 <<< U\u0308& Y < \u01B6 <<< \u01B5"
+    Version{ "3.0" }
+    collations {
+      standard { 
+        Version { "2.0" }
+        Sequence { 
+            "&[before 1]T<š<<<Š<z<<<Z<ž<<<Ž"
+            "&v<<w<<<W"
+            "&[before 1]X<õ<<<Õ<ä<<<Ä<ö<<<Ö<ü<<<Ü"
         }
+      }
     }
-    Countries { 
+    Countries {
+        Fallback{ "en"}
+        //AD { "Andorra" }
+        AE { "Araabia \u00DChendemiraadid" }
+        AF { "Afganistan" }
+        AG { "Antigua ja Barbuda" }
+        //AI { "Anguilla" }
+        AL { "Albaania" }
+        AM { "Armeenia" }
+        AN { "Hollandi Antillid" }
+        //AO { "Angola" }
+        AQ { "Antarktika" }
+        //AR { "Argentina" }
+        AS { "Ameerika Samoa" }
+        //AT { "Austria" }
+        AU { "Austraalia" }
+        //AW { "Aruba" }
+        AZ { "Aserbaid\u012Aaan" }
+        BA { "Bosnia ja Hertsegoviina" }
+        //BB { "Barbados" }
+        //BD { "Bangladesh" }
+        BE { "Belgia" }
+        //BF { "Burkina Faso" }
+        BG { "Bulgaaria" }
+        BH { "Bahrein" }
+        //BI { "Burundi" }
+        //BJ { "Benin" }
+        //BM { "Bermuda" }
+        //BN { "Brunei" }
+        BO { "Boliivia" }
+        BR { "Brasiilia" }
+        BS { "Bahama saared" }
+        //BT { "Bhutan" }
+        BV { "Bouvet' saar" }
+        //BW { "Botswana" }
+        BY { "Valgevene" }
+        //BZ { "Belize" }
+        CA { "Kanada" }
+        CC { "Kookossaared" }
+        CD { "Kongo DV" }
+        CF { "Kesk-Aafrika Vabariik" }
+        CG { "Kongo" }
+        CH { "\u0128veits" }
+        CI { "Cote d'Ivoire" }
+        CK { "Cooki saared" }
+        CL { "Tiiili" }
+        CM { "Kamerun" }
+        CN { "Hiina" }
+        //CO { "Colombia" }
+        //CR { "Costa Rica" }
+        CU { "Kuuba" }
+        CV { "Cabo Verde" }
+        CX { "J\u00F5ulusaar" }
+        CY { "K\u00FCpros" }
+        CZ { "Tiehhi Vabariik" }
+        DE { "Saksamaa" }
+        //DJ { "Djibouti" }
+        DK { "Taani" }
+        //DM { "Dominica" }
+        DO { "Dominikaani Vabariik" }
+        DZ { "Al\u012Aeeria" }
+        //EC { "Ecuador" }
         EE { "Eesti" }
+        EG { "Egiptus" }
+        EH { "L\u00E4\u00E4ne-Sahara" }
+        //ER { "Eritrea" }
+        ES { "Hispaania" }
+        ET { "Etioopia" }
+        FI { "Soome" }
+        FJ { "Fid\u012Ai" }
+        FK { "Falklandi saared" }
+        FM { "Mikroneesia Liiduriigid" }
+        FO { "F\u00E4\u00E4ri saared" }
+        FR { "Prantsusmaa" }
+        //GA { "Gabon" }
+        GB { "\u00DChendkuningriik" }
+        //GD { "Grenada" }
+        GE { "Gruusia" }
+        GF { "Prantsuse Guajaana" }
+        //GH { "Ghana" }
+        //GI { "Gibraltar" }
+        GL { "Gr\u00F6\u00F6nimaa" }
+        //GM { "Gambia" }
+        //GN { "Guinea" }
+        //GP { "Guadeloupe" }
+        GQ { "Ekvatoriaal-Guinea" }
+        GR { "Kreeka" }
+        GS { "L\u00F5una-Georgia ja L\u00F5una-Sandwichi saared" }
+        //GT { "Guatemala" }
+        //GU { "Guam" }
+        //GW { "Guinea-Bissau" }
+        //GY { "Guyana" }
+        HK { "Hongkongi erihalduspiirkond" }
+        HM { "Heard ja McDonald" }
+        //HN { "Honduras" }
+        HR { "Horvaatia" }
+        //HT { "Haiti" }
+        HU { "Ungari" }
+        ID { "Indoneesia" }
+        IE { "Iirimaa" }
+        IL { "Iisrael" }
+        //IN { "India" }
+        IO { "Briti India ookeani ala" }
+        IQ { "Iraak" }
+        IR { "Iraan" }
+        IS { "Island" }
+        IT { "Itaalia" }
+        //JM { "Jamaica" }
+        JO { "Jordaania" }
+        JP { "Jaapan" }
+        //KE { "Kenya" }
+        KG { "K\u00F5rg\u00F5zstan" }
+        KH { "Kambod\u012Aa" }
+        //KI { "Kiribati" }
+        KM { "Komoorid" }
+        KN { "Saint Kitts ja Nevis" }
+        KP { "P\u00F5hja-Korea" }    // alternate name { "Korea RDV" }
+        KR { "L\u00F5una-Korea" }    // alternate name { "Korea Vabariik" }
+        KW { "Kuveit" }
+        KY { "Kaimani saared" }
+        KZ { "Kasahstan" }
+        LA { "Laose DRV" }
+        LB { "Liibanon" }
+        //LC { "Saint Lucia" }
+        //LI { "Liechtenstein" }
+        //LK { "Sri Lanka" }
+        LR { "Libeeria" }
+        //LS { "Lesotho" }
+        LT { "Leedu" }
+        LU { "Luksemburg" }
+        LV { "L\u00E4ti" }
+        LY { "Liib\u00FCa" }
+        MA { "Maroko" }
+        //MC { "Monaco" }
+        //MD { "Moldova" }
+        MG { "Madagaskar" }
+        MH { "Marshalli Saared" }
+        MK { "Makedoonia Vabariik" }
+        //ML { "Mali" }
+        //MM { "Myanmar" }
+        MN { "Mongoolia" }
+        MO { "Aomeni Hiina erihalduspiirkond" }
+        MP { "P\u00F5hja-Mariaanid" }
+        //MQ { "Martinique" }
+        MR { "Mauritaania" }
+        //MS { "Montserrat" }
+        //MT { "Malta" }
+        //MU { "Mauritius" }
+        MV { "Maldiivid" }
+        //MW { "Malawi" }
+        MX { "Mehhiko" }
+        MY { "Malaisia" }
+        MZ { "Mosambiik" }
+        NA { "Namiibia" }
+        NC { "Uus-Kaledoonia" }
+        //NE { "Niger" }
+        NF { "Norfolk" }
+        NG { "Nigeeria" }
+        //NI { "Nicaragua" }
+        NL { "Holland" }
+        NO { "Norra" }
+        //NP { "Nepal" }
+        //NR { "Nauru" }
+        //NU { "Niue" }
+        NZ { "Uus-Meremaa" }
+        OM { "Omaan" }
+        //PA { "Panama" }
+        PE { "Peruu" }
+        PF { "Prantsuse Pol\u00FCneesia" }
+        PG { "Paapua Uus-Guinea" }
+        PH { "Filipiinid" }
+        //PK { "Pakistan" }
+        PL { "Poola" }
+        PM { "Saint-Pierre ja Miquelon" }
+        //PN { "Pitcairn" }
+        //PR { "Puerto Rico" }
+        PS { "Palestiina Omavalitsus" }
+        //PT { "Portugal" }
+        PW { "Belau" }
+        //PY { "Paraguay" }
+        QA { "Katar" }
+        //RE { "R\u00E9union" }
+        RO { "Rumeenia" }
+        RU { "Venemaa" }
+        //RW { "Rwanda" }
+        SA { "Saudi Araabia" }
+        SB { "Saalomoni Saared" }
+        SC { "Seiiellid" }
+        SD { "Sudaan" }
+        SE { "Rootsi" }
+        SG { "Singapur" }
+        //SH { "Saint Helena" }
+        SI { "Sloveenia" }
+        SJ { "Svalbard ja Jan Mayen" }
+        SK { "Slovakkia" }
+        //SL { "Sierra Leone" }
+        //SM { "San Marino" }
+        //SN { "Senegal" }
+        SO { "Somaalia" }
+        //SR { "Suriname" }
+        ST { "Sao Tom\u00E9 ja Principe" }
+        //SV { "El Salvador" }
+        SY { "S\u00FC\u00FCria" }
+        SZ { "Svaasimaa" }
+        TC { "Turks ja Caicos" }
+        TD { "Tiaad" }
+        TF { "Prantsuse L\u00F5unaalad" }
+        //TG { "Togo" }
+        TH { "Tai" }
+        TJ { "Tad\u012Aikistan" }
+        //TK { "Tokelau" }
+        TL { "Ida-Timor" }
+        TM { "T\u00FCrkmenistan" }
+        TN { "Tuneesia" }
+        //TO { "Tonga" }
+        TR { "T\u00FCrgi" }
+        TT { "Trinidad ja Tobago" }
+        //TV { "Tuvalu" }
+        //TW { "Taiwan" }
+        TZ { "Tansaania" }
+        UA { "Ukraina" }
+        //UG { "Uganda" }
+        UM { "\u00DChendriikide hajasaared" }
+        US { "Ameerika \u00DChendriigid" }
+        //UY { "Uruguay" }
+        UZ { "Usbekistan" }
+        VA { "P\u00FCha Tool (Vatikan)" }
+        VC { "Saint Vincent ja Grenadiinid" }
+        //VE { "Venezuela" }
+        VG { "Briti Neitsisaared" }
+        VI { "USA Neitsisaared" }
+        //VN { "Vietnam" }
+        //VU { "Vanuatu" }
+        WF { "Wallis ja Futuna" }
+        //WS { "Samoa" }
+        YE { "Jeemen" }
+        //YT { "Mayotte" }
+        YU { "Jugoslaavia" }
+        ZA { "L\u00F5una-Aafrika Vabariik" }
+        ZM { "Sambia" }
+        //ZW { "Zimbabwe" }
+    }
+    Languages { 
+        ar { "Araabia" }
+        bg { "Bulgaaria" }
+        cs { "Tiehhi" }
+        da { "Taani" }
+        de { "Saksa" }
+        el { "Kreeka" }
+        en { "Inglise" }
+        es { "Hispaania" }
+        et { "Eesti" }
+        fi { "Soome" }
+        fr { "Prantsuse" }
+        he { "Heebrea" }
+        hr { "Horvaadi" }
+        hu { "Ungari" }
+        it { "Itaalia" }
+        ja { "Jaapani" }
+        ko { "Korea" }
+        lt { "Leedu" }
+        lv { "L\u00E4ti" }
+        nl { "Hollandi" }
+        no { "Norra" }
+        pl { "Poola" }
+        pt { "Portugali" }
+        ro { "Rumeenia" }
+        ru { "Vene" }
+        sk { "Slovaki" }
+        sl { "Sloveeni" }
+        sv { "Rootsi" }
+        tr { "T\u00FCrgi" }
+        zh { "Hiina" }
+        //zh_cn { "Hiina (lihtsustatud)" }
+        //zh_tw { "Hiina (traditsiooniline)" }
     }
     DateTimePatterns { 
         "H:mm:ss z",
@@ -54,24 +330,19 @@
         "e.m.a.",
         "m.a.j.",
     }
-    Languages { 
-        et { "Eesti" }
-    }
-    LocaleID:int { 0x25 }
-//    LocaleString { "et" }
     MonthAbbreviations { 
-        "jaan.",
-        "veebr.",
+        "jaan",
+        "veebr",
         "m\u00E4rts",
-        "apr.",
+        "apr",
         "mai",
         "juuni",
         "juuli",
-        "aug.",
-        "sept.",
-        "okt.",
-        "nov.",
-        "dets.",
+        "aug",
+        "sept",
+        "okt",
+        "nov",
+        "dets",
     }
     MonthNames { 
         "jaanuar",
@@ -100,25 +371,17 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "est" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
+
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
     }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
     ExemplarCharacters { "[a-z \u00f5 \u00e4 \u00f6 \u00fc \u0161 \u017e]" }
 
     // Currency display names
     Currencies {
         EEK { "kr", "EEK" }
     }
-}
+}
\ No newline at end of file

Index: et_EE.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/et_EE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- et_EE.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ et_EE.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -7,13 +7,10 @@
 
 et_EE {
     Version{ "2.0" }
-//    LocaleString { "et_EE" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "EST" }
-    LocaleID:int { 0x0425 }
 }

Index: eu.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/eu.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- eu.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ eu.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -7,8 +7,12 @@
 
 eu {
     Version { "2.0" }
-    Languages {
-        eu { "euskara" }
+    Countries {
+        ES { "Espainia" }
+    }
+    // Currency display names
+    Currencies {
+        ESP { "\u20A7", "ESP" }
     }
     DayAbbreviations {
         "ig",
@@ -28,6 +32,13 @@
         "ostirala",
         "larunbata",
     }
+    Languages {
+        eu { "euskara" }
+    }
+    LocaleScript{  
+        "Latn",  // ISO 15924 Name 
+    }
+    ExemplarCharacters { "[a-z\u00f1\u00e7]" }
     MonthAbbreviations {
         "urt",
         "ots",
@@ -69,24 +80,13 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-    LocaleID:int { 0x2D }
-//    LocaleScript{  
-//        "Latn",  // ISO 15924 Name 
-//    }
-    ExemplarCharacters { "[a-z \u00f1 \u00e7]" }
 
     // /**************** Info Below is needed ****************/
-    // CollationElements{}
+    // collations{}
     // Countries{}
     // Eras{}
     // Languages{}
-    // ShortLanguage { }
     // localPatternChars{}
-    //
-
-    // Currency display names
-    Currencies {
-        ESP { "\u20A7", "ESP" }
-    }
 }

Index: eu_ES.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/eu_ES.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- eu_ES.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ eu_ES.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -28,5 +28,4 @@
         "#,##0%",
         "#E0",
     }
-    LocaleID:int { 0x042D }
 }

Index: fa.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/fa.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fa.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ fa.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -9,11 +9,8 @@
 
 fa {
     Version { "3.0" }
-    AmPmMarkers { 
-        "\u0642.\u0638.",
-        "\u0628.\u0638.",
-    }
-    CollationElements {
+    collations {
+      standard { 
         Version { "2.0" }
         Sequence { "[normalization on]"
            "&\u064e<<\u0650<<\u064f<<\u064b<<\u064d<<\u064c"
@@ -23,111 +20,17 @@
            "&\u06cf <\u0647<<\u06d5<<\u06c1<<\u0629<<\u06c3<<\u06c0<<\u06be"
            "&\u06cc<<\u0649<<\u06d2<<\u064a<<\u06d0<<\u06d1<<\u06cd<<\u06ce"
          }
+      }
     }
-    LocaleScript:array { 
-        "Arab"   // ISO 15924 Name 
-    }
-    DateTimePatterns { 
-        "HH:mm:ss (z)",
-        "HH:mm:ss (z)",
-        "HH:mm:ss",
-        "HH:mm",
-        "EEEE\u060c d MMMM yyyy",
-        "d MMMM yyyy",
-        "yyyy/MM/d",
-        "yyyy/MM/d",
-        "{1} {0}",
-    }
-    ExemplarCharacters{"[\u0621-\u0624\u0626-\u063a\u0641\u0642\u0644-\u0648\u064b-\u0652\u0654\u0670\u067e\u0686\u0698\u06a9\u06af\u06cc\u200c\u200d\u200f\u200e]"}
-    DayAbbreviations { 
-        "\u06cc.",
-        "\u062f.",
-        "\u0633.",
-        "\u0686.",
-        "\u067e.",
-        "\u062c.",
-        "\u0634.",
-    }
-    DayNames { 
-        "\u06cc\u06a9\u200c\u0634\u0646\u0628\u0647",
-        "\u062f\u0648\u0634\u0646\u0628\u0647",
-        "\u0633\u0647\u200c\u0634\u0646\u0628\u0647",
-        "\u0686\u0647\u0627\u0631\u0634\u0646\u0628\u0647",
-        "\u067e\u0646\u062c\u200c\u0634\u0646\u0628\u0647",
-        "\u062c\u0645\u0639\u0647",
-        "\u0634\u0646\u0628\u0647",
-    }
-    MonthAbbreviations { 
-        "\u0698\u0627\u0646",
-        "\u0641\u0648\u0631",
-        "\u0645\u0627\u0631",
-        "\u0622\u0648\u0631",
-        "\u0645\u0640\u0647",
-        "\u0698\u0648\u0646",
-        "\u0698\u0648\u06cc",
-        "\u0627\u0648\u062a",
-        "\u0633\u067e\u062a",
-        "\u0627\u06a9\u062a",
-        "\u0646\u0648\u0627",
-        "\u062f\u0633\u0627",
-    }
-    MonthNames { 
-        "\u0698\u0627\u0646\u0648\u06cc\u0647",
-        "\u0641\u0648\u0631\u06cc\u0647",
-        "\u0645\u0627\u0631\u0633",
-        "\u0622\u0648\u0631\u06cc\u0644",
-        "\u0645\u0647",
-        "\u0698\u0648\u0626\u0646",
-        "\u0698\u0648\u0626\u06cc\u0647",
-        "\u0627\u0648\u062a",
-        "\u0633\u067e\u062a\u0627\u0645\u0628\u0631",
-        "\u0627\u06a9\u062a\u0628\u0631",
-        "\u0646\u0648\u0627\u0645\u0628\u0631",
-        "\u062f\u0633\u0627\u0645\u0628\u0631",
-    }
-    LocaleID:int { 0x29 }
-    Eras { 
-        "\u0642.\u0645.",
-        "\u0645.",
-    }
-    zoneStrings {
-        {
-            "Asia/Tehran",
-            "\u0648\u0642\u062a \u0627\u0633\u062a\u0627\u0646\u062f\u0627\u0631\u062f \u062a\u0647\u0631\u0627\u0646",
-            "IRST",
-            "\u0648\u0642\u062a \u062a\u0627\u0628\u0633\u062a\u0627\u0646\u06cc \u062a\u0647\u0631\u0627\u0646",
-            "IRDT",
-            "\u062a\u0647\u0631\u0627\u0646",
-        }
+    AmPmMarkers { 
+        "\u0642.\u0638.",
+        "\u0628.\u0638.",
     }
-    SpelloutRules {
-        "%main:\n"
-        "    -x: \u0645\u0646\u0641\u06cc >>;\n"
-        "    x.x: << \u0645\u0645\u06cc\u0632 >>;\n"
-        "    \u0635\u0641\u0631; \u06cc\u06a9; \u062f\u0648; \u0633\u0647; \u0686\u0647\u0627\u0631; \u067e\u0646\u062c; \u0634\u0634; \u0647\u0641\u062a; \u0647\u0634\u062a; \u0646\u0647;\n"
-        "    \u062f\u0647; \u06cc\u0627\u0632\u062f\u0647; \u062f\u0648\u0627\u0632\u062f\u0647; \u0633\u06cc\u0632\u062f\u0647; \u0686\u0647\u0627\u0631\u062f\u0647; \u067e\u0627\u0646\u0632\u062f\u0647; \u0634\u0627\u0646\u0632\u062f\u0647;\n"
-        "        \u0647\u0641\u062f\u0647; \u0647\u062c\u062f\u0647; \u0646\u0648\u0632\u062f\u0647;\n"
-        "    20: \u0628\u06cc\u0633\u062a[ \u0648 >>];\n"
-        "    30: \u0633\u06cc[ \u0648 >>];\n"
-        "    40: \u0686\u0647\u0644[ \u0648 >>];\n"
-        "    50: \u067e\u0646\u062c\u0627\u0647[ \u0648 >>];\n"
-        "    60: \u0634\u0635\u062a[ \u0648 >>];\n"
-        "    70: \u0647\u0641\u062a\u0627\u062f[ \u0648 >>];\n"
-        "    80: \u0647\u0634\u062a\u0627\u062f[ \u0648 >>];\n"
-        "    90: \u0646\u0648\u062f[ \u0648 >>];\n"
-        "    100: \u0635\u062f[ \u0648 >>];\n"
-        "    200: \u062f\u0648\u06cc\u0633\u062a[ \u0648 >>];\n"
-        "    300: \u0633\u06cc\u0635\u062f[ \u0648 >>];\n"
-        "    400: \u0686\u0647\u0627\u0631\u0635\u062f[ \u0648 >>];\n"
-        "    500: \u067e\u0627\u0646\u0635\u062f[ \u0648 >>];\n"
-        "    600: \u0634\u0634\u0635\u062f[ \u0648 >>];\n"
-        "    700: \u0647\u0641\u062a\u0635\u062f[ \u0648 >>];\n"
-        "    800: \u0647\u0634\u062a\u0635\u062f[ \u0648 >>];\n"
-        "    900: \u0646\u0647\u0635\u062f[ \u0648 >>];\n"
-        "    1000: << \u0647\u0632\u0627\u0631[ \u0648 >>];\n"
-        "    1,000,000: << \u0645\u06cc\u0644\u06cc\u0648\u0646[ \u0648 >>];\n"
-        "    1,000,000,000: << \u0645\u06cc\u0644\u06cc\u0627\u0631\u062f[ \u0648 >>];\n"
-        "    1,000,000,000,000: =#,##0=;\n"
+    // Currency display names
+    Currencies {
+        // The Afghani symbol doesn't exist in Unicode. So we use the long name
+        AFA { "\u0627\u0641\u063a\u0627\u0646\u06cc", "\u0627\u0641\u063a\u0627\u0646\u06cc" }
+        IRR { "\uFDFC", "IRR" }
     }
 
     Countries {
@@ -396,6 +299,40 @@
         ZM { "\u0632\u0627\u0645\u0628\u06cc\u0627" }
         ZW { "\u0632\u06cc\u0645\u0628\u0627\u0628\u0648\u0647" }
     }
+    DateTimePatterns { 
+        "HH:mm:ss (z)",
+        "HH:mm:ss (z)",
+        "HH:mm:ss",
+        "HH:mm",
+        "EEEE\u060c d MMMM yyyy",
+        "d MMMM yyyy",
+        "yyyy/MM/d",
+        "yyyy/MM/d",
+        "{1} {0}",
+    }
+    DayAbbreviations { 
+        "\u06cc.",
+        "\u062f.",
+        "\u0633.",
+        "\u0686.",
+        "\u067e.",
+        "\u062c.",
+        "\u0634.",
+    }
+    DayNames { 
+        "\u06cc\u06a9\u200c\u0634\u0646\u0628\u0647",
+        "\u062f\u0648\u0634\u0646\u0628\u0647",
+        "\u0633\u0647\u200c\u0634\u0646\u0628\u0647",
+        "\u0686\u0647\u0627\u0631\u0634\u0646\u0628\u0647",
+        "\u067e\u0646\u062c\u200c\u0634\u0646\u0628\u0647",
+        "\u062c\u0645\u0639\u0647",
+        "\u0634\u0646\u0628\u0647",
+    }
+    Eras { 
+        "\u0642.\u0645.",
+        "\u0645.",
+    }
+    ExemplarCharacters {"[\u0621-\u0624\u0626-\u063a\u0641\u0642\u0644-\u0648\u064b-\u0652\u0654\u0670\u067e\u0686\u0698\u06a9\u06af\u06cc\u200c\u200d\u200f\u200e]"}
     Languages {
         root  { "\u0631\u06cc\u0634\u0647" }
         aa  { "\u0622\u0641\u0627\u0631\u06cc" }
@@ -518,7 +455,7 @@
         is  { "\u0627\u06cc\u0633\u0644\u0646\u062f\u06cc" }
         it  { "\u0627\u06cc\u062a\u0627\u0644\u06cc\u0627\u06cc\u06cc" }
         iu  { "\u0627\u06cc\u0646\u0648\u06a9\u06cc\u062a\u0648\u062a" }
-        iw  { "\u0639\u0628\u0631\u06cc" }  // Use he instead
+        //iw  { "\u0639\u0628\u0631\u06cc" }  // Use he instead
         ja  { "\u0698\u0627\u067e\u0646\u06cc" }
         jpr { "\u0641\u0627\u0631\u0633\u06cc \u06cc\u0647\u0648\u062f\u06cc" }
         jrb { "\u0639\u0631\u0628\u06cc \u06cc\u0647\u0648\u062f\u06cc" }
@@ -543,7 +480,6 @@
         // ? lam { "Lamba" }
         lb  { "\u0644\u062a\u0633\u0647\u200c\u0628\u0648\u0631\u06af\u06cc\u0634" }
         // ? lez { "Lezghian" }
-        lit { "\u0644\u06cc\u062a\u0648\u0627\u0646\u06cc\u0627\u06cc\u06cc" }
         ln  { "\u0644\u06cc\u0646\u06af\u0627\u0644\u0627" }
         lo  { "\u0644\u0627\u0626\u0648\u0633\u06cc" }
         lt  { "\u0644\u06cc\u062a\u0648\u0627\u0646\u06cc\u0627\u06cc\u06cc" }
@@ -648,7 +584,6 @@
         tr  { "\u062a\u0631\u06a9\u06cc" }
         ts  { "\u062a\u0633\u0648\u0646\u06af\u0627\u06cc\u06cc" }
         tt  { "\u062a\u0627\u062a\u0627\u0631\u06cc" }
-        tur { "\u062a\u0631\u06a9\u06cc \u0627\u0633\u062a\u0627\u0646\u0628\u0648\u0644\u06cc" }
         // ? tvl { "Tuvalu" }
         tw  { "\u062a\u0648\u06cc\u200c\u06cc\u0627\u06cc\u06cc" }
         ty  { "\u062a\u0627\u0647\u06cc\u062a\u06cc\u0627\u06cc\u06cc" }
@@ -670,53 +605,119 @@
         zh  { "\u0686\u06cc\u0646\u06cc" }
         zu  { "\u0632\u0648\u0644\u0648\u06cc\u06cc" }
     }
+    LocaleScript:array { 
+        "Arab"   // ISO 15924 Name 
+    }
+    MonthAbbreviations { 
+        "\u0698\u0627\u0646",
+        "\u0641\u0648\u0631",
+        "\u0645\u0627\u0631",
+        "\u0622\u0648\u0631",
+        "\u0645\u0640\u0647",
+        "\u0698\u0648\u0646",
+        "\u0698\u0648\u06cc",
+        "\u0627\u0648\u062a",
+        "\u0633\u067e\u062a",
+        "\u0627\u06a9\u062a",
+        "\u0646\u0648\u0627",
+        "\u062f\u0633\u0627",
+    }
+    MonthNames { 
+        "\u0698\u0627\u0646\u0648\u06cc\u0647",
+        "\u0641\u0648\u0631\u06cc\u0647",
+        "\u0645\u0627\u0631\u0633",
+        "\u0622\u0648\u0631\u06cc\u0644",
+        "\u0645\u0647",
+        "\u0698\u0648\u0626\u0646",
+        "\u0698\u0648\u0626\u06cc\u0647",
+        "\u0627\u0648\u062a",
+        "\u0633\u067e\u062a\u0627\u0645\u0628\u0631",
+        "\u0627\u06a9\u062a\u0628\u0631",
+        "\u0646\u0648\u0627\u0645\u0628\u0631",
+        "\u062f\u0633\u0627\u0645\u0628\u0631",
+    }
     Scripts { 
-        ARAB { "\u0639\u0631\u0628\u06cc" }
-        ARMN { "\u0627\u0631\u0645\u0646\u06cc" }
-        BENG { "\u0628\u0646\u06af\u0627\u0644\u06cc" }
-        BOPO { "\u0628\u0648\u067e\u0648\u0645\u0648\u0641\u0648" }
-        // ? CANS { "Unified Canadian Aboriginal Symbols" }
-        CHER { "\u0686\u0631\u0648\u06a9\u06cc\u0627\u06cc\u06cc" }
-        CYRL { "\u0633\u06cc\u0631\u06cc\u0644\u06cc" }
-        DEVA { "\u062f\u0648\u0646\u0627\u06af\u0631\u06cc" }
-        // ? DSRT { "Deseret" }
-        ETHI { "\u0627\u062a\u06cc\u0648\u067e\u06cc\u0627\u06cc\u06cc" }
-        GEOR { "\u06af\u0631\u062c\u06cc" }
-        GOTH { "\u06af\u0648\u062a\u06cc\u06a9" }
-        GREK { "\u06cc\u0648\u0646\u0627\u0646\u06cc" }
-        GUJR { "\u06af\u062c\u0631\u0627\u062a\u06cc" }
-        // ? GURU { "Gurmukhi" }
-        HANG { "\u0647\u0627\u0646\u06af\u0648\u0644" }
-        HANI { "\u0647\u0627\u0646" }
-        HEBR { "\u0639\u0628\u0631\u06cc" }
-        HIRA { "\u0647\u06cc\u0631\u0627\u06af\u0627\u0646\u0627" }
-        // ? ITAL { "Old_italic" }
-        KANA { "\u06a9\u0627\u062a\u0627\u06a9\u0627\u0646\u0627" }
-        KHMR { "\u062e\u0645\u0631\u06cc" }
-        KNDA { "\u06a9\u0627\u0646\u0627\u062f\u0647\u200c\u0627\u06cc" }
-        LAO  { "\u0644\u0627\u0626\u0648\u0633\u06cc" }
-        LATN { "\u0644\u0627\u062a\u06cc\u0646" }
-        MLYM { "\u0645\u0627\u0644\u0627\u06cc\u0627\u0644\u0627\u0645\u06cc" }
-        MONG { "\u0645\u063a\u0648\u0644\u06cc" }
-        MYMR { "\u0645\u06cc\u0627\u0646\u0645\u0627\u0631" }
-        // ? OGAM { "Ogham" }
-        ORYA { "\u0627\u0648\u0631\u06cc\u0647\u200c\u0627\u06cc" }
-        QAAC { "\u0642\u0628\u0637\u06cc" }
-        QAAI { "\u0645\u0648\u0631\u0648\u062b\u06cc" }
-        RUNR { "\u0631\u0648\u0646\u06cc" }
-        // ? SINH { "Sinhala" }
-        SYRC { "\u0622\u0633\u0648\u0631\u06cc" }
-        TAML { "\u062a\u0627\u0645\u06cc\u0644" }
-        TELU { "\u062a\u0644\u0648\u06af\u0648\u06cc\u06cc" }
-        // ? THAA { "Thana" }
-        THAI { "\u062a\u0627\u06cc\u0644\u0646\u062f\u06cc" }
-        TIBT { "\u062a\u0628\u062a\u06cc" }
-        YIII { "\u06cc\u06cc" }
-        ZYYY { "\u0645\u0634\u062a\u0631\u06a9" }
+        Arab { "\u0639\u0631\u0628\u06cc" }
+        Armn { "\u0627\u0631\u0645\u0646\u06cc" }
+        Beng { "\u0628\u0646\u06af\u0627\u0644\u06cc" }
+        Bopo { "\u0628\u0648\u067e\u0648\u0645\u0648\u0641\u0648" }
+        // ? Cans { "Unified Canadian Aboriginal Symbols" }
+        Cher { "\u0686\u0631\u0648\u06a9\u06cc\u0627\u06cc\u06cc" }
+        Cyrl { "\u0633\u06cc\u0631\u06cc\u0644\u06cc" }
+        Deva { "\u062f\u0648\u0646\u0627\u06af\u0631\u06cc" }
+        // ? Dsrt { "Deseret" }
+        Ethi { "\u0627\u062a\u06cc\u0648\u067e\u06cc\u0627\u06cc\u06cc" }
+        Geor { "\u06af\u0631\u062c\u06cc" }
+        Goth { "\u06af\u0648\u062a\u06cc\u06a9" }
+        Grek { "\u06cc\u0648\u0646\u0627\u0646\u06cc" }
+        Gujr { "\u06af\u062c\u0631\u0627\u062a\u06cc" }
+        // ? Guru { "Gurmukhi" }
+        Hang { "\u0647\u0627\u0646\u06af\u0648\u0644" }
+        Hani { "\u0647\u0627\u0646" }
+        Hebr { "\u0639\u0628\u0631\u06cc" }
+        Hira { "\u0647\u06cc\u0631\u0627\u06af\u0627\u0646\u0627" }
+        // ? Ital { "Old_italic" }
+        Kana { "\u06a9\u0627\u062a\u0627\u06a9\u0627\u0646\u0627" }
+        Khmr { "\u062e\u0645\u0631\u06cc" }
+        Knda { "\u06a9\u0627\u0646\u0627\u062f\u0647\u200c\u0627\u06cc" }
+        Laoo { "\u0644\u0627\u0626\u0648\u0633\u06cc" }
+        Latn { "\u0644\u0627\u062a\u06cc\u0646" }
+        Mlym { "\u0645\u0627\u0644\u0627\u06cc\u0627\u0644\u0627\u0645\u06cc" }
+        Mong { "\u0645\u063a\u0648\u0644\u06cc" }
+        Mymr { "\u0645\u06cc\u0627\u0646\u0645\u0627\u0631" }
+        // ? Ogam { "Ogham" }
+        Orya { "\u0627\u0648\u0631\u06cc\u0647\u200c\u0627\u06cc" }
+        Qaac { "\u0642\u0628\u0637\u06cc" }
+        Qaai { "\u0645\u0648\u0631\u0648\u062b\u06cc" }
+        Runr { "\u0631\u0648\u0646\u06cc" }
+        // ? Sinh { "Sinhala" }
+        Syrc { "\u0622\u0633\u0648\u0631\u06cc" }
+        Taml { "\u062a\u0627\u0645\u06cc\u0644" }
+        Telu { "\u062a\u0644\u0648\u06af\u0648\u06cc\u06cc" }
+        // ? Thaa { "Thana" }
+        Thai { "\u062a\u0627\u06cc\u0644\u0646\u062f\u06cc" }
+        Tibt { "\u062a\u0628\u062a\u06cc" }
+        Yiii { "\u06cc\u06cc" }
+        Zyyy { "\u0645\u0634\u062a\u0631\u06a9" }
     }
 
-    // Currency display names
-    Currencies {
-        IRR { "\uFDFC", "IRR" }
+    SpelloutRules {
+        "%main:\n"
+            "-x: \u0645\u0646\u0641\u06cc >>;\n"
+            "x.x: << \u0645\u0645\u06cc\u0632 >>;\n"
+            "\u0635\u0641\u0631; \u06cc\u06a9; \u062f\u0648; \u0633\u0647; \u0686\u0647\u0627\u0631; \u067e\u0646\u062c; \u0634\u0634; \u0647\u0641\u062a; \u0647\u0634\u062a; \u0646\u0647;\n"
+            "\u062f\u0647; \u06cc\u0627\u0632\u062f\u0647; \u062f\u0648\u0627\u0632\u062f\u0647; \u0633\u06cc\u0632\u062f\u0647; \u0686\u0647\u0627\u0631\u062f\u0647; \u067e\u0627\u0646\u0632\u062f\u0647; \u0634\u0627\u0646\u0632\u062f\u0647;\n"
+            "    \u0647\u0641\u062f\u0647; \u0647\u062c\u062f\u0647; \u0646\u0648\u0632\u062f\u0647;\n"
+            "20: \u0628\u06cc\u0633\u062a[ \u0648 >>];\n"
+            "30: \u0633\u06cc[ \u0648 >>];\n"
+            "40: \u0686\u0647\u0644[ \u0648 >>];\n"
+            "50: \u067e\u0646\u062c\u0627\u0647[ \u0648 >>];\n"
+            "60: \u0634\u0635\u062a[ \u0648 >>];\n"
+            "70: \u0647\u0641\u062a\u0627\u062f[ \u0648 >>];\n"
+            "80: \u0647\u0634\u062a\u0627\u062f[ \u0648 >>];\n"
+            "90: \u0646\u0648\u062f[ \u0648 >>];\n"
+            "100: \u0635\u062f[ \u0648 >>];\n"
+            "200: \u062f\u0648\u06cc\u0633\u062a[ \u0648 >>];\n"
+            "300: \u0633\u06cc\u0635\u062f[ \u0648 >>];\n"
+            "400: \u0686\u0647\u0627\u0631\u0635\u062f[ \u0648 >>];\n"
+            "500: \u067e\u0627\u0646\u0635\u062f[ \u0648 >>];\n"
+            "600: \u0634\u0634\u0635\u062f[ \u0648 >>];\n"
+            "700: \u0647\u0641\u062a\u0635\u062f[ \u0648 >>];\n"
+            "800: \u0647\u0634\u062a\u0635\u062f[ \u0648 >>];\n"
+            "900: \u0646\u0647\u0635\u062f[ \u0648 >>];\n"
+            "1000: << \u0647\u0632\u0627\u0631[ \u0648 >>];\n"
+            "1,000,000: << \u0645\u06cc\u0644\u06cc\u0648\u0646[ \u0648 >>];\n"
+            "1,000,000,000: << \u0645\u06cc\u0644\u06cc\u0627\u0631\u062f[ \u0648 >>];\n"
+            "1,000,000,000,000: =#,##0=;\n"
+    }
+    zoneStrings {
+        {
+            "Asia/Tehran",
+            "\u0648\u0642\u062a \u0627\u0633\u062a\u0627\u0646\u062f\u0627\u0631\u062f \u062a\u0647\u0631\u0627\u0646",
+            "IRST",
+            "\u0648\u0642\u062a \u062a\u0627\u0628\u0633\u062a\u0627\u0646\u06cc \u062a\u0647\u0631\u0627\u0646",
+            "IRDT",
+            "\u062a\u0647\u0631\u0627\u0646",
+        }
     }
 }

Index: fa_IR.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/fa_IR.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fa_IR.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ fa_IR.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -13,7 +13,6 @@
         7,      // Saturday
         1,
     }
-    LocaleID:int { 0x0429 }
     NumberPatterns { 
         "#,##0.###;\u2212#,##0.###",
         "#,##0 \u00a4;\u2212#,##0 \u00a4",
@@ -33,6 +32,7 @@
         "\u221E",
         "\uFFFD",
         "\u066B",
+        "+",
     }
 }
 

Index: fi.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/fi.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fi.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ fi.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -1,4 +1,4 @@
-// ***************************************************************************
+// ***************************************************************************
 // *
 // *   Copyright (C) 1997-2003, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
@@ -6,25 +6,53 @@
 // ***************************************************************************
 
 fi {
-    Version { "2.0" }
-    CollationElements { 
-        Version { "1.0" }
-        Sequence { "& V << w <<< W & Z < a\u030A <<< A\u030A< a\u0308 <<< A\u0308 "
-            "< o\u0308 <<< O\u0308< o\u030B <<< O\u030B << \u00F8 <<< \u00D8&  Y << u\u030B<<< U\u030B"
-            " << u\u0308 <<< U\u0308"
+    Version { "3.0" }
+    collations {
+      standard { 
+        Version { "2.0" }
+        Sequence { 
+            "&D<<đ<<<Đ<<ð<<<Ð"
+            "&t<<<þ/h"
+            "&T<<<Þ/H"
+            "&Y<<ü<<<Ü<<ű<<<Ű"
+            "&[before 1]ʒ<å<<<Å<ä<<<Ä<<æ<<<Æ<<ę<<<Ę"
+            "<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<œ<<<Œ<<ô<<<Ô"
         }
+      }
     }
     Countries { 
-        AE { "Yhdistyneet Arabiemiraatit" }
-        AT { "It\u00e4valta" }
-        BA { "Bosnia" }
+        Fallback{ "en"}
+        AE { "Arabiemiirikunnat" }
+        //AE { "Yhdistyneet Arabiemiraatit" } // Old value
+        AF { "Afganistan" }
+        AG { "Antigua ja Barbuda" }
+        AN { "Alankomaiden Antillit" }
+        AQ { "Antarktis" }
+        AR { "Argentiina" }
+        AS { "Amerikan Samoa" }
+        AT { "It\u00E4valta" }
+        AZ { "Azerbaidzan" }
+        BA { "Bosnia ja Hertsegovina" }
         BE { "Belgia" }
         BR { "Brasilia" }
-        BY { "Valko-Ven\u00e4j\u00e4" }
+        BS { "Bahama" }
+        BV { "Bouvet'nsaari" }
+        BY { "Valko-Ven\u00E4j\u00E4" }
         CA { "Kanada" }
+        CC { "Kookossaaret" }
+        CD { "Kongon demokraattinen tasavalta" }
+        CF { "Keski-Afrikan tasavalta" }
+        CG { "Kongo" }
         CH { "Sveitsi" }
+        CI { "Norsunluurannikko" }
+        CK { "Cookinsaaret" }
+        CM { "Kamerun" }
         CN { "Kiina" }
         CO { "Kolumbia" }
+        CU { "Kuuba" }
+        CV { "Kap Verde" }
+        CX { "Joulusaari" }
+        CY { "Kypros" }
         CZ { "Tsekin tasavalta" }
         DE { "Saksa" }
         DK { "Tanska" }
@@ -32,82 +60,111 @@
         EC { "Equador" }
         EE { "Viro" }
         EG { "Egypti" }
+        EH { "L\u00E4nsi-Sahara" }
         ES { "Espanja" }
+        ET { "Etiopia" }
         FI { "Suomi" }
+        FJ { "Fidzi" }
+        FK { "Falklandinsaaret" }
+        FM { "Mikronesia" }
+        FO { "F\u00E4rsaaret" }
         FR { "Ranska" }
         GB { "Iso-Britannia" }
+        GF { "Ranskan Guayana" }
+        GL { "Gr\u00F6nlanti" }
+        GQ { "P\u00E4iv\u00E4ntasaajan Guinea" }
         GR { "Kreikka" }
+        GS { "Etel\u00E4-Georgia ja Etel\u00E4iset Sandwichsaaret" }
+        HK { "Hongkongin erityishallintoalue" }
+        //HK { "Hongknog, erit.hall.alue" } // Old value
+        HM { "Heard ja McDonaldinsaaret" }
         HR { "Kroatia" }
         HU { "Unkari" }
-        HK { "Hongknog, erit.hall.alue" }
         IE { "Irlanti" }
         IN { "Intia" }
+        IO { "Brittil\u00E4inen Intian valtameren alue" }
+        IQ { "Irak" }
         IS { "Islanti" }
         IT { "Italia" }
         JO { "Jordania" }
         JP { "Japani" }
-        KR { "Korea" }
-        LA { "Latinalainen Amerikka" }
+        KE { "Kenia" }
+        KG { "Kirgisia" }
+        KH { "Kambodza" }
+        KM { "Komorit" }
+        KN { "Saint Kitts ja Nevis" }
+        KP { "Pohjois-Korea" }    // alternate name { "Korean demokraattinen kansantasavalta" }
+        KR { "Etel\u00E4-Korea" }    // alternate name { "Korean tasavalta" }
+        KY { "Caymansaaret" }
+        KZ { "Kazakstan" }
+        LA { "Laos" }
         LB { "Libanon" }
         LT { "Liettua" }
         LU { "Luxemburg" }
         MA { "Marokko" }
-        MK { "Makedonia (FYR)" }
-        MO { "Macao, erit.hall.alue" }
+        MG { "Madagaskar" }
+        MH { "Marshallinsaaret" }
+        MK { "Makedonia" }
+        //MK { "Makedonia (FYR)" } // Old value
+        //MO { "Macao, erit.hall.alue" } // Old value
+        MO { "Macaon erityishallintoalue" }
+        MP { "Pohjois-Mariaanit" }
+        MV { "Malediivit" }
         MX { "Meksiko" }
+        MY { "Malesia" }
+        MZ { "Mosambik" }
+        NC { "Uusi-Kaledonia" }
+        NF { "Norfolkinsaari" }
         NL { "Alankomaat" }
         NO { "Norja" }
         NZ { "Uusi Seelanti" }
+        //NZ { "Uusi-Seelanti" } // From translation center
+        PF { "Ranskan Polynesia" }
+        PG { "Papua-Uusi-Guinea" }
+        PH { "Filippiinit" }
         PL { "Puola" }
+        PM { "Saint-Pierre ja Miquelon" }
+        PS { "Palestiina" }
         PT { "Portugali" }
         RU { "Ven\u00e4j\u00e4" }
+        RW { "Ruanda" }
         SA { "Saudi-Arabia" }
+        SB { "Salomonsaaret" }
+        SC { "Seychellit" }
         SE { "Ruotsi" }
+        SJ { "Huippuvuoret ja Jan Mayen" }
+        ST { "Sao Tome ja Principe" }
         SY { "Syyria" }
+        SZ { "Swazimaa" }
+        TC { "Turks- ja Caicossaaret" }
+        TD { "Tsad" }
+        TF { "Ranskan etel\u00E4iset alueet" }
         TH { "Thaimaa" }
+        TJ { "Tadzikistan" }
+        TL { "It\u00E4-Timor" }
+        //TM { "Turkmenistan" }
         TR { "Turkki" }
+        TT { "Trinidad ja Tobago" }
+        TW { "Kiinan maakunta Taiwan" }
+        TZ { "Tansania" }
         UA { "Ukraina" }
+        UM { "Yhdysvaltain pienet erillissaaret" }
         US { "Yhdysvallat" }
+        VA { "Vatikaani" }
+        VC { "Saint Vincent ja Grenadiinit" }
+        VG { "Brittil\u00E4iset Neitsytsaaret" }
+        VI { "Yhdysvaltain Neitsytsaaret" }
+        WF { "Wallis ja Futuna" }
         YE { "Jemen" }
-        ZA { "Etel\u00e4-Afrikka" }
-    }
-    DateTimeElements:intvector { 
-        2,
-        4,
-    }
-    DateTimePatterns { 
-        "HH:mm:ss z",
-        "HH:mm:ss z",
-        "HH:mm:ss",
-        "HH:mm",
-        "d. MMMM'ta 'yyyy",
-        "d. MMMM'ta 'yyyy",
-        "d.M.yyyy",
-        "d.M.yyyy",
-        "{1} {0}",
-    }
-    DayAbbreviations { 
-        "su",
-        "ma",
-        "ti",
-        "ke",
-        "to",
-        "pe",
-        "la",
-    }
-    DayNames { 
-        "sunnuntai",
-        "maanantai",
-        "tiistai",
-        "keskiviikko",
-        "torstai",
-        "perjantai",
-        "lauantai",
+        YU { "Jugoslavia" }
+        ZA { "Etel\u00E4-Afrikka" }
+        ZM { "Sambia" }
     }
     Languages { 
+        af { "afrikanhollanti" }
+        am { "amharan kieli" }
         ar { "arabia" }
         az { "azerbaizani" }
-        ba { "baski" }
         be { "valkoven\u00e4j\u00e4" }
         bg { "bulgaria" }
         bh { "bihari" }
@@ -118,53 +175,106 @@
         de { "saksa" }
         el { "kreikka" }
         en { "englanti" }
+        eo { "esperanto" }
         es { "espanja" }
         et { "viro" }
+        eu { "baski" }
         fa { "farsi" }
         fi { "suomi" }
+        fo { "f\u00e4\u00e4ri" }
         fr { "ranska" }
+        ga { "iiri" }
+        gl { "galicia" }
+        gu { "gujarati" }
+        gv { "manx" }
+        haw { "havaiji" }
         he { "heprea" }
         hi { "hindi" }
-        hr { "kroatia" }
+        hr { "kroaatti" }
         hu { "unkari" }
+        hy { "armenia" }
         id { "indonesia" }
+        is { "islanti" }
         it { "italia" }
+        iu { "eskimo" }
         ja { "japani" }
         ka { "georgia" }
         kk { "kazakki" }
+        kl { "gr\u00f6\u00f6nlandi" }
         km { "khmer" }
         kn { "kannada" }
         ko { "korea" }
         ku { "kurdi" }
-        la { "latinalainen" }
+        kw { "korni" }
+        la { "latina" }
         lt { "liettua" }
         lv { "latvia" }
         mk { "makedonia" }
         mr { "marathi" }
+        mt { "malta" }
         my { "burma" }
+        nb { "kirjanorja" }
         nl { "hollanti" }
         no { "norja" }
+        nn { "uusnorja" }
+        om { "oromo" }
         pl { "puola" }
         pt { "portugali" }
         ro { "romania" }
         ru { "ven\u00e4j\u00e4" }
-        sk { "slovakia" }
-        sl { "slovenia" }
+        sh { "serbokroatia" }
+        sk { "slovakki" }
+        sl { "sloveeni" }
+        so { "somali" }
         sq { "albania" }
         sr { "serbia" }
         sv { "ruotsi" }
-        sw { "swahili" }
+        sw { "suahili" }
+        ta { "tamili" }
         te { "telugu" }
         th { "thai" }
+        ti { "tigrinja" }
         tk { "tagalog" }
         tr { "turkki" }
         uk { "ukraina" }
         ur { "urdu" }
         uz { "uzbekki" }
+        vi { "vietnam" }
         zh { "kiina" }
     }
-    LocaleID:int { 0x0b }
-//    LocaleString { "fi" }
+    DateTimeElements:intvector { 
+        2,
+        4,
+    }
+    DateTimePatterns { 
+        "HH:mm:ss z",
+        "HH:mm:ss z",
+        "HH:mm:ss",
+        "HH:mm",
+        "d. MMMM'ta 'yyyy",
+        "d. MMMM'ta 'yyyy",
+        "d.M.yyyy",
+        "d.M.yyyy",
+        "{1} {0}",
+    }
+    DayAbbreviations { 
+        "su",
+        "ma",
+        "ti",
+        "ke",
+        "to",
+        "pe",
+        "la",
+    }
+    DayNames { 
+        "sunnuntai",
+        "maanantai",
+        "tiistai",
+        "keskiviikko",
+        "torstai",
+        "perjantai",
+        "lauantai",
+    }
     MonthAbbreviations { 
         "tammi",
         "helmi",
@@ -206,25 +316,66 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "fin" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
-    }
+
     ExemplarCharacters { "[a-z \u00e4 \u00f6]" }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
+    }
 
     // Currency display names
     Currencies {
         FIM { "mk", "FIM" }
     }
+    // International Calendars Data.
+    // NOTE (ICU 2.6) - the format of this data WILL CHANGE in future releases.
+    MonthNames_islamic {
+            "Muh\u00E1rram",                // Muharram
+            "S\u00E1far",                   // Safar
+            "Rab\u00ED' al-\u00E1wwal",     // Rabi' al-awwal
+            "Rab\u00ED' al-\u00E1khir",     // Rabi' al-thani
+            "D\u017Eumada-l-\u00FAla",      // Jumada al-awwal
+            "D\u017Eumada-l-\u00E1khira",   // Jumada al-thani
+            "Rad\u017Eab",                  // Rajab
+            "\u0160a'b\u00E1n",             // Sha'ban
+            "Ramad\u00E1n",                 // Ramadan
+            "\u0160awwal",                  // Shawwal
+            "Dhu-l-qada",                   // Dhu al-Qi'dah
+            "Dhu-l-hidd\u017Ea"            // Dhu al-Hijjah
+    }
+    //Eras_islamic {
+    //    "AH"   // Anno Hid\u017Era (in root)
+    //}
+    MonthAbbreviations_islamic:alias {  // same as MonthNames (no data)
+        "fi/MonthNames_islamic"
+    }   
+    // Civil is identical other than in calculations
+    MonthNames_islamic-civil:alias {
+        "fi/MonthNames_islamic"
+    }
+    MonthAbbreviations_islamic-civil:alias {
+        "fi/MonthAbbreviations_islamic"
+    }
+
+    MonthNames_hebrew {
+                "Ti\u0161r\u00ECkuu",       // Tishri
+                "He\u0161v\u00E1nkuu",      // Heshvan
+                "Kisl\u00E9vkuu",           // Kislev
+                "Tev\u00E9tkuu",            // Tevet
+                "\u0160evatkuu",            // Shevat
+                "Ad\u00E1rkuu",             // Adar I
+                "Ad\u00E1rkuu II",          // Adar
+                "Nis\u00E1nkuu",            // Nisan
+                "Ijj\u00E1rkuu",            // Iyar
+                "Siv\u00E1nkuu",            // Sivan
+                "Tamm\u00FAzkuu",           // Tamuz
+                "Abkuu",                    // Av
+                "El\u00FAlkuu",             // Elul
+    }
+    MonthAbbreviations_hebrew:alias {
+       "fi/MonthNames_hebrew" // no data
+    }
+
 }

Index: fi_FI.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/fi_FI.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fi_FI.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ fi_FI.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -7,13 +7,10 @@
 
 fi_FI {
     Version { "2.0" }
-//    LocaleString { "fi_FI" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "FIN" }
-    LocaleID:int { 0x040b }
 }

Index: fo.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/fo.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fo.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ fo.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -7,6 +7,19 @@
 
 fo {
     Version { "2.0" }
+    collations {
+      standard { 
+        Version { "2.0" }
+        Sequence { 
+            "&D<<đ<<<Đ<<ð<<<Ð "
+            "&t<<<þ/h"
+            "&T<<<Þ/H"
+            "&Y<<ü<<<Ü<<ű<<<Ű"
+            "&[before 1]ʒ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å"
+            "<<<aa<<<Aa<<< AA"	// Danish, Faroese only            
+        }
+      }
+    }
     Languages {
         fo { "føroyskt" }
     }
@@ -72,15 +85,26 @@
         "∞",
         "�",
         ",",
+        "+",
+    }
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
     }
-    LocaleID:int { 0x38 }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
     ExemplarCharacters { "[a-z \u00e1 \u00e6 \u00ed \u00f0 \u00f3 \u00f8 \u00fa \u00fd]" }
 
     // Currency display names
     Currencies {
         DKK { "kr", "DKK" }
+    }
+    DateTimePatterns { 
+        "HH:mm:ss z",
+        "HH:mm:ss z",
+        "HH:mm:ss",
+        "HH:mm",
+        "EEEE dd MMMM yyyy",
+        "d. MMM yyyy",
+        "dd-MM-yyyy",
+        "dd-MM-yy",
+        "{1} {0}",
     }
 }

Index: fo_FO.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/fo_FO.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fo_FO.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ fo_FO.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -7,24 +7,10 @@
 
 fo_FO {
     Version { "2.0" }
-
-    /* Discarding duplicate data for tag: AmPmMarkers */
-    DateTimePatterns { 
-        "h:mm:ss a",
-        "h:mm:ss a",
-        "h:mm:ss a",
-        "h:mm a",
-        "EEEE dd MMMM yyyy",
-        "dd MMMM yyyy",
-        "MMM dd,yy",
-        "dd/MM/yy",
-        "{1} {0}",
-    }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "\u00a4#,##0.00;\u00a4 -#,##0.00",
         "#,##0%",
         "#E0",
     }
-    LocaleID:int { 0x0438 }
 }

Index: fr.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/fr.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fr.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ fr.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -7,110 +7,127 @@
 
 fr {
     Version{"2.0"}
-    CollationElements { 
-        Version { "1.0" }
-        Sequence { "[backwards 2]&A<<\u00e6/e<<<\u00c6/E" }
+    collations {
+        standard { 
+            Version { "2.0" }
+            Sequence { "[backwards 2]"
+            "&A<<\u00c6/E &a<<\u00e6/e" }
[...1037 lines suppressed...]
+                "Tisseri",      // Tishri
+                "Hesvan",       // Heshvan
+                "Kislev",       // Kislev
+                "T\u00e9beth",  // Tevet
+                "Sch\u00e9bat", // Shevat
+                "Adar",         // Adar I
+                "Adar II",      // Adar
+                "Nissan",       // Nisan
+                "Iyar",         // Iyar
+                "Sivan",        // Sivan
+                "Tamouz",       // Tamuz
+                "Ab",           // Av
+                "Elloul",       // Elul
+    }
+    MonthAbbreviations_hebrew:alias {
+       "fr/MonthNames_hebrew" // no data
+    }
+
+
 }

Index: fr_BE.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/fr_BE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fr_BE.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ fr_BE.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -22,8 +22,6 @@
         2,
         1,
     }
-    LocaleID:int { 0x080c }
-//    LocaleString { "fr_BE" }
     NumberElements { 
         ",",
         ".",
@@ -37,17 +35,9 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortCountry { "BEL" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
-    }
+
     NumberPatterns {
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00a4;-#,##0.00 \u00a4",

Index: fr_CA.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/fr_CA.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fr_CA.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ fr_CA.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -18,26 +18,12 @@
         "yy-MM-dd",
         "{1} {0}",
     }
-    LocaleID:int { 0x0c0c }
-//    LocaleString { "fr_CA" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00A4;(#,##0.00\u00A4)",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "CAN" }
-
-// Fall back to French
-//    zoneStrings { 
-//        {
-//            "Africa/Casablanca",
-//            "GMT",
-//            "GMT",
-//            "GMT",
-//            "GMT",
-//        }
-//    }
 
     // Currency display names
     Currencies {

Index: fr_CH.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/fr_CH.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fr_CH.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ fr_CH.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -12,18 +12,16 @@
         4,
     }
     DateTimePatterns { 
-        "HH.mm' h' z",
+        "HH.mm:ss' h' z",
         "HH:mm:ss z",
         "HH:mm:ss",
         "HH:mm",
-        "EEEE, d. MMMM yyyy",
-        "d. MMMM yyyy",
+        "EEEE, d MMMM yyyy",
+        "d MMMM yyyy",
         "d MMM yy",
         "dd.MM.yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x100c }
-//    LocaleString { "fr_CH" }
     NumberElements { 
         ".",
         "'",
@@ -37,6 +35,7 @@
         "\u221E",
         "\uFFFD",
         ".",
+        "+",
     }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
@@ -44,16 +43,7 @@
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "CHE" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
-    }
+
 
     //------------------------------------------------------------
     // Rule Based Number Format Support
@@ -74,31 +64,31 @@
 
     SpelloutRules {
         "%main:\n"
-        "    -x: moins >>;\n"
-        "    x.x: << virgule >>;\n"
-        "    z\u00e9ro; un; deux; trois; quatre; cinq; six; sept; huit; neuf;\n"
-        "    dix; onze; douze; treize; quatorze; quinze; seize;\n"
-        "        dix-sept; dix-huit; dix-neuf;\n"
-        "    20: vingt[->%%alt-ones>];\n"
-        "    30: trente[->%%alt-ones>];\n"
-        "    40: quarante[->%%alt-ones>];\n"
-        "    50: cinquante[->%%alt-ones>];\n"
-        "    60: soixante[->%%alt-ones>];\n"
+            "-x: moins >>;\n"
+            "x.x: << virgule >>;\n"
+            "z\u00e9ro; un; deux; trois; quatre; cinq; six; sept; huit; neuf;\n"
+            "dix; onze; douze; treize; quatorze; quinze; seize;\n"
+            "    dix-sept; dix-huit; dix-neuf;\n"
+            "20: vingt[->%%alt-ones>];\n"
+            "30: trente[->%%alt-ones>];\n"
+            "40: quarante[->%%alt-ones>];\n"
+            "50: cinquante[->%%alt-ones>];\n"
+            "60: soixante[->%%alt-ones>];\n"
                // notice new words for 70, 80, and 90
-        "    70: septante[->%%alt-ones>];\n"
-        "    80: huitante[->%%alt-ones>];\n"
-        "    90: nonante[->%%alt-ones>];\n"
-        "    100: cent[ >>];\n"
-        "    200: << cents[ >>];\n"
-        "    1000: mille[ >>];\n"
-        "    1100>: onze cents[ >>];\n"
-        "    1200: mille >>;\n"
-        "    2000: << mille[ >>];\n"
-        "    1,000,000: << million[ >>];\n"
-        "    1,000,000,000: << milliarde[ >>];\n"
-        "    1,000,000,000,000: << billion[ >>];\n"
-        "    1,000,000,000,000,000: =#,##0=;\n"
+            "70: septante[->%%alt-ones>];\n"
+            "80: huitante[->%%alt-ones>];\n"
+            "90: nonante[->%%alt-ones>];\n"
+            "100: cent[ >>];\n"
+            "200: << cents[ >>];\n"
+            "1000: mille[ >>];\n"
+            "1100>: onze cents[ >>];\n"
+            "1200: mille >>;\n"
+            "2000: << mille[ >>];\n"
+            "1,000,000: << million[ >>];\n"
+            "1,000,000,000: << milliarde[ >>];\n"
+            "1,000,000,000,000: << billion[ >>];\n"
+            "1,000,000,000,000,000: =#,##0=;\n"
         "%%alt-ones:\n"
-        "    ; et-un; =%main=;" 
+            "; et-un; =%main=;" 
     }
 }

Index: fr_FR.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/fr_FR.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fr_FR.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ fr_FR.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -11,7 +11,4 @@
         2,
         1,
     }
-//    LocaleString { "fr_FR" }
-//    ShortCountry { "FRA" }
-    LocaleID:int { 0x040c }
 }

Index: fr_LU.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/fr_LU.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fr_LU.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ fr_LU.txt	6 Apr 2004 10:08:12 -0000	1.2
@@ -24,10 +24,8 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    LocaleString { "fr_LU" }
-//    ShortCountry { "LUX" }
-    LocaleID:int { 0x140c }
 
     // Currency display names
     Currencies {

Index: ga.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ga.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ga.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ ga.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -5,10 +5,672 @@
 // *
 // ***************************************************************************
 
+// A lot of data contributed from Séamus Ó Ciardhuáin, seoc [at] cnds.ucd.ie
+
 ga{
-   Version { "2.0" }
+    Version { "2.0" }
 
-   DayAbbreviations { 
+    AmPmMarkers { 
[...1163 lines suppressed...]
+        {
+            "Europe/Belfast",
+            "Meán-Am Greenwich",
+            "MAG",
+            "Am Samhraidh na Breataine",
+            "ASB",
+            "Béal Feirste",
+        }
+        {
+            "GMT",
+            "Meán-Am Greenwich",
+            "MAG",
+            "Meán-Am Greenwich",
+            "MAG",
+            "Londain",
+        }
+       // many others could go in here if desired
     }
 }
+

Index: ga_IE.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ga_IE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ga_IE.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ ga_IE.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,9 +7,8 @@
 
 ga_IE {
     Version { "2.0" }
-    DateTimeElements:intvector { 
-        2,
-        1,
+    Currencies {
+        IEP { "\u00A3","Punt \u00C9ireannach"      } // 1922-2001
     }
     DateTimePatterns { 
         "HH:mm:ss z",
@@ -28,4 +27,4 @@
         "#,##0%",
         "#E0",
     }
-}
+}
\ No newline at end of file

Index: gl.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/gl.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gl.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ gl.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,6 +7,13 @@
 
 gl {
     Version { "2.0" }
+    Countries {
+        ES { "España" }
+    }
+    // Currency display names
+    Currencies {
+        ESP { "\u20A7", "ESP" } // Spanish Peseta
+    }
     DayAbbreviations { 
         "Dom",
         "Lun",
@@ -25,6 +32,13 @@
         "Venres",
         "Sábado",
     }
+    Languages {
+        gl { "galego" }
+    }
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
+    }
+    ExemplarCharacters { "[a-z\u00e1\u00e9\u00ed\u00f3\u00fa\u00fc\u00f1]" }
     MonthAbbreviations { 
         "Xan",
         "Feb",
@@ -66,15 +80,11 @@
         "∞",
         "�",
         ",",
+        "+",
     }
-    LocaleID:int { 0x56 }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
-    ExemplarCharacters { "[a-z \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u00fc \u00f1]" }
     
     // /**************** Info Below is needed ****************/
-    // CollationElements{}
+    // collations{}
     // Countries{}
     // Eras{}
     // Languages{}
@@ -82,9 +92,4 @@
     // localPatternChars{}
     //
 
-
-    // Currency display names
-    Currencies {
-        ESP { "\u20A7", "ESP" } // Spanish Peseta
-    }
 }

Index: gl_ES.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/gl_ES.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gl_ES.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ gl_ES.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -28,5 +28,4 @@
         "#,##0%",
         "#E0",
     }
-    LocaleID:int { 0x0456 }
 }

Index: gu.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/gu.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gu.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ gu.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,20 +7,25 @@
 
 gu {
     Version{ "2.0" }
-    LocaleID:int { 0x47 }
-    Languages {
-        gu { "\u0A97\u0AC1\u0A9C\u0AB0\u0ABE\u0AA4\u0AC0" }
+    AmPmMarkers{
+        "\u0AAA\u0AC2\u0AB0\u0ACD\u0AB5\u00A0\u0AAE\u0AA7\u0ACD\u0AAF\u0ABE\u0AB9\u0ACD\u0AA8",
+        "\u0A89\u0AA4\u0ACD\u0AA4\u0AB0\u00A0\u0AAE\u0AA7\u0ACD\u0AAF\u0ABE\u0AB9\u0ACD\u0AA8"
+    }
+    collations {
+      standard { 
+        Version { "1.0" }
+        Sequence { 
+            "[normalization on]"
+        }
+      }
     }
     Countries {
         IN { "\u0AAD\u0ABE\u0AB0\u0AA4" }
     }
-    AmPmMarkers{
-        "\u0AAA\u0AC2\u0AB0\u0ACD\u0AB5\u00A0\u0AAE\u0AA7\u0ACD\u0AAF\u0ABE\u0AB9\u0ACD\u0AA8",
-        "\u0A89\u0AA4\u0ACD\u0AA4\u0AB0\u00A0\u0AAE\u0AA7\u0ACD\u0AAF\u0ABE\u0AB9\u0ACD\u0AA8"
+    // Currency display names
+    Currencies {
+        INR { "\u0AB0\u0AC1", "INR" }
     }
-//    ShortLanguage{
-//        "GUJ"
-//    }
     DayNames{
         "\u0AB0\u0AB5\u0ABF\u0AB5\u0ABE\u0AB0",
         "\u0AB8\u0ACB\u0AAE\u0AB5\u0ABE\u0AB0",
@@ -30,7 +35,6 @@
         "\u0AB6\u0AC1\u0A95\u0ACD\u0AB0\u0AB5\u0ABE\u0AB0",
         "\u0AB6\u0AA8\u0ABF\u0AB5\u0ABE\u0AB0"
     }
-
     DayAbbreviations{
         "\u0AB0\u0AB5\u0ABF",
         "\u0AB8\u0ACB\u0AAE",
@@ -40,7 +44,11 @@
         "\u0AB6\u0AC1\u0A95\u0ACD\u0AB0",
         "\u0AB6\u0AA8\u0ABF"
     }
-
+    ExemplarCharacters { "[[:Gujr:]\u200c\u200d]" }
+    LocaleScript:array { "Gujr" }
+    Languages {
+        gu { "\u0A97\u0AC1\u0A9C\u0AB0\u0ABE\u0AA4\u0AC0" }
+    }
     MonthNames{
         "\u0A9C\u0ABE\u0AA8\u0ACD\u0AAF\u0AC1\u0A86\u0AB0\u0AC0",
         "\u0AAB\u0AC7\u0AAC\u0ACD\u0AB0\u0AC1\u0A86\u0AB0\u0AC0",
@@ -84,18 +92,6 @@
         "\u221E",
         "\uFFFD",
         ".",
-    }
-    LocaleScript:array { "Gujr" }
-    ExemplarCharacters { "[[:Gujr:]\u200c\u200d]" }
-    CollationElements {	    
-        Version { "1.0" }
-        Sequence { 
-            "[normalization on]"
-        }
-    }
-
-    // Currency display names
-    Currencies {
-        INR { "\u0AB0\u0AC1", "INR" }
+        "+",
     }
 }

Index: gu_IN.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/gu_IN.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gu_IN.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ gu_IN.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,7 +7,6 @@
 
 gu_IN {
     Version { "2.0" }
-    LocaleID:int { 0x0447 }
     DateTimePatterns {
         "hh:mm:ss a z",
         "hh:mm:ss a z",

Index: gv.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/gv.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gv.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ gv.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -66,16 +66,24 @@
 //        "\u221e",
 //        "\ufffd",
 //    }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
-
+    LocaleScript:array{ 
+        "Latn",  // ISO 15924 Name 
+    }
+    ExemplarCharacters{
+        "[a-z \u00E7]"
+    }
+    AmPmMarkers {
+        "a.m.",
+        "p.m.",
+    }
+    Eras {
+        "RC", // BC
+        "AD"   // AD
+    }
     // /**************** Info Below is needed ****************/
-    // CollationElements{}
+    // collations{}
     // Countries{}
-    // Eras{}
     // Languages{}
-    // ShortLanguage { }
     // localPatternChars{}
     //
 }

Index: he.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/he.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- he.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ he.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,15 +7,287 @@
 
 he {
     Version{"2.0"}
-    CollationElements { 
-        Version { "2.0" }
-        Sequence { "[normalization on]& Z < \u05D0 < \u05D1 < \u05D2 < \u05D3 < \u05D4 < \u05D5 < "
-        "\u05F0 < \u05F1 < \u05D6 < \u05D7 < \u05D8 < \u05D9 < \u05F2 < \u05DA <<< \u05DB "
-        "< \u05DC < \u05DD <<< \u05DE < \u05DF <<< \u05E0 < \u05E1 < \u05E2 < \u05E3 <<< \u05E4"
-        " < \u05E5 <<< \u05E6 < \u05E7 < \u05E8 < \u05E9 < \u05EA" }
+    collations {
+      standard { 
+        Version { "3.0" }
+        Sequence { "[normalization on]" }
+      }
     }
     Countries { 
+        AD { "\u05D0\u05E0\u05D3\u05D5\u05E8\u05D4" }
+        AE { "\u05D0\u05D9\u05D7\u05D5\u05D3 \u05D4\u05D0\u05DE\u05D9\u05E8\u05D5\u05D9\u05D5\u05EA \u05D4\u05E2\u05E8\u05D1\u05D9\u05D5\u05EA" }
+        AF { "\u05D0\u05E4\u05D2\u05E0\u05D9\u05E1\u05D8\u05DF" }
+        AG { "\u05D0\u05E0\u05D8\u05D9\u05D2\u05D5\u05D0\u05D4 \u05D5\u05D1\u05E8\u05D1\u05D5\u05D3\u05D4" }
+        AI { "\u05D0\u05E0\u05D2\u05D9\u05DC\u05D4" }
+        AL { "\u05D0\u05DC\u05D1\u05E0\u05D9\u05D4" }
+        AM { "\u05D0\u05E8\u05DE\u05E0\u05D9\u05D4" }
+        AN { "\u05D4\u05D0\u05D9\u05E0\u05D8\u05D9\u05DC\u05D9\u05DD \u05D4\u05D4\u05D5\u05DC\u05E0\u05D3\u05D9\u05D9\u05DD" }
+        AO { "\u05D0\u05E0\u05D2\u05D5\u05DC" }
+        AQ { "\u05D0\u05E0\u05D8\u05D0\u05E8\u05E7\u05D8\u05D9\u05E7\u05D4" }
+        AR { "\u05D0\u05E8\u05D2\u05E0\u05D8\u05D9\u05E0\u05D4" }
+        AS { "\u05E1\u05DE\u05D5\u05D0\u05D4 \u05D4\u05D0\u05DE\u05E8\u05D9\u05E7\u05E0\u05D9\u05EA" }
+        AT { "\u05D0\u05D5\u05E1\u05D8\u05E8\u05D9\u05D4" }
+        AU { "\u05D0\u05D5\u05E1\u05D8\u05E8\u05DC\u05D9\u05D4" }
+        AW { "\u05D0\u05E8\u05D5\u05D1\u05D4" }
+        AZ { "\u05D0\u05D6\u05E8\u05D1\u05D9\u05D9\u05D2'\u05DF" }
+        BA { "\u05D1\u05D5\u05E1\u05E0\u05D9\u05D4 \u05D5\u05D4\u05E8\u05E6\u05D2\u05D5\u05D1\u05D9\u05E0\u05D4" }
+        BB { "\u05D1\u05E8\u05D1\u05D3\u05D5\u05E1" }
+        BD { "\u05D1\u05E0\u05D2\u05DC\u05D3\u05E9" }
+        BE { "\u05D1\u05DC\u05D2\u05D9\u05D4" }
+        BF { "\u05D1\u05D5\u05E8\u05E7\u05D9\u05E0\u05D4 \u05E4\u05D0\u05E1\u05D5" }
+        BG { "\u05D1\u05D5\u05DC\u05D2\u05E8\u05D9\u05D4" }
+        BH { "\u05D1\u05D7\u05E8\u05D9\u05D9\u05DF" }
+        BI { "\u05D1\u05D5\u05E8\u05D5\u05E0\u05D3\u05D9" }
+        BJ { "\u05D1\u05E0\u05D9\u05DF" }
+        BM { "\u05D1\u05E8\u05DE\u05D5\u05D3\u05D4" }
+        BN { "\u05D1\u05E8\u05D5\u05E0\u05D9\u05D9 \u05D3\u05D0\u05E8\u05E1\u05DC\u05D0\u05DD" }
+        BO { "\u05D1\u05D5\u05DC\u05D9\u05D1\u05D9\u05D4" }
+        BR { "\u05D1\u05E8\u05D6\u05D9\u05DC" }
+        BS { "\u05D1\u05D4\u05D0\u05DE\u05D4" }
+        BT { "\u05D1\u05D5\u05D8\u05D0\u05DF" }
+        BV { "\u05D4\u05D0\u05D9 \u05D1\u05D5\u05D1\u05D4" }
+        BW { "\u05D1\u05D5\u05D8\u05E1\u05D5\u05D5\u05D0\u05E0\u05D4" }
+        BY { "\u05D1\u05DC\u05E8\u05D5\u05E1" }
+        BZ { "\u05D1\u05DC\u05D9\u05D6" }
+        CA { "\u05E7\u05E0\u05D3\u05D4" }
+        CC { "\u05D0\u05D9\u05D9 \u05E7\u05D5\u05E7\u05D5\u05E1 (\u05E7\u05D9\u05DC\u05D9\u05E0\u05D2)" }
+        CD { "\u05E7\u05D5\u05E0\u05D2\u05D5, \u05D4\u05E8\u05E4\u05D5\u05D1\u05DC\u05D9\u05E7\u05D4 \u05D4\u05D3\u05DE\u05D5\u05E7\u05E8\u05D8\u05D9\u05EA \u05E9\u05DC" }
+        CF { "\u05D4\u05E8\u05E4\u05D5\u05D1\u05DC\u05D9\u05E7\u05D4 \u05E9\u05DC \u05DE\u05E8\u05DB\u05D6 \u05D0\u05E4\u05E8\u05D9\u05E7\u05D4" }
+        CG { "\u05E7\u05D5\u05E0\u05D2\u05D5" }
+        CH { "\u05E9\u05D5\u05D5\u05D9\u05D9\u05E5" }
+        CI { "\u05D7\u05D5\u05E3 \u05D4\u05E9\u05E0\u05D4\u05D1" }
+        CK { "\u05D0\u05D9\u05D9 \u05E7\u05D5\u05E7" }
+        CL { "\u05E6'\u05D9\u05DC\u05D4" }
+        CM { "\u05E7\u05DE\u05E8\u05D5\u05DF" }
+        CN { "\u05E1\u05D9\u05DF" }
+        CO { "\u05E7\u05D5\u05DC\u05D5\u05DE\u05D1\u05D9\u05D4" }
+        CR { "\u05E7\u05D5\u05E1\u05D8\u05D4 \u05E8\u05D9\u05E7\u05D4" }
+        CU { "\u05E7\u05D5\u05D1\u05D4" }
+        CV { "\u05E7\u05D9\u05D9\u05E4 \u05D5\u05E8\u05D3\u05D4" }
+        CX { "\u05D0\u05D9\u05D9 \u05DB\u05E8\u05D9\u05E1\u05D8\u05DE\u05E1" }
+        CY { "\u05E7\u05E4\u05E8\u05D9\u05E1\u05D9\u05DF" }
+        CZ { "\u05D4\u05E8\u05E4\u05D5\u05D1\u05DC\u05D9\u05E7\u05D4 \u05D4\u05E6'\u05DB\u05D9\u05EA" }
+        DE { "\u05D2\u05E8\u05DE\u05E0\u05D9\u05D4" }
+        DJ { "\u05D2'\u05D9\u05D1\u05D5\u05D8\u05D9" }
+        DK { "\u05D3\u05E0\u05DE\u05E8\u05E7" }
+        DM { "\u05D3\u05D5\u05DE\u05D9\u05E0\u05D9\u05E7\u05D4" }
+        DO { "\u05D4\u05E8\u05E4\u05D5\u05D1\u05DC\u05D9\u05E7\u05D4 \u05D4\u05D3\u05D5\u05DE\u05D9\u05E0\u05D9\u05E7\u05E0\u05D9\u05EA" }
+        DZ { "\u05D0\u05DC\u05D2'\u05D9\u05E8\u05D9\u05D4" }
+        EC { "\u05D0\u05E7\u05D5\u05D5\u05D0\u05D3\u05D5\u05E8" }
+        EE { "\u05D0\u05E1\u05D8\u05D5\u05E0\u05D9\u05D4" }
+        EG { "\u05DE\u05E6\u05E8\u05D9\u05DD" }
+        EH { "\u05E1\u05D4\u05E8\u05D4 \u05D4\u05DE\u05E2\u05E8\u05D1\u05D9\u05EA" }
+        ER { "\u05D0\u05E8\u05D9\u05EA\u05E8\u05D9\u05D0\u05D4" }
+        ES { "\u05E1\u05E4\u05E8\u05D3" }
+        ET { "\u05D0\u05EA\u05D9\u05D5\u05E4\u05D9\u05D4" }
+        FI { "\u05E4\u05D9\u05E0\u05DC\u05E0\u05D3" }
+        FJ { "\u05E4\u05D9\u05D2'\u05D9" }
+        FK { "\u05D0\u05D9\u05D9 \u05E4\u05D5\u05E7\u05DC\u05E0\u05D3" }
+        FM { "\u05DE\u05D0\u05D5\u05E8\u05D9\u05E6\u05D9\u05D5\u05E1, \u05D4\u05DE\u05D3\u05D9\u05E0\u05D5\u05EA \u05D4\u05DE\u05D0\u05D5\u05D2\u05D3\u05D5\u05EA \u05E9\u05DC" }
+        FO { "\u05D0\u05D9\u05D9 \u05E4\u05D0\u05E8\u05D5" }
+        FR { "\u05E6\u05E8\u05E4\u05EA" }
+        GA { "\u05D2\u05D1\u05D5\u05DF" }
+        GB { "\u05D1\u05E8\u05D9\u05D8\u05E0\u05D9\u05D4" }
+        GD { "\u05D2\u05E8\u05E0\u05D3\u05D4" }
+        GE { "\u05D2\u05E8\u05D5\u05D6\u05D9\u05D4" }
+        GF { "\u05D2\u05D9\u05D0\u05E0\u05D4 \u05D4\u05E6\u05E8\u05E4\u05EA\u05D9\u05EA" }
+        GH { "\u05D2\u05D0\u05E0\u05D4" }
+        GI { "\u05D2\u05D9\u05D1\u05E8\u05DC\u05D8\u05E8" }
+        GL { "\u05D2\u05E8\u05D9\u05E0\u05DC\u05E0\u05D3" }
+        GM { "\u05D2\u05DE\u05D1\u05D9\u05D4" }
+        GN { "\u05D2\u05D9\u05E0\u05D9\u05D0\u05D4" }
+        GP { "\u05D2\u05D5\u05D5\u05D0\u05D3\u05DC\u05D5\u05E4" }
+        GQ { "\u05D2\u05D9\u05E0\u05D9\u05D0\u05D4 \u05D4\u05DE\u05E9\u05D5\u05D5\u05E0\u05D9\u05EA" }
+        GR { "\u05D9\u05D5\u05D5\u05DF" }
+        GS { "\u05D4\u05D0\u05D9 \u05D2'\u05D5\u05E8\u05D2'\u05D9\u05D4 \u05D4\u05D3\u05E8\u05D5\u05DE\u05D9\u05EA \u05D5\u05D0\u05D9\u05D9 \u05E1\u05E0\u05D3\u05D5\u05D5\u05D9\u05E5' \u05D4\u05D3\u05E8\u05D5\u05DE\u05D9\u05D9\u05DD" }
+        GT { "\u05D2\u05D5\u05D5\u05D8\u05DE\u05D0\u05DC\u05D4" }
+        GU { "\u05D2\u05D5\u05D0\u05DD" }
+        GW { "\u05D2\u05D9\u05E0\u05D9\u05D0\u05D4-\u05D1\u05D9\u05E1\u05D0\u05D5" }
+        GY { "\u05D2\u05D9\u05D0\u05E0\u05D4" }
+        HK { "\u05D4\u05D5\u05E0\u05D2 \u05E7\u05D5\u05E0\u05D2 S.A.R. \u05E9\u05DC \u05E1\u05D9\u05DF" }
+        HM { "\u05D0\u05D9\u05D9 \u05D4\u05E8\u05D3 \u05D5\u05D0\u05D9\u05D9 \u05DE\u05E7\u05D3\u05D5\u05E0\u05DC\u05E0\u05D3" }
+        HN { "\u05D4\u05D5\u05E0\u05D3\u05D5\u05E8\u05E1" }
+        HR { "\u05E7\u05E8\u05D5\u05D0\u05D8\u05D9\u05D4" }
+        HT { "\u05D4\u05D0\u05D9\u05D8\u05D9" }
+        HU { "\u05D4\u05D5\u05E0\u05D2\u05E8\u05D9\u05D4" }
+        ID { "\u05D0\u05D9\u05E0\u05D3\u05D5\u05E0\u05D6\u05D9\u05D4" }
+        IE { "\u05D0\u05D9\u05E8\u05DC\u05E0\u05D3" }
         IL { "\u05D9\u05E9\u05E8\u05D0\u05DC" }
+        IN { "\u05D4\u05D5\u05D3\u05D5" }
+        IO { "\u05D4\u05D8\u05E8\u05D9\u05D8\u05D5\u05E8\u05D9\u05D4 \u05D4\u05D1\u05E8\u05D9\u05D8\u05D9\u05EA \u05D1\u05D0\u05D5\u05E7\u05D9\u05E0\u05D5\u05E1 \u05D4\u05D4\u05D5\u05D3\u05D9" }
+        IQ { "\u05E2\u05D9\u05E8\u05E7" }
+        IR { "\u05D0\u05D9\u05E8\u05D0\u05DF, \u05D4\u05E8\u05E4\u05D5\u05D1\u05DC\u05D9\u05E7\u05D4 \u05D4\u05D0\u05D9\u05E1\u05DC\u05DE\u05D9\u05EA" }
+        IS { "\u05D0\u05D9\u05E1\u05DC\u05E0\u05D3" }
+        IT { "\u05D0\u05D9\u05D8\u05DC\u05D9\u05D4" }
+        JM { "\u05D2'\u05DE\u05D9\u05D9\u05E7\u05D4" }
+        JO { "\u05D9\u05E8\u05D3\u05DF" }
+        JP { "\u05D9\u05E4\u05DF" }
+        KE { "\u05E7\u05E0\u05D9\u05D4" }
+        KG { "\u05E7\u05D9\u05E8\u05D2\u05D9\u05D6\u05E1\u05D8\u05DF" }
+        KH { "\u05E7\u05DE\u05D1\u05D5\u05D3\u05D9\u05D4" }
+        KI { "\u05E7\u05D9\u05E8\u05D9\u05D1\u05D0\u05D8\u05D9" }
+        KM { "\u05E7\u05D5\u05DE\u05D5\u05E8\u05D5\u05E1" }
+        KN { "\u05E1\u05E0\u05D8 \u05E7\u05D9\u05D8\u05E1 \u05D5\u05E0\u05D9\u05D1\u05E1" }
+        KP { "\u05E7\u05D5\u05E8\u05D9\u05D0\u05D4, \u05E6\u05E4\u05D5\u05DF" }    // alternate name { "\u05E7\u05D5\u05E8\u05D9\u05D0\u05D4, \u05D4\u05E8\u05E4\u05D5\u05D1\u05DC\u05D9\u05E7\u05D4 \u05D4\u05D3\u05DE\u05D5\u05E7\u05E8\u05D8\u05D9\u05EA \u05D4\u05E2\u05DE\u05DE\u05D9\u05EA" }
+        KR { "\u05E7\u05D5\u05E8\u05D9\u05D0\u05D4, \u05D3\u05E8\u05D5\u05DD" }    // alternate name { "\u05E7\u05D5\u05E8\u05D9\u05D0\u05D4, \u05D4\u05E8\u05E4\u05D5\u05D1\u05DC\u05D9\u05E7\u05D4" }
+        KW { "\u05DB\u05D5\u05D5\u05D9\u05EA" }
+        KY { "\u05D0\u05D9\u05D9 \u05E7\u05D9\u05D9\u05DE\u05D0\u05DF" }
+        KZ { "\u05E7\u05D6\u05D7\u05E1\u05D8\u05DF" }
+        LA { "\u05DC\u05D0\u05D5\u05E1, \u05D4\u05E8\u05E4\u05D5\u05D1\u05DC\u05D9\u05E7\u05D4 \u05D4\u05D3\u05DE\u05E7\u05D5\u05E8\u05D8\u05D9\u05EA \u05D4\u05E2\u05DE\u05DE\u05D9\u05EA" }
+        LB { "\u05DC\u05D1\u05E0\u05D5\u05DF" }
+        LC { "\u05E1\u05E0\u05D8 \u05DC\u05D5\u05E9\u05D9\u05D4" }
+        LI { "\u05DC\u05D9\u05DB\u05D8\u05E0\u05E9\u05D8\u05D9\u05D9\u05DF" }
+        LK { "\u05E1\u05E8\u05D9 \u05DC\u05E0\u05E7\u05D4" }
+        LR { "\u05DC\u05D9\u05D1\u05E8\u05D9\u05D4" }
+        LS { "\u05DC\u05E1\u05D5\u05D8\u05D5" }
+        LT { "\u05DC\u05D9\u05D8\u05D0" }
+        LU { "\u05DC\u05D5\u05E7\u05E1\u05DE\u05D1\u05D5\u05E8\u05D2" }
+        LV { "\u05DC\u05D8\u05D1\u05D9\u05D4" }
+        LY { "\u05DC\u05D5\u05D1" }
+        MA { "\u05DE\u05E8\u05D5\u05E7\u05D5" }
+        MC { "\u05DE\u05D5\u05E0\u05E7\u05D5" }
+        MD { "\u05DE\u05D5\u05DC\u05D3\u05D5\u05D1\u05D4, \u05D4\u05E8\u05E4\u05D5\u05D1\u05DC\u05D9\u05E7\u05D4" }
+        MG { "\u05DE\u05D3\u05D2\u05E1\u05E7\u05E8" }
+        MH { "\u05D0\u05D9\u05D9 \u05DE\u05E8\u05E9\u05DC" }
+        MK { "\u05DE\u05E7\u05D3\u05D5\u05E0\u05D9\u05D4, \u05D4\u05E8\u05E4\u05D5\u05D1\u05DC\u05D9\u05E7\u05D4 \u05E9\u05DC" }
+        ML { "\u05DE\u05D0\u05DC" }
+        MM { "\u05DE\u05D9\u05E0\u05DE\u05D0\u05E8" }
+        MN { "\u05DE\u05D5\u05E0\u05D2\u05D5\u05DC\u05D9" }
+        MO { "\u05DE\u05E7\u05D0\u05D5 S.A.R. \u05E9\u05DC \u05E1\u05D9\u05DF" }
+        MP { "\u05D0\u05D9\u05D9 \u05DE\u05E8\u05D9\u05D0\u05E0\u05D4 \u05D4\u05E6\u05E4\u05D5\u05E0\u05D9\u05D9\u05DD" }
+        MQ { "\u05DE\u05E8\u05D8\u05D9\u05E0\u05D9\u05E7" }
+        MR { "\u05DE\u05D0\u05D5\u05E8\u05D9\u05D8\u05E0\u05D9\u05D4" }
+        MS { "\u05DE\u05D5\u05E0\u05D8\u05E1\u05E8\u05D0\u05D8" }
+        MT { "\u05DE\u05DC\u05D8\u05D4" }
+        MU { "\u05DE\u05D0\u05D5\u05E8\u05D9\u05E6\u05D9\u05D5\u05E1" }
+        MV { "\u05DE\u05DC\u05D3\u05D9\u05D1\u05D0\u05E1" }
+        MW { "\u05DE\u05DC\u05D0\u05D5\u05D5\u05D9" }
+        MX { "\u05DE\u05DB\u05E1\u05D9\u05E7\u05D5" }
+        MY { "\u05DE\u05DC\u05D6\u05D9\u05D4" }
+        MZ { "\u05DE\u05D5\u05D6\u05DE\u05D1\u05D9\u05E7" }
+        NA { "\u05E0\u05DE\u05D9\u05D1\u05D9\u05D4" }
+        NC { "\u05E7\u05DC\u05D3\u05D5\u05E0\u05D9\u05D4 \u05D4\u05D7\u05D3\u05E9" }
+        NE { "\u05E0\u05D9\u05D6'\u05E8" }
+        NF { "\u05D0\u05D9\u05D9 \u05E0\u05D5\u05E8\u05E4\u05E7" }
+        NG { "\u05E0\u05D9\u05D2\u05E8\u05D9\u05D4" }
+        NI { "\u05E0\u05D9\u05E7\u05E8\u05D0\u05D2\u05D5\u05D5\u05D4" }
+        NL { "\u05D4\u05D5\u05DC\u05E0\u05D3" }
+        NO { "\u05E0\u05D5\u05E8\u05D5\u05D5\u05D2\u05D9\u05D4" }
+        NP { "\u05E0\u05E4\u05D0\u05DC" }
+        NR { "\u05E0\u05D0\u05D5\u05E8\u05D5" }
+        NU { "\u05E0\u05D9\u05D5\u05D5\u05D4" }
+        NZ { "\u05E0\u05D9\u05D5 \u05D6\u05D9\u05DC\u05E0\u05D3" }
+        OM { "\u05E2\u05D5\u05DE\u05DF" }
+        PA { "\u05E4\u05E0\u05DE\u05D4" }
+        PE { "\u05E4\u05E8\u05D5" }
+        PF { "\u05E4\u05D5\u05DC\u05D9\u05E0\u05D6\u05D9\u05D4 \u05D4\u05E6\u05E8\u05E4\u05EA\u05D9\u05EA" }
+        PG { "\u05E4\u05E4\u05D5\u05D0\u05D4 \u05D2\u05D9\u05E0\u05D9\u05D0\u05D4 \u05D4\u05D7\u05D3\u05E9\u05D4" }
+        PH { "\u05E4\u05D9\u05DC\u05D9\u05E4\u05D9\u05E0\u05D9\u05DD" }
+        PK { "\u05E4\u05E7\u05D9\u05E1\u05D8\u05DF" }
+        PL { "\u05E4\u05D5\u05DC\u05D9\u05DF" }
+        PM { "\u05E1\u05E0\u05D8 \u05E4\u05D9\u05D9\u05E8 \u05D5\u05DE\u05D9\u05E7\u05DC\u05D5\u05DF" }
+        PN { "\u05E4\u05D9\u05D8\u05E7\u05D9\u05D9\u05E8\u05DF" }
+        PR { "\u05E4\u05D5\u05E8\u05D8\u05D5 \u05E8\u05D9\u05E7\u05D5" }
+        PS { "\u05D4\u05E8\u05E9\u05D5\u05EA \u05D4\u05E4\u05DC\u05E9\u05EA\u05D9\u05E0\u05D9\u05EA" }
+        PT { "\u05E4\u05D5\u05E8\u05D8\u05D5\u05D2\u05DC" }
+        PW { "\u05E4\u05DC\u05D0\u05D5" }
+        PY { "\u05E4\u05E8\u05D0\u05D2\u05D5\u05D5\u05D0\u05D9" }
+        QA { "\u05E7\u05D8\u05E8" }
+        RE { "\u05E8\u05D0\u05D5\u05E0\u05D9\u05D5\u05DF" }
+        RO { "\u05E8\u05D5\u05DE\u05E0\u05D9\u05D4" }
+        RU { "\u05D7\u05D1\u05E8 \u05D4\u05DE\u05D3\u05D9\u05E0\u05D5\u05EA \u05D4\u05E8\u05D5\u05E1\u05D9\u05D5\u05EA" }
+        RW { "\u05E8\u05D5\u05D0\u05E0\u05D3\u05D4" }
+        SA { "\u05E2\u05E8\u05D1 \u05D4\u05E1\u05E2\u05D5\u05D3\u05D9\u05EA" }
+        SB { "\u05D0\u05D9\u05D9 \u05E9\u05DC\u05DE\u05D4" }
+        SC { "\u05D0\u05D9\u05D9 \u05E1\u05D9\u05D9\u05E9\u05DC" }
+        SD { "\u05E1\u05D5\u05D3\u05DF" }
+        SE { "\u05E9\u05D5\u05D5\u05D3\u05D9\u05D4" }
+        SG { "\u05E1\u05D9\u05E0\u05D2\u05E4\u05D5\u05E8" }
+        SH { "\u05E1\u05D9\u05D9\u05E0\u05D8 \u05D4\u05DC\u05E0\u05D4" }
+        SI { "\u05E1\u05DC\u05D5\u05D1\u05E0\u05D9\u05D4" }
+        SJ { "\u05E1\u05D5\u05D5\u05DC\u05D1\u05D0\u05E8\u05D3 \u05D5\u05D6'\u05D0\u05DF \u05DE\u05D0\u05D9\u05D9\u05DF" }
+        SK { "\u05E1\u05DC\u05D5\u05D1\u05E7\u05D9\u05D4" }
+        SL { "\u05E1\u05D9\u05D9\u05E8\u05D4 \u05DC\u05D0\u05D5\u05E0\u05D4" }
+        SM { "\u05E1\u05DF \u05DE\u05E8\u05D9\u05E0\u05D5" }
+        SN { "\u05E1\u05E0\u05D2\u05DC" }
+        SO { "\u05E1\u05D5\u05DE\u05DC\u05D9\u05D4" }
+        SR { "\u05E1\u05D5\u05E8\u05D9\u05E0\u05D0\u05DD" }
+        ST { "\u05E1\u05DF \u05EA\u05D5\u05DE\u05D4 \u05D5\u05E4\u05E8\u05D9\u05E0\u05E1\u05D9\u05E4\u05D4" }
+        SV { "\u05D0\u05DC \u05E1\u05DC\u05D1\u05D0\u05D3\u05D5\u05E8" }
+        SY { "\u05D4\u05E8\u05E4\u05D5\u05D1\u05DC\u05D9\u05E7\u05D4 \u05D4\u05E2\u05E8\u05D1\u05D9\u05EA \u05D4\u05E1\u05D5\u05E8\u05D9\u05EA" }    // alternate name { "\u05E1\u05D5\u05E8\u05D9\u05D4" }
+        SZ { "\u05E1\u05D5\u05D5\u05D6\u05D9\u05DC\u05E0\u05D3" }
+        TC { "\u05D0\u05D9\u05D9 \u05D8\u05D5\u05E8\u05E7\u05E1 \u05D5\u05E7\u05D0\u05D9\u05E7\u05D5\u05E1" }
+        TD { "\u05E6'\u05D0\u05D3" }
+        TF { "\u05D8\u05E8\u05D9\u05D8\u05D5\u05E8\u05D9\u05D5\u05EA \u05D3\u05E8\u05D5\u05DE\u05D9\u05D5\u05EA \u05E9\u05DC \u05E6\u05E8\u05E4\u05EA" }
+        TG { "\u05D8\u05D5\u05D2\u05D5" }
+        TH { "\u05EA\u05D0\u05D9\u05DC\u05E0\u05D3" }
+        TJ { "\u05D8\u05D2'\u05D9\u05E7\u05D9\u05E1\u05D8\u05DF" }
+        TK { "\u05D8\u05D5\u05E7\u05DC\u05D0\u05D5" }
+        TL { "\u05DE\u05D6\u05E8\u05D7 \u05D8\u05D9\u05DE\u05D5\u05E8" }
+        TM { "\u05D8\u05D5\u05E8\u05E7\u05DE\u05E0\u05D9\u05E1\u05D8\u05DF" }
+        TN { "\u05D8\u05D5\u05E0\u05D9\u05E1\u05D9\u05D4" }
+        TO { "\u05D8\u05D5\u05E0\u05D2\u05D4" }
+        TR { "\u05D8\u05D5\u05E8\u05E7\u05D9\u05D4" }
+        TT { "\u05D8\u05E8\u05D9\u05E0\u05D9\u05D3\u05D3 \u05D5\u05D8\u05D5\u05D1\u05D2\u05D5" }
+        TV { "\u05D8\u05D5\u05D1\u05D0\u05DC\u05D5" }
+        TW { "\u05D8\u05D9\u05D5\u05D5\u05D0\u05DF" }
+        TZ { "\u05D8\u05E0\u05D6\u05E0\u05D9\u05D4" }
+        UA { "\u05D0\u05D5\u05E7\u05E8\u05D0\u05D9\u05E0\u05D4" }
+        UG { "\u05D0\u05D5\u05D2\u05E0\u05D3\u05D4" }
+        UM { "\u05D0\u05D9\u05D9\u05DD \u05E7\u05D8\u05E0\u05D9\u05DD \u05E9\u05DC\u05D7\u05D5\u05E3 \u05D0\u05E8\u05E6\u05D5\u05EA \u05D4\u05D1\u05E8\u05D9\u05EA" }
+        US { "\u05D0\u05E8\u05E6\u05D5\u05EA \u05D4\u05D1\u05E8\u05D9\u05EA" }
+        UY { "\u05D0\u05D5\u05E8\u05D5\u05D2\u05D5\u05D5\u05D0\u05D9" }
+        UZ { "\u05D0\u05D5\u05D6\u05D1\u05E7\u05D9\u05E1\u05D8\u05DF" }
+        VA { "\u05D4\u05D5\u05D5\u05EA\u05D9\u05E7\u05DF" }
+        VC { "\u05E1\u05E0\u05D8 \u05D5\u05D9\u05E0\u05E1\u05E0\u05D8 \u05D5\u05D4\u05D2\u05E8\u05E0\u05D3\u05D9\u05E0\u05D9\u05DD" }
+        VE { "\u05D5\u05E0\u05E6\u05D5\u05D0\u05DC\u05D4" }
+        VG { "\u05D0\u05D9\u05D9 \u05D4\u05D1\u05EA\u05D5\u05DC\u05D4 \u05D4\u05D1\u05E8\u05D9\u05D8\u05D9\u05D9\u05DD" }
+        VI { "\u05D0\u05D9\u05D9 \u05D4\u05D1\u05EA\u05D5\u05DC\u05D4 \u05D4\u05D0\u05DE\u05E8\u05D9\u05E7\u05E0\u05D9\u05D9\u05DD" }
+        VN { "\u05D5\u05D9\u05D9\u05D8\u05E0\u05D0\u05DD" }
+        VU { "\u05D5\u05D0\u05E0\u05D5\u05D0\u05D8\u05D5" }
+        WF { "\u05D5\u05D0\u05DC\u05D9\u05E1 \u05D5\u05E4\u05D5\u05D8\u05D5\u05E0\u05D4" }
+        WS { "\u05E1\u05DE\u05D5\u05D0\u05D4" }
+        YE { "\u05EA\u05D9\u05DE\u05DF" }
+        YT { "\u05DE\u05D9\u05D5\u05D8\u05D4" }
+        YU { "\u05D9\u05D5\u05D2\u05D5\u05E1\u05DC\u05D1\u05D9\u05D4" }
+        ZA { "\u05D3\u05E8\u05D5\u05DD \u05D0\u05E4\u05E8\u05D9\u05E7\u05D4" }
+        ZM { "\u05D6\u05DE\u05D1\u05D9\u05D4" }
+        ZW { "\u05D6\u05D9\u05DE\u05D1\u05D1\u05D5\u05D5\u05D4" }
+    }
+    Languages { 
+        ar { "\u05E2\u05E8\u05D1\u05D9\u05EA" }
+        bg { "\u05D1\u05D5\u05DC\u05D2\u05E8\u05D9\u05EA" }
+        cs { "\u05E6'\u05DB\u05D9\u05EA" }
+        da { "\u05D3\u05E0\u05D9\u05EA" }
+        de { "\u05D2\u05E8\u05DE\u05E0\u05D9\u05EA" }
+        el { "\u05D9\u05D5\u05D5\u05E0\u05D9\u05EA" }
+        en { "\u05D0\u05E0\u05D2\u05DC\u05D9\u05EA" }
+        es { "\u05E1\u05E4\u05E8\u05D3\u05D9\u05EA" }
+        et { "\u05D0\u05E1\u05D8\u05D5\u05E0\u05D9\u05EA" }
+        fi { "\u05E4\u05D9\u05E0\u05D9\u05EA" }
+        fr { "\u05E6\u05E8\u05E4\u05EA\u05D9\u05EA" }
+        he { "\u05E2\u05D1\u05E8\u05D9\u05EA" }
+        hr { "\u05E7\u05E8\u05D5\u05D0\u05D8\u05D9\u05EA" }
+        hu { "\u05D4\u05D5\u05E0\u05D2\u05E8\u05D9\u05EA" }
+        it { "\u05D0\u05D9\u05D8\u05DC\u05E7\u05D9\u05EA" }
+        //iw { "\u05E2\u05D1\u05E8\u05D9\u05EA" } //Use he instead
+        ja { "\u05D9\u05E4\u05E0\u05D9\u05EA" }
+        ko { "\u05E7\u05D5\u05E8\u05D9\u05D0\u05E0\u05D9\u05EA" }
+        lt { "\u05DC\u05D9\u05D8\u05D0\u05D9\u05EA" }
+        lv { "\u05DC\u05D8\u05D1\u05D9\u05EA" }
+        nl { "\u05D4\u05D5\u05DC\u05E0\u05D3\u05D9\u05EA" }
+        no { "\u05E0\u05D5\u05E8\u05D5\u05D5\u05D2\u05D9\u05EA" }
+        pl { "\u05E4\u05D5\u05DC\u05E0\u05D9\u05EA" }
+        pt { "\u05E4\u05D5\u05E8\u05D8\u05D5\u05D2\u05D6\u05D9\u05EA" }
+        ro { "\u05E8\u05D5\u05DE\u05E0\u05D9\u05EA" }
+        ru { "\u05E8\u05D5\u05E1\u05D9\u05EA" }
+        sk { "\u05E1\u05DC\u05D5\u05D1\u05E7\u05D9\u05EA" }
+        sl { "\u05E1\u05DC\u05D5\u05D1\u05E0\u05D9\u05EA" }
+        sv { "\u05E9\u05D5\u05D5\u05D3\u05D9\u05EA" }
+        tr { "\u05D8\u05D5\u05E8\u05E7\u05D9\u05EA" }
+        zh { "\u05E1\u05D9\u05E0\u05D9\u05EA" }
+        //zh_cn { "\u05E1\u05D9\u05E0\u05D9\u05EA (\u05DE\u05E4\u05D5\u05E9\u05D8\u05EA)" }
+        //zh_tw { "\u05E1\u05D9\u05E0\u05D9\u05EA (\u05DE\u05E1\u05D5\u05E8\u05EA\u05D9\u05EA)" }
     }
     DateTimePatterns { 
         "HH:mm:ss z",
@@ -47,15 +319,9 @@
         "\u05E9\u05D1\u05EA",
     }
     Eras { 
-        "\u05DC\u05E1\u05D4\u0022\u05E0",
         "\u05DC\u05E4\u05E1\u05D4\u0022\u05E0",
+        "\u05DC\u05E1\u05D4\u0022\u05E0",
     }
-    Languages { 
-        he { "\u05E2\u05D1\u05E8\u05D9\u05EA" }
-        //iw { "\u05E2\u05D1\u05E8\u05D9\u05EA" } //Use he instead
-    }
-    LocaleID:int { 0x0d }
-//    LocaleString { "he" }
     MonthAbbreviations { 
         "\u05D9\u05E0\u05D5",
         "\u05E4\u05D1\u05E8",
@@ -84,17 +350,8 @@
         "\u05E0\u05D5\u05D1\u05DE\u05D1\u05E8",
         "\u05D3\u05E6\u05DE\u05D1\u05E8",
     }
-//    ShortLanguage { "heb" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
-    }
+
     LocaleScript:array { 
         "Hebr"    // ISO 15924 Name 
     }
@@ -137,4 +394,64 @@
     Currencies {
         ILS { "\u20AA", "\u05E9\u0022\u05D7" }
     }
+
+    // International Calendars Data.
+    // NOTE (ICU 2.6) - the format of this data WILL CHANGE in future releases.  
+
+    MonthNames_hebrew {
+                "\u05EA\u05E9\u05E8\u05D9",                 // Tishri
+                "\u05D7\u05E9\u05D5\u05DF",                 // Heshvan
+                "\u05DB\u05E1\u05DC\u05D5",                 // Kislev
+                "\u05D8\u05D1\u05EA",                       // Tevet
+                "\u05E9\u05D1\u05D8",                       // Shevat
+                "\u05D0\u05D3\u05E8 \u05E8\u05D0\u05E9\u05D5\u05DF",    // Adar I
+                "\u05D0\u05D3\u05E8 \u05E9\u05E0\u05D9",    // Adar
+                "\u05E0\u05D9\u05E1\u05DF",                 // Nisan
+                "\u05D0\u05D9\u05D9\u05E8",                 // Iyar
+                "\u05E1\u05D9\u05D5\u05DF",                 // Sivan
+                "\u05EA\u05DE\u05D5\u05D6",                 // Tamuz
+                "\u05D0\u05D1",                             // Av
+                "\u05D0\u05DC\u05D5\u05DC",                 // Elul
+    }
+    MonthAbbreviations_hebrew:alias {
+                "he/MonthNames_hebrew"
+    }
+    Eras_hebrew:array {
+               "\u05DC\u05D1\u05D4\042\u05E2"
+    }
+
+    // Islamic calendar
+    Eras_islamic:array { 
+            "\u05E9\u05E0\u05EA \u05D4\u05D9\u05D2'\u05E8\u05D4"
+    }
+
+    MonthNames_islamic {
+            "\u05DE\u05D5\u05D7\u05E8\u05DD",                                               // Muharram
+            "\u05E1\u05E4\u05E8",                                                           // Safar
+            "\u05E8\u05D1\u05D9\u05E2 \u05D0\u05DC-\u05D0\u05D5\u05D5\u05D0\u05DC",         // Rabi' al-awwal
+            "\u05E8\u05D1\u05D9\u05E2 \u05D0\u05DC-\u05EA\u05E0\u05D9",                     // Rabi' al-thani
+            "\u05D2'\u05D5\u05DE\u05D3\u05D4 \u05D0\u05DC-\u05D0\u05D5\u05D5\u05D0\u05DC",  // Jumada al-awwal
+            "\u05D2'\u05D5\u05DE\u05D3\u05D4 \u05D0\u05DC-\u05EA\u05E0\u05D9",              // Jumada al-thani
+            "\u05E8\u05D2'\u05D0\u05D1",                                                    // Rajab
+            "\u05E9\u05E2\u05D1\u05D0\u05DF",                                               // Sha'ban
+            "\u05E8\u05D0\u05DE\u05D3\u05DF",                                               // Ramadan
+            "\u05E9\u05D5\u05D5\u05D0\u05DC",                                               // Shawwal
+            "\u05D6\u05D5 \u05D0\u05DC-QI'DAH",                                             // Dhu al-Qi'dah  (NEED TRANSLATION!!)
+            "\u05D6\u05D5 \u05D0\u05DC-\u05D7\u05D9\u05D2'\u05D4",                          // Dhu al-Hijjah
+       }
+
+    MonthAbbreviations_islamic:alias {  // same as MonthNames (no data)
+        "he/MonthNames_islamic"
+    }   
+    // Civil is identical other than in calculations
+    Eras_islamic-civil:alias {
+        "he/Eras_islamic"
+    }
+    MonthNames_islamic-civil:alias {
+        "he/MonthNames_islamic"
+    }
+    MonthAbbreviations_islamic-civil:alias {
+        "he/MonthAbbreviations_islamic"
+    }
+
 }

Index: he_IL.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/he_IL.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- he_IL.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ he_IL.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,13 +7,10 @@
 
 he_IL {
     Version { "2.0" }
-//    LocaleString { "he_IL" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "ISR" }
-    LocaleID:int { 0x040d }
 }

Index: hi.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/hi.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hi.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ hi.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,68 +7,57 @@
 
 // Thanks to:
 //  -  Shehnaz Nagpurwala and Anwar Nagpurwala [first version]
-//  -  IBM NLTC:  http://w3.torolab.ibm.com/reference/software/global/documents/India/hi-nlsgg.htm
+//  -  IBM NLTC:  http://w3.torolab.ibm.com/gcoc/documents/india/hi-nlsgg.htm
 //  -  Arundhati Bhowmick [IBM Cupertino]
 
 hi {
     Version { "2.0" }
     // This ordering comes from Hyangmi Cho of LOTUS
-    CollationElements {
+    collations {
+      standard { 
         Version { "2.0" }
-        Sequence { "[normalization on]&[top]"
-         "<\u0950<\u0964<\u0965<\u0970<\u0966<\u0967<\u0968<\u0969"
-         "<\u096a<\u096b<\u096c<\u096d<\u096e<\u096f<\u0905<\u0906"
-         "<\u0907<\u0908<\u0909<\u090a<\u090b<\u0960<\u090c<\u0961"
-         "<\u090d<\u090e<\u090f<\u0910<\u0911<\u0912<\u0913<\u0914"
-         "<\u0915<\u0915\u093c=\u0958<\u0915\u0901<\u0915\u0902<\u0915\u0903<\u0915\u0951<\u0915\u0952"
-         "<\u0915\u0953<\u0915\u0954<\u0915\u093d<\u0915\u094d<\u0915\u093e<\u0915\u093f<\u0915\u0940<\u0915\u0941"
-         "<\u0915\u0942<\u0915\u0943<\u0915\u0944<\u0915\u0962<\u0915\u0963<\u0915\u0945<\u0915\u0946<\u0915\u0947"
-         "<\u0915\u0948<\u0915\u0949<\u0915\u094a<\u0915\u094b<\u0915\u094c<\u0916<\u0916\u093c =\u0959<\u0916\u0901<\u0916\u0902<\u0916\u0903"
-         "<\u0916\u0951<\u0916\u0952<\u0916\u0953<\u0916\u0954<\u0916\u093d<\u0916\u094d<\u0916\u093e<\u0916\u093f"
-         "<\u0916\u0940<\u0916\u0941<\u0916\u0942<\u0916\u0943<\u0916\u0944<\u0916\u0962<\u0916\u0963<\u0916\u0945"
-         "<\u0916\u0946<\u0916\u0947<\u0916\u0948<\u0916\u0949<\u0916\u094a<\u0916\u094b<\u0916\u094c<\u0917"
-         "<\u0917\u093c=\u095a<\u0917\u0901<\u0917\u0902<\u0917\u0903<\u0917\u0951<\u0917\u0952<\u0917\u0953<\u0917\u0954"
-         "<\u0917\u093d<\u0917\u094d<\u0917\u093e<\u0917\u093f<\u0917\u0940<\u0917\u0941<\u0917\u0942<\u0917\u0943"
-         "<\u0917\u0944<\u0917\u0962<\u0917\u0963<\u0917\u0945<\u0917\u0946<\u0917\u0947<\u0917\u0948<\u0917\u0949"
-         "<\u0917\u094a<\u0917\u094b<\u0917\u094c<\u0918<\u0919<\u091a<\u091b<\u091c<\u091c\u093c =\u095b<\u091c\u0901<\u091c\u0902<\u091c\u0903"
-         "<\u091c\u0951<\u091c\u0952<\u091c\u0953<\u091c\u0954<\u091c\u093d<\u091c\u094d<\u091c\u093e<\u091c\u093f"
-         "<\u091c\u0940<\u091c\u0941<\u091c\u0942<\u091c\u0943<\u091c\u0944<\u091c\u0962<\u091c\u0963<\u091c\u0945"
-         "<\u091c\u0946<\u091c\u0947<\u091c\u0948<\u091c\u0949<\u091c\u094A<\u091c\u094b<\u091c\u094c<\u091d"
-         "<\u091e<\u091f<\u0920<\u0921<\u0921\u093c=\u095c<\u0921\u0901<\u0921\u0902<\u0921\u0903<\u0921\u0951<\u0921\u0952<\u0921\u0953<\u0921\u0954"
-         "<\u0921\u093d<\u0921\u094d<\u0921\u093e<\u0921\u093f<\u0921\u0940<\u0921\u0941<\u0921\u0942<\u0921\u0943"
-         "<\u0921\u0944<\u0921\u0962<\u0921\u0963<\u0921\u0945<\u0921\u0946<\u0921\u0947<\u0921\u0948<\u0921\u0949"
-         "<\u0921\u094a<\u0921\u094b<\u0921\u094c<\u0922<\u0922\u093c=\u095d<\u0922\u0901<\u0922\u0902<\u0922\u0903"
-         "<\u0922\u0951<\u0922\u0952<\u0922\u0953<\u0922\u0954<\u0922\u093d<\u0922\u094d<\u0922\u093e<\u0922\u093f"
-         "<\u0922\u0940<\u0922\u0941<\u0922\u0942<\u0922\u0943<\u0922\u0944<\u0922\u0962<\u0922\u0963<\u0922\u0945"
-         "<\u0922\u0946<\u0922\u0947<\u0922\u0948<\u0922\u0949<\u0922\u094a<\u0922\u094b<\u0922\u094c<\u0923"
-         "<\u0924<\u0925<\u0926<\u0927<\u0928<\u0928\u093c =\u0929< \u0928\u0901<\u0928\u0902< \u0928\u0903"
-         "<\u0928\u0951<\u0928\u0952<\u0928\u0953<\u0928\u0954<\u0928\u093d<\u0928\u094d<\u0928\u093e<\u0928\u093f"
-         "<\u0928\u0940<\u0928\u0941<\u0928\u0942<\u0928\u0943<\u0928\u0944<\u0928\u0962<\u0928\u0963<\u0928\u0945"
-         "<\u0928\u0946<\u0928\u0947<\u0928\u0948<\u0928\u0949<\u0928\u094a<\u0928\u094b<\u0928\u094c"
-         "<\u092a<\u092b<\u092b\u093c=\u095e<\u092b\u0901<\u092b\u0902<\u092b\u0903<\u092b\u0951<\u092b\u0952"
-         "<\u092b\u0953<\u092b\u0954<\u092b\u093d<\u092b\u094d<\u092b\u093e<\u092b\u093f<\u092b\u0940<\u092b\u0941<\u092b\u0942<\u092b\u0943"
-         "<\u092b\u0944<\u092b\u0962<\u092b\u0963<\u092b\u0945<\u092b\u0946<\u092b\u0947<\u092b\u0948<\u092b\u0949"
-         "<\u092b\u094a<\u092b\u094b<\u092b\u094c<\u092c<\u092d<\u092e<\u092f<\u092f\u093c=\u095f "
-         "<\u092f\u0901<\u092f\u0902<\u092f\u0903<\u092f\u0951<\u092f\u0952<\u092f\u0953<\u092f\u0954"
-         "<\u092f\u093d<\u092f\u094d<\u092f\u093e<\u092f\u093f<\u092f\u0940<\u092f\u0941<\u092f\u0942<\u092f\u0943"
-         "<\u092f\u0944<\u092f\u0962<\u092f\u0963<\u092f\u0945<\u092f\u0946<\u092f\u0947<\u092f\u0948<\u092f\u0949"
-         "<\u092f\u094a<\u092f\u094b<\u092f\u094c<\u0930<\u0930\u093c=\u0931<\u0930\u0901<\u0930\u0902<\u0930\u0903"
-         "<\u0930\u0951<\u0930\u0952<\u0930\u0953<\u0930\u0954<\u0930\u093d<\u0930\u094d<\u0930\u093e<\u0930\u093f"
-         "<\u0930\u0940<\u0930\u0941<\u0930\u0942<\u0930\u0943<\u0930\u0944<\u0930\u0962<\u0930\u0963<\u0930\u0945"
-         "<\u0930\u0946<\u0930\u0947<\u0930\u0948<\u0930\u0949<\u0930\u094a<\u0930\u094b<\u0930\u094c"
-         "<\u0932<\u0933<\u0933\u093c=\u0934<\u0933\u0901<\u0933\u0902<\u0933\u0903<\u0933\u0951<\u0933\u0952"
-         "<\u0933\u0953<\u0933\u0954<\u0933\u093d<\u0933\u094d<\u0933\u093e<\u0933\u093f<\u0933\u0940<\u0933\u0941"
-         "<\u0933\u0942<\u0933\u0943<\u0933\u0944<\u0933\u0962<\u0933\u0963<\u0933\u0945<\u0933\u0946<\u0933\u0947"
-         "<\u0933\u0948<\u0933\u0949<\u0933\u094a<\u0933\u094b<\u0933\u094c<\u0935<\u0936<\u0937<\u0938<\u0939"
-         "<\u093c<\u0901<\u0902<\u0903<\u0951<\u0952<\u0953<\u0954<\u093d<\u094d<\u093e<\u093f<\u0940"
-         "<\u0941<\u0942<\u0943<\u0944<\u0962<\u0963<\u0945<\u0946"
-         "<\u0947<\u0948<\u0949<\u094a<\u094b<\u094c" }
+        Sequence {   
+            "[normalization on]"
+            "& [before 1] 0"
+            " < \u0950"
+            " < \u0964"
+            " < \u0965"
+            " < \u0970"
+            "& \u0939"
+            " < \u093c"
+            " < \u0901"
+            " < \u0902"
+            " < \u0903"
+            " < \u0951"
+            " < \u0952"
+            " < \u0953"
+            " < \u0954"
+            "& \u093d"
+            " < \u094d"
+         }
+      }
+      direct { 
+        Version { "1.0" }
+        Sequence { //"[normalization on]"
+            "&[top]"
+            "<\u0901 <\u0902 <\u0903 <\u0905 <\u0906 <\u0907 <\u0908 <\u0909"
+            "<\u090a <\u090b <\u090c <\u090d <\u090e <\u090f <\u0910 <\u0911"
+            "<\u0912 <\u0913 <\u0914 <\u0915 <\u0916 <\u0917 <\u0918 <\u0919"
+            "<\u091a <\u091b <\u091c <\u091d <\u091e <\u091f <\u0920 <\u0921"
+            "<\u0922 <\u0923 <\u0924 <\u0925 <\u0926 <\u0927 <\u0928 <\u0929"
+            "<\u092a <\u092b <\u092c <\u092d <\u092e <\u092f <\u0930 <\u0931"
+            "<\u0932 <\u0933 <\u0934 <\u0935 <\u0936 <\u0937 <\u0938 <\u0939"
+            "<\u093c <\u093d <\u093e <\u093f <\u0940 <\u0941 <\u0942 <\u0943"
+            "<\u0944 <\u0945 <\u0946 <\u0947 <\u0948 <\u0949 <\u094a <\u094b <\u094c"
+            "<\u094d <\u0950 <\u0951 <\u0952 <\u0953 <\u0954 <\u0958 <\u0959"
+            "<\u095a <\u095b <\u095c <\u095d <\u095e <\u095f <\u0960 <\u0961<\u0962 <\u0963"
+            "<\u0964 <\u0965 <\u0966 <\u0967 <\u0968 <\u0969 <\u096a <\u096b"
+            "<\u096c <\u096d <\u096e <\u096f <\u0970"
+        }
+      }
     }
-    LocaleID:int { 0x39 }
-//    ShortLanguage { hin }
 
     Languages {
-
 //Haryanvi    \u0939\u0930\u093F\u092F\u093E\u0928\u0935\u0940 // ???
 
         root { "\u0936\u093F\u0916\u0930" }
@@ -220,28 +209,207 @@
         zu { "\u095B\u0941\u0932\u0942" }
     }
     Countries {
-        IN { "\u092d\u093e\u0930\u0924" } // bharat
+        AD { "\u0905\u0928\u094D\u0921\u094B\u0930\u093E" }
+        AE { "\u0938\u0902\u092F\u0941\u0915\u094D\u0924 \u0905\u0930\u092C \u0905\u092E\u0940\u0930\u093E\u0924" }
+        AF { "\u0905\u092B\u0917\u093E\u0928\u093F\u0938\u094D\u0924\u093E\u0928" }
+        AG { "\u090F\u0928\u094D\u091F\u093F\u0917\u0941\u0935\u093E \u0914\u0930 \u092C\u093E\u0930\u092C\u0942\u0921\u093E" }
+        AL { "\u0905\u0932\u094D\u092C\u093E\u0928\u093F\u092F\u093E" }
+        AM { "\u0906\u0930\u094D\u092E\u0947\u0928\u093F\u092F\u093E" }
+        AO { "\u0905\u0902\u0917\u094B\u0932\u093E" }
+        AR { "\u0905\u0930\u094D\u091C\u0947\u0928\u094D\u091F\u0940\u0928\u093E" }
+        AT { "\u0911\u0938\u094D\u091F\u094D\u0930\u093F\u092F\u093E" } // The first letter could be \u0906 instead
+        AU { "\u0911\u0938\u094D\u091F\u094D\u0930\u0947\u0932\u093F\u092F\u093E" } // The first letter could be \u0906 instead
+        AZ { "\u0905\u091C\u0930\u092C\u0948\u091C\u093E\u0928" }
+
+        BA { "\u092C\u094B\u0938\u0928\u093F\u092F\u093E \u0939\u0930\u094D\u091C\u093F\u0917\u094B\u0935\u093F\u0928\u093E" }
+        BB { "\u092C\u093E\u0930\u092C\u093E\u0921\u094B\u0938" }
+        BD { "\u092C\u0902\u0917\u0932\u093E\u0926\u0947\u0936" }
+        BE { "\u092C\u0947\u0932\u094D\u091C\u093F\u092F\u092E" }
+        BF { "\u092C\u0930\u094D\u0915\u093F\u0928\u093E \u092B\u093E\u0938\u094B" }
+        BG { "\u092C\u0941\u0932\u094D\u0917\u093E\u0930\u093F\u092F\u093E" }
+        BH { "\u092C\u0939\u0930\u0948\u0928" }
+        BI { "\u092C\u0941\u0930\u0941\u0902\u0921\u0940" }
+        BJ { "\u092C\u0947\u0928\u093F\u0928" }
+        BN { "\u092C\u094D\u0930\u0942\u0928\u0907" }
+        BO { "\u092C\u094B\u0932\u0940\u0935\u093F\u092F\u093E" }
+        BR { "\u092C\u094D\u0930\u093E\u091C\u0940\u0932" }
+        BS { "\u092C\u0939\u093E\u092E\u093E" }
+        BT { "\u092D\u0942\u091F\u093E\u0928" }
+        BW { "\u092C\u094B\u0924\u094D\u0938\u094D\u0935\u093E\u0928\u093E" }
+        BY { "\u092C\u0947\u0932\u093E\u0930\u0942\u0938" }
+        BZ { "\u092C\u0947\u0932\u093F\u091C" }
+
+        CA { "\u0915\u0928\u093e\u0921\u093e" }
+        CC { "\u0915\u093f\u0902\u0936\u093e\u0938\u093e"}
+        CF { "\u0938\u0947\u0902\u091f\u094d\u0930\u0932 \u0905\u092b\u094d\u0930\u0940\u0915\u0928 \u0930\u093f\u092a\u092c\u094d\u0932\u093f\u0915" }
+        CG { "\u0915\u093e\u0902\u0917\u094b" }
+        CH { "\u0938\u094d\u0935\u093f\u0938" } // Could be \u0938\u094d\u0935\u093f\u091f\u094d\u091c\u0930\u0932\u0948\u0902\u0921 
+        CI { "\u0906\u0908\u0935\u0930\u0940 \u0915\u094b\u0938\u094d\u091f" }
+        CL { "\u091a\u093f\u0932\u0940" }
+        CM { "\u0915\u093e\u092e\u0947\u0930\u093e\u0928" }
+        CN { "\u091a\u0940\u0928" }
+        CO { "\u0915\u094b\u0932\u092e\u094d\u092c\u093f\u092f\u093e" }
+        CR { "\u0915\u094b\u0938\u094d\u091f\u093e\u0930\u0940\u0915\u093e" }
+        //CS { "\u0938\u0930\u094d\u092c\u093f\u092f\u093e \u0914\u0930 \u092e\u094b\u0902\u091f\u0947\u0928\u0940\u0917\u0930\u094b" } // Does ICU support this name?
+        CU { "\u0915\u094d\u092f\u0942\u092c\u093e" }
+        CV { "\u0915\u0948\u092a \u0935\u0930\u094d\u0924" }
+        CY { "\u0938\u093e\u0907\u092a\u094d\u0930\u0938" }
+        CZ { "\u091a\u0947\u0915 \u0917\u0923\u0930\u093e\u091c\u094d\u092f" }
+
+        DE { "\u091c\u0930\u094d\u092e\u0928\u0940" }
+        DJ { "\u091c\u093f\u092c\u0942\u0924\u0940" }
+        DK { "\u0921\u0947\u0928\u092e\u093e\u0930\u094d\u0915" }
+        DM { "\u0921\u094b\u092e\u093f\u0928\u093f\u0915\u093e" }
+        DO { "\u0921\u094b\u092e\u093f\u0928\u093f\u0915\u0928 \u0917\u0923\u0930\u093e\u091c\u094d\u092f" }
+        DZ { "\u0905\u0932\u094d\u091c\u0940\u0930\u093f\u092f\u093e" }
+
+        EC { "\u0907\u0915\u094d\u0935\u093e\u0921\u094b\u0930" } // The first character could be \u090f instead
+        EE { "\u090f\u0938\u094d\u091f\u094b\u0928\u093f\u092f\u093e" }
+        EG { "\u092e\u093f\u0938\u094d\u0930" }
+        EH { "\u092a\u0936\u094d\u091a\u093f\u092e\u0940 \u0938\u0939\u093e\u0930\u093e" }
+        ER { "\u0907\u0930\u093f\u091f\u094d\u0930\u093f\u092f\u093e" }
+        ES { "\u0938\u094d\u092a\u0947\u0928" }
+        ET { "\u0907\u0925\u093f\u092f\u094b\u092a\u093f\u092f\u093e" }
+
+        FI { "\u092b\u093f\u0928\u0932\u0948\u0902\u0921" }
+        FJ { "\u092b\u093f\u091c\u0940" }
+        FR { "\u092b\u094d\u0930\u093e\u0902\u0938" }
+
         GR { "\u0917\u094D\u0930\u0940\u0938" }
         GT { "\u0917\u094b\u0924\u0947\u0926\u093e\u0932\u093e" }
-        UY { "\u0909\u0930\u0942\u0917\u0941\u090F" }
         GW { "\u0917\u0940\u0928\u0940-\u092c\u093f\u0938\u093e\u0909" }
         GY { "\u0917\u0941\u092f\u093e\u0928\u093e" }
-        VA { "\u0935\u093e\u0945\u091f\u093f\u0915\u0928" }
-        TM { "\u0924\u0941\u0915\u094d\u0930\u092e\u0947\u0928\u093f\u0938\u094d\u0924\u093e\u0928" }
-        VG { "\u092c\u094d\u0930\u093f\u091f\u093f\u0936 "
-             "\u0935\u0930\u094d\u091c\u0940\u0928 "
-             "\u090c\u0908\u0932\u0948\u0902\u0921\u0938\u094d" }
-        VI { "\u0908\u0909, \u090f\u0938 "
-             "\u0935\u0930\u094d\u091c\u0940\u0928 "
-             "\u0906\u0908\u0932\u0948\u0902\u0921\u0938\u094d" }
-        TL { "\u0908\u0938\u094d\u091f \u091f\u093f\u092e\u094b\u0930" }
+
         //HK { "\u0939\u094b\u0902\u0917 \u0915\u094b\u0902\u0917" }
-        VU { "\u0938\u093e\u0928\u0941\u0905\u0924\u0941" }  // CHECK - #12
-        HN { "\u0939\u093e\u0945\u0928\u0921\u0941\u0930\u093e\u0938" }
-        HR { "\u0915\u094d\u0930\u094b\u0936\u0940\u092f\u093e" }
-        HT { "\u0939\u093e\u0908\u091f\u0940" }
-        HU { "\u0939\u0902\u0917\u0947\u0930\u0940" }
+        //HN { "\u0939\u093e\u0945\u0928\u0921\u0941\u0930\u093e\u0938" }
+        HN { "\u0939\u093e\u0923\u094d\u0921\u0942\u0930\u0938" }
+        //HR { "\u0915\u094d\u0930\u094b\u0936\u0940\u092f\u093e" }
+        HR { "\u0915\u094d\u0930\u094b\u0936\u093f\u092f\u093e" }
+        //HT { "\u0939\u093e\u0908\u091f\u0940" }
+        HT { "\u0939\u093e\u0907\u0924\u0940" }
+        //HU { "\u0939\u0902\u0917\u0947\u0930\u0940" }
+        HU { "\u0939\u0902\u0917\u0930\u0940" }
+
+        ID { "\u0907\u0902\u0921\u094b\u0928\u0947\u0936\u093f\u092f\u093e" }
+        IE { "\u0906\u092f\u0930\u0932\u0948\u0902\u0921" }
+        IL { "\u0907\u0938\u0930\u093e\u0907\u0932" }
+        IN { "\u092d\u093e\u0930\u0924" } // bharat
+        IQ { "\u0907\u0930\u093e\u0915" }
+        IR { "\u0908\u0930\u093e\u0928" }
+        IS { "\u0906\u0907\u0938\u0932\u0948\u0902\u0921" }
+        IT { "\u0907\u091f\u0932\u0940" }
+
+        JM { "\u091c\u092e\u093e\u0907\u0915\u093e" }
+        JO { "\u091c\u094b\u0930\u094d\u0921\u0928" }
+        JP { "\u091c\u093e\u092a\u093e\u0928" }
+
+        KE { "\u0915\u0947\u0928\u094d\u092f\u093e" }
+        KG { "\u0915\u093f\u0930\u094d\u0917\u093f\u091c" }
+        KH { "\u0915\u092e\u094d\u092c\u094b\u0921\u093f\u092f\u093e" }
+        KM { "\u0915\u094b\u092e\u094b\u0930\u0938" }
+        KN { "\u0938\u0947\u0902\u091f \u0915\u093f\u091f\u094d\u0938 \u0914\u0930 \u0928\u0947\u0935\u093f\u0938" }
+        KP { "\u0909\u0924\u094d\u0924\u0930 \u0915\u094b\u0930\u093f\u092f\u093e" }
+        KR { "\u0926\u0915\u094d\u0937\u093f\u0923 \u0915\u094b\u0930\u093f\u092f\u093e" }
+        KW { "\u0915\u0941\u0935\u0948\u0924" }
+        KZ { "\u0915\u091c\u093e\u0916\u0938\u094d\u0924\u093e\u0928" }
+
+        LA { "\u0932\u093e\u0913\u0938" }
+        LB { "\u0932\u0947\u092c\u0928\u093e\u0928" }
+        LC { "\u0938\u0947\u0902\u091f \u0932\u0942\u0938\u093f\u092f\u093e" }
+        LI { "\u0932\u093f\u0915\u091f\u0947\u0902\u0938\u094d\u091f\u0940\u0928" }
+        LK { "\u0936\u094d\u0930\u0940\u0932\u0902\u0915\u093e" }
+        LR { "\u0932\u093e\u0907\u092c\u0947\u0930\u093f\u092f\u093e" }
+        LS { "\u0932\u0947\u0938\u094b\u0925\u094b" }
+        LT { "\u0932\u093f\u0925\u0941\u0906\u0928\u093f\u092f\u093e" }
+        LU { "\u0932\u0915\u094d\u0938\u092e\u092c\u0930\u094d\u0917" }
+        LV { "\u0932\u093e\u0924\u094d\u0935\u093f\u092f\u093e" }
+        LY { "\u0932\u0940\u092c\u093f\u092f\u093e" }
+
+        MA { "\u092e\u094b\u0930\u0915\u094d\u0915\u094b" }
+        MC { "\u092e\u094b\u0928\u093e\u0915\u094b" }
+        MD { "\u092e\u094b\u0932\u094d\u0921\u093e\u0935\u093f\u092f\u093e" }
+        MG { "\u092e\u0926\u093e\u0917\u093e\u0938\u094d\u0915\u0930" }
+        MK { "\u092e\u0948\u0938\u0947\u0921\u094b\u0928\u093f\u092f\u093e" }
+        ML { "\u092e\u093e\u0932\u0940" }
+        MM { "\u092e\u094d\u092f\u093e\u0928\u092e\u093e\u0930" }
+        MN { "\u092e\u0902\u0917\u094b\u0932\u093f\u092f\u093e" }
+        MR { "\u092e\u0949\u0930\u093f\u091f\u093e\u0928\u093f\u092f\u093e" }
+        MT { "\u092e\u093e\u0932\u094d\u091f\u093e" }
+        MU { "\u092e\u094c\u0930\u093f\u0938" }
+        MV { "\u092e\u093e\u0932\u0926\u0940\u0935" }
+        MW { "\u092e\u0932\u093e\u0935\u0940" }
+        MX { "\u092e\u0947\u0915\u094d\u0938\u093f\u0915\u094b" }
+        MY { "\u092e\u0932\u0947\u0936\u093f\u092f\u093e" }
+        MZ { "\u092e\u094b\u091c\u093e\u092e\u094d\u092c\u093f\u0915" }
+
+        PA { "\u092a\u0928\u093e\u092e\u093e" }
         PE { "\u092a\u0947\u0930\u0942" }
+        PG { "\u092a\u093e\u092a\u0941\u0906 \u0928\u094d\u092f\u0942 \u0917\u093f\u0928\u0940" }
+        PH { "\u092b\u093f\u0932\u0940\u092a\u093f\u0902\u0938" }
+        PK { "\u092a\u093e\u0915\u093f\u0938\u094d\u0924\u093e\u0928" }
+        PL { "\u092a\u094b\u0932\u0948\u0902\u0921" }
+        PT { "\u092a\u0941\u0930\u094d\u0924\u0917\u093e\u0932" }
+        PY { "\u092a\u093e\u0930\u093e\u0917\u0941\u090f" }
+
+        QA { "\u0915\u0924\u0930" }
+
+        RO { "\u0930\u094b\u092e\u093e\u0928\u093f\u092f\u093e" }
+        RU { "\u0930\u0942\u0938" }
+        RW { "\u0930\u0942\u0906\u0923\u094d\u0921\u093e" }
+
+        SA { "\u0938\u090a\u0926\u0940 \u0905\u0930\u092c" }
+        SD { "\u0938\u0942\u0921\u093e\u0928" }
+        SE { "\u0938\u094d\u0935\u0940\u0921\u0928" }
+        SG { "\u0938\u093f\u0902\u0917\u093e\u092a\u0941\u0930" }
+        SI { "\u0938\u094d\u0932\u094b\u0935\u0947\u0928\u093f\u092f\u093e" }
+        SK { "\u0938\u094d\u0932\u094b\u0935\u093e\u0915\u093f\u092f\u093e" }
+        SL { "\u0938\u093f\u092f\u0930\u093e\u0932\u0947\u0913\u0928" }
+        SM { "\u0938\u0948\u0928 \u092e\u0947\u0930\u0940\u0928\u094b" }
+        SN { "\u0938\u0947\u0928\u0947\u0917\u0932" }
+        SO { "\u0938\u094b\u092e\u093e\u0932\u093f\u092f\u093e" }
+        SR { "\u0938\u0941\u0930\u093f\u0928\u093e\u092e" }
+        ST { "\u0938\u093e\u0909-\u0924\u094b\u092e-\u092a\u094d\u0930\u093f\u0902\u0938\u093f\u092a" }
+        SV { "\u0905\u0932 \u0938\u093e\u0932\u094d\u0935\u093e\u0921\u094b\u0930" }
+        SY { "\u0938\u0940\u0930\u093f\u092f\u093e" }
+        SZ { "\u0938\u0941\u0906\u091c\u0940\u0932\u0948\u0902\u0921" }
+
+        TD { "\u091a\u093e\u0921" }
+        TG { "\u091f\u094b\u0917\u094b" }
+        TH { "\u0925\u093e\u0907\u0932\u0948\u0902\u0921" }
+        TJ { "\u0924\u093e\u091c\u093f\u0915\u093f\u0938\u094d\u0924\u093e\u0928" }
+        //TL { "\u092a\u0942\u0930\u094d\u0935\u0940 \u0924\u093f\u092e\u094b\u0930" }    // This was called East Timor
+        //TL { "\u0908\u0938\u094d\u091f \u091f\u093f\u092e\u094b\u0930" } // Is this right?
+        //TM { "\u0924\u0941\u0915\u094d\u0930\u092e\u0947\u0928\u093f\u0938\u094d\u0924\u093e\u0928" }
+        TM { "\u0924\u0941\u0930\u094d\u0915\u092e\u0947\u0928\u093f\u0938\u094d\u0924\u093e\u0928" }
+        TN { "\u0924\u0941\u0928\u093f\u0936\u093f\u092f\u093e" }
+        TO { "\u091f\u094b\u0902\u0917\u093e" }
+        TR { "\u0924\u0941\u0930\u094d\u0915\u0940" }
+        TT { "\u091f\u094d\u0930\u093f\u0928\u093f\u0921\u093e\u0921 \u0914\u0930 \u091f\u094b\u092c\u0948\u0917\u094b" }
+        TV { "\u0924\u0941\u0935\u093e\u0932\u0941" }
+        TW { "\u0924\u093e\u0907\u0935\u093e\u0928" }
+        TZ { "\u0924\u0902\u091c\u093e\u0928\u093f\u092f\u093e" }
+
+        UA { "\u092f\u0942\u0915\u094d\u0930\u0947\u0928" }
+        UG { "\u092f\u0941\u0917\u093e\u0902\u0921\u093e" }
+        US { "\u0938\u0902\u092f\u0941\u0915\u094d\u0924 \u0930\u093e\u091c\u094d\u092f \u0905\u092e\u0930\u093f\u0915\u093e" }
+        //UY { "\u0909\u0930\u0942\u0917\u0941\u090F" }
+        UY { "\u092f\u0941\u0930\u0942\u0917\u0941\u090f" }
+        UZ { "\u0909\u091c\u092c\u0947\u0915\u093f\u0938\u094d\u0924\u093e\u0928" }
+
+        //VA { "\u0935\u093e\u0945\u091f\u093f\u0915\u0928" }
+        VA { "\u0935\u0948\u091f\u093f\u0915\u0928" }
+        VE { "\u0935\u0947\u0928\u0947\u091c\u0941\u090f\u0932\u093e" }
+        VN { "\u0935\u093f\u092f\u0924\u0928\u093e\u092e" }
+        VG { "\u092c\u094d\u0930\u093f\u091f\u093f\u0936 \u0935\u0930\u094d\u091c\u0940\u0928 \u090c\u0908\u0932\u0948\u0902\u0921\u0938\u094d" }
+        VI { "\u0908\u0909, \u090f\u0938 \u0935\u0930\u094d\u091c\u0940\u0928 \u0906\u0908\u0932\u0948\u0902\u0921\u0938\u094d" }
+        //VU { "\u0938\u093e\u0928\u0941\u0905\u0924\u0941" }  // CHECK - #12
+        VU { "\u0935\u093e\u0928\u0941\u0905\u0924\u0941" }
+
+        YE { "\u092f\u092e\u0928" }
+
+        ZA { "\u0926\u0915\u094d\u0937\u093f\u0923 \u0905\u092b\u094d\u0930\u0940\u0915\u093e" }
+        ZM { "\u091c\u093e\u092e\u094d\u092c\u093f\u092f\u093e" }
+        ZW { "\u091c\u093f\u092e\u094d\u092c\u093e\u092c\u094d\u0935\u0947" }
     }
     MonthNames {
         "\u091c\u0928\u0935\u0930\u0940",
@@ -313,6 +481,7 @@
         "\u221E",
         "\uFFFD",
         ".",
+        "+",
     }
 
 //    NumberPatterns {

Index: hi_IN.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/hi_IN.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hi_IN.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ hi_IN.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -15,7 +15,6 @@
         "##,##,##0%",
         "#E0",
     }
-//    ShortCountry { IND }
     DateTimePatterns {
         "h:mm:ss a z",
         "h:mm:ss a z",
@@ -31,5 +30,4 @@
 //        "1",
 //        "1"
 //    }
-    LocaleID:int { 0x0439 }
 }

Index: hi__DIRECT.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/hi__DIRECT.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hi__DIRECT.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ hi__DIRECT.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// *   Copyright (C) 1997-2002, International Business Machines
+// *   Copyright (C) 1997-2003, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
 // ***************************************************************************
@@ -8,23 +8,7 @@
 hi__DIRECT {
     Version { "1.1" }
     // This is the order ICU originaly used
-    CollationElements {
-        Version { "1.0" }
-        Sequence { //"[normalization on]"
-            "&[top]"
-            "<\u0901 <\u0902 <\u0903 <\u0905 <\u0906 <\u0907 <\u0908 <\u0909"
-            "<\u090a <\u090b <\u090c <\u090d <\u090e <\u090f <\u0910 <\u0911"
-            "<\u0912 <\u0913 <\u0914 <\u0915 <\u0916 <\u0917 <\u0918 <\u0919"
-            "<\u091a <\u091b <\u091c <\u091d <\u091e <\u091f <\u0920 <\u0921"
-            "<\u0922 <\u0923 <\u0924 <\u0925 <\u0926 <\u0927 <\u0928 <\u0929"
-            "<\u092a <\u092b <\u092c <\u092d <\u092e <\u092f <\u0930 <\u0931"
-            "<\u0932 <\u0933 <\u0934 <\u0935 <\u0936 <\u0937 <\u0938 <\u0939"
-            "<\u093c <\u093d <\u093e <\u093f <\u0940 <\u0941 <\u0942 <\u0943"
-            "<\u0944 <\u0945 <\u0946 <\u0947 <\u0948 <\u0949 <\u094a <\u094b <\u094c"
-            "<\u094d <\u0950 <\u0951 <\u0952 <\u0953 <\u0954 <\u0958 <\u0959"
-            "<\u095a <\u095b <\u095c <\u095d <\u095e <\u095f <\u0960 <\u0961<\u0962 <\u0963"
-            "<\u0964 <\u0965 <\u0966 <\u0967 <\u0968 <\u0969 <\u096a <\u096b"
-            "<\u096c <\u096d <\u096e <\u096f <\u0970"
-        }
+    collations {
+      default { "direct" }
     }
 }

Index: hr.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/hr.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hr.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ hr.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,7 +7,8 @@
 
 hr {
     Version{"2.0"}
-    CollationElements { 
+    collations {
+      standard { 
         Version { "2.0" }
         Sequence {
             "& C < \u010D <<< \u010C < \u0107 <<< \u0106"
@@ -15,10 +16,286 @@
             "& L < lj<<< Lj <<< LJ"
             "& N < nj<<< Nj <<< NJ "
             "& S < \u0161 <<< \u0160"
-            "& Z < \u017E <<< \u017D"			}
+            "& Z < \u017E <<< \u017D"
+        }
+      }
     }
+
     Countries { 
+        Fallback{ "en"}
+        AD { "Andora" }
+        AE { "Ujedinjeni Arapski Emirati" }
+        AF { "Afganistan" }
+        AG { "Antigua i Barbuda" }
+        AI { "Anguila" }
+        AL { "Albanija" }
+        AM { "Armenija" }
+        AN { "Nizozemski Antili" }
+        //AO { "Angola" }
+        AQ { "Antarktik" }
+        //AR { "Argentina" }
+        AS { "Ameri\u010Dka Samoa" }
+        AT { "Austrija" }
+        AU { "Australija" }
+        //AW { "Aruba" }
+        AZ { "Azerbajd\u017Ean" }
+        BA { "Bosna i Hercegovina" }
+        //BB { "Barbados" }
+        BD { "Banglade\u0161" }
+        BE { "Belgija" }
+        //BF { "Burkina Faso" }
+        BG { "Bugarska" }
+        BH { "Bahrein" }
+        //BI { "Burundi" }
+        //BJ { "Benin" }
+        //BM { "Bermuda" }
+        BN { "Brunei Darussalam" }
+        BO { "Bolivija" }
+        //BR { "Brazil" }
+        BS { "Bahami" }
+        BT { "Butan" }
+        BV { "Otok Bouvet" }
+        BW { "Bocvana" }
+        BY { "Bjelorusija" }
+        //BZ { "Belize" }
+        CA { "Kanada" }
+        CC { "Kokos (Keeling) Otoci" }
+        CD { "Kongo, Demokratska Republika" }
+        CF { "Srednjoafri\u010Dka Republika" }
+        CG { "Kongo" }
+        CH { "\u0160vicarska" }
+        CI { "Obala Bjelokosti" }
+        CK { "Kukovi Otoci" }
+        CL { "\u010Cile" }
+        CM { "Kamerun" }
+        CN { "Kina" }
+        CO { "Kolumbija" }
+        CR { "Kostarika" }
+        CU { "Kuba" }
+        CV { "Zeleni Rt" }
+        CX { "Bo\u017Ei\u0107ni Otoci" }
+        CY { "Cipar" }
+        CZ { "\u010Ce\u0161ka Republika" }
+        DE { "Njema\u010Dka" }
+        DJ { "D\u017Eibuti" }
+        DK { "Danska" }
+        DM { "Dominika" }
+        DO { "Dominikanska Republika" }
+        DZ { "Al\u017Eir" }
+        EC { "Ekvador" }
+        EE { "Estonija" }
+        EG { "Egipat" }
+        EH { "Zapadna Sahara" }
+        ER { "Eritreja" }
+        ES { "\u0160panjolska" }
+        ET { "Etiopija" }
+        FI { "Finska" }
+        FJ { "Fid\u017Ei" }
+        FK { "Falklandski Otoci" }
+        FM { "Mikronezija, Federalne Dr\u017Eave" }
+        FO { "Farski Otoci" }
+        FR { "Francuska" }
+        //GA { "Gabon" }
+        GB { "Ujedinjena Kraljevina" }
+        //GD { "Grenada" }
+        GE { "Gruzija" }
+        GF { "Francuska Gvajana" }
+        GH { "Gana" }
+        //GI { "Gibraltar" }
+        //GL { "Greenland" }
+        GM { "Gambija" }
+        GN { "Gvineja" }
+        //GP { "Guadeloupe" }
+        GQ { "Ekvatorska Gvineja" }
+        GR { "Gr\u010Dka" }
+        GS { "Ju\u017Ena Gruzija i Ju\u017Eni Sendvi\u010D Otoci" }
+        GT { "Gvatemala" }
+        //GU { "Guam" }
+        GW { "Gvineja Bisau" }
+        GY { "Gvajana" }
+        HK { "Hong Kong S.A.R. Kine" }
+        HM { "Heard Otok i McDonald Otoci" }
+        //HN { "Honduras" }
         HR { "Hrvatska" }
+        //HT { "Haiti" }
+        HU { "Ma\u0111arska" }
+        ID { "Indonezija" }
+        IE { "Irska" }
+        IL { "Izrael" }
+        IN { "Indija" }
+        IO { "Britanski Teritorij Indijskog Oceana" }
+        IQ { "Irak" }
+        IR { "Iran, Islamska Republika" }
+        IS { "Island" }
+        IT { "Italija" }
+        JM { "Jamajka" }
+        //JO { "Jordan" }
+        //JP { "Japan" }
+        KE { "Kenija" }
+        KG { "Kirgistan" }
+        KH { "Kambod\u017Ea" }
+        //KI { "Kiribati" }
+        KM { "Komori" }
+        KN { "Sveti Kristofor i Nevis" }
+        KP { "Koreja, Sjeverna" } // alternate name { "Koreja, Demokratska Narodna Republika" }
+        KR { "Koreja, Ju\u017Ena" } // alternate name { "Koreja, Republika" }
+        KW { "Kuvajt" }
+        KY { "Kajmanski Otoci" }
+        KZ { "Kazakstan" }
+        LA { "Laoska Narodna Demokratska Republika" }
+        LB { "Libanon" }
+        LC { "Sveta Lucija" }
+        LI { "Lihten\u0161tajn" }
+        LK { "\u0160ri Lanka" }
+        LR { "Liberija" }
+        LS { "Lesoto" }
+        LT { "Litva" }
+        LU { "Luksemburg" }
+        LV { "Latvija" }
+        LY { "Libijska Arapska D\u017Eamahirija" }
+        MA { "Maroko" }
+        MC { "Monako" }
+        MD { "Moldavija, Republika" }
+        MG { "Madagaskar" }
+        MH { "Mar\u0161alovi Otoci" }
+        MK { "Makedonija, Republika" }
+        //ML { "Mali" }
+        MM { "Mijanma" }
+        MN { "Mongolija" }
+        MO { "Makao S.A.R. Kine" }
+        MP { "Sjeverni Marianski Otoci" }
+        MQ { "Martinik" }
+        MR { "Mauritanija" }
+        MS { "Montserat" }
+        //MT { "Malta" }
+        MU { "Mauricijus" }
+        MV { "Maldivi" }
+        MW { "Malavi" }
+        MX { "Meksiko" }
+        MY { "Malezija" }
+        MZ { "Mozambik" }
+        NA { "Namibija" }
+        NC { "Nova Kaledonija" }
+        //NE { "Niger" }
+        NF { "Norfol\u0161ki Otoci" }
+        NG { "Nigerija" }
+        NI { "Nikaragva" }
+        NL { "Nizozemska" }
+        NO { "Norve\u0161ka" }
+        //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" }
+        PM { "Sveti Petar i Miguel" }
+        //PN { "Pitcairn" }
+        PR { "Portoriko" }
+        PS { "Palestinska Teritoija" }
+        //PT { "Portugal" }
+        //PW { "Palau" }
+        PY { "Paragvaj" }
+        QA { "Katar" }
+        RE { "Reunion" }
+        RO { "Rumunjska" }
+        RU { "Ruska Federacija" }
+        RW { "Ruanda" }
+        SA { "Saudijska Arabija" }
+        SB { "Salamunovi Otoci" }
+        SC { "Sej\u0161eli" }
+        //SD { "Sudan" }
+        SE { "\u0160vedska" }
+        SG { "Singapur" }
+        SH { "Sveta Helena" }
+        SI { "Slovenija" }
+        SJ { "Svalbard i Jan Mayen" }
+        SK { "Slova\u010Dka" }
+        SL { "Sijera Leone" }
+        //SM { "San Marino" }
+        //SN { "Senegal" }
+        SO { "Somalija" }
+        SR { "Surinam" }
+        ST { "Sveti Toma i Prinsipe" }
+        //SV { "El Salvador" }
+        SY { "Sirija" } // alternate name { "Sirijska Arapska Republika" }
+        SZ { "Svazi" }
+        TC { "Turkski i Kaikos Otoci" }
+        TD { "\u010Cad" }
+        TF { "Francuske Ju\u017Ene Teritorije" }
+        //TG { "Togo" }
+        TH { "Tajland" }
+        TJ { "Tad\u017Eikistan" }
+        //TK { "Tokelau" }
+        TL { "Isto\u010Dni Timor" }
+        //TM { "Turkmenistan" }
+        TN { "Tunis" }
+        //TO { "Tonga" }
+        TR { "Turska" }
+        TT { "Trinidad i Tobago" }
+        //TV { "Tuvalu" }
+        TW { "Tajvan, Kineska Pokrajina" }
+        TZ { "Tanzanija" }
+        UA { "Ukrajina" }
+        //UG { "Uganda" }
+        UM { "Sjedinjene Dr\u017Eave Manji Vanjski Otoci" }
+        US { "Sjedinjene Dr\u017Eave" }
+        UY { "Urugvaj" }
+        //UZ { "Uzbekistan" }
+        VA { "Sveta Stolica (Dr\u017Eava Vatikanskog Grada)" }
+        VC { "Sveti Vincent i Grenadini" }
+        //VE { "Venezuela" }
+        VG { "Britanski Djevi\u010Danski Otoci" }
+        VI { "U.S. Djevi\u010Danski Otoci" }
+        VN { "Vijetnam" }
+        //VU { "Vanuatu" }
+        WF { "Wallis i Futuna" }
+        //WS { "Samoa" }
+        YE { "Jemen" }
+        YT { "Majote" }
+        YU { "Jugoslavija" }
+        ZA { "Ju\u017Ena Afrika" }
+        ZM { "Zambija" }
+        ZW { "Zimbabve" }
+    }
+    Languages {
+        ar { "arapski" }
+        bg { "bugarski" }
+        cs { "\u010De\u0161ki" }
+        da { "danski" }
+        de { "njema\u010Dki" }
+        el { "gr\u010Dki" }
+        en { "engleski" }
+        es { "\u0161panjolski" }
+        et { "estonijski" }
+        fi { "finski" }
+        fr { "francuski" }
+        he { "hebrejski" }
+        hr { "hrvatski" }
+        hu { "ma\u0111arski" }
+        it { "talijanski" }
+        ja { "japanski" }
+        ko { "korejski" }
+        lt { "litvanski" }
+        lv { "latvijski" }
+        nl { "nizozemski" }
+        no { "norve\u0161ki" }
+        pl { "poljski" }
+        pt { "portugalski" }
+        ro { "rumunjski" }
+        ru { "ruski" }
+        sk { "slova\u010Dki" }
+        sl { "slovenski" }
+        sv { "\u0161vedski" }
+        tr { "turski" }
+        zh { "kineski" }
+        //zh_cn { "kineski (pojednostavljeni)" }
+        //zh_tw { "kineski (tradicionalni)" }
     }
     DateTimePatterns { 
         "HH:mm:ss z",
@@ -31,6 +308,10 @@
         "yyyy.MM.dd",
         "{1} {0}",
     }
+    DateTimeElements:intvector {
+        2,
+        1, // "Minimal Days in First Week" is unknown. Root value used instead
+    }
     DayAbbreviations { 
         "ned",
         "pon",
@@ -49,11 +330,6 @@
         "petak",
         "subota",
     }
-    Languages { 
-        hr { "hrvatski" }
-    }
-    LocaleID:int { 0x1a }
-//    LocaleString { "hr" }
     MonthAbbreviations { 
         "sij",
         "vel",
@@ -95,25 +371,17 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "hrv" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
-    }
+
     ExemplarCharacters { "[a-p r-v z \u0111 \u0107 \u010d \u017e \u0161 {lj} {nj} {d\u017e}]" }
-//    LocaleScript:array {
-//        "Latn"  // ISO 15924 Name 
-//    }
+    LocaleScript:array {
+        "Latn"  // ISO 15924 Name 
+    }
 
     // Currency display names
     Currencies {
         HRK { "Kn", "HRK" }
     }
-}
+}
\ No newline at end of file

Index: hr_HR.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/hr_HR.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hr_HR.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ hr_HR.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,12 +7,9 @@
 
 hr_HR {
     Version{ "2.0" }
-//    LocaleString { "hr_HR" }
 //    NumberPatterns { 
 //        "#,##0.###;-#,##0.###",
 //        "\u00A4 #,##0.00;-\u00A4 #,##0.00",
 //        "#,##0%",
 //    }
-//    ShortCountry { "HRV" }
-    LocaleID:int { 0x041a }
 }

Index: hu.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/hu.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hu.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ hu.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,20 +7,445 @@
 
 hu {
     Version{ "2.0" }
-    AmPmMarkers { 
-        "DE",
-        "DU",
-    }
-    CollationElements { 
-        Version { "1.0" }
-        Sequence { "& C < cs <<< cS <<< Cs <<< CS & D < \u0111<<< \u0110 "
-        "& G < gy<<< gY<<< Gy<<< GY & L < ly<<< lY<<< Ly<<< LY"
-        "& O < o\u0308 <<< O\u0308 < o\u030B <<< O\u030B"
-        "& S < sz <<< sZ <<< Sz <<< SZ & U < u\u0308 <<< U\u0308 < u\u030B <<< U\u030B"
-        "& Z < zs <<< zS <<< Zs <<< ZS" }
+    collations {
+        standard { 
+            Version { "2.0" }
+            Sequence {
+                "& C < cs <<< Cs <<< CS"
+                "& D < dz <<< Dz <<< DZ"
+                "& DZ < dzs <<< Dzs <<< DZS"
+                "& G < gy <<< Gy <<< GY"
+                "& L < ly <<< Ly <<< LY"
+                "& N < ny <<< Ny <<< NY"
+                "& S < sz <<< Sz <<< SZ"
+                "& T < ty <<< Ty <<< TY"
+                "& Z < zs <<< Zs <<< ZS"
+
+                // vowels
+                "& O < \u00F6 <<< \u00D6 << \u0151 <<< \u0150"
+                "& U < \u00FC <<< \u00DC << \u0171 <<< \u0170"
+
+                // special contraction/expansions for doubled letters
+                "& cs <<< ccs / cs"
+                "& Cs <<< Ccs / cs"
+                "& CS <<< CCS / CS"
+                "& dz <<< ddz / dz"
+                "& Dz <<< Ddz / dz"
+                "& DZ <<< DDZ / DZ"
+                "& dzs <<< ddzs / dzs"
+                "& Dzs <<< Ddzs / dzs"
+                "& DZS <<< DDZS / DZS"
+                "& gy <<< ggy / gy"
+                "& Gy <<< Ggy / gy"
+                "& GY <<< GGY / GY"
+                "& ly <<< lly / ly"
+                "& Ly <<< Lly / ly"
+                "& LY <<< LLY / LY"
+                "& ny <<< nny / ny"
+                "& Ny <<< Nny / ny"
+                "& NY <<< NNY / NY"
+                "& sz <<< ssz / sz"
+                "& Sz <<< Ssz / sz"
+                "& SZ <<< SSZ / SZ"
+                "& ty <<< tty / ty"
+                "& Ty <<< Tty / ty"
+                "& TY <<< TTY / TY"
+                "& zs <<< zzs / zs"
+                "& Zs <<< Zzs / zs"
+                "& ZS <<< ZZS / ZS"
+            }
+            
+            // Note: b\u00C3\u00A9rcs\u00C3\u00ADk may be ranked before or after b\u00C3\u00A9rczerge depending on its morphology: 
+            // b\u00C3\u00A9r+cs\u00C3\u00ADk (after b\u00C3\u00A9rczerge) or b\u00C3\u00A9rc+s\u00C3\u00ADk (before b\u00C3\u00A9rczerge).
+            // A SHY can be used to make the difference                }
+      }
     }
     Countries { 
+        Fallback{ "en"}
+        //AD { "Andorra" }
+        AE { "Egyes\u00FClt Arab Emir\u00E1tus" }
+        AF { "Afganiszt\u00E1n" }
+        AG { "Antigua \u00E9s Barbuda" }
+        //AI { "Anguilla" }
+        AL { "Alb\u00E1nia" }
+        AM { "\u00D6rm\u00E9nyorsz\u00E1g" }
+        AN { "Holland Antill\u00E1k" }
+        //AO { "Angola" }
+        AQ { "Antarktisz" }
+        AR { "Argent\u00EDna" }
+        AS { "Amerikai Szamoa" }
+        AT { "Ausztria" }
+        AU { "Ausztr\u00E1lia" }
+        //AW { "Aruba" }
+        AZ { "Azerbajdzs\u00E1n" }
+        BA { "Bosznia-Hercegovina" }
+        //BB { "Barbados" }
+        BD { "Banglades" }
+        //BE { "Belgium" }
+        //BF { "Burkina Faso" }
+        BG { "Bulg\u00E1ria" }
+        //BH { "Bahrain" }
+        //BI { "Burundi" }
+        //BJ { "Benin" }
+        //BM { "Bermuda" }
+        BN { "Brunei Darussalam" }
+        BO { "Bol\u00EDvia" }
+        BR { "Braz\u00EDlia" }
+        BS { "Baham\u00E1k" }
+        BT { "Bhut\u00E1n" }
+        BV { "Bouvet-sziget" }
+        //BW { "Botswana" }
+        BY { "Feh\u00E9roroszorsz\u00E1g" }
+        BZ { "Beliz" }
+        CA { "Kanada" }
+        CC { "K\u00F3kusz (Keeling)-szigetek" }
+        CD { "Kong\u00F3, Demokratikus k\u00F6zt\u00E1rsas\u00E1g" }
+        CF { "K\u00F6z\u00E9p-afrikai K\u00F6zt\u00E1rsas\u00E1g" }
+        CG { "Kong\u00F3" }
+        CH { "Sv\u00E1jc" }
+        CI { "Elef\u00E1ntcsontpart" }
+        CK { "Cook-szigetek" }
+        //CL { "Chile" }
+        CM { "Kamerun" }
+        CN { "K\u00EDna" }
+        CO { "Kolumbia" }
+        //CR { "Costa Rica" }
+        CU { "Kuba" }
+        CV { "Z\u00F6ld-foki K\u00F6zt\u00E1rsas\u00E1g" }
+        CX { "Kar\u00E1csony-szigetek" }
+        CY { "Ciprus" }
+        CZ { "Cseh K\u00F6zt\u00E1rsas\u00E1g" }
+        DE { "N\u00E9metorsz\u00E1g" }
+        DJ { "Dzsibuti" }
+        DK { "D\u00E1nia" }
+        DM { "Dominika" }
+        DO { "Dominikai K\u00F6zt\u00E1rsas\u00E1g" }
+        DZ { "Alg\u00E9ria" }
+        //EC { "Ecuador" }
+        EE { "\u00C9sztorsz\u00E1g" }
+        EG { "Egyiptom" }
+        EH { "Nyugat Szahara" }
+        //ER { "Eritrea" }
+        ES { "Spanyolorsz\u00E1g" }
+        ET { "Eti\u00F3pia" }
+        FI { "Finnorsz\u00E1g" }
+        FJ { "Fidzsi" }
+        FK { "Falkland-szigetek" }
+        FM { "Mikron\u00E9zia, Sz\u00F6vets\u00E9gi \u00C1llamok" }
+        FO { "Fer\u00F6er-szigetek" }
+        FR { "Franciaorsz\u00E1g" }
+        //GA { "Gabon" }
+        GB { "Egyes\u00FClt Kir\u00E1lys\u00E1g" }
+        //GD { "Grenada" }
+        GE { "Gr\u00FAzia" }
+        GF { "Francia Guyana" }
+        //GH { "Ghana" }
+        GI { "Gibralt\u00E1r" }
+        GL { "Gr\u00F6nland" }
+        //GM { "Gambia" }
+        //GN { "Guinea" }
+        //GP { "Guadeloupe" }
+        GQ { "Egyenl\u00EDt\u010Fi Guinea" }
+        GR { "G\u00F6r\u00F6gorsz\u00E1g" }
+        GS { "D\u00E9l-Georgia \u00E9s D\u00E9l-Sandwich Szigetek" }
+        //GT { "Guatemala" }
+        //GU { "Guam" }
+        //GW { "Guinea-Bissau" }
+        //GY { "Guyana" }
+        //HK { "Hong Kong S.A.R. of China" }
+        HM { "Heard \u00E9s McDonald Szigetek" }
+        //HN { "Honduras" }
+        HR { "Horv\u00E1torsz\u00E1g" }
+        //HT { "Haiti" }
         HU { "Magyarorsz\u00E1g" }
+        ID { "Indon\u00E9zia" }
+        IE { "\u00CDrorsz\u00E1g" }
+        IL { "Izrael" }
+        //IN { "India" }
+        IO { "Brit Indiai Oce\u00E1n" }
+        IQ { "Irak" }
+        IR { "Ir\u00E1n" }
+        IS { "Izland" }
+        IT { "Olaszorsz\u00E1g" }
+        //JM { "Jamaica" }
+        JO { "Jord\u00E1nia" }
+        JP { "Jap\u00E1n" }
+        //KE { "Kenya" }
+        KG { "Kirgiziszt\u00E1n" }
+        KH { "Kambodzsa" }
+        //KI { "Kiribati" }
+        KM { "Comore-szigetek" }
+        KN { "Saint Kitts \u00E9s Nevis" }
+        KP { "Korea, \u00C9szak" }    // alternate name { "Korea, N\u00E9pi Demokratikus K\u00F6zt\u00E1rsas\u00E1g" }
+        KR { "Korea, D\u00E9l" }    // alternate name { "Koreai K\u00F6zt\u00E1rsas\u00E1g" }
+        //KW { "Kuwait" }
+        KY { "Kajm\u00E1n-szigetek" }
+        KZ { "Kazahszt\u00E1n" }
+        LA { "Laoszi N\u00E9pi Demokratikus K\u00F6zt\u00E1rsas\u00E1g" }
+        LB { "Libanon" }
+        //LC { "Saint Lucia" }
+        //LI { "Liechtenstein" }
+        //LK { "Sri Lanka" }
+        LR { "Lib\u00E9ria" }
+        //LS { "Lesotho" }
+        LT { "Litv\u00E1nia" }
+        LU { "Luxemburg" }
+        LV { "Lettorsz\u00E1g" }
+        LY { "L\u00EDbiai Arab Jamahiriya" }
+        MA { "Marokk\u00F3" }
+        //MC { "Monaco" }
+        MD { "Mold\u00E1v K\u00F6zt\u00E1rsas\u00E1g" }
+        MG { "Madagaszk\u00E1r" }
+        MH { "Marshall-szigetek" }
+        MK { "Maced\u00F3nia, K\u00F6zt\u00E1rsas\u00E1g" }
+        //ML { "Mali" }
+        MM { "Mianmar" }
+        MN { "Mong\u00F3lia" }
+        //MO { "Macao S.A.R. of China" }
+        MP { "\u00C9szaki Mariana-szigetek" }
+        MQ { "Martinique (francia)" }
+        MR { "Maurit\u00E1nia" }
+        //MS { "Montserrat" }
+        MT { "M\u00E1lta" }
+        //MU { "Mauritius" }
+        MV { "Mald\u00EDv-szigetek" }
+        //MW { "Malawi" }
+        MX { "Mexik\u00F3" }
+        MY { "Malajzia" }
+        MZ { "Mozambik" }
+        NA { "Nam\u00EDbia" }
+        NC { "\u00DAj Kaled\u00F3nia (francia)" }
+        //NE { "Niger" }
+        NF { "Norfolk-sziget" }
+        NG { "Nig\u00E9ria" }
+        //NI { "Nicaragua" }
+        NL { "Hollandia" }
+        NO { "Norv\u00E9gia" }
+        NP { "Nep\u00E1l" }
+        //NR { "Nauru" }
+        //NU { "Niue" }
+        NZ { "\u00DAj-Z\u00E9land" }
+        OM { "Om\u00E1n" }
+        //PA { "Panama" }
+        //PE { "Peru" }
+        PF { "Polin\u00E9zia (francia)" }
+        PG { "P\u00E1pua \u00DAj-Guinea" }
+        PH { "F\u00FCl\u00F6p-szigetek" }
+        PK { "Pakiszt\u00E1n" }
+        PL { "Lengyelorsz\u00E1g" }
+        PM { "Saint Pierre \u00E9s Miquelon" }
+        PN { "Pitcairn-sziget" }
+        //PR { "Puerto Rico" }
+        PS { "Paleszt\u00EDn Ter\u00FClet" }
+        PT { "Portug\u00E1lia" }
+        //PW { "Palau" }
+        //PY { "Paraguay" }
+        QA { "Katar" }
+        RE { "Reunion (francia)" }
+        RO { "Rom\u00E1nia" }
+        RU { "Orosz K\u00F6zt\u00E1rsas\u00E1g" }
+        RW { "Ruanda" }
+        SA { "Szaud-Ar\u00E1bia" }
+        SB { "Salamon-szigetek" }
+        //SC { "Seychelles" }
+        SD { "Szud\u00E1n" }
+        SE { "Sv\u00E9dorsz\u00E1g" }
+        SG { "Szingap\u00FAr" }
+        //SH { "Saint Helena" }
+        SI { "Szlov\u00E9nia" }
+        SJ { "Svalbard \u00E9s Jan Mayen" }
+        SK { "Szlov\u00E1kia" }
+        //SL { "Sierra Leone" }
+        //SM { "San Marino" }
+        SN { "Szeneg\u00E1l" }
+        SO { "Szom\u00E1lia" }
+        //SR { "Suriname" }
+        ST { "Saint Tome \u00E9s Principe" }
+        //SV { "El Salvador" }
+        SY { "Sz\u00EDriai Arab K\u00F6zt\u00E1rsas\u00E1g" }    // alternate name { "Sz\u00EDria" }
+        SZ { "Szv\u00E1zif\u00F6ld" }
+        TC { "T\u00F6r\u00F6k \u00E9s Caicos Szigetek" }
+        TD { "Cs\u00E1d" }
+        TF { "Francia D\u00E9li Ter\u00FCletek" }
+        //TG { "Togo" }
+        TH { "Thaif\u00F6ld" }
+        TJ { "Tadzsikiszt\u00E1n" }
+        //TK { "Tokelau" }
+        TL { "Kelet-Timor" }
+        TM { "T\u00FCrkmeniszt\u00E1n" }
+        TN { "Tun\u00E9zia" }
+        //TO { "Tonga" }
+        TR { "T\u00F6r\u00F6korsz\u00E1g" }
+        TT { "Trinidad \u00E9s Tobago" }
+        //TV { "Tuvalu" }
+        //TW { "Taiwan" }
+        TZ { "Tanz\u00E1nia" }
+        UA { "Ukrajna" }
+        //UG { "Uganda" }
+        //UM { "United States Minor Outlying Islands" }
+        US { "Egyes\u00FClt \u00C1llamok" }
+        //UY { "Uruguay" }
+        UZ { "\u00DCzbegiszt\u00E1n" }
+        VA { "Vatik\u00E1n" }
+        VC { "Saint Vincent \u00E9s Grenadines" }
+        //VE { "Venezuela" }
+        VG { "Brit Virgin-szigetek" }
+        VI { "U.S. Virgin-szigetek" }
+        VN { "Vietn\u00E1m" }
+        //VU { "Vanuatu" }
+        WF { "Wallis \u00E9s Futuna Szigetek" }
+        WS { "Szamoa" }
+        YE { "Jemen" }
+        //YT { "Mayotte" }
+        YU { "Jugoszl\u00E1via" }
+        ZA { "D\u00E9l-Afrika" }
+        //ZM { "Zambia" }
+        //ZW { "Zimbabwe" }
+    }
+    Languages { 
+        aa { "afar" }
+        ab { "abh\u00E1z" }
+        af { "afrikai" }
+        am { "amhara" }
+        ar { "arab" }
+        as { "assz\u00E1mi" }
+        ay { "ajmara" }
+        az { "azerbajdzs\u00E1ni" }
+        ba { "bask\u00EDr" }
+        be { "belorusz" }
+        bg { "bolg\u00E1r" }
+        bh { "bihari" }
+        bi { "bislama" }
+        bn { "beng\u00E1li" }
+        bo { "tibeti" }
+        br { "breton" }
+        ca { "katal\u00E1n" }
+        co { "korzikai" }
+        cs { "cseh" }
+        cy { "walesi" }
+        da { "d\u00E1n" }
+        de { "n\u00E9met" }
+        dz { "but\u00E1ni" }
+        el { "g\u00F6r\u00F6g" }
+        en { "angol" }
+        eo { "eszperant\u00F3" }
+        es { "spanyol" }
+        et { "\u00E9szt" }
+        eu { "baszk" }
+        fa { "perzsa" }
+        fi { "finn" }
+        fj { "fidzsi" }
+        fo { "fer\u00F6eri" }
+        fr { "francia" }
+        fy { "fr\u00EDz" }
+        ga { "\u00EDr" }
+        gd { "sk\u00F3t (gael)" }
+        gl { "gal\u00EDciai" }
+        gn { "guarani" }
+        gu { "gudzsar\u00E1ti" }
+        ha { "hausza" }
+        he { "h\u00E9ber" }
+        hi { "hindi" }
+        hr { "horv\u00E1t" }
+        hu { "magyar" }
+        hy { "\u00F6rm\u00E9ny" }
+        ia { "interlingua" }
+        id { "indon\u00E9z" }
+        ie { "interlingue" }
+        ik { "inupiak" }
+        is { "izlandi" }
+        it { "olasz" }
+        iu { "inuktitut" }
+        ja { "jap\u00E1n" }
+        jv { "j\u00E1vai" }
+        ka { "gr\u00FAz" }
+        kk { "kazah" }
+        kl { "gr\u00F6nlandi" }
+        km { "kambodzsai" }
+        kn { "kannada" }
+        ko { "koreai" }
+        ks { "kasm\u00EDri" }
+        ku { "kurd" }
+        ky { "kirgiz" }
+        la { "latin" }
+        ln { "lingala" }
+        lo { "laoszi" }
+        lt { "litv\u00E1n" }
+        lv { "lett" }
+        mg { "madagaszk\u00E1ri" }
+        mi { "maori" }
+        mk { "maced\u00F3n" }
+        ml { "malajalam" }
+        mn { "mongol" }
+        mo { "moldvai" }
+        mr { "marati" }
+        ms { "mal\u00E1j" }
+        mt { "m\u00E1ltai" }
+        my { "burmai" }
+        na { "naurui" }
+        ne { "nep\u00E1li" }
+        nl { "holland" }
+        no { "norv\u00E9g" }
+        oc { "okszit\u00E1n" }
+        om { "orom\u00F3i" }
+        or { "orija" }
+        pa { "pandzs\u00E1bi" }
+        pl { "lengyel" }
+        ps { "pastu (afg\u00E1n)" }
+        pt { "portug\u00E1l" }
+        qu { "kecsua" }
+        rm { "r\u00E9torom\u00E1n" }
+        rn { "kirundi" }
+        ro { "rom\u00E1n" }
+        ru { "orosz" }
+        rw { "kiruanda" }
+        sa { "szanszkrit" }
+        sd { "szindi" }
+        sg { "sango" }
+        sh { "szerb-horv\u00E1t" }
+        si { "szingal\u00E9z" }
+        sk { "szlov\u00E1k" }
+        sl { "szlov\u00E9n" }
+        sm { "szamoai" }
+        sn { "sona" }
+        so { "szom\u00E1li" }
+        sq { "alb\u00E1n" }
+        sr { "szerb" }
+        ss { "sziszuati" }
+        st { "szeszot\u00F3" }
+        su { "szundan\u00E9z" }
+        sv { "sv\u00E9d" }
+        sw { "szuah\u00E9li" }
+        ta { "tamil" }
+        te { "telugu" }
+        tg { "tadzsik" }
+        th { "thai" }
+        ti { "tigrinya" }
+        tk { "t\u00FCrkm\u00E9n" }
+        tl { "tagalog" }
+        tn { "szecsu\u00E1ni" }
+        to { "tonga" }
+        tr { "t\u00F6r\u00F6k" }
+        ts { "conga" }
+        tt { "tat\u00E1r" }
+        tw { "tui" }
+        ug { "ujgur" }
+        uk { "ukr\u00E1n" }
+        ur { "urdu" }
+        uz { "\u00FCzb\u00E9g" }
+        vi { "vietn\u00E1mi" }
+        vo { "volap\u00FCk" }
+        wo { "volof" }
+        xh { "hosza" }
+        yi { "zsid\u00F3" }
+        yo { "joruba" }
+        za { "zsuang" }
+        zh { "k\u00EDnai" }
+        zu { "zulu" }
+    }
+    AmPmMarkers { 
+        "DE",
+        "DU",
     }
     DateTimePatterns { 
         "H:mm:ss z",
@@ -59,11 +484,6 @@
         "i.e.",
         "i.u.",
     }
-    Languages { 
-        hu { "magyar" }
-    }
-    LocaleID:int { 0x0e }
-//    LocaleString { "hu" }
     MonthAbbreviations { 
         "jan.",
         "febr.",
@@ -105,22 +525,17 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "hun" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
+
+    LocaleScript{
+        "Latn",  // ISO 15924 Name 
     }
-//    LocaleScript{
-//        "Latn",  // ISO 15924 Name 
-//    }
-    ExemplarCharacters { "[a-z \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u00f6 \u00fc \u0151 \u0171]" }
+
+    ExemplarCharacters { "[a-z \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u00f6 \u00fc \u0151 \u0171"
+                         " {cs} {dz} {dzs} {gy} {ly} {ny} {sz} {ty} {zs} {ccs} {ddz} {ddzs}"
+                         " {ggy} {lly} {nny} {ssz} {tty} {zzs}]" }
 
     // Currency display names
     Currencies {
@@ -129,4 +544,60 @@
 
     // (ICU 2.6) International Calendar Data.  Note, THE FORMAT OF THIS DATA WILL CHANGE IN FUTURE RELEASES.
     Eras_buddhist:array { "BK" }
+
+    // Islamic calendar
+    Eras_islamic:array { 
+            "MF"
+
+    }
+
+    MonthNames_islamic {
+        "Moharrem",                 // Muharram
+        "Safar",                    // Safar
+        "R\u00E9bi el avvel",       // Rabi' al-awwal
+        "R\u00E9bi el accher",      // Rabi' al-thani
+        "Dsem\u00E1di el avvel",    // Jumada al-awwal
+        "Dsem\u00E1di el accher",   // Jumada al-thani
+        "Redseb",                   // Rajab
+        "Sab\u00E1n",               // Sha'ban
+        "Ramad\u00E1n",             // Ramadan
+        "Sevv\u00E1l",              // Shawwal
+        "Ds\u00FCl kade",           // Dhu al-Qi'dah
+        "Ds\u00FCl hedse",          // Dhu al-Hijjah
+    }
+    MonthAbbreviations_islamic:alias {  // same as MonthNames (no data)
+        "hu/MonthNames_islamic"
+    }   
+    // Civil is identical other than in calculations
+    Eras_islamic-civil:alias {
+        "hu/Eras_islamic"
+    }
+    MonthNames_islamic-civil:alias {
+        "hu/MonthNames_islamic"
+    }
+    MonthAbbreviations_islamic-civil:alias {
+        "hu/MonthAbbreviations_islamic"
+    }
+    MonthNames_hebrew {
+        "Tisri",                        // Tishri
+        "Hesv\u00E1n",                  // Heshvan
+        "Kiszl\u00E9v",                 // Kislev
+        "T\u00E9v\u00E9sz",             // Tevet
+        "Sv\u00E1t",                    // Shevat
+        "\u00C1d\u00E1r ris\u00F3n",    // Adar I
+        "\u00C1d\u00E1r s\u00E9ni",     // Adar
+        "Nisz\u00E1n",                  // Nisan
+        "Ij\u00E1r",                    // Iyar
+        "Sziv\u00E1n",                  // Sivan
+        "Tamuz",                        // Tamuz
+        "\u00C1v",                      // Av
+        "Elul",                         // Elul
+    }
+    MonthAbbreviations_hebrew:alias {
+       "hu/MonthNames_hebrew" // no data
+    }
+    Eras_hebrew:array {
+        "T\u00C9"
+    }
+
 }

Index: hu_HU.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/hu_HU.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hu_HU.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ hu_HU.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,13 +7,10 @@
 
 hu_HU {
     Version{ "2.0" }
-//    LocaleString { "hu_HU" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
-        "\u00A4#,##0.00;-\u00A4#,##0.00",
+        "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "HUN" }
-    LocaleID:int { 0x040e }
 }

Index: hy.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/hy.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hy.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ hy.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -85,11 +85,9 @@
     Languages{
       hy { "\u0540\u0561\u0575\u0565\u0580\u0567\u0576" }
     }
-//    LocaleString{ "hy" }
-    LocaleID:int { 0x2b }
 
     // /**************** Info Below is needed ****************/
-    // CollationElements{}    // To be supplied from Unicode
+    // collations{}    // To be supplied from Unicode
     //
 
     DateTimePatterns {
@@ -97,13 +95,18 @@
         "HH:mm:ss z",
         "HH:mm:ss",
         "HH:mm",
-        "EEEE,MMMM d, yyyy",
+        "EEEE, MMMM d, yyyy",
         "MMMM dd, yyyy",
         "MMM d, yyyy",
         "MM/dd/yy",
         "{1} {0}",
     }
 
+    DateTimeElements:intvector {
+        2,
+        1, // "Minimal Days in First Week" is unknown. Root value used instead
+    }
+
 //    localPatternChars{ "GyMdkHmsSEDFwWahKz" }
 
     NumberPatterns{
@@ -125,5 +128,6 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
 }

Index: hy_AM.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/hy_AM.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hy_AM.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ hy_AM.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// *   Copyright (C) 2001-2002, International Business Machines
+// *   Copyright (C) 2001-2003, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
 // *   Data by :
@@ -13,13 +13,10 @@
 
 hy_AM{
     Version { "1.0" }
-
-//    LocaleString { "hy_AM" }
     Eras {
         "\u0554\u2024\u0531\u2024",      // K.A.
         "\u0554\u2024\u0535\u2024"       // K.E.
     }
-    LocaleID:int { 0x042b }
 }
 
 

Index: id.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/id.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- id.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ id.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -4,17 +4,290 @@
 // *   Corporation and others.  All Rights Reserved.
 // *
 // ***************************************************************************
+//
+// Significant contributions from Mohammad DAMT
+
 
 id {
     Version { "2.0" }
+    Countries {
+        AD { "Andora" }
+        AE { "Uni Emirat Arab" }
+        AF { "Afghanistan" }
+        AG { "Antigua dan Barbuda" }
+        AI { "Anguilla" }
+        AL { "Albania" }
+        AM { "Armenia" }
+        AN { "Antilles Belanda" }
+        AO { "Angola" }
+        AQ { "Antarktika" }
+        AR { "Argentina" }
+        AS { "Samoa Amerika" }
+        AT { "Austria" }
+        AU { "Australia" }
+        AW { "Aruba" }
+        AZ { "Azerbaijan" }
+
+        BA { "Bosnia dan Herzegovina" }
+        BB { "Barbados" }
+        BD { "Bangladesh" }
+        BE { "Belgia" }
+        BF { "Burkina Faso" }
+        BG { "Bulgaria" }
+        BH { "Bahrain" }
+        BI { "Burundi" }
+        BJ { "Benin" }
+        BM { "Bermuda" }
+        BN { "Brunei" }
+        BO { "Bolivia" }
+        BR { "Brazil" }
+        BS { "Bahamas" }
+        BT { "Bhutan" }
+        BV { "Kepulauan Bouvet" }
+        BW { "Botswana" }
+        BY { "Belarusia" }
+        BZ { "Belize" }
+
+        CA { "Kanada" }
+        CC { "Kepulauan Cocos"}
+        CD { "Republik Demokratik Kongo" }
+        CF { "Republik Afrika Tengah" }
+        CG { "Kongo" }
+        CH { "Swiss" }
+        CI { "Pantai Gading" }
+        CK { "Kepulauan Cook" }
+        CL { "Chili" }
+        CM { "Kamerun" }
+        CN { "Cina" }
+        CO { "Kolombia" }
+        CR { "Kosta Rika" }
+        CU { "Kuba" }
+        CV { "Tanjung Verde" }
+        CX { "Pulau Christmas" }
+        CY { "Siprus" }
+        CZ { "Republik Ceko" }
+
+        DE { "Jerman" }
+        DJ { "Jibouti" }
+        DK { "Denmark" }
+        DM { "Dominika" }
+        DO { "Republik Dominika" }
+        DZ { "Algeria" }
+
+        EC { "Ekuador" }
+        EE { "Estonia" }
+        EG { "Mesir" }
+        EH { "Sahara Barat" }
+        ER { "Eritrea" }
+        ES { "Spanyol" }
+        ET { "Ethiopia" }
+
+        FI { "Finlandia" }
+        FJ { "Fiji" }
+        FK { "Kepulauan Falkland" }
+        FM { "Mikronesia" }
+        FO { "Kepulauan Faroe" }
+        FR { "Perancis" }
+
+        GA { "Gabon" }
+        GB { "Inggris Raya" }
+        GD { "Grenada" }
+        GE { "Georgia" }
+        GF { "Guyana Perancis" }
+        GH { "Ghana" }
+        GI { "Gibraltar" }
+        GL { "Greenland" }
+        GM { "Gambia" }
+        GN { "Guinea" }
+        GP { "Guadeloupe" }
+        GQ { "Guinea Khatulistiwa" }
+        GR { "Yunani" }
+        GS { "Georgia Selatan dan Kepulauan Sandwich Selatan" }
+        GT { "Guatemala" }
+        GU { "Guam" }
+        GW { "Guinea-Bissau" }
+        GY { "Guyana" }
+
+        HK { "Hong Kong S.A.R., Cina" }
+        HM { "Pulau Heard dan Kepulauan McDonald" }
+        HN { "Honduras" }
+        HR { "Kroasia" }
+        HT { "Haiti" }
+        HU { "Hungaria" }
+
+        ID { "Indonesia" }
+        IE { "Irlandia" }
+        IL { "Israel" }
+        IN { "India" }
+        //IO { "British Indian Ocean Territory" }
+        IQ { "Iraq" }
+        IR { "Iran" }
+        IS { "Islandia" }
+        IT { "Itali" }
+
+        JM { "Jamaika" }
+        JO { "Yordania" }
+        JP { "Jepang" }
+
+        KE { "Kenya" }
+        KG { "Kyrgyzstan" }
+        KH { "Kamboja" }
+        KI { "Kiribati" }
+        KM { "Komoros" }
+        KN { "Saint Kitts dan Nevis" }
+        KP { "Korea Utara" }
+        KR { "Korea Selatan" }
+        KW { "Kuwait" }
+        KY { "Kepulauan Kayman" }
+        KZ { "Kazakhstan" }
+
+        LA { "Laos" }
+        LB { "Lebanon" }
+        LC { "Santa Lusia" }
+        LI { "Liechtenstein" }
+        LK { "Sri Lanka" }
+        LR { "Liberia" }
+        LS { "Lesotho" }
+        LT { "Lithuania" }
+        LU { "Luxembourg" }
+        LV { "Latvia" }
+        LY { "Libya" }
+
+        MA { "Maroko" }
+        MC { "Monaco" }
+        MD { "Moldova" }
+        MG { "Madagaskar" }
+        MH { "Kepulauan Marshall"}
+        MK { "Macedonia" }
+        ML { "Mali" }
+        MM { "Myanmar" }
+        MN { "Mongolia" }
+        MO { "Makao S.A.R. Cina" }
+        MP { "Kepualuan Mariana Utara" }
+        MQ { "Martinique" }
+        MR { "Mauritania" }
+        MS { "Montserrat" }
+        MT { "Malta" }
+        MU { "Mauritius" }
+        MV { "Maldives" }
+        MW { "Malawi" }
+        MX { "Mexico" }
+        MY { "Malaysia" }
+        MZ { "Mozambique" }
+
+        NA { "Namibia" }
+        NC { "Kaledonia Baru" }
+        NE { "Niger" }
+        NF { "Kepulauan Norfolk" }
+        NG { "Nigeria" }
+        NI { "Nicaragua" }
+        NL { "Netherlands" }
+        NO { "Norwegia" }
+        NP { "Nepal" }
+        NR { "Nauru" }
+        NU { "Niue" }
+        NZ { "Selandia Baru" }
+
+        OM { "Oman" }
+
+        PA { "Panama" }
+        PE { "Peru" }
+        PF { "Polynesia Perancis" }
+        PG { "Papua Nugini" }
+        PH { "Filipina" }
+        PK { "Pakistan" }
+        PL { "Polandia" }
+        PM { "Saint Pierre dan Miquelon" }
+        PN { "Pitcairn" }
+        PR { "Puerto Riko" }
+        PS { "Otoritas Palestina" }
+        PT { "Portugis" }
+        PW { "Palau" }
+        PY { "Paraguay" }
+
+        QA { "Qatar" }
+
+        RE { "R\u00E9union" }
+        RO { "Romania" }
+        RU { "Rusia" }
+        RW { "Rwanda" }
+
+        SA { "Arab Saudi" }
+        SB { "Kepulauan Solomon" }
+        SC { "Seychelles" }
+        SD { "Sudan" }
+        SE { "Sweden" }
+        SG { "Singapura" }
+        SH { "Saint Helena" }
+        SI { "Slovenia" }
+        SJ { "Svalbard dan Jan Mayen" }
+        SK { "Slovakia" }
+        SL { "Sierra Leone" }
+        SM { "San Marino" }
+        SN { "Senegal" }
+        SO { "Somalia" }
+        SP { "Serbia" }
+        SR { "Suriname" }
+        ST { "Sao Tome dan Principe" }
+        SV { "El Salvador" }
+        SY { "Syria" }
+        SZ { "Swaziland" }
+
+        //TC { "Turks and Caicos Islands" }
+        TD { "Chad" }
+        //TF { "French Southern Territories" }
+        TG { "Togo" }
+        TH { "Thailand" }
+        TJ { "Tajikistan" }
+        TK { "Tokelau" }
+        //TL { "Timor-Leste" }    // This was called East Timor
+        TM { "Turkmenistan" }
+        TN { "Tunisia" }
+        TO { "Tonga" }
+        TR { "Turkey" }
+        TT { "Trinidad dan Tobago" }
+        TV { "Tuvalu" }
+        TW { "Taiwan" }
+        TZ { "Tanzania" }
+
+        UA { "Ukraina" }
+        UG { "Uganda" }
+        //UM { "United States Minor Outlying Islands" }
+        US { "Amerika Serikat" }
+        UY { "Uruguay" }
+        UZ { "Uzbekistan" }
+
+        VA { "Vatikan" }
+        VC { "Saint Vincent dan Grenadines" }
+        VE { "Venezuela" }
+        VG { "Kepulauan British Virgin" }
+        VI { "Kepulauan U.S. Virgin" }
+        VN { "Vietnam" }
+        VU { "Vanuatu" }
+
+        WF { "Wallis dan Futuna" }
+        WS { "Samoa" }
+
+        YE { "Yaman" }
+        YT { "Mayotte" }
+        YU { "Yugoslavia" }
+
+        ZA { "Afrika Selatan" }
+        ZM { "Zambia" }
+        ZW { "Zimbabwe" }
+    }
+    // Currency display names
+    Currencies {
+        IDR { "Rp", "IDR" }
+    }
     DayAbbreviations {
-        "Minggu",
+        "Min",
         "Sen",
         "Sel",
-        "Rabu",
-        "Kamis",
-        "Jumat",
-        "Sabtu",
+        "Rab",
+        "Kam",
+        "Jum",
+        "Sab",
     }
     DayNames {
         "Minggu",
@@ -33,7 +306,7 @@
         "Mei",
         "Jun",
         "Jul",
-        "August",
+        "Agu",
         "Sep",
         "Okt",
         "Nov",
@@ -53,6 +326,242 @@
         "November",
         "Desember",
     }
+    Languages {
+        aa  { "Afar" }
+        ab  { "Abkhaz" }
+        ace { "Aceh" }
+        ae  { "Avestan" }
+        af  { "Afrikaans" }
+        afa { "Afro-Asiatik (Lainnya)" }
+        ak  { "Akan" }
+        akk { "Akkadien" }
+        alg { "Bahasa Algonquia" }
+        am  { "Amharik" }
+        ang { "Inggris Kuno (kl.450-1100)" }
+        apa { "Bahasa-bahasa Apache"}
+        ar  { "Arab" }
+        arc { "Aram" }
+        arn { "Araucan" }
+        art { "Buatan (Lainnya)" }
+        as  { "Assam" }
+        ast { "Astur" }
+        ath { "Bahasa-bahasa Athapaska" }
+        aus { "Bahasa-bahasa Australia" }
+        av  { "Avarik" }
+        ay  { "Aymara" }
+        az  { "Azerbaijan" }
+        ba  { "Bashkir" }
+        bai { "Bahasa-bahasa Bamileke" }
+        ban { "Balin" }
+        bat { "Baltik (Lainnya)" }
+        be  { "Belarusia" }
+        bg  { "Bulgaria" }
+        bh  { "Bihari" }
+        bi  { "Bislama" }
+        bm  { "Bambara" }
+        bn  { "Bengal" }
+        bo  { "Tibet" }
+        br  { "Breton" }
+        bs  { "Bosnia"}
+        bug { "Bugis" }
+        ca  { "Catalan" }
+        cai { "India Amerika Tengah (Lainnnya)" }
+        car { "Karib" }
+        cau { "Kaukasia (Lainnya)" }
+        ce  { "Chechen" }
+        cel { "Celtic (Lainnya)" }
+        ch  { "Chamorro" }
+        chk { "Chuuke" }
+        co  { "Korsika" }
+        cop { "Koptik" }
+        cr  { "Cree" }
+        cs  { "Ceko" }
+        cv  { "Chuvash" }
+        cy  { "Welsh" }
+        da  { "Denmark" }
+        de  { "Jerman" }
+        dv  { "Divehi" }
+        dz  { "Dzongkha" }
+        ee  { "Ewe" }
+        egy { "Mesir Kuno" }
+        el  { "Yunani" } //  Modern (1453-)
+        en  { "Inggris" }
+        enm { "Inggris, Abad Pertengahan (1100-1500)" }
+        eo  { "Esperanto" }
+        es  { "Spanyol" }
+        et  { "Estonian" }
+        eu  { "Basque" }
+        fa  { "Persia" }
+        ff  { "Fulah" }
+        fi  { "Finlandia" }
+        fj  { "Fiji" }
+        fo  { "Faro" }
+        fr  { "Perancis" }
+        frm { "Perancis, Abad Pertengahan (kl.1400-1600)" }
+        fro { "Perancis Kuno (842-kl.1400)" }
+        fur { "Friuli" }
+        fy  { "Frisi" }
+        ga  { "Irlandia" }
+        gd  { "Gaelik Skotlandia" }
+        gem { "Jermanik (Lainnya)" }
+        gil { "Gilbert" }
+        gl  { "Gallegan" }
+        gmh { "Jerman, Abad Pertengahan (kl.1050-1500)" }
+        gn  { "Guarani" }
+        goh { "Jerman Kuno (kl.750-1050)" }
+        got { "Gothik" }
+        grc { "Yunani Kuno (sd 1453)" }
+        gu  { "Gujarati" }
+        gv  { "Manx" }
+        ha  { "Hausa" }
+        haw { "Hawaii" }
+        he  { "Ibrani" }
+        hi  { "Hindi" }
+        ho  { "Hiri Motu" }
+        hr  { "Kroasia" }
+        hu  { "Hungaria" }
+        hy  { "Armenia" }
+        hz  { "Herero" }
+        ia  { "Interlingua" }
+        id  { "Bahasa Indonesia" }
+        ie  { "Interlingue" }
+        ig  { "Igbo" }
+        ii  { "Sichuan Yi" }
+        ik  { "Inupiaq" }
+        io  { "Ido" }
+        is  { "Icelandic" }
+        it  { "Italian" }
+        ja  { "Japanese" }
+        jpr { "Judeo-Persia" }
+        jrb { "Judeo-Arab" }
+        jv  { "Jawa" }
+        ka  { "Georgian" }
+        kg  { "Kongo" }
+        ki  { "Kikuyu" }
+        kj  { "Kuanyama" }
+        kk  { "Kazakh" }
+        kl  { "Kalaallisut" }
+        km  { "Khmer" }
+        kn  { "Kannada" }
+        ko  { "Korea" }
+        kok { "Konkani" }
+        kos { "Kosrae" }
+        kr  { "Kanuri" }
+        ks  { "Kashmir" }
+        ku  { "Kurdi" }
+        kv  { "Komi" }
+        kw  { "Cornish" }
+        ky  { "Kirghiz" }
+        la  { "Latin" }
+        lb  { "Luxembourg" }
+        lez { "Lezghia" }
+        lg  { "Ganda" }
+        li  { "Limburg" }
+        ln  { "Lingala" }
+        lo  { "Lao" }
+        lt  { "Lithuania" }
+        lu  { "Luba-Katanga" }
+        lv  { "Latvian" }
+        mad { "Madura" }
+        mak { "Makassar" }
+        map { "Austronesia" }
+        mg  { "Malagasi" }
+        mga { "Irlandia Abad Pertengahan (900-1200)" }
+        mh  { "Marshall"}
+        mi  { "Maori" }
+        mis { "Bahasa Lain-lain" }
+        mk  { "Macedonian" }
+        mkh { "Mon-Khmer (Lainnya)" }
+        ml  { "Malayalam" }
+        mn  { "Mongolian" }
+        mo  { "Moldavian" }
+        mr  { "Marathi" }
+        ms  { "Malay" }
+        mt  { "Maltese" }
+        my  { "Burma" }
+        na  { "Nauru" }
+        nb  { "Norwegian Bokm\u00e5l" }
+        ne  { "Nepal" }
+        ng  { "Ndonga" }
+        nl  { "Belanda" }
+        nn  { "Norwegian Nynorsk" }
+        no  { "Norwegian" }
+        nv  { "Navajo"}
+        ny  { "Nyanja; Chichewa; Chewa" }
+        oj  { "Ojibwa" }
+        om  { "Oromo" }
+        or  { "Oriya" }
+        os  { "Ossetic" }
+        pa  { "Punjabi" }
+        paa { "Papuan (Lainnya)" }
+        peo { "Persia Kuno (kl.600-400 SM.)" }
+        phi { "Filipina (Lainnya)" }
+        pi  { "Pali" }
+        pl  { "Polish" }
+        ps  { "Pashto (Pushto)" }
+        pt  { "Portugis" }
+        qu  { "Quechua" }
+        // The range qaa-qtz is reserved for local use.
+        rm  { "Rhaeto-Romance" }
+        rn  { "Rundi" }
+        ro  { "Romanian" }
+        ru  { "Russian" }
+        rw  { "Kinyarwanda" }
+        sa  { "Sanskrit" }
+        sc  { "Sardinian" }
+        sd  { "Sindhi" }
+        se  { "Northern Sami" }
+        sg  { "Sango" }
+        sh  { "Serbo-Croatian" }
+        si  { "Sinhalese" }
+        sk  { "Slovak" }
+        sl  { "Slovenian" }
+        sm  { "Samoan" }
+        sn  { "Shona" }
+        so  { "Somali" }
+        sq  { "Albanian" }
+        sr  { "Serbian" }
+        ss  { "Swati" }
+        su  { "Sundan" }
+        sux { "Sumeria"}
+        sv  { "Swedia" }
+        sw  { "Swahili" }
+        syr { "Syria" }
+        ta  { "Tamil" }
+        te  { "Telugu" }
+        tg  { "Tajik" }
+        th  { "Thai" }
+        ti  { "Tigrinya" }
+        tk  { "Turkmen" }
+        tl  { "Tagalog" }
+        tn  { "Tswana" }
+        tr  { "Turkish" }
+        ts  { "Tsonga" }
+        tt  { "Tatar" }
+        tw  { "Twi" }
+        ty  { "Tahitian" }
+        ug  { "Uighur" }
+        uk  { "Ukrainian" }
+        ur  { "Urdu" }
+        uz  { "Uzbek" }
+        ve  { "Venda" }
+        vi  { "Vietnamese" }
+        vo  { "Volap\u00FCk" }   // Yes the iso-639 standard uses the umlaut in the English name
+        wa  { "Walloon" }
+        wo  { "Wolof" }
+        xh  { "Xhosa" }
+        yi  { "Yiddish" }
+        yo  { "Yoruba" }
+        za  { "Zhuang" }
+        zh  { "Cina" }
+        zu  { "Zulu" }
+    }
+    LocaleScript:array{ 
+       "Latn",  // ISO 15924 Name 
+    }
+    ExemplarCharacters{
+       "[a-z]"
+    }
     NumberElements {
         ",",
         ".",
@@ -66,6 +575,7 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
     NumberPatterns {
         "#,##0.###;-#,##0.###",
@@ -73,21 +583,9 @@
         "#,##0%",
         "#E0",
     }
-    LocaleID:int { 0x21 }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
     // /**************** Info Below is needed ****************/
-    // CollationElements{}
-    // Countries{}
+    // collations{}
+    // AmPmMarkers{}
     // Eras{}
-    // Languages{}
-    // ShortLanguage { }
     // localPatternChars{}
-    //
-
-    // Currency display names
-    Currencies {
-        IDR { "Rp", "IDR" }
-    }
-}
+}
\ No newline at end of file

Index: id_ID.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/id_ID.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- id_ID.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ id_ID.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -6,7 +6,7 @@
 // *******************************************************************************
 
 id_ID {
-   Version { "2.0" }
+    Version { "2.0" }
     DateTimePatterns {
         "H:mm:ss",
         "H:mm:ss",
@@ -18,5 +18,4 @@
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x0421 }
 }

Index: is.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/is.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- is.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ is.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -1,4 +1,4 @@
-// ***************************************************************************
+// ***************************************************************************
 // *
 // *   Copyright (C) 1997-2003, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
@@ -7,12 +7,20 @@
 
 is {
     Version{ "2.0" }
-    CollationElements { 
-        Version { "1.0" }
-        Sequence { "@& A < a\u0301<<< A\u0301 & D < \u00F0<<< \u00D0& E < e\u0301"
-        "<<< E\u0301 & I < i\u0301<<< I\u0301 & O < o\u0301<<< O\u0301 & U < u\u0301<<< U\u0301 "
-        "& Y < y\u0301<<< Y\u0301 & Z < \u00fe<<< \u00DE < \u00E6<<< \u00C6< o\u0308<<< O\u0308"
-        " << \u00F8<<< \u00D8" }
+    collations {
+      standard { 
+        Version { "2.0" }
+        Sequence { 
+            "&[before 1]b<á<<<Á"
+            "&[before 1]d<<đ<<<Đ<ð<<<Ð"
+            "&[before 1]f<é<<<É"
+            "&[before 1]j<í<<<Í"
+            "&[before 1]p<ó<<<Ó"
+            "&[before 1]v<ú<<<Ú "
+            "&[before 1]z<ý<<<Ý"
+            "&[before 1]ʒ<þ<<<Þ<æ<<<Æ<<ä<<<Ä<ö<<<Ö<<ø<<<Ø<å<<<Å"
+           }
+      }
     }
     Countries { 
         IS { "\u00CDsland" }
@@ -22,20 +30,20 @@
         "HH:mm:ss z",
         "HH:mm:ss",
         "HH:mm",
-        "d. MMMM yyyy",
+        "EEEE, d. MMMM yyyy",
         "d. MMMM yyyy",
         "d.M.yyyy",
         "d.M.yyyy",
         "{1} {0}",
     }
     DayAbbreviations { 
-        "sun.",
-        "m\u00E1n.",
-        "\u00FEri.",
-        "mi\u00F0.",
-        "fim.",
-        "f\u00F6s.",
-        "lau.",
+        "sun",
+        "m\u00E1n",
+        "\u00FEri",
+        "mi\u00F0",
+        "fim",
+        "f\u00F6s",
+        "lau",
     }
     DayNames { 
         "sunnudagur",
@@ -49,21 +57,19 @@
     Languages { 
         is { "\u00EDslenska" }
     }
-    LocaleID:int { 0x0f }
-//    LocaleString { "is" }
     MonthAbbreviations { 
-        "jan.",
-        "feb.",
-        "mar.",
-        "apr.",
+        "jan",
+        "feb",
+        "mar",
+        "apr",
         "ma\u00ED",
-        "j\u00FAn.",
-        "j\u00FAl.",
-        "\u00E1g\u00FA.",
-        "sep.",
-        "okt.",
-        "n\u00F3v.",
-        "des.",
+        "j\u00FAn",
+        "j\u00FAl",
+        "\u00E1g\u00FA",
+        "sep",
+        "okt",
+        "n\u00F3v",
+        "des",
     }
     MonthNames { 
         "jan\u00FAar",
@@ -92,24 +98,16 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "isl" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
+
+    LocaleScript{   
+        "Latn",  // ISO 15924 Name 
     }
-//    LocaleScript{   
-//        "Latn",  // ISO 15924 Name 
-//    }
-    ExemplarCharacters { "[a-z \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u00fd \u00f6 \u00e6 \u00f0 \u00fe]" }
+    ExemplarCharacters { "[a-z\u00e1\u00e9\u00ed\u00f3\u00fa\u00fd\u00f6\u00e6\u00f0\u00fe]" }
 
     // Currency display names
     Currencies {
         ISK { "kr.", "ISK" }
     }
-}
+}
\ No newline at end of file

Index: is_IS.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/is_IS.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- is_IS.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ is_IS.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,13 +7,10 @@
 
 is_IS {
     Version{ "2.0" }
-//    LocaleString { "is_IS" }
     NumberPatterns {
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "ISL" }
-    LocaleID:int { 0x040f }
 }

Index: it.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/it.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- it.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ it.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,9 +7,313 @@
 
 it {
     Version{ "2.0" }
+    collations {
+        standard { 
+            Version { "1.0" }
+            Sequence { "&A<<\u00c6/E &a<<\u00e6/e" }
+        }
+    }
+
+    AmPmMarkers { 
+        "m.",
+        "p.",
+    }
     Countries { 
-        IT { "Italia" }
+        Fallback{ "en"}
+        //AD { "Andorra" }
+        AE { "Emirati Arabi Uniti" }
+        //AF { "Afghanistan" }
+        AG { "Antigua e Barbuda" }
+        //AI { "Anguilla" }
+        //AL { "Albania" }
+        //AM { "Armenia" }
+        AN { "Antille Olandesi" }
+        //AO { "Angola" }
+        AQ { "Antartico" }
+        //AR { "Argentina" }
+        AS { "Samoa Americane" }
+        //AT { "Austria" }
+        //AU { "Australia" }
+        //AW { "Aruba" }
+        //AZ { "Azerbaijan" }
+        BA { "Bosnia Erzegovina" }
+        //BB { "Barbados" }
+        //BD { "Bangladesh" }
+        BE { "Belgio" }
+        //BF { "Burkina Faso" }
+        //BG { "Bulgaria" }
+        //BH { "Bahrain" }
+        //BI { "Burundi" }
+        //BJ { "Benin" }
+        //BM { "Bermuda" }
+        //BN { "Brunei" }
+        //BO { "Bolivia" }
+        BR { "Brasile" }
+        //BS { "Bahamas" }
+        //BT { "Bhutan" }
+        BV { "Isola Bouvet" }
+        //BW { "Botswana" }
+        BY { "Bielorussia" }
+        //BZ { "Belize" }
+        //CA { "Canada" }
+        CC { "Isole Cocos (Keeling)" }
+        CD { "Repubblica Democratica del Congo" }
+        CF { "Repubblica Centrafricana" }
+        //CG { "Congo" }
         CH { "Svizzera" }
+        CI { "Costa d'Avorio" }
+        CK { "Isole Cook" }
+        CL { "Cile" }
+        CM { "Camerun" }
+        CN { "Cina" }
+        //CO { "Colombia" }
+        //CR { "Costa Rica" }
+        //CU { "Cuba" }
+        CV { "Capo Verde" }
+        CX { "Isola di Natale" }
+        CY { "Cipro" }
+        CZ { "Repubblica Ceca" }
+        DE { "Germania" }
+        DJ { "Gibuti" }
+        DK { "Danimarca" }
+        //DM { "Dominica" }
+        DO { "Repubblica Dominicana" }
+        //DZ { "Algeria" }
+        //EC { "Ecuador" }
+        //EE { "Estonia" }
+        EG { "Egitto" }
+        EH { "Sahara Occidentale" }
+        //ER { "Eritrea" }
+        ES { "Spagna" }
+        ET { "Etiopia" }
+        FI { "Finlandia" }
+        //FJ { "Fiji" }
+        FK { "Isole Falkland" }
+        //FM { "Micronesia" }
+        FO { "Isole Faroe" }
+        FR { "Francia" }
+        //GA { "Gabon" }
+        GB { "Regno Unito" }
+        //GD { "Grenada" }
+        //GE { "Georgia" }
+        GF { "Guiana Francese" }
+        //GH { "Ghana" }
+        GI { "Gibilterra" }
+        GL { "Groenlandia" }
+        //GM { "Gambia" }
+        //GN { "Guinea" }
+        GP { "Guadalupa" }
+        GQ { "Guinea Equatoriale" }
+        GR { "Grecia" }
+        GS { "Sud Georgia e Isole Sandwich del Sud" }
+        //GT { "Guatemala" }
+        //GU { "Guam" }
+        //GW { "Guinea-Bissau" }
+        //GY { "Guyana" }
+        HK { "Hong Kong (Cina)" }
+        HM { "Isole Heard ed Isole McDonald" }
+        //HN { "Honduras" }
+        HR { "Croazia" }
+        //HT { "Haiti" }
+        HU { "Ungheria" }
+        //ID { "Indonesia" }
+        IE { "Irlanda" }
+        IL { "Israele" }
+        //IN { "India" }
+        IO { "Territori Britannici dell'Oceano Indiano" }
+        //IQ { "Iraq" }
+        //IR { "Iran" }
+        IS { "Islanda" }
+        IT { "Italia" }
+        JM { "Giamaica" }
+        JO { "Giordania" }
+        JP { "Giappone" }
+        //KE { "Kenya" }
+        KG { "Kirghizistan" }
+        KH { "Cambogia" }
+        //KI { "Kiribati" }
+        KM { "Comore" }
+        KN { "Saint Kitts e Nevis" }
+        KP { "Corea del Nord" }    // alternate name { "Corea, Repubblica Popolare Democratica" }
+        KR { "Corea del Sud" }    // alternate name { "Corea, Repubblica" }
+        //KW { "Kuwait" }
+        KY { "Isole Cayman" }
+        KZ { "Kazakistan" }
+        //LA { "Laos" }
+        LB { "Libano" }
+        LC { "Santa Lucia" }
+        //LI { "Liechtenstein" }
+        //LK { "Sri Lanka" }
+        //LR { "Liberia" }
+        //LS { "Lesotho" }
+        LT { "Lituania" }
+        LU { "Lussemburgo" }
+        LV { "Lettonia" }
+        LY { "Libia" }
+        MA { "Marocco" }
+        //MC { "Monaco" }
+        MD { "Moldavia" }
+        //MG { "Madagascar" }
+        MH { "Isole Marshall" }
+        MK { "Macedonia, Repubblica" }
+        //ML { "Mali" }
+        //MM { "Myanmar" }
+        //MN { "Mongolia" }
+        MO { "Macao (Cina)" }
+        //MP { "Northern Mariana Islands" }
+        MQ { "Martinica" }
+        //MR { "Mauritania" }
+        //MS { "Montserrat" }
+        //MT { "Malta" }
+        //MU { "Mauritius" }
+        MV { "Maldive" }
+        //MW { "Malawi" }
+        MX { "Messico" }
+        MY { "Malesia" }
+        MZ { "Mozambico" }
+        //NA { "Namibia" }
+        NC { "Nuova Caledonia" }
+        //NE { "Niger" }
+        NF { "Isola Norfolk" }
+        //NG { "Nigeria" }
+        //NI { "Nicaragua" }
+        NL { "Olanda" }
+        NO { "Norvegia" }
+        //NP { "Nepal" }
+        //NR { "Nauru" }
+        //NU { "Niue" }
+        NZ { "Nuova Zelanda" }
+        //OM { "Oman" }
+        //PA { "Panama" }
+        //PE { "Peru" }
+        PF { "Polinesia Francese" }
+        PG { "Papua Nuova Guinea" }
+        PH { "Filippine" }
+        //PK { "Pakistan" }
+        PL { "Polonia" }
+        PM { "Saint Pierre e Miquelon" }
+        //PN { "Pitcairn" }
+        PR { "Portorico" }
+        PS { "Palestina" }
+        PT { "Portogallo" }
+        //PW { "Palau" }
+        //PY { "Paraguay" }
+        //QA { "Qatar" }
+        RE { "Reunion" }
+        //RO { "Romania" }
+        RU { "Federazione Russa" }
+        RW { "Ruanda" }
+        SA { "Arabia Saudita" }
+        SB { "Isole Solomon" }
+        //SC { "Seychelles" }
+        //SD { "Sudan" }
+        SE { "Svezia" }
+        //SG { "Singapore" }
+        //SH { "Saint Helena" }
+        //SI { "Slovenia" }
+        SJ { "Svalbard e Jan Mayen" }
+        SK { "Slovacchia" }
+        //SL { "Sierra Leone" }
+        //SM { "San Marino" }
+        //SN { "Senegal" }
+        //SO { "Somalia" }
+        //SR { "Suriname" }
+        ST { "Sao Tome e Principe" }
+        //SV { "El Salvador" }
+        SY { "Siria" }    // alternate name { "Repubblica Araba di Siria" }
+        //SZ { "Swaziland" }
+        TC { "Isole Turks e Caicos" }
+        TD { "Ciad" }
+        TF { "Territori francesi del sud" }
+        //TG { "Togo" }
+        TH { "Thailandia" }
+        //TJ { "Tajikistan" }
+        //TK { "Tokelau" }
+        TL { "Timor Est" }
+        //TM { "Turkmenistan" }
+        //TN { "Tunisia" }
+        //TO { "Tonga" }
+        TR { "Turchia" }
+        TT { "Trinidad e Tobago" }
+        //TV { "Tuvalu" }
+        TW { "Taiwan (provincia della Cina)" }    // alternate name { "Taiwan" }
+        //TZ { "Tanzania" }
+        UA { "Ucraina" }
+        //UG { "Uganda" }
+        UM { "Isole minori Americane" }
+        US { "Stati Uniti" }
+        //UY { "Uruguay" }
+        //UZ { "Uzbekistan" }
+        VA { "Vaticano" }
+        VC { "Saint Vincent e Grenadines" }
+        //VE { "Venezuela" }
+        VG { "Isole Vergini Britanniche" }
+        VI { "Isole Vergini Americane" }
+        //VN { "Vietnam" }
+        //VU { "Vanuatu" }
+        WF { "Wallis e Futuna" }
+        //WS { "Samoa" }
+        //YE { "Yemen" }
+        //YT { "Mayotte" }
+        //YU { "Yugoslavia" }
+        ZA { "Sud Africa" }
+        //ZM { "Zambia" }
+        //ZW { "Zimbabwe" }
+    }
+    // Currency display names
+    Currencies {
+        ARP { "ARP", "Peso Argentino (vecchio Cod.)" } // Argentine Peso
+        ARS { "ARS", "Peso Argentino" } // Argentine Peso
+        ATS { "ATS", "Scellino Austriaco" } // Schilling
+        AUD { "AUD", "Dollaro Australiano" } // Australian Dollar
+        BAM { "KM", "Marco Conv. Bosnia-Erzegovina" } // Convertible Marks
+        BEF { "BEF", "Franco Belga" } // Belgian Franc
+        BGL { "BGL", "Lev Bulgaro" } // Lev
+        BOB { "BOB", "Boliviano" } // Boliviano
+        BRL { "BRL", "Real Brasiliano" } // Brazilian Real
+        CAD { "CAD", "Dollaro Canadese" } // Canadian Dollar
+        CHF { "SFr.", "Franco Svizzero" } // Swiss Franc
+        CLP { "CLP", "Peso Cileno" } // Chilean Peso
+        CNY { "CNY", "Renmimbi Cinese" } // Yuan Renminbi
+        CYP { "CYP", "Sterlina Cipriota" } // Cyprus Pound
+        CZK { "CZK", "Corona Ceca" } // Czech Koruna
+        DEM { "DEM", "Marco Tedesco" } // Deutsche Mark
+        DKK { "DKK", "Corona Danese" } // Danish Krone
+        EEK { "EEK", "Corona dell'Estonia" } // Kroon
+        EGP { "EGP", "Sterlina Egiziana" } // Egyptian Pound
+        ESP { "ESP", "Peseta Spagnola" } // Spanish Peseta
+        EUR { "\u20AC", "Euro" } // Euro
+        FIM { "FIM", "Markka Finlandese" } // Markka
+        FRF { "FRF", "Franco Francese" } // French Franc
+        GBP { "\u00A3", "Sterlina Inglese" } // Pound Sterling
+        GRD { "GRD", "Dracma Greca" } // Drachma
+        HKD { "HKD", "Dollaro di Hong Kong" } // Hong Kong Dollar
+        HUF { "HUF", "Fiorino Ungherese" } // Forint
+        IDR { "IDR", "Rupia Indiana" } // Rupiah
+        IEP { "IEP", "Lira Irlandese" } // Irish Pound
+        ITL { "\u20A4", "Lira Italiana" } // Lira
+        JOD { "JOD", "Dinaro Giordano" } // Jordanian Dinar
+        JPY { "\u00A5", "Yen Giapponese" } // Yen
+        LTL { "LTL", "Lita Lituana" } // Lithuanian Litas
+        MAD { "MAD", "Dirham Marocchino" } // Moroccan Dirham
+        NGN { "NGN", "Naira Nigeriana" } // Naira
+        NLG { "NLG", "Fiorino Olandese" } // Netherlands Guilder
+        NOK { "NOK", "Corona Norvegese" } // Norwegian Krone
+        PHP { "PHP", "Peso delle Filippine" } // Philippine Peso
+        PLZ { "PLZ", "Zloty Polacco" } // Zloty
+        PTE { "PTE", "Escudo Portoghese" } // Portugese Escudo
+        ROL { "ROL", "Leu della Romania" } // Leu
+        RUR { "RUR", "Rublo della CSI" } // Russian Ruble
+        SAR { "SAR", "Ryal Saudita" } // Saudi Riyal
+        SEK { "SEK", "Corona Svedese" } // Swedish Krona
+        SGD { "SGD", "Dollaro di Singapore" } // Singapore Dollar
+        SIT { "SIT", "Tallero Sloveno" } // Tolar
+        THB { "THB", "Baht Tailandese" } // Baht
+        TRL { "TRL", "Lira Turca" } // Turkish Lira
+        UAH { "UAH", "Hrivna Ucraina" } // Hryvnia
+        USD { "$", "Dollaro Statunitense" } // US Dollar
+        YUD { "YUD", "Yud" } // New Yugoslavian
+        ZAR { "ZAR", "Rand Sudafricano" } // Rand
     }
     DateTimeElements:intvector { 
         2,
@@ -26,12 +330,6 @@
         "dd/MM/yy",
         "{1} {0}",
     }
-    
-    AmPmMarkers { 
-        "m.",
-        "p.",
-    }
-    
     DayAbbreviations { 
         "dom",
         "lun",
@@ -54,11 +352,83 @@
         "aC",
         "dC",
     }
-    Languages { 
+    Languages {
+
+        af { "afrikaans" }
+        am { "amarico" }
+        ar { "arabo" }
+        be { "bielorusso" }
+        bg { "bulgaro" }
+        bn { "bengali" }
+        ca { "catalano" }
+        cs { "ceco" }
+        da { "danese" }
+        de { "tedesco" }
+        el { "greco" }
+        en { "inglese" }
+        eo { "esperanto" }
+        es { "spagnolo" }
+        et { "estone" }
+        eu { "basco" }
+        fa { "persiano" }
+        fi { "finlandese" }
+        fo { "faroese" }
+        fr { "francese" }
+        ga { "irlandese" }
+        gl { "galiziano" }
+        gu { "gujarati" }
+        gv { "manx" }
+        haw { "hawaiano" }
+        he { "ebreo" }
+        hi { "hindi" }
+        hr { "croato" }
+        hu { "ungherese" }
+        hy { "armeno" }
+        id { "indonesiano" }
+        is { "islandese" }
         it { "italiano" }
+        iu { "inuktitut" }
+        ja { "giapponese" }
+        kl { "kalaallisut" }
+        kn { "kannada" }
+        ko { "coreano" }
+        kw { "cornish" }
+        lt { "lituano" }
+        lv { "lettone" }
+        mk { "macedone" }
+        mr { "marathi" }
+        mt { "maltese" }
+        nb { "norvegese bokm\u00e5l" }
+        nl { "olandese" }
+        no { "norvegese" }
+        nn { "norvegese nynorsk" }
+        om { "oromo" }
+        pl { "polacco" }
+        pt { "portoghese" }
+        ro { "romeno" }
+        ru { "russo" }
+        sh { "serbo-croata" }
+        sk { "slovacco" }
+        sl { "sloveno" }
+        so { "somalo" }
+        sq { "albanian" }
+        sr { "serbo" }
+        sv { "svedese" }
+        sw { "swahili" }
+        ta { "tamil" }
+        th { "thai" }
+        ti { "tigrinya" }
+        tr { "turco" }
+        uk { "ucraino" }
+        vi { "vietnamita" }
+        zh { "cinese" }
+        //zh_cn { "Cinese (Semplificato)" }
+        //zh_tw { "Cinese (Tradizionale)" }
+    }
+    ExemplarCharacters { "[a-z\u00e9\u00f3\u00e0\u00e8\u00ec\u00f2\u00ed\u00fa\u00f9\u00ef]" }
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
     }
-    LocaleID:int { 0x10 }
-//    LocaleString { "it" }
     MonthAbbreviations { 
         "gen",
         "feb",
@@ -100,33 +470,37 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "ita" }
-    zoneStrings { 
-        {
-            "Europe/Rome",
-            "CET",
-            "CET",
-            "CET",
-            "CET",
-            "Rome",
+    Keys{
+         collation { "Collazione" }
+         calendar  { "Calendario" }
+	 currency  { "valutario" }
+    }
+    Types{
+        collation {
+            traditional { "Tradizionale Collazione" }
+            stroke      {"Pennellata Ordine" }
+            phonebook   { "Elenco Telefonico Ordine" }
+        }
+        calendar {
+            traditional { "Tradizionale Calendario" }
         }
     }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
-    ExemplarCharacters { "[a-z \u00e9 \u00f3 \u00e0 \u00e8 \u00ec \u00f2 \u00ed \u00fa \u00f9 \u00ef]" }
+    Variants{
+        REVISED { "Modificato" }
+    }
 
     //------------------------------------------------------------
     // Rule Based Number Format Support
     //------------------------------------------------------------
 
-//         * Spellout rules for Italian.  Like German, most Italian numbers are
-//         * written as single words.  What makes these rules complicated is the rule
-//         * that says that when a word ending in a vowel and a word beginning with
-//         * a vowel are combined into a compound, the vowel is dropped from the
-//         * end of the first word: 180 is "centottanta," not "centoottanta."
-//         * The complexity of this rule set is to produce this behavior.
+//   * Spellout rules for Italian.  Like German, most Italian numbers are
+//   * written as single words.  What makes these rules complicated is the rule
+//   * that says that when a word ending in a vowel and a word beginning with
+//   * a vowel are combined into a compound, the vowel is dropped from the
+//   * end of the first word: 180 is "centottanta," not "centoottanta."
+//   * The complexity of this rule set is to produce this behavior.
 
     // Can someone confirm that I did the vowel-eliding thing right?  I'm
     // not 100% sure I'm doing it in all the right places, or completely
@@ -143,135 +517,76 @@
         // substitution that will supply that vowel, unless that vowel is to
         // be elided.
         "%main:\n"
-        "    -x: meno >>;\n"
-        "    x.x: << virgola >>;\n"
-        "    zero; uno; due; tre; quattro; cinque; sei; sette; otto;\n"
-        "        nove;\n"
-        "    dieci; undici; dodici; tredici; quattordici; quindici; sedici;\n"
-        "        diciasette; diciotto; diciannove;\n"
-        "    20: venti; vent>%%with-i>;\n"
-        "    30: trenta; trent>%%with-i>;\n"
-        "    40: quaranta; quarant>%%with-a>;\n"
-        "    50: cinquanta; cinquant>%%with-a>;\n"
-        "    60: sessanta; sessant>%%with-a>;\n"
-        "    70: settanta; settant>%%with-a>;\n"
-        "    80: ottanta; ottant>%%with-a>;\n"
-        "    90: novanta; novant>%%with-a>;\n"
-        "    100: cento; cent[>%%with-o>];\n"
-        "    200: <<cento; <<cent[>%%with-o>];\n"
-        "    1000: mille; mill[>%%with-i>];\n"
-        "    2000: <<mila; <<mil[>%%with-a>];\n"
-        "    100,000>>: <<mila[ >>];\n"
-        "    1,000,000: =#,##0= (incomplete data);\n"
+            "-x: meno >>;\n"
+            "x.x: << virgola >>;\n"
+            "zero; uno; due; tre; quattro; cinque; sei; sette; otto; nove;\n"
+            "dieci; undici; dodici; tredici; quattordici; quindici; sedici;\n"
+            "    diciasette; diciotto; diciannove;\n"
+            "20: venti; vent>%%with-i>;\n"
+            "30: trenta; trent>%%with-i>;\n"
+            "40: quaranta; quarant>%%with-a>;\n"
+            "50: cinquanta; cinquant>%%with-a>;\n"
+            "60: sessanta; sessant>%%with-a>;\n"
+            "70: settanta; settant>%%with-a>;\n"
+            "80: ottanta; ottant>%%with-a>;\n"
+            "90: novanta; novant>%%with-a>;\n"
+            "100: cento; cent[>%%with-o>];\n"
+            "200: <<cento; <<cent[>%%with-o>];\n"
+            "1000: mille; mill[>%%with-i>];\n"
+            "2000: <<mila; <<mil[>%%with-a>];\n"
+            "100,000>>: <<mila[ >>];\n"
+            "1,000,000: =#,##0= (incomplete data);\n"
         "%%with-a:\n"
-        "    azero; uno; adue; atre; aquattro; acinque; asei; asette; otto;\n"
-        "        anove;\n"
-        "    adieci; undici; adodici; atredici; aquattordici; aquindici; asedici;\n"
-        "        adiciasette; adiciotto; adiciannove;\n"
-        "    20: aventi; avent>%%with-i>;\n"
-        "    30: atrenta; atrent>%%with-i>;\n"
-        "    40: aquaranta; aquarant>%%with-a>;\n"
-        "    50: acinquanta; acinquant>%%with-a>;\n"
-        "    60: asessanta; asessant>%%with-a>;\n"
-        "    70: asettanta; asettant>%%with-a>;\n"
-        "    80: ottanta; ottant>%%with-a>;\n"
-        "    90: anovanta; anovant>%%with-a>;\n"
-        "    100: acento; acent[>%%with-o>];\n"
-        "    200: <%%with-a<cento; <%%with-a<cent[>%%with-o>];\n"
-        "    1000: amille; amill[>%%with-i>];\n"
-        "    2000: <%%with-a<mila; <%%with-a<mil[>%%with-a>];\n"
-        "    100,000: =%main=;\n"
+            "azero; uno; adue; atre; aquattro; acinque; asei; asette; otto; anove;\n"
+            "adieci; undici; adodici; atredici; aquattordici; aquindici; asedici;\n"
+            "    adiciasette; adiciotto; adiciannove;\n"
+            "20: aventi; avent>%%with-i>;\n"
+            "30: atrenta; atrent>%%with-i>;\n"
+            "40: aquaranta; aquarant>%%with-a>;\n"
+            "50: acinquanta; acinquant>%%with-a>;\n"
+            "60: asessanta; asessant>%%with-a>;\n"
+            "70: asettanta; asettant>%%with-a>;\n"
+            "80: ottanta; ottant>%%with-a>;\n"
+            "90: anovanta; anovant>%%with-a>;\n"
+            "100: acento; acent[>%%with-o>];\n"
+            "200: <%%with-a<cento; <%%with-a<cent[>%%with-o>];\n"
+            "1000: amille; amill[>%%with-i>];\n"
+            "2000: <%%with-a<mila; <%%with-a<mil[>%%with-a>];\n"
+            "100,000: =%main=;\n"
         "%%with-i:\n"
-        "    izero; uno; idue; itre; iquattro; icinque; isei; isette; otto;\n"
-        "        inove;\n"
-        "    idieci; undici; idodici; itredici; iquattordici; iquindici; isedici;\n"
-        "        idiciasette; idiciotto; idiciannove;\n"
-        "    20: iventi; ivent>%%with-i>;\n"
-        "    30: itrenta; itrent>%%with-i>;\n"
-        "    40: iquaranta; iquarant>%%with-a>;\n"
-        "    50: icinquanta; icinquant>%%with-a>;\n"
-        "    60: isessanta; isessant>%%with-a>;\n"
-        "    70: isettanta; isettant>%%with-a>;\n"
-        "    80: ottanta; ottant>%%with-a>;\n"
-        "    90: inovanta; inovant>%%with-a>;\n"
-        "    100: icento; icent[>%%with-o>];\n"
-        "    200: <%%with-i<cento; <%%with-i<cent[>%%with-o>];\n"
-        "    1000: imille; imill[>%%with-i>];\n"
-        "    2000: <%%with-i<mila; <%%with-i<mil[>%%with-a>];\n"
-        "    100,000: =%main=;\n"
+            "izero; uno; idue; itre; iquattro; icinque; isei; isette; otto; inove;\n"
+            "idieci; undici; idodici; itredici; iquattordici; iquindici; isedici;\n"
+            "    idiciasette; idiciotto; idiciannove;\n"
+            "20: iventi; ivent>%%with-i>;\n"
+            "30: itrenta; itrent>%%with-i>;\n"
+            "40: iquaranta; iquarant>%%with-a>;\n"
+            "50: icinquanta; icinquant>%%with-a>;\n"
+            "60: isessanta; isessant>%%with-a>;\n"
+            "70: isettanta; isettant>%%with-a>;\n"
+            "80: ottanta; ottant>%%with-a>;\n"
+            "90: inovanta; inovant>%%with-a>;\n"
+            "100: icento; icent[>%%with-o>];\n"
+            "200: <%%with-i<cento; <%%with-i<cent[>%%with-o>];\n"
+            "1000: imille; imill[>%%with-i>];\n"
+            "2000: <%%with-i<mila; <%%with-i<mil[>%%with-a>];\n"
+            "100,000: =%main=;\n"
         "%%with-o:\n"
-        "    ozero; uno; odue; otre; oquattro; ocinque; osei; osette; otto;\n"
-        "        onove;\n"
-        "    odieci; undici; ododici; otredici; oquattordici; oquindici; osedici;\n"
-        "        odiciasette; odiciotto; odiciannove;\n"
-        "    20: oventi; ovent>%%with-i>;\n"
-        "    30: otrenta; otrent>%%with-i>;\n"
-        "    40: oquaranta; oquarant>%%with-a>;\n"
-        "    50: ocinquanta; ocinquant>%%with-a>;\n"
-        "    60: osessanta; osessant>%%with-a>;\n"
-        "    70: osettanta; osettant>%%with-a>;\n"
-        "    80: ottanta; ottant>%%with-a>;\n"
-        "    90: onovanta; onovant>%%with-a>;\n"
-        "    100: ocento; ocent[>%%with-o>];\n"
-        "    200: <%%with-o<cento; <%%with-o<cent[>%%with-o>];\n"
-        "    1000: omille; omill[>%%with-i>];\n"
-        "    2000: <%%with-o<mila; <%%with-o<mil[>%%with-a>];\n"
-        "    100,000: =%main=;\n" 
+            "ozero; uno; odue; otre; oquattro; ocinque; osei; osette; otto; onove;\n"
+            "odieci; undici; ododici; otredici; oquattordici; oquindici; osedici;\n"
+            "    odiciasette; odiciotto; odiciannove;\n"
+            "20: oventi; ovent>%%with-i>;\n"
+            "30: otrenta; otrent>%%with-i>;\n"
+            "40: oquaranta; oquarant>%%with-a>;\n"
+            "50: ocinquanta; ocinquant>%%with-a>;\n"
+            "60: osessanta; osessant>%%with-a>;\n"
+            "70: osettanta; osettant>%%with-a>;\n"
+            "80: ottanta; ottant>%%with-a>;\n"
+            "90: onovanta; onovant>%%with-a>;\n"
+            "100: ocento; ocent[>%%with-o>];\n"
+            "200: <%%with-o<cento; <%%with-o<cent[>%%with-o>];\n"
+            "1000: omille; omill[>%%with-i>];\n"
+            "2000: <%%with-o<mila; <%%with-o<mil[>%%with-a>];\n"
+            "100,000: =%main=;\n" 
     }
 
-    // Currency display names
-    Currencies {
-        ARP { "ARP", "Peso Argentino (vecchio Cod.)" } // Argentine Peso
-        ARS { "ARS", "Peso Argentino" } // Argentine Peso
-        ATS { "ATS", "Scellino Austriaco" } // Schilling
-        AUD { "AUD", "Dollaro Australiano" } // Australian Dollar
-        BAM { "KM", "Marco Conv. Bosnia-Erzegovina" } // Convertible Marks
-        BEF { "BEF", "Franco Belga" } // Belgian Franc
-        BGL { "BGL", "Lev Bulgaro" } // Lev
-        BOB { "BOB", "Boliviano" } // Boliviano
-        BRL { "BRL", "Real Brasiliano" } // Brazilian Real
-        CAD { "CAD", "Dollaro Canadese" } // Canadian Dollar
-        CHF { "SFr.", "Franco Svizzero" } // Swiss Franc
-        CLP { "CLP", "Peso Cileno" } // Chilean Peso
-        CNY { "CNY", "Renmimbi Cinese" } // Yuan Renminbi
-        CYP { "CYP", "Sterlina Cipriota" } // Cyprus Pound
-        CZK { "CZK", "Corona Ceca" } // Czech Koruna
-        DEM { "DEM", "Marco Tedesco" } // Deutsche Mark
-        DKK { "DKK", "Corona Danese" } // Danish Krone
-        EEK { "EEK", "Corona dell'Estonia" } // Kroon
-        EGP { "EGP", "Sterlina Egiziana" } // Egyptian Pound
-        ESP { "ESP", "Peseta Spagnola" } // Spanish Peseta
-        EUR { "\u20AC", "Euro" } // Euro
-        FIM { "FIM", "Markka Finlandese" } // Markka
-        FRF { "FRF", "Franco Francese" } // French Franc
-        GBP { "\u00A3", "Sterlina Inglese" } // Pound Sterling
-        GRD { "GRD", "Dracma Greca" } // Drachma
-        HKD { "HKD", "Dollaro di Hong Kong" } // Hong Kong Dollar
-        HUF { "HUF", "Fiorino Ungherese" } // Forint
-        IDR { "IDR", "Rupia Indiana" } // Rupiah
-        IEP { "IEP", "Lira Irlandese" } // Irish Pound
-        ITL { "\u20A4", "Lira Italiana" } // Lira
-        JOD { "JOD", "Dinaro Giordano" } // Jordanian Dinar
-        JPY { "\u00A5", "Yen Giapponese" } // Yen
-        LTL { "LTL", "Lita Lituana" } // Lithuanian Litas
-        MAD { "MAD", "Dirham Marocchino" } // Moroccan Dirham
-        NGN { "NGN", "Naira Nigeriana" } // Naira
-        NLG { "NLG", "Fiorino Olandese" } // Netherlands Guilder
-        NOK { "NOK", "Corona Norvegese" } // Norwegian Krone
-        PHP { "PHP", "Peso delle Filippine" } // Philippine Peso
-        PLZ { "PLZ", "Zloty Polacco" } // Zloty
-        PTE { "PTE", "Escudo Portoghese" } // Portugese Escudo
-        ROL { "ROL", "Leu della Romania" } // Leu
-        RUR { "RUR", "Rublo della CSI" } // Russian Ruble
-        SAR { "SAR", "Ryal Saudita" } // Saudi Riyal
-        SEK { "SEK", "Corona Svedese" } // Swedish Krona
-        SGD { "SGD", "Dollaro di Singapore" } // Singapore Dollar
-        SIT { "SIT", "Tallero Sloveno" } // Tolar
-        THB { "THB", "Baht Tailandese" } // Baht
-        TRL { "TRL", "Lira Turca" } // Turkish Lira
-        UAH { "UAH", "Hrivna Ucraina" } // Hryvnia
-        USD { "$", "Dollaro Statunitense" } // US Dollar
-        YUD { "YUD", "Yud" } // New Yugoslavian
-        ZAR { "ZAR", "Rand Sudafricano" } // Rand
-    }
 }

Index: it_CH.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/it_CH.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- it_CH.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ it_CH.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -8,18 +8,16 @@
 it_CH {
     Version{ "2.0" }
     DateTimePatterns { 
-        "HH.mm' h' z",
+        "HH.mm:ss' h' z",
         "HH:mm:ss z",
         "HH:mm:ss",
         "HH:mm",
-        "EEEE, d. MMMM yyyy",
-        "d. MMMM yyyy",
+        "EEEE, d MMMM yyyy",
+        "d MMMM yyyy",
         "d-MMM-yy",
         "dd.MM.yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x0810 }
-//    LocaleString { "it_CH" }
     NumberElements { 
         ".",
         "'",
@@ -33,6 +31,7 @@
         "\u221E",
         "\uFFFD",
         ".",
+        "+",
     }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
@@ -40,15 +39,5 @@
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "CHE" }
-    zoneStrings { 
-        {
-            "Europe/Zurich",
-            "CET",
-            "CET",
-            "CET",
-            "CET",
-            "Zurich",
-        }
-    }
+
 }

Index: it_IT.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/it_IT.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- it_IT.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ it_IT.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,14 +7,11 @@
 
 it_IT {
     Version{ "2.0" }
-//    LocaleString { "it_IT" }
 //    NumberPatterns { 
 //        "#,##0.###;-#,##0.###",
 //        "\u00A4 #,##0.00;-\u00A4 #,##0.00",
 //        "#,##0%",
 //    }
-//    ShortCountry { "ITA" }
-    LocaleID:int { 0x0410 }
     DateTimePatterns { 
         "HH:mm:ss z",
         "H:mm:ss z",

Index: ja.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ja.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ja.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ ja.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -11,8 +11,26 @@
         "\u5348\u524D",
         "\u5348\u5F8C",
     }
+   // Keys{
+   //      collation{""}
+   //      calendar {""}
+   // }
+    Types{
+        collation{
+            traditional { "\u5E74\u53F7" }
+        }
[...1812 lines suppressed...]
         YUN { "YUN", "\u30E6\u30FC\u30B4\u30B9\u30E9\u30D3\u30A2\u65B0\u30C7\u30A3\u30FC\u30CA\u30FC\u30EB" }
         ZAR { "ZAR", "\u30E9\u30F3\u30C9" } // Rand
@@ -2783,17 +2375,4 @@
             "\u662D\u548C",             // 1926 Showa
             "\u5E73\u6210"             // 1989 Heisei
     }
-
-    DateTimePatterns_japanese { 
-        "H'\u6642'mm'\u5206'ss'\u79D2'z",
-        "H:mm:ss:z",
-        "H:mm:ss",
-        "H:mm",
-        "Gy'\u5E74'M'\u6708'd'\u65E5'",
-        "Gy'\u5E74'M'\u6708'd'\u65E5'",
-        "G yy/MM/dd",
-        "G yy/MM/dd",
-        "{1} {0}",
-    }
-
 }

Index: ja_JP.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ja_JP.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ja_JP.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ ja_JP.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,13 +7,10 @@
 
 ja_JP {
     Version{ "2.0" }
-//    LocaleString { "ja_JP" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "\u00A4#,##0;-\u00A4#,##0",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "JPN" }
-    LocaleID:int { 0x0411 }
 }

Index: kl.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/kl.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kl.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ kl.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,7 +7,26 @@
 
 kl{
     Version { "2.0" }
-
+    collations {
+        standard { 
+            Version { "1.0" }
+            Sequence { 
+                "&D<<\u0111<<<\u0110<<\u00F0<<<\u00D0"
+                "&Q<<\u0138<<<K''"	// Greenland only
+                "&t<<<\u00FE/h"
+                "&T<<<\u00DE/H"
+                "&Y<<u\u0308<<<U\u0308<<u\u030B<<<U\u030B"
+                "&[before 1]\u0292<\u00E6<<<\u00C6<<\u00E4<<<\u00C4<<e\u0328<<<E\u0328<\u00F8<<<\u00D8<<\u00F6<<<\u00D6<<\u0151<<<\u0150<<\u0153<<<\u0152<\u00E5<<<\u00C5"
+            }
+        }
+    }
+    Countries {
+        GL { "Kalaallit Nunaat" }
+    }
+    // Currency display names
+    Currencies {
+        DKK { "kr", "DKK" }
+    }
     DayAbbreviations { 
         "sab",
         "ata",
@@ -26,6 +45,13 @@
         "tallimanngorneq",
         "arfininngorneq",
     }
+    Languages {
+        kl { "kalaallisut" }
+    }
+    ExemplarCharacters { "[a-z\u00e1\u00e9\u00ed\u00fa\u00e2\u00ea\u00ee\u00f4\u00fb\u00e6\u00e5\u00f8\u00e3\u0129\u0169\u0138]" }
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
+    }
     MonthAbbreviations { 
         "jan",
         "feb",
@@ -67,25 +93,15 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-    ExemplarCharacters { "[a-z \u00e1 \u00e9 \u00ed \u00fa \u00e2 \u00ea \u00ee \u00f4 \u00fb \u00e6 \u00e5 \u00f8 \u00e3 \u0129 \u0169 \u0138]" }
-
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
-
-            // /**************** Info Below is needed ****************/
-            // CollationElements{}
-            // Countries{}
-            // Eras{}
-            // Languages{}
-            // ShortLanguage { }
-            // localPatternChars{}
-            //
 
+    // /**************** Info Below is needed ****************/
+    // Countries{}
+    // Eras{}
+    // Languages{}
+    // ShortLanguage { }
+    // localPatternChars{}
+    //
 
-    // Currency display names
-    Currencies {
-        DKK { "kr", "DKK" }
-    }
 }

Index: kn.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/kn.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kn.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ kn.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,7 +7,6 @@
 
 kn {
     Version{ "2.0" }
-    LocaleID:int { 0x4B }
     Countries {
         IN { "\u0cad\u0cbe\u0cb0\u0ca4" }
     }
@@ -18,13 +17,6 @@
         "\u0CAA\u0CC2\u0CB0\u0CCD\u0CB5\u0CBE\u0CB9\u0CCD\u0CA8",
         "\u0C85\u0CAA\u0CB0\u0CBE\u0CB9\u0CCD\u0CA8"
     }
-//    ShortLanguage{
-//        "KAN"
-//    }
-//    Language {
-//        "Kannada"
-//    }
-
     DayNames{
         "\u0CB0\u0CB5\u0CBF\u0CB5\u0CBE\u0CB0",
         "\u0CB8\u0CCB\u0CAE\u0CB5\u0CBE\u0CB0",
@@ -34,7 +26,6 @@
         "\u0CB6\u0CC1\u0C95\u0CCD\u0CB0\u0CB5\u0CBE\u0CB0",
         "\u0CB6\u0CA8\u0CBF\u0CB5\u0CBE\u0CB0"
     }
-
     DayAbbreviations{
         "\u0CB0.",
         "\u0CB8\u0CCB.",
@@ -59,7 +50,6 @@
         "\u0CA8\u0CB5\u0CC6\u0C82\u0CAC\u0CB0\u0CCD",
         "\u0CA1\u0CBF\u0CB8\u0CC6\u0C82\u0CAC\u0CB0\u0CCD",
     }
-
     MonthAbbreviations{
         "\u0C9C\u0CA8\u0CB5\u0CB0\u0CC0",
         "\u0CAB\u0CC6\u0CAC\u0CCD\u0CB0\u0CB5\u0CB0\u0CC0",
@@ -90,11 +80,13 @@
 //    }
     LocaleScript:array { "Knda" }
     ExemplarCharacters { "[:Knda:]" }
-    CollationElements {	    
+    collations {
+      standard { 
         Version { "1.0" }
         Sequence { 
             "[normalization on]"
         }
+      }
     }
 
     // Currency display names

Index: kn_IN.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/kn_IN.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kn_IN.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ kn_IN.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,9 +7,6 @@
 
 kn_IN {
     Version { "2.0" }
-    LocaleID:int { 0x044B }
-//    ShortCountry { IND }
-
     DateTimePatterns {
         "hh:mm:ss a z",
         "hh:mm:ss a z",

Index: ko.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ko.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ko.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ ko.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,6 +7,7 @@
 
 ko {
     Version { "2.0" }
+
     AmPmMarkers {
         "\uC624\uC804",
         "\uC624\uD6C4",
@@ -14,9 +15,10 @@
     // Collation rules supplied by Hyangmi Cho of LOTUS
     // UCA deals properly with Hangul and Jamo. These rules interleave proper CJK (Hanja)
     // between corresponding Hanguls.
[...1031 lines suppressed...]
-        "\uD478-\uD479\uD47C\uD47F-\uD480\uD482\uD488-\uD489\uD48B\uD48D"
-        "\uD494\uD4A9\uD4CC\uD4D0\uD4D4\uD4DC\uD4DF\uD4E8\uD4EC\uD4F0"
-        "\uD4F8\uD4FB\uD4FD\uD504\uD508\uD50C\uD514-\uD515\uD517\uD53C-\uD53D"
-        "\uD540\uD544\uD54C-\uD54D\uD54F\uD551\uD558-\uD559\uD55C\uD560"
-        "\uD565\uD568-\uD569\uD56B\uD56D\uD574-\uD575\uD578\uD57C\uD584-\uD585"
-        "\uD587-\uD589\uD590\uD5A5\uD5C8-\uD5C9\uD5CC\uD5D0\uD5D2\uD5D8-\uD5D9"
-        "\uD5DB\uD5DD\uD5E4-\uD5E5\uD5E8\uD5EC\uD5F4-\uD5F5\uD5F7\uD5F9"
-        "\uD600-\uD601\uD604\uD608\uD610-\uD611\uD613-\uD615\uD61C\uD620"
-        "\uD624\uD62D\uD638-\uD639\uD63C\uD640\uD645\uD648-\uD649\uD64B"
-        "\uD64D\uD651\uD654-\uD655\uD658\uD65C\uD667\uD669\uD670-\uD671"
-        "\uD674\uD683\uD685\uD68C-\uD68D\uD690\uD694\uD69D\uD69F\uD6A1"
-        "\uD6A8\uD6AC\uD6B0\uD6B9\uD6BB\uD6C4-\uD6C5\uD6C8\uD6CC\uD6D1"
-        "\uD6D4\uD6D7\uD6D9\uD6E0\uD6E4\uD6E8\uD6F0\uD6F5\uD6FC-\uD6FD"
-        "\uD700\uD704\uD711\uD718-\uD719\uD71C\uD720\uD728-\uD729\uD72B"
-        "\uD72D\uD734-\uD735\uD738\uD73C\uD744\uD747\uD749\uD750-\uD751"
-        "\uD754\uD756-\uD759\uD760-\uD761\uD763\uD765\uD769\uD76C\uD770"
-        "\uD774\uD77C-\uD77D\uD781\uD788-\uD789\uD78C\uD790\uD798-\uD799"
-        "\uD79B\uD79D]"
     }
 }

Index: ko_KR.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ko_KR.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ko_KR.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ ko_KR.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,15 +7,12 @@
 
 ko_KR {
     Version { "2.0" }
-//    LocaleString { "ko_KR" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "\u00A4#,##0.00;-\u00A4#,##0.00",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "KOR" }
-    LocaleID:int { 0x0412 }
 //    Countries {
         //KR { "\uB300\uD55C\uBBFC\uAD6D" }
         //KP { "\uC870\uC120 \uBBFC\uC8FC\uC8FC\uC758 \uC778\uBBFC \uACF5\uD654\uAD6D" }

Index: kok.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/kok.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kok.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ kok.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,8 +7,6 @@
 
 kok {
     Version { "2.0" }
-    LocaleID:int { 0x57 }
-//    ShortLanguage { kok }
     Languages {
         aa { "\u0905\u092b\u093e\u0930" }
         ab { "\u0905\u092c\u0916\u0947\u091c\u093c\u093f\u092f\u0928" }
@@ -242,7 +240,7 @@
         "Deva"        // ISO 15924 Name 
     }
     ExemplarCharacters{ "[[:Deva:]\u200c\u200d]" }
-//    CollationElements {
+//    collations {
 //            ""
 //      }
 

Index: kok_IN.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/kok_IN.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kok_IN.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ kok_IN.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -8,9 +8,6 @@
 
 kok_IN {
     Version { "2.0" }
-    LocaleID:int { 0x0457 }
-//    ShortCountry { IND }
-
     NumberPatterns {
         "##,##,##0.###;-##,##,##0.###",
         "\u00A4 ##,##,##0.00;-\u00A4 ##,##,##0.00",

Index: kw.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/kw.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kw.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ kw.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -5,8 +5,15 @@
 // *
 // ***************************************************************************
 
-kw{
+kw {
     Version { "2.0" }
+    AmPmMarkers {
+        "a.m.",
+        "p.m.",
+    }
+    Countries {
+        GB { "Rywvaneth Unys" }
+    }
     DayAbbreviations { 
         "Sul",
         "Lun",
@@ -25,6 +32,17 @@
         "De Gwener",
         "De Sadorn",
     }
+    Eras {
+        "RC", // BC
+        "AD"   // AD
+    }
+    ExemplarCharacters { "[a-z]" }
+    LocaleScript:array{ 
+        "Latn",  // ISO 15924 Name 
+    }
+    Languages {
+        kw { "kernewek" }
+    }
     MonthAbbreviations { 
         "Gen",
         "Whe",
@@ -66,15 +84,11 @@
 //        "\u221e",
 //        "\ufffd",
 //    }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
+
     // /**************** Info Below is needed ****************/
-    // CollationElements{}
+    // collations{}
     // Countries{}
-    // Eras{}
     // Languages{}
-    // ShortLanguage { }
     // localPatternChars{}
     //
 }

Index: lt.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/lt.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lt.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ lt.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -1,4 +1,4 @@
-// ***************************************************************************
+// ***************************************************************************
 // *
 // *   Copyright (C) 1997-2003, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
@@ -7,14 +7,267 @@
 
 lt {
     Version{ "2.0" }
-    CollationElements { 
-        Version { "1.0" }
-        Sequence { "[backwards 2]& C < c\u030C <<< C\u030C & I << y = \u0131 <<< Y = \u0130 "
-        "& S < s\u030C <<< S\u030C & X < y\u0301<<< Y\u0301 < y\u0302 <<< Y\u0302 < y\u0308<<< Y"
-        "\u0308 & Z < z\u030C <<< Z\u030C" }
+    collations {
+      standard { 
+        Version { "2.0" }
+        Sequence { 
+            "&\u0328 << \u0307" // put dot-above after ogonek
+            "&[before 1]D<č<<<Č"
+            "&[before 1]J<y<<<Y"
+            "&[before 1]T<š<<<Š"
+            "&[before 1]Ʒ<ž<<<Ž"
+            // sources differ on the following, and the strengths thereof
+            // so keep in file but leave commented out
+            // "&C<<ch<<<Ch<<<CH"
+            // "&H<ch<<<Ch<<<CH"
+            // "&[before 1]B<ą<<<Ą"
+            // "&[before 1]F<ę<<<Ę<ė<<<Ė"
+            // "&[before 1]I<į<<<Į"
+            // "&[before 1]V<ų<<<Ų<ū<<<Ū"
+        }
+      }
     }
     Countries { 
+        Fallback{ "en"}
+        AD { "Andora" }
+        AE { "Jungtiniai Arab\u0173 Emyratai" }
+        AF { "Afganistanas" }
+        AG { "Antigva ir Barbuda" }
+        AI { "Angvila" }
+        AL { "Albanija" }
+        AM { "Arm\u0117nija" }
+        AN { "Nyderland\u0173 Antilai" }
+        //AO { "Angola" }
+        AQ { "Antarktika" }
+        //AR { "Argentina" }
+        AS { "Amerikos Samoa" }
+        AT { "Austrija" }
+        AU { "Australija" }
+        //AW { "Aruba" }
+        AZ { "Azerbaid\u017Eanas" }
+        BA { "Bosnija ir Hercegovina" }
+        BB { "Barbadosas" }
+        BD { "Banglade\u0161as" }
+        BE { "Belgija" }
+        BF { "Burkina Fasas" }
+        BG { "Bulgarija" }
+        BH { "Bahreinas" }
+        BI { "Burundis" }
+        BJ { "Beninas" }
+        BM { "Bermudai" }
+        BN { "Brun\u0117jus" }
+        BO { "Bolivija" }
+        BR { "Brazilija" }
+        BS { "Bahamai" }
+        BT { "Butanas" }
+        BV { "Bouvet sala" }
+        BW { "Botsvana" }
+        BY { "Baltarusija" }
+        BZ { "Belizas" }
+        CA { "Kanada" }
+        CC { "Kokos\u0173 salos" }
+        CD { "Kongo Demokratin\u0117 Respublika" }
+        CF { "Centrin\u0117s Afrikos Respublika" }
+        CG { "Kongas" }
+        CH { "\u0160veicarija" }
+        CI { "Kot d'Ivuar" }
+        CK { "Kuko salos" }
+        CL { "\u010Cil\u0117" }
+        CM { "Kamer\u016Bnas" }
+        CN { "Kinija" }
+        CO { "Kolumbija" }
+        CR { "Kosta Rika" }
+        CU { "Kuba" }
+        CV { "\u017Daliojo Ky\u0161ulio salos" }
+        CX { "Kal\u0117d\u0173 sala" }
+        CY { "Kipras" }
+        CZ { "\u010Cekijos respublika" }
+        DE { "Vokietija" }
+        DJ { "D\u017Eibutis" }
+        DK { "Danija" }
+        DM { "Dominika" }
+        DO { "Dominikos Respublika" }
+        DZ { "Al\u017Eyras" }
+        EC { "Ekvadoras" }
+        EE { "Estija" }
+        EG { "Egiptas" }
+        EH { "Vakar\u0173 Sachara" }
+        ER { "Eritr\u0117ja" }
+        ES { "Ispanija" }
+        ET { "Etiopija" }
+        FI { "Suomija" }
+        FJ { "Fid\u017Eis" }
+        FK { "Folklendo salos (Malvinai)" }    // alternate name { "Folklendo salos" }
+        FM { "Mikronezijos Federacin\u0117s Valstijos" }
+        FO { "Farer\u0173 salos" }
+        FR { "Pranc\u016Bzija" }
+        GA { "Gabonas" }
+        GB { "Did\u017Eioji Britanija" }
+        //GD { "Grenada" }
+        GE { "Gruzija" }
+        GF { "Pranc\u016Bzijos Gviana" }
+        GH { "Gana" }
+        GI { "Gibraltaras" }
+        GL { "Grenlandija" }
+        GM { "Gambija" }
+        GN { "Gvin\u0117ja" }
+        GP { "Gvadelup\u0117" }
+        GQ { "Ekvatorin\u0117 Gvin\u0117ja" }
+        GR { "Graikija" }
+        GS { "Ryt\u0173 D\u017Eord\u017Eija ir Ryt\u0173 Sandwich salos" }
+        GT { "Gvatemala" }
+        GU { "Guamas" }
+        GW { "Gvin\u0117ja-Bisau" }
+        GY { "Gviana" }
+        HK { "Kinijos S.A.R.Honkongas" }
+        HM { "Heard ir McDonald salos" }
+        HN { "Hond\u016Bras" }
+        HR { "Kroatija" }
+        HT { "Haitis" }
+        HU { "Vengrija" }
+        ID { "Indonezija" }
+        IE { "Airija" }
+        IL { "Izraelis" }
+        IN { "Indija" }
+        IO { "Brit\u0173 Indijos vandenyno teritorija" }
+        IQ { "Irakas" }
+        IR { "Irano" }
+        IS { "Islandija" }
+        IT { "Italija" }
+        JM { "Jamaika" }
+        JO { "Jordanija" }
+        JP { "Japonija" }
+        KE { "Kenija" }
+        KG { "Kirgiztanas" }
+        KH { "Kambod\u017Ea" }
+        KI { "Kiribatis" }
+        KM { "Komorai" }
+        KN { "Sent Kitsas ir Nevis" }
+        KP { "\u0160iaur\u0117s Kor\u0117ja" }    // alternate name { "Kor\u0117jos Demokratin\u0117 Liaudies Respublika" }
+        KR { "Piet\u0173 Kor\u0117ja" }    // alternate name { "Kor\u0117jos Respublika" }
+        KW { "Kuveitas" }
+        KY { "Kaiman\u0173 salos" }
+        KZ { "Kazachstanas" }
+        LA { "Laoso Liaudies Demokratin\u0117 Respublika" }
+        LB { "Libanas" }
+        LC { "\u0160ventoji Liucija" }
+        LI { "Lichten\u0161teinas" }
+        LK { "\u0160ri Lanka" }
+        LR { "Liberija" }
+        LS { "Lesotas" }
         LT { "Lietuva" }
+        LU { "Liuksemburgas" }
+        LV { "Latvija" }
+        LY { "Libijos Arab\u0173 D\u017Eamahirija" }
+        MA { "Marokas" }
+        MC { "Monakas" }
+        MD { "Moldovos Respublika" }
+        MG { "Madagaskaras" }
+        MH { "Mar\u0161alo salos" }
+        MK { "Makedonijos Respublika" }
+        ML { "Malis" }
+        MM { "Mjanma" }
+        MN { "Mongolija" }
+        MO { "Kinijos S.A.R. Makao" }
+        MP { "\u0160iaurin\u0117s Marianos salos" }
+        MQ { "Martinika" }
+        MR { "Mauritanija" }
+        MS { "Montserat" }
+        //MT { "Malta" }
+        MU { "Mauricijus" }
+        MV { "Maldivai" }
+        MW { "Malavis" }
+        MX { "Meksika" }
+        MY { "Malaizija" }
+        MZ { "Mozambikas" }
+        NA { "Namibija" }
+        NC { "Naujoji Kaledonija" }
+        NE { "Nigeris" }
+        NF { "Norfolko sala" }
+        NG { "Nigerija" }
+        NI { "Nikaragva" }
+        NL { "Nyderlandai" }
+        NO { "Norvegija" }
+        NP { "Nepalas" }
+        //NR { "Nauru" }
+        NU { "Niuj\u0117" }
+        NZ { "Naujoji Zelandija" }
+        OM { "Omanas" }
+        //PA { "Panama" }
+        //PE { "Peru" }
+        PF { "Pranc\u016Bz\u0173 Polinezija" }
+        PG { "Papua Naujoji Gvin\u0117ja" }
+        PH { "Filipinai" }
+        PK { "Pakistanas" }
+        PL { "Lenkija" }
+        PM { "Sen Pjeras ir Mikelonas" }
+        PN { "Pitkernas" }
+        PR { "Puerto Rikas" }
+        PS { "Palestinos teritorija" }
+        PT { "Portugalija" }
+        //PW { "Palau" }
+        PY { "Paragvajus" }
+        QA { "Kataras" }
+        RE { "Rejunjonas" }
+        RO { "Rumunija" }
+        RU { "Rusijos Federacija" }
+        RW { "Ruanda" }
+        SA { "Saudo Arabija" }
+        SB { "Saliamono salos" }
+        SC { "Sei\u0161eliai" }
+        SD { "Sudanas" }
+        SE { "\u0160vedija" }
+        SG { "Singap\u016Bras" }
+        SH { "\u0160ventoji Elena" }
+        SI { "Slov\u0117nija" }
+        SJ { "Svalbardo ir Jan Majen salos" }
+        //SK { "Slovakia" }
+        SL { "Siera Leon\u0117" }
+        SM { "San Marinas" }
+        SN { "Senegalas" }
+        SO { "Somalis" }
+        SR { "Surinamas" }
+        ST { "San Tom\u0117 ir Princip\u0117" }
+        SV { "El Salvadoras" }
+        SY { "Sirija" }    // alternate name { "Sirijos Arab\u0173 Respublika" }
+        SZ { "Svazilendas" }
+        TC { "Turks ir Kaikos salos" }
+        TD { "\u010Cadas" }
+        TF { "Pranc\u016Bz\u0173 pietin\u0117s teritorijos" }
+        TG { "Togas" }
+        TH { "Tailandas" }
+        TJ { "Tad\u017Eikija" }
+        //TK { "Tokelau" }
+        TL { "Ryt\u0173 Timoras" }
+        TM { "Turkm\u0117nistanas" }
+        TN { "Tunisas" }
+        //TO { "Tonga" }
+        TR { "Turkija" }
+        TT { "Trinidadas ir Tobagas" }
+        //TV { "Tuvalu" }
+        TW { "Taivanis, Kinijos provincija" }
+        TZ { "Tanzanija" }
+        UA { "Ukraina" }
+        //UG { "Uganda" }
+        UM { "JAV antraeil\u0117s teritorijos salos" }
+        //US { "JAV" } // Poor translation. JAV -> United States
+        UY { "Urugvajus" }
+        UZ { "Uzbekija" }
+        VA { "Vatikano Miesto Valstija" }
+        VC { "\u0160ventasis Vincentas ir Grenadinai" }
+        VE { "Venesuela" }
+        VG { "Brit\u0173 Virginijos salos" }
+        VI { "JAV Virginijos salos" } // Poor translation? JAV -> United States
+        VN { "Vietnamas" }
+        //VU { "Vanuatu" }
+        WF { "Valiso ir Futuna salos" }
+        //WS { "Samoa" }
+        YE { "Jemenas" }
+        YT { "Majot\u0117" }
+        YU { "Jugoslavija" }
+        ZA { "Piet\u0173 Afrika" }
+        ZM { "Zambija" }
+        ZW { "Zimbabv\u0117" }
     }
     DateTimePatterns { 
         "HH:mm:ss z",
@@ -23,68 +276,97 @@
         "HH:mm",
         "yyyy 'm.' MMMM d 'd.',EEEE",
         "yyyy 'm.' MMMM d 'd.'",
-        "yyyy.M.d",
-        "yyyy.M.d",
+        "yyyy.MM.dd",
+        "yyyy.MM.dd",
         "{1} {0}",
     }
     DateTimeElements:intvector {
         2,
-        1, // "Minimal Days in First Week" is unknown. Root value used instead
+        4, // "Minimal Days in First Week"   Lithuania follows ISO 8601 
     }
     DayAbbreviations { 
-        "sk",
-        "pr",
-        "an",
-        "tr",
-        "kt",
-        "pn",
-        "\u0161t",
+        "Sk",
+        "Pr",
+        "An",
+        "Tr",
+        "Kt",
+        "Pn",
+        "\u0160t",
     }
     DayNames { 
-        "sekmadienis",
-        "pirmadienis",
-        "antradienis",
-        "tre\u010Diadienis",
-        "ketvirtadienis",
-        "penktadienis",
-        "\u0161e\u0161tadienis",
+        "Sekmadienis",
+        "Pirmadienis",
+        "Antradienis",
+        "Tre\u010Diadienis",
+        "Ketvirtadienis",
+        "Penktadienis",
+        "\u0160e\u0161tadienis",
     }
     Eras { 
         "pr.Kr.",
         "po.Kr.",
     }
     Languages { 
+        ar { "Arab\u0173" }
+        bg { "Bulgar\u0173" }
+        cs { "\u010Cekijos" }
+        da { "Dan\u0173" }
+        de { "Vokie\u010Di\u0173" }
+        el { "Graik\u0173" }
+        en { "Angl\u0173" }
+        es { "Ispan\u0173" }
+        et { "Est\u0173" }
+        fi { "Suomi\u0173" }
+        fr { "Pranc\u016Bz\u0173" }
+        he { "Hebraj\u0173" }
+        hr { "Kroat\u0173" }
+        hu { "Vengr\u0173" }
+        it { "Ital\u0173" }
+        ja { "Japon\u0173" }
+        ko { "Kor\u0117jie\u010Di\u0173" }
         lt { "Lietuvi\u0173" }
+        lv { "Latvi\u0173" }
+        nl { "Oland\u0173" }
+        no { "Norveg\u0173" }
+        pl { "Lenk\u0173" }
+        pt { "Portugal\u0173" }
+        ro { "Rumun\u0173" }
+        ru { "Rus\u0173" }
+        sk { "Slovak\u0173" }
+        sl { "Slov\u0117n\u0173" }
+        sv { "\u0160ved\u0173" }
+        tr { "Turk\u0173" }
+        zh { "Kin\u0173" }
+        //zh_cn { "Kin\u0173 (supaprastinta)" }
+        //zh_tw { "Kin\u0173 (tadicin\u0117)" }
     }
-    LocaleID:int { 0x27 }
-//    LocaleString { "lt" }
     MonthAbbreviations { 
-        "sau",
-        "vas",
-        "kov",
-        "bal",
-        "geg",
-        "bir",
-        "lie",
-        "rgp",
-        "rgs",
-        "spa",
-        "lap",
-        "grd",
+        "Sau",
+        "Vas",
+        "Kov",
+        "Bal",
+        "Geg",
+        "Bir",
+        "Lie",
+        "Rgp",
+        "Rgs",
+        "Spa",
+        "Lap",
+        "Grd",
     }
     MonthNames { 
-        "sausio",
-        "vasario",
-        "kovo",
-        "baland\u017Eio",
-        "gegu\u017E\u0117s",
-        "bir\u017Eelio",
-        "liepos",
-        "rugpj\u016B\u010Dio",
-        "rugs\u0117jo",
-        "spalio",
-        "lapkri\u010Dio",
-        "gruod\u017Eio",
+        "Sausio",
+        "Vasario",
+        "Kovo",
+        "Baland\u017Eio",
+        "Gegu\u017E\u0117s",
+        "Bir\u017Eelio",
+        "Liepos",
+        "Rugpj\u016B\u010Dio",
+        "Rugs\u0117jo",
+        "Spalio",
+        "Lapkri\u010Dio",
+        "Gruod\u017Eio",
     }
     NumberElements { 
         ",",
@@ -99,25 +381,17 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "lit" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
+
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
     }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
     ExemplarCharacters { "[a-z \u0105 \u0119 \u012f \u0173 \u0117 \u016b \u010d \u0161 \u017e]" }
 
     // Currency display names
     Currencies {
         LTL { "Lt", "LTL" }
     }
-}
+}
\ No newline at end of file

Index: lt_LT.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/lt_LT.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lt_LT.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ lt_LT.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,13 +7,10 @@
 
 lt_LT {
     Version{ "2.0" }
-//    LocaleString { "lt_LT" }
     NumberPatterns { 
         "##,##0.##;-##,##0.##",
         "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##%",
         "#E0",
     }
-//    ShortCountry { "LTU" }
-    LocaleID:int { 0x0427 }
 }

Index: lv.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/lv.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lv.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ lv.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -1,4 +1,4 @@
-// ***************************************************************************
+// ***************************************************************************
 // *
 // *   Copyright (C) 1997-2003, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
@@ -7,14 +7,263 @@
 
 lv {
     Version{ "2.0"}
-    CollationElements { 
-        Version { "1.0" }
-        Sequence { "[casefirst upper][backwards 2] &C < c\u030C <<< C\u030C & G < g\u0327 <<< G\u0327 & I < "
-        "y<<< Y& K < k\u0327 <<< K\u0327 & L < l\u0327 <<< L\u0327 & N < n\u0327 <<< N\u0327 & S"
-        " < s\u030C <<< S\u030C & Z < z\u030C <<< Z\u030C" }
+    collations {
+      standard { 
+        Version { "2.0" }
+        Sequence { 
+            "&[before 1]D<č<<<Č"
+            "&[before 1]H<ģ<<<Ģ"
+            "&[before 1]J<y<<<Y"
+            "&[before 1]L<ķ<<<Ķ"
+            "&[before 1]M<ļ<<<Ļ"
+            "&[before 1]O<ņ<<<Ņ"
+            "&[before 1]S<ŗ<<<Ŗ"
+            "&[before 1]T<š<<<Š"
+            "&[before 1]Ʒ<ž<<<Ž"
+        }
+      }
     }
     Countries { 
+        Fallback{ "en"}
+        AD { "Andora" }
+        AE { "Apvienotie Ar\u0101bu Emir\u0101ti" }
+        AF { "Afganist\u0101na" }
+        AG { "Antigva un Barbuda" }
+        AI { "Angilja" }
+        AL { "Alb\u0101nija" }
+        AM { "Arm\u0113nija" }
+        AN { "Anti\u013Cas" }
+        //AO { "Angola" }
+        AQ { "Antarktika" }
+        AR { "Argent\u012Bna" }
+        AS { "Amerik\u0101\u0146u Samoa" }
+        AT { "Austrija" }
+        AU { "Austr\u0101lija" }
+        //AW { "Aruba" }
+        AZ { "Azerbaid\u017E\u0101na" }
+        BA { "Bosnija un Hercegovina" }
+        BB { "Barbadosa" }
+        BD { "Banglade\u0161a" }
+        BE { "Be\u013C\u0123ija" }
+        BF { "Burkinafaso" }
+        BG { "Bulg\u0101rija" }
+        BH { "Bahreina" }
+        //BI { "Burundi" }
+        BJ { "Benina" }
+        BM { "Bermudu salas" }
+        BN { "Bruneja" }
+        BO { "Bol\u012Bvija" }
+        BR { "Braz\u012Blija" }
+        //BS { "Bahamas" }
+        BT { "But\u0101na" }
+        BV { "Buv\u0113 sala" }
+        BW { "Botsv\u0101na" }
+        BY { "Baltkrievija" }
+        BZ { "Beliza" }
+        CA { "Kan\u0101da" }
+        CC { "Kokosu (K\u012Blinga) salas" }
+        CD { "Kongo Demokr\u0101tisk\u0101 Republika" }
+        CF { "Centr\u0101l\u0101frikas Republika" }
+        CG { "Kongo" }
+        CH { "\u0160veice" }
+        CI { "Kotdivu\u0101ra" }
+        CK { "Kuka salas" }
+        CL { "\u010C\u012Ble" }
+        CM { "Kamer\u016Bna" }
+        CN { "\u0136\u012Bna" }
+        CO { "Kolumbija" }
+        CR { "Kostarika" }
+        CU { "Kuba" }
+        CV { "Kaboverde" }
+        CX { "Ziemsv\u0113tku sala" }
+        CY { "Kipra" }
+        CZ { "\u010Cehija" }
+        DE { "V\u0101cija" }
+        DJ { "D\u017Eibutija" }
+        DK { "D\u0101nija" }
+        DM { "Dominika" }
+        DO { "Dominik\u0101nas Republika" }
+        DZ { "Al\u017E\u012Brija" }
+        EC { "Ekvadora" }
+        EE { "Igaunija" }
+        EG { "\u0112\u0123ipte" }
+        EH { "Rietumsah\u0101ra" }
+        ER { "Eritreja" }
+        ES { "Sp\u0101nija" }
+        ET { "Etiopija" }
+        FI { "Somija" }
+        FJ { "Fid\u017Ei" }
+        FK { "Folklenda salas" }
+        FM { "Mikron\u0113zijas Federat\u012Bv\u0101s Valstis" }
+        FO { "Far\u0113ru salas" }
+        FR { "Francija" }
+        GA { "Gabona" }
+        GB { "Lielbrit\u0101nija" }
+        GD { "Gren\u0101da" }
+        GE { "Gruzija" }
+        GF { "Fran\u010Du Gvi\u0101na" }
+        GH { "Gana" }
+        GI { "Gibralt\u0101rs" }
+        GL { "Grenlande" }
+        GM { "Gambija" }
+        GN { "Gvineja" }
+        GP { "Gvadelupa" }
+        GQ { "Ekvatori\u0101l\u0101 Gvineja" }
+        GR { "Grie\u0137ija" }
+        GS { "Dienvidd\u017Eord\u017Eija un Dienvidsendvi\u010Du salas" }
+        GT { "Gvatemala" }
+        GU { "Guama" }
+        GW { "Gvineja-Bisava" }
+        GY { "Gaj\u0101na" }
+        HK { "Honkonga, \u0136\u012Bnas \u012Bpa\u0161\u0101s p\u0101rvaldes apgabals" }
+        HM { "H\u0113rda un Makdonalda salas" }
+        HN { "Hondurasa" }
+        HR { "Horv\u0101tija" }
+        //HT { "Haiti" }
+        HU { "Ung\u0101rija" }
+        ID { "Indon\u0113zija" }
+        IE { "\u012Arija" }
+        IL { "Izra\u0113la" }
+        IN { "Indija" }
+        IO { "Britu Indijas oke\u0101na teritorija" }
+        IQ { "Ir\u0101ka" }
+        IR { "Ir\u0101na" }
+        IS { "Islande" }
+        IT { "It\u0101lija" }
+        JM { "Jamaika" }
+        JO { "Jord\u0101nija" }
+        JP { "Jap\u0101na" }
+        KE { "Kenija" }
+        KG { "Kirg\u012Bzija" }
+        KH { "Kambod\u017Ea" }
+        //KI { "Kiribati" }
+        KM { "Komoru salas" }
+        KN { "Sentkitsa un Nevisa" }
+        KP { "Zieme\u013Ckoreja" }    // alternate name { "Korejas Tautas Demokr\u0101tisk\u0101 Republika" }
+        KR { "Dienvidkoreja" }    // alternate name { "Korejas Republika" }
+        KW { "Kuveita" }
+        KY { "Kaimanu salas" }
+        KZ { "Kazahst\u0101na" }
+        LA { "Laosa" }
+        LB { "Lib\u0101na" }
+        LC { "Sentl\u016Bsija" }
+        LI { "Lihten\u0161teina" }
+        LK { "\u0160rilanka" }
+        LR { "Lib\u0113rija" }
+        LS { "Lesoto" }
+        LT { "Lietuva" }
+        LU { "Luksemburga" }
         LV { "Latvija" }
+        LY { "L\u012Bbija" }
+        MA { "Maroka" }
+        MC { "Monako" }
+        //MD { "Moldova" }
+        MG { "Madagaskara" }
+        MH { "M\u0101r\u0161ala salas" }
+        MK { "Ma\u0137edonija" }
+        //ML { "Mali" }
+        MM { "Mjanma" }
+        MN { "Mongolija" }
+        MO { "Makao, \u0136\u012Bnas \u012Bpa\u0161\u0101s p\u0101rvaldes apgabals" }
+        MP { "Zieme\u013Cu Marianas" }
+        MQ { "Martinika" }
+        MR { "Maurit\u0101nija" }
+        MS { "Montserrata" }
+        //MT { "Malta" }
+        MU { "Maur\u012Bcija" }
+        MV { "Mald\u012Bvija" }
+        MW { "Mal\u0101vija" }
+        MX { "Meksika" }
+        MY { "Malaizija" }
+        MZ { "Mozambika" }
+        NA { "Nam\u012Bbija" }
+        NC { "Jaunkaledonija" }
+        NE { "Nig\u0113ra" }
+        NF { "Norfolka" }
+        NG { "Nig\u0113rija" }
+        NI { "Nikaragva" }
+        NL { "N\u012Bderlande" }
+        NO { "Norv\u0113\u0123ija" }
+        NP { "Nep\u0101la" }
+        //NR { "Nauru" }
+        //NU { "Niue" }
+        NZ { "Jaunz\u0113lande" }
+        OM { "Om\u0101na" }
+        //PA { "Panama" }
+        //PE { "Peru" }
+        PF { "Fran\u010Du Polin\u0113zija" }
+        PG { "Papua-Jaungvineja" }
+        PH { "Filip\u012Bnas" }
+        PK { "Pakist\u0101na" }
+        PL { "Polija" }
+        PM { "Senpj\u0113ra un Mikelona" }
+        PN { "Pitk\u0113rna" }
+        PR { "Puertoriko" }
+        PS { "Palest\u012Bnie\u0161u pa\u0161p\u0101rvaldes teritorija" }
+        PT { "Portug\u0101le" }
+        //PW { "Palau" }
+        PY { "Paragvaja" }
+        QA { "Katara" }
+        RE { "Reinjona" }
+        RO { "Rum\u0101nija" }
+        RU { "Krievija" }
+        RW { "Ruanda" }
+        SA { "Sa\u016Bda Ar\u0101bija" }
+        SB { "Z\u0101lamana salas" }
+        SC { "Sei\u0161e\u013Cu salas" }
+        SD { "Sud\u0101na" }
+        SE { "Zviedrija" }
+        SG { "Singap\u016Bra" }
+        SH { "Sv. Hel\u0113nas sala" }
+        SI { "Slov\u0113nija" }
+        SJ { "Svalb\u0101ra un Jana Majena sala" }
+        SK { "Slov\u0101kija" }
+        SL { "Sjerraleone" }
+        SM { "Sanmar\u012Bno" }
+        SN { "Seneg\u0101la" }
+        SO { "Som\u0101lija" }
+        SR { "Surinama" }
+        ST { "Santome un Prinsipi" }
+        SV { "Salvadora" }
+        SY { "S\u012Brija" }    // alternate name { "S\u012Brijas Ar\u0101bu Republika" }
+        SZ { "Svazilenda" }
+        TC { "T\u0113rksas un Kaikosas salas" }
+        TD { "\u010Cada" }
+        TF { "Fran\u010Du dienvidu teritorijas" }
+        //TG { "Togo" }
+        TH { "Taizeme" }
+        TJ { "Tad\u017Eikist\u0101na" }
+        //TK { "Tokelau" }
+        TL { "Austrumtimora" }
+        TM { "Turkmenist\u0101na" }
+        TN { "Tunisija" }
+        //TO { "Tonga" }
+        TR { "Turcija" }
+        TT { "Trinid\u0101da un Tob\u0101go" }
+        //TV { "Tuvalu" }
+        TW { "Taiv\u0101na, \u0136\u012Bnas province" }
+        TZ { "Tanz\u0101nija" }
+        UA { "Ukraina" }
+        //UG { "Uganda" }
+        UM { "ASV maz\u0101s aizj\u016Bras teritorijas" }
+        //US { "ASV" } // Poor translation. ASV -> United States
+        UY { "Urugvaja" }
+        UZ { "Uzbekist\u0101na" }
+        VA { "Vatik\u0101ns" }
+        VC { "Sentvinsenta un Grenad\u012Bnas" }
+        VE { "Venecu\u0113la" }
+        VG { "Britu Vird\u017E\u012Bnu salas" }
+        VI { "Amerik\u0101\u0146u Vird\u017E\u012Bnu salas" } // Poor translation? Amerik\u0101\u0146u -> United States
+        VN { "Vjetnama" }
+        //VU { "Vanuatu" }
+        WF { "Volisa un Futuna" }
+        //WS { "Samoa" }
+        YE { "Jemena" }
+        YT { "Majota" }
+        YU { "Dienvidsl\u0101vija" }
+        ZA { "Dienvid\u0101frika" }
+        ZM { "Zambija" }
+        ZW { "Zimbabve" }
     }
     DateTimePatterns { 
         "HH:mm:ss z",
@@ -54,16 +303,45 @@
         "m\u0113",
     }
     Languages { 
-        lv { "Latvie\u0161u" }
+        ar { "ar\u0101bu" }
+        bg { "bulg\u0101ru" }
+        cs { "\u010Dehu" }
+        da { "d\u0101\u0146u" }
+        de { "v\u0101cu" }
+        el { "grie\u0137u" }
+        en { "ang\u013Cu" }
+        es { "sp\u0101\u0146u" }
+        et { "igau\u0146u" }
+        fi { "somu" }
+        fr { "fran\u010Du" }
+        he { "ivrits" }
+        hr { "horv\u0101tu" }
+        hu { "ung\u0101ru" }
+        it { "it\u0101lie\u0161u" }
+        ja { "jap\u0101\u0146u" }
+        ko { "korejie\u0161u" }
+        lt { "lietuvie\u0161u" }
+        lv { "latvie\u0161u" }
+        nl { "holandie\u0161u" }
+        no { "norv\u0113\u0123u" }
+        pl { "po\u013Cu" }
+        pt { "portug\u0101\u013Cu" }
+        ro { "rum\u0101\u0146u" }
+        ru { "krievu" }
+        sk { "slov\u0101ku" }
+        sl { "slov\u0113\u0146u" }
+        sv { "zviedru" }
+        tr { "turku" }
+        zh { "\u0137\u012Bnie\u0161u" }
+        //zh_cn { "\u0137\u012Bnie\u0161u (vienk\u0101r\u0161ot\u0101)" }
+        //zh_tw { "\u0137\u012Bnie\u0161u (tradicion\u0101l\u0101)" }
     }
-    LocaleID:int { 0x26 }
-//    LocaleString { "lv" }
     MonthAbbreviations { 
         "Jan",
         "Feb",
         "Mar",
         "Apr",
-        "Maijs",
+        "Mai",
         "J\u016Bn",
         "J\u016Bl",
         "Aug",
@@ -99,25 +377,16 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "lav" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
-    }
     ExemplarCharacters { "[a-z \u0101 \u0113 \u012b \u014d \u016b \u0123 \u0137 \u013c \u0146 \u0157 \u010d \u0161 \u017e]" }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
+    }
 
     // Currency display names
     Currencies {
         LVL { "Ls", "LVL" }
     }
-}
+}
\ No newline at end of file

Index: lv_LV.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/lv_LV.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lv_LV.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ lv_LV.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,13 +7,10 @@
 
 lv_LV {
     Version{ "2.0" }
-//    LocaleString { "lv_LV" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "LVA" }
-    LocaleID:int { 0x0426 }
 }

Index: mk.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/mk.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mk.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ mk.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -6,10 +6,10 @@
 // ***************************************************************************
 
 mk {
-     Version { "2.0"}
-     // We use UCA collation table optimized for Cyrillic
-     // as defined in the Russian locale
-     CollationElements:alias { "ru" }
+    Version { "2.0"}
+    // We use UCA collation table optimized for Cyrillic
+    // as defined in the Russian locale
+    collations:alias { "ru" }
 
     Countries { 
         MK { "\u041C\u0430\u043A\u0435\u0434\u043E\u043D\u0438\u0458\u0430" }
@@ -25,6 +25,10 @@
         "dd.M.yy",
         "{1} {0}",
     }
+    DateTimeElements:intvector {
+        2,
+        1, // "Minimal Days in First Week" is unknown. Root value used instead
+    }
     DayAbbreviations { 
         "\u043D\u0435\u0434.",
         "\u043F\u043E\u043D.",
@@ -50,8 +54,6 @@
     Languages { 
         mk { "\u043C\u0430\u043A\u0435\u0434\u043E\u043D\u0441\u043A\u0438" }
     }
-    LocaleID:int { 0x2f }
-//    LocaleString { "mk" }
     MonthAbbreviations { 
         "\u0458\u0430\u043D.",
         "\u0444\u0435\u0432.",
@@ -93,18 +95,10 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "mkd" }
     localPatternChars { "GuMtkHmsSEDFwWahKzUe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
-    }
+
     LocaleScript{   
         "Cyrl",     // ISO 15924 Name 
     }

Index: mk_MK.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/mk_MK.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mk_MK.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ mk_MK.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,13 +7,10 @@
 
 mk_MK {
     Version{ "2.0" }
-//    LocaleString { "mk_MK" }
     NumberPatterns { 
         "#,##0.###;(#,##0.###)",
         "\u00A4 #,##0.00;-\u00A4 #,##0.00",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "MKD" }
-    LocaleID:int { 0x042f }
 }

Index: mr.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/mr.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mr.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ mr.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -7,7 +7,6 @@
 
 mr {
     Version { "2.0" }
-//    ShortLanguage { mar }
     Languages {
         root { "\u092e\u0930\u093e\u0920\u0940" }
 
@@ -236,13 +235,13 @@
             "IST"
         }
     }
-
-    LocaleID:int { 0x4e }
-    CollationElements {
+    collations {
+      standard { 
         Version { "1.0" }
         Sequence { 
             "[normalization on]"
         }
+      }
     }
     LocaleScript:array { 
         "Deva"        // ISO 15924 Name 

Index: mr_IN.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/mr_IN.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mr_IN.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ mr_IN.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -8,16 +8,12 @@
 
 mr_IN {
     Version { "2.0" }
-    LocaleID:int { 0x044e }
-//    ShortCountry { IND }
-
     NumberPatterns {
         "##,##,##0.###;-##,##,##0.###",
         "\u00A4 ##,##,##0.00;-\u00A4 ##,##,##0.00",
         "##,##,##0%",
         "#E0",
     }
-//    LocaleString { "mr_IN" }
     DateTimePatterns {
         "h:mm:ss a z",
         "h:mm:ss a z",

Index: mt.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/mt.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mt.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ mt.txt	6 Apr 2004 10:08:13 -0000	1.2
@@ -19,17 +19,11 @@
 
 mt {
     Version { "1.0" } // 2002-01-15 
-//    ShortLanguage { mlt }
 
-//  "%%PHONEBOOK" { "Bħal lista tat-telefon" }
-//  "%%PINYIN" { "Pinyin Order" }
-//  "%%TRADITIONAL" { "Traditional" }
-//  "%%STROKE" { "Stroke Order" }
-//  "%%DIRECT" { "Dritt Order" }
-    "%%PREEURO" { "Qabel il-Euro" }
 
     // Duplicate data has been commented out.
     Languages {
+        Fallback{ "en"}
         root    { "Għerq" } // the root locale
 //------------------------------------------------
         //aa	{ "Afar" }	// Afar
@@ -170,7 +164,6 @@
         gem	{ "Ġermaniku (Oħra)" }	// Germanic (Other)
         gil	{ "Gilbertjan" }	// Gilbertese
         gl	{ "Gallegjan" }	// Gallegan
-        gla	{ "Galliku (Skoċċiż)" }	// Gaelic (Scots)
         gmh	{ "Ġermaniku, Medjevali Pulit (ca. 1050-1500)" }	// German, Middle High (ca.1050-1500)
         gn	{ "Gwarani" }	// Guarani
         goh	{ "Ġermaniku, Antik Pulit (ca. 750-1050)" }	// German, Old High (ca.750-1050)
@@ -252,8 +245,6 @@
         //lam	{ "Lamba" }	// Lamba
         lb	{ "Letżburgiż" }	// Letzeburgesch
         lez	{ "Leżgjan" }	// Lezghian
-        lin	{ "Lingaljan" }	// Lingala
-        lit	{ "Litwanjan" }	// Lithuanian
         ln	{ "Lingaljan" }	// Lingala
         //lo	{ "Lao" }	// Lao
         //lol	{ "Mongo" }	// Mongo
@@ -429,7 +420,6 @@
         tsi	{ "Zimxjan" }	// Tsimshian
         //tt	{ "Tatar" }	// Tatar
         //tum	{ "Tumbuka" }	// Tumbuka
-        tur	{ "Tork" }	// Turkish
         tut	{ "Altajk (Oħra)" }	// Altaic (Other)
         //tvl	{ "Tuvalu" }	// Tuvalu
         //tw	{ "Twi" }	// Twi
@@ -470,6 +460,7 @@
 
     // Duplicate data has been commented out.
     Countries {
+        Fallback{ "en"}
         //AD { "Andorra" } 	// Andorra
         AE { "Emirati Għarab Maqgħuda" } 	// United Arab Emirates
         AF { "Afganistan" } 	// Afghanistan
@@ -716,8 +707,8 @@
     }
 
     Eras {
-         "QK",  // Quddiem Kristu  [from Il-BIBBJA - it-tieni edijoni,
-         "WK"   // Wara Kristu      Ghaqda Biblika Maltija]
+        "QK",  // Quddiem Kristu  [from Il-BIBBJA - it-tieni edijoni,
+        "WK"   // Wara Kristu      Ghaqda Biblika Maltija]
     }
 
     DayAbbreviations { 
@@ -773,19 +764,23 @@
 // Note that IE is **NOT** sorted as ittra waħda. 
 // So says the Akkademja tal-Malta
 
-   CollationElements
-   {
-        Version { "1.0" }
-        Sequence { "& B < ċ <<< Ċ" // ċ  Ċ
-                   "    < c<<<C"      
-                   "& F < ġ<<< Ġ "              // ġ  Ġ
-                   "    < g<<<G"
-                   "    < għ <<< gĦ <<< Għ <<< GĦ "
-                   "& H < ħ  <<< Ħ "           
-                   "& Y < ż<<< Ż"               // ż Ż
-                   "    < z<<<Z" }
-   }
+    collations {
+        standard {
+            Version { "1.0" }
+            Sequence { "& B < ċ<<<Ċ" // ċ  Ċ
+                           "< c<<<C"
+                       "& F < ġ<<<Ġ"              // ġ  Ġ
+                           "< g<<<G"
+                           "< għ <<< gĦ <<< Għ <<< GĦ"
+                       "& H < ħ  <<< Ħ"
+                       "& Y < ż<<<Ż"               // ż Ż
+                           "< z<<<Z" }
+        }
+    }
 
+//    Variants{
+//        PREEURO { "Qabel il-Euro" }
+//    }
 // Time zone
 //CET: 
     zoneStrings {
@@ -797,196 +792,194 @@
             "CEST"
         }
     }
-
-    LocaleID:int { 0x3A }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
+    }
 
     ExemplarCharacters { "[[a-z \u00e0 \u00ec \u00f9 \u00e8 \u00f2 ċ ġ ħ {għ} ż]-[cy]]" }
 
 // Spellout rules.  Experimental.
 
-     SpelloutRules {
-            // This rule set shows the normal simple formatting rules for English
-            "%simplified:\n"
-                   // negative number rule.  This rule is used to format negative
-                   // numbers.  The result of formatting the number's absolute
-                   // value is placed where the >> is.
-            "    -x: minus >>;\n"
-                   // faction rule.  This rule is used for formatting numbers
-                   // with fractional parts.  The result of formatting the
-                   // number's integral part is substituted for the <<, and
-                   // the result of formatting the number's fractional part
-                   // (one digit at a time, e.g., 0.123 is "zero punt one two
-                   // three") replaces the >>.
-            "    x.x: << punt >>;\n"
-                   // the rules for the values from 0 to 19 are simply the
-                   // words for those numbers
-            "    żero; wieħed; tnejn; tlieta; erbgħa; ħamsa; sitta; sebgħa; tmienja; disgħa;\n"
-            "    għaxra; ħdax; tnax; tlettax; erbatax; ħmistax; sittax;\n"
-            "        sbatax; tmintax; dsatax;\n"
-                   // beginning at 20, we use the >> to mark the position where
-                   // the result of formatting the number's ones digit.  Thus,
-                   // we only need a new rule at every multiple of 10.  Text in
-                   // backets is omitted if the value being formatted is an
-                   // even multiple of 10.
-            "    20: [>> u ]għoxrin;\n"
-            "    30: [>> u ]tletin;\n"
-            "    40: [>> u ]erbgħin;\n"
-            "    50: [>> u ]ħamsin;\n"
-            "    60: [>> u ]sittin;\n"
-            "    70: [>> u ]sebgħin;\n"
-            "    80: [>> u ]tmenin;\n"
-            "    90: [>> u ]disgħin;\n"
-                   // beginning at 100, we can use << to mark the position where
-                   // the result of formatting the multiple of 100 is to be
-                   // inserted.  Notice also that the meaning of >> has shifted:
-                   // here, it refers to both the ones place and the tens place.
-                   // The meanings of the << and >> tokens depend on the base value
-                   // of the rule.  A rule's divisor is (usually) the highest
-                   // power of 10 that is less than or equal to the rule's base
-                   // value.  The value being formatted is divided by the rule's
-                   // divisor, and the integral quotient is used to get the text
-                   // for <<, while the remainder is used to produce the text
-                   // for >>.  Again, text in brackets is omitted if the value
-                   // being formatted is an even multiple of the rule's divisor
-                   // (in this case, an even multiple of 100)
-            "    100: mija[ u >>];\n"
-            "    200: mitejn[ u >>];\n"
-                   // The rules for the higher numbers work the same way as the
-                   // rule for 100: Again, the << and >> tokens depend on the
-                   // rule's divisor, which for all these rules is also the rule's
-                   // base value.  To group by thousand, we simply don't have any
-                   // rules between 1,000 and 1,000,000.
-            "    1000: << elf[ u >>];\n"
-            "    2000: << elfejn[ u >>];\n"
-            "    3000: tliet elef [ u >>];\n"
-            "    1,000,000: << miljun[ u >>];\n"
-            "    1,000,000,000: << biljun[ >>];\n"
-            "    1,000,000,000,000: << triljun[ >>];\n"
-                   // overflow rule.  This rule specifies that values of a
-                   // quadrillion or more are shown in numerals rather than words.
-                   // The == token means to format (with new rules) the value
-                   // being formatted by this rule and place the result where
-                   // the == is.  The #,##0 inside the == signs is a
-                   // DecimalFormat pattern.  It specifies that the value should
-                   // be formatted with a DecimalFormat object, and that it
-                   // should be formatted with no decimal places, at least one
-                   // digit, and a thousands separator.
-            "    1,000,000,000,000,000: =#,##0=;\n"
+    SpelloutRules {
+        // This rule set shows the normal simple formatting rules for English
+        "%simplified:\n"
+                // negative number rule.  This rule is used to format negative
+                // numbers.  The result of formatting the number's absolute
+                // value is placed where the >> is.
+            "-x: minus >>;\n"
+                // faction rule.  This rule is used for formatting numbers
+                // with fractional parts.  The result of formatting the
+                // number's integral part is substituted for the <<, and
+                // the result of formatting the number's fractional part
+                // (one digit at a time, e.g., 0.123 is "zero punt one two
+                // three") replaces the >>.
+            "x.x: << punt >>;\n"
+                // the rules for the values from 0 to 19 are simply the
+                // words for those numbers
+            "żero; wieħed; tnejn; tlieta; erbgħa; ħamsa; sitta; sebgħa; tmienja; disgħa;\n"
+            "għaxra; ħdax; tnax; tlettax; erbatax; ħmistax; sittax;\n"
+            "    sbatax; tmintax; dsatax;\n"
+                // beginning at 20, we use the >> to mark the position where
+                // the result of formatting the number's ones digit.  Thus,
+                // we only need a new rule at every multiple of 10.  Text in
+                // backets is omitted if the value being formatted is an
+                // even multiple of 10.
+            "20: [>> u ]għoxrin;\n"
+            "30: [>> u ]tletin;\n"
+            "40: [>> u ]erbgħin;\n"
+            "50: [>> u ]ħamsin;\n"
+            "60: [>> u ]sittin;\n"
+            "70: [>> u ]sebgħin;\n"
+            "80: [>> u ]tmenin;\n"
+            "90: [>> u ]disgħin;\n"
+                // beginning at 100, we can use << to mark the position where
+                // the result of formatting the multiple of 100 is to be
+                // inserted.  Notice also that the meaning of >> has shifted:
+                // here, it refers to both the ones place and the tens place.
+                // The meanings of the << and >> tokens depend on the base value
+                // of the rule.  A rule's divisor is (usually) the highest
+                // power of 10 that is less than or equal to the rule's base
+                // value.  The value being formatted is divided by the rule's
+                // divisor, and the integral quotient is used to get the text
+                // for <<, while the remainder is used to produce the text
+                // for >>.  Again, text in brackets is omitted if the value
+                // being formatted is an even multiple of the rule's divisor
+                // (in this case, an even multiple of 100)
+            "100: mija[ u >>];\n"
+            "200: mitejn[ u >>];\n"
+                // The rules for the higher numbers work the same way as the
+                // rule for 100: Again, the << and >> tokens depend on the
+                // rule's divisor, which for all these rules is also the rule's
+                // base value.  To group by thousand, we simply don't have any
+                // rules between 1,000 and 1,000,000.
+            "1000: << elf[ u >>];\n"
+            "2000: << elfejn[ u >>];\n"
+            "3000: tliet elef [ u >>];\n"
+            "1,000,000: << miljun[ u >>];\n"
+            "1,000,000,000: << biljun[ >>];\n"
+            "1,000,000,000,000: << triljun[ >>];\n"
+                // overflow rule.  This rule specifies that values of a
+                // quadrillion or more are shown in numerals rather than words.
+                // The == token means to format (with new rules) the value
+                // being formatted by this rule and place the result where
+                // the == is.  The #,##0 inside the == signs is a
+                // DecimalFormat pattern.  It specifies that the value should
+                // be formatted with a DecimalFormat object, and that it
+                // should be formatted with no decimal places, at least one
+                // digit, and a thousands separator.
+            "1,000,000,000,000,000: =#,##0=;\n"
 
-            // %default is a more elaborate form of %simplified;  It is basically
-            // the same, except that it introduces "and" before the ones digit
-            // when appropriate (basically, between the tens and ones digits) and
-            // separates the thousands groups with commas in values over 100,000.
-            "%default:\n"
-                   // negative-number and fraction rules.  These are the same
-                   // as those for %simplified, but have to be stated here too
-                   // because this is an entry point
-            "    -x: minus >>;\n"
-            "    x.x: << punt >>;\n"
-                   // just use %simplified for values below 100
-            "    =%simplified=;\n"
-                   // for values from 100 to 9,999 use %%and to decide whether or
-                   // not to interpose the "and"
-            "    100: mija[ >%%and>];\n"
-            "    200: mitejn[ >%%and>];\n"
-            "    300: tlett mija[ >%%and>];\n"
-            "    400: erbgħa mija[ >%%and>];\n"
-            "    500: ħames mija[ >%%and>];\n"
-            "    600: sitt mija[ >%%and>];\n"
-            "    700: sebgħa mija[ >%%and>];\n"
-            "    800: tmin mija[ >%%and>];\n"
-            "    900: disgħa mija[ >%%and>];\n"
-            "    1000: << elf[ >%%and>];\n"
-                   // for values of 100,000 and up, use %%commas to interpose the
-                   // commas in the right places (and also to interpose the "and")
-            "    100,000>>: << thousand[>%%commas>];\n"
-            "    1,000,000: << million[>%%commas>];\n"
-            "    1,000,000,000: << billion[>%%commas>];\n"
-            "    1,000,000,000,000: << trillion[>%%commas>];\n"
-            "    1,000,000,000,000,000: =#,##0=;\n"
-            // if the value passed to this rule set is greater than 100, don't
-            // add the "and"; if it's less than 100, add "and" before the last
-            // digits
-            "%%and:\n"
-            "    u =%default=;\n"
-            "    100: =%default=;\n"
-            // this rule set is used to place the commas
-            "%%commas:\n"
-                   // for values below 100, add "and" (the apostrophe at the
-                   // beginning is ignored, but causes the space that follows it
-                   // to be significant: this is necessary because the rules
-                   // calling %%commas don't put a space before it)
-            "    ' and =%default=;\n"
-                   // put a comma after the thousands (or whatever preceded the
-                   // hundreds)
-            "    100: , =%default=;\n"
-                   // put a comma after the millions (or whatever precedes the
-                   // thousands)
-            "    1000: , <%default< thousand, >%default>;\n"
-                   // and so on...
-            "    1,000,000: , =%default=;"
-            // %%lenient-parse isn't really a set of number formatting rules;
-            // it's a set of collation rules.  Lenient-parse mode uses a Collator
-            // object to compare fragments of the text being parsed to the text
-            // in the rules, allowing more leeway in the matching text.  This set
-            // of rules tells the formatter to ignore commas when parsing (it
-            // already ignores spaces, which is why we refer to the space; it also
-            // ignores hyphens, making "twenty one" and "twenty-one" parse
-            // identically)
-            "%%lenient-parse:\n"
-            //            "    & ' ' , ',' ;\n"
-            "   &\u0000 << ' ' << ',' << '-'; \n"
+        // %default is a more elaborate form of %simplified;  It is basically
+        // the same, except that it introduces "and" before the ones digit
+        // when appropriate (basically, between the tens and ones digits) and
+        // separates the thousands groups with commas in values over 100,000.
+        "%default:\n"
+                // negative-number and fraction rules.  These are the same
+                // as those for %simplified, but have to be stated here too
+                // because this is an entry point
+            "-x: minus >>;\n"
+            "x.x: << punt >>;\n"
+                // just use %simplified for values below 100
+            "=%simplified=;\n"
+                // for values from 100 to 9,999 use %%and to decide whether or
+                // not to interpose the "and"
+            "100: mija[ >%%and>];\n"
+            "200: mitejn[ >%%and>];\n"
+            "300: tlett mija[ >%%and>];\n"
+            "400: erbgħa mija[ >%%and>];\n"
+            "500: ħames mija[ >%%and>];\n"
+            "600: sitt mija[ >%%and>];\n"
+            "700: sebgħa mija[ >%%and>];\n"
+            "800: tmin mija[ >%%and>];\n"
+            "900: disgħa mija[ >%%and>];\n"
+            "1000: << elf[ >%%and>];\n"
+                // for values of 100,000 and up, use %%commas to interpose the
+                // commas in the right places (and also to interpose the "and")
+            "100,000>>: << thousand[>%%commas>];\n"
+            "1,000,000: << million[>%%commas>];\n"
+            "1,000,000,000: << billion[>%%commas>];\n"
+            "1,000,000,000,000: << trillion[>%%commas>];\n"
+            "1,000,000,000,000,000: =#,##0=;\n"
+        // if the value passed to this rule set is greater than 100, don't
+        // add the "and"; if it's less than 100, add "and" before the last
+        // digits
+        "%%and:\n"
+            "u =%default=;\n"
+            "100: =%default=;\n"
+        // this rule set is used to place the commas
+        "%%commas:\n"
+                // for values below 100, add "and" (the apostrophe at the
+                // beginning is ignored, but causes the space that follows it
+                // to be significant: this is necessary because the rules
+                // calling %%commas don't put a space before it)
+            "' and =%default=;\n"
+                // put a comma after the thousands (or whatever preceded the
+                // hundreds)
+            "100: , =%default=;\n"
+                // put a comma after the millions (or whatever precedes the
+                // thousands)
+            "1000: , <%default< thousand, >%default>;\n"
+                // and so on...
+            "1,000,000: , =%default=;"
+        // %%lenient-parse isn't really a set of number formatting rules;
+        // it's a set of collation rules.  Lenient-parse mode uses a Collator
+        // object to compare fragments of the text being parsed to the text
+        // in the rules, allowing more leeway in the matching text.  This set
+        // of rules tells the formatter to ignore commas when parsing (it
+        // already ignores spaces, which is why we refer to the space; it also
+        // ignores hyphens, making "twenty one" and "twenty-one" parse
+        // identically)
+        "%%lenient-parse:\n"
+        //                "& ' ' , ',' ;\n"
+            "&\u0000 << ' ' << ',' << '-'; \n"
     }
 
 
     DurationRules {
-            // main rule set for formatting with words
-            "%with-words:\n"
-                   // take care of singular and plural forms of "second"
-            "    0 sekondi; 1 sekonda; =0= sekondi;\n"
-                   // use %%min to format values greater than 60 seconds
-            "    60/60: <%%min<[, >>];\n"
-                   // use %%hr to format values greater than 3,600 seconds
-                   // (the ">>>" below causes us to see the number of minutes
-                   // when when there are zero minutes)
-            "    3600/60: <%%hr<[, >>>];\n"
-            // this rule set takes care of the singular and plural forms
-            // of "minute"
-            "%%min:\n"
-            "    0 minuti; 1 minuta; =0= minuti;\n"
-            // this rule set takes care of the singular and plural forms
-            // of "hour"
-            "%%hr:\n"
-            "    0 siegħat; 1 siegħa; =0= siegħat;\n"
+        // main rule set for formatting with words
+        "%with-words:\n"
+                // take care of singular and plural forms of "second"
+            "0 sekondi; 1 sekonda; =0= sekondi;\n"
+                // use %%min to format values greater than 60 seconds
+            "60/60: <%%min<[, >>];\n"
+                // use %%hr to format values greater than 3,600 seconds
+                // (the ">>>" below causes us to see the number of minutes
+                // when when there are zero minutes)
+            "3600/60: <%%hr<[, >>>];\n"
+        // this rule set takes care of the singular and plural forms
+        // of "minute"
+        "%%min:\n"
+            "0 minuti; 1 minuta; =0= minuti;\n"
+        // this rule set takes care of the singular and plural forms
+        // of "hour"
+        "%%hr:\n"
+            "0 siegħat; 1 siegħa; =0= siegħat;\n"
 
-            // main rule set for formatting in numerals
-            "%in-numerals:\n"
-                   // values below 60 seconds are shown with "sec."
-            "    =0= sek.;\n"
-                   // higher values are shown with colons: %%min-sec is used for
-                   // values below 3,600 seconds...
-            "    60: =%%min-sec=;\n"
-                   // ...and %%hr-min-sec is used for values of 3,600 seconds
-                   // and above
-            "    3600: =%%hr-min-sec=;\n"
-            // this rule causes values of less than 10 minutes to show without
-            // a leading zero
-            "%%min-sec:\n"
-            "    0: :=00=;\n"
-            "    60/60: <0<>>;\n"
-            // this rule set is used for values of 3,600 or more.  Minutes are always
-            // shown, and always shown with two digits
-            "%%hr-min-sec:\n"
-            "    0: :=00=;\n"
-            "    60/60: <00<>>;\n"
-            "    3600/60: <#,##0<:>>>;\n"
-            // the lenient-parse rules allow several different characters to be used
-            // as delimiters between hours, minutes, and seconds
-            "%%lenient-parse:\n"
-            "    & ':' = '.' = ' ' = '-';\n" 
+        // main rule set for formatting in numerals
+        "%in-numerals:\n"
+                // values below 60 seconds are shown with "sec."
+            "=0= sek.;\n"
+                // higher values are shown with colons: %%min-sec is used for
+                // values below 3,600 seconds...
+            "60: =%%min-sec=;\n"
+                // ...and %%hr-min-sec is used for values of 3,600 seconds
+                // and above
+            "3600: =%%hr-min-sec=;\n"
+        // this rule causes values of less than 10 minutes to show without
+        // a leading zero
+        "%%min-sec:\n"
+            "0: :=00=;\n"
+            "60/60: <0<>>;\n"
+        // this rule set is used for values of 3,600 or more.  Minutes are always
+        // shown, and always shown with two digits
+        "%%hr-min-sec:\n"
+            "0: :=00=;\n"
+            "60/60: <00<>>;\n"
+            "3600/60: <#,##0<:>>>;\n"
+        // the lenient-parse rules allow several different characters to be used
+        // as delimiters between hours, minutes, and seconds
+        "%%lenient-parse:\n"
+            "& ':' = '.' = ' ' = '-';\n" 
     }
 
 

Index: mt_MT.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/mt_MT.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mt_MT.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ mt_MT.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -8,19 +8,11 @@
 // srl@monkey.sbay.org
 
 mt_MT {
-      
     Version { "2.0" }
-
-//    ShortCountry { MLT }
-
-
     NumberPatterns {
         "#,##0.###;-#,##0.###",
         "\u00A4#,##0.00;(\u00A4#,##0.00)",
         "#,##0%",
         "#E0",
     }
-
-    LocaleID:int { 0x043A }
-
 }

Index: nb.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/nb.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nb.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ nb.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -1,4 +1,4 @@
-// ***************************************************************************
+// ***************************************************************************
 // *
 // *   Copyright (C) 1997-2003, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
@@ -7,82 +7,404 @@
 
 nb {
     Version{"2.0"}
-    CollationElements {
-	    Version { "1.0" }
-		Sequence { "& Z < \u00E6<<< \u00C6  < a\u0308<<< A\u0308< \u00F8<<< \u00D8"
-        " < o\u0308<<< O\u0308< o\u030B<<< O\u030B < a\u030A<<< A\u030A<<< aa <<< aA <<< Aa <<< AA  & "
-        "V<<< w<<< W" }
-	}
+    collations {
+      standard { 
+        Version { "2.0" }
+        Sequence { 
+            "&D<<đ<<<Đ<<ð<<<Ð "
+            "&t<<<þ/h"
+            "&T<<<Þ/H"
+            "&Y<<ü<<<Ü<<ű<<<Ű"
+            "&[before 1]ʒ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å"
+        }
+      }
+    }
     Countries {
+        Fallback{ "en"}
+        //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 { "\u00D8sterrike" }
+        //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\u00F8ya" }
+        //BW { "Botswana" }
+        BY { "Hviterussland" }
+        //BZ { "Belize" }
+        //CA { "Canada" }
+        CC { "Kokos\u00F8yene (Keeling\u00F8yene)" }
+        CD { "Kongo, Den demokratiske republikken" }
+        CF { "Den sentralafrikanske republikk" }
+        CG { "Kongo" }
+        CH { "Sveits" }
+        CI { "Elfenbenskysten" }
+        CK { "Cook\u00F8yene" }
+        //CL { "Chile" }
+        CM { "Kamerun" }
+        CN { "Kina" }
+        //CO { "Colombia" }
+        //CR { "Costa Rica" }
+        //CU { "Cuba" }
+        CV { "Kapp Verde" }
+        CX { "Christmas\u00F8ya" }
+        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\u00F8yene (Malvinas)" }    // alternate name { "Falklands\u00F8yene" }
+        FM { "Mikronesiaf\u00F8derasjonen" }
+        FO { "F\u00E6r\u00F8yene" }
+        FR { "Frankrike" }
+        //GA { "Gabon" }
+        GB { "Storbritannia" }
+        //GD { "Grenada" }
+        //GE { "Georgia" }
+        GF { "Fransk Guyana" }
+        //GH { "Ghana" }
+        //GI { "Gibraltar" }
+        GL { "Gr\u00F8nland" }
+        //GM { "Gambia" }
+        //GN { "Guinea" }
+        //GP { "Guadeloupe" }
+        GQ { "Ekvatorial-Guinea" }
+        GR { "Hellas" }
+        GS { "S\u00F8r-Georgia og S\u00F8r-Sandwich-\u00F8yene" }
+        //GT { "Guatemala" }
+        //GU { "Guam" }
+        //GW { "Guinea-Bissau" }
+        //GY { "Guyana" }
+        HK { "Hong Kong S.A.R. (Kina)" }
+        HM { "Heard- og McDonalds\u00F8yene" }
+        //HN { "Honduras" }
+        HR { "Kroatia" }
+        //HT { "Haiti" }
+        HU { "Ungarn" }
+        //ID { "Indonesia" }
+        IE { "Irland" }
+        //IL { "Israel" }
+        //IN { "India" }
+        IO { "Britiske omr\u00E5der 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 { "Korea (Nord)" }    // alternate name { "Korea, Den demokratiske republikken" }
+        KR { "Korea (S\u00F8r)" }    // alternate name { "Korea, Republikken" }
+        //KW { "Kuwait" }
+        KY { "Cayman\u00F8yene" }
+        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, Den arabiske republikken" }
+        MA { "Marokko" }
+        //MC { "Monaco" }
+        //MD { "Moldova" }
+        MG { "Madagaskar" }
+        MH { "Marshall\u00F8yene" }
+        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\u00F8yene" }
+        //NG { "Nigeria" }
+        //NI { "Nicaragua" }
+        NL { "Nederland" }
         NO { "Norge" }
+        //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\u00F8derasjon" }
+        //RW { "Rwanda" }
+        //SA { "Saudi Arabia" }
+        SB { "Salomon\u00F8yene" }
+        SC { "Seychellene" }
+        //SD { "Sudan" }
+        SE { "Sverige" }
+        //SG { "Singapore" }
+        //SH { "St. Helena" }
+        //SI { "Slovenia" }
+        SJ { "Svalbard og Jan Mayen" }
+        //SK { "Slovakia" }
+        //SL { "Sierra Leone" }
+        //SM { "San Marino" }
+        //SN { "Senegal" }
+        //SO { "Somalia" }
+        SR { "Surinam" }
+        ST { "Sao Tome og Principe" }
+        //SV { "El Salvador" }
+        //SY { "Syria" }    // alternate name { "Syria, Den arabiske republikken" }
+        //SZ { "Swaziland" }
+        TC { "Turks- og Caicos\u00F8yene" }
+        TD { "Tchad" }
+        TF { "Franske s\u00F8romr\u00E5der" }
+        //TG { "Togo" }
+        //TH { "Thailand" }
+        TJ { "Tadsjikistan" }
+        //TK { "Tokelau" }
+        TL { "\u00D8st-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 \u00F8yer" }
+        US { "Sambandsstatane" }
+        //UY { "Uruguay" }
+        UZ { "Usbekistan" }
+        VA { "Vatikanstaten" }
+        VC { "St. Vincent og Grenadinene" }
+        //VE { "Venezuela" }
+        VG { "Jomfru\u00F8yene (britisk)" }
+        //VI { "Jomfru\u00F8yene (amerikansk)" } // Poor translation. amerikansk -> United States
+        //VN { "Vietnam" }
+        //VU { "Vanuatu" }
+        WF { "Wallis og Futuna" }
+        //WS { "Samoa" }
+        //YE { "Yemen" }
+        //YT { "Mayotte" }
+        YU { "Jugoslavia" }
+        ZA { "S\u00F8r-Afrika" }
+        //ZM { "Zambia" }
+        //ZW { "Zimbabwe" }
+    }
+    // Currency display names
+    Currencies {
+        NOK { "kr", "NOK" }
     }
     DateTimeElements:intvector {
         2,
         4,
     }
     DateTimePatterns {
-	    "'kl 'HH.mm z",
-	    "HH:mm:ss z",
-	    "HH:mm:ss",
-	    "HH:mm",
-	    "d. MMMM yyyy",
-	    "d. MMMM yyyy",
-	    "dd.MMM.yy",
-	    "dd.MM.yy",
-	    "{1} {0}",
+        "'kl. 'HH.mm.ss z",
+        "HH.mm.ss z",
+        "HH.mm.ss",
+        "HH.mm",
+        "EEEE d. MMMM yyyy",
+        "d. MMMM yyyy",
+        "d. MMM. yyyy",
+        "dd.MM.yy",
+        "{1} {0}",
     }
     DayAbbreviations {
-	    "s\u00F8",
-	    "ma",
-	    "ti",
-	    "on",
-	    "to",
-	    "fr",
-	    "l\u00F8",
+        "s\u00F8",
+        "ma",
+        "ti",
+        "on",
+        "to",
+        "fr",
+        "l\u00F8",
     }
     DayNames {
-	    "s\u00F8ndag",
-	    "mandag",
-	    "tirsdag",
-	    "onsdag",
-	    "torsdag",
-	    "fredag",
-	    "l\u00F8rdag",
+        "s\u00F8ndag",
+        "mandag",
+        "tirsdag",
+        "onsdag",
+        "torsdag",
+        "fredag",
+        "l\u00F8rdag",
+    }
+    Eras {
+        "f.Kr.",
+        "e.Kr.",
     }
     Languages {
-        nb { "bokm\u00E5l" }
-        nn { "nynorsk" }
+        af { "afrikaans" }
+        am { "amharisk" }
+        ar { "arabisk" }
+        be { "hviterussisk" }
+        bg { "bulgarsk" }
+        bn { "bengali" }
+        ca { "katalansk" }
+        cs { "tsjekkisk" }
+        da { "dansk" }
+        de { "tysk" }
+        el { "gresk" }
+        en { "engelsk" }
+        eo { "esperanto" }
+        es { "spansk" }
+        et { "estisk" }
+        eu { "baskisk" }
+        fa { "persisk" }
+        fi { "finsk" }
+        fo { "f\u00e6r\u00F8ysk" }
+        fr { "fransk" }
+        ga { "irsk" }
+        gl { "galicisk" }
+        gu { "gujarati" }
+        gv { "manx" }
+        haw { "hawaiisk" }
+        he { "hebraisk" }
+        hi { "hindi" }
+        hr { "kroatisk" }
+        hu { "ungarsk" }
+        hy { "armensk" }
+        id { "indonesisk" }
+        is { "islandsk" }
+        it { "italiensk" }
+        iu { "inuktitut" }
+        ja { "japansk" }
+        kl { "kalaallisut" }
+        kn { "kannada" }
+        ko { "koreansk" }
+        kw { "kornisk" }
+        lt { "litauisk" }
+        lv { "latvisk" }
+        mk { "makedonsk" }
+        mr { "marathi" }
+        mt { "maltesisk" }
+        nb { "norsk bokm\u00E5l" }
+        nl { "nederlandsk" }
+        nn { "norsk nynorsk" }
         no { "norsk" }
+        om { "oromo" }
+        pl { "polsk" }
+        pt { "portugisisk" }
+        ro { "rumensk" }
+        ru { "russisk" }
+        sh { "serbokroatisk" }
+        sk { "slovakisk" }
+        sl { "slovensk" }
+        so { "somalisk" }
+        sq { "albansk" }
+        sr { "serbisk" }
+        sv { "svensk" }
+        sw { "swahili" }
+        ta { "tamil" }
+        th { "thai" }
+        ti { "tigrinya" }
+        tr { "tyrkisk" }
+        uk { "ukrainsk" }
+        vi { "vietnamesisk" }
+        zh { "kinesisk" }
+        //zh_cn { "kinesisk (forenklet)" }
+        //zh_tw { "kinesisk (tradisjonell)" }
+    }
+    ExemplarCharacters { "[a-z\u00e6\u00e5\u00f8\u00e9\u00f3\u00f4\u00e0\u00fc\u01ce]" }
+    LocaleScript{  
+        "Latn",  // ISO 15924 Name 
     }
-    LocaleID:int { 0x14 }
-//    LocaleString { "nb" }
     MonthAbbreviations {
-	    "jan",
-	    "feb",
-	    "mar",
-	    "apr",
-	    "mai",
-	    "jun",
-	    "jul",
-	    "aug",
-	    "sep",
-	    "okt",
-	    "nov",
-	    "des",
+        "jan",
+        "feb",
+        "mar",
+        "apr",
+        "mai",
+        "jun",
+        "jul",
+        "aug",
+        "sep",
+        "okt",
+        "nov",
+        "des",
     }
     MonthNames {
-	    "januar",
-	    "februar",
-	    "mars",
-	    "april",
-	    "mai",
-	    "juni",
-	    "juli",
-	    "august",
-	    "september",
-	    "oktober",
-	    "november",
-	    "desember",
+        "januar",
+        "februar",
+        "mars",
+        "april",
+        "mai",
+        "juni",
+        "juli",
+        "august",
+        "september",
+        "oktober",
+        "november",
+        "desember",
     }
     NumberElements {
         ",",
@@ -97,31 +419,26 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "nor" }
-    Eras {
-	    "f.Kr.",
-	    "e.Kr.",
+    Keys{
+	calendar    { "Kalendar" }
+	//collation {""}
+	currency    { "Valuta" }
     }
 
-    zoneStrings {
-        {
-	        "Europe/Oslo",
-	        "Central European Time",
-	        "MET",
-	        "Central European Time (DST)",
-	        "MET",
-	        "Oslo"
+    Types{
+        collation{
+            traditional { "Tradisjonell" }
+        }
+        calendar{
+            traditional { "Tradisjonell Kalender" }
         }
     }
-//    LocaleScript{  
-//        "Latn",  // ISO 15924 Name 
-//    }
-    ExemplarCharacters { "[a-z \u00e6 \u00e5 \u00f8 \u00e9 \u00f3 \u00f4 \u00e0 \u00fc \u01ce]" }
-
-
-    // Currency display names
-    Currencies {
-        NOK { "kr", "NOK" }
+    Variants{
+        // EURO    { "Europeisk" }
+        //PREEURO { "F\u00f8r-eruropeisk" }
+        REVISED { "Revidert" }
     }
-}
+
+}
\ No newline at end of file

Index: nb_NO.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/nb_NO.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nb_NO.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ nb_NO.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -8,11 +8,9 @@
 nb_NO {
     Version{"2.0"}
     NumberPatterns {
-	    "#,##0.###;-#,##0.###",
-	    "\u00A4 #,##0.00;\u00A4 -#,##0.00",
-	    "#,##0%",
+        "#,##0.###;-#,##0.###",
+        "#,##0.00 \u00A4;-#,##0.00 \u00A4",
+        "#,##0%",
         "#E0",
     }
-//    ShortCountry { "NOR" }
-    LocaleID:int { 0x0414 }
 }

Index: nl.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/nl.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nl.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ nl.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -7,9 +7,253 @@
 
 nl {
     Version { "2.0" }
+
     Countries { 
-        NL { "Nederland" }
+        Fallback{ "en"}
+        //AD { "Andorra" }
+        AE { "Verenigde Arabische Emiraten" }
+        //AF { "Afghanistan" }
+        AG { "Antigua en Barbuda" }
+        //AI { "Anguilla" }
+        AL { "Albani\u00EB" }
+        AM { "Armeni\u00EB" }
+        AN { "Nederlandse Antillen" }
+        //AO { "Angola" }
+        //AQ { "Antarctica" }
+        AR { "Argentini\u00EB" }
+        AS { "Amerikaans Samoa" }
+        AT { "Oostenrijk" }
+        AU { "Australi\u00EB" }
+        //AW { "Aruba" }
+        AZ { "Azerbeidzjan" }
+        BA { "Bosni\u00EB Herzegovina" }
+        //BB { "Barbados" }
+        //BD { "Bangladesh" }
         BE { "Belgi\u00EB" }
+        //BF { "Burkina Faso" }
+        BG { "Bulgarije" }
+        BH { "Bahrein" }
+        //BI { "Burundi" }
+        //BJ { "Benin" }
+        //BM { "Bermuda" }
+        BN { "Brunei Darussalam" }
+        //BO { "Bolivia" }
+        BR { "Brazili\u00EB" }
+        BS { "Bahama's" }
+        //BT { "Bhutan" }
+        BV { "Bouveteiland" }
+        //BW { "Botswana" }
+        BY { "Wit-Rusland" }
+        //BZ { "Belize" }
+        //CA { "Canada" }
+        CC { "Cocoseilanden" }
+        CD { "Congo, Democratische Republiek" }
+        CF { "Centraal-Afrikaanse Republiek" }
+        //CG { "Congo" }
+        CH { "Zwitserland" }
+        CI { "Ivoorkust" }
+        CK { "Cookeilanden" }
+        CL { "Chili" }
+        CM { "Kameroen" }
+        //CN { "China" }
+        //CO { "Colombia" }
+        //CR { "Costa Rica" }
+        //CU { "Cuba" }
+        CV { "Kaapverdi\u00EB" }
+        CX { "Christmaseiland" }
+        //CY { "Cyprus" }
+        CZ { "Tsjechi\u00EB" }
+        DE { "Duitsland" }
+        //DJ { "Djibouti" }
+        DK { "Denemarken" }
+        //DM { "Dominica" }
+        DO { "Dominicaanse Republiek" }
+        DZ { "Algerije" }
+        //EC { "Ecuador" }
+        EE { "Estland" }
+        EG { "Egypte" }
+        EH { "West-Sahara" }
+        //ER { "Eritrea" }
+        ES { "Spanje" }
+        ET { "Ethiopi\u00EB" }
+        //FI { "Finland" }
+        //FJ { "Fiji" }
+        FK { "Falklandeilanden" }
+        FM { "Micronesia, Federale Staten van" }
+        FO { "Faer\u00F6er" }
+        FR { "Frankrijk" }
+        //GA { "Gabon" }
+        GB { "Verenigd Koninkrijk" }
+        //GD { "Grenada" }
+        GE { "Georgi\u00EB" }
+        GF { "Frans-Guyana" }
+        //GH { "Ghana" }
+        //GI { "Gibraltar" }
+        GL { "Groenland" }
+        //GM { "Gambia" }
+        //GN { "Guinea" }
+        //GP { "Guadeloupe" }
+        GQ { "Equatoriaal-Guinea" }
+        GR { "Griekenland" }
+        GS { "Zuid-Georgi\u00EB en Zuidelijke Sandwicheilanden" }
+        //GT { "Guatemala" }
+        //GU { "Guam" }
+        GW { "Guinee-Bissau" }
+        //GY { "Guyana" }
+        HK { "Hongkong S.A.R. van China" }
+        HM { "Heardeiland en McDonaldeiland" }
+        //HN { "Honduras" }
+        HR { "Kroati\u00EB" }
+        HT { "Ha\u00EFti" }
+        HU { "Hongarije" }
+        ID { "Indonesi\u00EB" }
+        IE { "Ierland" }
+        IL { "Isra\u00EBl" }
+        //IN { "India" }
+        IO { "Brits Territorium in de Indische Oceaan" }
+        IQ { "Irak" }
+        //IR { "Iran, Islamitische Republiek" }
+        IS { "IJsland" }
+        IT { "Itali\u00EB" }
+        //JM { "Jamaica" }
+        JO { "Jordani\u00EB" }
+        //JP { "Japan" }
+        KE { "Kenia" }
+        KG { "Kirgizstan" }
+        KH { "Cambodja" }
+        //KI { "Kiribati" }
+        KM { "Comoren" }
+        KN { "Saint Kitts en Nevis" }
+        KP { "Korea, Noord" }    // alternate name { "Korea, Democratische Volksrepubliek" }
+        KR { "Korea, Zuid" }    // alternate name { "Korea, Republiek" }
+        KW { "Koeweit" }
+        KY { "Caymaneilanden" }
+        KZ { "Kazakstan" }
+        //LA { "Laos" }
+        LB { "Libanon" }
+        //LC { "Saint Lucia" }
+        //LI { "Liechtenstein" }
+        //LK { "Sri Lanka" }
+        //LR { "Liberia" }
+        //LS { "Lesotho" }
+        LT { "Litouwen" }
+        LU { "Luxemburg" }
+        LV { "Letland" }
+        LY { "Libi\u00EB" }
+        MA { "Marokko" }
+        //MC { "Monaco" }
+        MD { "Moldova, Republiek" }
+        MG { "Madagaskar" }
+        MH { "Marshalleilanden" }
+        MK { "Macedoni\u00EB, Republiek" }
+        //ML { "Mali" }
+        //MM { "Myanmar" }
+        MN { "Mongoli\u00EB" }
+        MO { "Macao S.A.R. van China" }
+        MP { "Noordelijke Marianeneilanden" }
+        //MQ { "Martinique" }
+        MR { "Mauritani\u00EB" }
+        //MS { "Montserrat" }
+        //MT { "Malta" }
+        //MU { "Mauritius" }
+        MV { "Malediven" }
+        //MW { "Malawi" }
+        //MX { "Mexico" }
+        MY { "Maleisi\u00EB" }
+        //MZ { "Mozambique" }
+        NA { "Namibi\u00EB" }
+        NC { "Nieuw-Caledoni\u00EB" }
+        //NE { "Niger" }
+        NF { "Norfolkeiland" }
+        //NG { "Nigeria" }
+        //NI { "Nicaragua" }
+        NL { "Nederland" }
+        NO { "Noorwegen" }
+        //NP { "Nepal" }
+        //NR { "Nauru" }
+        //NU { "Niue" }
+        NZ { "Nieuw-Zeeland" }
+        //OM { "Oman" }
+        //PA { "Panama" }
+        //PE { "Peru" }
+        PF { "Frans-Polynesi\u00EB" }
+        PG { "Papoea-Nieuw-Guinea" }
+        PH { "Filippijnen" }
+        //PK { "Pakistan" }
+        PL { "Polen" }
+        PM { "Saint Pierre en Miquelon" }
+        //PN { "Pitcairn" }
+        //PR { "Puerto Rico" }
+        PS { "Palestijns Gebied" }
+        //PT { "Portugal" }
+        //PW { "Palau" }
+        //PY { "Paraguay" }
+        QA { "Katar" }
+        //RE { "R\u00E9union" }
+        RO { "Roemeni\u00EB" }
+        RU { "Russische Federatie" }
+        //RW { "Rwanda" }
+        SA { "Saoedi-Arabi\u00EB" }
+        SB { "Salomonseilanden" }
+        SC { "Seychellen" }
+        SD { "Soedan" }
+        SE { "Zweden" }
+        //SG { "Singapore" }
+        //SH { "Saint Helena" }
+        SI { "Sloveni\u00EB" }
+        SJ { "Svalbard en Jan Mayen" }
+        SK { "Slowakije" }
+        //SL { "Sierra Leone" }
+        //SM { "San Marino" }
+        //SN { "Senegal" }
+        SO { "Somali\u00EB" }
+        //SR { "Suriname" }
+        ST { "Sao Tom\u00E9 en Principe" }
+        //SV { "El Salvador" }
+        SY { "Syri\u00EB" }
+        //SZ { "Swaziland" }
+        TC { "Turks- en Caicoseilanden" }
+        TD { "Tsjaad" }
+        TF { "Franse Gebieden in de zuidelijke Indische Oceaan" }
+        //TG { "Togo" }
+        //TH { "Thailand" }
+        TJ { "Tadzjikistan" }
+        //TK { "Tokelau" }
+        TL { "Oost-Timor" }
+        //TM { "Turkmenistan" }
+        TN { "Tunesi\u00EB" }
+        //TO { "Tonga" }
+        TR { "Turkije" }
+        TT { "Trinidad en Tobago" }
+        //TV { "Tuvalu" }
+        //TW { "Taiwan" }
+        //TZ { "Tanzania" }
+        UA { "Oekra\u00EFne" }
+        UG { "Oeganda" }
+        UM { "Amerikaanse ondergeschikte afgelegen eilanden" }
+        US { "Verenigde Staten" }
+        //UY { "Uruguay" }
+        UZ { "Oezbekistan" }
+        VA { "Vaticaanstad" }
+        VC { "Saint Vincent en de Grenadines" }
+        //VE { "Venezuela" }
+        VG { "Britse Maagdeneilanden" }
+        VI { "Amerikaanse Maagdeneilanden" }
+        //VN { "Vietnam" }
+        //VU { "Vanuatu" }
+        WF { "Wallis en Futuna" }
+        //WS { "Samoa" }
+        YE { "Jemen" }
+        //YT { "Mayotte" }
+        YU { "Joegoslavi\u00EB" }
+        ZA { "Zuid-Afrika" }
+        //ZM { "Zambia" }
+        //ZW { "Zimbabwe" }
+    }
+    // Currency display names
+    Currencies {
+        BEF { "BF", "BEF" }
+        NLG { "fl", "NLG" }
     }
     DateTimeElements:intvector { 
         2,
@@ -22,7 +266,7 @@
         "H:mm",
         "EEEE d MMMM yyyy",
         "d MMMM yyyy",
-        "d-MMM-yy",
+        "d-MMM-yyyy",
         "d-M-yy",
         "{1} {0}",
     }
@@ -44,11 +288,86 @@
         "vrijdag",
         "zaterdag",
     }
+    Eras { 
+        "v. Chr.",  // voor Christus
+        "n. Chr.",  // na Christus
+    }
+    ExemplarCharacters { "[a-z\u00e1\u00e9\u00ed\u00f3\u00fa\u00e4\u00eb\u00ef\u00f6\u00fc\u0133]" }
     Languages { 
+        //af  { "Afrikaans" }
+        am { "Amhaars" }
+        ar { "Arabisch" }
+        be { "Wit-Russisch" }
+        bg { "Bulgaars" }
+        bn { "Bengaals" }
+        ca { "Catalaans" }
+        cs { "Tsjechisch" }
+        da { "Deens" }
+        de { "Duits" }
+        el { "Grieks" }
+        en { "Engels" }
+        //eo  { "Esperanto" }
+        es { "Spaans" }
+        et { "Estlands" }
+        eu { "Baskisch" }
+        fa { "Perzisch" }
+        fi { "Fins" }
+        fo { "Faer\u00f6ers" }
+        fr { "Frans" }
+        ga { "Iers" }
+        gl { "Galicisch" }
+        //gu  { "Gujarati" }
+        //gv  { "Manx" }
+        haw { "Hawaiiaans" }
+        he { "Hebreeuws" }
+        //hi  { "Hindi" }
+        hr { "Kroatisch" }
+        hu { "Hongaars" }
+        hy { "Armeens" }
+        id { "Indonesisch" }
+        is { "IJslands" }
+        it { "Italiaans" }
+        //iu  { "Inuktitut" }
+        ja { "Japans" }
+        //kl  { "Kalaallisut" }
+        //kn  { "Kannada" }
+        ko { "Koreaans" }
+        //kw  { "Cornish" }
+        lt { "Litouws" }
+        lv { "Letlands" }
+        mk { "Macedonisch" }
+        //mr  { "Marathi" }
+        mt { "Maltees" }
+        nb { "Noors - Bokm\u00e5l" }
         nl { "Nederlands" }
+        nn { "Noors - Nynorsk" }
+        no { "Noors" }
+        //om  { "Oromo" }
+        pl { "Pools" }
+        pt { "Portugees" }
+        ro { "Roemeens" }
+        ru { "Russisch" }
+        sh { "Servokroatisch" }
+        sk { "Slowaaks" }
+        sl { "Sloveens" }
+        //so  { "Somali" }
+        sq { "Albanees" }
+        sr { "Servisch" }
+        sv { "Zweeds" }
+        //sw  { "Swahili" }
+        //ta  { "Tamil" }
+        //th  { "Thai" }
+        //ti  { "Tigrinya" }
+        tr { "Turks" }
+        uk { "Oekra\u00efens" }
+        vi { "Vietnamees" }
+        zh { "Chinees" }
+        //zh_cn { "Chinees (Vereenvoudigd)" }
+        //zh_tw { "Chinees (Traditioneel)" }
+    }
+    LocaleScript {
+        "Latn",  // ISO 15924 Name 
     }
-    LocaleID:int { 0x13 }
-//    LocaleString { "nl" }
     MonthAbbreviations { 
         "jan",
         "feb",
@@ -90,34 +409,71 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "nld" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
+
+        // International Calendars Data.
+    // NOTE (ICU 2.6) - the format of this data WILL CHANGE in future releases.  
+    // Islamic calendar
+    Eras_islamic:array { 
+        "Sa'na Hizjria"
+    }
+
+    MonthNames_islamic:array {
+        "Moeharram",            // Muharram
+        "Safar",                // Safar
+        "Rabi'a al awal",      // Rabi' al-awwal
+        "Rabi'a al thani",      // Rabi' al-thani
+        "Joemad'al awal",       // Jumada al-awwal
+        "Joemad'al thani",      // Jumada al-thani
+        "Rajab",                // Rajab
+        "Sja'aban",             // Sha'ban
+        "Ramadan",              // Ramadan
+        "Sjawal",               // Shawwal
+        "Doe al ka'aba",        // Dhu al-Qi'dah
+        "Doe al hizja",         // Dhu al-Hijjah
+    }
+    MonthAbbreviations_islamic:alias {  // same as MonthNames (no data)
+        "nl/MonthNames_islamic"
+    }   
+    // Civil is identical other than in calculations
+    Eras_islamic-civil:alias {
+        "nl/Eras_islamic"
+    }
+    MonthNames_islamic-civil:alias {
+        "nl/MonthNames_islamic"
+    }
+    MonthAbbreviations_islamic-civil:alias {
+        "nl/MonthAbbreviations_islamic"
+    }
+    MonthNames_hebrew {
+        "Tisjrie",      // Tishri
+        "Chesjwan",     // Heshvan
+        "Kislev",       // Kislev
+        "Tevet",        // Tevet
+        "Sjevat",       // Shevat
+        "Adar",         // Adar I
+        "Adar B",       // Adar
+        "Nisan",        // Nisan
+        "Ijar",         // Iyar
+        "Sivan",        // Sivan
+        "Tammoez",      // Tamuz
+        "Av",           // Av
+        "Elloel",       // Elul
+    }
+    MonthAbbreviations_hebrew:alias {
+       "nl/MonthNames_hebrew" // no data
     }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
-    ExemplarCharacters { "[a-z \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u00e4 \u00eb \u00ef \u00f6 \u00fc \u0133]" }
 
     //------------------------------------------------------------
     // Rule Based Number Format Support
     //------------------------------------------------------------
-
 //     * Spellout rules for Dutch
-
     // can someone supply me with information on negatives and decimals?
-
     SpelloutRules {
         "-x: min >>;\n"
         "x.x: << komma >>;\n"
-        "(zero?); een; twee; drie; vier; vijf; zes; zeven; acht; negen;\n"
+        "nul; een; twee; drie; vier; vijf; zes; zeven; acht; negen;\n"
         "tien; elf; twaalf; dertien; veertien; vijftien; zestien;\n"
         "zeventien; achtien; negentien;\n"
         "20: [>> en ]twintig;\n"
@@ -132,12 +488,23 @@
         "1000: << duizend[ >>];\n"
         "1,000,000: << miljoen[ >>];\n"
         "1,000,000,000: << biljoen[ >>];\n"
-        "1,000,000,000,000: =#,##0="
+        "1,000,000,000,000: << triljoen[ >>];\n"
+        "1,000,000,000,000,000: =#,##0="
     }
-
-    // Currency display names
-    Currencies {
-        BEF { "BF", "BEF" }
-        NLG { "fl", "NLG" }
+    Keys{
+       calendar { "Kalender" }
+       collation { "Soorten" }
+       currency {"Muntsoort"}
+    }
+    Types{
+        calendar{
+           traditional { "Traditioneel Soorten" }
+        }
+        collation{
+           traditional { "Traditioneel Kalendar" }
+        }
+    }
+    Variants{
+        REVISED { "Gewijzigd" }
     }
 }

Index: nl_BE.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/nl_BE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nl_BE.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ nl_BE.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -22,22 +22,11 @@
         "d/MM/yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x0813 }
-//    LocaleString { "nl_BE" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "BEL" }
-//    zoneStrings { 
-//        {
-//            "Africa/Casablanca",
-//            "GMT",
-//            "GMT",
-//            "GMT",
-//            "GMT",
-//        }
-//    }
+
 }

Index: nl_NL.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/nl_NL.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nl_NL.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ nl_NL.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -7,13 +7,10 @@
 
 nl_NL {
     Version{ "2.0" }
-//    LocaleString { "nl_NL" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "\u00A4 #,##0.00;\u00A4 #,##0.00-",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "NLD" }
-    LocaleID:int { 0x0413 }
 }

Index: nn.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/nn.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nn.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ nn.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -1,4 +1,4 @@
-// ***************************************************************************
+// ***************************************************************************
 // *
 // *   Copyright (C) 1997-2003, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
@@ -7,36 +7,71 @@
 
 nn{
     Version { "2.0" }
-    CollationElements {
-        Version { "1.0" }
-        Sequence { "& Z < \u00E6<<< \u00C6  < a\u0308<<< A\u0308< \u00F8<<< \u00D8"
-        " < o\u0308<<< O\u0308< o\u030B<<< O\u030B < a\u030A<<< A\u030A<<< aa <<< aA <<< Aa <<< AA  & "
-        "V<<< w<<< W" }
+    collations {
+      standard { 
+        Version { "2.0" }
+        Sequence { 
+            "&D<<đ<<<Đ<<ð<<<Ð "
+            "&t<<<þ/h"
+            "&T<<<Þ/H"
+            "&Y<<ü<<<Ü<<ű<<<Ű"
+            "&[before 1]ʒ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å"
+        }
+      }
     }
     Countries {
         NO { "Noreg" }
     }
+    // Currency display names
+    Currencies {
+        NOK { "kr", "NOK" }
+    }
     DateTimeElements:intvector {
         2,
         4,
     }
     DateTimePatterns {
-        "'kl 'HH.mm z",
-        "HH:mm:ss z",
-        "HH:mm:ss",
-        "HH:mm",
-        "d. MMMM yyyy",
+        "'kl. 'HH.mm.ss z",
+        "HH.mm.ss z",
+        "HH.mm.ss",
+        "HH.mm",
+        "EEEE d. MMMM yyyy",
         "d. MMMM yyyy",
-        "dd.MMM.yy",
+        "d. MMM. yyyy",
         "dd.MM.yy",
         "{1} {0}",
     }
+    DayAbbreviations {
+        "su",
+        "m\u00E5",
+        "ty",
+        "on",
+        "to",
+        "fr",
+        "la",
+    }
+    DayNames {
+        "sundag",
+        "m\u00E5ndag",
+        "tysdag",
+        "onsdag",
+        "torsdag",
+        "fredag",
+        "laurdag",
+    }
+    Eras {
+        "f.Kr.",
+        "e.Kr.",
+    }
     Languages {
-        nb { "bokm\u00E5l" }
-        nn { "nynorsk" }
+        nb { "norsk bokm\u00E5l" }
+        nn { "norsk nynorsk" }
         no { "norsk" }
     }
-//    LocaleString { "nn" }
+    ExemplarCharacters { "[a-z\u00e6\u00e5\u00f8\u00e9\u00f3\u00f4\u00e0\u00fc\u01ce]" }
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
+    }
     MonthAbbreviations {
         "jan",
         "feb",
@@ -78,49 +113,7 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "nor" }
-    Eras {
-        "f.Kr.",
-        "e.Kr.",
-    }
-
-    zoneStrings {
-        {
-            "Europe/Oslo",
-            "Central European Time",
-            "MET",
-            "Central European Time (DST)",
-            "MET",
-            "Oslo"
-        }
-    }
-    DayAbbreviations {
-        "su",
-        "m\u00E5",
-        "ty",
-        "on",
-        "to",
-        "fr",
-        "lau",
-    }
-    DayNames {
-        "sundag",
-        "m\u00E5ndag",
-        "tysdag",
-        "onsdag",
-        "torsdag",
-        "fredag",
-        "laurdag",
-    }
-    ExemplarCharacters { "[a-z \u00e6 \u00e5 \u00f8 \u00e9 \u00f3 \u00f4 \u00e0 \u00fc \u01ce]" }
-    LocaleID:int { 0x814 }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
 
-    // Currency display names
-    Currencies {
-        NOK { "kr", "NOK" }
-    }
-}
+}
\ No newline at end of file

Index: nn_NO.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/nn_NO.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nn_NO.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ nn_NO.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -7,13 +7,10 @@
 
 nn_NO {
     Version{ "3.0"}
-
     NumberPatterns {
         "#,##0.###;-#,##0.###",
-        "\u00A4 #,##0.00;\u00A4 -#,##0.00",
+        "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "NOR" }
-    LocaleID:int { 0x0814 }
 }

Index: om.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/om.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- om.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ om.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -15,8 +15,20 @@
 // * across the Oromo region.  Regional synonyms naturally exist for many
 // * of the month and day names.
 
-om{
+om {
     Version{ "2.0" }
+//    collations {
+//        standard { 
+//            Version { "1.0" }
+//            Sequence { "&Z<ch<<<Ch<<<CH"
+//                "<dh<<<Dh<<<DH"
+//                "<kh<<<Kh<<<KH"
+//                "<ny<<<Ny<<<NY"
+//                "<ph<<<Ph<<<PH"
+//                "<sh<<<Sh<<<SH"
+//            }
+//        }
+//    }
     DayAbbreviations {
         "Dil",
         "Wix",
@@ -83,5 +95,11 @@
     // Currency display names
     Currencies {
         KES { "Ksh", "KES" }
+    }
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
+    }
+    ExemplarCharacters{
+        "[a-z]"
     }
 }

Index: pl.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/pl.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pl.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ pl.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -7,9 +7,10 @@
 
 pl {
     Version{ "2.0" }
-    CollationElements { 
-	    Version { "2" }
-		Sequence { "&A < a\u0328 <<< A\u0328" 
+    collations {
+      standard { 
+        Version { "2" }
+        Sequence { "&A < a\u0328 <<< A\u0328" 
                    "&C < c\u0301 <<< C\u0301" 
                    "&E < e\u0328 <<< E\u0328" 
                    "&L < \u0142 <<< \u0141"
@@ -17,9 +18,249 @@
                    "&O < o\u0301 <<< O\u0301"
                    "&S < s\u0301 <<< S\u0301" 
                    "&Z < z\u0301 <<< Z\u0301 < z\u0307 <<< Z\u0307" }
-	}
+      }
+    }
     Countries { 
+        Fallback{ "en"}
+        AD { "Andora" }
+        AE { "Zjednoczone Emiraty Arabskie" }
+        AF { "Afganistan" }
+        AG { "Antigua i Barbuda" }
+        //AI { "Anguilla" }
+        //AL { "Albania" }
+        //AM { "Armenia" }
+        AN { "Antyle Holenderskie" }
+        //AO { "Angola" }
+        AQ { "Antarktyka" }
+        AR { "Argentyna" }
+        AS { "Samoa Ameryka\u0144skie" }
+        //AT { "Austria" }
+        //AU { "Australia" }
+        //AW { "Aruba" }
+        AZ { "Azerbejd\u017Can" }
+        BA { "Bo\u015Bnia i Hercegowina" }
+        //BB { "Barbados" }
+        BD { "Bangladesz" }
+        BE { "Belgia" }
+        //BF { "Burkina Faso" }
+        BG { "Bu\u0142garia" }
+        BH { "Bahrajn" }
+        //BI { "Burundi" }
+        //BJ { "Benin" }
+        BM { "Bermudy" }
+        BN { "Brunei Darussalam" }
+        BO { "Boliwia" }
+        BR { "Brazylia" }
+        BS { "Bahamy" }
+        //BT { "Bhutan" }
+        BV { "Wyspa Bouveta" }
+        //BW { "Botswana" }
+        BY { "Bia\u0142oru\u015B" }
+        //BZ { "Belize" }
+        CA { "Kanada" }
+        CC { "Wyspy Kokosowe (Keelinga)" }
+        CD { "Kongo, Republika Demokratyczna" }
+        CF { "Republika \u015Arodkowej Afryki" }
+        CG { "Kongo" }
+        CH { "Szwajcaria" }
+        CI { "Wybrze\u017Ce Ko\u015Bci S\u0142oniowej" }
+        CK { "Wyspy Cooka" }
+        //CL { "Chile" }
+        CM { "Kamerun" }
+        CN { "Chiny" }
+        CO { "Kolumbia" }
+        CR { "Kostaryka" }
+        CU { "Kuba" }
+        CV { "Wyspy Zielonego Przyl\u0105dka" }
+        CX { "Wyspa Bo\u017Cego Narodzenia" }
+        CY { "Cypr" }
+        CZ { "Republika Czeska" }
+        DE { "Niemcy" }
+        DJ { "D\u017Cibuti" }
+        DK { "Dania" }
+        DM { "Dominika" }
+        DO { "Republika Dominika\u0144ska" }
+        DZ { "Algieria" }
+        EC { "Ekwador" }
+        //EE { "Estonia" }
+        EG { "Egipt" }
+        EH { "Sahara Zachodnia" }
+        ER { "Erytrea" }
+        ES { "Hiszpania" }
+        ET { "Etiopia" }
+        FI { "Finlandia" }
+        FJ { "Fid\u017Ci" }
+        FK { "Falklandy (Malwiny)" }    // alternate name { "Falklandy" }
+        FM { "Mikronezja, Stany Sfederowane" }
+        FO { "Wyspy Owcze" }
+        FR { "Francja" }
+        //GA { "Gabon" }
+        GB { "Wielka Brytania" }
+        //GD { "Grenada" }
+        GE { "Gruzja" }
+        GF { "Gujana Francuska" }
+        //GH { "Ghana" }
+        //GI { "Gibraltar" }
+        GL { "Grenlandia" }
+        //GM { "Gambia" }
+        GN { "Gwinea" }
+        GP { "Gwadelupa" }
+        GQ { "Gwinea R\u00F3wnikowa" }
+        GR { "Grecja" }
+        GS { "Wyspy Georgia Po\u0142udniowa i Sandwich Po\u0142udniowy" }
+        GT { "Gwatemala" }
+        //GU { "Guam" }
+        GW { "Gwinea Bissau" }
+        GY { "Gujana" }
+        HK { "Hongkong, Specjalny Region Administracyjny Chin" }
+        HM { "Wyspy Heard i McDonald" }
+        //HN { "Honduras" }
+        HR { "Chorwacja" }
+        //HT { "Haiti" }
+        HU { "W\u0119gry" }
+        ID { "Indonezja" }
+        IE { "Irlandia" }
+        IL { "Izrael" }
+        IN { "Indie" }
+        IO { "Terytorium Brytyjskie Oceanu Indyjskiego" }
+        IQ { "Irak" }
+        //IR { "Iran" }
+        IS { "Islandia" }
+        IT { "W\u0142ochy" }
+        JM { "Jamajka" }
+        JO { "Jordania" }
+        JP { "Japonia" }
+        KE { "Kenia" }
+        KG { "Kirgistan" }
+        KH { "Kambod\u017Ca" }
+        //KI { "Kiribati" }
+        KM { "Komory" }
+        KN { "Saint Kitts i Nevis" }
+        KP { "Korea P\u00F3\u0142nocna" }    // alternate name { "Korea, Demokratyczna Republika Ludowa" }
+        KR { "Korea Po\u0142udniowa" }    // alternate name { "Korea, Republika" }
+        KW { "Kuwejt" }
+        KY { "Kajmany" }
+        KZ { "Kazachstan" }
+        LA { "Laos (Demokratyczna Republika Ludowa)" }
+        LB { "Liban" }
+        //LC { "Saint Lucia" }
+        //LI { "Liechtenstein" }
+        //LK { "Sri Lanka" }
+        //LR { "Liberia" }
+        //LS { "Lesotho" }
+        LT { "Litwa" }
+        LU { "Luksemburg" }
+        LV { "\u0141otwa" }
+        LY { "Libijska" }    // alternate name { "Libijska Arabska Jamahiria" }
+        MA { "Maroko" }
+        MC { "Monako" }
+        MD { "Mo\u0142dawia, Republika" }
+        MG { "Madagaskar" }
+        MH { "Wyspy Marshalla" }
+        MK { "Macedonia, Republika" }
+        //ML { "Mali" }
+        MM { "Birma" }
+        //MN { "Mongolia" }
+        MO { "Makau, Specjalny Region Administracyjny Chin" }
+        MP { "Wsp\u00F3lnota Marian\u00F3w P\u00F3\u0142nocnych" }
+        MQ { "Martynika" }
+        MR { "Mauretania" }
+        //MS { "Montserrat" }
+        //MT { "Malta" }
+        //MU { "Mauritius" }
+        MV { "Malediwy" }
+        //MW { "Malawi" }
+        MX { "Meksyk" }
+        MY { "Malezja" }
+        MZ { "Mozambik" }
+        //NA { "Namibia" }
+        NC { "Nowa Kaledonia" }
+        //NE { "Niger" }
+        NF { "Wyspa Norfolk" }
+        //NG { "Nigeria" }
+        NI { "Nikaragua" }
+        NL { "Holandia" }
+        NO { "Norwegia" }
+        //NP { "Nepal" }
+        //NR { "Nauru" }
+        //NU { "Niue" }
+        NZ { "Nowa Zelandia" }
+        //OM { "Oman" }
+        //PA { "Panama" }
+        //PE { "Peru" }
+        PF { "Polinezja Francuska" }
+        PG { "Papua Nowa Gwinea" }
+        PH { "Filipiny" }
+        //PK { "Pakistan" }
         PL { "Polska" }
+        PM { "St. Pierre i Miquelon" }
+        //PN { "Pitcairn" }
+        //PR { "Puerto Rico" }
+        PS { "Terytoria Palesty\u0144skie" }
+        PT { "Portugalia" }
+        //PW { "Palau" }
+        PY { "Paragwaj" }
+        QA { "Katar" }
+        RE { "Reunion" }
+        RO { "Rumunia" }
+        RU { "Federacja Rosyjska" }
+        //RW { "Rwanda" }
+        SA { "Arabia Saudyjska" }
+        SB { "Wyspy Salomona" }
+        SC { "Seszele" }
+        //SD { "Sudan" }
+        SE { "Szwecja" }
+        SG { "Singapur" }
+        SH { "Wyspa \u015Awi\u0119tej Heleny" }
+        SI { "S\u0142owenia" }
+        SJ { "Svalbard i Wyspy Jan Mayen" }
+        SK { "S\u0142owacja" }
+        //SL { "Sierra Leone" }
+        //SM { "San Marino" }
+        //SN { "Senegal" }
+        //SO { "Somalia" }
+        SR { "Surinam" }
+        ST { "Wyspy \u015Awi\u0119tego Tomasza i Ksi\u0105\u017C\u0119ca" }
+        SV { "Salwador" }
+        //SY { "Syria" }    // alternate name { "Syryjska Republika Arabska" }
+        SZ { "Suazi" }
+        TC { "Turks i Caicos" }
+        TD { "Czad" }
+        TF { "Francuskie Terytoria Po\u0142udniowe" }
+        //TG { "Togo" }
+        TH { "Tajlandia" }
+        TJ { "Tad\u017Cykistan" }
+        //TK { "Tokelau" }
+        TL { "Timor Wschodni" }
+        TM { "Turkmenia" }
+        TN { "Tunezja" }
+        //TO { "Tonga" }
+        TR { "Turcja" }
+        TT { "Trinidad i Tobago" }
+        //TV { "Tuvalu" }
+        TW { "Tajwan" }
+        //TZ { "Tanzania" }
+        UA { "Ukraina" }
+        //UG { "Uganda" }
+        //UM { "United States Minor Outlying Islands" }
+        US { "Stany Zjednoczone" }
+        UY { "Urugwaj" }
+        //UZ { "Uzbekistan" }
+        VA { "Stolica Apostolska (Pa\u0144stwo Watyka\u0144skie)" }
+        //VC { "Saint Vincent and the Grenadines" }
+        VE { "Wenezuela" }
+        VG { "Brytyjskie Wyspy Dziewicze" }
+        VI { "Wyspy Dziewicze, Stan\u00F3w Zjednoczonych" }
+        VN { "Wietnam" }
+        //VU { "Vanuatu" }
+        WF { "Wallis i Futuna" }
+        //WS { "Samoa" }
+        YE { "Jemen" }
+        YT { "Majotta" }
+        YU { "Jugos\u0142awia" }
+        ZA { "Afryka Po\u0142udniowa" }
+        //ZM { "Zambia" }
+        //ZW { "Zimbabwe" }
     }
     DateTimeElements:intvector { 
         2,
@@ -59,10 +300,39 @@
         "n.e.",
     }
     Languages { 
+        ar { "arabski" }
+        bg { "bu\u0142garski" }
+        cs { "czeski" }
+        da { "du\u0144ski" }
+        de { "niemiecki" }
+        el { "grecki" }
+        en { "angielski" }
+        es { "hiszpa\u0144ski" }
+        et { "esto\u0144ski" }
+        fi { "fi\u0144ski" }
+        fr { "francuski" }
+        he { "hebrajski" }
+        hr { "chorwacki" }
+        hu { "w\u0119gierski" }
+        it { "w\u0142oski" }
+        ja { "japo\u0144ski" }
+        ko { "korea\u0144ski" }
+        lt { "litewski" }
+        lv { "\u0142otewski" }
+        nl { "holenderski" }
+        no { "norweski" }
         pl { "polski" }
+        pt { "portugalski" }
+        ro { "rumu\u0144ski" }
+        ru { "rosyjski" }
+        sk { "s\u0142owacki" }
+        sl { "s\u0142owe\u0144ski" }
+        sv { "szwedzki" }
+        tr { "turecki" }
+        zh { "chi\u0144ski" }
+        //zh_cn { "chi\u0144ski (uproszczony)" }
+        //zh_tw { "chi\u0144ski (tradycyjny)" }
     }
-    LocaleID:int { 0x15 }
-//    LocaleString { "pl" }
     MonthAbbreviations { 
         "sty",
         "lut",
@@ -104,24 +374,49 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "pol" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
+    SpelloutRules {
+        "-x: minus >>;\n"
+        "zero; jeden; dwa; trzy; cztery; pi\u0119\u0107;\n"
+        "sze\u015B\u0107; siedem; osiem; dziewi\u0119\u0107; dziesi\u0119\u0107;\n"
+        "jedena\u015Bcie; dwana\u015Bcie; trzyna\u015Bcie; czterna\u015Bcie; pi\u0119tna\u015Bcie;\n"
+        "szesna\u015Bcie; siedemna\u015Bcie; osiemna\u015Bcie; dziewi\u0119tna\u015Bcie;\n"
+        "20: dwadzie\u015Bcia[ >>];\n"
+        "30: trzydzie\u015Bci[ >>];\n"
+        "40: czterdzie\u015Bci[ >>];\n"
+        "50: pi\u0119\u0107dziesi\u0105t[ >>];\n"
+        "60: sze\u015B\u0107dziesi\u0105t[ >>];\n"
+        "70: siedemdziesi\u0105t[ >>];\n"
+        "80: osiemdziesi\u0105t[ >>];\n"
+        "90: dziewi\u0119\u0107dziesi\u0105t[ >>];\n"
+        "100: sto[ >>];\n"
+        "200: dwie\u015Bcie[ >>];\n"
+        "300: trzysta[ >>];\n"
+        "400: czterysta[ >>];\n"
+        "500: pi\u0119\u0107set[ >>];\n"
+        "600: sze\u015B\u0107set[ >>];\n"
+        "700: siedemset[ >>];\n"
+        "800: osiemset[ >>];\n"
+        "900: dziewi\u0119\u0107set[ >>];\n"
+        "1000: tysi\u0105c[ >>];\n"
+        "2000: << tysi\u0105cy[ >>];\n"
+        "1,000,000: milion[ >>];\n"
+        "2,000,000: << miliony[ >>];\n"
+        "1,000,000,000: bilion[ >>];\n"
+        "2,000,000,000: << biliony[ >>];\n"
+        "1,000,000,000,000: trylion[ >>];\n"
+        "2,000,000,000,000: << tryliony[ >>];\n"
+        "1,000,000,000,000,000: =#,##0=;" 
+    }
+
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
     }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
     ExemplarCharacters { "[a-z \u00f3 \u0105 \u0119 \u0107 \u0144 \u015b \u017a \u0142 \u017c]" }
 
     // Currency display names
     Currencies {
         PLN { "z\u0142", "PLN" }
     }
-}
+}
\ No newline at end of file

Index: pl_PL.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/pl_PL.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pl_PL.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ pl_PL.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -7,13 +7,10 @@
 
 pl_PL {
     Version { "2.0" }
-//    LocaleString { "pl_PL" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "POL" }
-    LocaleID:int { 0x0415 }
 }

Index: pt.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/pt.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pt.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ pt.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -5,229 +5,254 @@
 // *
 // ***************************************************************************
 
+// The vast majority of this data is based on the pt_BR locale.
+// The pt_PT locale should be used when Portugal Portuguese is needed.
 pt {
     Version { "2.0" }
+
     Countries {
-        AE { "Rep\u00fablica \u00c1rabe Unida" }
-        AL { "Alb\u00e2nia" }
-        AS { "\u00c1sia" }
-        AT { "\u00c1ustria" }
-        AU { "Austr\u00e1lia" }
-        BA { "B\u00f3snia" }
-        BE { "B\u00e9lgica" }
-        BG { "Bulg\u00e1ria" }
+        Fallback{ "en"}
+        //AD { "Andorra" }
+        AE { "Emirados \u00C1rabes Unidos" }
+        AF { "Afeganist\u00E3o" }
+        AG { "Antigua e Barbuda" }
+        //AI { "Anguilla" }
+        AL { "Alb\u00E2nia" }
+        AM { "Arm\u00EAnia" }
+        AN { "Antilhas Holandesas" }
+        //AO { "Angola" }
+        AQ { "Ant\u00E1rtida" }
+        //AR { "Argentina" }
+        AS { "Samoa Americana" }
+        AT { "\u00C1ustria" }
+        AU { "Austr\u00E1lia" }
+        //AW { "Aruba" }
+        AZ { "Azerbaij\u00E3o" }
+        BA { "B\u00F3snia-Herzeg\u00F3vina" }
+        //BB { "Barbados" }
+        //BD { "Bangladesh" }
+        BE { "B\u00E9lgica" }
+        BF { "Burkina Fasso" }
+        BG { "Bulg\u00E1ria" }
         BH { "Bar\u00e1in" }
-        BO { "Bol\u00edvia" }
+        //BI { "Burundi" }
+        //BJ { "Benin" }
+        BM { "Bermudas" }
+        //BN { "Brunei Darussalam" }
+        BO { "Bol\u00EDvia" }
         BR { "Brasil" }
-        CA { "Canad\u00e1" }
-        CH { "Su\u00ed\u00e7a" }
-        CN { "China (PRC)" }
-        CO { "Col\u00f4mbia" }
-        CZ { "Rep\u00fablica Tcheca" }
+        //BS { "Bahamas" }
+        BT { "But\u00E3o" }
+        BV { "Ilha Bouvet" }
+        BW { "Botsuana" }
+        //BY { "Belarus" }
+        //BZ { "Belize" }
+        CA { "Canad\u00E1" }
+        CC { "Ilhas Cocos (Keeling)" }
+        CD { "Congo, Rep\u00FAblica Democr\u00E1tica do" }
+        CF { "Rep\u00FAblica Centro-Africana" }
+        //CG { "Congo" }
+        CH { "Su\u00ED\u00E7a" }
+        CI { "Costa do Marfim" }
+        CK { "Ilhas Cook" }
+        //CL { "Chile" }
+        CM { "Rep\u00FAblica dos Camar\u00F5es" }
+        //CN { "China (PRC)" }
+        CO { "Col\u00F4mbia" }
+        //CR { "Costa Rica" }
+        //CU { "Cuba" }
+        CV { "Cabo Verde" }
+        CX { "Ilhas Christmas" }
+        CY { "Chipre" }
+        CZ { "Rep\u00FAblica Tcheca" }
         DE { "Alemanha" }
+        DJ { "Djibuti" }
         DK { "Dinamarca" }
-        DO { "Rep\u00fablica Dominicana" }
-        DZ { "Arg\u00e9lia" }
+        //DM { "Dominica" }
+        DO { "Rep\u00FAblica Dominicana" }
+        DZ { "Arg\u00E9lia" }
         EC { "Equador" }
-        EE { "Est\u00f4nia" }
+        EE { "Est\u00F4nia" }
         EG { "Egito" }
+        EH { "Saara Ocidental" }
+        ER { "Eritr\u00E9ia" }
         ES { "Espanha" }
-        FI { "Finl\u00e2ndia" }
-        FR { "Fran\u00e7a" }
+        ET { "Eti\u00F3pia" }
+        FI { "Finl\u00E2ndia" }
+        //FJ { "Fiji" }
+        FK { "Ilhas Falkland" }
+        FM { "Micron\u00E9sia, Estados Federados da" }
+        FO { "Ilhas Faroe" }
+        FR { "Fran\u00E7a" }
+        GA { "Gab\u00E3o" }
         GB { "Reino Unido" }
-        GR { "Gr\u00e9cia" }
-        HR { "Cro\u00e1cia" }
+        GD { "Granada" }
+        GE { "Ge\u00F3rgia" }
+        GF { "Guiana Francesa" }
+        GH { "Gana" }
+        //GI { "Gibraltar" }
+        GL { "Gro\u00EAnlandia" }
+        GM { "G\u00E2mbia" }
+        GN { "Guin\u00E9" }
+        GP { "Guadalupe" }
+        GQ { "Guin\u00E9 Equatorial" }
+        GR { "Gr\u00E9cia" }
+        GS { "Ge\u00F3rgia do Sul e Ilhas Sandwich do Sul" }
+        //GT { "Guatemala" }
+        //GU { "Guam" }
+        GW { "Guin\u00E9 Bissau" }
+        GY { "Guiana" }
+        HK { "Hong Kong S.A.R. da China" }
+        HM { "Ilha Heard e Ilhas McDonald" }
+        //HN { "Honduras" }
+        HR { "Cro\u00E1cia" }
+        //HT { "Haiti" }
         HU { "Hungria" }
-        ID { "Indon\u00e9sia" }
+        ID { "Indon\u00E9sia" }
         IE { "Irlanda" }
-        IN { "\u00cdndia" }
-        IS { "Isl\u00e2ndia" }
-        IT { "It\u00e1lia" }
-        JO { "Jord\u00e2nia" }
-        JP { "Jap\u00e3o" }
-        KR { "Cor\u00e9ia" }
-        LA { "Am\u00e9rica Latina" }
-        LB { "L\u00edbano" }
-        LT { "Litu\u00e2nia" }
+        //IL { "Israel" }
+        IN { "\u00CDndia" }
+        IO { "Territ\u00F3rio Brit\u00E2nico do Oceano \u00CDndico" }
+        IQ { "Iraque" }
+        IR { "Ir\u00E3" }
+        IS { "Isl\u00E2ndia" }
+        IT { "It\u00E1lia" }
+        //JM { "Jamaica" }
+        JO { "Jord\u00E2nia" }
+        JP { "Jap\u00E3o" }
+        KE { "Qu\u00EAnia" }
+        KG { "Quirguist\u00E3o" }
+        KH { "Cambodja" }
+        //KI { "Kiribati" }
+        KM { "Comores" }
+        KN { "S\u00E3o Cristov\u00E3o e Nevis" }
+        KP { "Cor\u00E9ia, Norte" }    // alternate name { "Cor\u00E9ia, Rep\u00FAblica Popular Democr\u00E1tica da " }
+        KR { "Cor\u00E9ia, Sul" }    // alternate name { "Cor\u00E9ia, Rep\u00FAblica da" }
+        //KW { "Kuwait" }
+        KY { "Ilhas Cayman" }
+        KZ { "Casaquist\u00E3o" }
+        LA { "Rep\u00FAblica Democr\u00E1tica Popular de Lao" }
+        LB { "L\u00EDbano" }
+        LC { "Santa L\u00FAcia" }
+        //LI { "Liechtenstein" }
+        //LK { "Sri Lanka" }
+        LR { "Lib\u00E9ria" }
+        LS { "Lesoto" }
+        LT { "Litu\u00E2nia" }
         LU { "Luxemburgo" }
-        LV { "Let\u00f4nia" }
+        LV { "Let\u00F4nia" }
+        LY { "Jamahiriya \u00C1rabe L\u00EDbia" }
         MA { "Marrocos" }
-        MK { "Maced\u00f4nia FYR" }
-        MX { "M\u00e9xico" }
-        NI { "Nicar\u00e1gua" }
-        NL { "Pa\u00edses Baixos" }
+        MC { "M\u00F4naco" }
+        MD { "Moldova, Rep\u00FAblica de" }
+        //MG { "Madagascar" }
+        MH { "Ilhas Marshall" }
+        MK { "Maced\u00F4nia, Rep\u00FAblica da" }
+        //ML { "Mali" }
+        MM { "Myanma" }
+        MN { "Mong\u00F3lia" }
+        MO { "Macao S.A.R. da China" }
+        MP { "Ilhas Marianas do Norte" }
+        MQ { "Martinica" }
+        MR { "Maurit\u00E2nia" }
+        //MS { "Montserrat" }
+        //MT { "Malta" }
+        MU { "Maur\u00EDcio" }
+        MV { "Maldivas" }
+        MW { "Malavi" }
+        MX { "M\u00E9xico" }
+        MY { "Mal\u00E1sia" }
+        MZ { "Mo\u00E7ambique" }
+        NA { "Nam\u00EDbia" }
+        NC { "Nova Caled\u00F4nia" }
+        NE { "N\u00EDger" }
+        NF { "Ilha Norfolk" }
+        NG { "Nig\u00E9ria" }
+        NI { "Nicar\u00E1gua" }
+        NL { "Pa\u00EDses Baixos" }
         NO { "Noruega" }
-        NZ { "Nova Zel\u00e2ndia" }
-        OM { "Om\u00e3" }
-        PA { "Panam\u00e1" }
-        PK { "Paquist\u00e3o" }
-        PL { "Pol\u00f4nia" }
+        //NP { "Nepal" }
+        //NR { "Nauru" }
+        //NU { "Niue" }
+        NZ { "Nova Zel\u00E2ndia" }
+        OM { "Om\u00E3" }
+        PA { "Panam\u00E1" }
+        //PE { "Peru" }
+        PF { "Polin\u00E9sia Francesa" }
+        PG { "Papua-Nova Guin\u00E9" }
+        PH { "Filipinas" }
+        PK { "Paquist\u00E3o" }
+        PL { "Pol\u00F4nia" }
+        PM { "Saint Pierre e Miquelon" }
+        //PN { "Pitcairn" }
+        PR { "Porto Rico" }
+        PS { "Territ\u00F3rio da Palestina" }
+        //PT { "Portugal" }
+        //PW { "Palau" }
         PY { "Paraguai" }
         QA { "Catar" }
-        RO { "Rom\u00eania" }
-        RU { "R\u00fassia" }
-        SA { "Ar\u00e1bia Saudita" }
-        SE { "Su\u00e9cia" }
+        RE { "Reuni\u00E3o" }
+        RO { "Rom\u00EAnia" }
+        RU { "R\u00FAssia" }
+        RW { "Ruanda" }
+        SA { "Ar\u00E1bia Saudita" }
+        SB { "Ilhas Salom\u00E3o" }
+        //SC { "Seychelles" }
+        SD { "Sud\u00E3o" }
+        SE { "Su\u00E9cia" }
         SG { "Cingapura" }
-        SI { "Eslov\u00eania" }
-        SK { "Eslov\u00e1quia" }
-        SP { "S\u00e9rvia" }
-        SY { "S\u00edria" }
-        TH { "Tail\u00e2ndia" }
-        TN { "Tun\u00edsia" }
+        SH { "Santa Helena" }
+        SI { "Eslov\u00EAnia" }
+        SJ { "Svalbard e Jan Mayen" }
+        SK { "Eslov\u00E1quia" }
+        SL { "Serra Leoa" }
+        //SM { "San Marino" }
+        //SN { "Senegal" }
+        SO { "Som\u00E1lia" }
+        SP { "S\u00E9rvia" }
+        //SR { "Suriname" }
+        ST { "S\u00E3o Tom\u00E9 e Pr\u00EDncipe" }
+        //SV { "El Salvador" }
+        SY { "S\u00EDria" }
+        SZ { "Suazil\u00E2ndia" }
+        TC { "Ilhas Turks e Caicos" }
+        TD { "Chade" }
+        TF { "Territ\u00F3rios Franceses do Sul" }
+        //TG { "Togo" }
+        TH { "Tail\u00E2ndia" }
+        TJ { "Tadjiquist\u00E3o" }
+        //TK { "Tokelau" }
+        TL { "Timor Leste" }
+        TM { "Turcomenist\u00E3o" }
+        TN { "Tun\u00EDsia" }
+        //TO { "Tonga" }
         TR { "Turquia" }
-        UA { "Ucr\u00e2nia" }
+        TT { "Trinidad e Tobago" }
+        //TV { "Tuvalu" }
+        //TW { "Taiwan" }
+        TZ { "Tanz\u00E2nia" }
+        UA { "Ucr\u00E2nia" }
+        //UG { "Uganda" }
+        UM { "Ilhas Menores Distantes dos Estados Unidos" }
         US { "Estados Unidos" }
         UY { "Uruguai" }
-        ZA { "\u00c1frica do Sul" }
-    }
-    DateTimeElements:intvector { 
-        2,
-        1,
-    }
-    DateTimePatterns { 
-        "HH'H'mm'm' z",
-        "HH:mm:ss z",
-        "HH:mm:ss",
-        "HH:mm",
-        "EEEE, d' de 'MMMM' de 'yyyy",
-        "d' de 'MMMM' de 'yyyy",
-        "d/MMM/yyyy",
-        "dd-MM-yyyy",
-        "{1} {0}",
-    }
-    DayAbbreviations { 
-        "Dom",
-        "Seg",
-        "Ter",
-        "Qua",
-        "Qui",
-        "Sex",
-        "S\u00E1b",
-    }
-    DayNames { 
-        "Domingo",
-        "Segunda-feira",
-        "Ter\u00E7a-feira",
-        "Quarta-feira",
-        "Quinta-feira",
-        "Sexta-feira",
-        "S\u00E1bado",
-    }
-    Languages { 
-        ar { "\u00c1rabe" }
-        az { "Azerbaij\u00e3o" }
-        ba { "Basco" }
-        be { "Bielo-russo" }
-        bg { "B\u00falgaro" }
-        bn { "Bengala" }
-        ca { "Catal\u00e3o" }
-        cs { "Tcheco" }
-        da { "Dinamarqu\u00eas" }
-        de { "Alem\u00e3o" }
-        el { "Grego" }
-        en { "Ingl\u00eas" }
-        es { "Espanhol" }
-        et { "Est\u00f4nio" }
-        fa { "Farsi" }
-        fi { "Finland\u00eas" }
-        fr { "Franc\u00eas" }
-        gu { "Guzarate" }
-        he { "Hebreu" }
-        hr { "Croata" }
-        hu { "H\u00fangaro" }
-        id { "Indon\u00e9sio" }
-        it { "Italiano" }
-        ja { "Japon\u00eas" }
-        ka { "Georgiano" }
-        km { "Cmer" }
-        kn { "Canad\u00e1" }
-        ko { "Coreano" }
-        ku { "Curdo" }
-        la { "Latino" }
-        lt { "Lituano" }
-        lv { "Let\u00e3o" }
-        mk { "Maced\u00f4nio" }
-        mr { "Marati" }
-        my { "Birman\u00eas" }
-        nl { "Holand\u00eas" }
-        no { "Noruegu\u00eas" }
-        pl { "Polon\u00eas" }
-        pt { "Portugu\u00eas" }
-        ro { "Romeno" }
-        ru { "Russo" }
-        sk { "Eslovaco" }
-        sl { "Esloveno" }
-        sq { "Alban\u00eas" }
-        sr { "S\u00e9rvio" }
-        sv { "Su\u00e9co" }
-        te { "T\u00e9lugu" }
-        th { "Tailand\u00eas" }
-        tk { "Tagalo" }
-        tr { "Turco" }
-        uk { "Ucraniano" }
-        uz { "Usbeque" }
-        zh { "Chin\u00eas" }
-    }
-    LocaleID:int { 0x16 }
-//    LocaleString { "pt" }
-    MonthAbbreviations { 
-        "Jan",
-        "Fev",
-        "Mar",
-        "Abr",
-        "Mai",
-        "Jun",
-        "Jul",
-        "Ago",
-        "Set",
-        "Out",
-        "Nov",
-        "Dez",
-    }
-    MonthNames { 
-        "Janeiro",
-        "Fevereiro",
-        "Mar\u00E7o",
-        "Abril",
-        "Maio",
-        "Junho",
-        "Julho",
-        "Agosto",
-        "Setembro",
-        "Outubro",
-        "Novembro",
-        "Dezembro",
-    }
-    NumberElements { 
-        ",",
-        ".",
-        ";",
-        "%",
-        "0",
-        "#",
-        "-",
-        "E",
-        "\u2030",
-        "\u221E",
-        "\uFFFD",
-        ",",
-    }
-//    ShortLanguage { "por" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
+        UZ { "Uzbequist\u00E3o" }
+        VA { "Santa S\u00E9 (Cidade Estado do Vaticano)" }
+        VC { "Saint Vincent e Grenadinas" }
+        //VE { "Venezuela" }
+        VG { "Ilhas Virgens Brit\u00E2nicas" }
+        VI { "Ilhas Virgens dos EUA" }
+        VN { "Vietn\u00E3" }
+        //VU { "Vanuatu" }
+        WF { "Wallis e Futuna" }
+        //WS { "Samoa" }
+        YE { "I\u00EAmen" }
+        //YT { "Mayotte" }
+        YU { "Iugosl\u00E1via" }
+        ZA { "\u00C1frica do Sul" }
+        ZM { "Z\u00E2mbia" }
+        ZW { "Zimb\u00E1bue" }
     }
-//    LocaleScript{
-//        "Latn",  // ISO 15924 Name 
-//    }
-    ExemplarCharacters { "[a-z \u00e3 \u00f5 \u00e7 \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u00e0 \u00e2 \u00ea \u00f4 \u00fc \u00f2]" }
-
     // Currency display names
     Currencies {
         ADP { "ADP", "Peseta de Andorra" }
@@ -399,7 +424,7 @@
         USD { "$", "D\u00F3lar Americano" }
         UYP { "UYP", "Novo Peso Uruguaio" }
         VEB { "VEB", "Bolivar Venezuelano" }
-        VND { "\u20AB", "Dong Vietnamita" }
+        VND { "\u0111", "Dong Vietnamita" }
         VUV { "VUV", "Vatu do Vanuatu" }
         WST { "WST", "Tala de Samoa" }
         XAF { "XAF", "Franco do Gab\u00E3o C.f.A" }
@@ -410,4 +435,216 @@
         ZMK { "ZMK", "Kwacha da Z\u00E2mbia" }
         ZWD { "ZWD", "D\u00F3lar do Zimbabue" }
     }
+    DateTimePatterns { 
+        "HH'H'mm'm'ss's' z",
+        "HH:mm:ss z",
+        "HH:mm:ss",
+        "HH:mm",
+        "EEEE, d' de 'MMMM' de 'yyyy",
+        "d' de 'MMMM' de 'yyyy",
+        "d/MMM/yyyy",
+        "dd-MM-yyyy",
+        "{1} {0}",
+    }
+    DayAbbreviations { 
+        "dom",
+        "seg",
+        "ter",
+        "qua",
+        "qui",
+        "sex",
+        "s\u00E1b",
+    }
+    DayNames { 
+        "domingo",
+        "segunda-feira",
+        "ter\u00E7a-feira",
+        "quarta-feira",
+        "quinta-feira",
+        "sexta-feira",
+        "s\u00E1bado",
+    }
+    Eras { 
+        "a.C.", // antes de Cristo 
+        "d.C.", // depois de Cristo
+    }
+    ExemplarCharacters { "[a-z\u00e3\u00f5\u00e7\u00e1\u00e9\u00ed\u00f3\u00fa\u00e0\u00e2\u00ea\u00f4\u00fc\u00f2]" }
+    LocaleScript{
+        "Latn",  // ISO 15924 Name 
+    }
+    Languages { 
+        af { "afric\u00E2ner" }
+        am { "am\u00E1rico" }
+        ar { "ar\u00E1bico" }
+        az { "azerbaij\u00E3o" }
+        // ??? ba { "basco" }
+        be { "bielo-russo" }
+        bg { "b\u00FAlgaro" }
+        bn { "bengala" }
+        ca { "catal\u00E3o" }
+        cs { "tcheco" }
+        da { "dinamarqu\u00EAs" }
+        de { "alem\u00E3o" }
+        el { "grego" }
+        en { "ingl\u00EAs" }
+        eo { "esperanto" }
+        es { "espanhol" }
+        et { "estoniano" }
+        eu { "basco" }
+        fa { "farsi" }
+        fi { "finland\u00EAs" }
+        fo { "faroense" }
+        fr { "franc\u00EAs" }
+        ga { "irland\u00EAs" }
+        gl { "galego" }
+        gu { "guzarate" }
+        gv { "manx" }
+        haw { "havaiano" }
+        //he { "hebreu" } // Old value
+        he { "hebraico" }
+        hi { "hindi" }
+        hr { "croata" }
+        hu { "h\u00FAngaro" }
+        hy { "arm\u00EAnio" }
+        id { "indon\u00E9sio" }
+        is { "island\u00EAs" }
+        it { "italiano" }
+        iu { "inuktitut" }
+        ja { "japon\u00EAs" }
+        ka { "georgiano" }
+        kl { "kalaallisut" }
+        km { "cmer" }
+        kn { "canad\u00E1" }
+        ko { "coreano" }
+        ku { "curdo" }
+        kw { "c\u00F3rnico" }
+        la { "latino" }
+        lt { "lituano" }
+        lv { "latviano" }
+        mk { "maced\u00F4nio" }
+        mr { "marati" }
+        mt { "malt\u00EAs" }
+        my { "birman\u00EAs" }
+        nb { "bokm\u00E5l noruegu\u00EAs" }
+        nl { "holand\u00EAs" }
+        nn { "nynorsk noruegu\u00EAs" }
+        no { "noruegu\u00EAs" }
+        om { "oromo" }
+        pl { "polon\u00EAs" }
+        pt { "portugu\u00EAs" }
+        ro { "romeno" }
+        ru { "russo" }
+        sh { "servo-croata" }
+        sk { "eslovaco" }
+        sl { "eslov\u00EAnio" }
+        so { "somali" }
+        sq { "alban\u00EAs" }
+        sr { "s\u00E9rvio" }
+        sv { "sueco" }
+        sw { "sua\u00EDli" }
+        ta { "t\u00E2mil" }
+        te { "t\u00E9lugu" }
+        th { "tailand\u00EAs" }
+        ti { "tigr\u00EDnia" }
+        tk { "tagalo" }
+        tr { "turco" }
+        uk { "ucraniano" }
+        uz { "usbeque" }
+        vi { "vietnamita" }
+        zh { "chin\u00EAs" }
+    }
+    MonthAbbreviations { 
+        "jan",
+        "fev",
+        "mar",
+        "abr",
+        "mai",
+        "jun",
+        "jul",
+        "ago",
+        "set",
+        "out",
+        "nov",
+        "dez",
+    }
+    MonthNames { 
+        "janeiro",
+        "fevereiro",
+        "mar\u00E7o",
+        "abril",
+        "maio",
+        "junho",
+        "julho",
+        "agosto",
+        "setembro",
+        "outubro",
+        "novembro",
+        "dezembro",
+    }
+    NumberElements { 
+        ",",
+        ".",
+        ";",
+        "%",
+        "0",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221E",
+        "\uFFFD",
+        ",",
+        "+",
+    }
+    SpelloutRules {
+        "-x: menos >>;\n"
+        "x.x: << ponto >>;\n"
+        "zero; um; dois; tr\u00EAs; qtro; cinco; seis; sete; oito; nove;\n"
+        "dez; onze; doze; treze; catorze; quinze; dezasseis;"
+        "    dezassete; dezoito; dezanove;\n"
+        "vinte; vinte e um; vinte e dois; vinte e tr\u00EAs; vete e quatro;"
+        "    vinte cinco; vinte seis; vinte sete; vinte e oito;"
+        "    vinte e nove;\n"
+        "30: trinta[ e >>];\n"
+        "40: cuarenta[ e >>];\n"
+        "50: cincuenta[ e >>];\n"
+        "60: sessenta[ e >>];\n"
+        "70: setenta[ e >>];\n"
+        "80: oitenta[ e >>];\n"
+        "90: noventa[ e >>];\n"
+        "100: cem;\n"
+        "200: doscentos[ >>];\n"
+        "300: tr\u00E8sentos[ >>];\n"
+        "400: cuatrocentos[ >>];\n"
+        "500: quinientos[ >>];\n"
+        "600: seiscentos[ >>];\n"
+        "700: setecentos[ >>];\n"
+        "800: oitocentos[ >>];\n"
+        "900: novecentos[ >>];\n"
+        "1000: mil[ >>];\n"
+        "2000: << mil[ >>];\n"
+        "1,000,000: um milh\u00E3o[ >>];\n"
+        "2,000,000: << milh\u00F5es[ >>];\n"
+        "1,000,000,000: um bilh\u00E3o[>>];\n"         
+        "2,000,000,000: << bilh\u00F5es[>>];\n"     
+        "1,000,000,000,000: =#,##0=;" 
+    }
+    Keys {
+       collation { "Sorte" }
+       calendar  { "Caled\u00E1rio" }
+       currency  { "Moeda Corrente"}
+    }
+    Types{
+        collation{
+            traditional{ "Tradicional Sorte" }
+        }
+        calendar{
+            traditional{ "Tradicional Caled\u00E1rio" }
+        }
+    }
+    Variants{
+        //PREEURO { "Pr\u00e9-Euro" }
+        REVISED { "Revisado" }
+    }
+
 }

Index: pt_BR.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/pt_BR.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pt_BR.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ pt_BR.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -18,13 +18,10 @@
         "dd/MM/yy",
         "{1} {0}",
     }
-    LocaleID:int { 0x0416 }
-//    LocaleString { "pt_BR" }
 //    NumberPatterns { 
 //        "#,##0.###;-#,##0.###",
 //        "\u00A4 #,##0.00;-\u00A4 #,##0.00",
 //        "#,##0%",
 //        "#E0",
 //    }
-//    ShortCountry { "BRA" }
 }

Index: pt_PT.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/pt_PT.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pt_PT.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ pt_PT.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -7,28 +7,129 @@
 
 pt_PT {
     Version{ "2.0" }
-//    LocaleString { "pt_PT" }
-    NumberPatterns { 
+    // Only contains differences from pt.
+    // TODO Verify that the commented out translations are correct for pt and pt_PT.
+    Countries {
+        AE { "Emiratos \u00C1rabes Unidos" }
+        AG { "Ant\u00EDgua e Barbuda" }
+        AM { "Arm\u00E9nia" }
+        AQ { "Ant\u00E1rctica" }
+        AZ { "Azerbeij\u00E3o" }
+        BA { "B\u00F3snia-Herzegovina" }
+        //BF { "Burkina Faso" }
+        //BH { "Bahrain" }
+        BJ { "Benim" }
+        //BM { "Bermuda" }
+        //BW { "Botswana" }
+        BY { "Bielorr\u00FAssia" }
+        CM { "Camar\u00F5es" }
+        CX { "Ilha do Natal" }
+        CZ { "Rep\u00FAblica Checa" }
+        //DJ { "Djibouti" }
+        EE { "Est\u00F3nia" }
+        EG { "Egipto" }
+        EH { "Sahara Ocidental" }
+        ER { "Eritreia" }
+        FK { "Ilhas Falkland" }
+        //GD { "Grenada" }
+        //GH { "Ghana" }
+        GL { "Gronel\u00E2ndia" }
+        GS { "Ilhas South Georgia e South Sandwich" }
+        GW { "Guin\u00E9-Bissau" }
+        HK { "Hong Kong - Regi\u00E3o Administrativa Especial da China" }
+        KE { "Qu\u00E9nia" }
+        KG { "Quirguizist\u00E3o" }
+        KH { "Camboja" }
+        //KM { "Comoros" }
+        KN { "Saint Kitts e Nevis" }
+        KP { "Coreia do Norte" }    // alternate name { "Coreia, Rep\u00FAblica Popular Democr\u00E1tica da" }
+        KR { "Coreia do Sul" }    // alternate name { "Coreia, Rep\u00FAblica da" }
+        KY { "Ilhas Caim\u00E3o" }
+        KZ { "Cazaquist\u00E3o" }
+        LA { "Lao, Rep\u00FAblica Popular Democr\u00E1tica" }
+        //LC { "Saint Lucia" }
+        //LS { "Lesotho" }
+        LV { "Let\u00F3nia" }
+        MC { "M\u00F3naco" }
+        MD { "Mold\u00E1via, Rep\u00FAblica da" }
+        MG { "Madag\u00E1scar" }
+        MK { "Maced\u00F3nia, Rep\u00FAblica da" }
+        //MM { "Myanmar" }
+        MO { "Macau - Regi\u00E3o Administrativa Especial da China" }
+        MP { "Ilhas Mariana do Norte" }
+        MU { "Maur\u00EDcias" }
+        //MW { "Malawi" }
+        NC { "Nova Caled\u00F3nia" }
+        PG { "Papua Nova Guin\u00E9" }
+        PL { "Pol\u00F3nia" }
+        PS { "Territ\u00F3rio Palestiniano" }
+        RE { "Reunion" }
+        RO { "Rom\u00E9nia" }
+        SC { "Seicheles" }
+        SG { "Singapura" }
+        //SH { "Saint Helena" }
+        SI { "Eslov\u00E9nia" }
+        SM { "S\u00E3o Marino" }
+        TC { "Ilhas Turcas e Caicos" }
+        TD { "Tchade" }
+        TF { "Territ\u00F3rios Franceses a Sul" }
+        TJ { "Tajiquist\u00E3o" }
+        TM { "Turquemenist\u00E3o" }
+        TW { "Formosa, Prov\u00EDncia Chinesa" }
+        UM { "Ilhas Minor Outlying (E.U.A)" }
+        UZ { "Uzbaquist\u00E3o" }
+        VA { "Santa S\u00E9 (Estado da Cidade do Vaticano)" }
+        VC { "Saint Vincent e Grenadines" }
+        VG { "Ilhas Virgin Brit\u00E2nicas" }
+        VI { "Ilhas Virgin E.U.A." }
+        VN { "Vietname" }
+        YE { "I\u00E9men" }
+        YU { "Jugosl\u00E1via" }
+        //ZW { "Zimbabwe" }
+    }
+    DateTimeElements:intvector { 
+        2,
+        1,
+    }
+    DateTimePatterns {
+        "HH'H'mm'm'ss's' z",
+        "HH:mm:ss z",
+        "HH:mm:ss",
+        "HH:mm",
+        "EEEE, d' de 'MMMM' de 'yyyy",
+        "d' de 'MMMM' de 'yyyy",
+        "yyyy/MM/dd",
+        "yy/MM/dd",
+        "{1} {0}",
+    }
+    Languages {
+        ar { "\u00E1rabe" }
+        cs { "checo" }
+        et { "est\u00F3nio" }
+        lv { "let\u00E3o" }
+        pl { "polaco" }
+        sl { "esloveno" }
+    }
+    NumberPatterns {
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "PRT" }
-    LocaleID:int { 0x0816 }
-
-    NumberElements {
-        ",",
-        ".",
-        ";",
-        "%",
-        "0",
-        "#",
-        "-",
-        "E",
-        "\u2030",
-        "\u221E",
-        "\uFFFD",
-        "$",
-    }
-}
+    // Fallback to pt
+//    NumberElements {
+//        ",",
+//        ".",
+//        ";",
+//        "%",
+//        "0",
+//        "#",
+//        "-",
+//        "E",
+//        "\u2030",
+//        "\u221E",
+//        "\uFFFD",
+//        ",",
+//        "+",
+//    }
+}
\ No newline at end of file

Index: pt_PT_PREEURO.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/pt_PT_PREEURO.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pt_PT_PREEURO.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ pt_PT_PREEURO.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -13,4 +13,19 @@
         "#,##0%",
         "#E0",
     }
+    NumberElements {
+        ",",
+        ".",
+        ";",
+        "%",
+        "0",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221E",
+        "\uFFFD",
+        "$",
+        "+",
+    }
 }

Index: resfiles.mk
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/resfiles.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- resfiles.mk	10 Sep 2003 02:42:06 -0000	1.1
+++ resfiles.mk	6 Apr 2004 10:08:14 -0000	1.2
@@ -26,13 +26,13 @@
 
 # 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 = \
+GENRB_ALIAS_SOURCE = \
 #iw.txt iw_IL.txt\
 #no.txt no_NO.txt no_NO_NY.txt
 
 
 # Please try to keep this list in alphabetical order
-#GENRB_SOURCE = \
+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\
@@ -59,7 +59,7 @@
 #es_UY.txt es_VE.txt\
 #et.txt et_EE.txt\
 #eu.txt eu_ES.txt eu_ES_PREEURO.txt\
-#fa.txt fa_IR.txt\
+#fa.txt fa_AF.txt fa_IR.txt\
 #fi.txt fi_FI.txt fi_FI_PREEURO.txt\
 #fo.txt fo_FO.txt\
 #fr.txt fr_BE.txt fr_BE_PREEURO.txt fr_CA.txt fr_CH.txt\
@@ -77,6 +77,7 @@
 #is.txt is_IS.txt\
 #it.txt it_CH.txt it_IT.txt it_IT_PREEURO.txt\
 #ja.txt ja_JP.txt ja_JP_TRADITIONAL.txt\
+#kk.txt kk_KZ.txt\
 #kl.txt kl_GL.txt\
 #ko.txt ko_KR.txt\
 #kok.txt kok_IN.txt\
@@ -86,12 +87,15 @@
 #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_BE_PREEURO.txt nl_NL.txt nl_NL_PREEURO.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 pt_PT_PREEURO.txt\
 #ro.txt ro_RO.txt\
 #ru.txt ru_RU.txt ru_UA.txt\

Index: ro.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ro.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ro.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ ro.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -7,14 +7,256 @@
 
 ro {
     Version{ "2.0" }
-    CollationElements {
-	 	Version { "1.0" }
-		Sequence {"& A < a\u0306 <<< A\u0306 & D < \u0111<<< \u0110 & I < i\u0302"
+    collations {
+      standard { 
+        Version { "1.0" }
+        Sequence { "& A < a\u0306 <<< A\u0306 & D < \u0111<<< \u0110 & I < i\u0302"
         " <<< I\u0302 & S < s\u0327 <<< S\u0327 & \u00DE < t\u0327 <<< T\u0327& Z < z\u0307 <<< "
         "Z\u0307" }
-	}
+      }
+    }
     Countries { 
+        Fallback{ "en"}
+        //AD { "Andorra" }
+        AE { "Emiratele Arabe Unite" }
+        AF { "Afganistan" }
+        AG { "Antigua \u015Fi Barbuda" }
+        //AI { "Anguilla" }
+        //AL { "Albania" }
+        //AM { "Armenia" }
+        AN { "Antilele Olandeze" }
+        //AO { "Angola" }
+        //AQ { "Antarctica" }
+        //AR { "Argentina" }
+        AS { "Samoa American\u0103" }
+        //AT { "Austria" }
+        //AU { "Australia" }
+        //AW { "Aruba" }
+        AZ { "Azerbaidjan" }
+        BA { "Bosnia \u015Fi Herzegovina" }
+        //BB { "Barbados" }
+        //BD { "Bangladesh" }
+        BE { "Belgia" }
+        //BF { "Burkina Faso" }
+        //BG { "Bulgaria" }
+        //BH { "Bahrain" }
+        //BI { "Burundi" }
+        //BJ { "Benin" }
+        //BM { "Bermuda" }
+        //BN { "Brunei" }
+        //BO { "Bolivia" }
+        BR { "Brazilia" }
+        //BS { "Bahamas" }
+        //BT { "Bhutan" }
+        BV { "Insula Bouvet" }
+        //BW { "Botswana" }
+        BY { "Bielorusia" }
+        //BZ { "Belize" }
+        //CA { "Canada" }
+        CC { "Insulele Cocos (Keeling)" }
+        CD { "Congo, Republica Democratic\u0103" }
+        CF { "Republica Central African\u0103" }
+        //CG { "Congo" }
+        CH { "Eleve\u0163ia" }
+        CI { "Coasta de Filde\u015F" }
+        CK { "Insulele Cook" }
+        //CL { "Chile" }
+        CM { "Camerun" }
+        //CN { "China" }
+        CO { "Columbia" }
+        //CR { "Costa Rica" }
+        //CU { "Cuba" }
+        CV { "Capul Verde" }
+        CX { "Insula Christmas" }
+        CY { "Cipru" }
+        CZ { "Republica Ceh\u0103" }
+        DE { "Germania" }
+        //DJ { "Djibouti" }
+        DK { "Danemarca" }
+        //DM { "Dominica" }
+        DO { "Republica Dominican\u0103" }
+        //DZ { "Algeria" }
+        //EC { "Ecuador" }
+        //EE { "Estonia" }
+        EG { "Egipt" }
+        EH { "Sahara de Vest" }
+        //ER { "Eritrea" }
+        ES { "Spania" }
+        ET { "Etiopia" }
+        FI { "Finlanda" }
+        //FJ { "Fiji" }
+        FK { "Insulele Falkland" }
+        FM { "Micronezia, Statele Federate" }
+        FO { "Insulele Feroe" }
+        FR { "Fran\u0163a" }
+        //GA { "Gabon" }
+        GB { "Regatul Unit" }
+        //GD { "Grenada" }
+        //GE { "Georgia" }
+        GF { "Guyana Francez\u0103" }
+        //GH { "Ghana" }
+        //GI { "Gibraltar" }
+        GL { "Groenlanda" }
+        //GM { "Gambia" }
+        GN { "Guineea" }
+        //GP { "Guadeloupe" }
+        GQ { "Guineea Ecuatorial\u0103" }
+        GR { "Grecia" }
+        GS { "Insulele South Georgia \u015Fi South Sandwich" }
+        //GT { "Guatemala" }
+        //GU { "Guam" }
+        GW { "Guineea-Bissau" }
+        //GY { "Guyana" }
+        HK { "R.A.S. Hong Kong a Chinei" }
+        HM { "Insula Heard \u015Fi Insulele McDonald" }
+        //HN { "Honduras" }
+        HR { "Croa\u0163ia" }
+        //HT { "Haiti" }
+        HU { "Ungaria" }
+        ID { "Indonezia" }
+        IE { "Irlanda" }
+        //IL { "Israel" }
+        //IN { "India" }
+        IO { "Teritoriile Britanice din Oceanul Indian" }
+        //IQ { "Iraq" }
+        //IR { "Iran, Republica Islamic\u0103" }
+        IS { "Islanda" }
+        IT { "Italia" }
+        //JM { "Jamaica" }
+        JO { "Iordania" }
+        JP { "Japonia" }
+        //KE { "Kenya" }
+        KG { "Kirghizia" }
+        KH { "Cambodgia" }
+        //KI { "Kiribati" }
+        //KM { "Comoros" }
+        KN { "Saint Kitts \u015Fi Nevis" }
+        KP { "Coreea de Nord" }    // alternate name { "Coreea, Republica Popular\u0103 Democratic\u0103" }
+        KR { "Coreea de Sud" }    // alternate name { "Coreea, Republica" }
+        KW { "Kuweit" }
+        KY { "Insulele Cayman" }
+        KZ { "Kazahstan" }
+        LA { "Lao, Republica Democratic\u0103 Popular\u0103" }
+        LB { "Liban" }
+        //LC { "Saint Lucia" }
+        //LI { "Liechtenstein" }
+        //LK { "Sri Lanka" }
+        //LR { "Liberia" }
+        //LS { "Lesotho" }
+        LT { "Lituania" }
+        LU { "Luxemburg" }
+        LV { "Letonia" }
+        LY { "Libia, Jamahiriya Arab\u0103" }
+        MA { "Maroc" }
+        //MC { "Monaco" }
+        MD { "Moldova, Republica" }
+        //MG { "Madagascar" }
+        MH { "Insulele Marshall" }
+        //MK { "Macedonia" }
+        //ML { "Mali" }
+        //MM { "Myanmar" }
+        //MN { "Mongolia" }
+        MO { "R.A.S. Macao a Chinei" }
+        MP { "Insulele Northern Mariana" }
+        MQ { "Martinica" }
+        //MR { "Mauritania" }
+        //MS { "Montserrat" }
+        //MT { "Malta" }
+        //MU { "Mauritius" }
+        MV { "Maldive" }
+        //MW { "Malawi" }
+        MX { "Mexic" }
+        MY { "Malaezia" }
+        MZ { "Mozambic" }
+        //NA { "Namibia" }
+        NC { "Noua Caledonie" }
+        //NE { "Niger" }
+        NF { "Insulele Norfolk" }
+        //NG { "Nigeria" }
+        //NI { "Nicaragua" }
+        NL { "Olanda" }
+        NO { "Norvegia" }
+        //NP { "Nepal" }
+        //NR { "Nauru" }
+        //NU { "Niue" }
+        NZ { "Noua Zeeland\u0103" }
+        //OM { "Oman" }
+        //PA { "Panama" }
+        //PE { "Peru" }
+        PF { "Polinezia Francez\u0103" }
+        PG { "Papua Noua Guinee" }
+        PH { "Filipine" }
+        //PK { "Pakistan" }
+        PL { "Polonia" }
+        PM { "Saint Pierre \u015Fi Miquelon" }
+        //PN { "Pitcairn" }
+        PR { "Porto Rico" }
+        PS { "Teritoriul Palestinian" }
+        PT { "Portugalia" }
+        //PW { "Palau" }
+        //PY { "Paraguay" }
+        //QA { "Qatar" }
+        RE { "Reunion" }
         RO { "Rom\u00E2nia" }
+        //RO { "Romania" } // From translation center
+        RU { "Federa\u0163ia Rus\u0103" }
+        //RW { "Rwanda" }
+        SA { "Arabia Saudit\u0103" }
+        SB { "Insulele Solomon" }
+        //SC { "Seychelles" }
+        //SD { "Sudan" }
+        SE { "Suedia" }
+        //SG { "Singapore" }
+        //SH { "Saint Helena" }
+        //SI { "Slovenia" }
+        SJ { "Svalbard \u015Fi Jan Mayen" }
+        SK { "Slovacia" }
+        //SL { "Sierra Leone" }
+        //SM { "San Marino" }
+        //SN { "Senegal" }
+        //SO { "Somalia" }
+        SR { "Surinam" }
+        ST { "Sao Tome \u015Fi Principe" }
+        //SV { "El Salvador" }
+        SY { "Siria" }    // alternate name { "Republica Arab\u0103 Siria" }
+        //SZ { "Swaziland" }
+        TC { "Insulele Turks \u015Fi Caicos" }
+        TD { "Ciad" }
+        TF { "Teritoriile Franceze de Sud" }
+        //TG { "Togo" }
+        TH { "Tailanda" }
+        TJ { "Tadjikistan" }
+        //TK { "Tokelau" }
+        TL { "Timorul de Est" }
+        //TM { "Turkmenistan" }
+        //TN { "Tunisia" }
+        //TO { "Tonga" }
+        TR { "Turcia" }
+        TT { "Trinidad \u015Fi Tobago" }
+        //TV { "Tuvalu" }
+        TW { "Taiwan, Provincia Chinez\u0103" }    // alternate name { "Taiwan" }
+        //TZ { "Tanzania" }
+        UA { "Ucraina" }
+        //UG { "Uganda" }
+        //UM { "United States Minor Outlying Islands" }
+        US { "Statele Unite" }
+        //UY { "Uruguay" }
+        //UZ { "Uzbekistan" }
+        VA { "Sf\u00E2ntul Scaun (Statul Vatican)" }
+        VC { "Saint Vincent \u015Fi Grenadines" }
+        //VE { "Venezuela" }
+        VG { "Insulele Virgine Britanice" }
+        VI { "Insulele Virgine S.U.A." }
+        //VN { "Vietnam" }
+        //VU { "Vanuatu" }
+        WF { "Wallis \u015Fi Futuna" }
+        //WS { "Samoa" }
+        //YE { "Yemen" }
+        //YT { "Mayotte" }
+        YU { "Iugoslavia" }
+        ZA { "Africa de Sud" }
+        //ZM { "Zambia" }
+        //ZW { "Zimbabwe" }
     }
     DateTimePatterns { 
         "HH:mm:ss z",
@@ -27,6 +269,10 @@
         "dd.MM.yyyy",
         "{1} {0}",
     }
+    DateTimeElements:intvector {
+        2,
+        1, // "Minimal Days in First Week" is unknown. Root value used instead
+    }
     DayAbbreviations { 
         "D",
         "L",
@@ -50,10 +296,39 @@
         "\u00EE.d.C.",
     }
     Languages { 
-        ro { "rom\u00E2n\u0103" }
+        ar { "Arab\u0103" }
+        bg { "Bulgar\u0103" }
+        cs { "Ceh\u0103" }
+        da { "Danez\u0103" }
+        de { "German\u0103" }
+        el { "Greac\u0103" }
+        en { "Englez\u0103" }
+        es { "Spaniol\u0103" }
+        et { "Estonian\u0103" }
+        fi { "Finlandez\u0103" }
+        fr { "Francez\u0103" }
+        he { "Ebraic\u0103" }
+        hr { "Croat\u0103" }
+        hu { "Maghiar\u0103" }
+        it { "Italian\u0103" }
+        ja { "Japonez\u0103" }
+        ko { "Coreean\u0103" }
+        lt { "Lituanian\u0103" }
+        lv { "Leton\u0103" }
+        nl { "Olandez\u0103" }
+        no { "Norvegian\u0103" }
+        pl { "Polonez\u0103" }
+        pt { "Portughez\u0103" }
+        ro { "Rom\u00E2n\u0103" }
+        ru { "Rus\u0103" }
+        sk { "Slovac\u0103" }
+        sl { "Sloven\u0103" }
+        sv { "Suedez\u0103" }
+        tr { "Turc\u0103" }
+        zh { "Chinez\u0103" }
+        //zh_cn { "Chinez\u0103 (Simplificat\u0103)" }
+        //zh_tw { "Chinez\u0103 (Tradi\u0163ional\u0103)" }
     }
-    LocaleID:int { 0x18 }
-//    LocaleString { "ro" }
     MonthAbbreviations { 
         "Ian",
         "Feb",
@@ -95,25 +370,16 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "ron" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
     }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
     ExemplarCharacters { "[a-z \u00e2 \u00ee \u0103 \u015f \u0163]" }
 
     // Currency display names
     Currencies {
         ROL { "lei", "ROL" }
     }
-}
+}
\ No newline at end of file

Index: ro_RO.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ro_RO.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ro_RO.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ ro_RO.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -7,13 +7,10 @@
 
 ro_RO {
     Version{ "2.0" }
-//    LocaleString { "ro_RO" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "ROM" }
-    LocaleID:int { 0x0418 }
 }

Index: root.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/root.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- root.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ root.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -8,853 +8,299 @@
 //  11/17/99    aliu        Added support for transliterators.
 //  01/15/2002  grhoten     Synchronized the language and contry codes with ISO standards
 
-// ***  Note: do NOT translate or modify (customize) this root locale.  
+// ***  Note: do NOT translate or modify (customize) this root locale.
 //      Instead, put translations in sub locales.
 
 root {
-    Version { "4.0" }
-
-    // each variant name that occurs in locales should be listed with %% and a display string
[...2626 lines suppressed...]
+    }
+    Variants{
+        Fallback{ "" }
+        //NY      { "NY" }        // No longer valid variant. Here for backwards compatibility.
+        //EURO    { "EURO" }      // EURO variant display name
+        POSIX   { "POSIX" }
+        REVISED { "REVISED" }
+    }
+    zoneStrings:array {
+        {
+            "",
+            "",
+            "",
+            "",
+            "",
+            ""
+        }
+    }
 }
 

Index: ru.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ru.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ru.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ ru.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -9,62 +9,264 @@
     Version{ "2.0" }
     // Using the new options in rules in order to 
     // improve the performance for Cyrillic chars.
-    CollationElements { 
-      Version { "1.1" }
-      Sequence { 
-        "[suppressContractions [\u0400-\u045f]]"
+    collations {
+      standard { 
+        Version { "1.1" }
+        Sequence { 
+            "[suppressContractions [\u0400-\u045f]]"
+        }
       }
     }
     Countries { 
-        AL { "\u0410\u043b\u0431\u0430\u043d\u0438\u044f" }
-        AS { "\u0410\u0437\u0438\u044f" }
-        AT { "\u0410\u0432\u0441\u0442\u0440\u0438\u044f" }
-        AU { "\u0410\u0432\u0441\u0442\u0440\u0430\u043b\u0438\u044f" }
-        BA { "\u0411\u043e\u0441\u043d\u0438\u044f" }
-        BE { "\u0411\u0435\u043b\u044c\u0433\u0438\u044f" }
-        BG { "\u0411\u043e\u043b\u0433\u0430\u0440\u0438\u044f" }
-        BR { "\u0411\u0440\u0430\u0437\u0438\u043b\u0438\u044f" }
-        CA { "\u041a\u0430\u043d\u0430\u0434\u0430" }
-        CH { "\u0428\u0432\u0435\u0439\u0446\u0430\u0440\u0438\u044f" }
-        CN { "\u041a\u0438\u0442\u0430\u0439 (\u041a\u041d\u0420)" }
-        CZ { "\u0427\u0435\u0445\u0438\u044f" }
-        DE { "\u0413\u0435\u0440\u043c\u0430\u043d\u0438\u044f" }
-        DK { "\u0414\u0430\u043d\u0438\u044f" }
-        EE { "\u042d\u0441\u0442\u043e\u043d\u0438\u044f" }
-        ES { "\u0418\u0441\u043f\u0430\u043d\u0438\u044f" }
-        FI { "\u0424\u0438\u043d\u043b\u044f\u043d\u0434\u0438\u044f" }
-        FR { "\u0424\u0440\u0430\u043d\u0446\u0438\u044f" }
-        GB { "\u0412\u0435\u043b\u0438\u043a\u043e\u0431\u0440\u0438\u0442\u0430\u043d\u0438\u044f" }
-        GR { "\u0413\u0440\u0435\u0446\u0438\u044f" }
-        HR { "\u0425\u043e\u0440\u0432\u0430\u0442\u0438\u044f" }
-        HU { "\u0412\u0435\u043d\u0433\u0440\u0438\u044f" }
-        IE { "\u0418\u0440\u043b\u0430\u043d\u0434\u0438\u044f" }
-        IL { "\u0418\u0437\u0440\u0430\u0438\u043b\u044c" }
-        IS { "\u0418\u0441\u043b\u0430\u043d\u0434\u0438\u044f" }
-        IT { "\u0418\u0442\u0430\u043b\u0438\u044f" }
-        JP { "\u042f\u043f\u043e\u043d\u0438\u044f" }
-        KR { "\u041a\u043e\u0440\u0435\u044f" }
-        LA { "\u041b\u0430\u0442\u0438\u043d\u0441\u043a\u0430\u044f \u0410\u043c\u0435\u0440\u0438\u043a\u0430" }
-        LT { "\u041b\u0438\u0442\u0432\u0430" }
-        LV { "\u041b\u0430\u0442\u0432\u0438\u044f" }
-        MK { "\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0438\u044f" }
-        NL { "\u041d\u0438\u0434\u0435\u0440\u043b\u0430\u043d\u0434\u044b" }
-        NO { "\u041d\u043e\u0440\u0432\u0435\u0433\u0438\u044f" }
-        NZ { "\u041d\u043e\u0432\u0430\u044f \u0417\u0435\u043b\u0430\u043d\u0434\u0438\u044f" }
-        PL { "\u041f\u043e\u043b\u044c\u0448\u0430" }
-        PT { "\u041f\u043e\u0440\u0442\u0443\u0433\u0430\u043b\u0438\u044f" }
-        RO { "\u0420\u0443\u043c\u044b\u043d\u0438\u044f" }
-        RU { "\u0420\u043e\u0441\u0441\u0438\u044f" }
-        SE { "\u0428\u0432\u0435\u0446\u0438\u044f" }
-        SI { "\u0421\u043b\u043e\u0432\u0435\u043d\u0438\u044f" }
-        SK { "\u0421\u043b\u043e\u0432\u0430\u043a\u0438\u044f" }
-        SP { "\u0421\u0435\u0440\u0431\u0438\u044f" }
-        TH { "\u0422\u0430\u0438\u043b\u0430\u043d\u0434" }
-        TR { "\u0422\u0443\u0440\u0446\u0438\u044f" }
-        TW { "\u0422\u0430\u0439\u0432\u0430\u043d\u044c" }
+        AD { "\u0410\u043D\u0434\u043E\u0440\u0440\u0430" }
+        AE { "\u041E\u0431\u044A\u0435\u0434\u0438\u043D\u0435\u043D\u043D\u044B\u0435 \u0410\u0440\u0430\u0431\u0441\u043A\u0438\u0435 \u042D\u043C\u0438\u0440\u0430\u0442\u044B" }
+        AF { "\u0410\u0444\u0433\u0430\u043D\u0438\u0441\u0442\u0430\u043D" }
+        AG { "\u0410\u043D\u0442\u0438\u0433\u0443\u0430 \u0438 \u0411\u0430\u0440\u0431\u0443\u0434\u0430" }
+        AI { "\u0410\u043D\u0433\u0443\u0438\u043B\u043B\u0430" }
+        AL { "\u0410\u043B\u0431\u0430\u043D\u0438\u044F" }
+        AM { "\u0410\u0440\u043C\u0435\u043D\u0438\u044F" }
+        AN { "\u0413\u043E\u043B\u043B\u0430\u043D\u0434\u0441\u043A\u0438\u0435 \u0410\u043D\u0442\u0438\u043B\u044C\u0441\u043A\u0438\u0435 \u041E\u0441\u0442\u0440\u043E\u0432\u0430" }
+        AO { "\u0410\u043D\u0433\u043E\u043B\u0430" }
+        AQ { "\u0410\u043D\u0442\u0430\u0440\u043A\u0442\u0438\u0434\u0430" }
+        AR { "\u0410\u0440\u0433\u0435\u043D\u0442\u0438\u043D\u0430" }
+        AS { "\u0410\u043C\u0435\u0440\u0438\u043A\u0430\u043D\u0441\u043A\u043E\u0435 \u0421\u0430\u043C\u043E\u0430" }
+        AT { "\u0410\u0432\u0441\u0442\u0440\u0438\u044F" }
+        AU { "\u0410\u0432\u0441\u0442\u0440\u0430\u043B\u0438\u044F" }
+        AW { "\u0410\u0440\u0443\u0431\u0430" }
+        AZ { "\u0410\u0437\u0435\u0440\u0431\u0430\u0439\u0434\u0436\u0430\u043D" }
+        BA { "\u0411\u043E\u0441\u043D\u0438\u044F" }
+        //BA { "\u0411\u043E\u0441\u043D\u0438\u044F \u0438 \u0413\u0435\u0440\u0446\u0435\u0433\u043E\u0432\u0438\u043D\u0430" } // From translation center
+        BB { "\u0411\u0430\u0440\u0431\u0430\u0434\u043E\u0441" }
+        BD { "\u0411\u0430\u043D\u0433\u043B\u0430\u0434\u0435\u0448" }
+        BE { "\u0411\u0435\u043B\u044C\u0433\u0438\u044F" }
+        BF { "\u0411\u0443\u0440\u043A\u0438\u043D\u0430 \u0424\u0430\u0441\u043E" }
+        BG { "\u0411\u043E\u043B\u0433\u0430\u0440\u0438\u044F" }
+        BH { "\u0411\u0430\u0445\u0440\u0435\u0439\u043D" }
+        BI { "\u0411\u0443\u0440\u0443\u043D\u0434\u0438" }
+        BJ { "\u0411\u0435\u043D\u0438\u043D" }
+        BM { "\u0411\u0435\u0440\u043C\u0443\u0434\u0441\u043A\u0438\u0435 \u041E\u0441\u0442\u0440\u043E\u0432\u0430" }
+        BN { "\u0411\u0440\u0443\u043D\u0435\u0439 \u0414\u0430\u0440\u0443\u0441\u0441\u0430\u043B\u0430\u043C" }
+        BO { "\u0411\u043E\u043B\u0438\u0432\u0438\u044F" }
+        BR { "\u0411\u0440\u0430\u0437\u0438\u043B\u0438\u044F" }
+        BS { "\u0411\u0430\u0433\u0430\u043C\u0441\u043A\u0438\u0435 \u043E\u0441\u0442\u0440\u043E\u0432\u0430" }
+        BT { "\u0411\u0443\u0442\u0430\u043D" }
+        BV { "\u041E\u0441\u0442\u0440\u043E\u0432 \u0411\u0443\u0432\u0435" }
+        BW { "\u0411\u043E\u0442\u0441\u0432\u0430\u043D\u0430" }
+        BY { "\u0411\u0435\u043B\u0430\u0440\u0443\u0441\u044C" }
+        BZ { "\u0411\u0435\u043B\u0438\u0437" }
+        CA { "\u041A\u0430\u043D\u0430\u0434\u0430" }
+        CC { "\u041A\u043E\u043A\u043E\u0441\u043E\u0432\u044B\u0435 \u041E\u0441\u0442\u0440\u043E\u0432\u0430 (\u041A\u0438\u0438\u043B\u0438\u043D\u0433)" }
+        CD { "\u041A\u043E\u043D\u0433\u043E, \u0414\u0435\u043C\u043E\u043A\u0440\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0430\u044F \u0420\u0435\u0441\u043F\u0443\u0431\u043B\u0438\u043A\u0430" }
+        CF { "\u0426\u0435\u043D\u0442\u0440\u0430\u043B\u044C\u043D\u043E-\u0410\u0444\u0440\u0438\u043A\u0430\u043D\u0441\u043A\u0430\u044F \u0420\u0435\u0441\u043F\u0443\u0431\u043B\u0438\u043A\u0430" }
+        CG { "\u041A\u043E\u043D\u0433\u043E" }
+        CH { "\u0428\u0432\u0435\u0439\u0446\u0430\u0440\u0438\u044F" }
+        CI { "\u041A\u043E\u0442 \u0434'\u0418\u0432\u0443\u0430\u0440" }
+        CK { "\u041E\u0441\u0442\u0440\u043E\u0432\u0430 \u041A\u0443\u043A\u0430" }
+        CL { "\u0427\u0438\u043B\u0438" }
+        CM { "\u041A\u0430\u043C\u0435\u0440\u0443\u043D" }
+        CN { "\u041A\u0438\u0442\u0430\u0439" }
+        CO { "\u041A\u043E\u043B\u0443\u043C\u0431\u0438\u044F" }
+        CR { "\u041A\u043E\u0441\u0442\u0430-\u0420\u0438\u043A\u0430" }
+        CU { "\u041A\u0443\u0431\u0430" }
+        CV { "\u041E\u0441\u0442\u0440\u043E\u0432\u0430 \u0417\u0435\u043B\u0435\u043D\u043E\u0433\u043E \u041C\u044B\u0441\u0430" }
+        CX { "\u041E\u0441\u0442\u0440\u043E\u0432 \u0420\u043E\u0436\u0434\u0435\u0441\u0442\u0432\u0430" }
+        CY { "\u041A\u0438\u043F\u0440" }
+        //CZ { "\u0427\u0435\u0445\u0438\u044F" } // Old value
+        CZ { "\u0427\u0435\u0448\u0441\u043A\u0430\u044F \u0420\u0435\u0441\u043F\u0443\u0431\u043B\u0438\u043A\u0430" }
+        DE { "\u0413\u0435\u0440\u043C\u0430\u043D\u0438\u044F" }
+        DJ { "\u0414\u0436\u0438\u0431\u0443\u0442\u0438" }
+        DK { "\u0414\u0430\u043D\u0438\u044F" }
+        DM { "\u041E\u0441\u0442\u0440\u043E\u0432 \u0414\u043E\u043C\u0438\u043D\u0438\u043A\u0430" }
+        DO { "\u0414\u043E\u043C\u0438\u043D\u0438\u043A\u0430\u043D\u0441\u043A\u0430\u044F \u0420\u0435\u0441\u043F\u0443\u0431\u043B\u0438\u043A\u0430" }
+        DZ { "\u0410\u043B\u0436\u0438\u0440" }
+        EC { "\u042D\u043A\u0432\u0430\u0434\u043E\u0440" }
+        EE { "\u042D\u0441\u0442\u043E\u043D\u0438\u044F" }
+        EG { "\u0415\u0433\u0438\u043F\u0435\u0442" }
+        EH { "\u0417\u0430\u043F\u0430\u0434\u043D\u0430\u044F \u0421\u0430\u0445\u0430\u0440\u0430" }
+        ER { "\u042D\u0440\u0438\u0442\u0440\u0435\u044F" }
+        ES { "\u0418\u0441\u043F\u0430\u043D\u0438\u044F" }
+        ET { "\u042D\u0444\u0438\u043E\u043F\u0438\u044F" }
+        FI { "\u0424\u0438\u043D\u043B\u044F\u043D\u0434\u0438\u044F" }
+        FJ { "\u0424\u0438\u0434\u0436\u0438" }
+        FK { "\u0424\u043E\u043B\u044C\u043A\u043B\u0435\u043D\u0434\u0441\u043A\u0438\u0435 \u041E\u0441\u0442\u0440\u043E\u0432\u0430" }
+        FM { "\u0424\u0435\u0434\u0435\u0440\u0430\u0442\u0438\u0432\u043D\u043E\u0435 \u0413\u043E\u0441\u0443\u0434\u0430\u0440\u0441\u0442\u0432\u043E \u041C\u0438\u043A\u0440\u043E\u043D\u0435\u0437\u0438\u044F" }
+        FO { "\u0424\u0430\u0440\u0435\u0440\u0441\u043A\u0438\u0435 \u043E\u0441\u0442\u0440\u043E\u0432\u0430" }
+        FR { "\u0424\u0440\u0430\u043D\u0446\u0438\u044F" }
+        GA { "\u0413\u0430\u0431\u043E\u043D" }
+        GB { "\u0412\u0435\u043B\u0438\u043A\u043E\u0431\u0440\u0438\u0442\u0430\u043D\u0438\u044F" }
+        GD { "\u0413\u0440\u0435\u043D\u0430\u0434\u0430" }
+        GE { "\u0413\u0440\u0443\u0437\u0438\u044F" }
+        GF { "\u0424\u0440\u0430\u043D\u0446\u0443\u0437\u0441\u043A\u0430\u044F \u0413\u0432\u0438\u0430\u043D\u0430" }
+        GH { "\u0413\u0430\u043D\u0430" }
+        GI { "\u0413\u0438\u0431\u0440\u0430\u043B\u0442\u0430\u0440" }
+        GL { "\u0413\u0440\u0435\u043D\u043B\u0430\u043D\u0434\u0438\u044F" }
+        GM { "\u0413\u0430\u043C\u0431\u0438\u044F" }
+        GN { "\u0413\u0432\u0438\u043D\u0435\u044F" }
+        GP { "\u0413\u0432\u0430\u0434\u0435\u043B\u0443\u043F\u0430" }
+        GQ { "\u042D\u043A\u0432\u0430\u0442\u043E\u0440\u0438\u0430\u043B\u044C\u043D\u0430\u044F \u0413\u0432\u0438\u043D\u0435\u044F" }
+        GR { "\u0413\u0440\u0435\u0446\u0438\u044F" }
+        GS { "\u042E\u0436\u043D\u0430\u044F \u0414\u0436\u043E\u0440\u0434\u0436\u0438\u044F \u0438 \u042E\u0436\u043D\u044B\u0435 \u0421\u0430\u043D\u0434\u0432\u0438\u0447\u0435\u0432\u044B \u041E\u0441\u0442\u0440\u043E\u0432\u0430" }
+        GT { "\u0413\u0432\u0430\u0442\u0435\u043C\u0430\u043B\u0430" }
+        GU { "\u0413\u0443\u0430\u043C" }
+        GW { "\u0413\u0432\u0438\u043D\u0435\u044F-\u0411\u0438\u0441\u0441\u0430\u0443" }
+        GY { "\u0413\u0430\u0439\u0430\u043D\u0430" }
+        HK { "\u0413\u043E\u043D\u043A\u043E\u043D\u0433 (\u041E\u0431\u043B\u0430\u0441\u0442\u044C \u0441 \u041E\u0441\u043E\u0431\u044B\u043C \u0410\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\u0438\u0432\u043D\u044B\u043C \u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435\u043C, \u041A\u0438\u0442\u0430\u0439)" }
+        HM { "\u041E\u0441\u0442\u0440\u043E\u0432\u0430 \u0425\u0435\u0440\u0434 \u0438 \u041C\u0430\u043A-\u0414\u043E\u043D\u0430\u043B\u044C\u0434" }
+        HN { "\u0413\u043E\u043D\u0434\u0443\u0440\u0430\u0441" }
+        HR { "\u0425\u043E\u0440\u0432\u0430\u0442\u0438\u044F" }
+        HT { "\u0413\u0430\u0438\u0442\u0438" }
+        HU { "\u0412\u0435\u043D\u0433\u0440\u0438\u044F" }
+        ID { "\u0418\u043D\u0434\u043E\u043D\u0435\u0437\u0438\u044F" }
+        IE { "\u0418\u0440\u043B\u0430\u043D\u0434\u0438\u044F" }
+        IL { "\u0418\u0437\u0440\u0430\u0438\u043B\u044C" }
+        IN { "\u0418\u043D\u0434\u0438\u044F" }
+        IO { "\u0411\u0440\u0438\u0442\u0430\u043D\u0441\u043A\u0438\u0435 \u0422\u0435\u0440\u0440\u0438\u0442\u043E\u0440\u0438\u0438 \u0432 \u0418\u043D\u0434\u0438\u0439\u0441\u043A\u043E\u043C \u041E\u043A\u0435\u0430\u043D\u0435" }
+        IQ { "\u0418\u0440\u0430\u043A" }
+        //IR { "\u0418\u0441\u043B\u0430\u043C\u0441\u043A\u0430\u044F \u0420\u0435\u0441\u043F\u0443\u0431\u043B\u0438\u043A\u0430 \u0418\u0440\u0430\u043D" }
+        IR { "\u0418\u0440\u0430\u043D" }
+        IS { "\u0418\u0441\u043B\u0430\u043D\u0434\u0438\u044F" }
+        IT { "\u0418\u0442\u0430\u043B\u0438\u044F" }
+        JM { "\u042F\u043C\u0430\u0439\u043A\u0430" }
+        JO { "\u0418\u043E\u0440\u0434\u0430\u043D\u0438\u044F" }
+        JP { "\u042F\u043F\u043E\u043D\u0438\u044F" }
+        KE { "\u041A\u0435\u043D\u0438\u044F" }
+        KG { "\u041A\u044B\u0440\u0433\u044B\u0437\u0441\u0442\u0430\u043D" }
+        KH { "\u041A\u0430\u043C\u0431\u043E\u0434\u0436\u0430" }
+        KI { "\u041A\u0438\u0440\u0438\u0431\u0430\u0442\u0438" }
+        KM { "\u041A\u043E\u043C\u043E\u0440\u0441\u043A\u0438\u0435 \u041E\u0441\u0442\u0440\u043E\u0432\u0430" }
+        KN { "\u0421\u0435\u043D\u0442-\u041A\u0438\u0442\u0442\u0441 \u0438 \u041D\u0435\u0432\u0438\u0441" }
+        KP { "\u0421\u0435\u0432\u0435\u0440\u043D\u0430\u044F \u041A\u043E\u0440\u0435\u044F" }    // alternate name { "\u041A\u043E\u0440\u0435\u0439\u0441\u043A\u0430\u044F \u041D\u0430\u0440\u043E\u0434\u043D\u043E-\u0414\u0435\u043C\u043E\u043A\u0440\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0430\u044F \u0420\u0435\u0441\u043F\u0443\u0431\u043B\u0438\u043A\u0430" }
+        KR { "\u042E\u0436\u043D\u0430\u044F \u041A\u043E\u0440\u0435\u044F" }    // alternate name { "\u0420\u0435\u0441\u043F\u0443\u0431\u043B\u0438\u043A\u0430 \u041A\u043E\u0440\u0435\u044F" }
+        KW { "\u041A\u0443\u0432\u0435\u0439\u0442" }
+        KY { "\u041A\u0430\u0439\u043C\u0430\u043D\u043E\u0432\u044B \u041E\u0441\u0442\u0440\u043E\u0432\u0430" }
+        KZ { "\u041A\u0430\u0437\u0430\u0445\u0441\u0442\u0430\u043D" }
+        //LA { "\u041B\u0430\u0442\u0438\u043D\u0441\u043A\u0430\u044F \u0410\u043C\u0435\u0440\u0438\u043A\u0430" }
+        LA { "\u041B\u0430\u043E\u0441" }
+        LB { "\u041B\u0438\u0432\u0430\u043D" }
+        LC { "\u0421\u0435\u043D\u0442-\u041B\u044E\u0441\u0438\u044F" }
+        LI { "\u041B\u0438\u0445\u0442\u0435\u043D\u0448\u0442\u0435\u0439\u043D" }
+        LK { "\u0428\u0440\u0438-\u041B\u0430\u043D\u043A\u0430" }
+        LR { "\u041B\u0438\u0431\u0435\u0440\u0438\u044F" }
+        LS { "\u041B\u0435\u0441\u043E\u0442\u043E" }
+        LT { "\u041B\u0438\u0442\u0432\u0430" }
+        LU { "\u041B\u044E\u043A\u0441\u0435\u043C\u0431\u0443\u0440\u0433" }
+        LV { "\u041B\u0430\u0442\u0432\u0438\u044F" }
+        //LY { "\u041B\u0438\u0432\u0438\u0439\u0441\u043A\u0430\u044F \u0410\u0440\u0430\u0431\u0441\u043A\u0430\u044F \u0414\u0436\u0430\u043C\u0430\u0445\u0438\u0440\u0438\u044F" }
+        LY { "\u041B\u0438\u0432\u0438\u044F" }
+        MA { "\u041C\u0430\u0440\u043E\u043A\u043A\u043E" }
+        MC { "\u041C\u043E\u043D\u0430\u043A\u043E" }
+        MD { "\u041C\u043E\u043B\u0434\u043E\u0432\u0430" }
+        MG { "\u041C\u0430\u0434\u0430\u0433\u0430\u0441\u043A\u0430\u0440" }
+        MH { "\u041C\u0430\u0440\u0448\u0430\u043B\u043B\u043E\u0432\u044B \u041E\u0441\u0442\u0440\u043E\u0432\u0430" }
+        MK { "\u041C\u0430\u043A\u0435\u0434\u043E\u043D\u0438\u044F" }
+        //MK { "\u041C\u0430\u043A\u0435\u0434\u043E\u043D\u0438\u044F, \u0420\u0435\u0441\u043F\u0443\u0431\u043B\u0438\u043A\u0430" } // From translation center
+        ML { "\u041C\u0430\u043B\u0438" }
+        MM { "\u041C\u0430\u0439\u0430\u043D\u043C\u0430\u0440" }
+        MN { "\u041C\u043E\u043D\u0433\u043E\u043B\u0438\u044F" }
+        MO { "\u041C\u0430\u043A\u0430\u043E (\u041E\u0431\u043B\u0430\u0441\u0442\u044C \u0441 \u041E\u0441\u043E\u0431\u044B\u043C \u0410\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\u0438\u0432\u043D\u044B\u043C \u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435\u043C, \u041A\u0438\u0442\u0430\u0439)" }
+        MP { "\u0421\u0435\u0432\u0435\u0440\u043D\u044B\u0435 \u041C\u0430\u0440\u0438\u0430\u043D\u0441\u043A\u0438\u0435 \u041E\u0441\u0442\u0440\u043E\u0432\u0430" }
+        MQ { "\u041C\u0430\u0440\u0442\u0438\u043D\u0438\u043A" }
+        MR { "\u041C\u0430\u0432\u0440\u0438\u0442\u0430\u043D\u0438\u044F" }
+        MS { "\u041C\u043E\u043D\u0441\u0435\u0440\u0440\u0430\u0442" }
+        MT { "\u041C\u0430\u043B\u044C\u0442\u0430" }
+        MU { "\u041C\u0430\u0432\u0440\u0438\u043A\u0438\u0439" }
+        MV { "\u041C\u0430\u043B\u044C\u0434\u0438\u0432\u044B" }
+        MW { "\u041C\u0430\u043B\u0430\u0432\u0438" }
+        MX { "\u041C\u0435\u043A\u0441\u0438\u043A\u0430" }
+        MY { "\u041C\u0430\u043B\u0430\u0439\u0437\u0438\u044F" }
+        MZ { "\u041C\u043E\u0437\u0430\u043C\u0431\u0438\u043A" }
+        NA { "\u041D\u0430\u043C\u0438\u0431\u0438\u044F" }
+        NC { "\u041D\u043E\u0432\u0430\u044F \u041A\u0430\u043B\u0435\u0434\u043E\u043D\u0438\u044F" }
+        NE { "\u041D\u0438\u0433\u0435\u0440" }
+        NF { "\u041E\u0441\u0442\u0440\u043E\u0432 \u041D\u043E\u0440\u0444\u043E\u043B\u043A" }
+        NG { "\u041D\u0438\u0433\u0435\u0440\u0438\u044F" }
+        NI { "\u041D\u0438\u043A\u0430\u0440\u0430\u0433\u0443\u0430" }
+        NL { "\u041D\u0438\u0434\u0435\u0440\u043B\u0430\u043D\u0434\u044B" }
+        NO { "\u041D\u043E\u0440\u0432\u0435\u0433\u0438\u044F" }
+        NP { "\u041D\u0435\u043F\u0430\u043B" }
+        NR { "\u041D\u0430\u0443\u0440\u0443" }
+        NU { "\u041D\u0438\u0443\u0435" }
+        NZ { "\u041D\u043E\u0432\u0430\u044F \u0417\u0435\u043B\u0430\u043D\u0434\u0438\u044F" }
+        OM { "\u041E\u043C\u0430\u043D" }
+        PA { "\u041F\u0430\u043D\u0430\u043C\u0430" }
+        PE { "\u041F\u0435\u0440\u0443" }
+        PF { "\u0424\u0440\u0430\u043D\u0446\u0443\u0437\u0441\u043A\u0430\u044F \u041F\u043E\u043B\u0438\u043D\u0435\u0437\u0438\u044F" }
+        PG { "\u041F\u0430\u043F\u0443\u0430-\u041D\u043E\u0432\u0430\u044F \u0413\u0432\u0438\u043D\u0435\u044F" }
+        PH { "\u0424\u0438\u043B\u0438\u043F\u043F\u0438\u043D\u044B" }
+        PK { "\u041F\u0430\u043A\u0438\u0441\u0442\u0430\u043D" }
+        PL { "\u041F\u043E\u043B\u044C\u0448\u0430" }
+        PM { "\u0421\u0435\u043D-\u041F\u044C\u0435\u0440 \u0438 \u041C\u0438\u043A\u0435\u043B\u043E\u043D" }
+        PN { "\u041E\u0441\u0442\u0440\u043E\u0432 \u041F\u0438\u0442\u043A\u044D\u0440\u043D" }
+        PR { "\u041F\u0443\u044D\u0440\u0442\u043E-\u0420\u0438\u043A\u043E" }
+        PS { "\u041F\u0430\u043B\u0435\u0441\u0442\u0438\u043D\u0441\u043A\u0430\u044F \u0430\u0432\u0442\u043E\u043D\u043E\u043C\u0438\u044F" }
+        PT { "\u041F\u043E\u0440\u0442\u0443\u0433\u0430\u043B\u0438\u044F" }
+        PW { "\u041F\u0430\u043B\u0430\u0443" }
+        PY { "\u041F\u0430\u0440\u0430\u0433\u0432\u0430\u0439" }
+        QA { "\u041A\u0430\u0442\u0430\u0440" }
+        RE { "\u0420\u0435\u044E\u043D\u044C\u043E\u043D" }
+        RO { "\u0420\u0443\u043C\u044B\u043D\u0438\u044F" }
+        RU { "\u0420\u043E\u0441\u0441\u0438\u044F" }
+        //RU { "\u0420\u043E\u0441\u0441\u0438\u0439\u0441\u043A\u0430\u044F \u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044F" } // From translation center
+        RW { "\u0420\u0443\u0430\u043D\u0434\u0430" }
+        SA { "\u0421\u0430\u0443\u0434\u043E\u0432\u0441\u043A\u0430\u044F \u0410\u0440\u0430\u0432\u0438\u044F" }
+        SB { "\u0421\u043E\u043B\u043E\u043C\u043E\u043D\u043E\u0432\u044B \u041E\u0441\u0442\u0440\u043E\u0432\u0430" }
+        SC { "\u0421\u0435\u0439\u0448\u0435\u043B\u044C\u0441\u043A\u0438\u0435 \u041E\u0441\u0442\u0440\u043E\u0432\u0430" }
+        SD { "\u0421\u0443\u0434\u0430\u043D" }
+        SE { "\u0428\u0432\u0435\u0446\u0438\u044F" }
+        SG { "\u0421\u0438\u043D\u0433\u0430\u043F\u0443\u0440" }
+        SH { "\u041E\u0441\u0442\u0440\u043E\u0432 \u0421\u0432\u044F\u0442\u043E\u0439 \u0415\u043B\u0435\u043D\u044B" }
+        SI { "\u0421\u043B\u043E\u0432\u0435\u043D\u0438\u044F" }
+        SJ { "\u041E\u0441\u0442\u0440\u043E\u0432\u0430 \u0421\u0432\u0430\u043B\u0431\u0430\u0440\u0434 \u0438 \u0416\u0430\u043D \u041C\u0430\u0439\u0435\u043D" }
+        SK { "\u0421\u043B\u043E\u0432\u0430\u043A\u0438\u044F" }
+        SL { "\u0421\u044C\u0435\u0440\u0440\u0430-\u041B\u0435\u043E\u043D\u0435" }
+        SM { "\u0421\u0430\u043D-\u041C\u0430\u0440\u0438\u043D\u043E" }
+        SN { "\u0421\u0435\u043D\u0435\u0433\u0430\u043B" }
+        SO { "\u0421\u043E\u043C\u0430\u043B\u0438" }
+        SP { "\u0421\u0435\u0440\u0431\u0438\u044F" }
+        SR { "\u0421\u0443\u0440\u0438\u043D\u0430\u043C" }
+        ST { "\u0421\u0430\u043D-\u0422\u043E\u043C\u0435 \u0438 \u041F\u0440\u0438\u043D\u0441\u0438\u043F\u0438" }
+        SV { "\u0421\u0430\u043B\u044C\u0432\u0430\u0434\u043E\u0440" }
+        SY { "\u0421\u0438\u0440\u0438\u0439\u0441\u043A\u0430\u044F \u0410\u0440\u0430\u0431\u0441\u043A\u0430\u044F \u0420\u0435\u0441\u043F\u0443\u0431\u043B\u0438\u043A\u0430" }    // alternate name { "\u0421\u0438\u0440\u0438\u044F" }
+        SZ { "\u0421\u0432\u0430\u0437\u0438\u043B\u0435\u043D\u0434" }
+        TC { "\u041E\u0441\u0442\u0440\u043E\u0432\u0430 \u0422\u0443\u0440\u043A\u0441 \u0438 \u041A\u0430\u0439\u043A\u043E\u0441" }
+        TD { "\u0427\u0430\u0434" }
+        TF { "\u0424\u0440\u0430\u043D\u0446\u0443\u0437\u0441\u043A\u0438\u0435 \u042E\u0436\u043D\u044B\u0435 \u0422\u0435\u0440\u0440\u0438\u0442\u043E\u0440\u0438\u0438" }
+        TG { "\u0422\u043E\u0433\u043E" }
+        TH { "\u0422\u0430\u0438\u043B\u0430\u043D\u0434" }
+        TJ { "\u0422\u0430\u0434\u0436\u0438\u043A\u0438\u0441\u0442\u0430\u043D" }
+        TK { "\u0422\u043E\u043A\u0435\u043B\u0430\u0443" }
+        TL { "\u0412\u043E\u0441\u0442\u043E\u0447\u043D\u044B\u0439 \u0422\u0438\u043C\u043E\u0440" }
+        TM { "\u0422\u0443\u0440\u043A\u043C\u0435\u043D\u0438\u0441\u0442\u0430\u043D" }
+        TN { "\u0422\u0443\u043D\u0438\u0441" }
+        TO { "\u0422\u043E\u043D\u0433\u0430" }
+        TR { "\u0422\u0443\u0440\u0446\u0438\u044F" }
+        TT { "\u0422\u0440\u0438\u043D\u0438\u0434\u0430\u0434 \u0438 \u0422\u043E\u0431\u0430\u0433\u043E" }
+        TV { "\u0422\u0443\u0432\u0430\u043B\u0443" }
+        TW { "\u0422\u0430\u0439\u0432\u0430\u043D\u044C, \u041A\u0438\u0442\u0430\u0439\u0441\u043A\u0430\u044F \u041F\u0440\u043E\u0432\u0438\u043D\u0446\u0438\u044F" }    // alternate name { "\u0422\u0430\u0439\u0432\u0430\u043D\u044C" }
+        TZ { "\u0422\u0430\u043D\u0437\u0430\u043D\u0438\u044F" }
         UA { "\u0423\u043A\u0440\u0430\u0438\u043D\u0430" }
-        US { "\u0421\u0428\u0410" }
-        ZA { "\u042e\u0410\u0420" }
+        UG { "\u0423\u0433\u0430\u043D\u0434\u0430" }
+        UM { "\u0412\u043D\u0435\u0448\u043D\u0438\u0435 \u043C\u0430\u043B\u044B\u0435 \u043E\u0441\u0442\u0440\u043E\u0432\u0430 (\u0421\u0428\u0410)" }
+        //US { "\u0421\u0428\u0410" }
+        US { "\u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u043D\u044B\u0435 \u0428\u0442\u0430\u0442\u044B" }
+        UY { "\u0423\u0440\u0443\u0433\u0432\u0430\u0439" }
+        UZ { "\u0423\u0437\u0431\u0435\u043A\u0438\u0441\u0442\u0430\u043D" }
+        VA { "\u0413\u043E\u0441\u0443\u0434\u0430\u0440\u0441\u0442\u0432\u043E-\u0433\u043E\u0440\u043E\u0434 \u0412\u0430\u0442\u0438\u043A\u0430\u043D" }
+        VC { "\u0421\u0435\u043D\u0442-\u0412\u0438\u043D\u0441\u0435\u043D\u0442 \u0438 \u0413\u0440\u0435\u043D\u0430\u0434\u0438\u043D\u044B" }
+        VE { "\u0412\u0435\u043D\u0435\u0441\u0443\u044D\u043B\u0430" }
+        VG { "\u0411\u0440\u0438\u0442\u0430\u043D\u0441\u043A\u0438\u0435 \u0412\u0438\u0440\u0433\u0438\u043D\u0441\u043A\u0438\u0435 \u041E\u0441\u0442\u0440\u043E\u0432\u0430" }
+        VI { "\u0410\u043C\u0435\u0440\u0438\u043A\u0430\u043D\u0441\u043A\u0438\u0435 \u0412\u0438\u0440\u0433\u0438\u043D\u0441\u043A\u0438\u0435 \u041E\u0441\u0442\u0440\u043E\u0432\u0430" }
+        VN { "\u0412\u044C\u0435\u0442\u043D\u0430\u043C" }
+        VU { "\u0412\u0430\u043D\u0443\u0430\u0442\u0443" }
+        WF { "\u042D\u043B\u043B\u0438\u0441 \u0438 \u0424\u0443\u0442\u0443\u043D\u0430" }
+        WS { "\u0421\u0430\u043C\u043E\u0430" }
+        YE { "\u0419\u0435\u043C\u0435\u043D" }
+        YT { "\u041C\u0430\u0439\u043E\u0442\u0442\u0430" }
+        YU { "\u042E\u0433\u043E\u0441\u043B\u0430\u0432\u0438\u044F" }
+        //ZA { "\u042E\u0410\u0420" } // Old value
+        ZA { "\u042E\u0436\u043D\u0430\u044F \u0410\u0444\u0440\u0438\u043A\u0430" }
+        ZM { "\u0417\u0430\u043C\u0431\u0438\u044F" }
+        ZW { "\u0417\u0438\u043C\u0431\u0430\u0431\u0432\u0435" }
     }
     DateTimeElements:intvector { 
         2,
@@ -104,150 +306,148 @@
         "\u043D.\u044D.",
     }
     Languages { 
-        ab { "\u0410\u0431\u0445\u0430\u0437\u0441\u043a\u0438\u0439" }
         aa { "\u0410\u0444\u0430\u0440" }
-        af { "\u0410\u0444\u0440\u0438\u043a\u0430\u0430\u043d\u0441" }
-        sq { "\u0410\u043b\u0431\u0430\u043d\u0441\u043a\u0438\u0439" }
-        am { "\u0410\u043c\u0445\u0430\u0440\u0441\u043a\u0438\u0439" }
-        ar { "\u0410\u0440\u0430\u0431\u0441\u043a\u0438\u0439" }
-        hy { "\u0410\u0440\u043c\u044f\u043d\u0441\u043a\u0438\u0439" }
-        as { "\u0410\u0441\u0441\u0430\u043c\u0441\u043a\u0438\u0439" }
-        ay { "\u0410\u044f\u043c\u0430\u0440\u0430" }
-        az { "\u0410\u0437\u0435\u0440\u0431\u0430\u0439\u0434\u0436\u0430\u043d\u0441\u043a\u0438\u0439" }
-        ba { "\u0411\u0430\u0448\u043a\u0438\u0440\u0441\u043a\u0438\u0439" }
-        eu { "\u0411\u0430\u0441\u043a\u0441\u043a\u0438\u0439" }
-        bn { "\u0411\u0435\u043d\u0433\u0430\u043b\u044c\u0441\u043a\u0438\u0439" }
-        dz { "\u0411\u0443\u0442\u0430\u043d\u0441\u043a\u0438\u0439" }
-        bh { "\u0411\u0438\u0445\u0430\u0440\u0441\u043a\u0438\u0439" }
-        bi { "\u0411\u0438\u0441\u043b\u0430\u043c\u0430" }
-        br { "\u0411\u0440\u0435\u0442\u043e\u043d\u0441\u043a\u0438\u0439" }
-        bg { "\u0411\u043e\u043b\u0433\u0430\u0440\u0441\u043a\u0438\u0439" }
-        my { "\u0411\u0438\u0440\u043c\u0430\u043d\u0441\u043a\u0438\u0439" }
-        be { "\u0411\u0435\u043b\u043e\u0440\u0443\u0441\u0441\u043a\u0438\u0439" }
-        km { "\u041a\u0430\u043c\u0431\u043e\u0434\u0436\u0438\u0439\u0441\u043a\u0438\u0439" }
-        ca { "\u041a\u0430\u0442\u0430\u043b\u0430\u043d\u0441\u043a\u0438\u0439" }
-        zh { "\u041a\u0438\u0442\u0430\u0439\u0441\u043a\u0438\u0439" }
-        co { "\u041a\u043e\u0440\u0441\u0438\u043a\u0430\u043d\u0441\u043a\u0438\u0439" }
-        hr { "\u0425\u043e\u0440\u0432\u0430\u0442\u0441\u043a\u0438\u0439" }
-        cs { "\u0427\u0435\u0448\u0441\u043a\u0438\u0439" }
-        da { "\u0414\u0430\u0442\u0441\u043a\u0438\u0439" }
-        nl { "\u0413\u043e\u043b\u043b\u0430\u043d\u0434\u0441\u043a\u0438\u0439" }
-        en { "\u0410\u043d\u0433\u043b\u0438\u0439\u0441\u043a\u0438\u0439" }
-        eo { "\u042d\u0441\u043f\u0435\u0440\u0430\u043d\u0442\u043e" }
-        et { "\u042d\u0441\u0442\u043e\u043d\u0441\u043a\u0438\u0439" }
-        fo { "\u0424\u0430\u0440\u0435\u0440\u0441\u043a\u0438\u0439" }
+        ab { "\u0410\u0431\u0445\u0430\u0437\u0441\u043A\u0438\u0439" }
+        af { "\u0410\u0444\u0440\u0438\u043A\u0430\u0430\u043D\u0441" }
+        am { "\u0410\u043C\u0445\u0430\u0440\u0441\u043A\u0438\u0439" }
+        ar { "\u0410\u0440\u0430\u0431\u0441\u043A\u0438\u0439" }
+        as { "\u0410\u0441\u0441\u0430\u043C\u0441\u043A\u0438\u0439" }
+        ay { "\u0410\u044F\u043C\u0430\u0440\u0430" }
+        az { "\u0410\u0437\u0435\u0440\u0431\u0430\u0439\u0434\u0436\u0430\u043D\u0441\u043A\u0438\u0439" }
+        ba { "\u0411\u0430\u0448\u043A\u0438\u0440\u0441\u043A\u0438\u0439" }
+        be { "\u0411\u0435\u043B\u043E\u0440\u0443\u0441\u0441\u043A\u0438\u0439" }
+        bg { "\u0411\u043E\u043B\u0433\u0430\u0440\u0441\u043A\u0438\u0439" }
+        bh { "\u0411\u0438\u0445\u0430\u0440\u0441\u043A\u0438\u0439" }
+        bi { "\u0411\u0438\u0441\u043B\u0430\u043C\u0430" }
+        bn { "\u0411\u0435\u043D\u0433\u0430\u043B\u044C\u0441\u043A\u0438\u0439" }
+        bo { "\u0422\u0438\u0431\u0435\u0442\u0441\u043A\u0438\u0439" }
+        br { "\u0411\u0440\u0435\u0442\u043E\u043D\u0441\u043A\u0438\u0439" }
+        ca { "\u041A\u0430\u0442\u0430\u043B\u0430\u043D\u0441\u043A\u0438\u0439" }
+        co { "\u041A\u043E\u0440\u0441\u0438\u043A\u0430\u043D\u0441\u043A\u0438\u0439" }
+        cs { "\u0427\u0435\u0448\u0441\u043A\u0438\u0439" }
+        cy { "\u0412\u0430\u043B\u043B\u0438\u0439\u0441\u043A\u0438\u0439" }
+        da { "\u0414\u0430\u0442\u0441\u043A\u0438\u0439" }
+        de { "\u041D\u0435\u043C\u0435\u0446\u043A\u0438\u0439" }
+        dz { "\u0411\u0443\u0442\u0430\u043D\u0441\u043A\u0438\u0439" }
+        el { "\u0413\u0440\u0435\u0447\u0435\u0441\u043A\u0438\u0439" }
+        en { "\u0410\u043D\u0433\u043B\u0438\u0439\u0441\u043A\u0438\u0439" }
+        eo { "\u042D\u0441\u043F\u0435\u0440\u0430\u043D\u0442\u043E" }
+        es { "\u0418\u0441\u043F\u0430\u043D\u0441\u043A\u0438\u0439" }
+        et { "\u042D\u0441\u0442\u043E\u043D\u0441\u043A\u0438\u0439" }
+        eu { "\u0411\u0430\u0441\u043A\u0441\u043A\u0438\u0439" }
+        fa { "\u041F\u0435\u0440\u0441\u0438\u0434\u0441\u043A\u0438\u0439" }
+        fi { "\u0424\u0438\u043D\u0441\u043A\u0438\u0439" }
         fj { "\u0424\u0438\u0434\u0436\u0438" }
-        fi { "\u0424\u0438\u043d\u0441\u043a\u0438\u0439" }
-        fr { "\u0424\u0440\u0430\u043d\u0446\u0443\u0437\u0441\u043a\u0438\u0439" }
-        fy { "\u0424\u0440\u0438\u0437\u0441\u043a\u0438\u0439" }
-        gl { "\u0413\u0430\u043b\u0438\u0446\u0438\u0439\u0441\u043a\u0438\u0439" }
-        ka { "\u0413\u0440\u0443\u0437\u0438\u043d\u0441\u043a\u0438\u0439" }
-        de { "\u041d\u0435\u043c\u0435\u0446\u043a\u0438\u0439" }
-        el { "\u0413\u0440\u0435\u0447\u0435\u0441\u043a\u0438\u0439" }
-        kl { "\u0413\u0440\u0435\u043d\u043b\u0430\u043d\u0434\u0441\u043a\u0438\u0439" }
-        gn { "\u0413\u0443\u0430\u0440\u0430\u043d\u0438" }
-        gu { "\u0413\u0443\u044f\u0440\u0430\u0442\u0438" }
-        ha { "\u0425\u043e\u0441\u0430" }
+        fo { "\u0424\u0430\u0440\u0435\u0440\u0441\u043A\u0438\u0439" }
+        fr { "\u0424\u0440\u0430\u043D\u0446\u0443\u0437\u0441\u043A\u0438\u0439" }
+        fy { "\u0424\u0440\u0438\u0437\u0441\u043A\u0438\u0439" }
+        ga { "\u0418\u0440\u043B\u0430\u043D\u0434\u0441\u043A\u0438\u0439" }
+        gd { "\u0413\u0430\u044D\u043B\u044C\u0441\u043A\u0438\u0439" }
+        gl { "\u0413\u0430\u043B\u0438\u0446\u0438\u0439\u0441\u043A\u0438\u0439" }
+        gn { "\u0413\u0443\u0430\u0440\u0430\u043D\u0438" }
+        gu { "\u0413\u0443\u044F\u0440\u0430\u0442\u0438" }
+        ha { "\u0425\u043E\u0441\u0430" }
         he { "\u0418\u0432\u0440\u0438\u0442" }
-        hi { "\u0425\u0438\u043d\u0434\u0438" }
-        hu { "\u0412\u0435\u043d\u0433\u0435\u0440\u0441\u043a\u0438\u0439" }
-        is { "\u0418\u0441\u043b\u0430\u043d\u0434\u0441\u043a\u0438\u0439" }
-        id { "\u0418\u043d\u0434\u043e\u043d\u0435\u0437\u0438\u0439\u0441\u043a\u0438\u0439" }
-        ia { "\u0421\u043c\u0435\u0448\u0430\u043d\u043d\u044b\u0439 \u044f\u0437\u044b\u043a" }
-        ie { "\u0421\u043c\u0435\u0448\u0430\u043d\u043d\u044b\u0439 \u044f\u0437\u044b\u043a" }
-        iu { "\u0418\u043d\u0430\u043a\u0442\u0438\u0442\u0443\u0442" }
-        ik { "\u0418\u043d\u0430\u043f\u0438\u0430\u043a" }
-        ga { "\u0418\u0440\u043b\u0430\u043d\u0434\u0441\u043a\u0438\u0439" }
-        it { "\u0418\u0442\u0430\u043b\u044c\u044f\u043d\u0441\u043a\u0438\u0439" }
-        ja { "\u042f\u043f\u043e\u043d\u0441\u043a\u0438\u0439" }
-        jv { "\u042f\u0432\u0430\u043d\u0441\u043a\u0438\u0439" }
+        hi { "\u0425\u0438\u043D\u0434\u0438" }
+        hr { "\u0425\u043E\u0440\u0432\u0430\u0442\u0441\u043A\u0438\u0439" }
+        hu { "\u0412\u0435\u043D\u0433\u0435\u0440\u0441\u043A\u0438\u0439" }
+        hy { "\u0410\u0440\u043C\u044F\u043D\u0441\u043A\u0438\u0439" }
+        ia { "\u0421\u043C\u0435\u0448\u0430\u043D\u043D\u044B\u0439 \u044F\u0437\u044B\u043A" }
+        id { "\u0418\u043D\u0434\u043E\u043D\u0435\u0437\u0438\u0439\u0441\u043A\u0438\u0439" }
+        ie { "\u0421\u043C\u0435\u0448\u0430\u043D\u043D\u044B\u0439 \u044F\u0437\u044B\u043A" }
+        ik { "\u0418\u043D\u0430\u043F\u0438\u0430\u043A" }
+        is { "\u0418\u0441\u043B\u0430\u043D\u0434\u0441\u043A\u0438\u0439" }
+        it { "\u0418\u0442\u0430\u043B\u044C\u044F\u043D\u0441\u043A\u0438\u0439" }
+        iu { "\u0418\u043D\u0430\u043A\u0442\u0438\u0442\u0443\u0442" }
+        ja { "\u042F\u043F\u043E\u043D\u0441\u043A\u0438\u0439" }
+        jv { "\u042F\u0432\u0430\u043D\u0441\u043A\u0438\u0439" }
         //jw { "\u042f\u0432\u0430\u043d\u0441\u043a\u0438\u0439" } // Use jv instead
-        kn { "\u041a\u0430\u043d\u0430\u0434\u0430" }
-        ks { "\u041a\u0430\u0448\u043c\u0438\u0440\u0441\u043a\u0438\u0439" }
-        kk { "\u041a\u0430\u0437\u0430\u0445\u0441\u043a\u0438\u0439" }
-        rw { "\u041a\u0438\u043d\u044f\u0440\u0432\u0430\u043d\u0434\u0430" }
-        ky { "\u041a\u0438\u0440\u0433\u0438\u0437\u0441\u043a\u0438\u0439" }
-        rn { "\u041a\u0438\u0440\u0443\u043d\u0434\u0438\u0439\u0441\u043a\u0438\u0439" }
-        ko { "\u041a\u043e\u0440\u0435\u0439\u0441\u043a\u0438\u0439" }
-        ku { "\u041a\u0443\u0440\u0434\u0438\u0448" }
-        lo { "\u041b\u0430\u043e\u0441\u0441\u043a\u0438\u0439" }
-        la { "\u041b\u0430\u0442\u0438\u043d\u0441\u043a\u0438\u0439" }
-        lv { "\u041b\u0430\u0442\u0432\u0438\u0439\u0441\u043a\u0438\u0439" }
-        ln { "\u041b\u0438\u043d\u0433\u0430\u043b\u0430" }
-        lt { "\u041b\u0438\u0442\u043e\u0432\u0441\u043a\u0438\u0439" }
-        mk { "\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438\u0439" }
-        mg { "\u041c\u0430\u043b\u0430\u0433\u0430\u0441\u0438\u0439\u0441\u043a\u0438\u0439" }
-        ms { "\u041c\u0430\u043b\u0430\u0439\u0441\u043a\u0438\u0439" }
-        ml { "\u041c\u0430\u043b\u0430\u044f\u043b\u0430\u043c" }
-        mt { "\u041c\u0430\u043b\u044c\u0442\u0438\u0439\u0441\u043a\u0438\u0439" }
-        mi { "\u041c\u0430\u043e\u0440\u0438" }
-        mr { "\u041c\u0430\u0440\u0430\u0442\u0438\u0439\u0441\u043a\u0438\u0439" }
-        mo { "\u041c\u043e\u043b\u0434\u0430\u0432\u0441\u043a\u0438\u0439" }
-        mn { "\u041c\u043e\u043d\u0433\u043e\u043b\u044c\u0441\u043a\u0438\u0439" }
-        na { "\u041d\u0430\u0443\u0440\u0443" }
-        ne { "\u041d\u0435\u043f\u0430\u043b\u044c\u0441\u043a\u0438\u0439" }
-        no { "\u041d\u043e\u0440\u0432\u0435\u0436\u0441\u043a\u0438\u0439" }
-        oc { "\u041e\u043a\u0438\u0442\u0430\u043d" }
-        or { "\u041e\u0440\u0438\u044f" }
-        om { "\u041e\u0440\u043e\u043c\u043e (\u0410\u0444\u0430\u043d)" }
-        ps { "\u041f\u0430\u0448\u0442\u043e (\u041f\u0443\u0448\u0442\u043e)" }
-        fa { "\u041f\u0435\u0440\u0441\u0438\u0434\u0441\u043a\u0438\u0439" }
-        pl { "\u041f\u043e\u043b\u044c\u0441\u043a\u0438\u0439" }
-        pt { "\u041f\u043e\u0440\u0442\u0443\u0433\u0430\u043b\u044c\u0441\u043a\u0438\u0439" }
-        pa { "\u041f\u0430\u043d\u0434\u0436\u0430\u0431\u0441\u043a\u0438\u0439" }
-        qu { "\u041a\u0435\u0447\u0443\u0430" }
-        rm { "\u0420\u0430\u0435\u0442\u043e-\u0440\u043e\u043c\u0430\u043d\u0441\u043a\u0438\u0439" }
-        ro { "\u0420\u0443\u043c\u044b\u043d\u0441\u043a\u0438\u0439" }
-        ru { "\u0440\u0443\u0441\u0441\u043A\u0438\u0439" }
-        //ru { "\u0420\u0443\u0441\u0441\u043a\u0438\u0439" } // From Java (Suppose to be lower case?)
-        sm { "\u0421\u0430\u043c\u043e\u0430" }
-        sg { "\u0421\u0430\u043d\u0433\u043e" }
-        sa { "\u0421\u0430\u043d\u0441\u043a\u0440\u0438\u0442" }
-        gd { "\u0413\u0430\u044d\u043b\u044c\u0441\u043a\u0438\u0439" }
-        sr { "\u0421\u0435\u0440\u0431\u0441\u043a\u0438\u0439" }
-        sh { "\u0421\u0435\u0440\u0431\u0441\u043a\u043e-\u0445\u043e\u0440\u0432\u0430\u0442\u0441\u043a\u0438\u0439" }
-        st { "\u0421\u0435\u0441\u043e\u0442\u043e" }
-        tn { "\u0421\u0435\u0442\u0441\u0432\u0430\u043d\u0430" }
-        sn { "\u0428\u043e\u043d\u0430" }
-        sd { "\u0421\u0438\u043d\u0434\u0438" }
-        si { "\u0421\u0438\u043d\u0433\u0430\u043b\u044c\u0441\u043a\u0438\u0439" }
+        ka { "\u0413\u0440\u0443\u0437\u0438\u043D\u0441\u043A\u0438\u0439" }
+        kk { "\u041A\u0430\u0437\u0430\u0445\u0441\u043A\u0438\u0439" }
+        kl { "\u0413\u0440\u0435\u043D\u043B\u0430\u043D\u0434\u0441\u043A\u0438\u0439" }
+        km { "\u041A\u0430\u043C\u0431\u043E\u0434\u0436\u0438\u0439\u0441\u043A\u0438\u0439" }
+        kn { "\u041A\u0430\u043D\u0430\u0434\u0430" }
+        ko { "\u041A\u043E\u0440\u0435\u0439\u0441\u043A\u0438\u0439" }
+        ks { "\u041A\u0430\u0448\u043C\u0438\u0440\u0441\u043A\u0438\u0439" }
+        ku { "\u041A\u0443\u0440\u0434\u0438\u0448" }
+        ky { "\u041A\u0438\u0440\u0433\u0438\u0437\u0441\u043A\u0438\u0439" }
+        la { "\u041B\u0430\u0442\u0438\u043D\u0441\u043A\u0438\u0439" }
+        ln { "\u041B\u0438\u043D\u0433\u0430\u043B\u0430" }
+        lo { "\u041B\u0430\u043E\u0441\u0441\u043A\u0438\u0439" }
+        lt { "\u041B\u0438\u0442\u043E\u0432\u0441\u043A\u0438\u0439" }
+        //lv { "\u041B\u0430\u0442\u0432\u0438\u0439\u0441\u043A\u0438\u0439" } // Old value
+        lv { "\u041B\u0430\u0442\u0432\u0438\u0439\u0441\u043A\u0438\u0439" }
+        mg { "\u041C\u0430\u043B\u0430\u0433\u0430\u0441\u0438\u0439\u0441\u043A\u0438\u0439" }
+        mi { "\u041C\u0430\u043E\u0440\u0438" }
+        mk { "\u041C\u0430\u043A\u0435\u0434\u043E\u043D\u0441\u043A\u0438\u0439" }
+        ml { "\u041C\u0430\u043B\u0430\u044F\u043B\u0430\u043C" }
+        mn { "\u041C\u043E\u043D\u0433\u043E\u043B\u044C\u0441\u043A\u0438\u0439" }
+        mo { "\u041C\u043E\u043B\u0434\u0430\u0432\u0441\u043A\u0438\u0439" }
+        mr { "\u041C\u0430\u0440\u0430\u0442\u0438\u0439\u0441\u043A\u0438\u0439" }
+        ms { "\u041C\u0430\u043B\u0430\u0439\u0441\u043A\u0438\u0439" }
+        mt { "\u041C\u0430\u043B\u044C\u0442\u0438\u0439\u0441\u043A\u0438\u0439" }
+        my { "\u0411\u0438\u0440\u043C\u0430\u043D\u0441\u043A\u0438\u0439" }
+        na { "\u041D\u0430\u0443\u0440\u0443" }
+        ne { "\u041D\u0435\u043F\u0430\u043B\u044C\u0441\u043A\u0438\u0439" }
+        nl { "\u0413\u043E\u043B\u043B\u0430\u043D\u0434\u0441\u043A\u0438\u0439" }
+        no { "\u041D\u043E\u0440\u0432\u0435\u0436\u0441\u043A\u0438\u0439" }
+        oc { "\u041E\u043A\u0438\u0442\u0430\u043D" }
+        om { "\u041E\u0440\u043E\u043C\u043E (\u0410\u0444\u0430\u043D)" }
+        or { "\u041E\u0440\u0438\u044F" }
+        pa { "\u041F\u0430\u043D\u0434\u0436\u0430\u0431\u0441\u043A\u0438\u0439" }
+        pl { "\u041F\u043E\u043B\u044C\u0441\u043A\u0438\u0439" }
+        ps { "\u041F\u0430\u0448\u0442\u043E (\u041F\u0443\u0448\u0442\u043E)" }
+        pt { "\u041F\u043E\u0440\u0442\u0443\u0433\u0430\u043B\u044C\u0441\u043A\u0438\u0439" }
+        qu { "\u041A\u0435\u0447\u0443\u0430" }
+        rm { "\u0420\u0430\u0435\u0442\u043E-\u0440\u043E\u043C\u0430\u043D\u0441\u043A\u0438\u0439" }
+        rn { "\u041A\u0438\u0440\u0443\u043D\u0434\u0438\u0439\u0441\u043A\u0438\u0439" }
+        ro { "\u0420\u0443\u043C\u044B\u043D\u0441\u043A\u0438\u0439" }
+        ru { "\u0420\u0443\u0441\u0441\u043A\u0438\u0439" }
+        rw { "\u041A\u0438\u043D\u044F\u0440\u0432\u0430\u043D\u0434\u0430" }
+        sa { "\u0421\u0430\u043D\u0441\u043A\u0440\u0438\u0442" }
+        sd { "\u0421\u0438\u043D\u0434\u0438" }
+        sg { "\u0421\u0430\u043D\u0433\u043E" }
+        sh { "\u0421\u0435\u0440\u0431\u0441\u043A\u043E-\u0445\u043E\u0440\u0432\u0430\u0442\u0441\u043A\u0438\u0439" }
+        si { "\u0421\u0438\u043D\u0433\u0430\u043B\u044C\u0441\u043A\u0438\u0439" }
+        sk { "\u0421\u043B\u043E\u0432\u0430\u0446\u043A\u0438\u0439" }
+        sl { "\u0421\u043B\u043E\u0432\u0435\u043D\u0441\u043A\u0438\u0439" }
+        sm { "\u0421\u0430\u043C\u043E\u0430" }
+        sn { "\u0428\u043E\u043D\u0430" }
+        so { "\u0421\u043E\u043C\u0430\u043B\u0438" }
+        sq { "\u0410\u043B\u0431\u0430\u043D\u0441\u043A\u0438\u0439" }
+        sr { "\u0421\u0435\u0440\u0431\u0441\u043A\u0438\u0439" }
         ss { "\u0421\u0438\u0441\u0432\u0430\u0442\u0438" }
-        sk { "\u0421\u043b\u043e\u0432\u0430\u0446\u043a\u0438\u0439" }
-        sl { "\u0421\u043b\u043e\u0432\u0435\u043d\u0441\u043a\u0438\u0439" }
-        so { "\u0421\u043e\u043c\u0430\u043b\u0438" }
-        es { "\u0418\u0441\u043f\u0430\u043d\u0441\u043a\u0438\u0439" }
-        su { "\u0421\u0430\u043d\u0434\u0430\u043d\u0438\u0437\u0441\u043a\u0438\u0439" }
-        sw { "\u0421\u0443\u0430\u0445\u0438\u043b\u0438" }
-        sv { "\u0428\u0432\u0435\u0434\u0441\u043a\u0438\u0439" }
-        tl { "\u0422\u0430\u0433\u0430\u043b\u043e\u0433" }
-        tg { "\u0422\u0430\u0434\u0436\u0438\u043a\u0441\u043a\u0438\u0439" }
-        ta { "\u0422\u0430\u043c\u0438\u043b\u044c\u0441\u043a\u0438\u0439" }
-        tt { "\u0422\u0430\u0442\u0430\u0440\u0441\u043a\u0438\u0439" }
-        te { "\u0422\u0435\u043b\u0443\u0433\u0443" }
-        th { "\u0422\u0430\u0439\u0441\u043a\u0438\u0439" }
-        bo { "\u0422\u0438\u0431\u0435\u0442\u0441\u043a\u0438\u0439" }
-        ti { "\u0422\u0438\u0433\u0440\u0438\u043d\u0438\u0430" }
-        to { "\u0422\u043e\u043d\u0433\u0430" }
-        ts { "\u0422\u0441\u043e\u043d\u0433\u0430" }
-        tr { "\u0422\u0443\u0440\u0435\u0446\u043a\u0438\u0439" }
-        tk { "\u0422\u0443\u0440\u043a\u043c\u0435\u043d\u0441\u043a\u0438\u0439" }
+        st { "\u0421\u0435\u0441\u043E\u0442\u043E" }
+        su { "\u0421\u0430\u043D\u0434\u0430\u043D\u0438\u0437\u0441\u043A\u0438\u0439" }
+        sv { "\u0428\u0432\u0435\u0434\u0441\u043A\u0438\u0439" }
+        sw { "\u0421\u0443\u0430\u0445\u0438\u043B\u0438" }
+        ta { "\u0422\u0430\u043C\u0438\u043B\u044C\u0441\u043A\u0438\u0439" }
+        te { "\u0422\u0435\u043B\u0443\u0433\u0443" }
+        tg { "\u0422\u0430\u0434\u0436\u0438\u043A\u0441\u043A\u0438\u0439" }
+        th { "\u0422\u0430\u0439\u0441\u043A\u0438\u0439" }
+        ti { "\u0422\u0438\u0433\u0440\u0438\u043D\u0438\u0430" }
+        tk { "\u0422\u0443\u0440\u043A\u043C\u0435\u043D\u0441\u043A\u0438\u0439" }
+        tl { "\u0422\u0430\u0433\u0430\u043B\u043E\u0433" }
+        tn { "\u0421\u0435\u0442\u0441\u0432\u0430\u043D\u0430" }
+        to { "\u0422\u043E\u043D\u0433\u0430" }
+        tr { "\u0422\u0443\u0440\u0435\u0446\u043A\u0438\u0439" }
+        ts { "\u0422\u0441\u043E\u043D\u0433\u0430" }
+        tt { "\u0422\u0430\u0442\u0430\u0440\u0441\u043A\u0438\u0439" }
         tw { "\u0422\u0432\u0438" }
-        ug { "\u0423\u0439\u0433\u0443\u0440\u0441\u043a\u0438\u0439" }
-        uk { "\u0423\u043a\u0440\u0430\u0438\u043d\u0441\u043a\u0438\u0439" }
+        ug { "\u0423\u0439\u0433\u0443\u0440\u0441\u043A\u0438\u0439" }
+        uk { "\u0423\u043A\u0440\u0430\u0438\u043D\u0441\u043A\u0438\u0439" }
         ur { "\u0423\u0440\u0434\u0443" }
-        uz { "\u0423\u0437\u0431\u0435\u043a\u0441\u043a\u0438\u0439" }
-        vi { "\u0412\u044c\u0435\u0442\u043d\u0430\u043c\u0441\u043a\u0438\u0439" }
-        vo { "\u0412\u043e\u043b\u0430\u043f\u0430\u043a" }
-        cy { "\u0412\u0430\u043b\u043b\u0438\u0439\u0441\u043a\u0438\u0439" }
-        wo { "\u0412\u043e\u043b\u043e\u0444" }
-        xh { "\u0425\u043e\u0437\u0430" }
+        uz { "\u0423\u0437\u0431\u0435\u043A\u0441\u043A\u0438\u0439" }
+        vi { "\u0412\u044C\u0435\u0442\u043D\u0430\u043C\u0441\u043A\u0438\u0439" }
+        vo { "\u0412\u043E\u043B\u0430\u043F\u0430\u043A" }
+        wo { "\u0412\u043E\u043B\u043E\u0444" }
+        xh { "\u0425\u043E\u0437\u0430" }
         yi { "\u0418\u0434\u0438\u0448" }
-        yo { "\u0419\u043e\u0440\u0443\u0431\u0430" }
-        za { "\u0417\u0443\u0430\u043d\u0433" }
-        zu { "\u0417\u0443\u043b\u0443\u0441\u0441\u043a\u0438\u0439" }
+        yo { "\u0419\u043E\u0440\u0443\u0431\u0430" }
+        za { "\u0417\u0443\u0430\u043D\u0433" }
+        zh { "\u041A\u0438\u0442\u0430\u0439\u0441\u043A\u0438\u0439" }
+        zu { "\u0417\u0443\u043B\u0443\u0441\u0441\u043A\u0438\u0439" }
     }
-    LocaleID:int { 0x19 }
-//    LocaleString { "ru" }
     MonthAbbreviations { 
         "\u044F\u043D\u0432",
         "\u0444\u0435\u0432",
@@ -276,17 +476,8 @@
         "\u041D\u043E\u044F\u0431\u0440\u044C",
         "\u0414\u0435\u043A\u0430\u0431\u0440\u044C",
     }
-//    ShortLanguage { "rus" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
-    }
+
     LocaleScript:array {
         "Cyrl"      // ISO 15924 Name 
     }
@@ -337,4 +528,4 @@
         RUR { "\u0440.", "RUR" }
         UAH { "\u0433\u0440\u043D.", "UAH" }
     }
-}
+}
\ No newline at end of file

Index: ru_RU.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ru_RU.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ru_RU.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ ru_RU.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -20,14 +20,12 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    LocaleString { "ru_RU" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0.00\u00A4;-#,##0.00\u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "RUS" }
-    LocaleID:int { 0x0419 }
 }

Index: ru_UA.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ru_UA.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ru_UA.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ ru_UA.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -12,15 +12,15 @@
         "HH:mm:ss z",
         "HH:mm:ss",
         "HH:mm",
-        "d MMMM yyyy '\u0433.'",
-        "d MMMM yyyy '\u0433.'",
-        "dd.MM.yyyy",
+        "EEEE, d MMMM yyyy '\u0433.'",
+        "d MMMM yyyy",
+        "d MMM yyyy",
         "dd.MM.yy",
         "{1} {0}",
     }
     NumberElements {
         ",",
-        ".",
+        "\u00A0",
         ";",
         "%",
         "0",
@@ -31,6 +31,7 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
@@ -38,6 +39,4 @@
         "#,##0%",
         "#E0",
     }
-//    LocaleString{ "ru_UA" }
-//    ShortCountry { "UA" }
 }

Index: sh.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/sh.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sh.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ sh.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -7,7 +7,8 @@
 
 sh {
     Version { "2.0" }
-    CollationElements { 
+    collations {
+      standard { 
         Version { "2.0" }
         Sequence {
             "& C < \u010D <<< \u010C < \u0107 <<< \u0106"
@@ -17,8 +18,10 @@
             "& S < \u0161 <<< \u0160"
             "& Z < \u017E <<< \u017D"
             }
+      }
     }
     Countries { 
+        Fallback{ "en"}
         AF { "Avganistan" }
         AL { "Albanija" }
         DZ { "Al\u017Eir" }
@@ -218,6 +221,12 @@
         "d.M.yy.",
         "{1} {0}",
     }
+
+    DateTimeElements:intvector {
+        2,
+        1, // "Minimal Days in First Week" is unknown. Root value used instead
+    }
+
     DayAbbreviations { 
         "ned",
         "pon",
@@ -304,8 +313,6 @@
         //ji { "Jidi\u0161" }  // Use "yi" instead
         yi { "Jidi\u0161" }
     }
-    LocaleID:int { 0x081a }
-//    LocaleString { "sh" }
     MonthAbbreviations { 
         "jan",
         "feb",
@@ -347,8 +354,8 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "srp" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
     zoneStrings { 
         {
@@ -359,9 +366,9 @@
             "CET",
         }
     }
-//    LocaleScript{ 
-//                "Latn",  // ISO 15924 Name 
-//    }
+    LocaleScript{ 
+         "Latn",  // ISO 15924 Name 
+    }
     ExemplarCharacters { "[a-p r-v z \u0111 \u0107 \u010d \u017e \u0161 {lj} {nj} {d\u017e}]" }
 
     // Currency display names

Index: sh_YU.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/sh_YU.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sh_YU.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ sh_YU.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -7,7 +7,4 @@
 
 sh_YU {
     Version { "2.0" }
-//    LocaleString { "sh_YU" }
-//    ShortCountry { "YUG" }
-    LocaleID:int { 0x081a }
 }

Index: sk.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/sk.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sk.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ sk.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -7,15 +7,257 @@
 
 sk {
     Version{ "2.0" }
-    CollationElements { 
+    collations {
+      standard { 
         Version { "1.0" }
         Sequence { "& A < a\u0308 <<< A\u0308 & C "
         "< c\u030C <<< C\u030C & D < \u0111<<< \u0110 & H < ch <<< cH <<< Ch <<< CH & L < \u0142 <<<"
         " \u0141 & O < o\u0302 <<< O\u0302 & R < r\u030C <<< R\u030C & S < s\u030C <<< S\u030C"
         " & Z < z\u030C <<< Z\u030C < z\u0307 <<< Z\u0307" }
+      }
     }
     Countries { 
+        Fallback{ "en"}
+        //AD { "Andorra" }
+        AE { "Spojen\u00E9 arabsk\u00E9 emir\u00E1ty" }
+        AF { "Afganistan" }
+        AG { "Antigua a Barbados" }
+        //AI { "Anguilla" }
+        AL { "Alb\u00E1nsko" }
+        AM { "Arm\u00E9nsko" }
+        AN { "Holandsk\u00E9 Antily" }
+        //AO { "Angola" }
+        //AQ { "Antarkt\u00EDda" }
+        AR { "Argent\u00EDna" }
+        AS { "Americk\u00E1 Samoa" }
+        AT { "Rak\u00FAsko" }
+        AU { "Austr\u00E1lia" }
+        //AW { "Aruba" }
+        AZ { "Azerbajd\u017Ean" }
+        BA { "Bosna a Hercegovina" }
+        //BB { "Barbados" }
+        BD { "Banglad\u00E9\u0161" }
+        BE { "Belgicko" }
+        //BF { "Burkina Faso" }
+        BG { "Bulharsko" }
+        BH { "Bahrajn" }
+        //BI { "Burundi" }
+        //BJ { "Benin" }
+        BM { "Bermudy" }
+        BN { "Brunej" }
+        BO { "Bol\u00EDvia" }
+        BR { "Braz\u00EDlia" }
+        BS { "Bahamy" }
+        BT { "But\u00E1n" }
+        BV { "Bouvetov ostrov" }
+        //BW { "Botswana" }
+        BY { "Bielorusko" }
+        //BZ { "Belize" }
+        CA { "Kanada" }
+        CC { "Kokosov\u00E9 (Keelingove) ostrovy" }
+        CD { "Kon\u017Esk\u00E1 demokratick\u00E1 republika" }
+        CF { "Stredoafrick\u00E1 republika" }
+        CG { "Kongo" }
+        CH { "\u0160vaj\u010Diarsko" }
+        CI { "Pobre\u017Eie Slonoviny" }
+        CK { "Cookove ostrovy" }
+        CL { "\u010Cile" }
+        CM { "Kamerun" }
+        CN { "\u010C\u00EDna" }
+        CO { "Kolumbia" }
+        CR { "Kostarika" }
+        CU { "Kuba" }
+        CV { "Kapverdy" }
+        CX { "Viano\u010Dn\u00FD ostrov" }
+        //CY { "Cyprus" }
+        CZ { "\u010Cesk\u00E1 republika" }
+        DE { "Nemecko" }
+        DJ { "D\u017Eibuti" }
+        DK { "D\u00E1nsko" }
+        DM { "Dominika" }
+        DO { "Dominik\u00E1nska republika" }
+        DZ { "Al\u017E\u00EDrsko" }
+        EC { "Ekv\u00E1dor" }
+        EE { "Est\u00F3nsko" }
+        //EG { "Egypt" }
+        EH { "Z\u00E1padn\u00E1 Sahara" }
+        //ER { "Eritrea" }
+        ES { "\u0160panielsko" }
+        ET { "Eti\u00F3pia" }
+        FI { "F\u00EDnsko" }
+        FJ { "Fid\u017Ei" }
+        FK { "Falklandsk\u00E9 ostrovy" }
+        FM { "Mikron\u00E9zia, Federat\u00EDvne \u0161t\u00E1ty" }
+        FO { "Faersk\u00E9 ostrovy" }
+        FR { "Franc\u00FAzsko" }
+        //GA { "Gabon" }
+        GB { "Spojen\u00E9 kr\u00E1\u013Eovstvo" }
+        //GD { "Grenada" }
+        GE { "Gruz\u00EDnsko" }
+        GF { "Franc\u00FAzska Guayana" }
+        //GH { "Ghana" }
+        GI { "Gibralt\u00E1r" }
+        GL { "Gr\u00F3nsko" }
+        //GM { "Gambia" }
+        //GN { "Guinea" }
+        //GP { "Guadeloupe" }
+        GQ { "Rovn\u00EDkov\u00E1 Guinea" }
+        GR { "Gr\u00E9cko" }
+        GS { "Ju\u017En\u00E1 Georgia a Ju\u017En\u00E9 Sandwichove ostrovy" }
+        //GT { "Guatemala" }
+        //GU { "Guam" }
+        //GW { "Guinea-Bissau" }
+        GY { "Guayana" }
+        HK { "Hong Kong S.A.R. \u010C\u00EDny" }
+        HM { "Heardove ostrovy a McDonaldove ostrovy" }
+        //HN { "Honduras" }
+        HR { "Chorv\u00E1tsko" }
+        //HT { "Haiti" }
+        HU { "Ma\u010Farsko" }
+        ID { "Indon\u00E9zia" }
+        IE { "\u00CDrsko" }
+        IL { "Izrael" }
+        //IN { "India" }
+        IO { "Britsk\u00E9 \u00FAzemie v Indickom oce\u00E1ne" }
+        IQ { "Irak" }
+        IR { "Ir\u00E1n" }
+        IS { "Island" }
+        IT { "Taliansko" }
+        JM { "Jamajka" }
+        JO { "Jord\u00E1nsko" }
+        JP { "Japonsko" }
+        KE { "Ke\u0148a" }
+        KG { "Kirgizsko" }
+        KH { "Kambod\u017Ea" }
+        //KI { "Kiribati" }
+        KM { "Komory" }
+        KN { "Saint Kitts a Nevis" }
+        KP { "K\u00F3rea, Severn\u00E1" }    // alternate name { "K\u00F3rea, \u013Eudovodemokratick\u00E1 republika" }
+        KR { "K\u00F3rea, Ju\u017En\u00E1" }    // alternate name { "K\u00F3rea, republika" }
+        KW { "Kuvajt" }
+        KY { "Kajmansk\u00E9 ostrovy" }
+        KZ { "Kazachstan" }
+        LA { "Laosk\u00E1 \u013Eudovodemokratick\u00E1 republika" }
+        LB { "Libanon" }
+        LC { "Sv\u00E4t\u00E1 Lucia" }
+        LI { "Lichten\u0161tajnsko" }
+        LK { "Sr\u00ED Lanka" }
+        LR { "Lib\u00E9ria" }
+        //LS { "Lesotho" }
+        LT { "Litva" }
+        LU { "Luxembursko" }
+        LV { "Loty\u0161sko" }
+        LY { "L\u00FDbijsk\u00E1 arabsk\u00E1 d\u017Eamah\u00EDrija" }
+        MA { "Maroko" }
+        MC { "Monako" }
+        MD { "Moldavsko, republika" }
+        MG { "Madagaskar" }
+        MH { "Marshallove ostrovy" }
+        MK { "Maced\u00F3nsko, republika" }
+        //ML { "Mali" }
+        MM { "Mjanmarsko" }
+        MN { "Mongolsko" }
+        MO { "Makao S.A.R. \u010C\u00EDny" }
+        MP { "Severn\u00E9 Mari\u00E1ny" }
+        MQ { "Martinik" }
+        MR { "Maurit\u00E1nia" }
+        //MS { "Montserrat" }
+        //MT { "Malta" }
+        MU { "Maur\u00EDcius" }
+        MV { "Maldivy" }
+        //MW { "Malawi" }
+        MX { "Mexiko" }
+        MY { "Malajzia" }
+        MZ { "Mozambik" }
+        NA { "Nam\u00EDbia" }
+        NC { "Nov\u00E1 Kaled\u00F3nia" }
+        //NE { "Niger" }
+        NF { "Norfolkov ostrov" }
+        NG { "Nig\u00E9ria" }
+        NI { "Nikaragua" }
+        NL { "Holandsko" }
+        NO { "N\u00F3rsko" }
+        NP { "Nep\u00E1l" }
+        //NR { "Nauru" }
+        //NU { "Niue" }
+        NZ { "Nov\u00FD Z\u00E9land" }
+        OM { "Om\u00E1n" }
+        //PA { "Panama" }
+        //PE { "Peru" }
+        PF { "Franc\u00FAzska Polyn\u00E9zia" }
+        PG { "Papua Nov\u00E1 Guinea" }
+        PH { "Filip\u00EDny" }
+        //PK { "Pakistan" }
+        PL { "Po\u013Esko" }
+        PM { "Saint Pierre a Miquelon" }
+        PN { "Pitcairnove ostrovy" }
+        PR { "Portoriko" }
+        PS { "Palest\u00EDnske \u00FAzemie" }
+        PT { "Portugalsko" }
+        //PW { "Palau" }
+        PY { "Paraguaj" }
+        QA { "Katar" }
+        RE { "Reunion" }
+        RO { "Rumunsko" }
+        RU { "Rusk\u00E1 feder\u00E1cia" }
+        //RW { "Rwanda" }
+        SA { "Saudsk\u00E1 Ar\u00E1bia" }
+        SB { "\u0160alam\u00FAnove ostrovy" }
+        SC { "Seychelsk\u00E9 ostrovy" }
+        SD { "Sud\u00E1n" }
+        SE { "\u0160v\u00E9dsko" }
+        SG { "Singapur" }
+        SH { "Sv\u00E4t\u00E1 Helena" }
+        SI { "Slovinsko" }
+        SJ { "\u0160picbergy a Jan Mayen" }
         SK { "Slovensk\u00E1 republika" }
+        //SK { "Slovensko" } // From translation center
+        //SL { "Sierra Leone" }
+        SM { "San Mar\u00EDno" }
+        //SN { "Senegal" }
+        SO { "Som\u00E1lsko" }
+        SR { "Surinam" }
+        ST { "Sv\u00E4t\u00FD Tom\u00E1\u0161 a Princove ostrovy" }
+        SV { "Salvador" }
+        SY { "S\u00FDrska arabsk\u00E1 republika" }    // alternate name { "S\u00FDria" }
+        SZ { "Svazijsko" }
+        TC { "Turks a Caicos" }
+        TD { "\u010Cad" }
+        TF { "Franc\u00FAzske ju\u017En\u00E9 \u00FAzemia" }
+        //TG { "Togo" }
+        TH { "Thajsko" }
+        TJ { "Tad\u017Eikistan" }
+        //TK { "Tokelau" }
+        TL { "V\u00FDchodn\u00FD Timor" }
+        TM { "Turkm\u00E9nsko" }
+        TN { "Tunisko" }
+        //TO { "Tonga" }
+        TR { "Turecko" }
+        TT { "Trinidad a Tobago" }
+        //TV { "Tuvalu" }
+        TW { "Tajwan" }
+        TZ { "Tanz\u00E1nia" }
+        UA { "Ukrajina" }
+        //UG { "Uganda" }
+        UM { "Men\u0161ie od\u013Eahl\u00E9 ostrovy USA" }
+        US { "Spojen\u00E9 \u0161t\u00E1ty" }
+        UY { "Uruguaj" }
+        //UZ { "Uzbekistan" }
+        VA { "Sv\u00E4t\u00E1 stolica (Vatik\u00E1nsky mestsk\u00FD \u0161t\u00E1t)" }
+        VC { "Sv\u00E4t\u00FD Vincent a Grenad\u00EDny" }
+        //VE { "Venezuela" }
+        VG { "Britsk\u00E9 panensk\u00E9 ostrovy" }
+        VI { "Panensk\u00E9 ostrovy - USA" }
+        //VN { "Vietnam" }
+        //VU { "Vanuatu" }
+        WF { "Wallis a Futuna" }
+        //WS { "Samoa" }
+        YE { "Jemen" }
+        //YT { "Mayotte" }
+        YU { "Juhosl\u00E1via" }
+        ZA { "Ju\u017En\u00E1 Afrika" }
+        //ZM { "Zambia" }
+        //ZW { "Zimbabwe" }
     }
     DateTimePatterns { 
         "H:mm:ss z",
@@ -34,11 +276,11 @@
         "Ut",
         "St",
         "\u0160t",
-        "Pa",
+        "Pi",
         "So",
     }
     DayNames { 
-        "Nede\u013Ee",
+        "Nede\u013Ea", // Is this Nede\u013Ea or Nede\u013Ee?
         "Pondelok",
         "Utorok",
         "Streda",
@@ -50,11 +292,45 @@
         "pred n.l.",
         "n.l.",
     }
+    DateTimeElements:intvector {
+        2,
+        4
+    }
     Languages { 
-        sk { "Sloven\u010Dina" }
+        ar { "arabsk\u00FD" }
+        bg { "bulharsk\u00FD" }
+        cs { "\u010Desk\u00FD" }
+        da { "d\u00E1nsky" }
+        de { "nemeck\u00FD" }
+        el { "gr\u00E9cky" }
+        en { "anglick\u00FD" }
+        es { "\u0161panielsky" }
+        et { "est\u00F3nsky" }
+        fi { "f\u00EDnsky" }
+        fr { "franc\u00FAzsky" }
+        he { "hebrejsk\u00FD" }
+        hr { "chorv\u00E1tsky" }
+        hu { "ma\u010Farsk\u00FD" }
+        it { "taliansky" }
+        ja { "japonsk\u00FD" }
+        ko { "k\u00F3rejsk\u00FD" }
+        lt { "litovsk\u00FD" }
+        lv { "loty\u0161sk\u00FD" }
+        nl { "holandsk\u00FD" }
+        no { "n\u00F3rsky" }
+        pl { "po\u013Esk\u00FD" }
+        pt { "portugalsk\u00FD" }
+        ro { "rumunsk\u00FD" }
+        ru { "rusk\u00FD" }
+        //sk { "Sloven\u010Dina" } // Old value
+        sk { "slovensk\u00FD" }
+        sl { "slovinsk\u00FD" }
+        sv { "\u0161v\u00E9dsky" }
+        tr { "tureck\u00FD" }
+        zh { "\u010D\u00EDnsky" }
+        //zh_cn { "\u010D\u00EDnsky (zjednodu\u0161en\u00FD)" }
+        //zh_tw { "\u010D\u00EDnsky (tradi\u010Dn\u00FD)" }
     }
-    LocaleID:int { 0x1b }
-//    LocaleString { "sk" }
     MonthAbbreviations { 
         "jan",
         "feb",
@@ -96,25 +372,17 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "slk" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
+
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
     }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
     ExemplarCharacters { "[a-z \u00fd \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u00e4 \u00f4 \u013a \u0155 \u010d \u010f \u013e \u0148 \u0161 \u0165 \u017e]" }
 
     // Currency display names
     Currencies {
         SKK { "Sk", "SKK" }
     }
-}
+}
\ No newline at end of file

Index: sk_SK.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/sk_SK.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sk_SK.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ sk_SK.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -7,13 +7,10 @@
 
 sk_SK {
     Version{ "2.0" }
-//    LocaleString { "sk_SK" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "SVK" }
-    LocaleID:int { 0x041b }
 }

Index: sl.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/sl.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sl.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ sl.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -7,16 +7,257 @@
 
 sl {
     Version{"2.0"}
-    CollationElements { 
+    collations {
+      standard { 
         Version { "1.0" }
         Sequence { "& C < c\u030C <<< C\u030C & S < s\u030C <<< S\u030C & Z < z\u030C <<< Z\u030C" }
 //      Sequence { "& C < c\u030C <<< C\u030C < c\u0301 <<< C\u0301 & D < \u01F3"
 //        " <<< \u01F2 <<< \u01F1 < \u01C6 <<< \u01C5 <<< \u01C4 < \u0111 <<< \u0110 & L < \u0142 <<< "
 //        "\u0141 & N < nj <<< nJ <<< Nj <<< NJ & S < s\u030C <<< S\u030C < s\u0301<<< S\u0301 & Z <"
 //        " z\u030C <<< Z\u030C < z\u0301 <<< Z\u0301 < z\u0307 <<< Z\u0307 " }
+      }
     }
     Countries { 
+        Fallback{ "en"}
+        AD { "Andora" }
+        AE { "Zdru\u017Eeni arabski emirati" }
+        AF { "Afganistan" }
+        AG { "Antigva in Barbuda" }
+        AI { "Angvila" }
+        AL { "Albanija" }
+        AM { "Armenija" }
+        AN { "Nizozemski Antili" }
+        //AO { "Angola" }
+        AQ { "Antarktika" }
+        //AR { "Argentina" }
+        AS { "Ameri\u0161ka Samoa" }
+        AT { "Avstrija" }
+        AU { "Avstralija" }
+        //AW { "Aruba" }
+        AZ { "Azerbajd\u017Ean" }
+        BA { "Bosna in Hercegovina" }
+        //BB { "Barbados" }
+        BD { "Banglade\u0161" }
+        BE { "Belgija" }
+        //BF { "Burkina Faso" }
+        BG { "Bolgarija" }
+        BH { "Bahrajn" }
+        //BI { "Burundi" }
+        //BJ { "Benin" }
+        //BM { "Bermuda" }
+        BN { "Brunej" }
+        BO { "Bolivija" }
+        BR { "Brazilija" }
+        BS { "Bahami" }
+        BT { "Butan" }
+        BV { "Otok Bouvet" }
+        BW { "Bocvana" }
+        BY { "Belorusija" }
+        //BZ { "Belize" }
+        CA { "Kanada" }
+        CC { "Kokosovi otoki" }
+        CD { "Demokrati\u010Dna republika Kongo" }
+        CF { "Centralnoafri\u0161ka republika" }
+        CG { "Kongo" }
+        CH { "\u0160vica" }
+        CI { "Slonoko\u0161\u010Dena obala" }
+        CK { "Cookovi otoki" }
+        CL { "\u010Cile" }
+        CM { "Kamerun" }
+        CN { "Kitajska" }
+        CO { "Kolumbija" }
+        CR { "Kostarika" }
+        CU { "Kuba" }
+        CV { "Kapverdski otoki" }
+        CX { "Bo\u017Ei\u010Dni otok" }
+        CY { "Ciper" }
+        CZ { "\u010Ce\u0161ka" }
+        DE { "Nem\u010Dija" }
+        DJ { "D\u017Eibuti" }
+        DK { "Danska" }
+        DM { "Dominika" }
+        DO { "Dominikanska republika" }
+        DZ { "Al\u017Eirija" }
+        EC { "Ekvador" }
+        EE { "Estonija" }
+        EG { "Egipt" }
+        EH { "Zahodna Sahara" }
+        ER { "Eritreja" }
+        ES { "\u0160panija" }
+        ET { "Etiopija" }
+        FI { "Finska" }
+        FJ { "Fid\u017Ei" }
+        FK { "Falklandski (Malvinski) otoki" }    // alternate name { "Falklandski otoki" }
+        FM { "Mikronezija" }
+        FO { "Fererski otoki" }
+        FR { "Francija" }
+        //GA { "Gabon" }
+        GB { "Velika Britanija" }
+        //GD { "Grenada" }
+        GE { "Gruzija" }
+        GF { "Francoska Gvajana" }
+        GH { "Gana" }
+        //GI { "Gibraltar" }
+        GL { "Grenlandija" }
+        GM { "Gambija" }
+        GN { "Gvineja" }
+        //GP { "Guadeloupe" }
+        GQ { "Ekvatorialna Gvineja" }
+        GR { "Gr\u010Dija" }
+        GS { "Ju\u017Ena Georgija in Ju\u017Eni Sandwich Islands" }
+        GT { "Gvatemala" }
+        //GU { "Guam" }
+        GW { "Gvineja Bissau" }
+        GY { "Gvajana" }
+        HK { "Kitajska republika Hong Kong" }
+        HM { "Heardov otok in McDonaldovi otoki" }
+        //HN { "Honduras" }
+        HR { "Hrva\u0161ka" }
+        //HT { "Haiti" }
+        HU { "Mad\u017Earska" }
+        ID { "Indonezija" }
+        IE { "Irska" }
+        IL { "Izrael" }
+        IN { "Indija" }
+        IO { "Britanska Indija" }
+        IQ { "Irak" }
+        //IR { "Iran" }
+        IS { "Islandija" }
+        IT { "Italija" }
+        JM { "Jamajka" }
+        //JO { "Jordan" }
+        JP { "Japonska" }
+        KE { "Kenija" }
+        KG { "Kirgizistan" }
+        KH { "Kambod\u017Ea" }
+        //KI { "Kiribati" }
+        KM { "Komori" }
+        KN { "Saint Kitts in Nevis" }
+        KP { "Severna Koreja" }    // alternate name { "Demokrati\u010Dna ljudska republika Koreja" }
+        KR { "Ju\u017Ena Koreja" }    // alternate name { "Republika Koreja" }
+        KW { "Kuvajt" }
+        KY { "Kajmanski otoki" }
+        KZ { "Kazahstan" }
+        LA { "Ljudska demokrati\u010Dna republika Laos" }
+        LB { "Libanon" }
+        //LC { "Saint Lucia" }
+        //LI { "Liechtenstein" }
+        LK { "\u0160rilanka" }
+        LR { "Liberija" }
+        LS { "Lesoto" }
+        LT { "Litva" }
+        LU { "Luxemburg" }
+        LV { "Latvija" }
+        LY { "Libija" }
+        MA { "Maroko" }
+        MC { "Monako" }
+        MD { "Republika Moldova" }
+        MG { "Madagaskar" }
+        MH { "Marshallovi otoki" }
+        MK { "Republika Makedonija" }
+        //ML { "Mali" }
+        //MM { "Myanmar" }
+        MN { "Mongolija" }
+        MO { "Kitajska republika Macao" }
+        MP { "Severni Marianski otoki" }
+        MQ { "Martinik" }
+        MR { "Mavretanija" }
+        //MS { "Montserrat" }
+        //MT { "Malta" }
+        //MU { "Mauritius" }
+        MV { "Maldivi" }
+        MW { "Malavi" }
+        MX { "Mehika" }
+        MY { "Malezija" }
+        MZ { "Mozambik" }
+        NA { "Namibija" }
+        NC { "Nova Kaledonija" }
+        NE { "Nigerija" }
+        NF { "Otok Norfolk" }
+        NG { "Nigerija" }
+        NI { "Nikaragva" }
+        NL { "Nizozemska" }
+        NO { "Norve\u0161ka" }
+        //NP { "Nepal" }
+        //NR { "Nauru" }
+        //NU { "Niue" }
+        NZ { "Nova Zelandija" }
+        //OM { "Oman" }
+        //PA { "Panama" }
+        //PE { "Peru" }
+        PF { "Francoska Polinezija" }
+        PG { "Papua Nova Gvineja" }
+        PH { "Filipini" }
+        //PK { "Pakistan" }
+        PL { "Poljska" }
+        PM { "Saint Pierre in Miquelon" }
+        //PN { "Pitcairn" }
+        PR { "Portoriko" }
+        PS { "Palestinsko ozemlje" }
+        PT { "Portugalska" }
+        //PW { "Palau" }
+        PY { "Paragvaj" }
+        QA { "Katar" }
+        RE { "Reunion" }
+        RO { "Romunija" }
+        RU { "Ruska federacija" }
+        RW { "Ruanda" }
+        SA { "Saudova Arabija" }
+        SB { "Salomonovo oto\u010Dje" }
+        SC { "Sej\u0161eli" }
+        //SD { "Sudan" }
+        SE { "\u0160vedska" }
+        SG { "Singapur" }
+        SH { "Sveta Helena" }
         SI { "Slovenija" }
+        SJ { "Svalbard in Jan Mayen" }
+        SK { "Slova\u0161ka" }
+        //SL { "Sierra Leone" }
+        //SM { "San Marino" }
+        //SN { "Senegal" }
+        SO { "Somalija" }
+        SR { "Surinam" }
+        ST { "Sao Tome in Principe" }
+        SV { "Salvador" }
+        SY { "Sirija" }
+        SZ { "Svazi" }
+        TC { "Oto\u010Dji Turks in Caicos" }
+        TD { "\u010Cad" }
+        TF { "Francoski zahodni teritorij" }
+        //TG { "Togo" }
+        TH { "Tajska" }
+        TJ { "Tad\u017Eikistan" }
+        //TK { "Tokelau" }
+        TL { "Vzhodni Timor" }
+        //TM { "Turkmenistan" }
+        TN { "Tunizija" }
+        //TO { "Tonga" }
+        TR { "Tur\u010Dija" }
+        TT { "Trinidad in Tobago" }
+        //TV { "Tuvalu" }
+        TW { "Tajvan" }
+        TZ { "Tanzanija" }
+        UA { "Ukrajina" }
+        //UG { "Uganda" }
+        UM { "Ameri\u0161ki manj\u0161i oddaljeni otoki" }
+        US { "Zdru\u017Eene dr\u017Eave Amerike" }
+        UY { "Urugvaj" }
+        //UZ { "Uzbekistan" }
+        VA { "Vatikan" }
+        VC { "Saint Vincent in Grenadine" }
+        //VE { "Venezuela" }
+        VG { "Britanski Devi\u0161ki otoki" }
+        VI { "Ameri\u0161ki Devi\u0161ki otoki" }
+        //VN { "Vietnam" }
+        //VU { "Vanuatu" }
+        WF { "Wallis in Futuna" }
+        //WS { "Samoa" }
+        YE { "Jemen" }
+        //YT { "Mayotte" }
+        YU { "Jugoslavija" }
+        ZA { "Ju\u017Ena Afrika" }
+        ZM { "Zambija" }
+        ZW { "Zimbabve" }
     }
     DateTimePatterns { 
         "H:mm:ss z",
@@ -29,6 +270,12 @@
         "yy.M.d",
         "{1} {0}",
     }
+
+    DateTimeElements:intvector {
+        2,
+        1, // "Minimal Days in First Week" is unknown. Root value used instead
+    }
+
     DayAbbreviations { 
         "ned",
         "pon",
@@ -52,10 +299,39 @@
         "po Kr.",
     }
     Languages { 
+        ar { "Arab\u0161\u010Dina" }
+        bg { "Bolgar\u0161\u010Dina" }
+        cs { "\u010Ce\u0161\u010Dina" }
+        da { "Dan\u0161\u010Dina" }
+        de { "Nem\u0161\u010Dina" }
+        el { "Gr\u0161\u010Dina" }
+        en { "Angle\u0161\u010Dina" }
+        es { "\u0160pan\u0161\u010Dina" }
+        et { "Eston\u0161\u010Dina" }
+        fi { "Fin\u0161\u010Dina" }
+        fr { "Franco\u0161\u010Dina" }
+        he { "Hebrej\u0161\u010Dina" }
+        hr { "Hrva\u0161\u010Dina" }
+        hu { "Mad\u017Ear\u0161\u010Dina" }
+        it { "Italijan\u0161\u010Dina" }
+        ja { "Japon\u0161\u010Dina" }
+        ko { "Korej\u0161\u010Dina" }
+        lt { "Litov\u0161\u010Dina" }
+        lv { "Leton\u0161\u010Dina" }
+        nl { "Nizozem\u0161\u010Dina" }
+        no { "Norve\u0161\u010Dina" }
+        pl { "Polj\u0161\u010Dina" }
+        pt { "Portugal\u0161\u010Dina" }
+        ro { "Romun\u0161\u010Dina" }
+        ru { "Ru\u0161\u010Dina" }
+        sk { "Slova\u0161\u010Dina" }
         sl { "Sloven\u0161\u010Dina" }
+        sv { "\u0160ved\u0161\u010Dina" }
+        tr { "Tur\u0161\u010Dina" }
+        zh { "Kitaj\u0161\u010Dina" }
+        //zh_cn { "Kitaj\u0161\u010Dina (poenostavljena)" }
+        //zh_tw { "Kitaj\u0161\u010Dina (tradicionalna)" }
     }
-    LocaleID:int { 0x24 }
-//    LocaleString { "sl" }
     MonthAbbreviations { 
         "jan",
         "feb",
@@ -97,25 +373,17 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "slv" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
+
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
     }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
     ExemplarCharacters { "[a-p r-v z \u010d \u0161 \u017e]" }
 
     // Currency display names
     Currencies {
         SIT { "SIT", "SIT" }
     }
-}
+}
\ No newline at end of file

Index: sl_SI.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/sl_SI.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sl_SI.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ sl_SI.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -7,12 +7,9 @@
 
 sl_SI {
     Version{ "2.0" }
-//    LocaleString { "sl_SI" }
 //    NumberPatterns { 
 //        "#,##0.###;-#,##0.###",
 //        "\u00A4 #,##0.00;-\u00A4 #,##0.00",
 //        "#,##0%",
 //    }
-//    ShortCountry { "SVN" }
-    LocaleID:int { 0x0424 }
 }

Index: so.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/so.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- so.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ so.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -12,6 +12,153 @@
 
 so{ 
     Version{ "2.0" }
+    AmPmMarkers {
+        "sn",
+        "gn",
+    }
+    Countries { 
+        AE { "Imaaraadka Carabta ee Midoobay" }
+        AF { "Afgaanistaan" }
+        AM { "Armeeniya" }
+        AO { "Angoola" }
+        AT { "Osteeriya" }
+        AU { "Awstraaliya" }
+
+        BA { "Boosniya Heersigoviina" }
+        BB { "Baarbadoos" }
+        BD { "Bangaala-Deesh" }
+        BE { "Beljiyam" }
+        BH { "Baxrayn" }
+        BJ { "Beniin" }
+        BR { "Braasiil" }
+
+        CA { "Kanada" }
+        CH { "Swiiserlaand" }
+        CL { "Jili" }
+        CM { "Kameruun" }
+        CN { "Shiinaha" }
+        CU { "Kuuba" }
+
+        DE { "Jarmal" }
+        DJ { "Jabuuti" }
+        DK { "Danmaark" }
+
+        EG { "Masar" }
+        ES { "Isbeyn" }
+        ET { "Itoobiya" }
+
+        FI { "Fiinlaand" }
+        FR { "Faransiis" }
+
+        GD { "Giriinaada" }
+        GN { "Gini" }
+        GR { "Giriigga" }
+
+        HR { "Korweeshiya" }
+        HU { "Hangeri" }
+
+        ID { "Indoneesiya" }
+        IE { "Ayrlaanda" }
+        IL { "Israa'iil" }
+        IN { "Hindiya" }
+        IQ { "Ciraaq" }
+        IR { "Iiraan" }
+        IS { "Iislaand" }
+        IT { "Talyaani" }
+
+        JM { "Jameyka" }
+        JO { "Urdun" }
+        JP { "Jabbaan" }
+
+        KE { "Kiiniya" }
+        KH { "Kamboodiya" }
+        KP { "Kuuriyada Waqooyi" }
+        KR { "Kuuriyada Koonfureed" }
+        KW { "Kuwayt" }
+        KZ { "Kasaakhistaan" }
+
+        LB { "Lubnaan" }
+        LK { "Siirilaanka" }
+        LR { "Laybeeriya" }
+        LS { "Losooto" }
+        LU { "Luksemboorg" }
+        LV { "Laatfiya" }
+        LY { "Liibiya" }
+
+        MA { "Marooko" }
+        MC { "Moonako" }
+        MK { "Makadooniya" }
+        ML { "Maali" }
+        MR { "Muritaaniya" }
+        MT { "Maalda" }
+        MV { "Maaldiqeen" }
+        MW { "Malaawi" }
+        MX { "Meksiko" }
+        MZ { "Musambiig" }
+
+        NA { "Namiibiya" }
+        NG { "Nayjeeriya" }
+        NI { "Nikaraaguwa" }
+        NO { "Noorweey" }
+        NZ { "Neyuusilaand" }
+
+        OM { "Cumaan" }
+
+        PH { "Filibiin" }
+        PK { "Bakistaan" }
+        PL { "Booland" }
+        PT { "Bortuqaal" }
+
+        QA { "Qadar" }
+
+        RO { "Rumaaniya" }
+        RU { "Ruush" }
+
+        SA { "Sacuudi Carabiya" }
+        SD { "Sudaan" }
+        SE { "Iswidhan" }
+        SL { "Siraaliyoon" }
+        SO { "Soomaaliya" }
+        SY { "Suuriya" }
+
+        TD { "Jaad" }
+        TG { "Toogo" }
+        TH { "Taylaand" }
+        TN { "Tuniisiya" }
+        TR { "Turki" }
+        TZ { "Tansaaniya" }
+
+        UG { "Ugaanda" }
+        US { "Qaramada Midoobey ee Maraykanka" }
+
+        VA { "Faatikaan" }
+        VE { "Fenisuweela" }
+        VN { "Fiyetnaam" }
+
+        YE { "Yaman" }
+
+        ZA { "Koonfur Afrika" }
+        ZM { "Saambiya" }
+        ZW { "Simbaabwe" }
+    }
+    Currencies {
+        KES { "Ksh", "KES" }
+    }
+    DateTimeElements:intvector { 
+        7,
+        1,
+    }
+    DateTimePatterns { 
+        "h:mm:ss a",
+        "h:mm:ss a",
+        "h:mm:ss a",
+        "h:mm a",
+        "EEEE, MMMM dd, yyyy",
+        "dd MMMM yyyy",
+        "dd-MMM-yyyy",
+        "dd/MM/yy",
+        "{1} {0}",
+    }
     DayAbbreviations {
         "Axa",
         "Isn",
@@ -30,6 +177,17 @@
         "Jimco",
         "Sabti",
     }
+    Eras { 
+        "Ciise ka hor",
+        "Ciise ka dib"
+    }
+    ExemplarCharacters { "[a-z]" }
+    LocaleScript:array{ 
+       "Latn",  // ISO 15924 Name 
+    }
+    Languages { 
+        so { "Soomaali" }
+    }
     MonthAbbreviations {
         "Kob",
         "Lab",
@@ -58,41 +216,6 @@
         "Bisha Kow iyo Tobnaad",
         "Bisha Laba iyo Tobnaad",
     }
-    Eras { 
-        "Ciise ka hor",
-        "Ciise ka dib"
-    }
-    Languages { 
-        so { "Soomaali" }
-    }
-    Countries { 
-        DJ { "Jabuuti" }
-        ET { "Itoobiya" }
-        KE { "Kiiniya" }
-        SO { "Soomaaliya" }
-    }
-    AmPmMarkers {
-        "sn",
-        "gn",
-    }
-    DateTimeElements:intvector { 
-        7,
-        1,
-    }
-    DateTimePatterns { 
-        "h:mm:ss a",
-        "h:mm:ss a",
-        "h:mm:ss a",
-        "h:mm a",
-        "EEEE, MMMM dd, yyyy",
-        "dd MMMM yyyy",
-        "dd-MMM-yy",
-        "dd/MM/yy",
-        "{1} {0}",
-    }
-
-    // Currency display names
-    Currencies {
-        KES { "Ksh", "KES" }
-    }
 }
+
+

Index: sq.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/sq.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sq.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ sq.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -1,4 +1,4 @@
-// ***************************************************************************
+// ***************************************************************************
 // *
 // *   Copyright (C) 1997-2003, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
@@ -10,10 +10,24 @@
     AmPmMarkers { 
         "PD",
         "MD",
-    }
-    CollationElements { 
-        Version { "1.0" }
-        Sequence { "@" }
+    } 
+    collations {
+      standard { 
+        Version { "2.0" }
+        Sequence {  
+            "& [before 1] D < ç <<< Ç"
+            "& [before 1] E < dh <<< Dh <<< DH"
+            "& [before 1] F < ë <<< Ë"
+            "& [before 1] H < gj <<< Gj <<< GJ"
+            "& [before 1] M < ll <<< Ll <<< LL"
+            "& [before 1] O < nj <<< Nj <<< NJ"
+            "& [before 1] S < rr <<< Rr <<< RR"
+            "& [before 1] T < sh <<< Sh <<< SH"
+            "& [before 1] U < th <<< Th <<< TH"
+            "& [before 1] Y < xh <<< Xh <<< XH"
+            "& [before 1] Ʒ < zh <<< Zh <<< ZH" 
+        } 
+      }
     }
     Countries { 
         AL { "Shqip\u00EBria" }
@@ -29,6 +43,10 @@
         "yy-MM-dd",
         "{1} {0}",
     }
+    DateTimeElements:intvector {
+        2,
+        1, // "Minimal Days in First Week" is unknown. Root value used instead
+    }
     DayAbbreviations { 
         "Die",
         "H\u00EBn",
@@ -54,8 +72,6 @@
     Languages { 
         sq { "shqipe" }
     }
-    LocaleID:int { 0x1c }
-//    LocaleString { "sq" }
     MonthAbbreviations { 
         "Jan",
         "Shk",
@@ -97,22 +113,23 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "sqi" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
+/*    zoneStrings { 
+       {
+            "Europe/Tirane",
+            "CET", // TODO: Replace with long Albanian name
+            "CET",
+            "CEST", // TODO: Replace with long Albanian name
+            "CEST",
         }
     }
-//    LocaleScript{ 
-//                "Latn",  // ISO 15924 Name 
-//    }
-    ExemplarCharacters { "[a-z \u00eb \u00e7]" }
+*/
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
+    }
+    ExemplarCharacters { "[a-z ç ë {dh}{gj}{ll}{nj}{rr}{sh}{th}{xh}{zh}]" }
 
     // Currency display names
     Currencies {

Index: sq_AL.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/sq_AL.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sq_AL.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ sq_AL.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -7,22 +7,10 @@
 
 sq_AL {
     Version{ "2.0" }
-//    LocaleString { "sq_AL" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "\u00A4#,##0.00;-\u00A4#,##0.00",
         "#,##0%",
         "#E0",
     }
-    zoneStrings { 
-        {
-            "Europe/Tirane",
-            "CET", // TODO: Replace with long Albanian name
-            "CET",
-            "CEST", // TODO: Replace with long Albanian name
-            "CEST",
-        }
-    }
-//    ShortCountry { "ALB" }
-    LocaleID:int { 0x041c }
 }

Index: sr.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/sr.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sr.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ sr.txt	6 Apr 2004 10:08:14 -0000	1.2
@@ -9,7 +9,7 @@
     Version{ "2.0"}
     // We use UCA collation table optimized for Cyrillic
     // as defined in the Russian locale
-    CollationElements:alias { "ru" }
+    collations:alias { "ru" }
     Countries { 
         AF { "\u0410\u0432\u0433\u0430\u043D\u0438\u0441\u0442\u0430\u043D" }
         AL { "\u0410\u043B\u0431\u0430\u043D\u0438\u0458\u0430" }
@@ -210,6 +210,10 @@
         "d.M.yy.",
         "{1} {0}",
     }
+    DateTimeElements:intvector {
+        2,
+        1, // "Minimal Days in First Week" is unknown. Root value used instead
+    }
     DayAbbreviations { 
         "\u043D\u0435\u0434",
         "\u043F\u043E\u043D",
@@ -294,8 +298,6 @@
         vi { "\u0412\u0438\u0458\u0435\u0442\u043D\u0430\u043C\u0441\u043A\u0438" }
         yi { "\u0408\u0438\u0434\u0438\u0448" }
     }
-    LocaleID:int { 0x0c1a }
-//    LocaleString { "sr" }
     MonthAbbreviations { 
         "\u0458\u0430\u043D",
         "\u0444\u0435\u0431",
@@ -337,8 +339,8 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "srp" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
     zoneStrings { 
         {

Index: sr_YU.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/sr_YU.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sr_YU.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ sr_YU.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -7,8 +7,5 @@
 
 sr_YU {
     Version{ "2.0" }
-//    LocaleString { "sr_YU" }
     /* Discarding duplicate data for tag: NumberPatterns */
-//    ShortCountry { "YUG" }
-    LocaleID:int { 0x0c1a }
 }

Index: sv.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/sv.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sv.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ sv.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -1,4 +1,4 @@
-// ***************************************************************************
+// ***************************************************************************
 // *
 // *   Copyright (C) 1997-2003, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
@@ -7,13 +7,27 @@
 
 sv {
     Version{ "2.0" }
-    CollationElements {
-        Version { "1.0" }
-        Sequence { "& Z < \u00E6 <<< \u00C6 < a\u030A <<< A\u030A <<< aa <<<aA <<< A"
-        "a <<< AA< a\u0308 <<< A\u0308 < o\u0308 <<< O\u0308 << u\u030B <<< U\u030B<o\u030B <<< O"
-        "\u030B << \u00F8 <<< \u00D8 & V <<< w <<< W & Y<<< u\u0308 <<< U\u0308" }
+    AmPmMarkers { 
+        "fm",
+        "em",
+    }
+    collations {
+      standard { 
+        Version { "2.0" }
+        Sequence {
+            "&D<<đ<<<Đ<<ð<<<Ð"
+            "&t<<<þ/h"
+            "&T<<<Þ/H"
+            "&v<<<w"
+            "&V<<<W"
+            "&Y<<ü<<<Ü<<ű<<<Ű"
+            "&[before 1]ʒ<å<<<Å<ä<<<Ä<<æ<<<Æ<<ę<<<Ę"
+            "<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<œ<<<Œ<<ô<<<Ô"
+        }
+      }
     }
     Countries { 
+        Fallback{ "en"}
         // AD {"Andorra"}
         AE {"F\u00F6renade Arabemiraten"}
         AF {"Afganistan"}
@@ -28,8 +42,9 @@
         AS {"Amerikanska Samoa"}
         AT {"\u00D6sterrike"}
         AU {"Australien"}
+        //AW {"Aruba"}
         AZ {"Azerbajdzjan"}
-        BA {"Bosnien Herzegovina"}
+        BA {"Bosnien och Hercegovina"}
         // BB {"Barbados"}
         // BD {"Bangladesh"}
         BE {"Belgien"}
@@ -44,11 +59,13 @@
         BR {"Brasilien"}
         // BS {"Bahamas"}
         // BT {"Bhutan"}
+        BV { "Bouvet\u00F6n" }
         // BW {"Botswana"}
         BY {"Vitryssland"}
         // BZ {"Belize"}
         CA {"Kanada"}
-        CD {"Kongo"}
+        CC {"Kokos\u00F6arna (Keeling\u00F6arna)"}
+        CD {"Demokratiska republiken Kongo"}
         CF {"Centralafrikanska republiken"}
         CG {"Kongo"}
         CH {"Schweiz"}
@@ -60,7 +77,8 @@
         // CO {"Colombia"}
         // CR {"Costa Rica"}
         CU {"Kuba"}
-        CV {"Cap Verde"}
+        //CV {"Cap Verde"} // Old value
+        CV {"Kap Verde"}
         CX {"Jul\u00F6n"}
         CY {"Cypern"}
         CZ {"Tjeckien"}
@@ -96,11 +114,13 @@
         GP {"Guadelope"}
         GQ {"Ekvatorialguinea"}
         GR {"Grekland"}
+        GS { "Sydgeorgien och S\u00F6dra Sandwich\u00F6arna" }
         // GT {"Guatemala"}
         // GU {"Guam"}
         // GW {"Guinea-Bissau"}
         // GY {"Guyana"}
-        HK {"Hong Kong"}
+        HK { "Hongkong (Kina)" }
+        HM { "Heard- och McDonald\u00F6arna" }
         // HN {"Honduras"}
         HR {"Kroatien"}
         // HT {"Haiti"}
@@ -109,6 +129,7 @@
         IE {"Irland"}
         // IL {"Israel"}
         IN {"Indien"}
+        IO {"Brittiska Indiska ocean\u00F6arna"}
         IQ {"Irak"}
         // IR {"Iran"}
         IS {"Island"}
@@ -122,10 +143,10 @@
         // KI {"Kiribati"}
         KM {"Komorerna"}
         KN {"S:t Christopher och Nevis"}
-        KP {"Nordkorea"}
-        KR {"Sydkorea"}
+        KP {"Nordkorea"}    // alternate name { "Demokratiska folkrepubliken Korea" }
+        KR {"Sydkorea"}    // alternate name { "Republiken Korea" }
         // KW {"Kuwait"}
-        KY {"Cayman\u00F6arna"}
+        KY {"Kajman\u00F6arna"}
         KZ {"Kazachstan"}
         // LA {"Laos"}
         LB {"Libanon"}
@@ -158,9 +179,9 @@
         // MW {"Malawi"}
         MX {"Mexiko"}
         // MY {"Malaysia"}
-        // MZ {"Mozambique"}
+        MZ {"Mo\u00E7ambique"}
         // NA {"Namibia"}
-        NC {"Nya Caledonien"}
+        NC {"Nya Kaledonien"}
         // NE {"Niger"}
         NF {"Norfolk\u00F6n"}
         // NG {"Nigeria"}
@@ -169,7 +190,7 @@
         NO {"Norge"}
         // NP {"Nepal"}
         // NR {"Nauru"}
-        // NU {"Niue"}
+        NU { "Niue\u00F6n" }
         NZ {"Nya Zeeland"}
         // OM {"Oman"}
         // PA {"Panama"}
@@ -182,8 +203,9 @@
         PM {"S:t Pierre och Miquelon"}
         // PN {"Pitcairn"}
         // PR {"Puerto Rico"}
-        // PS {"Palestina"}
+        PS {"Palestinska territoriet"}
         // PT {"Portugal"}
+        // PW { "Palau" }
         // PY {"Paraguay"}
         // QA {"Qatar"}
         // RE {"R\u00E9union"}
@@ -211,10 +233,11 @@
         // SZ {"Swaziland"}
         TC {"Turks- och Caicos\u00F6arna"}
         TD {"Tchad"}
+        TF { "Franska Sydterritorierna" }
         // TG {"Togo"}
         // TH {"Thailand"}
         TJ {"Tadzjikistan"}
-        // TK {"Tokelau"}
+        TK { "Tokelau\u00F6arna" }
         TL {"\u00D6sttimor"}
         // TM {"Turkmenistan"}
         TN {"Tunisien"}
@@ -226,18 +249,19 @@
         // TZ {"Tanzania"}
         UA {"Ukraina"}
         // UG {"Uganda"}
-        US {"USA"}
+        UM { "Sm\u00E5, avl\u00E4gset bel\u00E4gna \u00F6ar som tillh\u00F6r F\u00F6renta staterna" }
+        US { "Amerikas F\u00F6renta Stater" }
         // UY {"Uruguay"}
         // UZ {"Uzbekistan"}
         VA {"Vatikanstaten"}
         VC {"S:t Vincent och Grenadinerna"}
         // VE {"Venezuela"}
-        WF {"Wallis och Futuna"}
         VG {"Brittiska Jungfru\u00F6arna"}
         VI {"Amerikanska Jungfru\u00F6arna"}
         // VN {"Vietnam"}
-        // WS {"Samoa"}
         // VU {"Vanuatu"}
+        WF { "Wallis och Futuna\u00F6arna" }
+        // WS {"Samoa"}
         YE {"Jemen"}
         // YT {"Mayotte"}
         YU {"Jugoslavien"}
@@ -246,18 +270,21 @@
         // ZW {"Zimbabwe"}
         // \u00C5L        {"\u00C5land"}
     }
+    Currencies {
+        SEK { "kr", "SEK" }
+    }
     DateTimeElements:intvector { 
         2,
         4,
     }
     DateTimePatterns { 
-        "'kl 'H:mm z",
-        "HH:mm:ss z",
-        "HH:mm:ss",
-        "HH:mm",
-        "'den 'd MMMM yyyy",
+        "'kl. 'HH.mm.ss z",
+        "HH.mm.ss z",
+        "HH.mm.ss",
+        "HH.mm",
         "'den 'd MMMM yyyy",
-        "yyyy-MMM-dd",
+        "'den 'd MMM yyyy",
+        "yyyy-MM-dd",
         "yyyy-MM-dd",
         "{1} {0}",
     }
@@ -279,6 +306,10 @@
         "fredag",
         "l\u00F6rdag",
     }
+    Eras { 
+        "f.Kr.",
+        "e.Kr.",
+    }
 
     Languages {
         aa   {"afar"}
@@ -377,7 +408,7 @@
         fi   {"finska"}
         fj   {"fidjianska"}
         fo   {"f\u00E4r\u00F6iska"}
-        fon  {"fon"}
+        // fon  {"fon"}
         fr   {"franska"}
         fur  {"friuilian"}
         fy   {"frisiska"}
@@ -414,7 +445,7 @@
         id   {"indonesiska"}
         ig   {"ibo"}
         ii   {"yi"}
-        ijo  {"ijo"}
+        //ijo  {"ijo"}
         ik   {"inupiaq"}
         ilo  {"iloko"}
         is   {"isl\u00E4ndska"}
@@ -435,7 +466,7 @@
         ki   {"kikuyu"}
         kj   {"kuanyama"}
         kk   {"kazakiska"}
-        kl   {"gr\u00F6nl\u00E4ndska; kalaallisut"}
+        kl   {"gr\u00F6nl\u00E4ndska"}
         km   {"kambodjanska; khmer"}
         kmb  {"kinbundu"}
         kn   {"kanaresiska; kannada"}
@@ -469,7 +500,7 @@
         lua  {"luba-lulua"}
         lui  {"luise\u00F1o"}
         lun  {"lunda"}
-        luo  {"luo"}
+        //luo  {"luo"}
         lus  {"lushai"}
         lv   {"lettiska"}
         mad  {"madurese"}
@@ -509,7 +540,7 @@
         ng   {"ndonga"}
         nia  {"nias"}
         niu  {"niuean"}
-        nl   {"nederl\u00E4ndska; holl\u00E4ndska"}
+        nl   {"nederl\u00E4ndska"}
         nn   {"ny\u00ADnorsk"}
         no   {"norska"}
         nr   {"syd\u00ADndebele"}
@@ -522,7 +553,7 @@
         nzi  {"nzima"}
         oc   {"provensalska"}
         oj   {"odjibwa; chippewa"}
-        om   {"oromo; galla"}
+        om   {"oromo"}
         or   {"oriya"}
         os   {"ossetiska"}
         osa  {"osage"}
@@ -559,6 +590,7 @@
         se   {"nord\u00ADsamiska"}
         sel  {"selkup"}
         sg   {"sango"}
+        sh   {"serbokroatiska"}
         shn  {"shan"}
         si   {"singalesiska"}
         sid  {"sidamo"}
@@ -592,7 +624,7 @@
         ter  {"tereno"}
         tet  {"tetum"}
         tg   {"tadzjikiska"}
-        th   {"thail\u00E4nska"}
+        th   {"thail\u00e4ndska"}
         ti   {"tigrinja"}
         tig  {"tigr\u00E9"}
         tiv  {"tivi"}
@@ -620,7 +652,7 @@
         umb  {"umbundu"}
         ur   {"urdu"}
         uz   {"uzbekiska"}
-        vai  {"vai"}
+        //vai  {"vai"}
         ve   {"venda"}
         vi   {"vietnamesiska"}
         vot  {"votiska"}
@@ -630,8 +662,8 @@
         was  {"washo"}
         wo   {"wolof"}
         xh   {"xhosa"}
-        yao  {"yao"}
-        yap  {"yap"}
+        //yao  {"yao"}
+        //yap  {"yap"}
         yi   {"jiddisch"}
         yo   {"yoruba"}
         za   {"zhuang"}
@@ -642,8 +674,6 @@
         zu   {"zulu"}
         zun  {"zu\u00F1i"}
     }
-
-    LocaleID:int { 0x1d }
     MonthAbbreviations { 
         "jan",
         "feb",
@@ -685,24 +715,11 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-    Eras { 
-        "f.Kr.",
-        "e.Kr.",
-    }
-    zoneStrings { 
-        {
-            "Europe/Stockholm",
-            "Central European Time",
-            "MET",
-            "Central European Time (DST)",
-            "MET",
-            "Stockholm",
-        }
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
     }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
     ExemplarCharacters { "[a-z \u00e4 \u00f6 \u00e5 \u00e1 \u00e9 \u00eb \u00fc]" }
     
     //------------------------------------------------------------
@@ -790,9 +807,33 @@
             "1,000,000,000,000,000,000,000,000,000,000,000,000,000: =#,##0="
 */
     }
-
-    // Currency display names
-    Currencies {
-        SEK { "kr", "SEK" }
+    Keys{
+         collation { "Sortera" }
+         calendar  { "Kalendar" }
+         currency  { "Valuta"}
     }
+    Types{
+        collation{
+            traditional { "Traditionell Sortera" }
+        }
+        calendar{
+            traditional { "Traditionell Kalendar" }
+        }
+    }
+    Variants{
+        REVISED { "Reviderad" }
+    }
+/*
+    zoneStrings { 
+        {
+            "Europe/Stockholm",
+            "Central European Time",
+            "MET",
+            "Central European Time (DST)",
+            "MET",
+            "Stockholm",
+        }
+    }
+*/
 }
+

Index: sv_FI.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/sv_FI.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sv_FI.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ sv_FI.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -13,6 +13,4 @@
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "FIN" }
-    LocaleID:int { 0x081d }
 }

Index: sv_SE.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/sv_SE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sv_SE.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ sv_SE.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -7,13 +7,10 @@
 
 sv_SE {
     Version { "2.0" }
-//    LocaleString { "sv_SE" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "SWE" }
-    LocaleID:int { 0x041d }
 }

Index: sw.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/sw.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sw.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ sw.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -11,11 +11,113 @@
 sw {
     Version { "2.0" }
 
-//    Countries {   // This does not need to be overridden
-//        KE { "Kenya" }
-//        TZ { "Tanzania" }
-//    }
-    DateTimeElements:intvector { 
+    // Many of these names came from www.geonames.de
+    Countries {
+        AE { "Muugano wa Falme za Nchi za Kiarabu" }
+        AG { "Antigua na Barbuda" }
+        AR { "Ajentina" }
+
+        BA { "Bosnia na Herzegowina" }
+        BE { "Ubelgiji" }
+        BR { "Brazili" }
+        BS { "Visiwa vya Bahama" }
+
+        CA { "Kanada" }
+        CF { "Jamhuri ya Afrika ya Kati" }
+        CG { "Kongo" }
+        CH { "Uswisi" }
+        CI { "Pwani ya Pembe" }
+        CM { "Kamerun" }
+        CN { "Uchina" }
+        CO { "Kolombia" }
+        //CS { "Serbiya da Montenegro" }
+        CV { "Rasi Verde" }
+        CZ { "Jamhuri ya Czech" }
+
+        DE { "Udachi" }
+        DJ { "Jibuti" }
+        DK { "Udenmarki" }
+        DM { "Dominika" }
+        DO { "Jamhuri ya Dominikan" }
+
+        EC { "Ekvado" }
+        EG { "Misri" }
+        ES { "Uhispania" }
+        ET { "Uhabeshi" }
+
+        FR { "Ufaransa" }
+
+        GB { "Uingereza" }
+        GQ { "Guinea ya Ikweta" }
+
+        HR { "Kroatia" }
+        HU { "Hungaria" }
+
+        IL { "Uyahudi" } // This could be Israeli instead
+        IN { "Uhindi" }
+        IQ { "Iraki" }
+        IR { "Uajemi" } // This could be Iran instead
+        IS { "Barafu" }
+        IT { "Uitaliani" }
+
+        JM { "Jamaika" }
+        JP { "Ujapani" }
+
+        KE { "Kenya" }
+        KH { "Kampuchea" }
+        KM { "Visiwa vya Komoro" }
+        KN { "Saint Kitts na Nevis" }
+        KP { "Korea ya Kaskazini" }
+        KR { "Korea ya Kusini" }
+
+        LU { "Luksemburg" }
+
+        MA { "Moroko" }
+        MC { "Monako" }
+        //MG { "Madagascar" } // Could also be Buki or Malagasi
+        MH { "Visiwa vya Marshall"}
+        MX { "Meksiko" }
+        MY { "Malasya" }
+        MZ { "Msumbiji" }
+
+        NI { "Nikaragua" }
+        NL { "Uholanzi" }
+        NO { "Unorwe" }
+        NP { "Nepali" }
+
+        PG { "Papua Guinea Mpya" }
+        PH { "Filipino" }
+        PT { "Ureno" }
+        PY { "Paragwai" }
+
+        RU { "Urusi" }
+
+        SA { "Arabuni Saudi" }
+        SB { "Visiwa vya Solomon" }
+        SC { "Visiwa vya Shelisheli" }
+        SE { "Uswidi" }
+        SO { "Somali" }
+        ST { "Sao Tome na Principe" }
+
+        TD { "Chadi" }
+        TL { "Timor ya Mashariki" }
+        TR { "Uturuki" }
+        TT { "Trinidad na Tobago" }
+        TZ { "Tanzania" }
+
+        US { "Muungano wa Nchi za Amerika" }
+        UY { "Urugwai" }
+
+        VA { "Vatikano" }
+        VC { "Saint Vincent na Grenadines" }
+
+        YE { "Yemeni" }
+
+        ZA { "Afrika ya Kusini" }
+        //ZM { "Zambia" }
+        //ZW { "Zimbabwe" }
+    }
+    DateTimeElements:intvector {
         7,
         1,
     }
@@ -28,7 +130,7 @@
         "Iju",
         "Jmo",
     }
-    DayNames { 
+    DayNames {
         "Jumapili",
         "Jumatatu",
         "Jumanne",
@@ -37,16 +139,14 @@
         "Ijumaa",
         "Jumamosi",
     }
-    Eras { 
+    Eras {
         "KK",
         "BK",
     }
-    Languages { 
+    Languages {
         sw  { "Kiswahili" }
     }
-    LocaleID:int { 0x0041 }
-//    LocaleString { "sw" }
-    MonthAbbreviations { 
+    MonthAbbreviations {
         "Jan",
         "Feb",
         "Mar",
@@ -60,7 +160,7 @@
         "Nov",
         "Des",
     }
-    MonthNames { 
+    MonthNames {
         "Januari",
         "Februari",
         "Machi",
@@ -74,8 +174,7 @@
         "Novemba",
         "Desemba",
     }
-//    ShortLanguage { "swa" }
-    zoneStrings { 
+    zoneStrings {
         {
             "Africa/Nairobi",
             "Saa za Africa Mashariki",  // East African Time
@@ -85,9 +184,12 @@
             "Nairobi",
         }
     }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
+    LocaleScript:array{
+      "Latn",  // ISO 15924 Name
+    }
+    ExemplarCharacters{
+      "[a-z]"
+    }
 
 // /**************** Info Below is needed ****************/
 // NumberElements{}

Index: sw_KE.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/sw_KE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sw_KE.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ sw_KE.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -10,13 +10,10 @@
 
 sw_KE {
     Version { "2.0" }
-//    LocaleString { "sw_KE" }
     NumberPatterns {
         "#,##0.###;-#,##0.###",
         "\u00A4#,##0.00;-\u00A4#,##0.00",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "KEN" }
-    LocaleID:int { 0x0441 }
 }

Index: sw_TZ.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/sw_TZ.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sw_TZ.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ sw_TZ.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -10,14 +10,10 @@
 
 sw_TZ {
     Version { "2.0" }
-//    LocaleString { "sw_TZ" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "TZA" }
-// Microsoft's JDK documentation says that this number is for Kenya only.
-//    LocaleID { "0441" }
 }

Index: ta.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ta.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ta.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ ta.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -7,8 +7,236 @@
 
 ta {
     Version { "2.0" }
+    AmPmMarkers {
+        "\u0b95\u0bbe\u0bb2\u0bc8",
+        "\u0bae\u0bbe\u0bb2\u0bc8"
+    }
+    collations {
+        standard { 
+            Version { "1.0" }
+            Sequence { "[normalization on]" }
+        }
+    }
+    Countries {
+        AD { "\u0b85\u0ba9\u0bcd\u0b9f\u0bcb\u0bb0\u0bbe" }
+        AE { "\u0b90\u0b95\u0bcd\u0b95\u0bbf\u0baf \u0b85\u0bb0\u0baa\u0bc1 \u0b95\u0bc2\u0b9f\u0bcd\u0b9f\u0bbe\u0b9f\u0bcd\u0b9a\u0bbf" }
+        AF { "\u0b86\u0baa\u0bcd\u0b95\u0bbe\u0ba9\u0bbf\u0bb8\u0bcd\u0ba4\u0bbe\u0ba9\u0bcd" }
+        AG { "\u0b86\u0ba9\u0bcd\u0b9f\u0bbf\u0b95\u0bc1\u0bb5\u0bbe \u0baa\u0bbe\u0bb0\u0bcd\u0baa\u0bc1\u0b9f\u0bbe" }
+        AL { "\u0b85\u0bb2\u0bcd\u0baa\u0bc7\u0ba9\u0bbf\u0baf\u0bbe" }
+        AM { "\u0b86\u0bb0\u0bcd\u0bae\u0bc0\u0ba9\u0bbf\u0baf\u0bbe" }
+        AO { "\u0b85\u0b99\u0bcd\u0b95\u0bcb\u0bb2\u0bbe" }
+        AR { "\u0b85\u0bb0\u0bcd\u0b9c\u0bc6\u0ba3\u0bcd\u0b9f\u0bbf\u0ba9\u0bbe" }
+        AT { "\u0b86\u0bb8\u0bcd\u0ba4\u0bbf\u0bb0\u0bbf\u0baf\u0bbe" }
+        AU { "\u0b86\u0bb8\u0bcd\u0ba4\u0bbf\u0bb0\u0bc7\u0bb2\u0bbf\u0baf\u0bbe" }
+        AZ { "\u0b85\u0b9c\u0bb0\u0bcd\u0baa\u0bc8\u0b9c\u0bbe\u0ba9\u0bcd" }
 
-//    ShortLanguage { tam }
+        BA { "\u0baa\u0bcb\u0bb8\u0bcd\u0ba9\u0bbf\u0baf\u0bbe \u0bb9\u0bc6\u0bb0\u0bcd\u0bb8\u0bbf\u0b95\u0bcb\u0bb5\u0bbf\u0ba9\u0bbe" }
+        BB { "\u0baa\u0bbe\u0bb0\u0bcd\u0baa\u0b9f\u0bcb\u0bb8\u0bcd" }
+        BD { "\u0baa\u0b99\u0bcd\u0b95\u0bb3\u0bbe\u0ba4\u0bc7\u0bb7\u0bcd" }
+        BE { "\u0baa\u0bc6\u0bb2\u0bcd\u0b9c\u0bbf\u0baf\u0bae\u0bcd" }
+        BF { "\u0baa\u0bb0\u0bcd\u0b95\u0bbf\u0ba9\u0bcb \u0baa\u0bbe\u0bb8\u0bcb" }
+        BG { "\u0baa\u0bb2\u0bcd\u0b95\u0bc7\u0bb0\u0bbf\u0baf\u0bbe" }
+        BH { "\u0baa\u0bb9\u0bcd\u0bb0\u0bc8\u0ba9\u0bcd" }
+        BI { "\u0baa\u0bc1\u0bb0\u0bc1\u0ba3\u0bcd\u0b9f\u0bbf" }
+        BJ { "\u0baa\u0bc6\u0ba9\u0bbf\u0ba9\u0bcd" }
+        BN { "\u0baa\u0bc1\u0bb0\u0bc2\u0ba9\u0bc7\u0baf\u0bcd" }
+        BO { "\u0baa\u0bca\u0bb2\u0bbf\u0bb5\u0bbf\u0baf\u0bbe" }
+        BR { "\u0baa\u0bbf\u0bb0\u0bc7\u0bb8\u0bbf\u0bb2\u0bcd" }
+        BS { "\u0baa\u0bb9\u0bbe\u0bae\u0bbe\u0bb8\u0bcd" }
+        BT { "\u0baa\u0bc2\u0b9f\u0bbe\u0ba9\u0bcd" }
+        BW { "\u0baa\u0bcb\u0b9f\u0bcd\u0bb8\u0bcd\u0bb5\u0bbe\u0ba9\u0bbe" }
+        BY { "\u0baa\u0bc6\u0bb2\u0bbe\u0bb0\u0bc2\u0bb8\u0bcd" }
+        BZ { "\u0baa\u0bc6\u0bb2\u0bbf\u0bb8\u0bcd" }
+
+        CA { "\u0b95\u0ba9\u0b9f\u0bbe" }
+        CF { "\u0bae\u0ba4\u0bcd\u0ba4\u0bbf\u0baf \u0b86\u0baa\u0bcd\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0b95\u0bcd \u0b95\u0bc1\u0b9f\u0bbf\u0baf\u0bb0\u0b9a\u0bc1" }
+        CG { "\u0b95\u0bbe\u0b99\u0bcd\u0b95\u0bcb" }
+        CH { "\u0bb8\u0bcd\u0bb5\u0bbf\u0b9f\u0bcd\u0b9a\u0bb0\u0bcd\u0bb2\u0bbe\u0ba8\u0bcd\u0ba4\u0bc1" }
+        CI { "\u0b90\u0bb5\u0bb0\u0bbf \u0b95\u0bcb\u0bb8\u0bcd\u0b9f\u0bcd" }
+        CL { "\u0b9a\u0bbf\u0bb2\u0bbf" }
+        CM { "\u0b95\u0bc7\u0bae\u0bb0\u0bc2\u0ba9\u0bcd" }
+        CN { "\u0b9a\u0bc0\u0ba9" }
+        CO { "\u0b95\u0bca\u0bb2\u0bae\u0bcd\u0baa\u0bbf\u0baf\u0bbe" }
+        CR { "\u0b95\u0bcb\u0bb8\u0bcd\u0b9f\u0bbe\u0bb0\u0bbf\u0b95\u0bbe" }
+        CU { "\u0b95\u0bbf\u0baf\u0bc2\u0baa\u0bbe" }
+        CV { "\u0b95\u0bc7\u0baa\u0bcd \u0bb5\u0bc6\u0bb0\u0bcd\u0b9f\u0bc7" }
+        CY { "\u0b9a\u0bc8\u0baa\u0bcd\u0bb0\u0bb8\u0bcd" }
+        CZ { "\u0b9a\u0bc6\u0b95\u0bcd \u0b95\u0bc1\u0b9f\u0bbf\u0baf\u0bb0\u0b9a\u0bc1" }
+
+        DE { "\u0b9c\u0bc6\u0bb0\u0bcd\u0bae\u0ba9\u0bcd" }
+        DJ { "\u0b9c\u0bbf\u0baa\u0bcc\u0b9f\u0bbf" }
+        DK { "\u0b9f\u0bc6\u0ba9\u0bcd\u0bae\u0bbe\u0bb0\u0bcd\u0b95\u0bcd" }
+        DM { "\u0b9f\u0bca\u0bae\u0bbf\u0ba9\u0bbf\u0b95\u0bbe" }
+        DO { "\u0b9f\u0bca\u0bae\u0bbf\u0ba9\u0bbf\u0b95\u0ba9\u0bcd \u0b95\u0bc1\u0b9f\u0bbf\u0baf\u0bb0\u0b9a\u0bc1" }
+        DZ { "\u0b85\u0bb2\u0bcd\u0b9c\u0bc0\u0bb0\u0bbf\u0baf\u0bbe" }
+
+        EC { "\u0b88\u0b95\u0bcd\u0bb5\u0b9f\u0bbe\u0bb0\u0bcd" }
+        EE { "\u0b8e\u0bb8\u0bcd\u0b9f\u0bcb\u0ba9\u0bbf\u0baf\u0bbe" }
+        EG { "\u0b8e\u0b95\u0bbf\u0baa\u0bcd\u0ba4\u0bc1" }
+        ES { "\u0bb8\u0bcd\u0baa\u0bc6\u0baf\u0bbf\u0ba9\u0bcd" }
+        ET { "\u0b8e\u0ba4\u0bbf\u0baf\u0bcb\u0baa\u0bcd\u0baa\u0bbf\u0baf\u0bbe" }
+
+        FI { "\u0baa\u0bbf\u0ba9\u0bcd\u0bb2\u0bbe\u0ba8\u0bcd\u0ba4\u0bc1" }
+        FJ { "\u0baa\u0bbf\u0b9c\u0bbf" }
+        FR { "\u0baa\u0bbf\u0bb0\u0bbe\u0ba9\u0bcd\u0bb8\u0bcd" }
+
+        GA { "\u0b95\u0bbe\u0baa\u0bcb\u0ba9\u0bcd" }
+        GB { "\u0baa\u0bbf\u0bb0\u0bbf\u0b9f\u0bbf\u0bb7\u0bcd \u0b95\u0bc2\u0b9f\u0bcd\u0b9f\u0bb0\u0b9a\u0bc1" }
+        GD { "\u0b95\u0bbf\u0bb0\u0ba9\u0bc6\u0b9f\u0bbe" }
+        GE { "\u0b9c\u0bbe\u0bb0\u0bcd\u0b9c\u0bbf\u0baf\u0bbe" }
+        GH { "\u0b95\u0bbe\u0ba9\u0bbe" }
+        GM { "\u0b95\u0bbe\u0bae\u0bcd\u0baa\u0bbf\u0baf\u0bbe" }
+        GN { "\u0b95\u0bbf\u0ba9\u0bbf" }
+        GQ { "\u0b88\u0b95\u0bcd\u0b95\u0bc1\u0bb5\u0bbf\u0b9f\u0bcb\u0bb0\u0bbf\u0baf\u0bb2\u0bcd \u0b95\u0bbf\u0ba9\u0bbf" }
+        GR { "\u0b95\u0bbf\u0bb0\u0bc0\u0bb8\u0bcd" }
+        GT { "\u0b95\u0bc1\u0bb5\u0bbe\u0ba4\u0bcd\u0ba4\u0bbe\u0bae\u0bbe\u0bb2\u0bbe" }
+        GW { "\u0b95\u0bbf\u0ba9\u0bbf-\u0baa\u0bbf\u0bb8\u0bcd\u0bb8\u0bbe\u0bb5\u0bcd" }
+        GY { "\u0b95\u0baf\u0bbe\u0ba9\u0bbe" }
+
+        HN { "\u0bb9\u0bbe\u0ba3\u0bcd\u0b9f\u0bc1\u0bb0\u0bbe\u0bb8\u0bcd" }
+        HR { "\u0b95\u0bc1\u0bb0\u0bcb\u0b9a\u0bbf\u0baf\u0bbe" }
+        HT { "\u0bb9\u0bc6\u0baf\u0bcd\u0ba4\u0bbf" }
+        HU { "\u0bb9\u0b99\u0bcd\u0b95\u0bc7\u0bb0\u0bbf" }
+
+        ID { "\u0b87\u0ba8\u0bcd\u0ba4\u0bcb\u0ba9\u0bc7\u0bb7\u0bbf\u0baf\u0bbe" }
+        IE { "\u0b85\u0baf\u0bb0\u0bcd\u0bb2\u0bbe\u0ba8\u0bcd\u0ba4\u0bc1" }
+        IL { "\u0b87\u0bb8\u0bcd\u0bb0\u0bc7\u0bb2\u0bcd" }
+        IN { "\u0b87\u0ba8\u0bcd\u0ba4\u0bbf\u0baf\u0bbe" } // Could be \u0baa\u0bbe\u0bb0\u0ba4 too
+        IQ { "\u0b87\u0bb0\u0bbe\u0b95\u0bcd" }
+        IR { "\u0b88\u0bb0\u0bbe\u0ba9\u0bcd" }
+        IS { "\u0b90\u0bb8\u0bcd\u0bb2\u0bbe\u0ba8\u0bcd\u0ba4\u0bc1" }
+        IT { "\u0b87\u0ba4\u0bcd\u0ba4\u0bbe\u0bb2\u0bbf" }
+
+        JM { "\u0b9c\u0bae\u0bbe\u0baf\u0bcd\u0b95\u0bcd\u0b95\u0bbe" }
+        JO { "\u0b9c\u0bca\u0bb0\u0bcd\u0b9f\u0bbe\u0ba9\u0bcd" }
+        JP { "\u0b9c\u0baa\u0bcd\u0baa\u0bbe\u0ba9\u0bcd" }
+
+        KE { "\u0b95\u0bc6\u0ba9\u0bcd\u0baf\u0bbe" }
+        KG { "\u0b95\u0bbf\u0bb0\u0bcd\u0b95\u0bbf\u0bb8\u0bcd\u0ba4\u0bbe\u0ba9\u0bcd" }
+        KH { "\u0b95\u0bae\u0bcd\u0baa\u0bcb\u0b9f\u0bbf\u0baf\u0bbe" }
+        KI { "\u0b95\u0bbf\u0bb0\u0bbf\u0baa\u0b9f\u0bbf" }
+        KM { "\u0b95\u0bcb\u0bae\u0bb0\u0bcb\u0bb8\u0bcd" }
+        //KN { "\u0bcd\u0b9a\u0bc6\u0ba3\u0bcd\u0b9f\u0bcd \u0b95\u0bbf\u0b9f\u0bcd\u0bb8\u0bcd \u0ba8\u0bc6\u0bb5\u0bbf\u0bb8\u0bcd" } // The first code unit seems to be in the wrong place
+        KP { "\u0bb5\u0b9f \u0b95\u0bca\u0bb0\u0bbf\u0baf\u0bbe" }
+        KR { "\u0ba4\u0bc6\u0ba9\u0bcd \u0b95\u0bca\u0bb0\u0bbf\u0baf\u0bbe" }
+        KW { "\u0b95\u0bc1\u0bb5\u0bc8\u0ba4\u0bcd\u0ba4\u0bc1" }
+        KZ { "\u0b95\u0b9c\u0b95\u0bb8\u0bcd\u0ba4\u0bbe\u0ba9\u0bcd" }
+
+        LA { "\u0bb2\u0bbe\u0bb5\u0bcb\u0bb8\u0bcd" }
+        LB { "\u0bb2\u0bc6\u0baa\u0ba9\u0bbe\u0ba9\u0bcd" }
+        //LC { "\u0bcd\u0b9a\u0bc6\u0ba3\u0bcd\u0b9f\u0bcd \u0bb2\u0bc2\u0b9a\u0bbf\u0baf\u0bbe" } // The first code unit seems to be in the wrong place
+        LI { "\u0bb2\u0bbf\u0b9a\u0bcd\u0b9f\u0bc6\u0ba3\u0bcd\u0bb8\u0bcd\u0b9f\u0bc0\u0ba9\u0bcd" }
+        LK { "\u0b87\u0bb2\u0b99\u0bcd\u0b95\u0bc8" }
+        LR { "\u0bb2\u0bc8\u0baa\u0bc0\u0bb0\u0bbf\u0baf\u0bbe" }
+        LS { "\u0bb2\u0bc6\u0b9a\u0bcb\u0ba4\u0bcb" }
+        LT { "\u0bb2\u0bbf\u0ba4\u0bc1\u0bb5\u0bc7\u0ba9\u0bbf\u0baf\u0bbe" }
+        LU { "\u0bb2\u0b95\u0bcd\u0bb8\u0bcd\u0b9a\u0bae\u0bcd\u0baa\u0bb0\u0bcd\u0b95\u0bcd" }
+        LV { "\u0bb2\u0bbe\u0b9f\u0bcd\u0bb5\u0bbf\u0baf\u0bbe" }
+        LY { "\u0bb2\u0bbf\u0baa\u0bcd\u0baf\u0bbe" }
+
+        MA { "\u0bae\u0bca\u0bb0\u0bcb\u0b95\u0bcd\u0b95\u0bcb" }
+        MC { "\u0bae\u0bca\u0ba9\u0bbe\u0b95\u0bcd\u0b95\u0bcb" }
+        MD { "\u0bae\u0bbe\u0bb2\u0bcd\u0b9f\u0bcb\u0bb5\u0bbe" }
+        MK { "\u0bae\u0b9a\u0bc6\u0b9f\u0bcb\u0ba3\u0bbf\u0baf\u0bbe" }
+        ML { "\u0bae\u0bbe\u0bb2\u0bc0" }
+        MM { "\u0bae\u0bbf\u0baf\u0bbe\u0ba9\u0bcd\u0bae\u0bbe\u0bb0\u0bcd" }
+        MN { "\u0bae\u0b99\u0bcd\u0b95\u0bcb\u0bb2\u0bbf\u0baf\u0bbe" }
+        MT { "\u0bae\u0bbe\u0bb2\u0bcd\u0b9f\u0bbe" }
+        MV { "\u0bae\u0bbe\u0bb2\u0ba4\u0bcd\u0ba4\u0bc0\u0bb5\u0bc1" }
+        MW { "\u0bae\u0bb2\u0bbe\u0bb5\u0bc0" }
+        MX { "\u0bae\u0bc6\u0b95\u0bcd\u0b9a\u0bbf\u0b95\u0bcb" }
+        MY { "\u0bae\u0bb2\u0bc7\u0bb7\u0bbf\u0baf\u0bbe" }
+
+        NA { "\u0ba9\u0bbe\u0bae\u0bc0\u0baa\u0bbf\u0baf\u0bbe" }
+        NI { "\u0ba8\u0bbf\u0b95\u0bbe\u0bb0\u0bbe\u0b95\u0bc1\u0bb5\u0bbe" }
+        NL { "\u0ba8\u0bc6\u0ba4\u0bb0\u0bcd\u0bb2\u0bbe\u0ba8\u0bcd\u0ba4\u0bc1" }
+        NO { "\u0ba8\u0bbe\u0bb0\u0bcd\u0bb5\u0bc7" }
+        NP { "\u0ba8\u0bc7\u0baa\u0bbe\u0bb3\u0bae\u0bcd" }
+        NR { "\u0ba8\u0bcc\u0bb0\u0bc1" }
+        NZ { "\u0ba8\u0bbf\u0baf\u0bc2\u0b9a\u0bbf\u0bb2\u0bbe\u0ba8\u0bcd\u0ba4\u0bc1" }
+
+        OM { "\u0b93\u0bae\u0bbe\u0ba9\u0bcd" }
+
+        PA { "\u0baa\u0ba3\u0bbe\u0bae\u0bbe" }
+        PE { "\u0baa\u0bc6\u0bb0\u0bc1" }
+        PG { "\u0baa\u0bbe\u0baa\u0bcd\u0baa\u0bc1\u0bb5\u0bbe-\u0ba8\u0bbf\u0baf\u0bc2\u0b95\u0bbf\u0ba9\u0bbf" }
+        PH { "\u0baa\u0bbf\u0bb2\u0bbf\u0baa\u0bcd\u0baa\u0bc8\u0ba9\u0bcd\u0bb8\u0bcd" }
+        PK { "\u0baa\u0bbe\u0b95\u0bbf\u0bb8\u0bcd\u0ba4\u0bbe\u0ba9\u0bcd" }
+        PL { "\u0baa\u0bcb\u0bb2\u0ba8\u0bcd\u0ba4\u0bc1" }
+        PT { "\u0baa\u0bcb\u0bb0\u0bcd\u0b9a\u0bcd\u0b9a\u0bc1\u0b95\u0bcd\u0b95\u0bb2\u0bcd" }
+        PY { "\u0baa\u0bbe\u0bb0\u0b95\u0bc1\u0bb5\u0bc7" }
+
+        QA { "\u0b95\u0bbe\u0b9f\u0bbe\u0bb0\u0bcd" }
+
+        RO { "\u0bb0\u0bc1\u0bae\u0bc7\u0ba9\u0bbf\u0baf\u0bbe" }
+        RU { "\u0bb0\u0bb7\u0bcd\u0baf\u0bbe" }
+
+        SA { "\u0b9a\u0bb5\u0bc2\u0ba4\u0bbf \u0b85\u0bb0\u0bc7\u0baa\u0bbf\u0baf\u0bbe" }
+        SB { "\u0b9a\u0bbe\u0bb2\u0bae\u0ba9\u0bcd \u0ba4\u0bc0\u0bb5\u0bc1\u0b95\u0bb3\u0bcd" }
+        SE { "\u0bb8\u0bcd\u0bb5\u0bc0\u0b9f\u0ba9\u0bcd" }
+        SG { "\u0b9a\u0bbf\u0b99\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0bc2\u0bb0\u0bcd" }
+        SI { "\u0bb8\u0bcd\u0bb2\u0bcb\u0bb5\u0bc7\u0ba9\u0bbf\u0baf\u0bbe" }
+        SK { "\u0bb8\u0bcd\u0bb2\u0bcb\u0bb5\u0bbe\u0b95\u0bbf\u0baf\u0bbe" }
+        SM { "\u0b9a\u0bbe\u0ba9\u0bcd\u0bae\u0bc6\u0bb0\u0bbf\u0ba9\u0bcb" }
+        SR { "\u0b9a\u0bc2\u0bb0\u0bbf\u0ba9\u0bbe\u0bae\u0bcd" }
+        SV { "\u0b8e\u0bb2\u0bcd \u0b9a\u0bbe\u0bb2\u0bcd\u0bb5\u0b9f\u0bbe\u0bb0\u0bcd" }
+        SY { "\u0b9a\u0bbf\u0bb0\u0bbf\u0baf\u0bbe" }
+
+        TD { "\u0b9a\u0bbe\u0b9f\u0bcd" }
+        TH { "\u0ba4\u0bbe\u0baf\u0bcd\u0bb2\u0bbe\u0ba8\u0bcd\u0ba4\u0bc1" }
+        TJ { "\u0ba4\u0bbe\u0b9c\u0bbf\u0b95\u0bbf\u0bb8\u0bcd\u0ba4\u0bbe\u0ba9\u0bcd" }
+        TM { "\u0ba4\u0bc1\u0bb0\u0bcd\u0b95\u0bcd\u0bae\u0bc6\u0ba9\u0bbf\u0bb8\u0bcd\u0ba4\u0bbe\u0ba9\u0bcd" }
+        TN { "\u0ba4\u0bc1\u0ba9\u0bbf\u0b9a\u0bbf\u0baf\u0bbe" }
+        TO { "\u0ba4\u0bca\u0b99\u0bcd\u0b95\u0bbe" }
+        TR { "\u0ba4\u0bc1\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bbf" }
+        TT { "\u0ba4\u0bbf\u0bb0\u0bbf\u0ba9\u0bbf\u0b9f\u0bbe\u0b9f\u0bcd \u0ba4\u0bca\u0baa\u0bbe\u0b95\u0bcb" }
+        TV { "\u0ba4\u0bc1\u0bb5\u0bbe\u0bb2\u0bc2" }
+        TW { "\u0ba4\u0bc8\u0bb5\u0bbe\u0ba9\u0bcd" }
+
+        UA { "\u0b89\u0b95\u0bcd\u0bb0\u0bc8\u0ba9\u0bcd" }
+        US { "\u0b90\u0b95\u0bcd\u0b95\u0bbf\u0baf \u0b85\u0bae\u0bc6\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bbe \u0b95\u0bc1\u0b9f\u0bbf\u0baf\u0bb0\u0b9a\u0bc1" }
+        UY { "\u0b89\u0bb0\u0bc1\u0b95\u0bc1\u0bb5\u0bc7" }
+        UZ { "\u0b89\u0bb8\u0bcd\u0baa\u0bc6\u0b95\u0bbf\u0bb8\u0bcd\u0ba4\u0bbe\u0ba9\u0bcd" }
+
+        VA { "\u0bb5\u0bbe\u0b9f\u0bbf\u0b95\u0ba9\u0bcd" }
+        //VC { "\u0bcd\u0b9a\u0bc6\u0ba3\u0bcd\u0b9f\u0bcd \u0bb5\u0bbf\u0ba3\u0bcd\u0b9a\u0bc6\u0ba3\u0bcd\u0b9f\u0bcd \u0b95\u0bbf\u0bb0\u0bc6\u0ba9\u0bc6\u0b9f\u0bc8\u0ba9\u0bcd\u0bb8\u0bcd" } // The first code unit seems to be in the wrong place
+        VE { "\u0bb5\u0bc6\u0ba9\u0b9c\u0bc1\u0bb5\u0bc7\u0bb2\u0bbe" }
+        VN { "\u0bb5\u0bbf\u0baf\u0b9f\u0bcd\u0ba8\u0bbe\u0bae\u0bcd" }
+        VU { "\u0bb5\u0ba9\u0bc1\u0bb5\u0bbe\u0b9f\u0bcd\u0b9f\u0bc1" }
+
+        WS { "\u0b9a\u0bae\u0bcb\u0bb5\u0bbe" }
+
+        YE { "\u0baf\u0bc7\u0bae\u0ba9\u0bcd" }
+
+        ZA { "\u0ba4\u0bc6\u0ba9\u0bcd \u0b86\u0baa\u0bcd\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bbe" }
+        ZW { "\u0b9c\u0bbf\u0bae\u0bcd\u0baa\u0bbe\u0baa\u0bcd\u0bb5\u0bc7" }
+    }
+    // Currency display names
+    Currencies {
+        INR { "\u0BB0\u0BC2", "INR" }
+    }
+    DayAbbreviations {
+        "\u0b9e\u0bbe",
+        "\u0ba4\u0bbf",
+        "\u0b9a\u0bc6",
+        "\u0baa\u0bc1",
+        "\u0bb5\u0bbf",
+        "\u0bb5\u0bc6",
+        "\u0b9a",
+    }
+    DayNames {
+        "\u0b9e\u0bbe\u0baf\u0bbf\u0bb1\u0bc1",
+        "\u0ba4\u0bbf\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
+        "\u0b9a\u0bc6\u0bb5\u0bcd\u0bb5\u0bbe\u0baf\u0bcd",
+        "\u0baa\u0bc1\u0ba4\u0ba9\u0bcd",
+        "\u0bb5\u0bbf\u0baf\u0bbe\u0bb4\u0ba9\u0bcd",
+        "\u0bb5\u0bc6\u0bb3\u0bcd\u0bb3\u0bbf",
+        "\u0b9a\u0ba9\u0bbf",
+    }
+    Eras {
+        "\u0b95\u0bbf\u0bae\u0bc1",
+        "\u0b95\u0bbf\u0baa\u0bbf",
+    }
     Languages {
         root { "\u0ba4\u0bae\u0bbf\u0bb4\u0bcd" }
 
@@ -16,17 +244,17 @@
         ab { "\u0b85\u0baa\u0bcd\u0b95\u0bbe\u0bb8\u0bbf\u0ba9\u0bcd" }
         af { "\u0b86\u0baa\u0bcd\u0bb0\u0bbf\u0b95\u0ba9\u0bcd\u0bb8\u0bcd" }
         am { "\u0b85\u0bae\u0bcd\u0bb9\u0bbe\u0bb0\u0bbf\u0b95\u0bcd" }
-        ar { "\u0b85\u0bb0\u0baa\u0bbf\u0b95\u0bcd" }
-        as { "\u0b85\u0bb8\u0bbe\u0bae\u0bc0\u0bb8\u0bcd" }
+        ar { "\u0b85\u0bb0\u0baa\u0bc1" }
+        as { "\u0b85\u0bb8\u0bcd\u0bb8\u0bbe\u0bae\u0bbf" }
         ay { "\u0b85\u0baf\u0bae\u0bb0\u0bbe" }
         az { "\u0b85\u0b9a\u0bb0\u0bcd\u0baa\u0bbe\u0baf\u0bcd\u0b9c\u0bbe\u0ba9\u0bbf" }
         ba { "\u0baa\u0bbe\u0bb7\u0bcd\u0b95\u0bbf\u0bb0\u0bcd0" }
         be { "\u0baa\u0bc8\u0bb2\u0bcb\u0bb0\u0bc1\u0bb7\u0bcd\u0ba9\u0bcd" }
-        bg { "\u0baa\u0bb2\u0bcd\u0b95\u0bc6\u0bb0\u0bbf\u0baf\u0ba9\u0bcd" }
+        bg { "\u0baa\u0bb2\u0bcd\u0b95\u0bc7\u0bb0\u0bbf\u0baf\u0ba9\u0bcd" }
         bh { "\u0baa\u0bbf\u0bb9\u0bbe\u0bb0\u0bbf" }
         bi { "\u0baa\u0bbf\u0bb8\u0bcd\u0bb2\u0bbe\u0bae\u0bbe" }
-        bn { "\u0baa\u0bc6\u0b99\u0bcd\u0b95\u0bbe\u0bb2\u0bbf" }
-        bo { "\u0ba4\u0bbf\u0baa\u0bc6\u0ba4\u0bcd\u0ba4\u0bbf\u0baf\u0ba9\u0bcd" }
+        bn { "\u0bb5\u0b99\u0bcd\u0b95\u0bbe\u0bb3\u0bae\u0bcd" }
+        bo { "\u0ba4\u0bbf\u0baa\u0bc6\u0ba4\u0bcd\u0ba4\u0bc1" }
         br { "\u0baa\u0bbf\u0bb0\u0bbf\u0b9f\u0ba9\u0bcd" }
         ca { "\u0b95\u0bbe\u0b9f\u0bb2\u0bbe\u0ba9\u0bcd" }
         co { "\u0b95\u0bbe\u0bb0\u0bcd\u0b9a\u0bbf\u0baf\u0ba9\u0bcd" }
@@ -35,17 +263,17 @@
         da { "\u0b9f\u0bbe\u0ba9\u0bbf\u0bb7\u0bcd" }
         de { "\u0b9c\u0bc6\u0bb0\u0bcd\u0bae\u0ba9\u0bcd" }
         dz { "\u0baa\u0bc1\u0b9f\u0bbe\u0ba9\u0bbf" }
-        el { "\u0b95\u0bbf\u0bb0\u0bbf\u0b95\u0bcd" }
+        el { "\u0b95\u0bbf\u0bb0\u0bc7\u0b95\u0bcd\u0b95\u0bae\u0bcd" }
         en { "\u0b86\u0b99\u0bcd\u0b95\u0bbf\u0bb2\u0bae\u0bcd" }
         eo { "\u0b8e\u0bb8\u0bcd\u0baa\u0bb0\u0bc7\u0ba9\u0bcd\u0b9f\u0bcb" }
         es { "\u0bb8\u0bcd\u0baa\u0bc7\u0ba9\u0bbf\u0bb7\u0bcd" }
         et { "\u0b8e\u0bb8\u0bcd\u0b9f\u0bcb\u0ba9\u0bbf\u0baf\u0ba9\u0bcd" }
         eu { "\u0baa\u0bb8\u0bcd\u0b95\u0bcd" }
         fa { "\u0baa\u0bb0\u0bcd\u0bb8\u0bbf\u0baf\u0ba9\u0bcd" }
-        fi { "\u0baa\u0bbf\u0ba9\u0bcd\u0bb7\u0bcd" }
+        fi { "\u0baa\u0bbf\u0ba9\u0bcd\u0ba9\u0bbf\u0bb7\u0bcd" }
         fj { "\u0baa\u0bbf\u0b9c\u0bbf" }
         fo { "\u0baa\u0bc8\u0bb0\u0bcb\u0bb8\u0bbf" }
-        fr { "\u0baa\u0bbf\u0bb0\u0ba9\u0bcd\u0b9a\u0bcd" }
+        fr { "\u0baa\u0bbf\u0bb0\u0bc6\u0b9e\u0bcd\u0b9a\u0bc1" }
         fy { "\u0baa\u0bbf\u0bb0\u0bbf\u0bb7\u0bbf\u0baf\u0ba9\u0bcd" }
         ga { "\u0b90\u0bb0\u0bbf\u0bb7\u0bcd" }
         gd { "\u0bb8\u0bcd\u0b95\u0bbe\u0b9f\u0bcd\u0bb8\u0bcd \u0b95\u0bbe\u0bb2\u0bc6\u0b95\u0bcd" }
@@ -65,16 +293,16 @@
         is { "\u0b90\u0bb8\u0bcd\u0bb2\u0bc6\u0ba9\u0bcd\u0b9f\u0bbf\u0b95\u0bcd" }
         it { "\u0b87\u0ba4\u0bcd\u0ba4\u0bbe\u0bb2\u0bbf\u0baf\u0ba9\u0bcd" }
         iu { "\u0b87\u0ba9\u0bc1\u0b95\u0bbf\u0b9f\u0b9f\u0bcd" }
-        ja { "\u0b9c\u0bbe\u0baa\u0ba9\u0bc0\u0bb8\u0bcd" }
+        ja { "\u0b9c\u0baa\u0bcd\u0baa\u0bbe\u0ba9\u0bc0\u0bb8\u0bcd" }
         jv { "\u0b9c\u0bbe\u0bb5\u0bbe\u0ba9\u0bc0\u0bb8\u0bcd" }
         //jw { "\u0b9c\u0bbe\u0bb5\u0bbe\u0ba9\u0bc0\u0bb8\u0bcd" } // Use jv instead
-        ka { "\u0b9c\u0bbe\u0bb0\u0bcd\u0b9c\u0bbf\u0baf\u0ba9\u0bcd" }
+        ka { "\u0b95\u0ba9\u0bcd\u0ba9\u0b9f\u0bae\u0bcd" }
         kk { "\u0b95\u0b9a\u0bbe\u0b95\u0bcd" }
         kl { "\u0b95\u0bbf\u0bb0\u0bbf\u0ba9\u0bcd\u0bb2\u0bc6\u0ba9\u0bcd\u0b9f\u0bbf\u0b95\u0bcd" }
         km { "\u0b95\u0bae\u0bcd\u0baa\u0bcb\u0b9f\u0bbf\u0baf\u0ba9\u0bcd" }
         kn { "\u0b95\u0ba9\u0bcd\u0ba9\u0b9f\u0bbe" }
         ko { "\u0b95\u0bca\u0bb0\u0bbf\u0baf\u0ba9\u0bcd" }
-        kok { "\u0b95\u0bcb\u0b99\u0bcd\u0b95\u0bcd\u0b95\u0ba9\u0bbf" }
+        kok { "\u0b95\u0bca\u0b99\u0bcd\u0b95\u0ba9\u0bbf" }
         ks { "\u0b95\u0bbe\u0bb7\u0bcd\u0bae\u0bbf\u0bb0\u0bbf" }
         ku { "\u0b95\u0bc1\u0bb0\u0bcd\u0ba4\u0bbf\u0bb7\u0bcd" }
         ky { "\u0b95\u0bbf\u0bb0\u0bcd\u0b95\u0bbf\u0bb7\u0bcd" }
@@ -86,7 +314,7 @@
         mg { "\u0bae\u0bb2\u0b95\u0bc6\u0bb8\u0bbf" }
         mi { "\u0bae\u0bcb\u0bb0\u0bbf" }
         mk { "\u0bae\u0bc6\u0b95\u0bcd\u0b95\u0b9f\u0bcb\u0ba9\u0bbf\u0baf\u0ba9\u0bcd" }
-        ml { "\u0bae\u0bb2\u0baf\u0bbe\u0bb4\u0bae\u0bcd" }
+        ml { "\u0bae\u0bb2\u0bc8\u0baf\u0bbe\u0bb3\u0bae\u0bcd" }
         mn { "\u0bae\u0b99\u0bcd\u0b95\u0bcb\u0bb2\u0bbf\u0baf\u0ba9\u0bcd" }
         mo { "\u0bae\u0bcb\u0bb2\u0bcd\u0b9f\u0bc7\u0bb5\u0bbf\u0baf\u0ba9\u0bcd" }
         mr { "\u0bae\u0bb0\u0bbe\u0ba4\u0bcd\u0ba4\u0bbf" }
@@ -95,7 +323,7 @@
         my { "\u0baa\u0bb0\u0bcd\u0bae\u0bbf\u0bb8\u0bcd" }
         na { "\u0ba8\u0bbe\u0bb0\u0bc2" }
         ne { "\u0ba8\u0bc7\u0baa\u0bcd\u0baa\u0bbe\u0bb2\u0bbf" }
-        nl { "\u0b9f\u0b9a\u0bcd" }
+        nl { "\u0b9f\u0b9a\u0bcd\u0b9a\u0bc1" }
         no { "\u0ba8\u0bbe\u0bb0\u0bcd\u0bb5\u0bc7\u0b95\u0bbf\u0baf\u0ba9\u0bcd" }
         oc { "\u0b86\u0b95\u0bbf\u0b9f\u0bbf\u0baf\u0ba9\u0bcd" }
         om { "\u0b92\u0bb0\u0bcb\u0bae (\u0b85\u0baa\u0ba9\u0bcd)" }
@@ -103,18 +331,18 @@
         pa { "\u0baa\u0b9e\u0bcd\u0b9a\u0bbe\u0baa\u0bbf" }
         pl { "\u0baa\u0bcb\u0bb2\u0bbf\u0bb7\u0bcd" }
         ps { "\u0baa\u0bc7\u0bb7\u0bcd\u0b9f\u0bcb (\u0baa\u0bc1\u0bb7\u0bcd\u0b9f\u0bcb)" }
-        pt { "\u0baa\u0bcb\u0bb0\u0bcd\u0b9a\u0bcd\u0b9a\u0bbf\u0b95\u0bc0\u0bb8\u0bcd" }
-        qu { "\u0b95\u0bbf\u0baf\u0bc1\u0b9a\u0bbeQuechua" }
+        pt { "\u0baa\u0bcb\u0bb0\u0bcd\u0ba4\u0bcd\u0ba4\u0bc1\u0b95\u0bc0\u0bb8\u0bcd" }
+        qu { "\u0b95\u0bbf\u0baf\u0bc1\u0b9a\u0bbe" }
         rm { "\u0bb0\u0bc8\u0b9f\u0bcd\u0b9f\u0bcb-\u0bb0\u0bcb\u0bae\u0bc6\u0ba9\u0bcd\u0bb8\u0bcd" }
         rn { "\u0b95\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bbf" }
         ro { "\u0bb0\u0bcb\u0bae\u0bc7\u0ba9\u0bbf\u0baf\u0ba9\u0bcd" }
         ru { "\u0bb0\u0bb7\u0bbf\u0baf\u0ba9\u0bcd" }
         rw { "\u0b95\u0bbf\u0ba9\u0bcd\u0baf\u0bb0\u0bcd\u0bb5\u0bc6\u0ba9\u0bcd\u0b9f\u0bbe" }
-        sa { "\u0b9a\u0bae\u0bb8\u0bcd\u0b95\u0bbf\u0bb0\u0bbf\u0ba4\u0bae\u0bcd" }
+        sa { "\u0b9a\u0bae\u0bb8\u0bcd\u0b95\u0bbf\u0bb0\u0bc1\u0ba4\u0bae\u0bcd" }
         sd { "\u0b9a\u0bbf\u0ba8\u0bcd\u0ba4\u0bbf" }
         sg { "\u0b9a\u0bc6\u0ba9\u0bcd\u0b95\u0bcd\u0bb0\u0bcb" }
         sh { "\u0b9a\u0bc6\u0bb0\u0bcd\u0baa\u0bcb-\u0b95\u0bcd\u0bb0\u0bcb\u0bb7\u0bbf\u0baf\u0ba9\u0bcd" }
-        si { "\u0b9a\u0bbf\u0b99\u0bcd\u0b95\u0bb3\u0bbf\u0bb8\u0bcd" }
+        si { "\u0b9a\u0bbf\u0b99\u0bcd\u0b95\u0bb3\u0bae\u0bcd" }
         sk { "\u0bb8\u0bcd\u0bb2\u0bcb\u0bb5\u0bc6\u0b95\u0bcd" }
         sl { "\u0bb8\u0bcd\u0bb2\u0bcb\u0bb5\u0bbf\u0ba9\u0bc7\u0baf\u0bbf\u0ba9\u0bcd" }
         sm { "\u0bb8\u0bc6\u0bae\u0bcb\u0ba9\u0bcd" }
@@ -126,7 +354,7 @@
         st { "\u0bb7\u0bc6\u0bb8\u0bcd\u0bb8\u0bcb\u0ba4\u0bcb" }
         su { "\u0b9a\u0bc1\u0b9f\u0bbe\u0ba9\u0bc0\u0bb8\u0bcd" }
         sv { "\u0bb7\u0bc0\u0bb5\u0bbf\u0b9f\u0bbf\u0bb8\u0bcd" }
-        sw { "\u0bb8\u0bcd\u0bb5\u0bc6\u0bb9\u0bbf\u0bb2\u0bbf" }
+        sw { "\u0b9a\u0bc1\u0bb5\u0bbe\u0bb9\u0bbf\u0bb2\u0bbf" }
         ta { "\u0ba4\u0bae\u0bbf\u0bb4\u0bcd" }
         te { "\u0ba4\u0bc6\u0bb2\u0bc1\u0b99\u0bcd\u0b95\u0bc1" }
         tg { "\u0ba4\u0bbe\u0b9c\u0bbf\u0b95\u0bcd" }
@@ -145,22 +373,18 @@
         ur { "\u0b89\u0bb0\u0bc1\u0ba4\u0bc1" }
         uz { "\u0b89\u0bb8\u0bcd\u0baa\u0bc6\u0b95\u0bcd" }
         vi { "\u0bb5\u0bbf\u0baf\u0b9f\u0bcd\u0ba8\u0bbe\u0bae\u0bbf\u0bb8\u0bcd" }
-        vo { "\u0b92\u0bb2\u0baa\u0bc1\u0b95\u0bcdVolapuk" }
-        wo { "\u0b92\u0bb2\u0bcb\u0baa\u0bcdWolof" }
-        xh { "\u0bb9\u0bcb\u0bb7\u0bbeXhosa" }
+        vo { "\u0b92\u0bb2\u0baa\u0bc1\u0b95\u0bcd" }
+        wo { "\u0b92\u0bb2\u0bcb\u0baa\u0bcd" }
+        xh { "\u0bb9\u0bcb\u0bb7\u0bbe" }
         yi { "\u0b88\u0ba4\u0bcd\u0ba4\u0bbf\u0bb7" }
         yo { "\u0baf\u0bcb\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0bbe" }
         za { "\u0b9c\u0bc1\u0bb5\u0bbe\u0b99\u0bcd" }
-        zh { "\u0b9a\u0baf\u0ba9\u0bc0\u0bb8\u0bcd" }
+        zh { "\u0b9a\u0bc0\u0ba9\u0bae\u0bcd" }
         zu { "\u0b9c\u0bc2\u0bb2\u0bc2" }
     }
-
-    Countries {
-        IN { "\u0b87\u0ba8\u0bcd\u0ba4\u0bbf\u0baf\u0bbe" }
-    }
     MonthNames {
         "\u0b9c\u0ba9\u0bb5\u0bb0\u0bbf",
-        "\u0baa\u0bc6\u0baa\u0bcd\u0bb0\u0bb5\u0bb0\u0bbf",
+        "\u0baa\u0bbf\u0baa\u0bcd\u0bb0\u0bb5\u0bb0\u0bbf",
         "\u0bae\u0bbe\u0bb0\u0bcd\u0b9a\u0bcd",
         "\u0b8f\u0baa\u0bcd\u0bb0\u0bb2\u0bcd",
         "\u0bae\u0bc7",
@@ -172,9 +396,13 @@
         "\u0ba8\u0bb5\u0bae\u0bcd\u0baa\u0bb0\u0bcd",
         "\u0b9f\u0bbf\u0b9a\u0bae\u0bcd\u0baa\u0bb0\u0bcd",
     }
+    LocaleScript:array {
+        "Taml"   // ISO 15924 Name 
+    }
+    ExemplarCharacters{"[[:Taml:]\u200c\u200d]"}
     MonthAbbreviations {
         "\u0b9c\u0ba9.",
-        "\u0baa\u0bc6\u0baa\u0bcd.",
+        "\u0baa\u0bbf\u0baa\u0bcd.",
         "\u0bae\u0bbe\u0bb0\u0bcd.",
         "\u0b8f\u0baa\u0bcd.",
         "\u0bae\u0bc7",
@@ -186,36 +414,6 @@
         "\u0ba8\u0bb5.",
         "\u0b9f\u0bbf\u0b9a.",
     }
-    DayNames {
-        "\u0b9e\u0bbe\u0baf\u0bbf\u0bb1\u0bc1",
-        "\u0ba4\u0bbf\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-        "\u0b9a\u0bc6\u0bb5\u0bcd\u0bb5\u0bbe\u0baf\u0bcd",
-        "\u0baa\u0bc1\u0ba4\u0ba9\u0bcd",
-        "\u0bb5\u0bbf\u0baf\u0bbe\u0bb4\u0ba9\u0bcd",
-        "\u0bb5\u0bc6\u0bb3\u0bcd\u0bb3\u0bbf",
-        "\u0b9a\u0ba9\u0bbf",
-    }
-    DayAbbreviations
-    {
-        "\u0b9e\u0bbe",
-        "\u0ba4\u0bbf",
-        "\u0b9a\u0bc6",
-        "\u0baa\u0bc1",
-        "\u0bb5\u0bbf",
-        "\u0bb5\u0bc6",
-        "\u0b9a",
-    }
-
-    AmPmMarkers {
-        "\u0b95\u0bbe\u0bb2\u0bc8",
-        "\u0bae\u0bbe\u0bb2\u0bc8"
-    }
-
-    Eras {
-        "\u0b95\u0bbf\u0bae\u0bc1",
-        "\u0b95\u0bbf\u0baa\u0bbf",
-    }
-
 //    NumberElements {
 //        ".",
 //        ",",
@@ -229,14 +427,12 @@
 //        "\u221e",
 //        "\ufffd"
 //    }
-
     NumberPatterns {
         "#,##,##0.###;-#,##,##0.###",
         "\u00A4 #,##,##0.00;-\u00A4 #,##,##0.00",
         "#,##,##0%",
         "#E0",
     }
-
     zoneStrings {
         {
             "Asia/Calcutta",
@@ -246,20 +442,4 @@
             "IST"
         }
     }
-
-    CollationElements {
-        Version { "1.0" }
-        Sequence { "[normalization on]" }
-    }
-    LocaleID:int { 0x49 }
-    LocaleScript:array {
-        "Taml"   // ISO 15924 Name 
-    }
-    ExemplarCharacters{"[[:Taml:]\u200c\u200d]"}
-
-    // Currency display names
-    Currencies {
-        INR { "\u0BB0\u0BC2", "INR" }
-    }
 }
-

Index: ta_IN.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ta_IN.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ta_IN.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ ta_IN.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -9,16 +9,12 @@
 
 ta_IN {
     Version { "2.0" }
-    LocaleID:int { 0x449 }
-//    ShortCountry { IND }
-
     NumberPatterns {
         "##,##,##0.###;-##,##,##0.###",
         "\u00A4 ##,##,##0.00;-\u00A4 ##,##,##0.00",
         "##,##,##0%",
         "#E0",
     }
-//    LocaleString { "ta_IN" }
     DateTimePatterns {
         "h:mm:ss a z",
         "h:mm:ss a z",

Index: te.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/te.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- te.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ te.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -9,11 +9,22 @@
 
 te {
     Version{ "2.0" }
+    AmPmMarkers {
+        "\u0c2a\u0c42\u0c30\u0c4d\u0c35\u0c3e\u0c39\u0c4d\u0c28",
+        "\u0c05\u0c2a\u0c30\u0c3e\u0c39\u0c4d\u0c28",
+    }
+    collations {
+        standard {
+            Version { "1.0" }
+            Sequence { "[normalization on]" }
+        }
+    }
     Countries {
-        IN { "\u0c2d\u0c3e\u0c30\u0c24 \u0c26\u0c46\u0c33\u0c66" }
+        IN { "\u0c2d\u0c3e\u0c30\u0c24 \u0c26\u0c47\u0c33\u0c66" }
     }
-    Languages {
-        te { "\u0c24\u0c46\u0c32\u0c41\u0c17\u0c41" }
+    // Currency display names
+    Currencies {
+        INR { "\u0C30\u0C42.", "INR" }
     }
     DayAbbreviations {
         "\u0c06\u0c26\u0c3f",
@@ -33,6 +44,13 @@
         "\u0c36\u0c41\u0c15\u0c4d\u0c30\u0c35\u0c3e\u0c30\u0c02",
         "\u0c36\u0c28\u0c3f\u0c35\u0c3e\u0c30\u0c02",
     }
+    ExemplarCharacters{"[[:Telu:]\u200c\u200d]"}
+    LocaleScript{ 
+        "Telu",  // ISO 15924 Name 
+    }
+    Languages {
+        te { "\u0c24\u0c46\u0c32\u0c41\u0c17\u0c41" }
+    }
     MonthAbbreviations {
         "\u0c1c\u0c28\u0c35\u0c30\u0c3f",
         "\u0c2b\u0c3f\u0c2c\u0c4d\u0c30\u0c35\u0c30\u0c3f",
@@ -61,36 +79,23 @@
         "\u0c28\u0c35\u0c02\u0c2c\u0c30\u0c4d",
         "\u0c21\u0c3f\u0c38\u0c46\u0c02\u0c2c\u0c30\u0c4d",
     }
-
-//    NumberElements {
-//        ".",
-//        ",",
-//        ";",
-//        "%",
-//        "0",
-//        "#",
-//        "-",
-//        "E",
-//        "\u2030",
-//        "\u221e",
-//        "\ufffd",
-//    }
-    LocaleID:int { 0x4a }
-    CollationElements {
-        Version { "1.0" }
-        Sequence { "[normalization on]" }
-    }
-    LocaleScript{ 
-        "Telu",  // ISO 15924 Name 
+    NumberElements {
+        ".",
+        ",",
+        ";",
+        "%",
+        "\u0C66",
+        "#",
+        "-",
+        "E",
+        "\u2030",
+        "\u221E",
+        "\uFFFD",
+        ".",
+        "+",
     }
-    ExemplarCharacters{"[[:Telu:]\u200c\u200d]"}
     // /**************** Info Below is needed ****************/
     // Eras{}
     // localPatternChars{}
     //
-
-    // Currency display names
-    Currencies {
-        INR { "\u0C30\u0C42.", "INR" }
-    }
 }

Index: te_IN.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/te_IN.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- te_IN.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ te_IN.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -9,10 +9,6 @@
 
 te_IN {
     Version{ "2.0" }
-    AmPmMarkers {
-        "\u0c2a\u0c42\u0c30\u0c4d\u0c35\u0c3e\u0c39\u0c4d\u0c28",
-        "\u0c05\u0c2a\u0c30\u0c3e\u0c39\u0c4d\u0c28",
-    }
     DateTimePatterns {
         "h:mm:ss a z",
         "h:mm:ss a z",
@@ -33,12 +29,10 @@
         "##,##,##0%",
         "#E0",
     }
-//    ShortLanguage { "tel" }
     //PaperSize {
     //    Height { "297" }
     //    Width { "210" }
     //    Units { "mm" }
     //}
-    LocaleID:int { 0x44a }
 }
 

Index: th.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/th.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- th.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ th.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -12,145 +12,52 @@
     //
     // First put in all of the consonants, after Z
     //
-    CollationElements {
-        Version { "2.0" }
-        Sequence { "[normalization on]& Z "
-        "<\u0E01"                    //  KO KAI
-        "<\u0E02"                    //  KHO KHAI
-        "<\u0E03"                    //  KHO KHUAT
-        "<\u0E04"                    //  KHO KHWAI
-        "<\u0E05"                    //  KHO KHON
-        "<\u0E06"                    //  KHO RAKHANG
-        "<\u0E07"                    //  NGO NGU
-        "<\u0E08"                    //  CHO CHAN
-        "<\u0E09"                    //  CHO CHING
-        "<\u0E0A"                    //  CHO CHANG
-        "<\u0E0B"                    //  SO SO
-        "<\u0E0C"                    //  CHO CHOE
-        "<\u0E0D"                    //  YO YING
-        "<\u0E0E"                    //  DO CHADA
-        "<\u0E0F"                    //  TO PATAK
-        "<\u0E10"                    //  THO THAN
-        "<\u0E11"                    //  THO NANGMONTHO
-        "<\u0E12"                    //  THO PHUTHAO
-        "<\u0E13"                    //  NO NEN
-        "<\u0E14"                    //  DO DEK
-        "<\u0E15"                    //  TO TAO
-        "<\u0E16"                    //  THO THUNG
-        "<\u0E17"                    //  THO THAHAN
-        "<\u0E18"                    //  THO THONG
-        "<\u0E19"                    //  NO NU
-        "<\u0E1A"                    //  BO BAIMAI
-        "<\u0E1B"                    //  PO PLA
-        "<\u0E1C"                    //  PHO PHUNG
-        "<\u0E1D"                    //  FO FA
-        "<\u0E1E"                    //  PHO PHAN
-        "<\u0E1F"                    //  FO FAN
-        "<\u0E20"                    //  PHO SAMPHAO
-        "<\u0E21"                    //  MO MA
-        "<\u0E22"                    //  YO YAK
-        "<\u0E23"                    //  RO RUA
-        "<\u0E24"                    //  RU
-        "<\u0E24\u0E45"              //  See the comment below on LAKKHANGYAO
-        "<\u0E25"                    //  LO LING
-        "<\u0E26"                    //  LU
-        "<\u0E26\u0E45"              //  See the comment below on LAKKHANGYAO
-        "<\u0E27"                    //  WO WAEN
-        "<\u0E28"                    //  SO SALA
-        "<\u0E29"                    //  SO RUSI
-        "<\u0E2A"                    //  SO SUA
-        "<\u0E2B"                    //  HO HIP
-        "<\u0E2C"                    //  LO CHULA
-        "<\u0E2D"                    //  O ANG
-        "<\u0E2E"                    //  HO NOKHUK
-
-        //
-        // Normal vowels
-        //
-        "<\u0E30"                    //  SARA A
-        "<\u0E31"                    //  MAI HAN-AKAT
-        "<\u0E32"                    //  SARA AA
-
-        // Normalizer will decompose this character to \u0e4d\u0e32.
-        // This is a Bad Thing, because we want the separate
-        // characters to sort differently than this individual one.
-        // Since there's no public way to set the decomposition to be
-        // used when creating a collator, there's no way around this
-        // right now.  It's best to go ahead and leave the character
-        // in, because it occurs this way a lot more often than it
-        // occurs as separate characters.
-        "<\u0E33"                    //  SARA AM
-
-        "<\u0E34"                    //  SARA I
-
-        "<\u0E35"                    //  SARA II
-        "<\u0E36"                    //  SARA UE
-        "<\u0E37"                    //  SARA UEE
-        "<\u0E38"                    //  SARA U
-        "<\u0E39"                    //  SARA UU
-
-        //
-        // Preceding vowels
-        //
-        "<\u0E40"                    //  SARA E
-        "<\u0E41"                    //  SARA AE
-        "<\u0E42"                    //  SARA O
-        "<\u0E43"                    //  SARA AI MAIMUAN
-        "<\u0E44"                    //  SARA AI MAIMALAI
-
-        //
-        // Digits
-        //
-        "<\u0E50"                    //  DIGIT ZERO
-        "<\u0E51"                    //  DIGIT ONE
-        "<\u0E52"                    //  DIGIT TWO
-        "<\u0E53"                    //  DIGIT THREE
-        "<\u0E54"                    //  DIGIT FOUR
-        "<\u0E55"                    //  DIGIT FIVE
-        "<\u0E56"                    //  DIGIT SIX
-        "<\u0E57"                    //  DIGIT SEVEN
-        "<\u0E58"                    //  DIGIT EIGHT
-        "<\u0E59"                    //  DIGIT NINE
-
-        // Sorta tonal marks, but maybe not really
-        "<\u0E4D"                    //  NIKHAHIT
+    collations {
+      standard { 
+        Version { "3.0" }
+        Sequence { 
+           // Tailoring of UCA for Thai Royal Institute Dictionary Sort, B.E. 2525
+           "[normalization on]" // needed because Thai uses multiple accents
 
-        // Thai symbols are supposed to sort "after white space".  I'm
-        // treating this as making them sort just after the normal
-        // Latin-1 symbols, which are in turn after the white space.
-        "&'\u007d'"                   //  right-brace
-        "<\u0E2F"                    //  PAIYANNOI      (ellipsis, abbreviation)
-        "<\u0E46"                    //  MAIYAMOK
-        "<\u0E4F"                    //  FONGMAN
-        "<\u0E5A"                    //  ANGKHANKHU
-        "<\u0E5B"                    //  KHOMUT
-        "<\u0E3F"                    //  CURRENCY SYMBOL BAHT
+           // put Ru with Lakkhangyao after Ru and put Lu with Lakkhangyao after Lu
+           // see the comment below on Lakkhangyao
+           "& \u0e24"          // U+0E24 THAI CHARACTER RU
+           "< \u0e24\u0e45"    // U+0E24 THAI CHARACTER RU  U+0E45 THAI CHARACTER LAKKHANGYAO
+           "& \u0e26"          // U+0E26 THAI CHARACTER LU
+           "< \u0e26\u0e45"    // U+0E26 THAI CHARACTER LU U+0E45 THAI CHARACTER LAKKHANGYAO
 
-        // These symbols are supposed to be "after all characters"
-        "<\u0E4E"                    //  YAMAKKAN
+           // put Lakkhangyao after Sara Ai Maimalai
+           // this rare symbol also comes after all characters. But when it is used in combination
+           // with Ru and Lu, the combination is treated as a seperate letter, ala CH sorting after
+           // C in the traditional Spanish.
+           "& \u0e44"  // U+0E44 THAI CHARACTER SARA AI MAIMALAI
+           "< \u0e45"  // U+0E45 THAI CHARACTER LAKKHANGYAO
 
-        // This rare symbol also comes after all characters.  But when it is
-        // used in combination with RU and LU, the combination is treated as
-        // a separate letter, ala "CH" sorting after "C" in traditional Spanish.
-        // see above.
-        "<\u0E45"                    //  LAKKHANGYAO
+           // put Yamakkan just before Maitaikhu. It will behave like an accent (primary ignorable)
+           "& [before 2] \u0E47" // U+0E47 THAI CHARACTER MAITAIKHU
+           "<< \u0E4E"           // U+0E4E THAI CHARACTER YAMAKKAN
 
-        // Tonal marks are primary ignorables but are treated as secondary
-        // differences
-        "&\u0301"                    // acute accent
-        "<<\u0E47"                    //  MAITAIKHU
-        "<<\u0E48"                    //  MAI EK
-        "<<\u0E49"                    //  MAI THO
-        "<<\u0E4A"                    //  MAI TRI
-        "<<\u0E4B"                    //  MAI CHATTAWA
-        "<<\u0E4C"                    //  THANTHAKHAT
+           // put Thantakat and Nikhahit just after Mai Chattawa.  They will behave like an accent (primary ignorable)
+            "& \u0E4B"  // U+0E4B  THAI CHARACTER MAI CHATTAWA
+           "<< \u0E4C"  // U+0E4C  THAI CHARACTER THANTAKAT
+           "<< \u0E4D"  // U+0E4D  THAI CHARACTER NIKHAHIT
 
+           // make punctuation and  Paiyannoi...Khomut secondary ignorable. This will make them sort after the same
+           // strings that don't contain them.
 
-        // These are supposed to be ignored, so I'm treating them as controls
-        "&\u0001 "
-        "=\u0E3A"                    //  PHINTHU
-        "='.'"                      //  period 
+           "& [last secondary ignorable]"
+           "<<< ' '"    // Space
+           "<<< '-'"    // Hyphen
+           "<<< '.'"    // Full stop
+           "<<< '...'"  // Ellipsis
+           "<<< \u0E2F" // U+0E2F  THAI CHARACTER PAIYANNOI (abbreviation mark)
+           "<<< \u0E46" // U+0E46  THAI CHARACTER MAIYAMOK (repetition mark)
+           "<<< \u0E4F" // U+0E4F  THAI CHARACTER FONGMAN (ancient symbol used as bullet mark)
+           "<<< \u0E5A" // U+0E5A  THAI CHARACTER ANGKHANKHU (ancient symbol used to mark end of section or episode)
+           "<<< \u0E5B" // U+0E5B  THAI CHARACTER KHOMUT (ancient symbol used to mark end of story)
+ 
         }
+      }
     }
     Countries { 
         AF { "\u0e2d\u0e31\u0e1f\u0e01\u0e32\u0e19\u0e34\u0e2a\u0e16\u0e32\u0e19" }
@@ -535,8 +442,6 @@
         za { "\u0e08\u0e27\u0e07" }
         zu { "\u0e0b\u0e39\u0e25\u0e39" }
     }
-    LocaleID:int { 0x1e }
-//    LocaleString { "th" }
     MonthAbbreviations { 
         "\u0E21.\u0E04.",
         "\u0E01.\u0E1E.",
@@ -565,8 +470,8 @@
         "\u0E1E\u0E24\u0E28\u0E08\u0E34\u0E01\u0E32\u0E22\u0E19",
         "\u0E18\u0E31\u0E19\u0E27\u0E32\u0E04\u0E21",
     }
-//    ShortLanguage { "tha" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
+    /*
     zoneStrings { 
         {
             "THA",
@@ -577,6 +482,7 @@
             "Bangkok",
         }
     }
+    */
     LocaleScript{ 
         "Thai", // Script Name  
     }
@@ -589,35 +495,35 @@
 
     SpelloutRules {
         "%default:\n"
-        "  -x: \u0e25\u0e1a>>;\n"
-        "  x.x: <<\u0e08\u0e38\u0e14>>>;\n"
-        "  \u0e28\u0e39\u0e19\u0e22\u0e4c; \u0e2b\u0e19\u0e36\u0e48\u0e07; \u0e2a\u0e2d\u0e07; \u0e2a\u0e32\u0e21;\n"
-        "  \u0e2a\u0e35\u0e48; \u0e2b\u0e49\u0e32; \u0e2b\u0e01; \u0e40\u0e08\u0e47\u0e14; \u0e41\u0e1b\u0e14;\n"
-        "  \u0e40\u0e01\u0e49\u0e32; \u0e2a\u0e34\u0e1a; \u0e2a\u0e34\u0e1a\u0e40\u0e2d\u0e47\u0e14;\n"
-        "  \u0e2a\u0e34\u0e1a\u0e2a\u0e2d\u0e07; \u0e2a\u0e34\u0e1a\u0e2a\u0e32\u0e21;\n"
-        "  \u0e2a\u0e34\u0e1a\u0e2a\u0e35\u0e48; \u0e2a\u0e34\u0e1a\u0e2b\u0e49\u0e32;\n"
-        "  \u0e2a\u0e34\u0e1a\u0e2b\u0e01; \u0e2a\u0e34\u0e1a\u0e40\u0e08\u0e47\u0e14;\n"
-        "  \u0e2a\u0e34\u0e1a\u0e41\u0e1b\u0e14; \u0e2a\u0e34\u0e1a\u0e40\u0e01\u0e49\u0e32;\n"
-        "  20: \u0e22\u0e35\u0e48\u0e2a\u0e34\u0e1a[>%%alt-ones>];\n"
-        "  30: \u0e2a\u0e32\u0e21\u0e2a\u0e34\u0e1a[>%%alt-ones>];\n"
-        "  40: \u0e2a\u0e35\u0e48\u0e2a\u0e34\u0e1a[>%%alt-ones>];\n"
-        "  50: \u0e2b\u0e49\u0e32\u0e2a\u0e34\u0e1a[>%%alt-ones>];\n"
-        "  60: \u0e2b\u0e01\u0e2a\u0e34\u0e1a[>%%alt-ones>];\n"
-        "  70: \u0e40\u0e08\u0e47\u0e14\u0e2a\u0e34\u0e1a[>%%alt-ones>];\n"
-        "  80: \u0e41\u0e1b\u0e14\u0e2a\u0e34\u0e1a[>%%alt-ones>];\n"
-        "  90: \u0e40\u0e01\u0e49\u0e32\u0e2a\u0e34\u0e1a[>%%alt-ones>];\n"
-        "  100: <<\u0e23\u0e49\u0e2d\u0e22[>>];\n"
-        "  1000: <<\u0e1e\u0e31\u0e19[>>];\n"
-        "  10000: <<\u0e2b\u0e21\u0e37\u0e48\u0e19[>>];\n"
-        "  100000: <<\u0e41\u0e2a\u0e19[>>];\n"
-        "  1,000,000: <<\u0e25\u0e49\u0e32\u0e19[>>];\n"
-        "  1,000,000,000: <<\u0e1e\u0e31\u0e19\u0e25\u0e49\u0e32\u0e19[>>];\n"
-        "  1,000,000,000,000: <<\u0e25\u0e49\u0e32\u0e19\u0e25\u0e49\u0e32\u0e19[>>];\n"
-        "  1,000,000,000,000,000: =#,##0=;\n"
+          "-x: \u0e25\u0e1a>>;\n"
+          "x.x: <<\u0e08\u0e38\u0e14>>>;\n"
+          "\u0e28\u0e39\u0e19\u0e22\u0e4c; \u0e2b\u0e19\u0e36\u0e48\u0e07; \u0e2a\u0e2d\u0e07; \u0e2a\u0e32\u0e21;\n"
+          "\u0e2a\u0e35\u0e48; \u0e2b\u0e49\u0e32; \u0e2b\u0e01; \u0e40\u0e08\u0e47\u0e14; \u0e41\u0e1b\u0e14;\n"
+          "\u0e40\u0e01\u0e49\u0e32; \u0e2a\u0e34\u0e1a; \u0e2a\u0e34\u0e1a\u0e40\u0e2d\u0e47\u0e14;\n"
+          "\u0e2a\u0e34\u0e1a\u0e2a\u0e2d\u0e07; \u0e2a\u0e34\u0e1a\u0e2a\u0e32\u0e21;\n"
+          "\u0e2a\u0e34\u0e1a\u0e2a\u0e35\u0e48; \u0e2a\u0e34\u0e1a\u0e2b\u0e49\u0e32;\n"
+          "\u0e2a\u0e34\u0e1a\u0e2b\u0e01; \u0e2a\u0e34\u0e1a\u0e40\u0e08\u0e47\u0e14;\n"
+          "\u0e2a\u0e34\u0e1a\u0e41\u0e1b\u0e14; \u0e2a\u0e34\u0e1a\u0e40\u0e01\u0e49\u0e32;\n"
+          "20: \u0e22\u0e35\u0e48\u0e2a\u0e34\u0e1a[>%%alt-ones>];\n"
+          "30: \u0e2a\u0e32\u0e21\u0e2a\u0e34\u0e1a[>%%alt-ones>];\n"
+          "40: \u0e2a\u0e35\u0e48\u0e2a\u0e34\u0e1a[>%%alt-ones>];\n"
+          "50: \u0e2b\u0e49\u0e32\u0e2a\u0e34\u0e1a[>%%alt-ones>];\n"
+          "60: \u0e2b\u0e01\u0e2a\u0e34\u0e1a[>%%alt-ones>];\n"
+          "70: \u0e40\u0e08\u0e47\u0e14\u0e2a\u0e34\u0e1a[>%%alt-ones>];\n"
+          "80: \u0e41\u0e1b\u0e14\u0e2a\u0e34\u0e1a[>%%alt-ones>];\n"
+          "90: \u0e40\u0e01\u0e49\u0e32\u0e2a\u0e34\u0e1a[>%%alt-ones>];\n"
+          "100: <<\u0e23\u0e49\u0e2d\u0e22[>>];\n"
+          "1000: <<\u0e1e\u0e31\u0e19[>>];\n"
+          "10000: <<\u0e2b\u0e21\u0e37\u0e48\u0e19[>>];\n"
+          "100000: <<\u0e41\u0e2a\u0e19[>>];\n"
+          "1,000,000: <<\u0e25\u0e49\u0e32\u0e19[>>];\n"
+          "1,000,000,000: <<\u0e1e\u0e31\u0e19\u0e25\u0e49\u0e32\u0e19[>>];\n"
+          "1,000,000,000,000: <<\u0e25\u0e49\u0e32\u0e19\u0e25\u0e49\u0e32\u0e19[>>];\n"
+          "1,000,000,000,000,000: =#,##0=;\n"
         "%%alt-ones:\n"
-        "  \u0e28\u0e39\u0e19\u0e22\u0e4c;\n"
-        "  \u0e40\u0e2d\u0e47\u0e14;\n"
-        "  =%default=;\n"
+          "\u0e28\u0e39\u0e19\u0e22\u0e4c;\n"
+          "\u0e40\u0e2d\u0e47\u0e14;\n"
+          "=%default=;\n"
     }
 
     // Currency display names
@@ -629,14 +535,13 @@
     Eras_buddhist:array { "\u0e1e.\u0e28." }
 
     DateTimePatterns_buddhist { 
-        "H' \u0E19\u0E32\u0E2C\u0E34\u0E01\u0E32 'm' \u0E19\u0E32\u0E17\u0E35 'ss' \u0E27"
-        "\u0E34\u0E19\u0E32\u0E17\u0E35'",
+        "H' \u0E19\u0E32\u0E2C\u0E34\u0E01\u0E32 'm' \u0E19\u0E32\u0E17\u0E35 'ss' \u0E27\u0E34\u0E19\u0E32\u0E17\u0E35'",
         "H' \u0E19\u0E32\u0E2C\u0E34\u0E01\u0E32 'm' \u0E19\u0E32\u0E17\u0E35'",
         "H:mm:ss",
         "H:mm",
         "EEEE'\u0E17\u0E35\u0E48 'd MMMM G yyyy",
-        "d MMMM yyyy G",
-        "d MMM yyyy G",
+        "d MMMM yyyy",
+        "d MMM yyyy",
         "d/M/yyyy",
         "{1}, {0}",
     }

Index: th_TH.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/th_TH.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- th_TH.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ th_TH.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -7,13 +7,10 @@
 
 th_TH {
     Version { "2.0" }
-//    LocaleString { "th_TH" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "\u00A4#,##0.00;\u00A4-#,##0.00",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "THA" }
-    LocaleID:int { 0x041e }
 }

Index: ti.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/ti.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ti.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ ti.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -9,6 +9,11 @@
 
 ti{ 
     Version{ "2.0" }
+    AmPmMarkers {
+        "\u1295\u1309\u1206 \u1230\u12D3\u1270",
+        "\u12F5\u1215\u122D \u1230\u12D3\u1275",
+    }
+    Countries:alias { "am" }
     DayAbbreviations {
         "\u1230\u1295\u1260",
         "\u1230\u1291\u12ED",
@@ -27,6 +32,10 @@
         "\u12D3\u122D\u1262",
         "\u1240\u12F3\u121D",
     }
+    Eras {
+        "\u12D3/\u12D3",
+        "\u12D3/\u121D"
+    }
     MonthAbbreviations {
         "\u1303\u1295\u12E9",
         "\u134C\u1265\u1229",
@@ -55,294 +64,11 @@
         "\u1296\u126C\u121D\u1260\u122D",
         "\u12F2\u1234\u121D\u1260\u122D",
     }
-    AmPmMarkers {
-        "\u1295\u1309\u1206 \u1230\u12D3\u1270",
-        "\u12F5\u1215\u122D \u1230\u12D3\u1275",
-    }
-    Eras {
-        "\u12D3/\u12D3",
-        "\u12D3/\u121D"
-    }
     DateTimeElements:intvector { 
         7,
         1,
     }
-    Languages { 
-        aa { "\u12A0\u134B\u122D\u129B" }
-        ab { "\u12A0\u1265\u1210\u12DA\u129B" }
-        af { "\u12A0\u134D\u122A\u1243\u1295\u1235\u129B" }
-        am { "\u12A0\u121D\u1210\u1228\u129B" }
-        ar { "\u12D0\u122D\u1262\u129B" }
-        as { "\u12A0\u1233\u121C\u12DB\u12CA" }
-        ay { "\u12A0\u12EB\u121B\u122D\u129B" }
-        az { "\u12A0\u12DC\u122D\u1263\u12ED\u1303\u1295\u129B" }
-        ba { "\u1263\u1235\u12AA\u122D\u129B" }
-        be { "\u1264\u120B\u122B\u123B\u129B" }
-        bg { "\u1261\u120D\u130B\u122A\u129B" }
-        bh { "\u1262\u1203\u122A" }
-        bi { "\u1262\u1235\u120B\u121D\u129B" }
-        bn { "\u1260\u1295\u130B\u120A\u129B" }
-        bo { "\u1275\u1260\u1275\u1295\u129B" }
-        br { "\u1265\u122C\u1276\u1295\u129B" }
-        ca { "\u12AB\u1273\u120B\u1295\u129B" }
-        co { "\u12AE\u122D\u1232\u12AB\u129B" }
-        cs { "\u127C\u12AD\u129B" }
-        cy { "\u12C8\u120D\u123D" }
-        da { "\u12F4\u1292\u123D" }
-        de { "\u1300\u122D\u1218\u1295" }
-        dz { "\u12F5\u12DE\u1295\u130D\u12BB\u129B" }
-        el { "\u130D\u122A\u12AD\u129B" }
-        en { "\u12A5\u1295\u130D\u120A\u12DD\u129B" }
-        eo { "\u12A4\u1235\u1350\u122B\u1295\u1276" }
-        es { "\u1235\u1353\u1292\u123D" }
-        et { "\u12A4\u1235\u1276\u1292\u12A0\u1295" }
-        eu { "\u1263\u1235\u12AD\u129B" }
-        fa { "\u1350\u122D\u1232\u12EB\u129B" }
-        fi { "\u134A\u1292\u123D" }
-        fj { "\u134A\u1302\u129B" }
-        fo { "\u134B\u122E\u129B" }
-        fr { "\u1348\u1228\u1295\u1233\u12ED\u129B" }
-        fy { "\u134D\u122A\u1235\u129B" }
-        ga { "\u12A0\u12ED\u122A\u123D" }
-        gd { "\u12A5\u1235\u12AE\u1275\u1235 \u130C\u120D\u12AD\u129B" }
-        gl { "\u130B\u1208\u130B\u129B" }
-        gn { "\u1313\u122B\u1292\u129B" }
-        gu { "\u1309\u1303\u122D\u1272\u129B" }
-        ha { "\u1203\u12CD\u1233\u129B" }
-        he { "\u12D5\u1265\u122B\u1235\u1325" }
-        hi { "\u1210\u1295\u12F5\u129B" }
-        hr { "\u12AD\u122E\u123D\u12EB\u1295\u129B" }
-        hu { "\u1200\u1295\u130B\u122A\u129B" }
-        hy { "\u12A0\u122D\u1218\u1293\u12CA" }
-        ia { "\u12A2\u1295\u1274\u122D\u120A\u1295\u1313" }
-        id { "\u12A5\u1295\u12F6\u1292\u1232\u129B" }
-        ie { "\u12A5\u1295\u1270\u122D\u120A\u1295\u130D\u12C8" }
-        ik { "\u12A5\u1291\u1352\u12EB\u1245\u129B" }
-        is { "\u12A0\u12ED\u1235\u120B\u1295\u12F5\u129B" }
-        it { "\u1323\u120A\u12EB\u1295\u129B" }
-        iu { "\u12A5\u1291\u12AD\u1272\u1271\u1275\u129B" }
-        ja { "\u1303\u1353\u1295\u129B" }
-        jv { "\u1303\u126B\u1295\u129B" }
-        ka { "\u130A\u12EE\u122D\u130A\u12EB\u1295" }
-        kk { "\u12AB\u12DB\u12AD\u129B" }
-        kl { "\u12AB\u120B\u120A\u1231\u1275\u129B" }
-        km { "\u12AD\u1218\u122D\u129B" }
-        kn { "\u12AB\u1293\u12F3\u129B" }
-        ko { "\u12AE\u122A\u12EB\u129B" }
-        ks { "\u12AB\u123D\u121A\u122D\u129B" }
-        ku { "\u12A9\u122D\u12F5\u123D\u129B" }
-        ky { "\u12AA\u122D\u130A\u12DD\u129B" }
-        la { "\u120B\u1272\u1295\u129B" }
-        ln { "\u120A\u1295\u130B\u120B\u129B" }
-        lo { "\u120B\u12CD\u1235\u129B" }
-        lt { "\u120A\u1271\u12A0\u1292\u12EB\u1295" }
-        lv { "\u120B\u1275\u126A\u12EB\u1295" }
-        mg { "\u121B\u120B\u130B\u1235\u129B" }
-        mi { "\u121B\u12EE\u122A\u129B" }
-        mk { "\u121B\u12A8\u12F6\u1292\u129B" }
-        ml { "\u121B\u120B\u12EB\u120B\u121D\u129B" }
-        mn { "\u121E\u1295\u130E\u120B\u12CA\u129B" }
-        mo { "\u121E\u120D\u12F3\u126B\u12CA\u1293" }
-        mr { "\u121B\u122B\u12DA\u129B" }
-        ms { "\u121B\u120B\u12ED\u129B" }
-        mt { "\u121B\u120D\u1272\u1235\u129B" }
-        my { "\u1261\u122D\u121B\u129B" }
-        na { "\u1293\u12A1\u1229" }
-        ne { "\u1294\u1353\u120A\u129B" }
-        nl { "\u12F0\u127D" }
-        no { "\u1296\u122D\u12CC\u1302\u12EB\u1295" }
-        oc { "\u12A6\u12AA\u1273\u1295\u129B" }
-        om { "\u12A6\u122E\u121D\u129B" }
-        or { "\u12A6\u122A\u12EB\u129B" }
-        pa { "\u1353\u1295\u1303\u1262\u129B" }
-        pl { "\u1356\u120A\u123D" }
-        ps { "\u1351\u123D\u1276\u129B" }
-        pt { "\u1356\u122D\u1271\u130B\u120A\u129B" }
-        qu { "\u12B5\u127F\u129B" }
-        rm { "\u122E\u121B\u1295\u1235"}
-        rn { "\u1229\u1295\u12F2\u129B" }
-        ro { "\u122E\u121B\u1292\u12EB\u1295" }
-        ru { "\u122B\u123D\u129B" }
-        rw { "\u12AA\u1295\u12EB\u122D\u12CB\u1295\u12F5\u129B" }
-        sa { "\u1233\u1295\u1235\u12AD\u122A\u1275\u129B" }
-        sd { "\u1232\u1295\u12F5\u1202\u129B" }
-        sg { "\u1233\u1295\u130E\u129B" }
-        sh { "\u0073\u0068"}
-        si { "\u1235\u1295\u1203\u120D\u129B" }
-        sk { "\u1235\u120E\u126B\u12AD\u129B" }
-        sl { "\u1235\u120E\u126A\u129B" }
-        sm { "\u1233\u121E\u12A0\u129B" }
-        sn { "\u123E\u1293\u129B" }
-        so { "\u1231\u121B\u120D\u129B" }
-        sq { "\u120D\u1264\u1292\u129B" }
-        sr { "\u1230\u122D\u1262\u129B" }
-        ss { "\u1235\u12CB\u1272\u129B" }
-        st { "\u1236\u12DE\u129B" }
-        su { "\u1231\u12F3\u1295\u129B" }
-        sv { "\u1235\u12CA\u12F5\u1295\u129B" }
-        sw { "\u1235\u12CB\u1202\u120A\u129B" }
-        ta { "\u1273\u121A\u120D\u129B" }
-        te { "\u1270\u1209\u1309\u129B" }
-        tg { "\u1273\u1302\u12AA\u129B" }
-        th { "\u1273\u12ED\u129B" }
-        ti { "\u1275\u130D\u122D\u129B" }
-        tk { "\u1271\u122D\u12AD\u1218\u1295\u129B" }
-        tl { "\u1273\u130B\u120E\u1308\u129B" }
-        tn { "\u133D\u12CB\u1293\u12CA\u129B" }
-        to { "\u1276\u1295\u130B" }
-        tr { "\u1271\u122D\u12AD\u129B" }
-        ts { "\u133E\u1295\u130B\u129B" }
-        tt { "\u1273\u1273\u122D\u129B" }
-        tw { "\u1275\u12CA\u129B" }
-        ug { "\u12A1\u12CA\u130D\u1201\u122D\u129B" }
-        uk { "\u12E9\u12AD\u1228\u1292\u129B" }
-        ur { "\u12A1\u122D\u12F1\u129B" }
-        uz { "\u12A1\u12DD\u1260\u12AD\u129B" }
-        vi { "\u126A\u1275\u1293\u121D\u129B" }
-        vo { "\u126E\u120B\u1351\u12AD\u129B" }
-        wo { "\u12CE\u120E\u134D\u129B" }
-        xh { "\u12DE\u1233\u129B" }
-        yi { "\u12ED\u12F2\u123B\u12CA\u129B" }
-        yo { "\u12EE\u1229\u1263\u12CA\u129B" }
-        za { "\u12E1\u12CB\u1295\u130D\u129B" }
-        zh { "\u127B\u12ED\u1295\u129B" }
-        zu { "\u12D9\u1209\u129B" }
-        gez { "\u130D\u12D5\u12DD\u129B" }
-        tig { "\u1275\u130D\u1228" }
-        sid { "\u1232\u12F3\u121D\u129B" }
-    }
-    Countries { 
-        AD { "\u12A0\u1295\u12F6\u122B" }
-        AE { "\u12E8\u1270\u1263\u1260\u1229\u1275 \u12A0\u1228\u1265 \u12A4\u121D\u122C\u1275\u1235" }
-        AL { "\u12A0\u120D\u1263\u1292\u12EB" }
-        AM { "\u12A0\u122D\u121C\u1292\u12EB" }
-        AN { "\u1294\u12D8\u122D\u120B\u1295\u12F5\u1235 \u12A0\u1295\u1272\u120D\u1235" }
-        AR { "\u12A0\u122D\u1300\u1295\u1272\u1293" }
-        AT { "\u12A6\u1235\u1275\u122A\u12EB" }
-        AU { "\u12A0\u12CD\u1235\u1275\u122C\u120A\u12EB" }
-        AZ { "\u12A0\u12D8\u122D\u1263\u1303\u1295" }
-        BA { "\u1266\u1235\u1292\u12EB \u12A5\u1293 \u1204\u122D\u12DE\u130E\u126A\u1292\u12EB" }
-        BB { "\u1263\u122D\u1264\u12F6\u1235" }
-        BE { "\u1264\u120D\u1304\u121D" }
-        BG { "\u1261\u120D\u130C\u122A\u12EB" }
-        BH { "\u1263\u1205\u122C\u1295" }
-        BM { "\u1264\u122D\u1219\u12F3" }
-        BO { "\u1266\u120A\u126A\u12EB" }
-        BR { "\u1265\u122B\u12DA\u120D" }
-        BT { "\u1261\u1205\u1273\u1295" }
-        BY { "\u1264\u120B\u1229\u1235" }
-        BZ { "\u1264\u120A\u12D8" }
-        CD { "\u12AE\u1295\u130E" }
-        CF { "\u12E8\u1218\u12AB\u12A8\u1208\u129B\u12CD \u12A0\u134D\u122A\u12AB \u122A\u1350\u1265\u120A\u12AD" }
-        CH { "\u1235\u12CA\u12D8\u122D\u120B\u1295\u12F5" }
-        CL { "\u127A\u120A" }
-        CM { "\u12AB\u121C\u1229\u1295" }
-        CN { "\u127B\u12ED\u1293" }
-        CO { "\u12AE\u120E\u121D\u1262\u12EB" }
-        CV { "\u12AC\u1355 \u126C\u122D\u12F4" }
-        CY { "\u1233\u12ED\u1355\u1228\u1235" }
-        CZ { "\u127C\u12AD \u122A\u1351\u1265\u120A\u12AD" }
-        DE { "\u1300\u122D\u1218\u1295" }
-        DK { "\u12F4\u1295\u121B\u122D\u12AD" }
-        DM { "\u12F6\u121A\u1292\u12AB" }
-        DO { "\u12F6\u121A\u1292\u12AD \u122A\u1351\u1265\u120A\u12AD" }
-        DZ { "\u12A0\u120D\u1304\u122A\u12EB" }
-        EC { "\u12A2\u12B3\u12F6\u122D" }
-        EE { "\u12A4\u1235\u1276\u1292\u12EB" }
-        EG { "\u130D\u1265\u133D" }
-        EH { "\u121D\u12D5\u122B\u1263\u12CA \u1233\u1205\u122B" }
-        ER { "\u12A4\u122D\u1275\u122B" }
-        ES { "\u1235\u1354\u1295" }
-        ET { "\u12A2\u1275\u12EE\u1335\u12EB" }
-        FI { "\u134A\u1295\u120B\u1295\u12F5" }
-        FJ { "\u134A\u1302" }
-        FM { "\u121A\u12AD\u122E\u1294\u12E2\u12EB" }
-        GB { "\u12A5\u1295\u130D\u120A\u12DD" }
-        GE { "\u1306\u122D\u1302\u12EB" }
-        GF { "\u12E8\u1348\u1228\u1295\u1233\u12ED \u1309\u12CA\u12A0\u1293" }
-        GM { "\u130B\u121D\u1262\u12EB" }
-        GN { "\u130A\u1292" }
-        GQ { "\u12A2\u12B3\u1276\u122A\u12EB\u120D \u130A\u1292" }
-        GR { "\u130D\u122A\u12AD" }
-        GW { "\u1262\u1233\u12CE"}
-        GY { "\u1309\u12EB\u1293" }
-        HK { "\u1206\u1295\u130D \u12AE\u1295\u130D" }
-        HR { "\u12AD\u122E\u12A4\u123D\u12EB" }
-        HT { "\u1200\u12ED\u1272" }
-        HU { "\u1200\u1295\u130B\u122A" }
-        ID { "\u12A2\u1295\u12F6\u1294\u12E2\u12EB" }
-        IE { "\u12A0\u12E8\u122D\u120B\u1295\u12F5" }
-        IL { "\u12A5\u1235\u122B\u12A4\u120D" }
-        IN { "\u1205\u1295\u12F5" }
-        IQ { "\u12A2\u122B\u1245" }
-        IS { "\u12A0\u12ED\u1235\u120B\u1295\u12F5" }
-        IT { "\u1323\u120A\u12EB\u1295" }
-        JM { "\u1303\u121B\u12ED\u12AB" }
-        JO { "\u1306\u122D\u12F3\u1295" }
-        JP { "\u1303\u1353\u1295" }
-        KH { "\u12AB\u121D\u1266\u12F2\u12EB" }
-        KM { "\u12AE\u121E\u122E\u1235" }
-        KP { "\u12F0\u1261\u1265 \u12AE\u122A\u12EB" }
-        KR { "\u1230\u121C\u1295 \u12AE\u122A\u12EB" }
-        KW { "\u12AD\u12CC\u1275" }
-        LB { "\u120A\u1263\u1296\u1235" }
-        LT { "\u120A\u1271\u12CC\u1292\u12EB" }
-        LV { "\u120B\u1275\u126A\u12EB" }
-        LY { "\u120A\u1262\u12EB" }
-        MA { "\u121E\u122E\u12AE" }
-        MD { "\u121E\u120D\u12F6\u126B" }
-        MK { "\u121B\u12A8\u12F6\u1292\u12EB" }
-        MN { "\u121E\u1295\u130E\u120A\u12EB" }
-        MO { "\u121B\u12AB\u12CE" }
-        MR { "\u121E\u122A\u1274\u1292\u12EB" }
-        MT { "\u121B\u120D\u1273" }
-        MU { "\u121B\u1229\u1238\u1235" }
-        MX { "\u121C\u12AD\u1232\u12AE" }
-        MY { "\u121B\u120C\u12E2\u12EB" }
-        NA { "\u1293\u121A\u1262\u12EB" }
-        NC { "\u1292\u12CD \u12AB\u120C\u12F6\u1292\u12EB" }
-        NG { "\u1293\u12ED\u1304\u122A\u12EB" }
-        NL { "\u1294\u12D8\u122D\u120B\u1295\u12F5" }
-        NO { "\u1296\u122D\u12CC" }
-        NP { "\u1294\u1353\u120D" }
-        NZ { "\u1292\u12CD \u12DA\u120B\u1295\u12F5" }
-        PE { "\u1354\u1229" }
-        PF { "\u12E8\u1348\u1228\u1295\u1233\u12ED \u1356\u120A\u1294\u12E2\u12EB" }
-        PG { "\u1353\u1351\u12CB \u1292\u12CD \u130A\u1292" }
-        PL { "\u1356\u120B\u1295\u12F5" }
-        PR { "\u1356\u122D\u1273 \u122A\u12AE" }
-        RO { "\u122E\u121C\u1292\u12EB" }
-        RU { "\u122B\u123A\u12EB" }
-        SA { "\u1233\u12CD\u12F5\u12A0\u1228\u1262\u12EB" }
-        SD { "\u1231\u12F3\u1295" }
-        SE { "\u1235\u12CA\u12F5\u1295" }
-        SG { "\u1232\u1295\u130B\u1356\u122D" }
-        SI { "\u1235\u120E\u126C\u1292\u12EB" }
-        SK { "\u1235\u120E\u126B\u12AA\u12EB" }
-        SN { "\u1234\u1294\u130B\u120D" }
-        SO { "\u1231\u121B\u120C" }
-        SP { "\u1230\u122D\u1262\u12EB" }
-        SY { "\u1232\u122A\u12EB" }
-        TD { "\u127B\u12F5" }
-        TF { "\u12E8\u1348\u1228\u1295\u1233\u12ED \u12F0\u1261\u1263\u12CA \u130D\u12DB\u1276\u127D" }
-        TH { "\u1273\u12ED\u120B\u1295\u12F5" }
-        TJ { "\u1273\u1303\u12AA\u1235\u1273\u1295" }
-        TL { "\u121D\u1235\u122B\u1245 \u1272\u121E\u122D" }
-        TN { "\u1271\u1292\u12DA\u12EB" }
-        TR { "\u1271\u122D\u12AD" }
-        TT { "\u1275\u122A\u1292\u12F3\u12F5 \u12A5\u1293 \u1276\u1263\u130E" }
-        TZ { "\u1273\u1295\u12DB\u1292\u12EB" }
-        UG { "\u12E9\u130B\u1295\u12F3" }
-        US { "\u12A0\u121C\u122A\u12AB" }
-        UZ { "\u12E9\u12DD\u1260\u12AA\u1235\u1273\u1295" }
-        VE { "\u126C\u1295\u12D9\u12CC\u120B" }
-        VG { "\u12E8\u12A5\u1295\u130D\u120A\u12DD \u12F5\u1295\u130D\u120D \u12F0\u1234\u1276\u127D" }
-        VI { "\u12E8\u12A0\u121C\u122A\u12AB \u1268\u122D\u1302\u1295 \u12F0\u1234\u1276\u127D" }
-        YE { "\u12E8\u1218\u1295" }
-        YU { "\u12E9\u130E\u12DD\u120B\u126A\u12EB" }
-        ZA { "\u12F0\u1261\u1265 \u12A0\u134D\u122A\u12AB" }
-        ZM { "\u12DB\u121D\u1262\u12EB" }
-    }
+    Languages:alias { "am" }
     LocaleScript{ "Ethi", }
     ExemplarCharacters{"[:Ethi:]"}
 }

Index: tr.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/tr.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tr.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ tr.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -9,17 +9,259 @@
     Version{ "2.0" }
     // According to Nurdan Mete from IBM Turkey, the following would be the correct
     // sorting order for Turkish
-    CollationElements { 
-        Version { "2" }
-        Sequence { "& C < c\u0327 <<< C\u0327" 
-                   "& G < g\u0306 <<< G\u0306"
-                   "& H < \u0131 <<< I < i <<< \u0130" 
-                   "& O < o\u0308 <<< O\u0308"
-                   "& S < s\u0327 <<< S\u0327" 
-                   "& U < u\u0308 <<< U\u0308" }
+    collations {
+        standard { 
+            Version { "2.1" }
+            Sequence { "& C < c\u0327 <<< C\u0327" 
+                       "& G < g\u0306 <<< G\u0306"
+                       "&[before 1]i < \u0131 <<< I"
+                       "& i <<< \u0130" 
+                       "& O < o\u0308 <<< O\u0308"
+                       "& S < s\u0327 <<< S\u0327" 
+                       "& U < u\u0308 <<< U\u0308" }
+        }
     }
     Countries { 
+        Fallback{ "en"}
+        AD { "Andora" }
+        AE { "Birle\u015Fik Arap Emirlikleri" }
+        AF { "Afganistan" }
+        AG { "Antigua ve Barbuda" }
+        //AI { "Anguilla" }
+        AL { "Arnavutluk" }
+        AM { "Ermenistan" }
+        AN { "Hollanda Antilleri" }
+        //AO { "Angola" }
+        AQ { "Antarktika" }
+        AR { "Arjantin" }
+        AS { "Amerikan Samoas\u0131" }
+        AT { "Avusturya" }
+        AU { "Avustralya" }
+        //AW { "Aruba" }
+        AZ { "Azerbaycan" }
+        BA { "Bosna Hersek" }
+        //BB { "Barbados" }
+        BD { "Banglade\u015F" }
+        BE { "Bel\u00E7ika" }
+        //BF { "Burkina Faso" }
+        BG { "Bulgaristan" }
+        BH { "Bahreyn" }
+        //BI { "Burundi" }
+        //BJ { "Benin" }
+        //BM { "Bermuda" }
+        //BN { "Brunei Dar\u00FCsselam" }
+        BO { "Bolivya" }
+        BR { "Brezilya" }
+        BS { "Bahamalar" }
+        //BT { "Bhutan" }
+        BV { "Bouvet Adas\u0131" }
+        //BW { "Botswana" }
+        //BY { "Belarus" }
+        //BZ { "Belize" }
+        CA { "Kanada" }
+        CC { "Cocos (Keeling) Adalar\u0131" }
+        CD { "Kongo Demokratik Cumhuriyeti" }
+        CF { "Orta Afrika Cumhuriyeti" }
+        CG { "Kongo" }
+        CH { "\u0130svi\u00E7re" }
+        CI { "Fildi\u015Fi Sahilleri" }
+        CK { "Cook Adalar\u0131" }
+        CL { "\u015Eili" }
+        CM { "Kamerun" }
+        CN { "\u00C7in" }
+        CO { "Kolombiya" }
+        CR { "Kosta Rika" }
+        CU { "K\u00FCba" }
+        //CV { "Cape Verde" }
+        CX { "Christmas Adas\u0131" }
+        CY { "K\u0131br\u0131s" }
+        CZ { "\u00C7ek Cumhuriyeti" }
+        DE { "Almanya" }
+        DJ { "Cibuti" }
+        DK { "Danimarka" }
+        DM { "Dominik" }
+        DO { "Dominik Cumhuriyeti" }
+        DZ { "Cezayir" }
+        EC { "Ekvador" }
+        EE { "Estonya" }
+        EG { "M\u0131s\u0131r" }
+        EH { "Bat\u0131 Sahara" }
+        ER { "Eritre" }
+        ES { "\u0130spanya" }
+        ET { "Etiyopya" }
+        FI { "Finlandiya" }
+        //FJ { "Fiji" }
+        FK { "Falkland Adalar\u0131 (Malvinalar)" }    // alternate name { "Falkland Adalar\u0131" }
+        FM { "Mikronezya Federal Eyaletleri" }
+        FO { "Faroe Adalar\u0131" }
+        FR { "Fransa" }
+        //GA { "Gabon" }
+        GB { "Birle\u015Fik Krall\u0131k" }
+        GD { "Granada" }
+        GE { "G\u00FCrcistan" }
+        GF { "Frans\u0131z Ginesi" }
+        GH { "Gana" }
+        GI { "Cebelitar\u0131k" }
+        GL { "Gr\u00F6nland" }
+        //GM { "Gambia" }
+        GN { "Gine" }
+        //GP { "Guadeloupe" }
+        GQ { "Ekvator Ginesi" }
+        GR { "Yunanistan" }
+        GS { "G\u00FCney Georgia ve G\u00FCney Sandwich Adalar\u0131" }
+        //GT { "Guatemala" }
+        //GU { "Guam" }
+        GW { "Gine-Bissau" }
+        //GY { "Guyana" }
+        HK { "Hong Kong SAR - \u00C7in" }
+        HM { "Heard Adas\u0131 ve McDonald Adalar\u0131" }
+        //HN { "Honduras" }
+        HR { "H\u0131rvatistan" }
+        //HT { "Haiti" }
+        HU { "Macaristan" }
+        ID { "Endonezya" }
+        IE { "\u0130rlanda" }
+        IL { "\u0130srail" }
+        IN { "Hindistan" }
+        IO { "Hint Okyanusu \u0130ngiliz B\u00F6lgesi" }
+        IQ { "Irak" }
+        IR { "\u0130ran" }
+        IS { "\u0130zlanda" }
+        IT { "\u0130talya" }
+        JM { "Jamaika" }
+        JO { "\u00DCrd\u00FCn" }
+        JP { "Japonya" }
+        //KE { "Kenya" }
+        KG { "K\u0131rg\u0131zistan" }
+        KH { "Kambo\u00E7ya" }
+        //KI { "Kiribati" }
+        KM { "Komorlar" }
+        KN { "Saint Kittler ve Neviler" }
+        KP { "Kore, Kuzey" }    // alternate name { "Kore Demokratik Halk Cumhuriyeti" }
+        KR { "Kore, G\u00FCney" }    // alternate name { "Kore Cumhuriyeti" }
+        KW { "Kuveyt" }
+        KY { "Cayman Adalar\u0131" }
+        KZ { "Kazakistan" }
+        LA { "Lao Demokratik Halk Cumhuriyeti" }
+        LB { "L\u00FCbnan" }
+        //LC { "Saint Lucia" }
+        //LI { "Liechtenstein" }
+        //LK { "Sri Lanka" }
+        LR { "Liberya" }
+        //LS { "Lesotho" }
+        LT { "Litvanya" }
+        LU { "L\u00FCksemburg" }
+        LV { "Letonya" }
+        //LY { "Libya Arap Cemahiriyesi" }
+        MA { "Fas" }
+        MC { "Monako" }
+        MD { "Moldovya Cumhuriyeti" }
+        MG { "Madagaskar" }
+        MH { "Marshall Adalar\u0131" }
+        MK { "Makedonya Cumhuriyeti" }
+        //ML { "Mali" }
+        //MM { "Myanmar" }
+        MN { "Mo\u011Folistan" }
+        MO { "Macao S.A.R. - \u00C7in" }
+        MP { "Kuzey Mariana Adalar\u0131" }
+        MQ { "Martinik" }
+        MR { "Moritanya" }
+        //MS { "Montserrat" }
+        //MT { "Malta" }
+        //MU { "Mauritius" }
+        MV { "Maldivler" }
+        MW { "Malavi" }
+        MX { "Meksika" }
+        MY { "Malezya" }
+        MZ { "Mozambik" }
+        NA { "Namibya" }
+        NC { "Yeni Kaledonya" }
+        NE { "Nijer" }
+        NF { "Norfolk Adas\u0131" }
+        NG { "Nijerya" }
+        NI { "Nikaragua" }
+        NL { "Hollanda" }
+        NO { "Norve\u00E7" }
+        //NP { "Nepal" }
+        NR { "Nauru Adas\u0131" }
+        NU { "Niue Adalar\u0131" }
+        NZ { "Yeni Zelanda" }
+        OM { "Umman" }
+        //PA { "Panama" }
+        //PE { "Peru" }
+        PF { "Frans\u0131z Polinezyas\u0131" }
+        PG { "Papua Yeni Gine" }
+        PH { "Filipinler" }
+        //PK { "Pakistan" }
+        PL { "Polonya" }
+        PM { "Saint Pierre ve Miquelon" }
+        //PN { "Pitcairn" }
+        PR { "Porto Riko" }
+        PS { "Filistin B\u00F6lgesi" }
+        PT { "Portekiz" }
+        //PW { "Palau" }
+        //PY { "Paraguay" }
+        QA { "Katar" }
+        RE { "Reunion" }
+        RO { "Romanya" }
+        RU { "Rusya Federasyonu" }
+        RW { "Ruanda" }
+        SA { "Suudi Arabistan" }
+        SB { "Solomon Adalar\u0131" }
+        SC { "Sey\u015Feller" }
+        //SD { "Sudan" }
+        SE { "\u0130sve\u00E7" }
+        SG { "Singapur" }
+        //SH { "Saint Helena" }
+        SI { "Slovenya" }
+        SJ { "Svalbard ve Jan Mayen" }
+        SK { "Slovakya" }
+        //SL { "Sierra Leone" }
+        //SM { "San Marino" }
+        //SN { "Senegal" }
+        SO { "Somali" }
+        SR { "Surinam" }
+        ST { "Sao Tome ve Principe" }
+        //SV { "El Salvador" }
+        SY { "Suriye" }
+        //SZ { "Swaziland" }
+        TC { "Turks ve Caicos Adalar\u0131" }
+        TD { "\u00C7ad" }
+        TF { "Frans\u0131z G\u00FCney B\u00F6lgeleri" }
+        //TG { "Togo" }
+        TH { "Tayland" }
+        TJ { "Tacikistan" }
+        //TK { "Tokelau" }
+        TL { "Do\u011Fu Timor" }
+        TM { "T\u00FCrkmenistan" }
+        TN { "Tunus" }
+        //TO { "Tonga" }
         TR { "T\u00FCrkiye" }
+        TT { "Trinidad ve Tobago" }
+        //TV { "Tuvalu" }
+        TW { "Tayvan, \u00C7in B\u00F6lgesi" }    // alternate name { "Tayvan" }
+        TZ { "Tanzanya" }
+        UA { "Ukrayna" }
+        //UG { "Uganda" }
+        UM { "Amerika Birle\u015Fik Devletleri K\u00FC\u00E7\u00FCk D\u0131\u015F Adalar\u0131" }
+        US { "Amerika Birle\u015Fik Devletleri" }
+        //UY { "Uruguay" }
+        UZ { "\u00D6zbekistan" }
+        VA { "Kutsal Devlet (Vatikan \u015Eehir Devleti)" }
+        VC { "Saint Vincent ve Grenadinler" }
+        //VE { "Venezuela" }
+        VG { "\u0130ngiliz Virgin Adalar\u0131" }
+        VI { "ABD Virgin Adalar\u0131" }
+        //VN { "Vietnam" }
+        //VU { "Vanuatu" }
+        WF { "Wallis ve Futuna" }
+        //WS { "Samoa" }
+        //YE { "Yemen" }
+        //YT { "Mayotte" }
+        YU { "Yugoslavya" }
+        ZA { "G\u00FCney Afrika" }
+        ZM { "Zambiya" }
+        //ZW { "Zimbabwe" }
     }
     DateTimeElements:intvector { 
         2,
@@ -54,11 +296,153 @@
         "Cuma",
         "Cumartesi",
     }
-    Languages { 
+    Eras { 
+        "M\u00D6",
+        "MS",
+    }
+    Languages {
+        aa { "Afar" }
+        ab { "Abazca" }
+        af { "Afrikaan Dili" }
+        am { "Amharik" }
+        ar { "Arap\u00E7a" }
+        //as { "Assamese" }
+        ay { "Aymara" }
+        az { "Azerice" }
+        ba { "Ba\u015Fk\u0131rt Dili" }
+        be { "Beyaz Rus\u00E7a" }
+        bg { "Bulgarca" }
+        bh { "Bihari" }
+        bi { "Bislama" }
+        bn { "Bengal Dili" }
+        bo { "Tibet\u00E7e" }
+        br { "Breton Dili" }
+        ca { "Katalan Dili" }
+        co { "Korsika Dili" }
+        cs { "\u00C7ek\u00E7e" }
+        cy { "Gal Dili" }
+        da { "Danca" }
+        de { "Almanca" }
+        dz { "Bhutan Dili" }
+        el { "Yunanca" }
+        en { "\u0130ngilizce" }
+        eo { "Esperanto" }
+        es { "\u0130spanyolca" }
+        et { "Estonya Dili" }
+        eu { "Bask Dili" }
+        fa { "Fars\u00E7a" }
+        fi { "Fince" }
+        fj { "Fiji Dili" }
+        fo { "Faroe Dili" }
+        fr { "Frans\u0131zca" }
+        fy { "Frizye Dili" }
+        ga { "\u0130rlanda Dili" }
+        gd { "\u0130sko\u00E7 Gal Dili" }
+        gl { "Gali\u00E7ya Dili" }
+        gn { "Guarani" }
+        gu { "Gujarati" }
+        ha { "Hausa" }
+        he { "\u0130branice" }
+        hi { "Hint Dili" }
+        hr { "H\u0131rvat\u00E7a" }
+        hu { "Macarca" }
+        hy { "Ermenice" }
+        ia { "Interlingua" }
+        id { "Endonezya Dili" }
+        ie { "Interlingue" }
+        ik { "Inupiak" }
+        is { "\u0130zlandaca" }
+        it { "\u0130talyanca" }
+        iu { "Inuktitut" }
+        ja { "Japonca" }
+        jv { "Java Dili" }
+        ka { "G\u00FCrc\u00FCce" }
+        kk { "Kazak Dili" }
+        kl { "Gr\u00F6nland Dili" }
+        km { "Kambo\u00E7ya Dili" }
+        kn { "Kannada" }
+        ko { "Korece" }
+        ks { "Ke\u015Fmirce" }
+        ku { "K\u00FCrt\u00E7e" }
+        ky { "K\u0131rg\u0131zca" }
+        la { "Latince" }
+        ln { "Lingala" }
+        lo { "Laos Dili" }
+        lt { "Litvanya Dili" }
+        lv { "Letonya Dili" }
+        mg { "Malaga Dili" }
+        mi { "Maori" }
+        mk { "Makedonca" }
+        ml { "Malayalam" }
+        mn { "Mo\u011Fol Dili" }
+        mo { "Moldavya Dili" }
+        mr { "Marathi" }
+        ms { "Malay" }
+        mt { "Malta Dili" }
+        my { "Birmanya Dili" }
+        na { "Nauru" }
+        ne { "Nepal Dili" }
+        nl { "Hollanda Dili" }
+        no { "Norve\u00E7\u00E7e" }
+        oc { "Occitan" }
+        om { "Oromo (Afan)" }
+        or { "Oriya" }
+        pa { "Pencap Dili" }
+        pl { "Polonya Dili" }
+        ps { "Pe\u015Ftun Dili" }
+        pt { "Portekizce" }
+        qu { "Quechua" }
+        rm { "Rhaeto-Roman Dili" }
+        rn { "Kirundi" }
+        ro { "Romence" }
+        ru { "Rus\u00E7a" }
+        rw { "Kinyarwanda" }
+        sa { "Sanskrit\u00E7e" }
+        sd { "Sindhi" }
+        sg { "Sangho" }
+        sh { "S\u0131rp-H\u0131rvat Dili" }
+        si { "Sinhal Dili" }
+        sk { "Slovak\u00E7a" }
+        sl { "Slovence" }
+        sm { "Samoa Dili" }
+        sn { "Shona" }
+        so { "Somali Dili" }
+        sq { "Arnavut\u00E7a" }
+        sr { "S\u0131rp\u00E7a" }
+        ss { "Siswati" }
+        st { "Sesotho" }
+        su { "Sudan Dili" }
+        sv { "\u0130sve\u00E7\u00E7e" }
+        sw { "Swahili" }
+        ta { "Tamil" }
+        te { "Telugu" }
+        tg { "Tacik Dili" }
+        th { "Tay Dili" }
+        ti { "Tigrinya" }
+        tk { "T\u00FCrkmence" }
+        tl { "Tagalog" }
+        tn { "Setswana" }
+        to { "Tonga" }
         tr { "T\u00FCrk\u00E7e" }
+        ts { "Tsonga" }
+        tt { "Tatarca" }
+        tw { "Twi" }
+        ug { "Uygurca" }
+        uk { "Ukraynaca" }
+        ur { "Urduca" }
+        uz { "\u00D6zbek\u00E7e" }
+        vi { "Vietnam Dili" }
+        vo { "Volapuk" }
+        wo { "Wolof" }
+        xh { "Xhosa" }
+        yi { "Yiddi\u015F" }
+        yo { "Yoruba" }
+        za { "Zhuang" }
+        zh { "\u00C7ince" }
+        zu { "Zulu" }
+        //zh_cn { "\u00C7ince (Basitle\u015Ftirilmi\u015F)" }
+        //zh_tw { "\u00C7ince (Geleneksel)" }
     }
-    LocaleID:int { 0x1f }
-//    LocaleString { "tr" }
     MonthAbbreviations { 
         "Oca",
         "\u015Eub",
@@ -100,26 +484,19 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "tur" }
     localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
+
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
     }
-//    LocaleScript{ 
-//        "Latn",  // ISO 15924 Name 
-//    }
-    ExemplarCharacters { "[a-z \u00e2 \u00ee \u00fb \u00f6 \u00fc \u0131 \u00e7 \u015f \u011f]" }
+    ExemplarCharacters { "[a-z\u00e2\u00fb\u00f6\u00fc\u0131\u00e7\u015f\u011f]" }
 
     // Currency display names
     Currencies {
         ITL { "ITL", "ITL" } // Italian Lira
-        TRL { "\u20A4", "TRL" } // Turkish Lira
+//        TRL { "\u20A4", "TRL" } // Turkish Lira (Rarely used)
+        TRL { "TL", "TRL" } // Turkish Lira
     }
-}
+}
\ No newline at end of file

Index: tr_TR.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/tr_TR.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tr_TR.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ tr_TR.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -7,13 +7,10 @@
 
 tr_TR {
     Version{ "2.0" }
-//    LocaleString { "tr_TR" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
-        "#,##0 \u00A4;-#,##0 \u00A4",
-        "%#,##0",
+        "#,##0.00 \u00A4;-#,##0.00 \u00A4",
+        "#,##0%",
         "#E0",
     }
-//    ShortCountry { "TUR" }
-    LocaleID:int { 0x041f }
 }

Index: uk.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/uk.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- uk.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ uk.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -7,11 +7,13 @@
 
 uk {
     Version {"2.0" } 
-    CollationElements { 
+    collations {
+      standard { 
         Version { "1.0" }
         Sequence { 
             "&\u0413 < \u0491 <<< \u0490"
         }
+      }
 //        "& Z"
 //        "< \u0430 <<< \u0410 < \u0431 <<< \u0411 < \u0432 <<< \u0412 < \u0433 <<< \u0413 < \u0491 <<< \u0490"
 //        "< \u0434 <<< \u0414 < \u0435 <<< \u0415 < \u0454 <<< \u0404 < \u0436 <<< \u0416"
@@ -45,7 +47,250 @@
 //        " <<< \u047A< \u047D <<< \u047C< \u047F <<< \u047E< \u0481 <<< \u0480" }
     }
     Countries { 
+        AD { "\u0410\u043D\u0434\u043E\u0440\u0440\u0430" }
+        AE { "\u0421\u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0456 \u0410\u0440\u0430\u0431\u0441\u044C\u043A\u0456 \u0415\u043C\u0456\u0440\u0430\u0442\u0438" }
+        AF { "\u0410\u0444\u0433\u0430\u043D\u0456\u0441\u0442\u0430\u043D" }
+        AG { "\u0410\u043D\u0442\u0438\u0433\u0443\u0430 \u0456 \u0411\u0430\u0440\u0431\u0443\u0434\u0430" }
+        AI { "\u0410\u043D\u0433\u0456\u043B\u044C\u044F" }
+        AL { "\u0410\u043B\u0431\u0430\u043D\u0456\u044F" }
+        AM { "\u0412\u0456\u0440\u043C\u0435\u043D\u0456\u044F" }
+        AN { "\u041D\u0456\u0434\u0435\u0440\u043B\u0430\u043D\u0434\u0441\u044C\u043A\u0456 \u0410\u043D\u0442\u0456\u043B\u0438" }
+        AO { "\u0410\u043D\u0433\u043E\u043B\u0430" }
+        AQ { "\u0410\u043D\u0442\u0430\u0440\u043A\u0442\u0438\u043A\u0430" }
+        AR { "\u0410\u0440\u0433\u0435\u043D\u0442\u0438\u043D\u0430" }
+        AS { "\u0410\u043C\u0435\u0440\u0438\u043A\u0430\u043D\u0441\u044C\u043A\u0456 \u0421\u0430\u043C\u043E\u0430" }
+        AT { "\u0410\u0432\u0441\u0442\u0440\u0456\u044F" }
+        AU { "\u0410\u0432\u0441\u0442\u0440\u0430\u043B\u0456\u044F" }
+        AW { "\u0410\u0440\u0443\u0431\u0430" }
+        AZ { "\u0410\u0437\u0435\u0440\u0431\u0430\u0439\u0434\u0436\u0430\u043D" }
+        BA { "\u0411\u043E\u0441\u043D\u0456\u044F \u0456 \u0413\u0435\u0440\u0446\u0435\u0433\u043E\u0432\u0438\u043D\u0430" }
+        BB { "\u0411\u0430\u0440\u0431\u0430\u0434\u043E\u0441" }
+        BD { "\u0411\u0430\u043D\u0433\u043B\u0430\u0434\u0435\u0448" }
+        BE { "\u0411\u0435\u043B\u044C\u0433\u0456\u044F" }
+        BF { "\u0411\u0443\u0440\u043A\u0456\u043D\u0430-\u0424\u0430\u0441\u043E" }
+        BG { "\u0411\u043E\u043B\u0433\u0430\u0440\u0456\u044F" }
+        BH { "\u0411\u0430\u0445\u0440\u0435\u0439\u043D" }
+        BI { "\u0411\u0443\u0440\u0443\u043D\u0434\u0456" }
+        BJ { "\u0411\u0435\u043D\u0456\u043D" }
+        BM { "\u0411\u0435\u0440\u043C\u0443\u0434\u0438" }
+        BN { "\u0411\u0440\u0443\u043D\u0435\u0439" }
+        BO { "\u0411\u043E\u043B\u0456\u0432\u0456\u044F" }
+        BR { "\u0411\u0440\u0430\u0437\u0438\u043B\u0456\u044F" }
+        BS { "\u0411\u0430\u0433\u0430\u043C\u0438" }
+        BT { "\u0411\u0443\u0442\u0430\u043D" }
+        BV { "\u0411\u0443\u0432\u0435, \u043E\u0441\u0442\u0440\u0456\u0432" }
+        BW { "\u0411\u043E\u0442\u0441\u0432\u0430\u043D\u0430" }
+        BY { "\u0411\u0456\u043B\u043E\u0440\u0443\u0441\u044C" }
+        BZ { "\u0411\u0435\u043B\u0456\u0437" }
+        CA { "\u041A\u0430\u043D\u0430\u0434\u0430" }
+        CC { "\u041A\u043E\u043A\u043E\u0441\u043E\u0432\u0456 \u043E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        CD { "\u041A\u043E\u043D\u0433\u043E" }
+        CF { "\u0426\u0435\u043D\u0442\u0440\u0430\u043B\u044C\u043D\u043E-\u0410\u0444\u0440\u0438\u043A\u0430\u043D\u0441\u044C\u043A\u0430 \u0420\u0435\u0441\u043F\u0443\u0431\u043B\u0456\u043A\u0430" }
+        CG { "\u041A\u043E\u043D\u0433\u043E" }
+        CH { "\u0428\u0432\u0435\u0439\u0446\u0430\u0440\u0456\u044F" }
+        CI { "\u041A\u043E\u0442-\u0434'\u0406\u0432\u0443\u0430\u0440" }
+        CK { "\u041A\u0443\u043A\u0430, \u043E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        CL { "\u0427\u0438\u043B\u0456" }
+        CM { "\u041A\u0430\u043C\u0435\u0440\u0443\u043D" }
+        CN { "\u041A\u0438\u0442\u0430\u0439" }
+        CO { "\u041A\u043E\u043B\u0443\u043C\u0431\u0456\u044F" }
+        CR { "\u041A\u043E\u0441\u0442\u0430-\u0420\u0438\u043A\u0430" }
+        CU { "\u041A\u0443\u0431\u0430" }
+        CV { "\u0417\u0435\u043B\u0435\u043D\u043E\u0433\u043E \u041C\u0438\u0441\u0443, \u043E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        CX { "\u0420\u0456\u0437\u0434\u0432\u044F\u043D\u0456 \u041E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        CY { "\u041A\u0456\u043F\u0440" }
+        CZ { "\u0427\u0435\u0445\u0456\u044F" }
+        DE { "\u041D\u0456\u043C\u0435\u0447\u0447\u0438\u043D\u0430" }
+        DJ { "\u0414\u0436\u0438\u0431\u0443\u0442\u0456" }
+        DK { "\u0414\u0430\u043D\u0456\u044F" }
+        DM { "\u0414\u043E\u043C\u0456\u043D\u0456\u043A" }
+        DO { "\u0414\u043E\u043C\u0456\u043D\u0456\u043A\u0430\u043D\u0441\u044C\u043A\u0430 \u0420\u0435\u0441\u043F\u0443\u0431\u043B\u0456\u043A\u0430" }
+        DZ { "\u0410\u043B\u0436\u0438\u0440" }
+        EC { "\u0415\u043A\u0432\u0430\u0434\u043E\u0440" }
+        EE { "\u0415\u0441\u0442\u043E\u043D\u0456\u044F" }
+        EG { "\u0404\u0433\u0438\u043F\u0435\u0442" }
+        EH { "\u0417\u0430\u0445\u0456\u0434\u043D\u0430 \u0421\u0430\u0445\u0430\u0440\u0430" }
+        ER { "\u0415\u0440\u0456\u0442\u0440\u0435\u044F" }
+        ES { "\u0406\u0441\u043F\u0430\u043D\u0456\u044F" }
+        ET { "\u0415\u0444\u0456\u043E\u043F\u0456\u044F" }
+        FI { "\u0424\u0456\u043D\u043B\u044F\u043D\u0434\u0456\u044F" }
+        FJ { "\u0424\u0456\u0434\u0436\u0456" }
+        FK { "\u0424\u043E\u043B\u043A\u043B\u0435\u043D\u0434\u0441\u044C\u043A\u0456 \u041E\u0441\u0442\u0440\u043E\u0432\u0438 (\u041C\u0430\u043B\u044C\u0432\u0456\u043D\u0438)" }
+        FM { "\u041C\u0456\u043A\u0440\u043E\u043D\u0435\u0437\u0456\u044F" }
+        FO { "\u0424\u0430\u0440\u043E, \u043E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        FR { "\u0424\u0440\u0430\u043D\u0446\u0456\u044F" }
+        // FX { "\u0424\u0440\u0430\u043D\u0446\u0456\u044F, \u043C\u0435\u0442\u0440\u043E\u043F\u043E\u043B\u0456\u0457" }
+        GA { "\u0413\u0430\u0431\u043E\u043D" }
+        GB { "\u0412\u0435\u043B\u0438\u043A\u043E\u0431\u0440\u0438\u0442\u0430\u043D\u0456\u044F" }
+        GD { "\u0413\u0440\u0435\u043D\u0430\u0434\u0430" }
+        GE { "\u0413\u0440\u0443\u0437\u0456\u044F" }
+        GF { "\u0424\u0440\u0430\u043D\u0446\u0443\u0437\u044C\u043A\u0430 \u0413\u0432\u0456\u0430\u043D\u0430" }
+        GH { "\u0413\u0430\u043D\u0430" }
+        GI { "\u0413\u0456\u0431\u0440\u0430\u043B\u0442\u0430\u0440" }
+        GL { "\u0413\u0440\u0435\u043D\u043B\u0430\u043D\u0434\u0456\u044F" }
+        GM { "\u0413\u0430\u043C\u0431\u0456\u044F" }
+        GN { "\u0413\u0432\u0456\u043D\u0435\u044F" }
+        GP { "\u0413\u0432\u0430\u0434\u0435\u043B\u0443\u043F\u0430" }
+        GQ { "\u0415\u043A\u0432\u0430\u0442\u043E\u0440\u0456\u0430\u043B\u044C\u043D\u0430 \u0413\u0432\u0456\u043D\u0435\u044F" }
+        GR { "\u0413\u0440\u0435\u0446\u0456\u044F" }
+        GS { "\u041F\u0456\u0432\u0434\u0435\u043D\u043D\u0430 \u0414\u0436\u043E\u0440\u0436\u0456\u044F \u0442\u0430 \u041E\u0441\u0442\u0440\u043E\u0432\u0438 \u041F\u0456\u0432\u0434\u0435\u043D\u043D\u0438\u0439 \u0421\u0430\u043D\u0434\u0432\u0456\u0447" }
+        GT { "\u0413\u0432\u0430\u0442\u0435\u043C\u0430\u043B\u0430" }
+        GU { "\u0413\u0443\u0430\u043C" }
+        GW { "\u0413\u0432\u0456\u043D\u0435\u044F-\u0411\u0456\u0441\u0441\u0430\u0443" }
+        GY { "\u0413\u0443\u0430\u043D\u0430" }
+        HK { "\u0413\u043E\u043D\u043A\u043E\u043D\u0433" }
+        HM { "\u041E\u0441\u0442\u0440\u043E\u0432\u0438 \u0425\u0435\u0440\u0434\u0430 \u0456 \u041C\u0430\u043A\u0434\u043E\u043D\u0430\u043B\u044C\u0434\u0441\u0430" }
+        HN { "\u0413\u043E\u043D\u0434\u0443\u0440\u0430\u0441" }
+        HR { "\u0425\u043E\u0440\u0432\u0430\u0442\u0456\u044F" }
+        HT { "\u0413\u0430\u0457\u0442\u0456" }
+        HU { "\u0423\u0433\u043E\u0440\u0449\u0438\u043D\u0430" }
+        ID { "\u0406\u043D\u0434\u043E\u043D\u0435\u0437\u0456\u044F" }
+        IE { "\u0406\u0440\u043B\u0430\u043D\u0434\u0456\u044F" }
+        IL { "\u0406\u0437\u0440\u0430\u0457\u043B\u044C" }
+        IN { "\u0406\u043D\u0434\u0456\u044F" }
+        IO { "\u0411\u0440\u0438\u0442\u0430\u043D\u0441\u044C\u043A\u0456 \u0442\u0435\u0440\u0438\u0442\u043E\u0440\u0456\u0457 \u0406\u043D\u0434\u0456\u0439\u0441\u044C\u043A\u043E\u0433\u043E \u043E\u043A\u0435\u0430\u043D\u0443" }
+        IQ { "\u0406\u0440\u0430\u043A" }
+        IR { "\u0406\u0440\u0430\u043D" }
+        IS { "\u0406\u0441\u043B\u0430\u043D\u0434\u0456\u044F" }
+        IT { "\u0406\u0442\u0430\u043B\u0456\u044F" }
+        JM { "\u042F\u043C\u0430\u0439\u043A\u0430" }
+        JO { "\u0419\u043E\u0440\u0434\u0430\u043D\u0456\u044F" }
+        JP { "\u042F\u043F\u043E\u043D\u0456\u044F" }
+        KE { "\u041A\u0435\u043D\u0456\u044F" }
+        KG { "\u041A\u0438\u0440\u0433\u0438\u0437\u0441\u0442\u0430\u043D" }
+        KH { "\u041A\u0430\u043C\u0431\u043E\u0434\u0436\u0430" }
+        KI { "\u041A\u0456\u0440\u0438\u0431\u0430\u0442\u0456" }
+        KM { "\u041A\u043E\u043C\u043E\u0440\u043E\u0441" }
+        KN { "\u0421\u0432. \u041A\u0456\u0442\u0442\u0441 \u0456 \u041D\u0435\u0432\u0456\u0441" }
+        KP { "\u041A\u043E\u0440\u0435\u044F, \u0414\u0435\u043C\u043E\u043A\u0440\u0430\u0442\u0438\u0447\u043D\u0430 \u0420\u0435\u0441\u043F\u0443\u0431\u043B\u0456\u043A\u0430" }
+        KR { "\u041A\u043E\u0440\u0435\u044F, \u0420\u0435\u0441\u043F\u0443\u0431\u043B\u0456\u043A\u0430" }
+        KW { "\u041A\u0443\u0432\u0435\u0439\u0442" }
+        KY { "\u041A\u0430\u0439\u043C\u0430\u043D\u043E\u0432\u0456 \u043E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        KZ { "\u041A\u0430\u0437\u0430\u0445\u0441\u0442\u0430\u043D" }
+        LA { "\u041B\u0430\u043E\u0441\u044C\u043A\u0430 \u041D\u0430\u0440\u043E\u0434\u043D\u043E-\u0414\u0435\u043C\u043E\u043A\u0440\u0430\u0442\u0438\u0447\u043D\u0430 \u0420\u0435\u0441\u043F\u0443\u0431\u043B\u0456\u043A\u0430" }
+        LB { "\u041B\u0456\u0432\u0430\u043D" }
+        LC { "\u0421\u0430\u043D\u0442\u0430 \u041B\u044E\u0447\u0456\u044F" }
+        LI { "\u041B\u0456\u0445\u0442\u0435\u043D\u0448\u0442\u0435\u0439\u043D" }
+        LK { "\u0428\u0440\u0456-\u041B\u0430\u043D\u043A\u0430" }
+        LR { "\u041B\u0456\u0431\u0435\u0440\u0456\u044F" }
+        LS { "\u041B\u0435\u0441\u043E\u0442\u043E" }
+        LT { "\u041B\u0438\u0442\u0432\u0430" }
+        LU { "\u041B\u044E\u043A\u0441\u0435\u043C\u0431\u0443\u0440\u0433" }
+        LV { "\u041B\u0430\u0442\u0432\u0456\u044F" }
+        LY { "\u041B\u0456\u0432\u0456\u0439\u0441\u044C\u043A\u0430 \u0410\u0440\u0430\u0431\u0441\u044C\u043A\u0430 \u0414\u0436\u0430\u043C\u0430\u0445\u0456\u0440\u0456\u044F" }
+        MA { "\u041C\u0430\u0440\u043E\u043A\u043A\u043E" }
+        MC { "\u041C\u043E\u043D\u0430\u043A\u043E" }
+        MD { "\u041C\u043E\u043B\u0434\u043E\u0432\u0430" }
+        MG { "\u041C\u0430\u0434\u0430\u0433\u0430\u0441\u043A\u0430\u0440" }
+        MH { "\u041C\u0430\u0440\u0448\u0430\u043B\u043E\u0432\u0456 \u041E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        MK { "\u041C\u0430\u043A\u0435\u0434\u043E\u043D\u0456\u044F" }
+        ML { "\u041C\u0430\u043B\u0456" }
+        MM { "\u041C'\u044F\u043D\u043C\u0430\u0440" }
+        MN { "\u041C\u043E\u043D\u0433\u043E\u043B\u0456\u044F" }
+        MO { "\u041C\u0430\u043A\u0430\u043E" }
+        MP { "\u041F\u0456\u0432\u043D\u0456\u0447\u043D\u0430 \u041C\u0430\u0440\u0456\u0430\u043D\u0430, \u043E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        MQ { "\u041C\u0430\u0440\u0442\u0438\u043D\u0456\u043A\u0430" }
+        MR { "\u041C\u0430\u0432\u0440\u0438\u0442\u0430\u043D\u0456\u044F" }
+        MS { "\u041C\u043E\u043D\u0441\u0435\u0440\u0440\u0430\u0442" }
+        MT { "\u041C\u0430\u043B\u044C\u0442\u0430" }
+        MU { "\u041C\u0430\u0432\u0440\u0438\u043A\u0456\u0439" }
+        MV { "\u041C\u0430\u043B\u044C\u0434\u0456\u0432\u0438" }
+        MW { "\u041C\u0430\u043B\u0430\u0432\u0438" }
+        MX { "\u041C\u0435\u043A\u0441\u0438\u043A\u0430" }
+        MY { "\u041C\u0430\u043B\u0430\u0439\u0437\u0456\u044F" }
+        MZ { "\u041C\u043E\u0437\u0430\u043C\u0431\u0456\u043A" }
+        NA { "\u041D\u0430\u043C\u0456\u0431\u0456\u044F" }
+        NC { "\u041D\u043E\u0432\u0430 \u041A\u0430\u043B\u0435\u0434\u043E\u043D\u0456\u044F" }
+        NE { "\u041D\u0456\u0433\u0435\u0440\u0456\u044F" }
+        NF { "\u041D\u043E\u0440\u0444\u043E\u043B\u044C\u043A\u0441\u044C\u043A\u0456 \u041E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        NG { "\u041D\u0456\u0433\u0435\u0440\u0456\u044F" }
+        NI { "\u041D\u0456\u043A\u0430\u0440\u0430\u0433\u0443\u0430" }
+        NL { "\u041D\u0456\u0434\u0435\u0440\u043B\u0430\u043D\u0434\u0438" }
+        NO { "\u041D\u043E\u0440\u0432\u0435\u0433\u0456\u044F" }
+        NP { "\u041D\u0435\u043F\u0430\u043B" }
+        NR { "\u041D\u0430\u0443\u0440\u0443" }
+        NU { "\u041D\u0456\u044F" }
+        NZ { "\u041D\u043E\u0432\u0430 \u0417\u0435\u043B\u0430\u043D\u0434\u0456\u044F" }
+        OM { "\u041E\u043C\u0430\u043D" }
+        PA { "\u041F\u0430\u043D\u0430\u043C\u0430" }
+        PE { "\u041F\u0435\u0440\u0443" }
+        PF { "\u0424\u0440\u0430\u043D\u0446\u0443\u0437\u044C\u043A\u0430 \u041F\u043E\u043B\u0456\u043D\u0435\u0437\u0456\u044F" }
+        PG { "\u041F\u0430\u043F\u0443\u0430 \u041D\u043E\u0432\u0430 \u0413\u0432\u0456\u043D\u0435\u044F" }
+        PH { "\u0424\u0456\u043B\u0456\u043F\u043F\u0456\u043D\u0438" }
+        PK { "\u041F\u0430\u043A\u0438\u0441\u0442\u0430\u043D" }
+        PL { "\u041F\u043E\u043B\u044C\u0449\u0430" }
+        PM { "\u0421\u0432. \u041F'\u0454\u0440 \u0456 \u041C\u0456\u043A\u0443\u043B\u043E\u043D" }
+        PN { "\u041F\u0456\u0442\u043A\u0430\u0457\u0440\u043D" }
+        PR { "\u041F\u0443\u0435\u0440\u0442\u043E-\u0420\u0456\u043A\u043E" }
+        PS { "\u041F\u0430\u043B\u0435\u0441\u0442\u0438\u043D\u0430" }
+        PT { "\u041F\u043E\u0440\u0442\u0443\u0433\u0430\u043B\u0456\u044F" }
+        PW { "\u041F\u0430\u043B\u0430\u0443" }
+        PY { "\u041F\u0430\u0440\u0430\u0433\u0432\u0430\u0439" }
+        QA { "\u041A\u0430\u0442\u0430\u0440" }
+        RE { "\u0420\u0435\u044E\u043D\u044C\u0439\u043E\u043D" }
+        RO { "\u0420\u0443\u043C\u0443\u043D\u0456\u044F" }
+        RU { "\u0420\u043E\u0441\u0456\u044F" }
+        RW { "\u0420\u0443\u0430\u043D\u0434\u0430" }
+        SA { "\u0421\u0430\u0443\u0434\u0456\u0432\u0441\u044C\u043A\u0430 \u0410\u0440\u0430\u0432\u0456\u044F" }
+        SB { "\u0421\u043E\u043B\u043E\u043C\u043E\u043D\u043E\u0432\u0456 \u041E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        SC { "\u0421\u0435\u0439\u0448\u0435\u043B\u0438" }
+        SD { "\u0421\u0443\u0434\u0430\u043D" }
+        SE { "\u0428\u0432\u0435\u0446\u0456\u044F" }
+        SG { "\u0421\u0456\u043D\u0433\u0430\u043F\u0443\u0440" }
+        SH { "\u0421\u0432. \u0404\u043B\u0435\u043D\u0430" }
+        SI { "\u0421\u043B\u043E\u0432\u0435\u043D\u0456\u044F" }
+        SJ { "\u0421\u0432\u0430\u043B\u0431\u0430\u0440\u0434 \u0456 \u042F\u043D \u041C\u0430\u0439\u0454\u043D, \u043E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        SK { "\u0421\u043B\u043E\u0432\u0430\u043A\u0456\u044F" }
+        SL { "\u0421\u044C\u0454\u0440\u0440\u0430-\u041B\u0435\u043E\u043D\u0435" }
+        SM { "\u0421\u0430\u043D-\u041C\u0430\u0440\u0456\u043D\u043E" }
+        SN { "\u0421\u0435\u043D\u0435\u0433\u0430\u043B" }
+        SO { "\u0421\u043E\u043C\u0430\u043B\u0456" }
+        SR { "\u0421\u0443\u0440\u0456\u043D\u0430\u043C" }
+        ST { "\u0421\u0430\u043E \u0422\u043E\u043C \u0456 \u041F\u0440\u0456\u043D\u0441\u0456\u043F" }
+        SV { "\u0421\u0430\u043B\u044C\u0432\u0430\u0434\u043E\u0440" }
+        SY { "\u0421\u0438\u0440\u0456\u0439\u0441\u044C\u043A\u0430 \u0410\u0440\u0430\u0431\u0441\u044C\u043A\u0430 \u0420\u0435\u0441\u043F\u0443\u0431\u043B\u0456\u043A\u0430" }
+        SZ { "\u0421\u0432\u0430\u0437\u0456\u043B\u0435\u043D\u0434" }
+        TC { "\u0422\u0443\u0440\u043E\u043A \u0442\u0430 \u041A\u0430\u043A\u0456\u043E\u0441, \u043E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        TD { "\u0427\u0430\u0434" }
+        TF { "\u0424\u0440\u0430\u043D\u0446\u0443\u0437\u044C\u043A\u0456 \u041F\u0456\u0432\u0434\u0435\u043D\u043D\u0456 \u0422\u0435\u0440\u0438\u0442\u043E\u0440\u0456\u0457" }
+        TG { "\u0422\u043E\u0433\u043E" }
+        TH { "\u0422\u0430\u0439\u043B\u0430\u043D\u0434" }
+        TJ { "\u0422\u0430\u0434\u0436\u0438\u043A\u0438\u0441\u0442\u0430\u043D" }
+        TK { "\u0422\u043E\u043A\u0435\u043B\u0430\u0443" }
+        TM { "\u0422\u0443\u0440\u043A\u043C\u0435\u043D\u0438\u0441\u0442\u0430\u043D" }
+        TN { "\u0422\u0443\u043D\u0456\u0441" }
+        TO { "\u0422\u043E\u043D\u0433\u0430" }
+        TL { "\u0421\u0445\u0456\u0434\u043D\u0438\u0439 \u0422\u0438\u043C\u043E\u0440" }
+        TR { "\u0422\u0443\u0440\u0435\u0447\u0447\u0438\u043D\u0430" }
+        TT { "\u0422\u0440\u0438\u043D\u0456\u0434\u0430\u0434 \u0456 \u0422\u0430\u0431\u0430\u0433\u043E" }
+        TV { "\u0422\u0443\u0432\u0430\u043B\u0443" }
+        TW { "\u0422\u0430\u0439\u0432\u0430\u043D\u044C" }
+        TZ { "\u0422\u0430\u043D\u0437\u0430\u043D\u0456\u044F, \u041E\u0431'\u0454\u0434\u043D\u0430\u043D\u0430 \u0420\u0435\u0441\u043F\u0443\u0431\u043B\u0456\u043A\u0430" }
         UA { "\u0423\u043A\u0440\u0430\u0457\u043D\u0430" }
+        UG { "\u0423\u0433\u0430\u043D\u0434\u0430" }
+        UM { "\u0412\u0456\u0434\u0434\u0430\u043B\u0435\u043D\u0456 \u041E\u0441\u0442\u0440\u043E\u0432\u0438 \u0421\u0428\u0410" }
+        US { "\u0421\u0428\u0410" }
+        UY { "\u0423\u0440\u0443\u0433\u0432\u0430\u0439" }
+        UZ { "\u0423\u0437\u0431\u0435\u043A\u0438\u0441\u0442\u0430\u043D" }
+        VA { "\u0412\u0430\u0442\u0438\u043A\u0430\u043D" }
+        VC { "\u0421\u0432. \u0412\u0456\u043D\u0441\u0435\u043D\u0442 \u0456 \u0413\u0440\u0435\u043D\u0430\u0434\u0438\u043D\u0438" }
+        VE { "\u0412\u0435\u043D\u0435\u0441\u0443\u0435\u043B\u0430" }
+        VG { "\u0412\u0456\u0440\u0433\u0456\u043D\u0441\u044C\u043A\u0456 \u043E\u0441\u0442\u0440\u043E\u0432\u0438 (\u0411\u0440\u0438\u0442\u0430\u043D\u0456\u044F)" }
+        VI { "\u0412\u0456\u0440\u0433\u0456\u043D\u0441\u044C\u043A\u0456 \u043E\u0441\u0442\u0440\u043E\u0432\u0438 (\u0421\u0428\u0410)" }
+        VN { "\u0412'\u0454\u0442\u043D\u0430\u043C" }
+        VU { "\u0412\u0430\u043D\u0443\u0430\u0442\u0443" }
+        WF { "\u0412\u0430\u043B\u043B\u0456\u0441 \u0456 \u0424\u0443\u0442\u0443\u043D\u0430, \u043E\u0441\u0442\u0440\u043E\u0432\u0438" }
+        WS { "\u0421\u0430\u043C\u043E\u0430" }
+        YE { "\u0419\u0454\u043C\u0435\u043D" }
+        YT { "\u041C\u0430\u0439\u043E\u0442" }
+        YU { "\u042E\u0433\u043E\u0441\u043B\u0430\u0432\u0456\u044F" }
+        ZA { "\u041F\u0410\u0420" }
+        ZM { "\u0417\u0430\u043C\u0431\u0456\u044F" }
+        ZW { "\u0417\u0456\u043C\u0431\u0430\u0431\u0432\u0435" }
+    }
+    // Currency display names
+    Currencies {
+        UAH { "\u0433\u0440\u043D.", "UAH" }
     }
     DateTimeElements:intvector { 
         2,
@@ -56,10 +301,10 @@
         "HH:mm:ss z",
         "HH:mm:ss",
         "HH:mm",
-        "EEEE, d MMMM yyyy",
-        "EEEE, d MMMM yyyy",
-        "d/M/yyyy",
-        "d/M/yy",
+        "EEEE, d MMMM yyyy '\u0440.'",
+        "d MMMM yyyy",
+        "d MMM yyyy",
+        "dd.MM.yy",
         "{1} {0}",
     }
     DayAbbreviations { 
@@ -80,15 +325,163 @@
         "\u041F'\u044F\u0442\u043D\u0438\u0446\u044F",
         "\u0421\u0443\u0431\u043E\u0442\u0430",
     }
+//    Eras {    // Old value
+//        "\u0434\u043E \u043D.\u0435.",
+//        "\u043F\u0456\u0441\u043B\u044F \u043D.\u0435.",
+//    }
     Eras { 
         "\u0434\u043E \u043D.\u0435.",
-        "\u043F\u0456\u0441\u043B\u044F \u043D.\u0435.",
+        "\u043D.\u0435.",
     }
+    ExemplarCharacters { "[\u0430-\u0449\u044e\u044c\u044f\u0454\u0456\u0457\u0491]" }
     Languages { 
-        uk { "\u0443\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430" }
+        aa { "\u0410\u0444\u0430\u0440\u0441\u044C\u043A\u0430" }
+        ab { "\u0410\u0431\u0445\u0430\u0437\u044C\u043A\u0430" }
+        af { "\u0410\u0444\u0440\u0438\u043A\u0430\u043D\u0441" }
+        am { "\u0410\u043C\u0445\u0430\u0440\u0456\u043A" }
+        ar { "\u0410\u0440\u0430\u0431\u0441\u044C\u043A\u0430" }
+        as { "\u0410\u0441\u0441\u0430\u043C\u0441\u044C\u043A\u0430" }
+        ay { "\u0410\u0443\u043C\u0430\u0440\u0430" }
+        az { "\u0410\u0437\u0435\u0440\u0431\u0430\u0439\u0434\u0436\u0430\u043D\u0441\u044C\u043A\u0430" }
+        ba { "\u0411\u0430\u0448\u043A\u0438\u0440\u0441\u044C\u043A\u0430" }
+        be { "\u0411\u0456\u043B\u043E\u0440\u0443\u0441\u044C\u043A\u0430" }
+        bg { "\u0411\u043E\u043B\u0433\u0430\u0440\u0441\u044C\u043A\u0430" }
+        bh { "\u0411\u0456\u0445\u0430\u0440\u0456\u0439\u0441\u044C\u043A\u0430" }
+        bi { "\u0411\u0456\u0441\u043B\u0430\u043C\u0456\u0439\u0441\u044C\u043A\u0430" }
+        bn { "\u0411\u0435\u043D\u0433\u0430\u043B\u044C\u0441\u044C\u043A\u0430" }
+        bo { "\u0422\u0456\u0431\u0435\u0442\u0441\u044C\u043A\u0430" }
+        br { "\u0411\u0440\u0435\u0442\u043E\u043D\u0441\u044C\u043A\u0430" }
+        ca { "\u041A\u0430\u0442\u0430\u043B\u043E\u043D\u0441\u044C\u043A\u0430" }
+        co { "\u041A\u043E\u0440\u0441\u0438\u043A\u0430\u043D\u0441\u044C\u043A\u0430" }
+        cs { "\u0427\u0435\u0441\u044C\u043A\u0430" }
+        cy { "\u0412\u0430\u043B\u043B\u0456\u0439\u0441\u044C\u043A\u0430" }
+        da { "\u0414\u0430\u0442\u0441\u044C\u043A\u0430" }
+        de { "\u041D\u0456\u043C\u0435\u0446\u044C\u043A\u0430" }
+        dz { "\u0411\u0445\u0443\u0442\u0430\u043D\u0456" }
+        el { "\u0413\u0440\u0435\u0446\u044C\u043A\u0430" }
+        en { "\u0410\u043D\u0433\u043B\u0456\u0439\u0441\u044C\u043A\u0430" }
+        eo { "\u0415\u0441\u043F\u0435\u0440\u0430\u043D\u0442\u043E" }
+        es { "\u0406\u0441\u043F\u0430\u043D\u0441\u044C\u043A\u0430" }
+        et { "\u0415\u0441\u0442\u043E\u043D\u0441\u044C\u043A\u0430" }
+        eu { "\u0411\u0430\u0441\u043A\u0432\u0430" }
+        fa { "\u041F\u0435\u0440\u0441\u044C\u043A\u0430" }
+        fi { "\u0424\u0456\u043D\u0441\u044C\u043A\u0430" }
+        fj { "\u0424\u0456\u0434\u0436\u0456" }
+        fo { "\u0424\u0430\u0440\u0435\u0440\u0441\u044C\u043A\u0430" }
+        fr { "\u0424\u0440\u0430\u043D\u0446\u0443\u0437\u044C\u043A\u0430" }
+        fy { "\u0424\u0440\u0438\u0437\u044C\u043A\u0430" }
+        ga { "\u0406\u0440\u043B\u0430\u043D\u0434\u0441\u044C\u043A\u0430" }
+        gd { "\u0413\u0430\u0435\u043B\u044C\u0441\u044C\u043A\u0430" }
+        gl { "\u0413\u0430\u043B\u0456\u0441\u0456\u0439\u0441\u044C\u043A\u0430" }
+        gn { "\u0413\u0443\u0430\u0440\u0430\u043D\u0456" }
+        gu { "\u0413\u0443\u044F\u0440\u0430\u0442\u0456" }
+        ha { "\u0425\u0430\u0443\u0441\u0430" }
+        he { "\u0406\u0432\u0440\u0438\u0442" }
+        hi { "\u0425\u0456\u043D\u0434\u0456" }
+        hr { "\u0425\u043E\u0440\u0432\u0430\u0442\u0441\u044C\u043A\u0430" }
+        hu { "\u0423\u0433\u043E\u0440\u0441\u044C\u043A\u0430" }
+        hy { "\u0412\u0456\u0440\u043C\u0435\u043D\u0441\u044C\u043A\u0430" }
+        ia { "\u0406\u043D\u0442\u0435\u0440\u043B\u0456\u043D\u0433\u0432\u0430" }
+        id { "\u0406\u043D\u0434\u043E\u043D\u0435\u0437\u0456\u0439\u0441\u044C\u043A\u0430" }
+        ie { "\u0406\u043D\u0442\u0435\u0440\u043B\u0456\u043D\u0433\u0432\u0430" }
+        ik { "\u0406\u043D\u0443\u043F\u0456\u0430\u043A" }
+        is { "\u0406\u0441\u043B\u0430\u043D\u0434\u0441\u044C\u043A\u0430" }
+        it { "\u0406\u0442\u0430\u043B\u0456\u0439\u0441\u044C\u043A\u0430" }
+        //iu { "\u0406\u043D\u0430\u043A\u0442\u0438\u0442\u0443\u0442" }
+        ja { "\u042F\u043F\u043E\u043D\u0441\u044C\u043A\u0430" }
+        // ji { "\u0404\u0432\u0440\u0435\u0439\u0441\u044C\u043A\u0430" }
+        jv { "\u042F\u0432\u0430\u043D\u0441\u044C\u043A\u0430" }
+        //jw { "\u042F\u0432\u0430\u043D\u0441\u043A\u0438\u0439" } // Use jv instead
+        ka { "\u0413\u0440\u0443\u0437\u0438\u043D\u0441\u044C\u043A\u0430" }
+        kk { "\u041A\u0430\u0437\u0430\u0445\u0441\u044C\u043A\u0430" }
+        kl { "\u0413\u0440\u0438\u043D\u043B\u0430\u043D\u0434\u0456\u043A" }
+        km { "\u041A\u0430\u043C\u043F\u0443\u0447\u0456\u0439\u0441\u044C\u043A\u0430" }
+        kn { "\u0414\u0440\u0430\u0432\u0456\u0434\u0456\u0439\u0441\u044C\u043A\u0430" }
+        ko { "\u041A\u043E\u0440\u0435\u0439\u0441\u044C\u043A\u0430" }
+        ks { "\u041A\u0430\u0448\u043C\u0456\u0440\u0441\u044C\u043A\u0430" }
+        ku { "\u041A\u0443\u0440\u0434\u0441\u044C\u043A\u0430" }
+        ky { "\u041A\u0438\u0440\u0433\u0438\u0437\u044C\u043A\u0430" }
+        la { "\u041B\u0430\u0442\u0438\u043D\u0441\u044C\u043A\u0430" }
+        ln { "\u041B\u0456\u043D\u0433\u0430\u043B\u0430" }
+        lo { "\u041B\u0430\u043E\u0441\u044C\u043A\u0430" }
+        lt { "\u041B\u0438\u0442\u043E\u0432\u0441\u044C\u043A\u0430" }
+        lv { "\u041B\u0430\u0442\u0432\u0456\u0439\u0441\u044C\u043A\u0430" }
+        mg { "\u041C\u0430\u043B\u0430\u0433\u0430\u0441\u0456\u0439\u0441\u044C\u043A\u0430" }
+        mi { "\u041C\u0430\u043E\u0440\u0456" }
+        mk { "\u041C\u0430\u043A\u0435\u0434\u043E\u043D\u0441\u044C\u043A\u0430" }
+        ml { "\u041C\u0430\u043B\u0430\u0439\u044F\u043B\u0430\u043C" }
+        mn { "\u041C\u043E\u043D\u0433\u043E\u043B\u044C\u0441\u044C\u043A\u0430" }
+        mo { "\u041C\u043E\u043B\u0434\u0430\u0432\u0441\u044C\u043A\u0430" }
+        mr { "\u041C\u0430\u0440\u0430\u0442\u0445\u0456" }
+        ms { "\u041C\u0430\u043B\u0430\u0439\u0441\u044C\u043A\u0430" }
+        mt { "\u041C\u0430\u043B\u044C\u0442\u0456\u0439\u0441\u044C\u043A\u0430" }
+        my { "\u0411\u0443\u0440\u043C\u0456\u0441\u0456\u0439\u0441\u044C\u043A\u0430" }
+        na { "\u041D\u0430\u0443\u0440\u0443" }
+        ne { "\u041D\u0435\u043F\u0430\u043B\u044C\u0441\u044C\u043A\u0430" }
+        nl { "\u0413\u043E\u043B\u043B\u0430\u043D\u0434\u0441\u044C\u043A\u0430" }
+        no { "\u041D\u043E\u0440\u0432\u0435\u0437\u044C\u043A\u0430" }
+        oc { "\u041E\u043A\u0438\u0442\u0430\u043D" }
+        om { "\u041E\u0440\u043E\u043C\u043E" }
+        or { "\u041E\u0440\u0456\u044F" }
+        pa { "\u041F\u0430\u043D\u0434\u0436\u0430\u0431\u0456" }
+        pl { "\u041F\u043E\u043B\u044C\u0441\u044C\u043A\u0430" }
+        ps { "\u041F\u0430\u0448\u0442\u043E" }
+        pt { "\u041F\u043E\u0440\u0442\u0443\u0433\u0430\u043B\u044C\u0441\u044C\u043A\u0430" }
+        qu { "\u041A\u0435\u0447\u0443\u0430" }
+        rm { "\u0420\u0435\u0442\u043E\u0440\u043E\u043C\u0430\u043D\u0441\u044C\u043A\u0430" }
+        rn { "\u041A\u0456\u0440\u0443\u043D\u0434\u0456\u0439\u0441\u044C\u043A\u0430" }
+        ro { "\u0420\u0443\u043C\u0443\u043D\u0441\u044C\u043A\u0430" }
+        ru { "\u0420\u043E\u0441\u0456\u0439\u0441\u044C\u043A\u0430" }
+        rw { "\u041A\u0456\u043D\u0430\u0440\u0443\u0430\u043D\u0434\u0430" }
+        sa { "\u0421\u0430\u043D\u0441\u043A\u0440\u0438\u0442" }
+        sd { "\u0421\u0456\u043D\u0434\u0442\u0445\u0456" }
+        sg { "\u0421\u0430\u043D\u0433\u0440\u043E" }
+        sh { "\u0421\u0435\u0440\u0431\u0441\u044C\u043A\u043E-\u0445\u043E\u0440\u0432\u0430\u0442\u0441\u044C\u043A\u0430" }
+        si { "\u0421\u0438\u043D\u0433\u0430\u043B\u044C\u0441\u044C\u043A\u0430" }
+        sk { "\u0421\u043B\u043E\u0432\u0430\u0446\u044C\u043A\u0430" }
+        sl { "\u0421\u043B\u043E\u0432\u0435\u043D\u0441\u044C\u043A\u0430" }
+        sm { "\u0421\u0430\u043C\u043E\u0430\u043D\u0441\u044C\u043A\u0430" }
+        sn { "\u0428\u043E\u043D\u0430" }
+        so { "\u0421\u043E\u043C\u0430\u043B\u0456" }
+        sq { "\u0410\u043B\u0431\u0430\u043D\u0441\u044C\u043A\u0430" }
+        sr { "\u0421\u0435\u0440\u0431\u0441\u044C\u043A\u0430" }
+        ss { "\u0421\u0456\u0441\u0432\u0430\u0442\u0456" }
+        st { "\u0421\u0435\u0441\u043E\u0442\u0445\u043E" }
+        su { "\u0421\u0443\u0434\u0430\u043D\u0441\u044C\u043A\u0430" }
+        sv { "\u0428\u0432\u0435\u0434\u0441\u044C\u043A\u0430" }
+        sw { "\u0421\u0443\u0430\u0445\u0456\u043B\u0456" }
+        ta { "\u0422\u0430\u043C\u0456\u043B\u044C\u0441\u044C\u043A\u0430" }
+        te { "\u0422\u0435\u043B\u0443\u0433\u0443" }
+        tg { "\u0422\u0430\u0434\u0436\u0438\u0446\u044C\u043A\u0430" }
+        th { "\u0422\u0430\u0439\u0441\u044C\u043A\u0430" }
+        ti { "\u0422\u0438\u0433\u0440\u0456\u043D\u0456" }
+        tk { "\u0422\u0443\u0440\u043A\u043C\u0435\u043D\u0441\u044C\u043A\u0430" }
+        tl { "\u0422\u0430\u0433\u0430\u043B\u044C\u0441\u044C\u043A\u0430" }
+        tn { "\u0421\u0435\u0442\u0441\u0432\u0430\u043D\u0441\u044C\u043A\u0430" }
+        to { "\u0422\u043E\u043D\u0433\u0430" }
+        tr { "\u0422\u0443\u0440\u0435\u0446\u044C\u043A\u0430" }
+        ts { "\u0422\u0441\u043E\u043D\u0433\u043E" }
+        tt { "\u0422\u0430\u0442\u0430\u0440\u0441\u044C\u043A\u0430" }
+        tw { "\u0422\u0432\u0456" }
+        ug { "\u0423\u0439\u0433\u0443\u0440\u0441\u044C\u043A\u0430" }
+        //uk { "\u0443\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430" } // Old value
+        uk { "\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430" }
+        ur { "\u0423\u0440\u0434\u0443" }
+        uz { "\u0423\u0437\u0431\u0435\u0446\u044C\u043A\u0430" }
+        vi { "\u0412'\u0454\u0442\u043D\u0430\u043C\u0441\u044C\u043A\u0430" }
+        vo { "\u0412\u043E\u043B\u0430\u043F\u0430\u043A" }
+        wo { "\u0412\u043E\u043B\u043E\u0444" }
+        xh { "\u041A\u0445\u043E\u0441\u0430" }
+        yi { "\u0406\u0434\u0438\u0448" }
+        yo { "\u0419\u043E\u0440\u0443\u0431\u0430" }
+        za { "\u0417\u0443\u0430\u043D\u0433" }
+        zh { "\u041A\u0438\u0442\u0430\u0439\u0441\u044C\u043A\u0430" }
+        zu { "\u0417\u0443\u043B\u0443\u0441\u044C\u043A\u0430" }
     }
-    LocaleID:int { 0x22 }
-//    LocaleString { "uk" }
+    LocaleScript:array {
+        "Cyrl"      // ISO 15924 Name 
+    }
+    localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
     MonthAbbreviations { 
         "\u0441\u0456\u0447",
         "\u043B\u044E\u0442",
@@ -119,7 +512,7 @@
     }
     NumberElements {
         ",",
-        ".",
+        "\u00A0",
         ";",
         "%",
         "0",
@@ -130,25 +523,50 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
-//    ShortLanguage { "ukr" }
-    localPatternChars { "GanjkHmsSEDFwWxhKzAe" }
-    zoneStrings { 
-        {
-            "Africa/Casablanca",
-            "GMT",
-            "GMT",
-            "GMT",
-            "GMT",
-        }
-    }
-    LocaleScript:array {
-        "Cyrl"      // ISO 15924 Name 
-    }
-    ExemplarCharacters { "[\u0430-\u0449 \u044e \u044c \u044f \u0454 \u0456 \u0457 \u0491]" }
 
-    // Currency display names
-    Currencies {
-        UAH { "\u0433\u0440\u043D.", "UAH" }
+
+    // TODO: Can someone supply me with information on negatives and decimals?
+    // How about words for billions and trillions?
+
+    SpelloutRules {
+        "\u043D\u0443\u043B\u044C; \u043E\u0434\u0438\u043D; \u0434\u0432\u0430; \u0442\u0440\u0438; "
+        "\u0447\u043E\u0442\u0438\u0440\u0438; \u043F'\u044F\u0442\u044C; \u0448\u0456\u0441\u0442\u044C; "
+        "\u0441\u0456\u043C; \u0432\u0456\u0441\u0456\u043C; \u0434\u0435\u0432'\u044F\u0442\u044C;\n"
+        "10: \u0434\u0435\u0441\u044F\u0442\u044C; "
+        "\u043E\u0434\u0438\u043D\u0430\u0434\u0446\u044F\u0442\u044C;\n"
+        "\u0434\u0432\u0430\u043D\u0430\u0434\u0446\u044F\u0442\u044C; "
+        "\u0442\u0440\u0438\u043D\u0430\u0434\u0446\u044F\u0442\u044C; "
+        "\u0447\u043E\u0442\u0438\u0440\u043D\u0430\u0434\u0446\u044F\u0442\u044C;\n"
+        "15: \u043F'\u044F\u0442\u043D\u0430\u0434\u0446\u044F\u0442\u044C; "
+        "\u0448\u0456\u0441\u0442\u043D\u0430\u0434\u0446\u044F\u0442\u044C; "
+        "\u0441\u0456\u043C\u043D\u0430\u0434\u0446\u044F\u0442\u044C; "
+        "\u0432\u0456\u0441\u0456\u043C\u043D\u0430\u0434\u0446\u044F\u0442\u044C; "
+        "\u0434\u0435\u0432'\u044F\u0442\u043D\u0430\u0434\u0446\u044F\u0442\u044C;\n"
+        "20: \u0434\u0432\u0430\u0434\u0446\u044F\u0442\u044C[ >>];\n"
+        "30: \u0442\u0440\u0438\u0434\u0446\u044F\u0442\u044C[ >>];\n"
+        "40: \u0441\u043E\u0440\u043E\u043A[ >>];\n"
+        "50: \u043F'\u044F\u0442\u0434\u0435\u0441\u044F\u0442[ >>];\n"
+        "60: \u0448\u0456\u0441\u0442\u0434\u0435\u0441\u044F\u0442[ >>];\n"
+        "70: \u0441\u0456\u043C\u0434\u0435\u0441\u044F\u0442[ >>];\n"
+        "80: \u0432\u0456\u0441\u0456\u043C\u0434\u0435\u0441\u044F\u0442[ >>];\n"
+        "90: \u0434\u0435\u0432'\u044F\u043D\u043E\u0441\u0442\u043E[ >>];\n"
+        "100: \u0441\u0442\u043E[ >>];\n"
+        "200: \u0434\u0432\u0456\u0441\u0442\u0456[ >>];\n"
+        "300: \u0442\u0440\u0438\u0441\u0442\u0430[ >>];\n"
+        "400: \u0447\u043E\u0442\u0438\u0440\u0438\u0441\u0442\u0430[ >>];\n"
+        "500: \u043F'\u044F\u0442\u0441\u043E\u0442[ >>];\n"
+        "600: \u0448\u0456\u0441\u0442\u0441\u043E\u0442[ >>];\n"
+        "700: \u0441\u0456\u043C\u0441\u043E\u0442[ >>];\n"
+        "800: \u0432\u0456\u0441\u0456\u043C\u0441\u043E\u0442[ >>];\n"
+        "900: \u0434\u0435\u0432'\u044F\u0442\u0441\u043E\u0442[ >>];\n"
+        "1000: \u0442\u0438\u0441\u044F\u0447\u0430[ >>];\n"
+        "2000: << \u0442\u0438\u0441\u044F\u0447\u0456[ >>];\n"
+        "5000: << \u0442\u0438\u0441\u044F\u0447[ >>];\n"
+        "1,000,000: \u043C\u0456\u043B\u044C\u0439\u043E\u043D[ >>];\n"
+        "2,000,000: << \u043C\u0456\u043B\u044C\u0439\u043E\u043D\u0438[ >>];\n"
+        "5,000,000: << \u043C\u0456\u043B\u044C\u0439\u043E\u043D\u0456\u0432[ >>];\n"
+        "1,000,000,000: << \u043C\u0456\u043B\u044C\u044F\u0440\u0434[ >>];" 
     }
 }

Index: uk_UA.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/uk_UA.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- uk_UA.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ uk_UA.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -7,13 +7,10 @@
 
 uk_UA {
     Version { "2.0" }
-//    LocaleString { "uk_UA" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "#,##0.00 \u00A4;-#,##0.00 \u00A4",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "UKR" }
-    LocaleID:int { 0x0422 }
 }

Index: vi.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/vi.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vi.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ vi.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -7,49 +7,314 @@
 
 vi {
     Version { "2.0" }
-    CollationElements { 
-        Version { "2.0" }
-        Sequence { "[normalization on]&\u0300<<\u0309<<\u0303<<\u0301<<"
-        "\u0323<<\u0306<<\u0302<<\u031B"
-        "&D<\u0111<<<\u0110" }
+    AmPmMarkers { 
+        "SA",
+        "CH",
+    }
+    collations {
+        standard { 
+            Version { "3.0" }
+              Sequence { "[normalization on]"
+                  // accented letters are actually ordered like this:
+                  // grave, hook above, tilde, acute, dot below.
+                  "&\u0300<<\u0309<<\u0303<<\u0301<<\u0323"
+                  // primary differences
+                  "&a<\u0103<<<\u0102<\u00E2<<<\u00C2"
+                  "&c<ch<<<Ch<<<CH"
+                  "&d<\u0111<<<\u0110"
+                  "&e<\u00EA<<<\u00CA"
+                  "&g<gi<<<Gi<<<GI"
+                  "&k<kh<<<Kh<<<KH"
+                  "&n<ng<<<Ng<<<NG<nh<<<Nh<<<NH"
+                  "&o<\u00F4<<<\u00D4<\u01A1<<<\u01A0"
+                  "&p<ph<<<Ph<<<PH"
+                  "&t<th<<<Th<<<TH<tr<<<Tr<<<TR"
+                  "&u<\u01B0<<<\u01AF"
+              }
+        }
     }
+    // Note many of the country names have dashes in the name. This seems to be correct.
+    // Translations that are done poorly seem to remove them. This doesn't mean that all the dashes are correct,
+    // but care should be taken before removing them.
     Countries {
-        VN { "Vi\u1EC7t Nam" }
+        AE { "C\u00e1c Ti\u1ec3u V\u01b0\u01a1ng qu\u1ed1c A-r\u1eadp Th\u1ed1ng nh\u1ea5t" }
+        AF { "\u00c1p-ga-ni-xtan" }
+        AG { "An-ti-gu-a v\u00e0 Ba-bu-\u0111a" }
+        AL { "An-ba-ni" }
+        AM { "\u00c1c-m\u00ea-ni-a" }
+        AO { "\u0102ng-g\u00f4-la" }
+        AR { "\u00c1c-hen-ti-na" }
+        AT { "\u00c1o" } // \u00c1o Qu\u1ed1c ?
+        AU { "\u00dac \u00d0\u1ea1i L\u1ee3i" }
+        AZ { "Ai-d\u00e9c-bai-gian" }
+
+        BA { "B\u00f4-xni-a H\u00e9c-x\u00ea-g\u00f4-vi-na" }
+        BB { "B\u00e1c-ba-\u0111\u1ed1t" }
+        BD { "B\u0103ng-la-\u0111\u00e9t" }
+        BE { "B\u1ec9" }
+        BF { "Bu\u1ed1c-ki-na Pha-x\u00f4" }
+        BG { "Bun-ga-ri" }
+        BH { "Ba-ren" }
+        BI { "Bu-run-\u0111i" }
+        BJ { "B\u00ea-nanh" }
+        BN { "Bru-n\u00e2y" }
+        BO { "B\u00f4-li-vi-a" }
+        BR { "Bra-xin" }
+        BS { "Ba-ha-ma" }
+        BW { "B\u1ed1t-xoa-na" }
+        BY { "B\u00ea-la-r\u00fat" }
+        BZ { "B\u00ea-li-x\u00ea" }
+
+        CA { "Ca-na-\u0111a" }
+        CF { "C\u1ed9ng h\u00f2a Trung Phi" }
+        CG { "C\u00f4ng-g\u00f4" }
+        CH { "Thu\u1ef5 S\u0129" }
+        CI { "B\u1edd Bi\u1ec3n Ng\u00e0" }
+        CL { "Chi-l\u00ea" }
+        CM { "Ca-m\u01a1-run" }
+        CN { "Trung Qu\u1ed1c" }
+        CO { "C\u00f4-l\u00f4m-bi-a" }
+        CR { "C\u1ed1t-xta Ri-ca" }
+        CU { "Cu-ba" }
+        CV { "C\u00e1p-ve" }
+        CY { "S\u00edp" }
+        CZ { "C\u1ed9ng h\u00f2a S\u00e9c" }
+
+        DE { "\u00d0\u1ee9c" }
+        DJ { "Gi-bu-ti" }
+        DK { "\u0110an M\u1ea1c" }
+        DZ { "An-gi\u00ea-ri" }
+
+        EC { "\u00ca-cu-a-\u0111o" }
+        EE { "E-xt\u00f4-ni-a" }
+        EG { "Ai-c\u1eadp" }
+        EH { "Ph\u00eda t\u00e2y Sahara" }
+        ER { "\u00ca-ri-t\u01a1-r\u00ea-a" }
+        ES { "T\u00e2y Ban Nha" }
+        ET { "\u00ca-ti-\u00f4-pi-a" }
+
+        FI { "Ph\u1ea7n Lan" }
+        FJ { "Phi-gi" }
+        FM { "Mi-cr\u00f4-n\u00ea-xi-a" }
+        FR { "Ph\u00e1p" }
+
+        GA { "Ga-b\u00f4ng" }
+        GB { "V\u01b0\u01a1ng qu\u1ed1c Anh" }
+        GD { "Gr\u00ea-na-\u0111a" }
+        GE { "Gru-di-a" }
+        GH { "Gha-na" }
+        GM { "G\u0103m-bi-a" }
+        GN { "Ghi-n\u00ea" }
+        GQ { "Ghi-n\u00ea X\u00edch-\u0111\u1ea1o" }
+        GR { "Hy L\u1ea1p" }
+        GT { "Goa-t\u00ea-ma-la" }
+        GW { "Ghi-n\u00ea B\u00edt-xao" }
+        GY { "Guy-a-na" }
+
+        HN { "H\u00f4n-\u0111u-r\u00e1t" }
+        HR { "Cr\u00f4-a-ti-a" }
+        HT { "Ha-i-ti" }
+        HU { "Hung-ga-ri" }
+
+        ID { "Nam D\u01b0\u01a1ng" } // or maybe also In-\u0111\u00f4-n\u00ea-xi-a
+        IE { "Ai-len" }
+        IL { "I-xra-en" }
+        IN { "\u1ea4n \u00d0\u1ed9" }
+        IQ { "I-r\u1eafc" }
+        IR { "I-ran" }
+        IS { "Ai-x\u01a1-len" }
+        IT { "\u00DD" } // The less frequent form of this country is "I-ta-li-a"
+
+        JM { "Ha-mai-ca" }
+        JO { "Gi\u00f3c-\u0111a-ni" }
+        JP { "Nh\u1eadt B\u1ea3n" }
+
+        KE { "K\u00ea-ni-a" }
+        KG { "C\u01b0-r\u01a1-g\u01b0-xtan" }
+        KH { "Cam-pu-chia" }
+        KI { "Ki-ri-ba-ti" }
+        KM { "C\u00f4-m\u00f4" }
+        KN { "Xan-k\u00edt v\u00e0 N\u00ea-vi" }
+        KP { "Tri\u1ec1u Ti\u00ean" } // Alt name?: C\u1ed9ng h\u00f2a D\u00e2n ch\u1ee7 Nh\u00e2n d\u00e2n Tri\u1ec1u Ti\u00ean
+        KR { "H\u00e0n Qu\u1ed1c" }
+        KW { "C\u00f4-o\u00e9t" }
+        KZ { "Ka-d\u1eafc-xtan" }
+
+        LA { "L\u00e0o" }
+        LB { "Li-b\u0103ng" }
+        LC { "Xan Lu-xi" }
+        LI { "Lich-ten-xt\u00ean" }
+        LK { "Xri Lan-ca" }
+        LR { "Li-b\u00ea-ri-a" }
+        LS { "L\u00ea-x\u00f4-th\u00f4" }
+        LT { "Li-tu-a-ni-a" }
+        LU { "L\u00fac-x\u0103m-bua" }
+        LV { "L\u00e1t-vi-a" }
+        LY { "Li-bi" }
+
+        MA { "Ma-r\u1ed1c" }
+        MC { "M\u00f4-na-c\u00f4" }
+        MD { "M\u00f4n-\u0111\u00f4-va" }
+        MG { "Ma-\u0111a-g\u00e1t-xca" }
+        MH { "Qu\u1ea7n \u0111\u1ea3o M\u00e1c-san"}
+        MK { "Ma-x\u00ea-\u0111\u00f4-ni-a" }
+        ML { "Ma-li" }
+        MM { "Mi-an-ma" }
+        MN { "M\u00f4ng C\u1ed5" }
+        MR { "M\u00f4-ri-ta-ni" }
+        MT { "Man-ta" }
+        MU { "M\u00f4-ri-x\u01a1" }
+        MV { "Man-\u0111i-v\u01a1" }
+        MW { "Ma-la-uy" }
+        MX { "M\u00ea-hi-c\u00f4" }
+        MY { "Ma-lay-xi-a" }
+        MZ { "M\u00f4-d\u0103m-b\u00edch" }
+
+        NA { "Nam-mi-bi-a" }
+        NE { "Ni-gi\u00ea" }
+        NG { "Ni-gi\u00ea-ri-a" }
+        NI { "Ni-ca-ra-goa" }
+        NL { "H\u00e0 Lan" }
+        NO { "Na Uy" }
+        NP { "N\u00ea-pan" }
+        NZ { "Niu Di-l\u00e2n" }
+
+        OM { "\u00d4-man" }
+
+        PA { "Pa-na-ma" }
+        PE { "P\u00ea-ru" }
+        PG { "Pa-pu-a Niu Ghi-n\u00ea" }
+        PH { "Phi-lip-pin" }
+        PK { "Pa-ki-xtan" }
+        PL { "Ba Lan" }
+        PT { "B\u1ed3 \u00d0\u00e0o Nha" }
+        PY { "Pa-ra-goay" }
+
+        QA { "Ca-ta" }
+
+        RO { "Ru-ma-ni" }
+        RU { "Nga" }
+        RW { "Ru-an-\u0111a" }
+
+        SA { "\u1ea2-r\u1eadp X\u00ea-\u00fat" }
+        SB { "Qu\u1ea7n \u0111\u1ea3o X\u00f4-l\u00f4-m\u00f4ng" }
+        SC { "X\u00e2y-sen" }
+        SD { "Xu-\u0111\u0103ng" }
+        SE { "Thu\u1ef5 \u0110i\u1ec3" }
+        SG { "Xin-ga-po" }
+        SI { "Xl\u00f4-ven-ni-a" }
+        SK { "Xl\u00f4-va-ki-a" }
+        SL { "Xi-\u00ea-ra L\u00ea-\u00f4n" }
+        SM { "Xan Ma-ri-n\u00f4" }
+        SN { "X\u00ea-n\u00ea-gan" }
+        SO { "X\u00f4-ma-li" }
+        SP { "S\u00e9cbia" }
+        SR { "Xu-ri-nam" }
+        ST { "Xao T\u00f4-m\u00ea v\u00e0 Prin-xi-p\u00ea" }
+        SV { "En-san-va-\u0111o" }
+        SY { "Xi-ri" }
+        SZ { "Xoa-di-len" }
+
+        TD { "S\u00e1t" }
+        TG { "T\u00f4-g\u00f4" }
+        TH { "Th\u00e1i Lan" }
+        TJ { "T\u00e1t-gi-ki-xtan" }
+        TM { "Tu\u1ed1c-m\u00ea-ni-xtan" }
+        TN { "Tuy-ni-di" }
+        TO { "T\u00f4ng-ga" }
+        TR { "Th\u1ed5 Nh\u0129 K\u1ef3" }
+        TT { "Tri-ni-\u0111\u00e1t v\u00e0 T\u00f4-ba-g\u00f4" }
+        TV { "Tu-va-lu" }
+        TW { "\u00d0\u00e0i Loan" }
+        TZ { "Tan-da-ni-a" }
+
+        UA { "U-crai-na" }
+        UG { "U-gan-\u0111a" }
+        US { "H\u1ee3p ch\u00fang qu\u1ed1c Hoa k\u1ef3" } // M\u1ef9 = slang abbreviated form of US; Hoa K\u1ef3 = US; H\u1ee3p ch\u00fang qu\u1ed1c Hoa k\u1ef3 = USA 
+        UY { "U-ru-goay" }
+        UZ { "U-d\u01a1-b\u00ea-ki-xtan" }
+
+        VA { "Va-ti-c\u0103ng" }
+        VC { "Xan Vin-xen v\u00e0 Gr\u00ea-na-din" }
+        VE { "V\u00ea-n\u00ea-zu-\u00ea-la" }
+        VN { "Vi\u1ec7t Nam" }
+        VU { "Va-nu-a-tu" }
+
+        WS { "Xa-moa" }
+
+        YE { "Y-\u00ea-men" }
+
+        ZA { "Nam Phi" }
+        ZM { "D\u0103m-bi-a" }
+        ZW { "Dim-ba-bu-\u00ea" }
     }
-    Languages {
-        vi { "Ti\u1EBFng Vi\u1EC7t" }
+    Currencies {
+        VND { "\u0111", "\u00d0\u00f4ng" } // Vietnamese Dong. More people use \u0111 rather than \u20AB
+    }
+    DateTimeElements:intvector { 
+        2,
+        1,
     }
     DateTimePatterns {
         "HH:mm:ss z",
         "HH:mm:ss z",
         "HH:mm:ss",
         "HH:mm",
-        "EEEE dd MMMM yyyy",
-        "EEE dd MMM yyyy",
-        "dd MMM yyyy",
-        "dd/MM/yy",
+        "EEEE dd MMMM yyyy",    // Should this be "EEEE dd MMMM n\u0103m yyyy"?
+        "dd MMMM yyyy",         // Should this be "dd MMMM n\u0103m yyyy"?
+        "dd-MM-yyyy",
+        "dd/MM/yyyy",
         "{0} {1}",
     }
     DayAbbreviations {
+        "CN",
         "Th 2",
         "Th 3",
         "Th 4",
         "Th 5",
         "Th 6",
         "Th 7",
-        "CN",
     }
     DayNames {
+        "Ch\u1EE7 nh\u1EADt",
         "Th\u1EE9 hai",
         "Th\u1EE9 ba",
         "Th\u1EE9 t\u01B0",
         "Th\u1EE9 n\u0103m",
         "Th\u1EE9 s\u00E1u",
         "Th\u1EE9 b\u1EA3y",
-        "Ch\u1EE7 nh\u1EADt",
     }
-    LocaleID:int { 0x002A }
-//    LocaleString { "vi" }
+    // The case of the letters may be wrong for languages because Ti\u1EBFng is used.
+    // Ti\u1EBFng is used in order to clarify some of the names, and ti\u1EBFng means "language".
+    // Ti\u1EBFng is used to differentiate similar words like English from England and German from Germany,
+    //   which are frequently the same in Vietnamese.
+    // It is difficult to decide whether Ti\u1EBFng should precede the translation, but it doesn't hurt to keep it there.
+    Languages {
+        ca { "Ti\u1EBFng Catalan" }
+        da { "Ti\u1EBFng \u0110an M\u1EA1ch" }
+        de { "Ti\u1EBFng \u0110\u1EE9c" }
+        en { "Ti\u1EBFng Anh" }
+        eo { "Ti\u1EBFng Esp\u00E9ranto" }
+        es { "Ti\u1EBFng T\u00E2y Ban Nha" }
+        fr { "Ti\u1EBFng Ph\u00E1p" }
+        hr { "Ti\u1EBFng Cr\u00f4atia" }
+        hu { "Ti\u1EBFng Hung-ga-ri" }
+        it { "Ti\u1EBFng \u00DD" } // Just \u00DD seems okay because Ti\u1EBFng is used. \u00DD is sometimes used to mean Italy too.
+        ja { "Ti\u1EBFng Nh\u1EADt" }
+        ko { "Ti\u1EBFng H\u00E0n Qu\u1ED1c" }
+        nl { "Ti\u1EBFng H\u00E0 Lan" }
+        pt { "Ti\u1EBFng B\u1ED3 \u0110\u00E0o Nha" }
+        ro { "Ti\u1EBFng La M\u00E3" }
+        ru { "Ti\u1EBFng Nga" }
+        sv { "Ti\u1EBFng Thu\u1EF5 \u0110i\u1EC3n" }
+        tr { "Ti\u1EBFng Th\u1ED5 Nh\u0129 K\u1EF3" }
+        vi { "Ti\u1EBFng Vi\u1EC7t" }
+        zh { "Ti\u1EBFng Trung Qu\u1ED1c" }
+    }
+    LocaleScript{ 
+        "Latn",  // ISO 15924 Name 
+    }
+    ExemplarCharacters{ "[a-z\u1EA0-\u1Ef9\u0111\u01A1\u00E0-\u00E3\u00E8-\u00EA\u00EC\u00ED\u00F2-\u00F5\u00F9\u00FA\u00FD\u0103\u0129\u0169\u01B0]" }
     MonthAbbreviations {
         "Thg 1",
         "Thg 2",
@@ -91,6 +356,7 @@
         "\u221E",
         "\uFFFD",
         ",",
+        "+",
     }
     NumberPatterns {
         "#,##0.###;-#,##0.###",
@@ -98,9 +364,4 @@
         "#,##0%",
         "#E0",
     }
-//    ShortLanguage { "vie" }
-//    LocaleScript{ 
-//                "Latn",  // ISO 15924 Name 
-//    }
-    ExemplarCharacters{ "[a-z \u1EA0-\u1Ef9 \u0111 \u01A1 \u00E0-\u00E3 \u00E8-\u00EA \u00EC \u00ED \u00F2-\u00F5 \u00F9 \u00FA \u00FD \u0103 \u0129 \u0169 \u01B0]" }
 }

Index: vi_VN.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/vi_VN.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vi_VN.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ vi_VN.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -7,11 +7,4 @@
 
 vi_VN {
     Version{ "2.0" }
-    LocaleID:int { 0x042A }
-//    LocaleString { "vi_VN" }
-//    ShortCountry { "VNM" }
-
-    Currencies {
-        VND { "\u20AB", "VND" } // Vietnamese Dong
-    }
 }

Index: zh.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/zh.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- zh.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ zh.txt	6 Apr 2004 10:08:15 -0000	1.2
@@ -11,7 +11,8 @@
         "\u4E0A\u5348",
         "\u4E0B\u5348",
     }
-    CollationElements { 
+    collations {
+      standard { 
         Version { "1.0" }
         Sequence{"&\u0304<<\u0301<<\u030C<<\u0300<<\u0308"
         "&[top]"
@@ -767,217 +768,5635 @@
         "<\u9E82<\u9E87<\u9E88<\u9E8B<\u9E92<\u93D6<\u9E9D<\u9E9F<\u9EDB"
[...6916 lines suppressed...]
-        MOP { "P",   "MOP" }
-        SGD { "S$",  "SGD" }
-        TWD { "NT$", "TWD" }
+    Types{
+        collation{
+            pinyin      { "\u62FC\u97F3\u987a\u5e8f" }
+            stroke      { "\u7b14\u5212\u987a\u5e8f" }   // Simplified Chinese name.
+            traditional { "\u4f20\u7edf\u5386\u6cd5" }  // Spanish traditional sorting
+        }
+        calendar{
+            traditional { "\u4f20\u7edf\u5386\u6cd5" }
+        }
     }
+    Variants{
+        // EURO    { "\u6b27\u5143" }
+        // PREEURO { "\u65e7\u5e01" }
+        REVISED { "\u5df2\u4fee\u8ba2" }
+    }
+
 }

Index: zh_CN.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/zh_CN.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- zh_CN.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ zh_CN.txt	6 Apr 2004 10:08:16 -0000	1.2
@@ -7,31 +7,23 @@
 
 zh_CN {
     Version{ "2.0" }
-//    LocaleString { "zh_CN" }
     NumberPatterns { 
         "#,##0.###;-#,##0.###",
         "\u00A4#,##0.00;-\u00A4#,##0.00",
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "CHN" }
-    Countries {
-        CN { "\u4E2D\u534E\u4EBA\u6C11\u5171\u548C\u56FD" }
-        TW { "\u53F0\u6E7E" }
-        HK { "\u9999\u6E2F" }
-    }
-    LocaleID:int { 0x0804 }
-
+    // use 12-hour time (24-hour time is also known to be used)
     DateTimePatterns { 
-        "HH'\u65F6'mm'\u5206'ss'\u79D2' z",
+        "ahh'\u65F6'mm'\u5206'ss'\u79D2' z",
         "ahh'\u65F6'mm'\u5206'ss'\u79D2'",
-        "H:mm:ss",
+        "ahh:mm:ss",
         "ah:mm",
-        "yyyy'\u5E74'M'\u6708'd'\u65E5'",
+        "yyyy'\u5E74'M'\u6708'd'\u65E5'EEEE",
         "yyyy'\u5E74'M'\u6708'd'\u65E5'",
         "yyyy-M-d",
         "yy-M-d",
         "{1} {0}",
     }
 }
-
+  
\ No newline at end of file

Index: zh_HK.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/zh_HK.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- zh_HK.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ zh_HK.txt	6 Apr 2004 10:08:16 -0000	1.2
@@ -7,15 +7,18 @@
 
 zh_HK {
     Version{ "2.0" }
-    CollationElements:alias { "zh_TW" }
-    
+    collations { 
+        default { "traditional" }
+    }
+    Countries:alias { "zh_TW" }
+
     DateTimePatterns { 
         "ahh'\u6642'mm'\u5206'ss'\u79D2' z",
         "ahh'\u6642'mm'\u5206'ss'\u79D2'",
         "ahh:mm:ss",
         "ah:mm",
         "yyyy'\u5E74'MM'\u6708'dd'\u65E5' EEEE",
-        "yyyy'\u5E74'MM'\u6708'dd'\u65E5' EEEE",
+        "yyyy'\u5E74'MM'\u6708'dd'\u65E5'",
         "yyyy'\u5E74'M'\u6708'd'\u65E5'",
         "yy'\u5E74'M'\u6708'd'\u65E5'",
         "{1} {0}",
@@ -29,8 +32,8 @@
         "\u4E94",
         "\u516D",
     }
-    LocaleID:int { 0x0c04 }
-//    LocaleString { "zh_HK" }
+    ExemplarCharacters:alias { "zh_TW" }
+    Languages:alias { "zh_TW" }
     MonthAbbreviations { 
         "1\u6708",
         "2\u6708",
@@ -51,7 +54,9 @@
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "HKG" }
+    Types:alias { "zh_TW" }
+    Variants:alias { "zh_TW" }
+/*
     zoneStrings { 
         {
             "CTT",
@@ -62,4 +67,5 @@
             "Hong Kong",
         }
     }
+*/
 }

Index: zh_MO.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/zh_MO.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- zh_MO.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ zh_MO.txt	6 Apr 2004 10:08:16 -0000	1.2
@@ -7,15 +7,17 @@
 
 zh_MO {
     Version{ "2.0" }
-    CollationElements:alias { "zh_TW" }
-    
+    collations { 
+        default { "traditional" }
+    }
+    Countries:alias { "zh_TW" }
     DateTimePatterns { 
         "ahh'\u6642'mm'\u5206'ss'\u79D2' z",
         "ahh'\u6642'mm'\u5206'ss'\u79D2'",
         "ahh:mm:ss",
         "ah:mm",
         "yyyy'\u5E74'MM'\u6708'dd'\u65E5' EEEE",
-        "yyyy'\u5E74'MM'\u6708'dd'\u65E5' EEEE",
+        "yyyy'\u5E74'MM'\u6708'dd'\u65E5'",
         "yyyy'\u5E74'M'\u6708'd'\u65E5'",
         "yy'\u5E74'M'\u6708'd'\u65E5'",
         "{1} {0}",
@@ -29,8 +31,8 @@
         "\u4E94",
         "\u516D",
     }
-    LocaleID:int { 0x1404 }
-//    LocaleString { "zh_MO" }
+    ExemplarCharacters:alias { "zh_TW" }
+    Languages:alias { "zh_TW" }
     MonthAbbreviations { 
         "1\u6708",
         "2\u6708",
@@ -51,7 +53,9 @@
         "#,##0%",
         "#E0",
     }
-//    ShortCountry { "MAC" }
+    //Keys:alias { "zh_TW" }
+    Types:alias { "zh_TW" }
+    Variants:alias { "zh_TW" }
 //    zoneStrings { 
 //        {
 //                "CTT",
@@ -63,3 +67,4 @@
 //        }
 //    }
 }
+

Index: zh_SG.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/zh_SG.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- zh_SG.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ zh_SG.txt	6 Apr 2004 10:08:16 -0000	1.2
@@ -1,4 +1,4 @@
-  // -*- Coding: utf-8; -*-
+// -*- Coding: utf-8; -*-
 // ***************************************************************************
 // *
 // *   Copyright (C) 1997-2003, International Business Machines
@@ -10,13 +10,6 @@
 
 zh_SG {
     Version { "2.0" }
-
-    NumberPatterns { 
-        "#,##0.###;-#,##0.###",
-        "\u00A4#,##0.00;-\u00A4#,##0.00",
-        "#,##0%",
-        "#E0",
-    }
 //    AmPmMarkers { 
 //        "\u4E0A\u5348", // am
 //        "\u4E0B\u5348" // pm
@@ -35,10 +28,30 @@
         "{1} {0}"
     }
 
-    LocaleID:int { 0x1004 }
-
-//    ShortCountry { "SIN" } // copied from zh_EN.txt
+    // Duplicates from zh locale have been removed.
+    Countries {
+        AU { "\u6FB3\u6D32" }
+        CZ { "\u6377\u514B" }
+        ID { "\u5370\u5C3C" }
+        KR { "\u5357\u97E9" }
+        MK { "\u9A6C\u5176\u987F" }
+        NZ { "\u7EBD\u897F\u5170" }
+        SA { "\u6C99\u5730\u963F\u62C9\u4F2F" }
+    }
+    // Duplicates from zh locale have been removed.
+    Languages {
+        root { "\u6839 \u6e90" }
 
+        ko { "\u97e9\u6587" }           // Korean
+        sh { "\u585e\u5c14\u7ef4\u4e9a\u514b\u7f57\u5730\u4e9a\u6587" }   // SerboCroatian
+    }
+    NumberPatterns { 
+        "#,##0.###;-#,##0.###",
+        "\u00A4#,##0.00;-\u00A4#,##0.00",
+        "#,##0%",
+        "#E0",
+    }
+/*
     zoneStrings { 
         {
             "SST",
@@ -49,136 +62,5 @@
 //            "Singapore"
         }
     }
-
-    // Duplicates from zh locale according to Syn Wee have been removed.
-    Languages
-    {
-        root { "\u6839 \u6e90" }
-
-        //ar { "阿拉伯文" }       // Arabic
-        //de { "德语" }           // German
-        //el { "希腊语" }         // Greek
-        //es { "西班牙语" }       // Spanish
-        //eu { "巴斯克" }         // Basque
-        //fr { "法语" }           // French
-        //he { "希伯来语" }       // Hebrew
-        //hi { "印度语" }         // Hindi
-        //hu { "匈牙利语" }       // Hungarian
-        //id { "印度尼西亚语" }   // Indonesian
-        //it { "意大利语" }       // Italian
-        //ja { "日语" }           // Japanese
-        ko { "\u97e9\u6587" }           // Korean
-//        ko { "韩语" }           // Korean
-        //pl { "波兰" }           // Polish
-        //pt { "葡萄牙语" }       // Portuguese
-        //ro { "罗马尼亚语" }     // Romanian
-        //ru { "俄语" }           // Russian
-        sh { "\u585e\u5c14\u7ef4\u4e9a\u514b\u7f57\u5730\u4e9a\u6587" }   // SerboCroatian
-//        sh { "塞尔维亚克罗" }   // SerboCroatian
-        //sk { "斯洛伐克语" }     // Slovak
-        //sl { "斯洛文尼亚语" }   // Slovenian
-        //sq { "阿尔巴尼亚" }     // Albanian
-        //sr { "塞尔维亚语" }     // Serbian
-        //sv { "瑞典语" }         // Swedish
-        //ta { "泰米尔语" }       // Tamil
-        //th { "泰语" }           // Thai
-        //tr { "土耳其语" }       // Turkish
-        //vi { "越语" }           // Vietnamese
-    }
-
-    // Duplicates from zh locale according to Syn Wee have been removed.
-    Countries
-    {
-        //AL { "\u963f\u5c14\u5df4\u5c3c\u4e9a" }
-        //AE { "阿拉伯联合 "} #do not do this yet, missing a part.   United Arab Emirates 
-        //AR { "阿根廷" }         // Argentina
-        //AT { "奥地利" }         // Austria
-        AU { "澳洲" }           // Australia
-        //BE { "比利时" }         // Belgium
-        //BY { "白俄罗斯" }       // Belarus
-        //BG { "保加利亚" }       // Bulgaria
-        //BH { "巴林" }           // Bahrain
-        //BO { "玻利维亚" }       // Bolivia
-        //BW { "博茨瓦纳" }       // Botswana
-        //BR { "巴西" }           // Brazil
-        //CA { "加拿大" }         // Canada
-        //CH { "瑞士" }           // Switzerland
-        //CL { "智利" }           // Chile
-        //CO { "哥伦比亚" }       // Colombia
-        //CR { "哥斯达黎加" }     // CostaRica
-        CZ { "捷克" }           // Czech Republic
-        //DE { "德国" }           // Germany
-        //DK { "丹麦" }           // Denmark
-        //DO { "多米尼加共和国" } // Dominican Republic
-        //DZ { "阿尔及利亚" }     // Algeria
-        //EC { "厄瓜多尔" }       // Ecuador
-        //EE { "爱沙尼亚" }       // Estonia
-        //EG { "埃及" }           // Egypt
-        //ES { "西班牙" }         // Spain
-        //FI { "芬兰" }           // Finland
-        //FR { "法国" }           // France
-        //GB { "英国" }           // UnitedKingdom
-        GL { "格陵兰" }         // Greenland
-        //GR { "希腊" }           // Greece
-        //GT { "危地马拉" }       // Guatemala
-        //HN { "洪都拉斯" }       // Honduras
-        //HR { "克罗地亚" }       // Croatia
-        //HU { "匈牙利" }         // Hungary
-        ID { "印尼" }           // Indonesia
-        //IE { "爱尔兰" }         // Ireland
-        //IL { "以色列" }         // Israel
-        //IN { "印度" }           // India
-        //IQ { "伊拉克" }         // Iraq
-        //IR { "伊朗" }           // Iran
-        //IS { "冰岛" }           // Iceland
-        //IT { "意大利" }         // Italy
-        //JO { "约旦" }           // Jordan
-        //JP { "日本" }           // Japan
-        //KE { "肯尼亚" }         // Kenya
-        KR { "南韩" }           // South Korea
-        //KW { "科威特" }         // Kuwait
-        //LB { "黎巴嫩" }         // Lebanon
-        //LT { "立陶宛" }         // Lithuania
-        //LU { "卢森堡" }         // Luxembourg
-        //LV { "拉脱维亚" }       // Latvia
-        //LY { "利比亚" }         // Libya
-        //MA { "摩洛哥" }         // Morocco
-        MK { "马其顿" }         // Macedonia
-        //MT { "马耳他" }         // Malta
-        //MX { "墨西哥" }         // Mexico
-        //NI { "尼加拉瓜" }       // Nicaragua
-        //NL { "荷兰" }           // Netherlands
-        //NO { "挪威" }           // Norway
-        NZ { "纽西兰" }         // New Zealand
-        //OM { "阿曼" }           // Oman
-        //PA { "巴拿马" }         // Panama
-        //PE { "秘鲁" }           // Peru
-        //PL { "波兰" }           // Poland
-        PR { "波多黎各" }       // Puerto Rico
-        //PT { "葡萄牙" }         // Portugal
-        //PY { "巴拉圭" }         // Paraguay
-        //QA { "卡塔尔" }         // Qatar
-        //RO { "罗马尼亚" }       // Romania
-        //RU { "俄罗斯" }         // Russia
-        SA { "沙地阿拉伯" }     // Saudi Arabia
-        //SD { "苏丹" }           // Sudan
-        //SE { "瑞典" }           // Sweden
-        //SI { "斯洛文尼亚" }     // Slovenia
-        //SK { "斯洛伐克" }       // Slovakia
-        //SV { "萨尔瓦多" }       // El Salvador
-        //SY { "叙利亚" }         // Syria
-        //TH { "泰国" }           // Thailand
-        //TN { "突尼斯" }         // Tunisia
-        //TR { "土耳其" }         // Turkey
-        //TZ { "坦桑尼亚" }       // Tanzania
-        //UA { "乌克兰" }         // Ukraine
-        //US { "美国" }           // United States
-        //UY { "乌拉圭" }         // Uruguay
-        //VE { "委内瑞拉" }       // Venezuela
-        //VN { "越南" }           // Vietnam
-        //YE { "也门" }           // Yemen
-        //YU { "南斯拉夫" }       // Yugoslavia
-        //ZA { "\u5357\u975e" }   // South Africa
-        //ZW { "津巴布韦" }       // Zimbabwe
-    }
+*/
 }

Index: zh_TW.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/zh_TW.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- zh_TW.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ zh_TW.txt	6 Apr 2004 10:08:16 -0000	1.2
@@ -1,4 +1,4 @@
-// ***************************************************************************
+// ***************************************************************************
 // *
 // *   Copyright (C) 1997-2003, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
@@ -7,1310 +7,258 @@
 
 zh_TW {
     Version{ "2.0" }
-    CollationElements { 
-        Version { "1.0" }
[...2591 lines suppressed...]
+    // Keys{
+    //   collation { "" }
+    //   calendar  { "" }
+    // }
+    Types{
+        collation{
+            stroke      { "\u7B46\u5283\u987a\u5e8f" }   // Traditional Chinese.
+            traditional { "\u50B3\u7D71\u66C6\u6CD5" }
+        }
+        calendar{
+            traditional { "\u50B3\u7D71\u66C6\u6CD5" }
+        }
+    }
+    Variants{
+        // EURO    { "\u6B50\u5143" }
+        // PREEURO { "\u820A\u5E63" }
+        REVISED { "\u5DF2\u4FEE\u8A02" }
     }
+
 }

Index: zh_TW_STROKE.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/zh_TW_STROKE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- zh_TW_STROKE.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ zh_TW_STROKE.txt	6 Apr 2004 10:08:16 -0000	1.2
@@ -7,1645 +7,7 @@
 
 zh_TW_STROKE {
     Version{ "2.0" }
-    CollationElements {
-        Version { "1.1" }
-        Sequence {
-        "& [top] "
-        "<\u4E00<\u4E59<\u4E01<\u4E03<\u4E43<\u4E5D<\u4E86"
-        "<\u4E8C<\u4EBA<\u513F<\u5165<\u516B<\u51E0<\u5200<\u5201"
-        "<\u529B<\u5315<\u5341<\u535C<\u53C8<\u4E42<\u4E5C"
-        "<\u51F5<\u531A<\u5382<\u4E09<\u4E0B<\u4E08<\u4E0A<\u4E2B"
[...1616 lines suppressed...]
-        "<\u9E10<\u9E0F<\u9E12<\u9E11<\u9EA1<\u9EF5<\u9F09<\u9F47"
-        "<\u9F78<\u9F7B<\u9F7A<\u9F79<\u7064<\u77DA<\u8B9A<\u9477"
-        "<\u97C9<\u9A62<\u9A65<\u571E<\u7066<\u7C6F<\u883C<\u8DB2"
-        "<\u8EA6<\u91C3<\u9474<\u9478<\u9476<\u9475<\u9A60<\u9C74"
-        "<\u9C73<\u9C71<\u9C75<\u9E14<\u9E13<\u9EF6<\u9F0A<\u9FA4"
-        "<\u9B2E<\u7E9C<\u8B9C<\u8EAA<\u91C5<\u947D<\u947E<\u947C"
-        "<\u9C77<\u9C78<\u9EF7<\u7068<\u7065<\u7CF7<\u866A<\u883E"
-        "<\u883D<\u883F<\u8B9E<\u8C9C<\u8EA9<\u8EC9<\u974B<\u9873"
-        "<\u9874<\u98CC<\u9961<\u99AB<\u9A64<\u9A66<\u9A67<\u9B24"
-        "<\u9E15<\u9E17<\u9F48<\u8C54<\u947F<\u9E1A<\u6207<\u6B1E"
-        "<\u7227<\u864C<\u8EA8<\u9482<\u9480<\u9481<\u9A69<\u9A68"
-        "<\u9E19<\u7228<\u9A6A<\u9B31<\u9E1B<\u9E1E<\u864B<\u8B9F"
-        "<\u9483<\u9C79<\u9EB7<\u7675<\u9A6B<\u9C7A<\u9E1D<\u7069"
-        "<\u7C72<\u706A<\u7229<\u9EA4<\u9F7E<\u9F49<\u9F98"
-        }
+    collations { 
+      default { "stroke" }
     }
-    LocaleID:int { 0x20404 }
 }

Index: zh__PINYIN.txt
===================================================================
RCS file: /cvs/core/icu-sword/source/data/locales/zh__PINYIN.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- zh__PINYIN.txt	10 Sep 2003 02:42:06 -0000	1.1
+++ zh__PINYIN.txt	6 Apr 2004 10:08:17 -0000	1.2
@@ -1,2643 +1,13 @@
 // *******************************************************************************
 // *
-// *   Copyright (C) 1997-2002, International Business Machines
+// *   Copyright (C) 1997-2003, International Business Machines
 // *   Corporation and others.  All Rights Reserved.
 // *
 // *******************************************************************************
 
 zh__PINYIN {
     Version{ "1.0" }
-    CollationElements {
[...2615 lines suppressed...]
-        "<\u84A9<\u5346<\u8DB3<\u5352<\u54EB<\u5D12<\u5D2A<\u65CF"
-        "<\u50B6<\u7A21<\u7BA4<\u8E24<\u8E3F<\u955E<\u93C3<\u8BC5"
-        "<\u963B<\u7EC4<\u4FCE<\u723C<\u73C7<\u7956<\u7D44<\u8A5B"
-        "<\u977B<\u93BA<\u8B2F<\u5297<\u8E9C<\u945A<\u8EA6<\u947D"
-        "<\u7E64<\u7F35<\u7E82<\u7E89<\u7C6B<\u7E98<\u94BB<\u63DD"
-        "<\u6525<\u539C<\u6718<\u55FA<\u6A36<\u87D5<\u7E97<\u5D8A"
-        "<\u5634<\u567F<\u6FE2<\u74BB<\u67A0<\u682C<\u7D4A<\u9154"
-        "<\u666C<\u6700<\u797D<\u7F6A<\u8FA0<\u917B<\u855E<\u9189"
-        "<\u5DB5<\u6A87<\u92F7<\u930A<\u6A8C<\u7A5D<\u6B08<\u5C0A"
-        "<\u5D9F<\u9075<\u6A3D<\u7E5C<\u7F47<\u9D8E<\u940F<\u9CDF"
-        "<\u9C52<\u9DF7<\u50D4<\u5642<\u6499<\u8B50<\u6358<\u928C"
-        "<\u6628<\u79E8<\u838B<\u637D<\u690A<\u8443<\u7A13<\u7B70"
-        "<\u923C<\u5DE6<\u4F50<\u7E53<\u4F5C<\u5750<\u963C<\u5C9D"
-        "<\u5C9E<\u600D<\u4FB3<\u67DE<\u795A<\u80D9<\u5511<\u5EA7"
-        "<\u888F<\u505A<\u8444<\u84D9<\u98F5<\u7CF3<\u5497"
-        }
+    collations {
+      default { "pinyin" }
     }
 }

--- fa_IN.txt DELETED ---