From 720697914f38439061cf76c5d2eda603fd0b5797 Mon Sep 17 00:00:00 2001 From: Vladimir Weinstein Date: Tue, 11 Nov 2003 21:33:49 +0000 Subject: [PATCH] ICU-2438 keyword supporting modifications to locales (CollationElements->collations) take 2 X-SVN-Rev: 13664 --- icu4c/source/data/locales/af.txt | 2 +- icu4c/source/data/locales/ar.txt | 4 +- icu4c/source/data/locales/be.txt | 2 +- icu4c/source/data/locales/bg.txt | 2 +- icu4c/source/data/locales/ca.txt | 4 +- icu4c/source/data/locales/cs.txt | 4 +- icu4c/source/data/locales/da.txt | 4 +- icu4c/source/data/locales/de__PHONEBOOK.txt | 10 +- icu4c/source/data/locales/el.txt | 4 +- icu4c/source/data/locales/en_BE.txt | 4 +- icu4c/source/data/locales/eo.txt | 4 +- icu4c/source/data/locales/es.txt | 4 - icu4c/source/data/locales/es__TRADITIONAL.txt | 10 +- icu4c/source/data/locales/et.txt | 4 +- icu4c/source/data/locales/eu.txt | 2 +- icu4c/source/data/locales/fa.txt | 4 +- icu4c/source/data/locales/fa_AF.txt | 6 +- icu4c/source/data/locales/fi.txt | 4 +- icu4c/source/data/locales/fr.txt | 4 +- icu4c/source/data/locales/gl.txt | 2 +- icu4c/source/data/locales/gu.txt | 4 +- icu4c/source/data/locales/gv.txt | 2 +- icu4c/source/data/locales/he.txt | 4 +- icu4c/source/data/locales/hi.txt | 23 +- icu4c/source/data/locales/hi__DIRECT.txt | 20 +- icu4c/source/data/locales/hr.txt | 4 +- icu4c/source/data/locales/hu.txt | 4 +- icu4c/source/data/locales/hy.txt | 2 +- icu4c/source/data/locales/id.txt | 2 +- icu4c/source/data/locales/is.txt | 4 +- icu4c/source/data/locales/ja.txt | 4 +- icu4c/source/data/locales/kl.txt | 2 +- icu4c/source/data/locales/kn.txt | 4 +- icu4c/source/data/locales/ko.txt | 4 +- icu4c/source/data/locales/kok.txt | 2 +- icu4c/source/data/locales/kw.txt | 2 +- icu4c/source/data/locales/lt.txt | 4 +- icu4c/source/data/locales/lv.txt | 4 +- icu4c/source/data/locales/mk.txt | 2 +- icu4c/source/data/locales/mr.txt | 4 +- icu4c/source/data/locales/mt.txt | 5 +- icu4c/source/data/locales/nb.txt | 4 +- icu4c/source/data/locales/nn.txt | 4 +- icu4c/source/data/locales/pl.txt | 4 +- icu4c/source/data/locales/ps.txt | 4 +- icu4c/source/data/locales/ro.txt | 4 +- icu4c/source/data/locales/root.txt | 13 - icu4c/source/data/locales/ru.txt | 4 +- icu4c/source/data/locales/sh.txt | 4 +- icu4c/source/data/locales/sk.txt | 4 +- icu4c/source/data/locales/sl.txt | 4 +- icu4c/source/data/locales/sq.txt | 6 +- icu4c/source/data/locales/sr.txt | 2 +- icu4c/source/data/locales/sv.txt | 4 +- icu4c/source/data/locales/ta.txt | 4 +- icu4c/source/data/locales/te.txt | 4 +- icu4c/source/data/locales/th.txt | 4 +- icu4c/source/data/locales/tr.txt | 4 +- icu4c/source/data/locales/uk.txt | 4 +- icu4c/source/data/locales/vi.txt | 4 +- icu4c/source/data/locales/zh.txt | 5369 ++++++++++++++++- icu4c/source/data/locales/zh_HK.txt | 4 +- icu4c/source/data/locales/zh_MO.txt | 4 +- icu4c/source/data/locales/zh_TW.txt | 1093 +--- icu4c/source/data/locales/zh_TW_STROKE.txt | 1641 +---- icu4c/source/data/locales/zh__PINYIN.txt | 2634 +------- 66 files changed, 5548 insertions(+), 5472 deletions(-) diff --git a/icu4c/source/data/locales/af.txt b/icu4c/source/data/locales/af.txt index f704d58d596..7f52b4c3166 100644 --- a/icu4c/source/data/locales/af.txt +++ b/icu4c/source/data/locales/af.txt @@ -78,7 +78,7 @@ af { } // /**************** Info Below is needed ****************/ - // CollationElements{} + // collations{} // Countries{} // Eras{} // Languages{} diff --git a/icu4c/source/data/locales/ar.txt b/icu4c/source/data/locales/ar.txt index 6fa3667e856..1931c25b0bd 100644 --- a/icu4c/source/data/locales/ar.txt +++ b/icu4c/source/data/locales/ar.txt @@ -11,7 +11,8 @@ ar { "\u0635", "\u0645", } - CollationElements { + collations { + standard { 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<" @@ -27,6 +28,7 @@ ar { "< \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"} + } } Countries { AD { "\u0627\u0646\u062f\u0648\u0631\u0627" } diff --git a/icu4c/source/data/locales/be.txt b/icu4c/source/data/locales/be.txt index 214343e7e45..d2e301b5650 100644 --- a/icu4c/source/data/locales/be.txt +++ b/icu4c/source/data/locales/be.txt @@ -10,7 +10,7 @@ be { // 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" } diff --git a/icu4c/source/data/locales/bg.txt b/icu4c/source/data/locales/bg.txt index d90db2ae12c..6c0a5e49efa 100644 --- a/icu4c/source/data/locales/bg.txt +++ b/icu4c/source/data/locales/bg.txt @@ -8,7 +8,7 @@ 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 { diff --git a/icu4c/source/data/locales/ca.txt b/icu4c/source/data/locales/ca.txt index 41d0396f450..b6ab5884c96 100644 --- a/icu4c/source/data/locales/ca.txt +++ b/icu4c/source/data/locales/ca.txt @@ -7,11 +7,13 @@ ca { Version { "4.0" } - CollationElements { + 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" } diff --git a/icu4c/source/data/locales/cs.txt b/icu4c/source/data/locales/cs.txt index efd001c4e75..b3a24f5f2b8 100644 --- a/icu4c/source/data/locales/cs.txt +++ b/icu4c/source/data/locales/cs.txt @@ -11,11 +11,13 @@ cs { "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 { Fallback{"en"} diff --git a/icu4c/source/data/locales/da.txt b/icu4c/source/data/locales/da.txt index bd317edc196..5d99d9d08a2 100644 --- a/icu4c/source/data/locales/da.txt +++ b/icu4c/source/data/locales/da.txt @@ -7,11 +7,13 @@ da { Version {"3.0"} - CollationElements { + collations { + standard { 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" } + } } Countries { diff --git a/icu4c/source/data/locales/de__PHONEBOOK.txt b/icu4c/source/data/locales/de__PHONEBOOK.txt index 89d41778c4d..5fe620f260a 100644 --- a/icu4c/source/data/locales/de__PHONEBOOK.txt +++ b/icu4c/source/data/locales/de__PHONEBOOK.txt @@ -7,11 +7,7 @@ de__PHONEBOOK { Version { "1.0" } - CollationElements:alias { "de/collations/phonebook" } - //CollationElements { - //Version { "1.0" } - //Sequence { "&ae <<< \u00E4 &AE <<< \u00C4" - //"&oe <<< \u00F6 &OE <<< \u00D6" - //"&ue <<< \u00FC &UE <<< \u00DC" } - //} + collations { + default { "phonebook" } + } } diff --git a/icu4c/source/data/locales/el.txt b/icu4c/source/data/locales/el.txt index b044497c98c..fd5c8013c40 100644 --- a/icu4c/source/data/locales/el.txt +++ b/icu4c/source/data/locales/el.txt @@ -11,9 +11,11 @@ el { "\u03C0\u03BC", "\u03BC\u03BC", } - CollationElements { + collations { + standard { Version { "2.0" } Sequence { "[normalization on]" } + } } Countries { AD { "\u0391\u03BD\u03B4\u03CC\u03C1\u03B1" } diff --git a/icu4c/source/data/locales/en_BE.txt b/icu4c/source/data/locales/en_BE.txt index 1ccea64ef3f..939f108cbb1 100644 --- a/icu4c/source/data/locales/en_BE.txt +++ b/icu4c/source/data/locales/en_BE.txt @@ -7,9 +7,11 @@ en_BE { Version { "2.0" } - CollationElements { + collations { + standard { Version { "1.0.1" } Sequence { "[backwards 2]" } + } } DateTimePatterns { "HH' h 'mm' min 'ss' s 'z", diff --git a/icu4c/source/data/locales/eo.txt b/icu4c/source/data/locales/eo.txt index ad90b42745f..2fce8e296ee 100644 --- a/icu4c/source/data/locales/eo.txt +++ b/icu4c/source/data/locales/eo.txt @@ -10,10 +10,12 @@ eo { Version { "4.0" } // collation: accented characters have primary (base character) differences // see Jitterbug 1440 http://www.jtcsv.com/cgibin/icu-bugs?findid=1440 - CollationElements { + collations { + standard { Version { "1.0" } Sequence { "&C<\u0109<<<\u0108 &G<\u011d<<<\u011c &H<\u0125<<<\u0124" "&J<\u0135<<<\u0134 &S<\u015d<<<\u015c &U<\u016d<<<\u016c" } + } } Countries { AT { "A\u016dstrujo" } diff --git a/icu4c/source/data/locales/es.txt b/icu4c/source/data/locales/es.txt index 8f4c3b768f9..f6dd7f9101a 100644 --- a/icu4c/source/data/locales/es.txt +++ b/icu4c/source/data/locales/es.txt @@ -45,10 +45,6 @@ es { } } } - //CollationElements { - //Version { "1.0" } - //Sequence { "& N < n\u0303<<< N\u0303" } - //} /* Duplicates from root commented out. */ Countries { Fallback{ "en"} diff --git a/icu4c/source/data/locales/es__TRADITIONAL.txt b/icu4c/source/data/locales/es__TRADITIONAL.txt index 0af1994f735..538042c9628 100644 --- a/icu4c/source/data/locales/es__TRADITIONAL.txt +++ b/icu4c/source/data/locales/es__TRADITIONAL.txt @@ -7,11 +7,7 @@ es__TRADITIONAL { Version { "2.0" } - CollationElements:alias { "es/collations/traditional" } -// Version { "1.0" } -// Sequence { "& N < n\u0303<<< N\u0303" -// "&C < ch <<< Ch <<< CH" -// "&l < ll <<< Ll <<< LL" -// } -// } + collations { + default { "traditional" } + } } diff --git a/icu4c/source/data/locales/et.txt b/icu4c/source/data/locales/et.txt index 339a8228401..430d23e5baf 100644 --- a/icu4c/source/data/locales/et.txt +++ b/icu4c/source/data/locales/et.txt @@ -7,12 +7,14 @@ et { Version{ "3.0" } - CollationElements { + collations { + standard { 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" } + } } Countries { Fallback{ "en"} diff --git a/icu4c/source/data/locales/eu.txt b/icu4c/source/data/locales/eu.txt index e9ec9f617d8..af5d6e7c183 100644 --- a/icu4c/source/data/locales/eu.txt +++ b/icu4c/source/data/locales/eu.txt @@ -77,7 +77,7 @@ eu { ExemplarCharacters { "[a-z \u00f1 \u00e7]" } // /**************** Info Below is needed ****************/ - // CollationElements{} + // collations{} // Countries{} // Eras{} // Languages{} diff --git a/icu4c/source/data/locales/fa.txt b/icu4c/source/data/locales/fa.txt index c7ba166419c..99c03a09f20 100644 --- a/icu4c/source/data/locales/fa.txt +++ b/icu4c/source/data/locales/fa.txt @@ -9,7 +9,8 @@ fa { Version { "3.0" } - CollationElements { + collations { + standard { Version { "2.0" } Sequence { "[normalization on]" "&\u064e<<\u0650<<\u064f<<\u064b<<\u064d<<\u064c" @@ -19,6 +20,7 @@ fa { "&\u06cf <\u0647<<\u06d5<<\u06c1<<\u0629<<\u06c3<<\u06c0<<\u06be" "&\u06cc<<\u0649<<\u06d2<<\u064a<<\u06d0<<\u06d1<<\u06cd<<\u06ce" } + } } AmPmMarkers { "\u0642.\u0638.", diff --git a/icu4c/source/data/locales/fa_AF.txt b/icu4c/source/data/locales/fa_AF.txt index f2945433d9d..66f6694d714 100644 --- a/icu4c/source/data/locales/fa_AF.txt +++ b/icu4c/source/data/locales/fa_AF.txt @@ -15,8 +15,9 @@ fa_AF { // "\u0628.\u0638.", // } // This is a unified sort with uz_AF, fa_AF and ps. - CollationElements:alias { "ps" } -// CollationElements { + collations:alias { "ps" } +// collations { +// standard { // Version { "1.0" } // Sequence { "[normalization on]" // "&\u064e<<\u0650<<\u064f<<\u064b<<\u064d<<\u064c" @@ -35,6 +36,7 @@ fa_AF { // "&\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" } diff --git a/icu4c/source/data/locales/fi.txt b/icu4c/source/data/locales/fi.txt index fd6cef11ab7..d211571eea6 100644 --- a/icu4c/source/data/locales/fi.txt +++ b/icu4c/source/data/locales/fi.txt @@ -7,12 +7,14 @@ fi { Version { "3.0" } - CollationElements { + collations { + standard { 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" } + } } Countries { Fallback{ "en"} diff --git a/icu4c/source/data/locales/fr.txt b/icu4c/source/data/locales/fr.txt index 38fe2cbc79d..ceeae8851cb 100644 --- a/icu4c/source/data/locales/fr.txt +++ b/icu4c/source/data/locales/fr.txt @@ -7,9 +7,11 @@ fr { Version{"2.0"} - CollationElements { + collations { + standard { Version { "1.0" } Sequence { "[backwards 2]&A<<\u00e6/e<<<\u00c6/E" } + } } Variants { REVISED { "R\u00e9vis\u00e9" } diff --git a/icu4c/source/data/locales/gl.txt b/icu4c/source/data/locales/gl.txt index 8709ecb493c..ce8d33d80ca 100644 --- a/icu4c/source/data/locales/gl.txt +++ b/icu4c/source/data/locales/gl.txt @@ -74,7 +74,7 @@ gl { ExemplarCharacters { "[a-z \u00e1 \u00e9 \u00ed \u00f3 \u00fa \u00fc \u00f1]" } // /**************** Info Below is needed ****************/ - // CollationElements{} + // collations{} // Countries{} // Eras{} // Languages{} diff --git a/icu4c/source/data/locales/gu.txt b/icu4c/source/data/locales/gu.txt index 685ef5084ae..b5b75e5380d 100644 --- a/icu4c/source/data/locales/gu.txt +++ b/icu4c/source/data/locales/gu.txt @@ -11,11 +11,13 @@ gu { "\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" } - CollationElements { + collations { + standard { Version { "1.0" } Sequence { "[normalization on]" } + } } Countries { IN { "\u0AAD\u0ABE\u0AB0\u0AA4" } diff --git a/icu4c/source/data/locales/gv.txt b/icu4c/source/data/locales/gv.txt index 31d3b3ae0ec..74362894d74 100644 --- a/icu4c/source/data/locales/gv.txt +++ b/icu4c/source/data/locales/gv.txt @@ -74,7 +74,7 @@ gv { } // /**************** Info Below is needed ****************/ - // CollationElements{} + // collations{} // Countries{} // Eras{} // Languages{} diff --git a/icu4c/source/data/locales/he.txt b/icu4c/source/data/locales/he.txt index 315a8ffb8ff..9800e2a93c9 100644 --- a/icu4c/source/data/locales/he.txt +++ b/icu4c/source/data/locales/he.txt @@ -7,12 +7,14 @@ he { Version{"2.0"} - CollationElements { + collations { + standard { 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" } + } } Countries { AD { "\u05D0\u05E0\u05D3\u05D5\u05E8\u05D4" } diff --git a/icu4c/source/data/locales/hi.txt b/icu4c/source/data/locales/hi.txt index 326ba6901c5..236eec3c649 100644 --- a/icu4c/source/data/locales/hi.txt +++ b/icu4c/source/data/locales/hi.txt @@ -13,7 +13,8 @@ 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" @@ -63,6 +64,26 @@ hi { "<\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" } + } + 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" + } + } } Languages { diff --git a/icu4c/source/data/locales/hi__DIRECT.txt b/icu4c/source/data/locales/hi__DIRECT.txt index 96a3afedd9d..9346c53a390 100644 --- a/icu4c/source/data/locales/hi__DIRECT.txt +++ b/icu4c/source/data/locales/hi__DIRECT.txt @@ -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" } } } diff --git a/icu4c/source/data/locales/hr.txt b/icu4c/source/data/locales/hr.txt index 792ed2a56b1..c1c546a6d00 100644 --- a/icu4c/source/data/locales/hr.txt +++ b/icu4c/source/data/locales/hr.txt @@ -7,7 +7,8 @@ hr { Version{"2.0"} - CollationElements { + collations { + standard { Version { "2.0" } Sequence { "& C < \u010D <<< \u010C < \u0107 <<< \u0106" @@ -17,6 +18,7 @@ hr { "& S < \u0161 <<< \u0160" "& Z < \u017E <<< \u017D" } + } } Countries { diff --git a/icu4c/source/data/locales/hu.txt b/icu4c/source/data/locales/hu.txt index 664f16e39f6..3a071b8e366 100644 --- a/icu4c/source/data/locales/hu.txt +++ b/icu4c/source/data/locales/hu.txt @@ -7,13 +7,15 @@ hu { Version{ "2.0" } - CollationElements { + collations { + standard { 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" } + } } Countries { Fallback{ "en"} diff --git a/icu4c/source/data/locales/hy.txt b/icu4c/source/data/locales/hy.txt index 0d17293cdcc..eccd2066bcf 100644 --- a/icu4c/source/data/locales/hy.txt +++ b/icu4c/source/data/locales/hy.txt @@ -87,7 +87,7 @@ hy{ } // /**************** Info Below is needed ****************/ - // CollationElements{} // To be supplied from Unicode + // collations{} // To be supplied from Unicode // DateTimePatterns { diff --git a/icu4c/source/data/locales/id.txt b/icu4c/source/data/locales/id.txt index 193edac831f..f996bb1d947 100644 --- a/icu4c/source/data/locales/id.txt +++ b/icu4c/source/data/locales/id.txt @@ -81,7 +81,7 @@ id { "[a-z]" } // /**************** Info Below is needed ****************/ - // CollationElements{} + // collations{} // Countries{} // Eras{} // Languages{} diff --git a/icu4c/source/data/locales/is.txt b/icu4c/source/data/locales/is.txt index 34b13c85214..55361b07e8a 100644 --- a/icu4c/source/data/locales/is.txt +++ b/icu4c/source/data/locales/is.txt @@ -7,12 +7,14 @@ is { Version{ "2.0" } - CollationElements { + collations { + standard { Version { "1.0" } Sequence { "@&A