ICU-9298 Add new region sublocales, update integration instructions

X-SVN-Rev: 31810

diff --git a/icu4c/source/data/cldr-icu-readme.txt b/icu4c/source/data/cldr-icu-readme.txt
index fc247a3869e80f021810867fc35be29160e7058e..1fdcfdf71b82c87913b39aaa14bba5a2d5531ae7 100644 (file)
--- a/icu4c/source/data/cldr-icu-readme.txt
+++ b/icu4c/source/data/cldr-icu-readme.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2010, International Business Machines Corporation and others.
+# Copyright (C) 2010,2012, International Business Machines Corporation and others.
 # All Rights Reserved.                  
 #
 # Commands for regenerating ICU4C locale data (.txt files) from CLDR.
@@ -82,6 +82,12 @@
 #                alt forms for certain paths, or to exclude certain paths; note
 #                that <paths> items can only have draft or alt attributes.
 #
+#                Note that if a language-only locale (e.g. "de") is included in
+#                <locales>, then all region sublocales for that language that
+#                are present in CLDR data (e.g. "de_AT", "de_BE", "de_CH", etc.)
+#                should also be included in <locales>, per PMC policy decision
+#                2012-05-02 (see http://bugs.icu-project.org/trac/ticket/9298).
+#
 #    icu/trunk/source/data/build.xml - If you are adding or removing break
 #                iterators, you need to update  <fileset id="brkitr" ...> under
 #                <target name="clean" ...> to clean the correct set of files.

diff --git a/icu4c/source/data/icu-config.xml b/icu4c/source/data/icu-config.xml
index 450111356232b02d1a27e98451c3485ee7f26e0e..f26a0763354b2e74ed4fcf5e180962922b42abe6 100644 (file)
--- a/icu4c/source/data/icu-config.xml
+++ b/icu4c/source/data/icu-config.xml
@@ -1,7 +1,7 @@
 <!--
 /*
 *******************************************************************************
-* Copyright (C) 2005-2011, International Business Machines Corporation and    *
+* Copyright (C) 2005-2012, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 */
@@ -19,34 +19,41 @@
         <include locales="am"/>
         <include locales="am_ET"/>
         <include locales="ar"/>
-        <include locales="ar_001"/> 
-        <include locales="ar_AE"/> 
-        <include locales="ar_BH"/> 
-        <include locales="ar_DZ"/> 
+        <include locales="ar_001"/>
+        <include locales="ar_AE"/>
+        <include locales="ar_BH"/>
+        <include locales="ar_DJ"/>
+        <include locales="ar_DZ"/>
         <include locales="ar_EG"/>
+        <include locales="ar_EH"/>
+        <include locales="ar_ER"/>
         <include locales="ar_IQ"/>
-        <include locales="ar_JO"/> 
-        <include locales="ar_KW"/> 
-        <include locales="ar_LB"/> 
+        <include locales="ar_JO"/>
+        <include locales="ar_KM"/>
+        <include locales="ar_KW"/>
+        <include locales="ar_LB"/>
         <include locales="ar_LY"/>
-        <include locales="ar_MA"/> 
-        <include locales="ar_OM"/> 
-        <include locales="ar_QA"/> 
-        <include locales="ar_SA"/> 
+        <include locales="ar_MA"/>
+        <include locales="ar_MR"/>
+        <include locales="ar_OM"/>
+        <include locales="ar_PS"/>
+        <include locales="ar_QA"/>
+        <include locales="ar_SA"/>
         <include locales="ar_SD"/>
-        <include locales="ar_SY"/> 
-        <include locales="ar_TN"/> 
-        <include locales="ar_YE"/> 
-        <include locales="as"/> 
-        <include locales="as_IN"/> 
+        <include locales="ar_SY"/>
+        <include locales="ar_TD"/>
+        <include locales="ar_TN"/>
+        <include locales="ar_YE"/>
+        <include locales="as"/>
+        <include locales="as_IN"/>
         <include locales="asa"/>
         <include locales="asa_TZ"/>
         <include locales="az"/>
-        <include locales="az_Latn"/>         
+        <include locales="az_Latn"/>
         <include locales="az_Latn_AZ"/>
-        <include locales="az_Cyrl"/> 
+        <include locales="az_Cyrl"/>
         <include locales="az_Cyrl_AZ"/>
-        <include locales="az_AZ" /> 
+        <include locales="az_AZ"/>
         <include locales="bas"/>
         <include locales="bas_CM"/>
         <include locales="be"/>
@@ -55,11 +62,11 @@
         <include locales="bem_ZM"/>
         <include locales="bez"/>
         <include locales="bez_TZ"/>
-        <include locales="bg"/>        
-        <include locales="bg_BG"/> 
+        <include locales="bg"/>
+        <include locales="bg_BG"/>
         <include locales="bm"/>
         <include locales="bm_ML"/>
-        <include locales="bn"/>        
+        <include locales="bn"/>
         <include locales="bn_BD"/>
         <include locales="bn_IN"/>
         <include locales="bo"/>
@@ -79,19 +86,19 @@
         <include locales="chr_US"/>
         <include locales="cs"/>
         <include locales="cs_CZ"/>
-        <include locales="cy"/>        
+        <include locales="cy"/>
         <include locales="cy_GB"/>
         <include locales="da"/>
         <include locales="da_DK"/>
         <include locales="dav"/>
         <include locales="dav_KE"/>
-        <include locales="de"/>        
-        <include locales="de_AT"/> 
+        <include locales="de"/>
+        <include locales="de_AT"/>
         <include locales="de_BE"/>
-        <include locales="de_CH"/> 
-        <include locales="de_DE"/> 
+        <include locales="de_CH"/>
+        <include locales="de_DE"/>
         <include locales="de_LI"/>
-        <include locales="de_LU"/> 
+        <include locales="de_LU"/>
         <include locales="dje"/>
         <include locales="dje_NE"/>
         <include locales="dua"/>
@@ -103,68 +110,79 @@
         <include locales="ee"/>
         <include locales="ee_GH"/>
         <include locales="ee_TG"/>
-        <include locales="el"/> 
-        <include locales="el_CY"/> 
-        <include locales="el_GR"/> 
+        <include locales="el"/>
+        <include locales="el_CY"/>
+        <include locales="el_GR"/>
         <include locales="en"/>
-        <include locales="en_AS"/> 
-        <include locales="en_AU"/> 
-        <include locales="en_BB"/> 
-        <include locales="en_BE"/> 
-        <include locales="en_BM"/> 
+        <include locales="en_AS"/>
+        <include locales="en_AU"/>
+        <include locales="en_BB"/>
+        <include locales="en_BE"/>
+        <include locales="en_BM"/>
+        <include locales="en_BS"/>
         <include locales="en_BW"/>
-        <include locales="en_BZ"/> 
-        <include locales="en_CA"/> 
-        <include locales="en_GB"/> 
-        <include locales="en_GU"/> 
-        <include locales="en_GY"/> 
-        <include locales="en_HK"/> 
-        <include locales="en_IE"/> 
-        <include locales="en_IN"/> 
-        <include locales="en_JM"/> 
-        <include locales="en_MH"/> 
+        <include locales="en_BZ"/>
+        <include locales="en_CA"/>
+        <include locales="en_FJ"/>
+        <include locales="en_FM"/>
+        <include locales="en_GB"/>
+        <include locales="en_GM"/>
+        <include locales="en_GU"/>
+        <include locales="en_GY"/>
+        <include locales="en_HK"/>
+        <include locales="en_IE"/>
+        <include locales="en_IN"/>
+        <include locales="en_JM"/>
+        <include locales="en_MH"/>
         <include locales="en_MP"/>
         <include locales="en_MT"/>
         <include locales="en_MU"/>
+        <include locales="en_MW"/>
         <include locales="en_NA"/>
-        <include locales="en_NZ"/> 
-        <include locales="en_PH"/> 
+        <include locales="en_NZ"/>
+        <include locales="en_PG"/>
+        <include locales="en_PH"/>
         <include locales="en_PK"/>
+        <include locales="en_PW"/>
         <include locales="en_RH"/>
-        <include locales="en_SG"/> 
-        <include locales="en_TT"/> 
+        <include locales="en_SB"/>
+        <include locales="en_SC"/>
+        <include locales="en_SG"/>
+        <include locales="en_SL"/>
+        <include locales="en_SZ"/>
+        <include locales="en_TT"/>
         <include locales="en_UM"/>
         <include locales="en_US"/>
-        <include locales="en_US_POSIX"/>        
+        <include locales="en_US_POSIX"/>
         <include locales="en_VI"/>
-        <include locales="en_ZA"/> 
+        <include locales="en_ZA"/>
         <include locales="en_ZW"/>
         <include locales="eo"/>
         <include locales="es"/>
         <include locales="es_419"/>
-        <include locales="es_AR"/> 
-        <include locales="es_BO"/> 
-        <include locales="es_CL"/> 
-        <include locales="es_CO"/> 
-        <include locales="es_CR"/> 
-        <include locales="es_DO"/> 
-        <include locales="es_EC"/> 
-        <include locales="es_ES"/> 
-        <include locales="es_GT"/> 
+        <include locales="es_AR"/>
+        <include locales="es_BO"/>
+        <include locales="es_CL"/>
+        <include locales="es_CO"/>
+        <include locales="es_CR"/>
+        <include locales="es_DO"/>
+        <include locales="es_EC"/>
+        <include locales="es_ES"/>
         <include locales="es_GQ"/>
-        <include locales="es_HN"/> 
-        <include locales="es_MX"/> 
-        <include locales="es_NI"/> 
-        <include locales="es_PA"/> 
-        <include locales="es_PE"/> 
-        <include locales="es_PR"/> 
-        <include locales="es_PY"/> 
-        <include locales="es_SV"/> 
-        <include locales="es_US"/> 
-        <include locales="es_UY"/> 
+        <include locales="es_GT"/>
+        <include locales="es_HN"/>
+        <include locales="es_MX"/>
+        <include locales="es_NI"/>
+        <include locales="es_PA"/>
+        <include locales="es_PE"/>
+        <include locales="es_PR"/>
+        <include locales="es_PY"/>
+        <include locales="es_SV"/>
+        <include locales="es_US"/>
+        <include locales="es_UY"/>
         <include locales="es_VE"/>
-        <include locales="et"/> 
-        <include locales="et_EE"/> 
+        <include locales="et"/>
+        <include locales="et_EE"/>
         <include locales="eu"/>
         <include locales="eu_ES"/>
         <include locales="ewo"/>
@@ -174,94 +192,96 @@
         <include locales="fa_IR"/>
         <include locales="ff"/>
         <include locales="ff_SN"/>
-        <include locales="fi"/> 
-        <include locales="fi_FI"/>         
+        <include locales="fi"/>
+        <include locales="fi_FI"/>
         <include locales="fil"/>
         <include locales="fil_PH"/>
         <include locales="fo"/>
         <include locales="fo_FO"/>
-        <include locales="fr"/>        
-        <include locales="fr_BE"/> 
-        <include locales="fr_BF"/> 
-        <include locales="fr_BI"/> 
-        <include locales="fr_BJ"/> 
+        <include locales="fr"/>
+        <include locales="fr_BE"/>
+        <include locales="fr_BF"/>
+        <include locales="fr_BI"/>
+        <include locales="fr_BJ"/>
         <include locales="fr_BL"/>
-        <include locales="fr_CA"/> 
-        <include locales="fr_CD"/> 
+        <include locales="fr_CA"/>
+        <include locales="fr_CD"/>
         <include locales="fr_CF"/>
-        <include locales="fr_CG"/> 
-        <include locales="fr_CH"/> 
+        <include locales="fr_CG"/>
+        <include locales="fr_CH"/>
         <include locales="fr_CI"/>
         <include locales="fr_CM"/>
-        <include locales="fr_DJ"/> 
-        <include locales="fr_FR"/> 
-        <include locales="fr_GA"/> 
-        <include locales="fr_GF"/> 
+        <include locales="fr_DJ"/>
+        <include locales="fr_FR"/>
+        <include locales="fr_GA"/>
+        <include locales="fr_GF"/>
         <include locales="fr_GN"/>
         <include locales="fr_GP"/>
-        <include locales="fr_GQ"/> 
-        <include locales="fr_KM"/> 
-        <include locales="fr_LU"/> 
-        <include locales="fr_MC"/> 
+        <include locales="fr_GQ"/>
+        <include locales="fr_KM"/>
+        <include locales="fr_LU"/>
+        <include locales="fr_MC"/>
         <include locales="fr_MF"/>
         <include locales="fr_MG"/>
         <include locales="fr_ML"/>
         <include locales="fr_MQ"/>
+        <include locales="fr_MR"/>
         <include locales="fr_NE"/>
         <include locales="fr_RE"/>
-        <include locales="fr_RW"/> 
-        <include locales="fr_SN"/> 
-        <include locales="fr_TD"/> 
-        <include locales="fr_TG"/> 
-        <include locales="fr_YT"/> 
+        <include locales="fr_RW"/>
+        <include locales="fr_SC"/>
+        <include locales="fr_SN"/>
+        <include locales="fr_TD"/>
+        <include locales="fr_TG"/>
+        <include locales="fr_YT"/>
         <include locales="ga"/>
         <include locales="ga_IE"/>
         <include locales="gl"/>
         <include locales="gl_ES"/>
         <include locales="gsw"/>
         <include locales="gsw_CH"/>
-        <include locales="gu"/>        
+        <include locales="gu"/>
         <include locales="gu_IN"/>
         <include locales="guz"/>
         <include locales="guz_KE"/>
         <include locales="gv"/>
         <include locales="gv_GB"/>
-        <include locales="ha"/> 
-        <include locales="ha_Latn"/> 
-        <include locales="ha_Latn_GH"/> 
-        <include locales="ha_Latn_NE"/> 
-        <include locales="ha_Latn_NG"/> 
-        <include locales="ha_GH"/> 
-        <include locales="ha_NE"/> 
-        <include locales="ha_NG"/> 
+        <include locales="ha"/>
+        <include locales="ha_Latn"/>
+        <include locales="ha_Latn_GH"/>
+        <include locales="ha_Latn_NE"/>
+        <include locales="ha_Latn_NG"/>
+        <include locales="ha_GH"/>
+        <include locales="ha_NE"/>
+        <include locales="ha_NG"/>
         <include locales="haw"/>
         <include locales="haw_US"/>
-        <include locales="he"/> 
-        <include locales="he_IL"/> 
-        <include locales="hi"/> 
-        <include locales="hi_IN"/> 
-        <include locales="hr"/> 
+        <include locales="he"/>
+        <include locales="he_IL"/>
+        <include locales="hi"/>
+        <include locales="hi_IN"/>
+        <include locales="hr"/>
         <include locales="hr_HR"/>
-        <include locales="hu"/> 
-        <include locales="hu_HU"/> 
+        <include locales="hu"/>
+        <include locales="hu_HU"/>
         <include locales="hy"/>
         <include locales="hy_AM"/>
-        <include locales="id"/>        
-        <include locales="id_ID"/>        
+        <include locales="id"/>
+        <include locales="id_ID"/>
         <include locales="ig"/>
         <include locales="ig_NG"/>
-        <include locales="ii"/>        
+        <include locales="ii"/>
         <include locales="ii_CN"/>
-        <include locales="in"/>        
+        <include locales="in"/>
         <include locales="in_ID"/>
-        <include locales="is"/> 
+        <include locales="is"/>
         <include locales="is_IS"/>
-        <include locales="it"/> 
-        <include locales="it_CH"/> 
+        <include locales="it"/>
+        <include locales="it_CH"/>
         <include locales="it_IT"/>
         <include locales="iw"/>
         <include locales="iw_IL"/>
-        <include locales="ja"/> 
+        <include locales="ja"/>
         <include locales="ja_JP"/>
         <include locales="jmc"/>
         <include locales="jmc_TZ"/>
@@ -279,7 +299,7 @@
         <include locales="khq_ML"/>
         <include locales="ki"/>
         <include locales="ki_KE"/>
-        <include locales="kk"/>        
+        <include locales="kk"/>
         <include locales="kk_Cyrl"/>
         <include locales="kk_Cyrl_KZ"/>
         <include locales="kk_KZ"/>
@@ -289,10 +309,10 @@
         <include locales="kln_KE"/>
         <include locales="km"/>
         <include locales="km_KH"/>
-        <include locales="kn"/>        
+        <include locales="kn"/>
         <include locales="kn_IN"/>
-        <include locales="ko"/> 
-        <include locales="ko_KR"/> 
+        <include locales="ko"/>
+        <include locales="ko_KR"/>
         <include locales="kok"/>
         <include locales="kok_IN"/>
         <include locales="ksb"/>
@@ -308,7 +328,7 @@
         <include locales="ln"/>
         <include locales="ln_CD"/>
         <include locales="ln_CG"/>
-        <include locales="lt"/>         
+        <include locales="lt"/>
         <include locales="lt_LT"/>
         <include locales="lu"/>
         <include locales="lu_CD"/>
@@ -316,7 +336,7 @@
         <include locales="luo_KE"/>
         <include locales="luy"/>
         <include locales="luy_KE"/>
-        <include locales="lv"/>         
+        <include locales="lv"/>
         <include locales="lv_LV"/>
         <include locales="mas"/>
         <include locales="mas_KE"/>
@@ -329,43 +349,43 @@
         <include locales="mg_MG"/>
         <include locales="mgh"/>
         <include locales="mgh_MZ"/>
-        <include locales="mk"/>         
+        <include locales="mk"/>
         <include locales="mk_MK"/>
         <include locales="ml"/>
         <include locales="ml_IN"/>
         <include locales="mo"/>
-        <include locales="mr"/>        
+        <include locales="mr"/>
         <include locales="mr_IN"/>
-        <include locales="ms"/> 
+        <include locales="ms"/>
         <include locales="ms_BN"/>
         <include locales="ms_MY"/>
-        <include locales="mt"/> 
+        <include locales="mt"/>
         <include locales="mt_MT"/>
-        <include locales="mua"/> 
-        <include locales="mua_CM"/> 
-        <include locales="my"/> 
-        <include locales="my_MM"/> 
+        <include locales="mua"/>
+        <include locales="mua_CM"/>
+        <include locales="my"/>
+        <include locales="my_MM"/>
         <include locales="naq"/>
         <include locales="naq_NA"/>
         <include locales="nb"/>
         <include locales="nb_NO"/>
         <include locales="nd"/>
         <include locales="nd_ZW"/>
-        <include locales="ne"/> 
+        <include locales="ne"/>
         <include locales="ne_NP"/>
         <include locales="ne_IN"/>
-        <include locales="nl"/>        
-        <include locales="nl_AW"/> 
-        <include locales="nl_BE"/> 
-        <include locales="nl_CW"/> 
-        <include locales="nl_NL"/> 
-        <include locales="nl_SX"/> 
+        <include locales="nl"/>
+        <include locales="nl_AW"/>
+        <include locales="nl_BE"/>
+        <include locales="nl_CW"/>
+        <include locales="nl_NL"/>
+        <include locales="nl_SX"/>
         <include locales="nmg"/>
         <include locales="nmg_CM"/>
         <include locales="nn"/>
         <include locales="nn_NO"/>
-        <include locales="no"/> 
-        <include locales="no_NO"/> 
+        <include locales="no"/>
+        <include locales="no_NO"/>
         <include locales="nus"/>
         <include locales="nus_SD"/>
         <include locales="nyn"/>
@@ -375,29 +395,29 @@
         <include locales="om_KE"/>
         <include locales="or"/>
         <include locales="or_IN"/>
-        <include locales="pa"/> 
-        <include locales="pa_Arab"/> 
-        <include locales="pa_Arab_PK"/> 
-        <include locales="pa_Guru"/> 
-        <include locales="pa_Guru_IN"/> 
+        <include locales="pa"/>
+        <include locales="pa_Arab"/>
+        <include locales="pa_Arab_PK"/>
+        <include locales="pa_Guru"/>
+        <include locales="pa_Guru_IN"/>
         <include locales="pa_IN"/>
         <include locales="pa_PK"/>
         <include locales="pl"/>
         <include locales="pl_PL"/>
         <include locales="ps"/>
         <include locales="ps_AF"/>
-        <include locales="pt"/> 
+        <include locales="pt"/>
         <include locales="pt_AO"/>
         <include locales="pt_BR"/>
         <include locales="pt_GW"/>
         <include locales="pt_MZ"/>
         <include locales="pt_PT"/>
         <include locales="pt_ST"/>
-        <include locales="rm"/>         
+        <include locales="rm"/>
         <include locales="rm_CH"/>
-        <include locales="rn"/>         
+        <include locales="rn"/>
         <include locales="rn_BI"/>
-        <include locales="ro"/>         
+        <include locales="ro"/>
         <include locales="ro_MD"/>
         <include locales="ro_RO"/>
         <include locales="rof"/>
@@ -421,19 +441,19 @@
         <include locales="ses_ML"/>
         <include locales="sg"/>
         <include locales="sg_CF"/>
-        <include locales="sh"/>         
-        <include locales="sh_BA"/>         
-        <include locales="sh_CS"/>         
-        <include locales="sh_YU"/>         
+        <include locales="sh"/>
+        <include locales="sh_BA"/>
+        <include locales="sh_CS"/>
+        <include locales="sh_YU"/>
         <include locales="shi"/>
         <include locales="shi_Latn"/>
         <include locales="shi_Latn_MA"/>
         <include locales="shi_Tfng"/>
         <include locales="shi_Tfng_MA"/>
         <include locales="shi_MA"/>
-        <include locales="si"/>         
+        <include locales="si"/>
         <include locales="si_LK"/>
-        <include locales="sk"/>         
+        <include locales="sk"/>
         <include locales="sk_SK"/>
         <include locales="sl"/>
         <include locales="sl_SI"/>
@@ -444,10 +464,10 @@
         <include locales="so_ET"/>
         <include locales="so_KE"/>
         <include locales="so_SO"/>
-        <include locales="sq"/>         
+        <include locales="sq"/>
         <include locales="sq_AL"/>
-        <include locales="sr"/> 
-        <include locales="sr_Latn"/>        
+        <include locales="sr"/>
+        <include locales="sr_Latn"/>
         <include locales="sr_Latn_BA"/>
         <include locales="sr_Latn_ME" />
         <include locales="sr_Latn_RS" />
@@ -464,7 +484,7 @@
         <include locales="sr_RS"/>
         <include locales="sr_CS"/>
         <include locales="sr_YU"/>
-        <include locales="sv"/>        
+        <include locales="sv"/>
         <include locales="sv_FI"/>
         <include locales="sv_SE"/>
         <include locales="sw"/>
@@ -472,15 +492,17 @@
         <include locales="sw_TZ"/>
         <include locales="swc"/>
         <include locales="swc_CD"/>
-        <include locales="ta"/> 
+        <include locales="ta"/>
         <include locales="ta_LK"/>
         <include locales="ta_IN"/>
-        <include locales="te"/> 
+        <include locales="ta_MY"/>
+        <include locales="ta_SG"/>
+        <include locales="te"/>
         <include locales="te_IN"/>
         <include locales="teo"/>
         <include locales="teo_KE"/>
         <include locales="teo_UG"/>
-        <include locales="th"/>         
+        <include locales="th"/>
         <include locales="th_TH"/>
         <include locales="ti"/>
         <include locales="ti_ER"/>
@@ -489,20 +511,20 @@
         <include locales="tl_PH"/>
         <include locales="to"/>
         <include locales="to_TO"/>
-        <include locales="tr"/>        
+        <include locales="tr"/>
         <include locales="tr_TR"/>
-        <include locales="twq"/>        
+        <include locales="twq"/>
         <include locales="twq_NE"/>
         <include locales="tzm"/>
         <include locales="tzm_Latn"/>
         <include locales="tzm_Latn_MA"/>
         <include locales="tzm_MA"/>
-        <include locales="uk"/>         
+        <include locales="uk"/>
         <include locales="uk_UA"/>
-        <include locales="ur"/> 
+        <include locales="ur"/>
         <include locales="ur_IN"/>
         <include locales="ur_PK"/>
-        <include locales="uz"/> 
+        <include locales="uz"/>
         <include locales="uz_Arab"/>
         <include locales="uz_Arab_AF"/>
         <include locales="uz_AF"/>
@@ -511,13 +533,13 @@
         <include locales="uz_Cyrl_UZ"/>
         <include locales="uz_Latn_UZ"/>
         <include locales="uz_UZ"/>
-        <include locales="vai"/> 
+        <include locales="vai"/>
         <include locales="vai_Vaii"/>
         <include locales="vai_Vaii_LR"/>
         <include locales="vai_LR"/>
         <include locales="vai_Latn"/>
         <include locales="vai_Latn_LR"/>
-        <include locales="vi"/> 
+        <include locales="vi"/>
         <include locales="vi_VN"/>
         <include locales="vun"/>
         <include locales="vun_TZ"/>
@@ -527,24 +549,24 @@
         <include locales="yav_CM"/>
         <include locales="yo"/>
         <include locales="yo_NG"/>
-        <include locales="zh"/> 
-        <include locales="zh_Hans"/> 
-        <include locales="zh_Hans_CN"/> 
-        <include locales="zh_Hans_HK"/> 
-        <include locales="zh_Hans_MO"/> 
-        <include locales="zh_Hans_SG"/> 
-        <include locales="zh_Hant"/> 
-        <include locales="zh_Hant_HK"/> 
-        <include locales="zh_Hant_MO"/> 
-        <include locales="zh_Hant_TW"/> 
-        <include locales="zh_CN"/> 
-        <include locales="zh_HK"/> 
-        <include locales="zh_MO"/> 
-        <include locales="zh_SG"/> 
-        <include locales="zh_TW"/> 
-        <include locales="zu"/> 
-        <include locales="zu_ZA"/> 
-    </locales>    
+        <include locales="zh"/>
+        <include locales="zh_Hans"/>
+        <include locales="zh_Hans_CN"/>
+        <include locales="zh_Hans_HK"/>
+        <include locales="zh_Hans_MO"/>
+        <include locales="zh_Hans_SG"/>
+        <include locales="zh_Hant"/>
+        <include locales="zh_Hant_HK"/>
+        <include locales="zh_Hant_MO"/>
+        <include locales="zh_Hant_TW"/>
+        <include locales="zh_CN"/>
+        <include locales="zh_HK"/>
+        <include locales="zh_MO"/>
+        <include locales="zh_SG"/>
+        <include locales="zh_TW"/>
+        <include locales="zu"/>
+        <include locales="zu_ZA"/>
+    </locales>
     <paths>
         <include xpath="//ldml/.*"/>
         <include xpath="//ldml/collations/.*" alt="short"/>