diff options
| -rw-r--r-- | common/supplemental/likelySubtags.xml | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/common/supplemental/likelySubtags.xml b/common/supplemental/likelySubtags.xml index a2d7cd69..0a60322d 100644 --- a/common/supplemental/likelySubtags.xml +++ b/common/supplemental/likelySubtags.xml @@ -614,9 +614,7 @@ not be patched by hand, as any changes made in that fashion may be lost. <!--{ Lojban; ?; ? } => { Lojban; Latin; world }--> <likelySubtag from="jgo" to="jgo_Latn_CM"/> <!--{ Ngomba; ?; ? } => { Ngomba; Latin; Cameroon }--> - <!-- Android patch (b/17938245) begin. <likelySubtag from="ji" to="ji_Hebr_UA"/> - Android patch (b/17938245) end. --> <!--{ Yiddish; ?; ? } => { Yiddish; Hebrew; Ukraine }--> <likelySubtag from="jmc" to="jmc_Latn_TZ"/> <!--{ Machame; ?; ? } => { Machame; Latin; Tanzania }--> @@ -752,10 +750,6 @@ not be patched by hand, as any changes made in that fashion may be lost. <!--{ Kurdish; ?; ? } => { Kurdish; Latin; Türkiye }--> <likelySubtag from="ku_LB" to="ku_Arab_LB"/> <!--{ Kurdish; ?; Lebanon } => { Kurdish; Arabic; Lebanon }--> - <!-- Android patch (CLDR ticket #3459) begin. --> - <likelySubtag from="ku_IR" to="ku_Arab_IR"/> - <!--{ Kurdish; ?; Iran } => { Kurdish; Arabic; Iran }--> - <!-- Android patch (CLDR ticket #3459) end. --> <likelySubtag from="ku_Arab" to="ku_Arab_IQ"/> <!--{ Kurdish; Arabic; ? } => { Kurdish; Arabic; Iraq }--> <likelySubtag from="ku_Yezi" to="ku_Yezi_GE"/> @@ -1256,10 +1250,6 @@ not be patched by hand, as any changes made in that fashion may be lost. <!--{ Old Irish; ?; ? } => { Old Irish; Ogham; Ireland }--> <likelySubtag from="sgs" to="sgs_Latn_LT"/> <!--{ Samogitian; ?; ? } => { Samogitian; Latin; Lithuania }--> - <!-- Android patch begin. --> - <likelySubtag from="sh" to="sr_Latn_RS"/> - <!--{ Serbo-Croatian; ?; ? } => { Serbian; Latin; Serbia }--> - <!-- Android patch end. --> <likelySubtag from="shi" to="shi_Tfng_MA"/> <!--{ Tachelhit; ?; ? } => { Tachelhit; Tifinagh; Morocco }--> <likelySubtag from="shn" to="shn_Mymr_MM"/> @@ -2145,10 +2135,8 @@ not be patched by hand, as any changes made in that fashion may be lost. <!--{ ?; ?; Nicaragua } => { Spanish; Latin; Nicaragua }--> <likelySubtag from="und_NL" to="nl_Latn_NL"/> <!--{ ?; ?; Netherlands } => { Dutch; Latin; Netherlands }--> - <!-- Android patch (CLDR ticket #2698) begin. --> - <likelySubtag from="und_NO" to="no_Latn_NO"/> - <!--{ ?; ?; Norway } => { Norwegian; Latin; Norway }--> - <!-- Android patch (CLDR ticket #2698) end. --> + <likelySubtag from="und_NO" to="nb_Latn_NO"/> + <!--{ ?; ?; Norway } => { Norwegian Bokmål; Latin; Norway }--> <likelySubtag from="und_NP" to="ne_Deva_NP"/> <!--{ ?; ?; Nepal } => { Nepali; Devanagari; Nepal }--> <likelySubtag from="und_OM" to="ar_Arab_OM"/> @@ -2201,10 +2189,8 @@ not be patched by hand, as any changes made in that fashion may be lost. <!--{ ?; ?; Sweden } => { Swedish; Latin; Sweden }--> <likelySubtag from="und_SI" to="sl_Latn_SI"/> <!--{ ?; ?; Slovenia } => { Slovenian; Latin; Slovenia }--> - <!-- Android patch begin. --> - <likelySubtag from="und_SJ" to="no_Latn_SJ"/> - <!--{ ?; ?; Svalbard & Jan Mayen } => { Norwegian; Latin; Svalbard & Jan Mayen }--> - <!-- Android patch end. --> + <likelySubtag from="und_SJ" to="nb_Latn_SJ"/> + <!--{ ?; ?; Svalbard & Jan Mayen } => { Norwegian Bokmål; Latin; Svalbard & Jan Mayen }--> <likelySubtag from="und_SK" to="sk_Latn_SK"/> <!--{ ?; ?; Slovakia } => { Slovak; Latin; Slovakia }--> <likelySubtag from="und_SM" to="it_Latn_SM"/> |