diff --git a/.gitattributes b/.gitattributes index 77a3df68196..fe5406da641 100644 --- a/.gitattributes +++ b/.gitattributes @@ -57,8 +57,13 @@ icu4c/source/data/coll/ms_Latn.txt -text icu4c/source/data/coll/ms_Latn_BN.txt -text icu4c/source/data/coll/ms_Latn_MY.txt -text icu4c/source/data/coll/ms_Latn_SG.txt -text +icu4c/source/data/curr/ms_BN.txt -text icu4c/source/data/curr/ms_Latn.txt -text icu4c/source/data/curr/ms_Latn_BN.txt -text +icu4c/source/data/curr/ms_Latn_MY.txt -text +icu4c/source/data/curr/ms_Latn_SG.txt -text +icu4c/source/data/curr/ms_MY.txt -text +icu4c/source/data/curr/ms_SG.txt -text icu4c/source/data/curr/pool.res -text icu4c/source/data/in/coll/invuca.icu -text icu4c/source/data/in/coll/ucadata.icu -text @@ -71,16 +76,31 @@ icu4c/source/data/in/ucase.icu -text icu4c/source/data/in/unames.icu -text icu4c/source/data/in/uprops.icu -text icu4c/source/data/in/uts46.nrm -text +icu4c/source/data/lang/ms_BN.txt -text icu4c/source/data/lang/ms_Latn.txt -text +icu4c/source/data/lang/ms_Latn_BN.txt -text +icu4c/source/data/lang/ms_Latn_MY.txt -text +icu4c/source/data/lang/ms_Latn_SG.txt -text +icu4c/source/data/lang/ms_MY.txt -text +icu4c/source/data/lang/ms_SG.txt -text icu4c/source/data/lang/pool.res -text +icu4c/source/data/locales/ms_BN.txt -text icu4c/source/data/locales/ms_Latn.txt -text icu4c/source/data/locales/ms_Latn_BN.txt -text icu4c/source/data/locales/ms_Latn_MY.txt -text icu4c/source/data/locales/ms_Latn_SG.txt -text +icu4c/source/data/locales/ms_MY.txt -text +icu4c/source/data/locales/ms_SG.txt -text icu4c/source/data/locales/pool.res -text icu4c/source/data/makedata.vcxproj -text icu4c/source/data/makedata.vcxproj.filters -text +icu4c/source/data/region/ms_BN.txt -text icu4c/source/data/region/ms_Latn.txt -text +icu4c/source/data/region/ms_Latn_BN.txt -text +icu4c/source/data/region/ms_Latn_MY.txt -text +icu4c/source/data/region/ms_Latn_SG.txt -text +icu4c/source/data/region/ms_MY.txt -text +icu4c/source/data/region/ms_SG.txt -text icu4c/source/data/region/pool.res -text icu4c/source/data/translit/az_Upper.txt -text icu4c/source/data/translit/el_Upper.txt -text @@ -88,7 +108,13 @@ icu4c/source/data/translit/lt_Upper.txt -text icu4c/source/data/translit/nl_Title.txt -text icu4c/source/data/translit/tr_Upper.txt -text icu4c/source/data/xml/main/ms_Latn.xml -text +icu4c/source/data/zone/ms_BN.txt -text icu4c/source/data/zone/ms_Latn.txt -text +icu4c/source/data/zone/ms_Latn_BN.txt -text +icu4c/source/data/zone/ms_Latn_MY.txt -text +icu4c/source/data/zone/ms_Latn_SG.txt -text +icu4c/source/data/zone/ms_MY.txt -text +icu4c/source/data/zone/ms_SG.txt -text icu4c/source/data/zone/pool.res -text icu4c/source/extra/uconv/uconv.vcxproj -text icu4c/source/extra/uconv/uconv.vcxproj.filters -text diff --git a/icu4c/source/data/coll/ar.txt b/icu4c/source/data/coll/ar.txt index 84bdaf39b71..f28bfd00c74 100644 --- a/icu4c/source/data/coll/ar.txt +++ b/icu4c/source/data/coll/ar.txt @@ -10,10 +10,10 @@ * ICU source: /xml/collation/ar.xml */ ar{ - Version{"2.0.80.65"} + Version{"2.0.80.77"} collations{ standard{ - Sequence{" [reorder Arab Latn]&ت<<ة<<<ﺔ<<<ﺓ&ي<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ<<<ﲐ<<<ﱝ"} + Sequence{" [reorder Arab]&ت<<ة<<<ﺔ<<<ﺓ&ي<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ<<<ﲐ<<<ﱝ"} Version{"23"} } } diff --git a/icu4c/source/data/coll/he.txt b/icu4c/source/data/coll/he.txt index 93511c551f4..07bd3612ed9 100644 --- a/icu4c/source/data/coll/he.txt +++ b/icu4c/source/data/coll/he.txt @@ -10,7 +10,7 @@ * ICU source: /xml/collation/he.xml */ he{ - Version{"2.0.80.59"} + Version{"2.0.80.77"} collations{ search{ Sequence{ @@ -64,11 +64,7 @@ he{ Version{"23"} } standard{ - Sequence{ - " [normalization on] [reorder Hebr Latn]" - "&[before 2]''<<׳" - "&[before 2]'\"'<<״" - } + Sequence{" [normalization on] [reorder Hebr]&[before 2]''<<׳&[before 2]'\"'<<״"} Version{"23"} } } diff --git a/icu4c/source/data/coll/ru.txt b/icu4c/source/data/coll/ru.txt index b2d7527571b..dea32e0e5ed 100644 --- a/icu4c/source/data/coll/ru.txt +++ b/icu4c/source/data/coll/ru.txt @@ -10,12 +10,12 @@ * ICU source: /xml/collation/ru.xml */ ru{ - Version{"2.0.80.59"} + Version{"2.0.80.77"} collations{ standard{ Sequence{ - " [reorder Cyrl Latn][suppressContractions [АаӘәГгЕеЖжЗзІіОоӨөКкУуЧчЫ" - "ыЭэѴѵ]]" + " [reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзІіОоӨөКкУуЧчЫыЭэѴѵ" + "]]" } Version{"23"} } diff --git a/icu4c/source/data/coll/sr.txt b/icu4c/source/data/coll/sr.txt index 0c6440aa5b6..59177d232c1 100644 --- a/icu4c/source/data/coll/sr.txt +++ b/icu4c/source/data/coll/sr.txt @@ -10,12 +10,12 @@ * ICU source: /xml/collation/sr.xml */ sr{ - Version{"2.0.80.59"} + Version{"2.0.80.77"} collations{ standard{ Sequence{ - " [reorder Cyrl Latn][suppressContractions [АаӘәГгЕеЖжЗзИиІіОоӨөКкУуЧ" - "чЫыЭэѴѵ]]" + " [reorder Cyrl][suppressContractions [АаӘәГгЕеЖжЗзИиІіОоӨөКкУуЧчЫыЭэ" + "Ѵѵ]]" } Version{"23"} } diff --git a/icu4c/source/data/coll/th.txt b/icu4c/source/data/coll/th.txt index b31c36482c1..6bea87c8508 100644 --- a/icu4c/source/data/coll/th.txt +++ b/icu4c/source/data/coll/th.txt @@ -10,11 +10,11 @@ * ICU source: /xml/collation/th.xml */ th{ - Version{"2.0.80.59"} + Version{"2.0.80.77"} collations{ standard{ Sequence{ - " [alternate shifted] [normalization on] [reorder Thai Latn]" + " [alternate shifted] [normalization on] [reorder Thai]" "&[before 1]๚<ฯ" "&๛<ๆ" "&๎<<์" diff --git a/icu4c/source/data/curr/ms_BN.txt b/icu4c/source/data/curr/ms_BN.txt new file mode 100644 index 00000000000..3f5c08a3ea8 --- /dev/null +++ b/icu4c/source/data/curr/ms_BN.txt @@ -0,0 +1,11 @@ +// *************************************************************************** +// * +// * Copyright (C) 2013 International Business Machines +// * Corporation and others. All Rights Reserved. +// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java +// * Source File:/icu-config.xml & build.xml +// * +// *************************************************************************** +ms_BN{ + "%%ALIAS"{"ms_Latn_BN"} +} diff --git a/icu4c/source/data/curr/ms_Latn_MY.txt b/icu4c/source/data/curr/ms_Latn_MY.txt new file mode 100644 index 00000000000..dc26b904042 --- /dev/null +++ b/icu4c/source/data/curr/ms_Latn_MY.txt @@ -0,0 +1,17 @@ +// *************************************************************************** +// * +// * Copyright (C) 2013 International Business Machines +// * Corporation and others. All Rights Reserved. +// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java +// * Source File:/icu-config.xml & build.xml +// * +// *************************************************************************** +/** + * generated alias target + */ +ms_Latn_MY{ + /** + * so genrb doesn't issue warnings + */ + ___{""} +} diff --git a/icu4c/source/data/curr/ms_Latn_SG.txt b/icu4c/source/data/curr/ms_Latn_SG.txt new file mode 100644 index 00000000000..c65bf0af4c5 --- /dev/null +++ b/icu4c/source/data/curr/ms_Latn_SG.txt @@ -0,0 +1,17 @@ +// *************************************************************************** +// * +// * Copyright (C) 2013 International Business Machines +// * Corporation and others. All Rights Reserved. +// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java +// * Source File:/icu-config.xml & build.xml +// * +// *************************************************************************** +/** + * generated alias target + */ +ms_Latn_SG{ + /** + * so genrb doesn't issue warnings + */ + ___{""} +} diff --git a/icu4c/source/data/curr/ms_MY.txt b/icu4c/source/data/curr/ms_MY.txt new file mode 100644 index 00000000000..c926ea927bc --- /dev/null +++ b/icu4c/source/data/curr/ms_MY.txt @@ -0,0 +1,11 @@ +// *************************************************************************** +// * +// * Copyright (C) 2013 International Business Machines +// * Corporation and others. All Rights Reserved. +// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java +// * Source File:/icu-config.xml & build.xml +// * +// *************************************************************************** +ms_MY{ + "%%ALIAS"{"ms_Latn_MY"} +} diff --git a/icu4c/source/data/curr/ms_SG.txt b/icu4c/source/data/curr/ms_SG.txt new file mode 100644 index 00000000000..841c7379c25 --- /dev/null +++ b/icu4c/source/data/curr/ms_SG.txt @@ -0,0 +1,11 @@ +// *************************************************************************** +// * +// * Copyright (C) 2013 International Business Machines +// * Corporation and others. All Rights Reserved. +// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java +// * Source File:/icu-config.xml & build.xml +// * +// *************************************************************************** +ms_SG{ + "%%ALIAS"{"ms_Latn_SG"} +} diff --git a/icu4c/source/data/curr/resfiles.mk b/icu4c/source/data/curr/resfiles.mk index 05e95d73cad..ca9258144c8 100644 --- a/icu4c/source/data/curr/resfiles.mk +++ b/icu4c/source/data/curr/resfiles.mk @@ -31,7 +31,8 @@ CURR_SYNTHETIC_ALIAS = az_AZ.txt az_Latn_AZ.txt bs_BA.txt bs_Latn_BA.txt\ ha_GH.txt ha_Latn_GH.txt ha_Latn_NE.txt ha_Latn_NG.txt ha_NE.txt\ ha_NG.txt he_IL.txt id_ID.txt in.txt in_ID.txt\ iw.txt iw_IL.txt ja_JP.txt ja_JP_TRADITIONAL.txt kk_Cyrl_KZ.txt\ - kk_KZ.txt ks_Arab_IN.txt ks_IN.txt mo.txt nb_NO.txt\ + kk_KZ.txt ks_Arab_IN.txt ks_IN.txt mo.txt ms_BN.txt\ + ms_Latn_MY.txt ms_Latn_SG.txt ms_MY.txt ms_SG.txt nb_NO.txt\ nn_NO.txt no.txt no_NO.txt no_NO_NY.txt pa_Arab_PK.txt\ pa_Guru_IN.txt pa_IN.txt pa_PK.txt ro_MD.txt sh.txt\ sh_BA.txt sh_CS.txt sh_YU.txt shi_Latn_MA.txt shi_MA.txt\ diff --git a/icu4c/source/data/icu-config.xml b/icu4c/source/data/icu-config.xml index f16beae2a83..3ad02aeeeb0 100644 --- a/icu4c/source/data/icu-config.xml +++ b/icu4c/source/data/icu-config.xml @@ -423,10 +423,13 @@ + - + + + diff --git a/icu4c/source/data/icu-locale-deprecates.xml b/icu4c/source/data/icu-locale-deprecates.xml index d62b394db88..7448159aa51 100644 --- a/icu4c/source/data/icu-locale-deprecates.xml +++ b/icu4c/source/data/icu-locale-deprecates.xml @@ -1,7 +1,7 @@