ICU-2438 keyword supporting modifications to locales (CollationElements->collations) take 2

X-SVN-Rev: 13664

icu4c/source/data/locales/af.txt

@@ -78,7 +78,7 @@ af {
     }
 
     // /**************** Info Below is needed ****************/
-    // CollationElements{}
+    // collations{}
     // Countries{}
     // Eras{}
     // Languages{}

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" }

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" }

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 {

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" }

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"}

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 {

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" }
+    }
 }

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" }

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",

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" }

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"}

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" }
+    }
 }

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"}

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{}

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.",

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" }

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"}

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" }

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{}

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" }

icu4c/source/data/locales/gv.txt

@@ -74,7 +74,7 @@ gv {
       } 
 
     // /**************** Info Below is needed ****************/
-    // CollationElements{}
+    // collations{}
     // Countries{}
     // Eras{}
     // Languages{}

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" }

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 {

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" }
     }
 }

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 { 

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"}

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 {

icu4c/source/data/locales/id.txt

@@ -81,7 +81,7 @@ id {
        "[a-z]"
     }
     // /**************** Info Below is needed ****************/
-    // CollationElements{}
+    // collations{}
     // Countries{}
     // Eras{}
     // Languages{}

icu4c/source/data/locales/is.txt

@@ -7,12 +7,14 @@
 
 is {
     Version{ "2.0" }
-    CollationElements { 
+    collations {
+      standard { 
         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" }
+      }
     }
     Countries { 
         IS { "\u00CDsland" }

icu4c/source/data/locales/ja.txt

@@ -29,7 +29,8 @@ ja {
         REVISED { "\u6539\u8a02\u7248" }
     }
 
-    CollationElements {
+    collations {
+      standard { 
         Version { "4.0" }
         Sequence {
             "[strength 3]" // if you want complete JIS 4061X support use strength I or 4
@@ -1328,6 +1329,7 @@ ja {
             "<\u9f76<\u9f95<\u9f9c<\u9fa0<\u582f<\u69c7<\u9059<\u7464<\u51dc"
             "<\u7199"
         }
+      }
     }
 
     Countries { 

icu4c/source/data/locales/kl.txt

@@ -76,7 +76,7 @@ kl{
     }
 
             // /**************** Info Below is needed ****************/
-            // CollationElements{}
+            // collation{}
             // Countries{}
             // Eras{}
             // Languages{}

icu4c/source/data/locales/kn.txt

@@ -80,11 +80,13 @@ kn {
 //    }
     LocaleScript:array { "Knda" }
     ExemplarCharacters { "[:Knda:]" }
-    CollationElements {	    
+    collations {
+      standard { 
         Version { "1.0" }
         Sequence { 
             "[normalization on]"
         }
+      }
     }
 
     // Currency display names

icu4c/source/data/locales/ko.txt

@@ -29,7 +29,8 @@ ko {
     // Collation rules supplied by Hyangmi Cho of LOTUS
     // UCA deals properly with Hangul and Jamo. These rules interleave proper CJK (Hanja)
     // between corresponding Hanguls.
-    CollationElements {
+    collations {
+      standard { 
         Version { "2.1" }
         Sequence{
             "[optimize [\uAC00-\uAC01\uAC04\uAC07-\uAC0A\uAC10-\uAC17\uAC19-\uAC1D\uAC20"
@@ -2054,6 +2055,7 @@ ko {
 
             "&\ud790<<\u8a70<<\u72b5<<\u7e88<<\u896d<<\u9821<<\u9ee0"
         }
+      }
     }
     Countries {
         AD { "\uC548\uB3C4\uB77C" }

icu4c/source/data/locales/kok.txt

@@ -240,7 +240,7 @@ kok {
         "Deva"        // ISO 15924 Name 
     }
     ExemplarCharacters{ "[[:Deva:]\u200c\u200d]" }
-//    CollationElements {
+//    collations {
 //            ""
 //      }
 

icu4c/source/data/locales/kw.txt

@@ -71,7 +71,7 @@ kw{
     }
     ExemplarCharacters { "[a-z]" }
     // /**************** Info Below is needed ****************/
-    // CollationElements{}
+    // collations{}
     // Countries{}
     // Eras{}
     // Languages{}

icu4c/source/data/locales/lt.txt

@@ -7,11 +7,13 @@
 
 lt {
     Version{ "2.0" }
-    CollationElements { 
+    collations {
+      standard { 
         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" }
+      }
     }
     Countries { 
         Fallback{ "en"}

icu4c/source/data/locales/lv.txt

@@ -7,11 +7,13 @@
 
 lv {
     Version{ "2.0"}
-    CollationElements { 
+    collations {
+      standard { 
         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" }
+      }
     }
     Countries { 
         Fallback{ "en"}

icu4c/source/data/locales/mk.txt

@@ -9,7 +9,7 @@ mk {
     Version { "2.0"}
     // We use UCA collation table optimized for Cyrillic
     // as defined in the Russian locale
-    CollationElements:alias { "ru" }
+    collations:alias { "ru" }
 
     Countries { 
         MK { "\u041C\u0430\u043A\u0435\u0434\u043E\u043D\u0438\u0458\u0430" }

icu4c/source/data/locales/mr.txt

@@ -235,11 +235,13 @@ mr {
             "IST"
         }
     }
-    CollationElements {
+    collations {
+      standard { 
         Version { "1.0" }
         Sequence { 
             "[normalization on]"
         }
+      }
     }
     LocaleScript:array { 
         "Deva"        // ISO 15924 Name 

icu4c/source/data/locales/mt.txt

@@ -769,8 +769,8 @@ mt {
 // Note that IE is **NOT** sorted as ittra waħda. 
 // So says the Akkademja tal-Malta
 
-   CollationElements
-   {
+    collations {
+      standard { 
         Version { "1.0" }
         Sequence { "& B < ċ <<< Ċ" // ċ  Ċ
                    "    < c<<<C"      
@@ -780,6 +780,7 @@ mt {
                    "& H < ħ  <<< Ħ "           
                    "& Y < ż<<< Ż"               // ż Ż
                    "    < z<<<Z" }
+      }
    }
 
 // Time zone

icu4c/source/data/locales/nb.txt

@@ -7,12 +7,14 @@
 
 nb {
     Version{"2.0"}
-    CollationElements {
+    collations {
+      standard { 
         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"
         }
+      }
     }
     Countries {
         Fallback{ "en"}

icu4c/source/data/locales/nn.txt

@@ -7,12 +7,14 @@
 
 nn{
     Version { "2.0" }
-    CollationElements {
+    collations {
+      standard { 
         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"
         }
+      }
     }
     Countries {
         NO { "Noreg" }

icu4c/source/data/locales/pl.txt

@@ -7,7 +7,8 @@
 
 pl {
     Version{ "2.0" }
-    CollationElements { 
+    collations {
+      standard { 
         Version { "2" }
         Sequence { "&A < a\u0328 <<< A\u0328" 
                    "&C < c\u0301 <<< C\u0301" 
@@ -17,6 +18,7 @@ pl {
                    "&O < o\u0301 <<< O\u0301"
                    "&S < s\u0301 <<< S\u0301" 
                    "&Z < z\u0301 <<< Z\u0301 < z\u0307 <<< Z\u0307" }
+      }
     }
     Countries { 
         Fallback{ "en"}

icu4c/source/data/locales/ps.txt

@@ -17,7 +17,8 @@ ps {
         "\u063a.\u0648.",
     }
     // This is a unified sort with uz_AF, fa_AF and ps.
-    CollationElements {
+    collations {
+      standard { 
         Version { "1.0" }
         Sequence { "[normalization on]"
            "&\u064e<<\u0650<<\u064f<<\u064b<<\u064d<<\u064c"
@@ -36,6 +37,7 @@ ps {
            "&\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" }

icu4c/source/data/locales/ro.txt

@@ -7,11 +7,13 @@
 
 ro {
     Version{ "2.0" }
-    CollationElements {
+    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"}

icu4c/source/data/locales/root.txt

@@ -60,22 +60,9 @@ root {
           Version  { "0.0" }
           Sequence { "" }
        }
-       // placeholder for phonebook
-       phonebook:alias { "root/collations/standard" }
-       traditional:alias { "root/collations/standard" }
-       
        default { "standard" }
     }
 
-    // For backwards compatibility
-    CollationElements:alias { "root/collations/standard" }
-
-    // Here are empty collation rules just for the consistency. UCA is used instead... 01/16/2001 by weiv
-    //CollationElements {
-        //Version { "0.0" }
-        //Sequence{ ""  }
-    //}
-
     //------------------------------------------------------------
     // BEGIN Transliterator support
     //------------------------------------------------------------

icu4c/source/data/locales/ru.txt

@@ -9,11 +9,13 @@ ru {
     Version{ "2.0" }
     // Using the new options in rules in order to 
     // improve the performance for Cyrillic chars.
-    CollationElements { 
+    collations {
+      standard { 
         Version { "1.1" }
         Sequence { 
             "[suppressContractions [\u0400-\u045f]]"
         }
+      }
     }
     Countries { 
         AD { "\u0410\u043D\u0434\u043E\u0440\u0440\u0430" }

icu4c/source/data/locales/sh.txt

@@ -7,7 +7,8 @@
 
 sh {
     Version { "2.0" }
-    CollationElements { 
+    collations {
+      standard { 
         Version { "2.0" }
         Sequence {
             "& C < \u010D <<< \u010C < \u0107 <<< \u0106"
@@ -17,6 +18,7 @@ sh {
             "& S < \u0161 <<< \u0160"
             "& Z < \u017E <<< \u017D"
             }
+      }
     }
     Countries { 
         Fallback{ "en"}

icu4c/source/data/locales/sk.txt

@@ -7,12 +7,14 @@
 
 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"}

icu4c/source/data/locales/sl.txt

@@ -7,13 +7,15 @@
 
 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"}

icu4c/source/data/locales/sq.txt

@@ -11,9 +11,11 @@ sq {
         "PD",
         "MD",
     }
-    CollationElements { 
+    collations {
+      standard { 
         Version { "1.0" }
-        Sequence { "@" }
+        Sequence { "[backwards 2]" }
+      }
     }
     Countries { 
         AL { "Shqip\u00EBria" }

icu4c/source/data/locales/sr.txt

@@ -9,7 +9,7 @@ sr {
     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" }

icu4c/source/data/locales/sv.txt

@@ -11,12 +11,14 @@ sv {
         "fm",
         "em",
     }
-    CollationElements {
+    collations {
+      standard { 
         Version { "1.1" }
         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"
         }
+      }
     }
     Countries { 
         Fallback{ "en"}

icu4c/source/data/locales/ta.txt

@@ -245,9 +245,11 @@ ta {
         }
     }
 
-    CollationElements {
+    collations {
+      standard { 
         Version { "1.0" }
         Sequence { "[normalization on]" }
+      }
     }
     LocaleScript:array {
         "Taml"   // ISO 15924 Name 

icu4c/source/data/locales/te.txt

@@ -75,9 +75,11 @@ te {
 //        "\u221e",
 //        "\ufffd",
 //    }
-    CollationElements {
+    collations {
+      standard { 
         Version { "1.0" }
         Sequence { "[normalization on]" }
+      }
     }
     LocaleScript{ 
         "Telu",  // ISO 15924 Name 

icu4c/source/data/locales/th.txt

@@ -12,7 +12,8 @@ th {
     //
     // First put in all of the consonants, after Z
     //
-    CollationElements {
+    collations {
+      standard { 
         Version { "3.0" }
         Sequence { 
            // Tailoring of UCA for Thai Royal Institute Dictionary Sort, B.E. 2525
@@ -56,6 +57,7 @@ th {
            "<<< \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" }

icu4c/source/data/locales/tr.txt

@@ -9,7 +9,8 @@ tr {
     Version{ "2.0" }
     // According to Nurdan Mete from IBM Turkey, the following would be the correct
     // sorting order for Turkish
-    CollationElements { 
+    collations {
+      standard { 
         Version { "2" }
         Sequence { "& C < c\u0327 <<< C\u0327" 
                    "& G < g\u0306 <<< G\u0306"
@@ -17,6 +18,7 @@ tr {
                    "& O < o\u0308 <<< O\u0308"
                    "& S < s\u0327 <<< S\u0327" 
                    "& U < u\u0308 <<< U\u0308" }
+      }
     }
     Countries { 
         Fallback{ "en"}

icu4c/source/data/locales/uk.txt

@@ -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"

icu4c/source/data/locales/vi.txt

@@ -7,11 +7,13 @@
 
 vi {
     Version { "2.0" }
-    CollationElements { 
+    collations {
+      standard { 
         Version { "2.0" }
         Sequence { "[normalization on]&\u0300<<\u0309<<\u0303<<\u0301<<"
         "\u0323<<\u0306<<\u0302<<\u031B"
         "&D<\u0111<<<\u0110" }
+      }
     }
     Countries {
         VN { "Vi\u1EC7t Nam" }

icu4c/source/data/locales/zh_HK.txt

@@ -8,7 +8,9 @@
 zh_HK {
     Version{ "2.0" }
 
-    CollationElements:alias { "zh_TW" }
+    collations { 
+      default { "traditional" }
+    }
     Countries:alias { "zh_TW" }
 
     DateTimePatterns { 

icu4c/source/data/locales/zh_MO.txt

@@ -7,7 +7,9 @@
 
 zh_MO {
     Version{ "2.0" }
-    CollationElements:alias { "zh_TW" }
+    collations { 
+      default { "traditional" }
+    }
     Countries:alias { "zh_TW" }
     DateTimePatterns { 
         "ahh'\u6642'mm'\u5206'ss'\u79D2' z",