From 70621e0c6ca85c29bef7fdc713d6ca6eebccf44b Mon Sep 17 00:00:00 2001 From: Vladimir Weinstein Date: Thu, 14 Oct 2004 20:10:38 +0000 Subject: [PATCH] ICU-3938 Collation data generated from CLDR 1.2 X-SVN-Rev: 16485 --- icu4c/source/data/coll/ar.txt | 28 +- icu4c/source/data/coll/be.txt | 8 +- icu4c/source/data/coll/bg.txt | 8 +- icu4c/source/data/coll/ca.txt | 11 +- icu4c/source/data/coll/colfiles.mk | 47 +- icu4c/source/data/coll/cs.txt | 11 +- icu4c/source/data/coll/da.txt | 11 +- icu4c/source/data/coll/de.txt | 17 +- icu4c/source/data/coll/de__PHONEBOOK.txt | 16 +- icu4c/source/data/coll/el.txt | 11 +- icu4c/source/data/coll/en.txt | 4 +- icu4c/source/data/coll/en_BE.txt | 5 +- icu4c/source/data/coll/eo.txt | 8 +- icu4c/source/data/coll/es.txt | 32 +- icu4c/source/data/coll/es__TRADITIONAL.txt | 16 +- icu4c/source/data/coll/et.txt | 11 +- icu4c/source/data/coll/fa.txt | 11 +- icu4c/source/data/coll/fa_AF.txt | 7 +- icu4c/source/data/coll/fi.txt | 11 +- icu4c/source/data/coll/fo.txt | 11 +- icu4c/source/data/coll/fr.txt | 17 +- icu4c/source/data/coll/gu.txt | 11 +- icu4c/source/data/coll/he.txt | 11 +- icu4c/source/data/coll/hi.txt | 11 +- icu4c/source/data/coll/hi__DIRECT.txt | 17 +- icu4c/source/data/coll/hr.txt | 11 +- icu4c/source/data/coll/hu.txt | 11 +- icu4c/source/data/coll/is.txt | 11 +- icu4c/source/data/coll/it.txt | 14 +- icu4c/source/data/coll/ja.txt | 11 +- icu4c/source/data/coll/kk.txt | 11 +- icu4c/source/data/coll/kl.txt | 11 +- icu4c/source/data/coll/kn.txt | 11 +- icu4c/source/data/coll/ko.txt | 11 +- icu4c/source/data/coll/lt.txt | 11 +- icu4c/source/data/coll/lv.txt | 11 +- icu4c/source/data/coll/mk.txt | 8 +- icu4c/source/data/coll/mr.txt | 11 +- icu4c/source/data/coll/mt.txt | 11 +- icu4c/source/data/coll/nb.txt | 11 +- icu4c/source/data/coll/nn.txt | 11 +- icu4c/source/data/coll/om.txt | 14 +- icu4c/source/data/coll/pa.txt | 11 +- icu4c/source/data/coll/pl.txt | 13 +- icu4c/source/data/coll/ps.txt | 11 +- icu4c/source/data/coll/ro.txt | 11 +- icu4c/source/data/coll/root.txt | 25 +- icu4c/source/data/coll/ru.txt | 12 +- icu4c/source/data/coll/sh.txt | 8 +- icu4c/source/data/coll/sk.txt | 11 +- icu4c/source/data/coll/sl.txt | 11 +- icu4c/source/data/coll/sq.txt | 11 +- icu4c/source/data/coll/sr.txt | 8 +- icu4c/source/data/coll/sv.txt | 12 +- icu4c/source/data/coll/ta.txt | 11 +- icu4c/source/data/coll/te.txt | 11 +- icu4c/source/data/coll/th.txt | 11 +- icu4c/source/data/coll/tr.txt | 11 +- icu4c/source/data/coll/uk.txt | 11 +- icu4c/source/data/coll/vi.txt | 11 +- icu4c/source/data/coll/zh.txt | 1237 ++++++++++---------- icu4c/source/data/coll/zh_HK.txt | 7 +- icu4c/source/data/coll/zh_Hant.txt | 10 +- icu4c/source/data/coll/zh_MO.txt | 7 +- icu4c/source/data/coll/zh_TW.txt | 7 +- icu4c/source/data/coll/zh_TW_STROKE.txt | 4 +- icu4c/source/data/coll/zh__PINYIN.txt | 18 +- 67 files changed, 1176 insertions(+), 865 deletions(-) diff --git a/icu4c/source/data/coll/ar.txt b/icu4c/source/data/coll/ar.txt index 2ffb44d4ff..b036d8a07b 100644 --- a/icu4c/source/data/coll/ar.txt +++ b/icu4c/source/data/coll/ar.txt @@ -3,16 +3,38 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:54 -// * Source File: \work\locale\common\collation\\ar.xml +// * Source File: ../../../locale/common/collation/ar.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/ar.xml + */ ar{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{"&ة=ت"} Version{"3.0"} } + validSubLocales{ + ar_AE{""} + ar_BH{""} + ar_DZ{""} + ar_EG{""} + ar_IN{""} + ar_IQ{""} + ar_JO{""} + ar_KW{""} + ar_LB{""} + ar_LY{""} + ar_MA{""} + ar_OM{""} + ar_QA{""} + ar_SA{""} + ar_SD{""} + ar_SY{""} + ar_TN{""} + ar_YE{""} + } } } diff --git a/icu4c/source/data/coll/be.txt b/icu4c/source/data/coll/be.txt index 6321b2960e..aefcf90a1d 100644 --- a/icu4c/source/data/coll/be.txt +++ b/icu4c/source/data/coll/be.txt @@ -3,11 +3,13 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:54 -// * Source File: \work\locale\common\collation\\be.xml +// * Source File: ../../../locale/common/collation/be.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/be.xml + */ be{ - Version{"1.1.1"} + Version{"1.2"} collations:alias{"ru/collations"} } diff --git a/icu4c/source/data/coll/bg.txt b/icu4c/source/data/coll/bg.txt index f2f8b6eda6..1bf7c4f0bb 100644 --- a/icu4c/source/data/coll/bg.txt +++ b/icu4c/source/data/coll/bg.txt @@ -3,11 +3,13 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:54 -// * Source File: \work\locale\common\collation\\bg.xml +// * Source File: ../../../locale/common/collation/bg.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/bg.xml + */ bg{ - Version{"1.1.1"} + Version{"1.2"} collations:alias{"ru/collations"} } diff --git a/icu4c/source/data/coll/ca.txt b/icu4c/source/data/coll/ca.txt index 6c030fc1fa..cee4b46ad6 100644 --- a/icu4c/source/data/coll/ca.txt +++ b/icu4c/source/data/coll/ca.txt @@ -3,16 +3,21 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:54 -// * Source File: \work\locale\common\collation\\ca.xml +// * Source File: ../../../locale/common/collation/ca.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/ca.xml + */ ca{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{" [backwards 2]&C source: ../../../locale/icu/collation/cs.xml + */ cs{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{"&C<č<<<Č&H source: ../../../locale/icu/collation/da.xml + */ da{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -22,5 +24,8 @@ da{ } Version{"3.0"} } + validSubLocales{ + da_DK{""} + } } } diff --git a/icu4c/source/data/coll/de.txt b/icu4c/source/data/coll/de.txt index 63b7d7f454..c6a6b52c2a 100644 --- a/icu4c/source/data/coll/de.txt +++ b/icu4c/source/data/coll/de.txt @@ -3,20 +3,29 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:54 -// * Source File: \work\locale\common\collation\\de.xml +// * Source File: ../../../locale/common/collation/de.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/de.xml + */ de{ - Version{"1.1.1"} + Version{"1.2"} collations{ phonebook{ Sequence{"&a<<æ/e<<ä/e&A<<Æ/E<<Ä/E&œ<<ö/e&Œ<<Ö/E&u<<ü/e&U<<Ü/E"} Version{"2.0"} } standard{ - Sequence{"&A<<Æ/E&a<<æ/e"} + Sequence{"&ae<<æ<<<Æ"} Version{"1.0"} } + validSubLocales{ + de_AT{""} + de_BE{""} + de_CH{""} + de_DE{""} + de_LU{""} + } } } diff --git a/icu4c/source/data/coll/de__PHONEBOOK.txt b/icu4c/source/data/coll/de__PHONEBOOK.txt index 8acf012f2a..f3a80ed7b7 100644 --- a/icu4c/source/data/coll/de__PHONEBOOK.txt +++ b/icu4c/source/data/coll/de__PHONEBOOK.txt @@ -1,13 +1,13 @@ -// *************************************************************************** +// *************************************************************************** // * -// * Copyright (C) 1997-2004, International Business Machines -// * Corporation and others. All Rights Reserved. +// * Copyright (C) 2004 International Business Machines +// * Corporation and others. All Rights Reserved. +// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java +// * Source File: deprecatedList.xml // * // *************************************************************************** - -de__PHONEBOOK { - Version { "1.0" } - collations { - default { "phonebook" } +de__PHONEBOOK{ + collations{ + default{"phonebook"} } } diff --git a/icu4c/source/data/coll/el.txt b/icu4c/source/data/coll/el.txt index da33e3a1e8..1d21a54eb3 100644 --- a/icu4c/source/data/coll/el.txt +++ b/icu4c/source/data/coll/el.txt @@ -3,16 +3,21 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:55 -// * Source File: \work\locale\common\collation\\el.xml +// * Source File: ../../../locale/common/collation/el.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/el.xml + */ el{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{" [normalization on ]"} Version{"2.0"} } + validSubLocales{ + el_GR{""} + } } } diff --git a/icu4c/source/data/coll/en.txt b/icu4c/source/data/coll/en.txt index 789d31c89a..3990eb81f2 100644 --- a/icu4c/source/data/coll/en.txt +++ b/icu4c/source/data/coll/en.txt @@ -3,11 +3,11 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File: ../../../locale/common/collation\en.xml +// * Source File: ../../../locale/common/collation/en.xml // * // *************************************************************************** /** - * ICU source: ../../../locale/icu/collation\en.xml + * ICU source: ../../../locale/icu/collation/en.xml */ en{ Version{"1.2"} diff --git a/icu4c/source/data/coll/en_BE.txt b/icu4c/source/data/coll/en_BE.txt index f01504d07e..9908f0e814 100644 --- a/icu4c/source/data/coll/en_BE.txt +++ b/icu4c/source/data/coll/en_BE.txt @@ -3,12 +3,11 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:55 -// * Source File: \work\locale\common\collation\\en_BE.xml +// * Source File: ../../../locale/common/collation/en_BE.xml // * // *************************************************************************** en_BE{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{" [backwards 2]"} diff --git a/icu4c/source/data/coll/eo.txt b/icu4c/source/data/coll/eo.txt index 26d331e509..acb18cda05 100644 --- a/icu4c/source/data/coll/eo.txt +++ b/icu4c/source/data/coll/eo.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:55 -// * Source File: \work\locale\common\collation\\eo.xml +// * Source File: ../../../locale/common/collation/eo.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/eo.xml + */ eo{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{"&C<ĉ<<<Ĉ&G<ĝ<<<Ĝ&H<ĥ<<<Ĥ&J<ĵ<<<Ĵ&S<ŝ<<<Ŝ&U<ŭ<<<Ŭ"} diff --git a/icu4c/source/data/coll/es.txt b/icu4c/source/data/coll/es.txt index 581872c196..9e2fb6596c 100644 --- a/icu4c/source/data/coll/es.txt +++ b/icu4c/source/data/coll/es.txt @@ -3,20 +3,44 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:55 -// * Source File: \work\locale\common\collation\\es.xml +// * Source File: ../../../locale/common/collation/es.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/es.xml + */ es{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ - Sequence{"&N<ñ<<<Ñ&A<<Æ/E&a<<æ/e"} + Sequence{"&N<ñ<<<Ñ&ae<<æ<<<Æ"} Version{"1.1"} } traditional{ Sequence{"&N<ñ<<<Ñ&C source: ../../../locale/icu/collation/et.xml + */ et{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -18,5 +20,8 @@ et{ } Version{"2.0"} } + validSubLocales{ + et_EE{""} + } } } diff --git a/icu4c/source/data/coll/fa.txt b/icu4c/source/data/coll/fa.txt index bd521dbecf..86bc451bc5 100644 --- a/icu4c/source/data/coll/fa.txt +++ b/icu4c/source/data/coll/fa.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:55 -// * Source File: \work\locale\common\collation\\fa.xml +// * Source File: ../../../locale/common/collation/fa.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/fa.xml + */ fa{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -21,5 +23,8 @@ fa{ } Version{"2.0"} } + validSubLocales{ + fa_IR{""} + } } } diff --git a/icu4c/source/data/coll/fa_AF.txt b/icu4c/source/data/coll/fa_AF.txt index f2e937354e..fc3a96bff2 100644 --- a/icu4c/source/data/coll/fa_AF.txt +++ b/icu4c/source/data/coll/fa_AF.txt @@ -3,11 +3,10 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:55 -// * Source File: \work\locale\common\collation\\fa_AF.xml +// * Source File: ../../../locale/common/collation/fa_AF.xml // * // *************************************************************************** fa_AF{ - Version{"1.1.1"} - collations:alias{"ps/collations/standard"} + Version{"1.2"} + collations:alias{"ps/collations"} } diff --git a/icu4c/source/data/coll/fi.txt b/icu4c/source/data/coll/fi.txt index 1c0ce4d8d8..79b306d4a4 100644 --- a/icu4c/source/data/coll/fi.txt +++ b/icu4c/source/data/coll/fi.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:55 -// * Source File: \work\locale\common\collation\\fi.xml +// * Source File: ../../../locale/common/collation/fi.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/fi.xml + */ fi{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -21,5 +23,8 @@ fi{ } Version{"2.0"} } + validSubLocales{ + fi_FI{""} + } } } diff --git a/icu4c/source/data/coll/fo.txt b/icu4c/source/data/coll/fo.txt index 6ac38e9181..c7ec85cd91 100644 --- a/icu4c/source/data/coll/fo.txt +++ b/icu4c/source/data/coll/fo.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:56 -// * Source File: \work\locale\common\collation\\fo.xml +// * Source File: ../../../locale/common/collation/fo.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/fo.xml + */ fo{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -21,5 +23,8 @@ fo{ } Version{"2.0"} } + validSubLocales{ + fo_FO{""} + } } } diff --git a/icu4c/source/data/coll/fr.txt b/icu4c/source/data/coll/fr.txt index 05e51dc5fb..3fca626162 100644 --- a/icu4c/source/data/coll/fr.txt +++ b/icu4c/source/data/coll/fr.txt @@ -3,16 +3,25 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:56 -// * Source File: \work\locale\common\collation\\fr.xml +// * Source File: ../../../locale/common/collation/fr.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/fr.xml + */ fr{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ - Sequence{" [backwards 2]&A<<Æ/E&a<<æ/e"} + Sequence{" [backwards 2]&ae<<æ<<<Æ"} Version{"2.0"} } + validSubLocales{ + fr_BE{""} + fr_CA{""} + fr_CH{""} + fr_FR{""} + fr_LU{""} + } } } diff --git a/icu4c/source/data/coll/gu.txt b/icu4c/source/data/coll/gu.txt index e4c86c193e..9df47cd519 100644 --- a/icu4c/source/data/coll/gu.txt +++ b/icu4c/source/data/coll/gu.txt @@ -3,16 +3,21 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:56 -// * Source File: \work\locale\common\collation\\gu.xml +// * Source File: ../../../locale/common/collation/gu.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/gu.xml + */ gu{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{" [normalization on ]&હ<઼<ઁ<ં<ઃ&ઽ<્"} Version{"1.0"} } + validSubLocales{ + gu_IN{""} + } } } diff --git a/icu4c/source/data/coll/he.txt b/icu4c/source/data/coll/he.txt index 088c42cc6b..2cd8f4c30d 100644 --- a/icu4c/source/data/coll/he.txt +++ b/icu4c/source/data/coll/he.txt @@ -3,16 +3,21 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:56 -// * Source File: \work\locale\common\collation\\he.xml +// * Source File: ../../../locale/common/collation/he.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/he.xml + */ he{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{" [normalization on ]"} Version{"3.0"} } + validSubLocales{ + he_IL{""} + } } } diff --git a/icu4c/source/data/coll/hi.txt b/icu4c/source/data/coll/hi.txt index 3c2e049a7a..5005d1128e 100644 --- a/icu4c/source/data/coll/hi.txt +++ b/icu4c/source/data/coll/hi.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:56 -// * Source File: \work\locale\common\collation\\hi.xml +// * Source File: ../../../locale/common/collation/hi.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/hi.xml + */ hi{ - Version{"1.1.1"} + Version{"1.2"} collations{ direct{ Sequence{ @@ -23,5 +25,8 @@ hi{ Sequence{" [normalization on ]&[before 1]0<ॐ<।<॥<॰&ह<़<ँ<ं<ः<॑<॒<॓<॔&ऽ<्"} Version{"2.0"} } + validSubLocales{ + hi_IN{""} + } } } diff --git a/icu4c/source/data/coll/hi__DIRECT.txt b/icu4c/source/data/coll/hi__DIRECT.txt index f8b253f62d..5f4b5221db 100644 --- a/icu4c/source/data/coll/hi__DIRECT.txt +++ b/icu4c/source/data/coll/hi__DIRECT.txt @@ -1,14 +1,13 @@ -// *************************************************************************** +// *************************************************************************** // * -// * Copyright (C) 1997-2004, International Business Machines -// * Corporation and others. All Rights Reserved. +// * Copyright (C) 2004 International Business Machines +// * Corporation and others. All Rights Reserved. +// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java +// * Source File: deprecatedList.xml // * // *************************************************************************** - -hi__DIRECT { - Version { "1.1" } - // This is the order ICU originaly used - collations { - default { "direct" } +hi__DIRECT{ + collations{ + default{"direct"} } } diff --git a/icu4c/source/data/coll/hr.txt b/icu4c/source/data/coll/hr.txt index e345a71eb5..7f239890e9 100644 --- a/icu4c/source/data/coll/hr.txt +++ b/icu4c/source/data/coll/hr.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:56 -// * Source File: \work\locale\common\collation\\hr.xml +// * Source File: ../../../locale/common/collation/hr.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/hr.xml + */ hr{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -21,5 +23,8 @@ hr{ } Version{"2.0"} } + validSubLocales{ + hr_HR{""} + } } } diff --git a/icu4c/source/data/coll/hu.txt b/icu4c/source/data/coll/hu.txt index aa8503f7c6..944258d39b 100644 --- a/icu4c/source/data/coll/hu.txt +++ b/icu4c/source/data/coll/hu.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:56 -// * Source File: \work\locale\common\collation\\hu.xml +// * Source File: ../../../locale/common/collation/hu.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/hu.xml + */ hu{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -53,5 +55,8 @@ hu{ } Version{"2.0"} } + validSubLocales{ + hu_HU{""} + } } } diff --git a/icu4c/source/data/coll/is.txt b/icu4c/source/data/coll/is.txt index 67c473f9e3..8eedd035e2 100644 --- a/icu4c/source/data/coll/is.txt +++ b/icu4c/source/data/coll/is.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:56 -// * Source File: \work\locale\common\collation\\is.xml +// * Source File: ../../../locale/common/collation/is.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/is.xml + */ is{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -23,5 +25,8 @@ is{ } Version{"2.0"} } + validSubLocales{ + is_IS{""} + } } } diff --git a/icu4c/source/data/coll/it.txt b/icu4c/source/data/coll/it.txt index fa642d42a5..6f7b338064 100644 --- a/icu4c/source/data/coll/it.txt +++ b/icu4c/source/data/coll/it.txt @@ -3,16 +3,22 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:56 -// * Source File: \work\locale\common\collation\\it.xml +// * Source File: ../../../locale/common/collation/it.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/it.xml + */ it{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ - Sequence{"&A<<Æ/E&a<<æ/e"} + Sequence{"&ae<<æ<<<Æ"} Version{"1.0"} } + validSubLocales{ + it_CH{""} + it_IT{""} + } } } diff --git a/icu4c/source/data/coll/ja.txt b/icu4c/source/data/coll/ja.txt index 24ac10b422..5d7d7b1e9d 100644 --- a/icu4c/source/data/coll/ja.txt +++ b/icu4c/source/data/coll/ja.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:57 -// * Source File: \work\locale\common\collation\\ja.xml +// * Source File: ../../../locale/common/collation/ja.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/ja.xml + */ ja{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -507,5 +509,8 @@ ja{ } Version{"4.0"} } + validSubLocales{ + ja_JP{""} + } } } diff --git a/icu4c/source/data/coll/kk.txt b/icu4c/source/data/coll/kk.txt index 722c09843d..a3ed79dde2 100644 --- a/icu4c/source/data/coll/kk.txt +++ b/icu4c/source/data/coll/kk.txt @@ -3,16 +3,21 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:57 -// * Source File: \work\locale\common\collation\\kk.xml +// * Source File: ../../../locale/common/collation/kk.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/kk.xml + */ kk{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{" [normalization on ][suppressContractions[Ѐ-џ]]&[before 1]ү<ұ<<<Ұ"} Version{"1.0"} } + validSubLocales{ + kk_KZ{""} + } } } diff --git a/icu4c/source/data/coll/kl.txt b/icu4c/source/data/coll/kl.txt index 91aa9b8a45..133b91a725 100644 --- a/icu4c/source/data/coll/kl.txt +++ b/icu4c/source/data/coll/kl.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:57 -// * Source File: \work\locale\common\collation\\kl.xml +// * Source File: ../../../locale/common/collation/kl.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/kl.xml + */ kl{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -20,5 +22,8 @@ kl{ } Version{"1.0"} } + validSubLocales{ + kl_GL{""} + } } } diff --git a/icu4c/source/data/coll/kn.txt b/icu4c/source/data/coll/kn.txt index 492e83c3fd..131f09c14c 100644 --- a/icu4c/source/data/coll/kn.txt +++ b/icu4c/source/data/coll/kn.txt @@ -3,16 +3,21 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:57 -// * Source File: \work\locale\common\collation\\kn.xml +// * Source File: ../../../locale/common/collation/kn.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/kn.xml + */ kn{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{" [normalization on ]"} Version{"1.0"} } + validSubLocales{ + kn_IN{""} + } } } diff --git a/icu4c/source/data/coll/ko.txt b/icu4c/source/data/coll/ko.txt index da9aaf9151..58e0138157 100644 --- a/icu4c/source/data/coll/ko.txt +++ b/icu4c/source/data/coll/ko.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:57 -// * Source File: \work\locale\common\collation\\ko.xml +// * Source File: ../../../locale/common/collation/ko.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/ko.xml + */ ko{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -681,5 +683,8 @@ ko{ } Version{"2.1"} } + validSubLocales{ + ko_KR{""} + } } } diff --git a/icu4c/source/data/coll/lt.txt b/icu4c/source/data/coll/lt.txt index 258d3e26a4..70d8d227fa 100644 --- a/icu4c/source/data/coll/lt.txt +++ b/icu4c/source/data/coll/lt.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:57 -// * Source File: \work\locale\common\collation\\lt.xml +// * Source File: ../../../locale/common/collation/lt.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/lt.xml + */ lt{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -20,5 +22,8 @@ lt{ } Version{"2.0"} } + validSubLocales{ + lt_LT{""} + } } } diff --git a/icu4c/source/data/coll/lv.txt b/icu4c/source/data/coll/lv.txt index 360c43d751..9387891b6e 100644 --- a/icu4c/source/data/coll/lv.txt +++ b/icu4c/source/data/coll/lv.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:57 -// * Source File: \work\locale\common\collation\\lv.xml +// * Source File: ../../../locale/common/collation/lv.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/lv.xml + */ lv{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -24,5 +26,8 @@ lv{ } Version{"2.0"} } + validSubLocales{ + lv_LV{""} + } } } diff --git a/icu4c/source/data/coll/mk.txt b/icu4c/source/data/coll/mk.txt index 2f9a5a5666..f8f6762d47 100644 --- a/icu4c/source/data/coll/mk.txt +++ b/icu4c/source/data/coll/mk.txt @@ -3,11 +3,13 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:57 -// * Source File: \work\locale\common\collation\\mk.xml +// * Source File: ../../../locale/common/collation/mk.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/mk.xml + */ mk{ - Version{"1.1.1"} + Version{"1.2"} collations:alias{"ru/collations"} } diff --git a/icu4c/source/data/coll/mr.txt b/icu4c/source/data/coll/mr.txt index 88949123b5..ffb11c2290 100644 --- a/icu4c/source/data/coll/mr.txt +++ b/icu4c/source/data/coll/mr.txt @@ -3,16 +3,21 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:57 -// * Source File: \work\locale\common\collation\\mr.xml +// * Source File: ../../../locale/common/collation/mr.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/mr.xml + */ mr{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{" [normalization on ]"} Version{"1.0"} } + validSubLocales{ + mr_IN{""} + } } } diff --git a/icu4c/source/data/coll/mt.txt b/icu4c/source/data/coll/mt.txt index fb3973efab..0332b2b435 100644 --- a/icu4c/source/data/coll/mt.txt +++ b/icu4c/source/data/coll/mt.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:58 -// * Source File: \work\locale\common\collation\\mt.xml +// * Source File: ../../../locale/common/collation/mt.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/mt.xml + */ mt{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -21,5 +23,8 @@ mt{ } Version{"1.2"} } + validSubLocales{ + mt_MT{""} + } } } diff --git a/icu4c/source/data/coll/nb.txt b/icu4c/source/data/coll/nb.txt index ba6cb2ac48..e867735efe 100644 --- a/icu4c/source/data/coll/nb.txt +++ b/icu4c/source/data/coll/nb.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:58 -// * Source File: \work\locale\common\collation\\nb.xml +// * Source File: ../../../locale/common/collation/nb.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/nb.xml + */ nb{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -20,5 +22,8 @@ nb{ } Version{"2.0"} } + validSubLocales{ + nb_NO{""} + } } } diff --git a/icu4c/source/data/coll/nn.txt b/icu4c/source/data/coll/nn.txt index 1a9e4793ac..5a6d129b9a 100644 --- a/icu4c/source/data/coll/nn.txt +++ b/icu4c/source/data/coll/nn.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:58 -// * Source File: \work\locale\common\collation\\nn.xml +// * Source File: ../../../locale/common/collation/nn.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/nn.xml + */ nn{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -20,5 +22,8 @@ nn{ } Version{"2.0"} } + validSubLocales{ + nn_NO{""} + } } } diff --git a/icu4c/source/data/coll/om.txt b/icu4c/source/data/coll/om.txt index 56992f89f5..41ca736aa1 100644 --- a/icu4c/source/data/coll/om.txt +++ b/icu4c/source/data/coll/om.txt @@ -3,19 +3,25 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:58 -// * Source File: \work\locale\common\collation\\om.xml +// * Source File: ../../../locale/common/collation/om.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/om.xml + */ om{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ "&Z source: ../../../locale/icu/collation/pa.xml + */ pa{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{" [normalization on ]"} Version{"1.0"} } + validSubLocales{ + pa_IN{""} + } } } diff --git a/icu4c/source/data/coll/pl.txt b/icu4c/source/data/coll/pl.txt index 1c3d8cb535..7ad2e4dd67 100644 --- a/icu4c/source/data/coll/pl.txt +++ b/icu4c/source/data/coll/pl.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:58 -// * Source File: \work\locale\common\collation\\pl.xml +// * Source File: ../../../locale/common/collation/pl.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/pl.xml + */ pl{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -19,9 +21,12 @@ pl{ "&N<ń<<<Ń" "&O<ó<<<Ó" "&S<ś<<<Ś" - "&Z<ż<<<Ż<ź<<<Ź" + "&Z<ź<<<Ź<ż<<<Ż" } Version{"2"} } + validSubLocales{ + pl_PL{""} + } } } diff --git a/icu4c/source/data/coll/ps.txt b/icu4c/source/data/coll/ps.txt index b9c661cded..ac5f495ed9 100644 --- a/icu4c/source/data/coll/ps.txt +++ b/icu4c/source/data/coll/ps.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:58 -// * Source File: \work\locale\common\collation\\ps.xml +// * Source File: ../../../locale/common/collation/ps.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/ps.xml + */ ps{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -31,5 +33,8 @@ ps{ } Version{"1.0"} } + validSubLocales{ + ps_AF{""} + } } } diff --git a/icu4c/source/data/coll/ro.txt b/icu4c/source/data/coll/ro.txt index db265a5d9e..ca7d072da7 100644 --- a/icu4c/source/data/coll/ro.txt +++ b/icu4c/source/data/coll/ro.txt @@ -3,16 +3,21 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:59 -// * Source File: \work\locale\common\collation\\ro.xml +// * Source File: ../../../locale/common/collation/ro.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/ro.xml + */ ro{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{"&A<ă<<<Ă<â<<<Â&D<đ<<<Đ&I<î<<<Î&S<ş=ș<<<Ş=Ș&T<ţ=ț<<<Ţ=Ț&Z<ż<<<Ż"} Version{"1.0"} } + validSubLocales{ + ro_RO{""} + } } } diff --git a/icu4c/source/data/coll/root.txt b/icu4c/source/data/coll/root.txt index ca52f559e5..3994704828 100644 --- a/icu4c/source/data/coll/root.txt +++ b/icu4c/source/data/coll/root.txt @@ -3,18 +3,35 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 13:6 -// * Source File: \work\locale\common\collation\\root.xml +// * Source File: ../../../locale/common/collation/root.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/root.xml + */ root{ - "%%UCARULES"{"UCARules.txt"} - Version{"1.1.1"} + "%%UCARULES":include{"../unidata/UCARules.txt"} + Version{"1.2"} collations{ default{"standard"} standard{ Sequence{""} Version{"0.0"} } + validSubLocales{ + ga{""} + ga_IE{""} + id{""} + id_ID{""} + ms{""} + ms_BN{""} + ms_MY{""} + nl{""} + nl_BE{""} + nl_NL{""} + pt{""} + pt_BR{""} + pt_PT{""} + } } } diff --git a/icu4c/source/data/coll/ru.txt b/icu4c/source/data/coll/ru.txt index af35ed1414..5a40a52269 100644 --- a/icu4c/source/data/coll/ru.txt +++ b/icu4c/source/data/coll/ru.txt @@ -3,16 +3,22 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:59 -// * Source File: \work\locale\common\collation\\ru.xml +// * Source File: ../../../locale/common/collation/ru.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/ru.xml + */ ru{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{"[suppressContractions[Ѐ-џ]]"} Version{"1.1"} } + validSubLocales{ + ru_RU{""} + ru_UA{""} + } } } diff --git a/icu4c/source/data/coll/sh.txt b/icu4c/source/data/coll/sh.txt index 6679e32ab8..0180059909 100644 --- a/icu4c/source/data/coll/sh.txt +++ b/icu4c/source/data/coll/sh.txt @@ -3,11 +3,13 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:59 -// * Source File: \work\locale\common\collation\\sh.xml +// * Source File: ../../../locale/common/collation/sh.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/sh.xml + */ sh{ - Version{"1.1.1"} + Version{"1.2"} collations:alias{"hr/collations"} } diff --git a/icu4c/source/data/coll/sk.txt b/icu4c/source/data/coll/sk.txt index a6c0c6c8e5..a48ff4b1d4 100644 --- a/icu4c/source/data/coll/sk.txt +++ b/icu4c/source/data/coll/sk.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:59 -// * Source File: \work\locale\common\collation\\sk.xml +// * Source File: ../../../locale/common/collation/sk.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/sk.xml + */ sk{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -24,5 +26,8 @@ sk{ } Version{"1.0"} } + validSubLocales{ + sk_SK{""} + } } } diff --git a/icu4c/source/data/coll/sl.txt b/icu4c/source/data/coll/sl.txt index 6a5227da00..ca3ea9b01c 100644 --- a/icu4c/source/data/coll/sl.txt +++ b/icu4c/source/data/coll/sl.txt @@ -3,16 +3,21 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:59 -// * Source File: \work\locale\common\collation\\sl.xml +// * Source File: ../../../locale/common/collation/sl.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/sl.xml + */ sl{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{"&C<č<<<Č<ć<<<Ć&S<š<<<Š&Z<ž<<<Ž"} Version{"1.0"} } + validSubLocales{ + sl_SI{""} + } } } diff --git a/icu4c/source/data/coll/sq.txt b/icu4c/source/data/coll/sq.txt index 7ea4890b4b..a7b8dda30a 100644 --- a/icu4c/source/data/coll/sq.txt +++ b/icu4c/source/data/coll/sq.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:59 -// * Source File: \work\locale\common\collation\\sq.xml +// * Source File: ../../../locale/common/collation/sq.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/sq.xml + */ sq{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -26,5 +28,8 @@ sq{ } Version{"2.0"} } + validSubLocales{ + sq_AL{""} + } } } diff --git a/icu4c/source/data/coll/sr.txt b/icu4c/source/data/coll/sr.txt index c935e4cebd..35bb72848b 100644 --- a/icu4c/source/data/coll/sr.txt +++ b/icu4c/source/data/coll/sr.txt @@ -3,11 +3,13 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 12:59 -// * Source File: \work\locale\common\collation\\sr.xml +// * Source File: ../../../locale/common/collation/sr.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/sr.xml + */ sr{ - Version{"1.1.1"} + Version{"1.2"} collations:alias{"ru/collations"} } diff --git a/icu4c/source/data/coll/sv.txt b/icu4c/source/data/coll/sv.txt index b195804fe0..e9a4c444d1 100644 --- a/icu4c/source/data/coll/sv.txt +++ b/icu4c/source/data/coll/sv.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 13:0 -// * Source File: \work\locale\common\collation\\sv.xml +// * Source File: ../../../locale/common/collation/sv.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/sv.xml + */ sv{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -23,5 +25,9 @@ sv{ } Version{"2.0"} } + validSubLocales{ + sv_FI{""} + sv_SE{""} + } } } diff --git a/icu4c/source/data/coll/ta.txt b/icu4c/source/data/coll/ta.txt index 5c08dde3a7..320ed3a361 100644 --- a/icu4c/source/data/coll/ta.txt +++ b/icu4c/source/data/coll/ta.txt @@ -3,16 +3,21 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 13:0 -// * Source File: \work\locale\common\collation\\ta.xml +// * Source File: ../../../locale/common/collation/ta.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/ta.xml + */ ta{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{" [normalization on ]"} Version{"1.0"} } + validSubLocales{ + ta_IN{""} + } } } diff --git a/icu4c/source/data/coll/te.txt b/icu4c/source/data/coll/te.txt index b85b1543bb..4152919188 100644 --- a/icu4c/source/data/coll/te.txt +++ b/icu4c/source/data/coll/te.txt @@ -3,16 +3,21 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 13:0 -// * Source File: \work\locale\common\collation\\te.xml +// * Source File: ../../../locale/common/collation/te.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/te.xml + */ te{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{" [normalization on ]&హ<ఁ<ం<ః<్"} Version{"1.0"} } + validSubLocales{ + te_IN{""} + } } } diff --git a/icu4c/source/data/coll/th.txt b/icu4c/source/data/coll/th.txt index df713eeacb..96ec3dc286 100644 --- a/icu4c/source/data/coll/th.txt +++ b/icu4c/source/data/coll/th.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 13:0 -// * Source File: \work\locale\common\collation\\th.xml +// * Source File: ../../../locale/common/collation/th.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/th.xml + */ th{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -23,5 +25,8 @@ th{ } Version{"3.0"} } + validSubLocales{ + th_TH{""} + } } } diff --git a/icu4c/source/data/coll/tr.txt b/icu4c/source/data/coll/tr.txt index 32a139d8ba..fbfc06edeb 100644 --- a/icu4c/source/data/coll/tr.txt +++ b/icu4c/source/data/coll/tr.txt @@ -3,16 +3,21 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 13:0 -// * Source File: \work\locale\common\collation\\tr.xml +// * Source File: ../../../locale/common/collation/tr.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/tr.xml + */ tr{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{"&C<ç<<<Ç&G<ğ<<<Ğ&[before 1]i<ı<< source: ../../../locale/icu/collation/uk.xml + */ uk{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{"&Г<ґ<<<Ґ"} Version{"1.0"} } + validSubLocales{ + uk_UA{""} + } } } diff --git a/icu4c/source/data/coll/vi.txt b/icu4c/source/data/coll/vi.txt index c70bde117b..95dc5441b5 100644 --- a/icu4c/source/data/coll/vi.txt +++ b/icu4c/source/data/coll/vi.txt @@ -3,12 +3,14 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 13:0 -// * Source File: \work\locale\common\collation\\vi.xml +// * Source File: ../../../locale/common/collation/vi.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/vi.xml + */ vi{ - Version{"1.1.1"} + Version{"1.2"} collations{ standard{ Sequence{ @@ -22,5 +24,8 @@ vi{ } Version{"3.1"} } + validSubLocales{ + vi_VN{""} + } } } diff --git a/icu4c/source/data/coll/zh.txt b/icu4c/source/data/coll/zh.txt index ac1ecca6b5..22b91c618c 100644 --- a/icu4c/source/data/coll/zh.txt +++ b/icu4c/source/data/coll/zh.txt @@ -3,13 +3,629 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 13:0 -// * Source File: \work\locale\common\collation\\zh.xml +// * Source File: ../../../locale/common/collation/zh.xml // * // *************************************************************************** +/** + * ICU source: ../../../locale/icu/collation/zh.xml + */ zh{ - Version{"1.1.1"} + Version{"1.2"} collations{ + big5han{ + Sequence{ + "&[before 2]a<<ā<<<Ā<<á<<<Á<<ǎ<<<Ǎ<<à<<<À" + "&[before 2]e<<ē<<<Ē<<é<<<É<<ě<<<Ě<<è<<<È" + "&e<<ê̄<<<Ê̄<<ế<<<Ế<<ê̌<<<Ê̌<<ề<<<Ề" + "&[before 2]i<<ī<<<Ī<<í<<<Í<<ǐ<<<Ǐ<<ì<<<Ì" + "&[before 2]m< source: ../../../locale/icu/collation/zh_Hant.xml + */ zh_Hant{ - Version{"1.1.1"} + Version{"1.2"} collations{ - default{"traditional"} + default{"stroke"} } } diff --git a/icu4c/source/data/coll/zh_MO.txt b/icu4c/source/data/coll/zh_MO.txt index 1d0011c518..e0a705b0cd 100644 --- a/icu4c/source/data/coll/zh_MO.txt +++ b/icu4c/source/data/coll/zh_MO.txt @@ -3,13 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 13:1 -// * Source File: \work\locale\common\collation\\zh_MO.xml +// * Source File: ../../../locale/common/collation/zh_MO.xml // * // *************************************************************************** zh_MO{ - Version{"1.1.1"} + Version{"1.2"} collations{ - default{"traditional"} + default{"stroke"} } } diff --git a/icu4c/source/data/coll/zh_TW.txt b/icu4c/source/data/coll/zh_TW.txt index e258809714..c2e7af1efc 100644 --- a/icu4c/source/data/coll/zh_TW.txt +++ b/icu4c/source/data/coll/zh_TW.txt @@ -3,13 +3,12 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/26 13:1 -// * Source File: \work\locale\common\collation\\zh_TW.xml +// * Source File: ../../../locale/common/collation/zh_TW.xml // * // *************************************************************************** zh_TW{ - Version{"1.1.1"} + Version{"1.2"} collations{ - default{"traditional"} + default{"stroke"} } } diff --git a/icu4c/source/data/coll/zh_TW_STROKE.txt b/icu4c/source/data/coll/zh_TW_STROKE.txt index 1960ace865..dff534fe0c 100644 --- a/icu4c/source/data/coll/zh_TW_STROKE.txt +++ b/icu4c/source/data/coll/zh_TW_STROKE.txt @@ -3,12 +3,10 @@ // * Copyright (C) 2004 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Date & Time: 2004/8/25 19:9 -// * Source File: \work\locale\common\collation\\zh_TW_STROKE.xml +// * Source File: deprecatedList.xml // * // *************************************************************************** zh_TW_STROKE{ - Version{"1.1.1"} collations{ default{"stroke"} } diff --git a/icu4c/source/data/coll/zh__PINYIN.txt b/icu4c/source/data/coll/zh__PINYIN.txt index ed7f91f92c..a65cae1577 100644 --- a/icu4c/source/data/coll/zh__PINYIN.txt +++ b/icu4c/source/data/coll/zh__PINYIN.txt @@ -1,13 +1,13 @@ -// ******************************************************************************* +// *************************************************************************** // * -// * Copyright (C) 1997-2004, International Business Machines -// * Corporation and others. All Rights Reserved. +// * Copyright (C) 2004 International Business Machines +// * Corporation and others. All Rights Reserved. +// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java +// * Source File: deprecatedList.xml // * -// ******************************************************************************* - -zh__PINYIN { - Version{ "1.0" } - collations { - default { "pinyin" } +// *************************************************************************** +zh__PINYIN{ + collations{ + default{"pinyin"} } }