Merge "ICU: add cherry-picked collation data from ICU 51 to sort native scripts first. Also bump version number to 50.1.1.2. Add updated .dat files from stubdata."
diff --git a/common/unicode/uvernum.h b/common/unicode/uvernum.h
index b1ecd11..d072e01 100644
--- a/common/unicode/uvernum.h
+++ b/common/unicode/uvernum.h
@@ -74,10 +74,11 @@
/** The current ICU build level version as an integer.
* This value is for use by ICU clients. It defaults to 0.
* @stable ICU 4.0
- * BEGIN Android patch of version for cherry pick of alphabetic index in 50.1
+ * BEGIN Android patch
+ * Update U_ICU_VERSION below for consistency.
*/
#ifndef U_ICU_VERSION_BUILDLEVEL_NUM
-#define U_ICU_VERSION_BUILDLEVEL_NUM 1
+#define U_ICU_VERSION_BUILDLEVEL_NUM 2
#endif
/* END Android patch */
@@ -117,11 +118,13 @@
/** The current ICU library version as a dotted-decimal string. The patchlevel
* only appears in this string if it non-zero.
- * This value will change in the subsequent releases of ICU
+ * This value will change in the subsequent releases of ICU.
* @stable ICU 2.4
- * BEGIN Android patch of version for cherry pick of alphabetic index in 50.1
+ * BEGIN Android patch: We increment the last version field when we make non-trivial changes
+ * to Android ICU.
+ * Update U_ICU_VERSION_BUILDLEVEL_NUM above for consistency.
*/
-#define U_ICU_VERSION "50.1.1.1"
+#define U_ICU_VERSION "50.1.1.2"
/* END Android patch */
/** The current ICU library major/minor version as a string without dots, for library name suffixes.
diff --git a/data/coll/ar.txt b/data/coll/ar.txt
index 2399387..1d67897 100644
--- a/data/coll/ar.txt
+++ b/data/coll/ar.txt
@@ -13,7 +13,7 @@
Version{"2.0.76.11"}
collations{
standard{
- Sequence{"&ت<<ة<<<ﺔ<<<ﺓ&ي<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ<<<ﲐ<<<ﱝ"}
+ Sequence{" [reorder Arab]&ت<<ة<<<ﺔ<<<ﺓ&ي<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ<<<ﲐ<<<ﱝ"}
Version{"22.1.1"}
}
}
diff --git a/data/coll/as.txt b/data/coll/as.txt
index bb40ad6..fce4a91 100644
--- a/data/coll/as.txt
+++ b/data/coll/as.txt
@@ -13,7 +13,11 @@
Version{"2.0.41.26"}
collations{
standard{
- Sequence{" [normalization on ]&ঔ<ং<ঁ<ঃ&[before 1]ত<ত্'\u200D'&হ<ক্ষ"}
+ Sequence{
+ " [normalization on ] [reorder Beng Deva Guru Gujr Orya Taml Telu Knda"
+ " Mlym Sinh]"
+ "&ঔ<ং<ঁ<ঃ"
+ "&[before 1]ত<ত্'\u200D'&হ<ক্ষ"}
Version{"22.1.1"}
}
}
diff --git a/data/coll/az.txt b/data/coll/az.txt
index 2b6ed06..65ffffb 100644
--- a/data/coll/az.txt
+++ b/data/coll/az.txt
@@ -75,6 +75,7 @@
}
standard{
Sequence{
+ " [reorder Latn Cyrl]"
"&C<ç<<<Ç"
"&G<ğ<<<Ğ"
"&[before 1]i<ı<<<I"
diff --git a/data/coll/be.txt b/data/coll/be.txt
index 533ddf7..d6efe86 100644
--- a/data/coll/be.txt
+++ b/data/coll/be.txt
@@ -13,7 +13,10 @@
Version{"2.0.49.75"}
collations{
standard{
- Sequence{"[suppressContractions [АаӘәГгЕеЖжЗзІіОоӨөКкЧчЫыЭэѴѵ] ]&Е<ё<<<Ё"}
+ Sequence{
+ " [reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзІіОоӨөКкЧчЫыЭэѴѵ]]"
+ "&Е<ё<<<Ё"
+ }
Version{"22.1.1"}
}
}
diff --git a/data/coll/bg.txt b/data/coll/bg.txt
index c5c4e88..0882e1c 100644
--- a/data/coll/bg.txt
+++ b/data/coll/bg.txt
@@ -13,7 +13,10 @@
Version{"2.0.61.82"}
collations{
standard{
- Sequence{"[suppressContractions [АаӘәГгЕеЖжЗзІіОоӨөКкУуЧчЫыЭэѴѵ] ]"}
+ Sequence{
+ " [reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзІіОоӨөКкУуЧчЫыЭэѴѵ"
+ "]]"
+ }
Version{"22.1.1"}
}
}
diff --git a/data/coll/bn.txt b/data/coll/bn.txt
index db43821..de7a1e1 100644
--- a/data/coll/bn.txt
+++ b/data/coll/bn.txt
@@ -13,12 +13,17 @@
Version{"2.0.59.17"}
collations{
standard{
- Sequence{" [normalization on ]&ঔ<ং<ঃ<ঁ"}
+ Sequence{
+ " [normalization on] [reorder Beng Deva Guru Gujr Orya Taml Telu Knda"
+ " Mlym Sinh]"
+ "&ঔ<ং<ঃ<ঁ"
+ }
Version{"22.1.1"}
}
traditional{
Sequence{
- " [normalization on ]"
+ " [normalization on] [reorder Beng Deva Guru Gujr Orya Taml Telu Knda"
+ " Mlym Sinh]"
"&ঔ<ং<ঃ<ঁ<ক্<খ্<গ্<ঘ্<ঙ্<চ্<ছ্<জ্<ঝ্<ঞ্<ট্<ঠ্<ড্<ঢ্<ণ্<ৎ=ত্'\u200D'<<"
"ত্<থ্<দ্<ধ্<ন্<প্<ফ্<ব্<ভ্<ম্<য্<র্<ৰ্<ল্<ৱ্<শ্<ষ্<স্<হ্"
"&ক্অ=ক"
diff --git a/data/coll/el.txt b/data/coll/el.txt
index 5745cf7..c7577fe 100644
--- a/data/coll/el.txt
+++ b/data/coll/el.txt
@@ -13,7 +13,7 @@
Version{"2.0.50.60"}
collations{
standard{
- Sequence{" [normalization on ]"}
+ Sequence{" [normalization on] [reorder Grek]"}
Version{"22.1.1"}
}
}
diff --git a/data/coll/fa.txt b/data/coll/fa.txt
index 8e834b2..393eaff 100644
--- a/data/coll/fa.txt
+++ b/data/coll/fa.txt
@@ -14,7 +14,7 @@
collations{
standard{
Sequence{
- " [normalization on ]"
+ " [normalization on] [reorder Arab]"
"&َ<<ِ<<ُ<<ً<<ٍ<<ٌ"
"&[before 1]ا<آ"
"&ا<<ٱ<ء<<أ<<*ٲ<<إ<<*ٳ<<ؤ<<یٔ<<<ىٔ<<<ئ"
diff --git a/data/coll/gu.txt b/data/coll/gu.txt
index 00bf573..d859ff4 100644
--- a/data/coll/gu.txt
+++ b/data/coll/gu.txt
@@ -13,7 +13,11 @@
Version{"2.0.50.24"}
collations{
standard{
- Sequence{" [normalization on ]&ૐ<ં<<ઁ<ઃ"}
+ Sequence{
+ " [normalization on] [reorder Gujr Deva Beng Guru Orya Taml Telu Knda"
+ " Mlym Sinh]"
+ "&ૐ<ં<<ઁ<ઃ"
+ }
Version{"22.1.1"}
}
}
diff --git a/data/coll/he.txt b/data/coll/he.txt
index 51f0d3f..6c9e64f 100644
--- a/data/coll/he.txt
+++ b/data/coll/he.txt
@@ -13,7 +13,7 @@
Version{"2.0.41.26"}
collations{
standard{
- Sequence{" [normalization on ]"}
+ Sequence{" [normalization on] [reorder Hebr]"}
Version{"22.1.1"}
}
}
diff --git a/data/coll/hi.txt b/data/coll/hi.txt
index 0b3e3f7..a8f77b8 100644
--- a/data/coll/hi.txt
+++ b/data/coll/hi.txt
@@ -13,7 +13,11 @@
Version{"2.0.63.59"}
collations{
standard{
- Sequence{" [normalization on ]&ॐ<ं<<ँ<ः"}
+ Sequence{
+ " [normalization on] [reorder Deva Beng Guru Gujr Orya Taml Telu Knda"
+ " Mlym Sinh]"
+ "&ॐ<ं<<ँ<ः"
+ }
Version{"22.1.1"}
}
}
diff --git a/data/coll/hr.txt b/data/coll/hr.txt
index f9c0763..8f23cd7 100644
--- a/data/coll/hr.txt
+++ b/data/coll/hr.txt
@@ -14,7 +14,7 @@
collations{
search{
Sequence{
- " [normalization on ][suppressContractions [เ-ไ ເ-ໄ] ]"
+ " [normalization on][suppressContractions [เ-ไ ເ-ໄ]]"
"&'='<'\u2260'&ا<<<ﺎ<<<ﺍ<<آ<<<ﺂ<<<ﺁ<<أ<<<ﺄ<<<ﺃ<<إ<<<ﺈ<<<ﺇ"
"&و<<<ۥ<<<ﻮ<<<ﻭ<<ؤ<<<ﺆ<<<ﺅ"
"&ي<<<ۦ<<<ﻳ<<<ﻴ<<<ﻲ<<<ﻱ<<ئ<<<ﺋ<<<ﺌ<<<ﺊ<<<ﺉ<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ"
@@ -71,6 +71,7 @@
}
standard{
Sequence{
+ " [reorder Latn Cyrl]"
"&C<č<<<Č<ć<<<Ć"
"&D<dž<<<dž<<<Dž<<<Dž<<<DŽ<<<DŽ<đ<<<Đ"
"&L<lj<<<lj<<<Lj<<<Lj<<<LJ<<<LJ"
diff --git a/data/coll/hy.txt b/data/coll/hy.txt
index ccb58d2..d9420de 100644
--- a/data/coll/hy.txt
+++ b/data/coll/hy.txt
@@ -13,7 +13,7 @@
Version{"2.0.48.6"}
collations{
standard{
- Sequence{"&ք<և<<<Եւ"}
+ Sequence{" [reorder Armn]&ք<և<<<Եւ"}
Version{"22.1.1"}
}
}
diff --git a/data/coll/ja.txt b/data/coll/ja.txt
index d7ee84f..a354a5e 100644
--- a/data/coll/ja.txt
+++ b/data/coll/ja.txt
@@ -14,10 +14,7 @@
collations{
standard{
Sequence{
- // BEGIN android-add
- " [reorder Kana Hani]"
- // END android-add
- " [strength 3 ] [hiraganaQ on ]"
+ " [strength 3] [hiraganaQ on] [reorder Kana Hani]"
"&ヽ=ゝ"
"&[before 3]ァ<<<ァ|ー=ｧ|ー=ぁ|ー=ア|ー=ｱ|ー=あ|ー=カ|ー=ｶ|ー=か|ー=ゕ|ー=ガ|ー=が|ー=サ|ー=ｻ"
"|ー=さ|ー=ザ|ー=ざ|ー=タ|ー=ﾀ|ー=た|ー=ダ|ー=だ|ー=ナ|ー=ﾅ|ー=な|ー=ハ|ー=ﾊ|ー=ㇵ|ー=は|ー=バ|ー=ば"
@@ -428,8 +425,7 @@
// BEGIN android-add
phonebook{
Sequence{
- " [reorder Kana Hani]"
- " [strength 3 ] [hiraganaQ on ]"
+ " [strength 3] [hiraganaQ on] [reorder Kana Hani]"
"&ヽ=ゝ"
"&[before 3]ァ<<<ァ|ー=ｧ|ー=ぁ|ー=ア|ー=ｱ|ー=あ|ー=カ|ー=ｶ|ー=か|ー=ゕ|ー=ガ|ー=が|ー=サ|ー=ｻ"
"|ー=さ|ー=ザ|ー=ざ|ー=タ|ー=ﾀ|ー=た|ー=ダ|ー=だ|ー=ナ|ー=ﾅ|ー=な|ー=ハ|ー=ﾊ|ー=ㇵ|ー=は|ー=バ|ー=ば"
diff --git a/data/coll/kk.txt b/data/coll/kk.txt
index 4baeae3..6357363 100644
--- a/data/coll/kk.txt
+++ b/data/coll/kk.txt
@@ -14,7 +14,8 @@
collations{
standard{
Sequence{
- "[suppressContractions [АаӘәГгЕеЖжЗзІіОоӨөКкУуЧчЫыЭэѴѵ] ]"
+ " [reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзІіОоӨөКкУуЧчЫыЭэѴѵ"
+ "]]"
"&Е<ё<<<Ё"
"&Ұ<ү<<<Ү"
"&[before 1]ь<і<<<І"
diff --git a/data/coll/km.txt b/data/coll/km.txt
index 9b6470b..e409f25 100644
--- a/data/coll/km.txt
+++ b/data/coll/km.txt
@@ -14,7 +14,7 @@
collations{
standard{
Sequence{
- " [normalization on ]"
+ " [normalization on ] [reorder Khmr]"
"&[last tertiary ignorable ]=឴=឵"
"&។ល។<<<៘"
"&ៈ<<៎<<៏<<៑<<័<<ៈ<<៝<<់<<៉<<៊<<៍"
diff --git a/data/coll/kn.txt b/data/coll/kn.txt
index e57046c..a318085 100644
--- a/data/coll/kn.txt
+++ b/data/coll/kn.txt
@@ -13,12 +13,16 @@
Version{"2.0.49.81"}
collations{
standard{
- Sequence{" [normalization on ]&ಔ<ಂ<ಃ<ೱ<ೲ"}
+ Sequence{
+ " [normalization on] [reorder Knda Deva Beng Guru Gujr Orya Taml Telu"
+ " Mlym Sinh]"
+ "&ಔ<ಂ<ಃ<ೱ<ೲ"}
Version{"22.1.1"}
}
traditional{
Sequence{
- " [normalization on ]"
+ " [normalization on] [reorder Knda Deva Beng Guru Gujr Orya Taml Telu"
+ " Mlym Sinh]"
"&ಔ<ಂ<ಃ<ೱ<ೲ<ಕ್<ಖ್<ಗ್<ಘ್<ಙ್<ಚ್<ಛ್<ಜ್<ಝ್<ಞ್<ಟ್<ಠ್<ಡ್<ಢ್<ಣ್<ತ್<ಥ್<ದ್<ಧ್<"
"ನ್<ಪ್<ಫ್<ಬ್<ಭ್<ಮ್<ಯ್<ರ್<ಱ್<ಲ್<ವ್<ಶ್<ಷ್<ಸ್<ಹ್<ಳ್<ೞ್"
"&ಕ್ಅ=ಕ"
diff --git a/data/coll/kok.txt b/data/coll/kok.txt
index 7da2691..a6a710b 100644
--- a/data/coll/kok.txt
+++ b/data/coll/kok.txt
@@ -13,7 +13,11 @@
Version{"2.0.42.63"}
collations{
standard{
- Sequence{" [normalization on ]&ॐ<ं<<ँ<ः&ह<ळ<क्ष"}
+ Sequence{
+ " [normalization on] [reorder Deva Beng Guru Gujr Orya Taml Telu Knda"
+ " Mlym Sinh]"
+ "&ॐ<ं<<ँ<ः&ह<ळ<क्ष"
+ }
Version{"22.1.1"}
}
}
diff --git a/data/coll/mk.txt b/data/coll/mk.txt
index efca093..91c3f90 100644
--- a/data/coll/mk.txt
+++ b/data/coll/mk.txt
@@ -13,7 +13,7 @@
Version{"2.0.49.75"}
collations{
standard{
- Sequence{"[suppressContractions [АаӘәЕеЖжЗзИиІіОоӨөУуЧчЫыЭэѴѵ] ]"}
+ Sequence{" [reorder Cyrl][suppressContractions [АаӘәЕеЖжЗзИиІіОоӨөУуЧчЫыЭэѴѵ]]"}
Version{"22.1.1"}
}
}
diff --git a/data/coll/ml.txt b/data/coll/ml.txt
index ef37e6f..994f85a 100644
--- a/data/coll/ml.txt
+++ b/data/coll/ml.txt
@@ -14,6 +14,8 @@
collations{
standard{
Sequence{
+ " [reorder Mlym Latn Deva Arab Taml Knda Telu Beng Guru Gujr Orya Sin"
+ "h]"
"&ഃ<<ഽ"
"&ോ<ൗ"
"&ൗ<<<ൌ"
diff --git a/data/coll/mr.txt b/data/coll/mr.txt
index 01425d9..2a386b5 100644
--- a/data/coll/mr.txt
+++ b/data/coll/mr.txt
@@ -13,7 +13,11 @@
Version{"2.0.42.63"}
collations{
standard{
- Sequence{" [normalization on ]&ॐ<ं<<ँ<ः&ह<ळ<क्ष<ज्ञ"}
+ Sequence{
+ " [normalization on] [reorder Deva Beng Guru Gujr Orya Taml Telu Knda"
+ " Mlym Sinh]"
+ "&ॐ<ं<<ँ<ः&ह<ळ<क्ष<ज्ञ"
+ }
Version{"22.1.1"}
}
}
diff --git a/data/coll/my.txt b/data/coll/my.txt
index de78914..53987dc 100644
--- a/data/coll/my.txt
+++ b/data/coll/my.txt
@@ -14,7 +14,7 @@
collations{
standard{
Sequence{
- " [normalization on ]"
+ " [normalization on] [reorder Mymr]"
"&ႌ<့<း<့း"
"&ာ<<ါ"
"&ဲ<ော<<ေါ<ော်<<ေါ်"
diff --git a/data/coll/or.txt b/data/coll/or.txt
index 86d073f..a25b106 100644
--- a/data/coll/or.txt
+++ b/data/coll/or.txt
@@ -13,7 +13,13 @@
Version{"2.0.50.38"}
collations{
standard{
- Sequence{" [normalization on ]&ଔ<ଁ<ଂ<ଃ&ହ<କ୍ଷ&ଯ<<ୟ"}
+ Sequence{
+ " [normalization on] [reorder Orya Deva Beng Guru Gujr Taml Telu Knda"
+ " Mlym Sinh]"
+ "&ଔ<ଁ<ଂ<ଃ"
+ "&ହ<କ୍ଷ"
+ "&ଯ<<ୟ"
+ }
Version{"22.1.1"}
}
}
diff --git a/data/coll/pa.txt b/data/coll/pa.txt
index a7f9a14..cb3f3e7 100644
--- a/data/coll/pa.txt
+++ b/data/coll/pa.txt
@@ -13,7 +13,12 @@
Version{"2.0.42.63"}
collations{
standard{
- Sequence{" [normalization on ]&ੱ<<ੰ<<ਂ<<ਁ<<਼&ੜ<੍"}
+ Sequence{
+ " [normalization on] [reorder Guru Deva Beng Gujr Orya Taml Telu Knda"
+ " Mlym Sinh Arab]"
+ "&ੱ<<ੰ<<ਂ<<ਁ<<਼"
+ "&ੜ<੍"
+ }
Version{"22.1.1"}
}
}
diff --git a/data/coll/ps.txt b/data/coll/ps.txt
index 505bf45..cba72cc 100644
--- a/data/coll/ps.txt
+++ b/data/coll/ps.txt
@@ -14,7 +14,7 @@
collations{
standard{
Sequence{
- " [normalization on ]"
+ " [normalization on ] [reorder Arab]"
"&َ<<ِ<<ُ<<ً<<ٍ<<ٌ"
"&[before 1]ا<آ"
"&ا<<أ<<*ٲٱ<<إ<<*ٳ<ء"
diff --git a/data/coll/ru.txt b/data/coll/ru.txt
index 62861b6..7ab62d1 100644
--- a/data/coll/ru.txt
+++ b/data/coll/ru.txt
@@ -13,7 +13,10 @@
Version{"2.0.76.11"}
collations{
standard{
- Sequence{"[suppressContractions [АаӘәГгЕеЖжЗзІіОоӨөКкУуЧчЫыЭэѴѵ] ]"}
+ Sequence{
+ " [reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзІіОоӨөКкУуЧчЫыЭэѴѵ"
+ "]]"
+ }
Version{"22.1.1"}
}
}
diff --git a/data/coll/si.txt b/data/coll/si.txt
index 3bf583b..297f4ed 100644
--- a/data/coll/si.txt
+++ b/data/coll/si.txt
@@ -13,11 +13,19 @@
Version{"2.0.50.23"}
collations{
dictionary{
- Sequence{" [normalization on ]&ඖ<ං<ඃ&ජ්ඤ<<ඥ"}
+ Sequence{
+ " [normalization on] [reorder Sinh Deva Beng Guru Gujr Orya Taml Telu"
+ " Knda Mlym]"
+ "&ඖ<ං<ඃ&ජ්ඤ<<ඥ"
+ }
Version{"22.1.1"}
}
standard{
- Sequence{" [normalization on ]&ඖ<ං<ඃ&ඥ<ඤ"}
+ Sequence{
+ " [normalization on] [reorder Sinh Deva Beng Guru Gujr Orya Taml Telu"
+ " Knda Mlym]"
+ "&ඖ<ං<ඃ&ඥ<ඤ"
+ }
Version{"22.1.1"}
}
}
diff --git a/data/coll/sr.txt b/data/coll/sr.txt
index ac41f18..db996aa 100644
--- a/data/coll/sr.txt
+++ b/data/coll/sr.txt
@@ -13,7 +13,10 @@
Version{"2.0.49.75"}
collations{
standard{
- Sequence{"[suppressContractions [АаӘәГгЕеЖжЗзИиІіОоӨөКкУуЧчЫыЭэѴѵ] ]"}
+ Sequence{
+ " [reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзИиІіОоӨөКкУуЧчЫыЭэ"
+ "Ѵѵ]]"
+ }
Version{"22.1.1"}
}
}
diff --git a/data/coll/ta.txt b/data/coll/ta.txt
index ec8c6a0..b0c30f3 100644
--- a/data/coll/ta.txt
+++ b/data/coll/ta.txt
@@ -14,7 +14,8 @@
collations{
standard{
Sequence{
- " [normalization on ]"
+ " [normalization on] [reorder Taml Deva Beng Guru Gujr Orya Telu Knda"
+ " Mlym Sinh]"
"&ஔ<ஂ<ஃ"
"&ஹ<க்ஷ"
"&[before 1]க<க்"
diff --git a/data/coll/te.txt b/data/coll/te.txt
index 783ab32..fe1e965 100644
--- a/data/coll/te.txt
+++ b/data/coll/te.txt
@@ -13,7 +13,11 @@
Version{"2.0.50.32"}
collations{
standard{
- Sequence{" [normalization on ]&ఔ<ఁ<ం<ః"}
+ Sequence{
+ " [normalization on] [reorder Telu Deva Beng Guru Gujr Orya Taml Knda"
+ " Mlym Sinh]"
+ "&ఔ<ఁ<ం<ః"
+ }
Version{"22.1.1"}
}
}
diff --git a/data/coll/th.txt b/data/coll/th.txt
index f00a24a..4efd7ad 100644
--- a/data/coll/th.txt
+++ b/data/coll/th.txt
@@ -14,7 +14,7 @@
collations{
standard{
Sequence{
- " [alternate shifted ] [normalization on ]"
+ " [alternate shifted] [normalization on] [reorder Thai]"
"&[before 1]๚<ฯ"
"&๛<ๆ"
"&๎<<์"
diff --git a/data/coll/uk.txt b/data/coll/uk.txt
index 6d7c678..d361a8e 100644
--- a/data/coll/uk.txt
+++ b/data/coll/uk.txt
@@ -13,7 +13,10 @@
Version{"2.0.62.15"}
collations{
standard{
- Sequence{"[suppressContractions [АаӘәГгЕеЖжЗзОоӨөКкУуЧчЫыЭэѴѵ] ]&Г<ґ<<<Ґ"}
+ Sequence{
+ " [reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзОоӨөКкУуЧчЫыЭэѴѵ]]"
+ "&Г<ґ<<<Ґ"
+ }
Version{"22.1.1"}
}
}
diff --git a/data/coll/ur.txt b/data/coll/ur.txt
index e5a5549..c3f4532 100755
--- a/data/coll/ur.txt
+++ b/data/coll/ur.txt
@@ -14,6 +14,7 @@
collations{
standard{
Sequence{
+ " [reorder Arab]"
"&ا<<أ<آ<ب<بھ<پ<پھ<ت<تھ<ٹ<ٹھ<ث<ج<جھ<چ<چھ<ح<خ<د<دھ<ڈ<ڈھ<ذ<ر<رھ<ڑ<ڑھ<ز<"
"ژ<س<ش<ص<ض<ط<ظ<ع<غ<ف<ق<ک<کھ<گ<گھ<ل<لھ<م<مھ<ن<نھ<ں<ںھ<و<<ؤ<وھ<ہ<<ۂ<ھ<ۃ"
"<ء<ی<<ئ<یھ<ے<<ۓ"
diff --git a/data/coll/zh.txt b/data/coll/zh.txt
index 3f9793a..7bb17f8 100644
--- a/data/coll/zh.txt
+++ b/data/coll/zh.txt
@@ -21,9 +21,7 @@
// END android-remove
pinyin{
Sequence{
- // BEGIN android-add
" [reorder Hani]"
- // END android-add
"&[before 2]a<<ā<<<Ā<<á<<<Á<<ǎ<<<Ǎ<<à<<<À"
"&[before 2]e<<ē<<<Ē<<é<<<É<<ě<<<Ě<<è<<<È"
"&e<<ê̄<<<Ê̄<<ế<<<Ế<<ê̌<<<Ê̌<<ề<<<Ề"
@@ -812,6 +810,7 @@
}
stroke{
Sequence{
+ " [reorder Hani Bopo]"
"&[before 2]a<<ā<<<Ā<<á<<<Á<<ǎ<<<Ǎ<<à<<<À"
"&[before 2]e<<ē<<<Ē<<é<<<É<<ě<<<Ě<<è<<<È"
"&e<<ê̄<<<Ê̄<<ế<<<Ế<<ê̌<<<Ê̌<<ề<<<Ề"
diff --git a/stubdata/icudt50l-all.dat b/stubdata/icudt50l-all.dat
index d1bca24..23824cb 100644
--- a/stubdata/icudt50l-all.dat
+++ b/stubdata/icudt50l-all.dat
Binary files differ
diff --git a/stubdata/icudt50l-default.dat b/stubdata/icudt50l-default.dat
index c30bc00..8d6ffda 100644
--- a/stubdata/icudt50l-default.dat
+++ b/stubdata/icudt50l-default.dat
Binary files differ
