From d6f6b7f0f7e7cc29af0b1aaf569621064cd8fe86 Mon Sep 17 00:00:00 2001
From: Conrad Nied <conrad.logos@gmail.com>
Date: Tue, 20 Aug 2024 10:21:36 -0700
Subject: [PATCH] CLDR-11888 Update French speakers

https://unicode-org.atlassian.net/browse/CLDR-11888 was created to update the French speakers for Djibouti but while I was researching that I found many other Francophone countries that significantly underestimated French populations. Most of those gaps probably come from the number being L1 users but the point of this file is L1+L2 users -- basically how many people in each country could use an interface in this language.

See the original data in:
https://www.francophonie.org/sites/default/files/2021-04/LFDM-20Edition-2019-La-langue-fran%C3%A7aise-dans-le-monde.pdf

mvn package -DskipTests=true
java -jar tools/cldr-code/target/cldr-code.jar ConvertLanguageData
java -jar tools/cldr-code/target/cldr-code.jar GenerateLikelySubtags
---
 common/supplemental/likelySubtags.xml         | 22 ++++++-----
 common/supplemental/supplementalData.xml      | 39 ++++++++++---------
 .../util/data/country_language_population.tsv | 14 +++----
 3 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/common/supplemental/likelySubtags.xml b/common/supplemental/likelySubtags.xml
index 3dc3523d626..341bb7f7a50 100644
--- a/common/supplemental/likelySubtags.xml
+++ b/common/supplemental/likelySubtags.xml
@@ -433,7 +433,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="lv" to="lv_Latn_LV"/>		<!--Latvian‧?‧?	➡ Latvian‧Latin‧Latvia-->
 		<likelySubtag from="lwl" to="lwl_Thai_TH"/>		<!--Eastern Lawa‧?‧?	➡ Eastern Lawa‧Thai‧Thailand-->
 		<likelySubtag from="lzh" to="lzh_Hans_CN"/>		<!--Literary Chinese‧?‧?	➡ Literary Chinese‧Simplified‧China-->
-		<likelySubtag from="lzz" to="lzz_Latn_TR"/>		<!--Laz‧?‧?	➡ Laz‧Latin‧Türkiye-->
+		<likelySubtag from="lzz" to="lzz_Geor_TR"/>		<!--Laz‧?‧?	➡ Laz‧Georgian‧Türkiye-->
 		<likelySubtag from="mad" to="mad_Latn_ID"/>		<!--Madurese‧?‧?	➡ Madurese‧Latin‧Indonesia-->
 		<likelySubtag from="maf" to="maf_Latn_CM"/>		<!--Mafa‧?‧?	➡ Mafa‧Latin‧Cameroon-->
 		<likelySubtag from="mag" to="mag_Deva_IN"/>		<!--Magahi‧?‧?	➡ Magahi‧Devanagari‧India-->
@@ -497,7 +497,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="myz" to="myz_Mand_IR"/>		<!--Classical Mandaic‧?‧?	➡ Classical Mandaic‧Mandaean‧Iran-->
 		<likelySubtag from="mzn" to="mzn_Arab_IR"/>		<!--Mazanderani‧?‧?	➡ Mazanderani‧Arabic‧Iran-->
 		<likelySubtag from="na" to="na_Latn_NR"/>		<!--Nauru‧?‧?	➡ Nauru‧Latin‧Nauru-->
-		<likelySubtag from="nan" to="nan_Hans_CN"/>		<!--Min Nan Chinese‧?‧?	➡ Min Nan Chinese‧Simplified‧China-->
+		<likelySubtag from="nan" to="nan_Hans_TW"/>		<!--Min Nan Chinese‧?‧?	➡ Min Nan Chinese‧Simplified‧Taiwan-->
 		<likelySubtag from="nap" to="nap_Latn_IT"/>		<!--Neapolitan‧?‧?	➡ Neapolitan‧Latin‧Italy-->
 		<likelySubtag from="naq" to="naq_Latn_NA"/>		<!--Nama‧?‧?	➡ Nama‧Latin‧Namibia-->
 		<likelySubtag from="nb" to="nb_Latn_NO"/>		<!--Norwegian Bokmål‧?‧?	➡ Norwegian Bokmål‧Latin‧Norway-->
@@ -566,7 +566,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="pko" to="pko_Latn_KE"/>		<!--Pökoot‧?‧?	➡ Pökoot‧Latin‧Kenya-->
 		<likelySubtag from="pl" to="pl_Latn_PL"/>		<!--Polish‧?‧?	➡ Polish‧Latin‧Poland-->
 		<likelySubtag from="pms" to="pms_Latn_IT"/>		<!--Piedmontese‧?‧?	➡ Piedmontese‧Latin‧Italy-->
-		<likelySubtag from="pnt" to="pnt_Grek_GR"/>		<!--Pontic‧?‧?	➡ Pontic‧Greek‧Greece-->
+		<likelySubtag from="pnt" to="pnt_Cyrl_GR"/>		<!--Pontic‧?‧?	➡ Pontic‧Cyrillic‧Greece-->
 		<likelySubtag from="pon" to="pon_Latn_FM"/>		<!--Pohnpeian‧?‧?	➡ Pohnpeian‧Latin‧Micronesia-->
 		<likelySubtag from="pqm" to="pqm_Latn_CA"/>		<!--Maliseet-Passamaquoddy‧?‧?	➡ Maliseet-Passamaquoddy‧Latin‧Canada-->
 		<likelySubtag from="pra" to="pra_Khar_PK"/>		<!--Prakrit languages‧?‧?	➡ Prakrit languages‧Kharoshthi‧Pakistan-->
@@ -703,10 +703,10 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="tiv" to="tiv_Latn_NG"/>		<!--Tiv‧?‧?	➡ Tiv‧Latin‧Nigeria-->
 		<likelySubtag from="tk" to="tk_Latn_TM"/>		<!--Turkmen‧?‧?	➡ Turkmen‧Latin‧Turkmenistan-->
 		<likelySubtag from="tkl" to="tkl_Latn_TK"/>		<!--Tokelau‧?‧?	➡ Tokelau‧Latin‧Tokelau-->
-		<likelySubtag from="tkr" to="tkr_Latn_AZ"/>		<!--Tsakhur‧?‧?	➡ Tsakhur‧Latin‧Azerbaijan-->
+		<likelySubtag from="tkr" to="tkr_Cyrl_AZ"/>		<!--Tsakhur‧?‧?	➡ Tsakhur‧Cyrillic‧Azerbaijan-->
 		<likelySubtag from="tkt" to="tkt_Deva_NP"/>		<!--Kathoriya Tharu‧?‧?	➡ Kathoriya Tharu‧Devanagari‧Nepal-->
 		<likelySubtag from="tl" to="tl_Latn_PH"/>		<!--Tagalog‧?‧?	➡ Tagalog‧Latin‧Philippines-->
-		<likelySubtag from="tly" to="tly_Latn_AZ"/>		<!--Talysh‧?‧?	➡ Talysh‧Latin‧Azerbaijan-->
+		<likelySubtag from="tly" to="tly_Arab_AZ"/>		<!--Talysh‧?‧?	➡ Talysh‧Arabic‧Azerbaijan-->
 		<likelySubtag from="tmh" to="tmh_Latn_NE"/>		<!--Tamashek‧?‧?	➡ Tamashek‧Latin‧Niger-->
 		<likelySubtag from="tn" to="tn_Latn_ZA"/>		<!--Tswana‧?‧?	➡ Tswana‧Latin‧South Africa-->
 		<likelySubtag from="tnr" to="tnr_Latn_SN"/>		<!--Ménik‧?‧?	➡ Ménik‧Latin‧Senegal-->
@@ -725,7 +725,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="tt" to="tt_Cyrl_RU"/>		<!--Tatar‧?‧?	➡ Tatar‧Cyrillic‧Russia-->
 		<likelySubtag from="ttj" to="ttj_Latn_UG"/>		<!--Tooro‧?‧?	➡ Tooro‧Latin‧Uganda-->
 		<likelySubtag from="tts" to="tts_Thai_TH"/>		<!--Northeastern Thai‧?‧?	➡ Northeastern Thai‧Thai‧Thailand-->
-		<likelySubtag from="ttt" to="ttt_Latn_AZ"/>		<!--Muslim Tat‧?‧?	➡ Muslim Tat‧Latin‧Azerbaijan-->
+		<likelySubtag from="ttt" to="ttt_Cyrl_AZ"/>		<!--Muslim Tat‧?‧?	➡ Muslim Tat‧Cyrillic‧Azerbaijan-->
 		<likelySubtag from="tum" to="tum_Latn_MW"/>		<!--Tumbuka‧?‧?	➡ Tumbuka‧Latin‧Malawi-->
 		<likelySubtag from="tvl" to="tvl_Latn_TV"/>		<!--Tuvalu‧?‧?	➡ Tuvalu‧Latin‧Tuvalu-->
 		<likelySubtag from="twq" to="twq_Latn_NE"/>		<!--Tasawaq‧?‧?	➡ Tasawaq‧Latin‧Niger-->
@@ -882,7 +882,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_CY" to="el_Grek_CY"/>		<!--?‧?‧Cyprus	➡ Greek‧Greek‧Cyprus-->
 		<likelySubtag from="und_CZ" to="cs_Latn_CZ"/>		<!--?‧?‧Czechia	➡ Czech‧Latin‧Czechia-->
 		<likelySubtag from="und_DE" to="de_Latn_DE"/>		<!--?‧?‧Germany	➡ German‧Latin‧Germany-->
-		<likelySubtag from="und_DJ" to="aa_Latn_DJ"/>		<!--?‧?‧Djibouti	➡ Afar‧Latin‧Djibouti-->
+		<likelySubtag from="und_DJ" to="fr_Latn_DJ"/>		<!--?‧?‧Djibouti	➡ French‧Latin‧Djibouti-->
 		<likelySubtag from="und_DK" to="da_Latn_DK"/>		<!--?‧?‧Denmark	➡ Danish‧Latin‧Denmark-->
 		<likelySubtag from="und_DO" to="es_Latn_DO"/>		<!--?‧?‧Dominican Republic	➡ Spanish‧Latin‧Dominican Republic-->
 		<likelySubtag from="und_DZ" to="ar_Arab_DZ"/>		<!--?‧?‧Algeria	➡ Arabic‧Arabic‧Algeria-->
@@ -911,7 +911,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_HK" to="zh_Hant_HK"/>		<!--?‧?‧Hong Kong SAR China	➡ Chinese‧Traditional‧Hong Kong SAR China-->
 		<likelySubtag from="und_HN" to="es_Latn_HN"/>		<!--?‧?‧Honduras	➡ Spanish‧Latin‧Honduras-->
 		<likelySubtag from="und_HR" to="hr_Latn_HR"/>		<!--?‧?‧Croatia	➡ Croatian‧Latin‧Croatia-->
-		<likelySubtag from="und_HT" to="ht_Latn_HT"/>		<!--?‧?‧Haiti	➡ Haitian Creole‧Latin‧Haiti-->
+		<likelySubtag from="und_HT" to="fr_Latn_HT"/>		<!--?‧?‧Haiti	➡ French‧Latin‧Haiti-->
 		<likelySubtag from="und_HU" to="hu_Latn_HU"/>		<!--?‧?‧Hungary	➡ Hungarian‧Latin‧Hungary-->
 		<likelySubtag from="und_IC" to="es_Latn_IC"/>		<!--?‧?‧Canary Islands	➡ Spanish‧Latin‧Canary Islands-->
 		<likelySubtag from="und_ID" to="id_Latn_ID"/>		<!--?‧?‧Indonesia	➡ Indonesian‧Latin‧Indonesia-->
@@ -1036,6 +1036,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Ahom" to="aho_Ahom_IN"/>		<!--?‧Ahom‧?	➡ Ahom‧Ahom‧India-->
 		<likelySubtag from="und_Arab" to="ar_Arab_EG"/>		<!--?‧Arabic‧?	➡ Arabic‧Arabic‧Egypt-->
 		<likelySubtag from="und_Arab_AF" to="fa_Arab_AF"/>		<!--?‧Arabic‧Afghanistan	➡ Persian‧Arabic‧Afghanistan-->
+		<likelySubtag from="und_Arab_AZ" to="tly_Arab_AZ"/>		<!--?‧Arabic‧Azerbaijan	➡ Talysh‧Arabic‧Azerbaijan-->
 		<likelySubtag from="und_Arab_BN" to="ms_Arab_BN"/>		<!--?‧Arabic‧Brunei	➡ Malay‧Arabic‧Brunei-->
 		<likelySubtag from="und_Arab_CC" to="ms_Arab_CC"/>		<!--?‧Arabic‧Cocos (Keeling) Islands	➡ Malay‧Arabic‧Cocos (Keeling) Islands-->
 		<likelySubtag from="und_Arab_CN" to="ug_Arab_CN"/>		<!--?‧Arabic‧China	➡ Uyghur‧Arabic‧China-->
@@ -1085,7 +1086,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Cyrl_BG" to="bg_Cyrl_BG"/>		<!--?‧Cyrillic‧Bulgaria	➡ Bulgarian‧Cyrillic‧Bulgaria-->
 		<likelySubtag from="und_Cyrl_BY" to="be_Cyrl_BY"/>		<!--?‧Cyrillic‧Belarus	➡ Belarusian‧Cyrillic‧Belarus-->
 		<likelySubtag from="und_Cyrl_GE" to="ab_Cyrl_GE"/>		<!--?‧Cyrillic‧Georgia	➡ Abkhazian‧Cyrillic‧Georgia-->
-		<likelySubtag from="und_Cyrl_GR" to="mk_Cyrl_GR"/>		<!--?‧Cyrillic‧Greece	➡ Macedonian‧Cyrillic‧Greece-->
+		<likelySubtag from="und_Cyrl_GR" to="pnt_Cyrl_GR"/>		<!--?‧Cyrillic‧Greece	➡ Pontic‧Cyrillic‧Greece-->
 		<likelySubtag from="und_Cyrl_IR" to="kaa_Cyrl_IR"/>		<!--?‧Cyrillic‧Iran	➡ Kara-Kalpak‧Cyrillic‧Iran-->
 		<likelySubtag from="und_Cyrl_KG" to="ky_Cyrl_KG"/>		<!--?‧Cyrillic‧Kyrgyzstan	➡ Kyrgyz‧Cyrillic‧Kyrgyzstan-->
 		<likelySubtag from="und_Cyrl_MD" to="uk_Cyrl_MD"/>		<!--?‧Cyrillic‧Moldova	➡ Ukrainian‧Cyrillic‧Moldova-->
@@ -1131,6 +1132,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Hani" to="zh_Hani_CN"/>		<!--?‧Han‧?	➡ Chinese‧Han‧China-->
 		<likelySubtag from="und_Hano" to="hnn_Hano_PH"/>		<!--?‧Hanunoo‧?	➡ Hanunoo‧Hanunoo‧Philippines-->
 		<likelySubtag from="und_Hans" to="zh_Hans_CN"/>		<!--?‧Simplified‧?	➡ Chinese‧Simplified‧China-->
+		<likelySubtag from="und_Hans_TW" to="nan_Hans_TW"/>		<!--?‧Simplified‧Taiwan	➡ Min Nan Chinese‧Simplified‧Taiwan-->
 		<likelySubtag from="und_Hant" to="zh_Hant_TW"/>		<!--?‧Traditional‧?	➡ Chinese‧Traditional‧Taiwan-->
 		<likelySubtag from="und_Hant_CA" to="yue_Hant_CA"/>		<!--?‧Traditional‧Canada	➡ Cantonese‧Traditional‧Canada-->
 		<likelySubtag from="und_Hant_CN" to="yue_Hant_CN"/>		<!--?‧Traditional‧China	➡ Cantonese‧Traditional‧China-->
@@ -1191,7 +1193,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Latn_MM" to="kac_Latn_MM"/>		<!--?‧Latin‧Myanmar (Burma)	➡ Kachin‧Latin‧Myanmar (Burma)-->
 		<likelySubtag from="und_Latn_MO" to="pt_Latn_MO"/>		<!--?‧Latin‧Macao SAR China	➡ Portuguese‧Latin‧Macao SAR China-->
 		<likelySubtag from="und_Latn_MR" to="fr_Latn_MR"/>		<!--?‧Latin‧Mauritania	➡ French‧Latin‧Mauritania-->
-		<likelySubtag from="und_Latn_MU" to="en_Latn_MU"/>		<!--?‧Latin‧Mauritius	➡ English‧Latin‧Mauritius-->
+		<likelySubtag from="und_Latn_MU" to="fr_Latn_MU"/>		<!--?‧Latin‧Mauritius	➡ French‧Latin‧Mauritius-->
 		<likelySubtag from="und_Latn_MV" to="en_Latn_MV"/>		<!--?‧Latin‧Maldives	➡ English‧Latin‧Maldives-->
 		<likelySubtag from="und_Latn_NP" to="en_Latn_NP"/>		<!--?‧Latin‧Nepal	➡ English‧Latin‧Nepal-->
 		<likelySubtag from="und_Latn_PK" to="en_Latn_PK"/>		<!--?‧Latin‧Pakistan	➡ English‧Latin‧Pakistan-->
diff --git a/common/supplemental/supplementalData.xml b/common/supplemental/supplementalData.xml
index 7ddde428e6c..1ef75057d40 100644
--- a/common/supplemental/supplementalData.xml
+++ b/common/supplemental/supplementalData.xml
@@ -1573,7 +1573,7 @@ XXX Code for transations where no currency is involved
 		<language type="fon" scripts="Latn"/>
 		<language type="fon" territories="BJ" alt="secondary"/>
 		<language type="fr" scripts="Latn" territories="BE BF BI BJ BL CA CD CF CG CH CI CM DJ DZ FR GA GF GN GP GQ HT KM LU MA MC MF MG ML MQ MU NC NE PF PM RE RW SC SN SY TD TG TN VU WF YT"/>
-		<language type="fr" scripts="Dupl" territories="DE GB IT NL PT RO TF US" alt="secondary"/>
+		<language type="fr" scripts="Dupl" territories="DE GB IT LB NL PT RO TF US" alt="secondary"/>
 		<language type="frc" scripts="Latn"/>
 		<language type="frm" scripts="Latn" alt="secondary"/>
 		<language type="fro" scripts="Latn" alt="secondary"/>
@@ -1647,7 +1647,7 @@ XXX Code for transations where no currency is involved
 		<language type="ha" scripts="Arab Latn"/>
 		<language type="ha" territories="NE NG" alt="secondary"/>
 		<language type="hai" scripts="Latn"/>
-		<language type="hak" scripts="Hans"/>
+		<language type="hak" scripts="Hans" territories="TW"/>
 		<language type="hak" territories="CN" alt="secondary"/>
 		<language type="haw" scripts="Latn"/>
 		<language type="haw" territories="US" alt="secondary"/>
@@ -1890,7 +1890,7 @@ XXX Code for transations where no currency is involved
 		<language type="lv" scripts="Latn" territories="LV"/>
 		<language type="lwl" scripts="Thai"/>
 		<language type="lzh" scripts="Hans" alt="secondary"/>
-		<language type="lzz" scripts="Latn Geor"/>
+		<language type="lzz" scripts="Geor Latn"/>
 		<language type="mad" scripts="Latn"/>
 		<language type="mad" territories="ID" alt="secondary"/>
 		<language type="maf" scripts="Latn"/>
@@ -1979,7 +1979,7 @@ XXX Code for transations where no currency is involved
 		<language type="mzn" scripts="Arab"/>
 		<language type="mzn" territories="IR" alt="secondary"/>
 		<language type="na" scripts="Latn" territories="NR"/>
-		<language type="nan" scripts="Hans"/>
+		<language type="nan" scripts="Hans" territories="TW"/>
 		<language type="nan" territories="CN" alt="secondary"/>
 		<language type="nap" scripts="Latn"/>
 		<language type="naq" scripts="Latn"/>
@@ -2077,7 +2077,7 @@ XXX Code for transations where no currency is involved
 		<language type="pl" scripts="Latn" territories="PL"/>
 		<language type="pl" territories="GB" alt="secondary"/>
 		<language type="pms" scripts="Latn"/>
-		<language type="pnt" scripts="Grek Cyrl Latn"/>
+		<language type="pnt" scripts="Cyrl Grek Latn"/>
 		<language type="pon" scripts="Latn"/>
 		<language type="pon" territories="FM" alt="secondary"/>
 		<language type="pqm" scripts="Latn"/>
@@ -2277,10 +2277,10 @@ XXX Code for transations where no currency is involved
 		<language type="tk" scripts="Arab Cyrl Latn" territories="TM"/>
 		<language type="tk" territories="AF IR" alt="secondary"/>
 		<language type="tkl" scripts="Latn" territories="TK"/>
-		<language type="tkr" scripts="Latn Cyrl"/>
+		<language type="tkr" scripts="Cyrl Latn"/>
 		<language type="tkt" scripts="Deva"/>
 		<language type="tli" scripts="Latn"/>
-		<language type="tly" scripts="Latn Arab Cyrl"/>
+		<language type="tly" scripts="Arab Cyrl Latn"/>
 		<language type="tly" territories="AZ" alt="secondary"/>
 		<language type="tmh" scripts="Latn"/>
 		<language type="tmh" territories="NE" alt="secondary"/>
@@ -2309,7 +2309,7 @@ XXX Code for transations where no currency is involved
 		<language type="ttj" scripts="Latn"/>
 		<language type="tts" scripts="Thai"/>
 		<language type="tts" territories="TH" alt="secondary"/>
-		<language type="ttt" scripts="Latn Cyrl"/>
+		<language type="ttt" scripts="Cyrl Latn"/>
 		<language type="ttt" scripts="Arab" alt="secondary"/>
 		<language type="tum" scripts="Latn"/>
 		<language type="tum" territories="MW" alt="secondary"/>
@@ -2735,9 +2735,9 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="CH" gdp="733800000000" literacyPercent="99" population="8860570">	<!--Switzerland-->
 			<languagePopulation type="de" populationPercent="73" officialStatus="official"/>	<!--German-->
+			<languagePopulation type="fr" populationPercent="67" officialStatus="official" references="R1335"/>	<!--French-->
 			<languagePopulation type="gsw" writingPercent="5" populationPercent="65" officialStatus="de_facto_official" references="R1006"/>	<!--Swiss German-->
 			<languagePopulation type="en" populationPercent="61" references="R1137"/>	<!--English-->
-			<languagePopulation type="fr" populationPercent="21" officialStatus="official" references="R1137"/>	<!--French-->
 			<languagePopulation type="it" populationPercent="4.3" officialStatus="official"/>	<!--Italian-->
 			<languagePopulation type="lmo" writingPercent="5" populationPercent="4.1" references="R1086"/>	<!--Lombard-->
 			<languagePopulation type="pt" populationPercent="3.4" references="R1316"/>	<!--Portuguese-->
@@ -2895,10 +2895,10 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="en" populationPercent="99" officialStatus="de_facto_official" references="R1065"/>	<!--English-->
 		</territory>
 		<territory type="DJ" gdp="7380000000" literacyPercent="67.9" population="994974">	<!--Djibouti-->
+			<languagePopulation type="fr" populationPercent="50" officialStatus="official" references="R1335"/>	<!--French-->
 			<languagePopulation type="aa" populationPercent="42"/>	<!--Afar-->
 			<languagePopulation type="so" populationPercent="41"/>	<!--Somali-->
 			<languagePopulation type="ar" populationPercent="7.3" officialStatus="official"/>	<!--Arabic-->
-			<languagePopulation type="fr" populationPercent="2.1" officialStatus="official"/>	<!--French-->
 		</territory>
 		<territory type="DK" gdp="428400000000" literacyPercent="99" population="5973140">	<!--Denmark-->
 			<languagePopulation type="da" populationPercent="93" officialStatus="official"/>	<!--Danish-->
@@ -3182,7 +3182,7 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="HT" gdp="34410000000" literacyPercent="48.7" population="11753900">	<!--Haiti-->
 			<languagePopulation type="ht" populationPercent="81" officialStatus="official" references="R1029"/>	<!--Haitian Creole-->
-			<languagePopulation type="fr" literacyPercent="100" populationPercent="4.7" officialStatus="official" references="R1030"/>	<!--French-->
+			<languagePopulation type="fr" literacyPercent="100" populationPercent="42" officialStatus="official" references="R1335"/>	<!--French-->
 		</territory>
 		<territory type="HU" gdp="388900000000" literacyPercent="99" population="9855750">	<!--Hungary-->
 			<languagePopulation type="hu" populationPercent="100" officialStatus="official"/>	<!--Hungarian-->
@@ -3489,9 +3489,9 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="apc" populationPercent="100" references="R1173"/>	<!--Levantine Arabic-->
 			<languagePopulation type="ar" populationPercent="86" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="en" populationPercent="40"/>	<!--English-->
+			<languagePopulation type="fr" populationPercent="38" references="R1335"/>	<!--French-->
 			<languagePopulation type="hy" populationPercent="5.2"/>	<!--Armenian-->
 			<languagePopulation type="ku_Arab" populationPercent="1.7"/>	<!--Kurdish (Arabic)-->
-			<languagePopulation type="fr" populationPercent="0.37"/>	<!--French-->
 		</territory>
 		<territory type="LC" gdp="4083000000" literacyPercent="90.1" population="168038">	<!--St. Lucia-->
 			<languagePopulation type="en" populationPercent="90" officialStatus="official"/>	<!--English-->
@@ -3548,8 +3548,8 @@ XXX Code for transations where no currency is involved
 		<territory type="MA" gdp="337500000000" literacyPercent="67.1" population="37387600">	<!--Morocco-->
 			<languagePopulation type="ary" populationPercent="87"/>	<!--Moroccan Arabic-->
 			<languagePopulation type="ar" populationPercent="62" officialStatus="official"/>	<!--Arabic-->
+			<languagePopulation type="fr" populationPercent="35" officialStatus="de_facto_official" references="R1335"/>	<!--French-->
 			<languagePopulation type="zgh" populationPercent="22" references="R1254"/>	<!--Standard Moroccan Tamazight-->
-			<languagePopulation type="fr" populationPercent="20" officialStatus="de_facto_official" references="R1050"/>	<!--French-->
 			<languagePopulation type="en" populationPercent="14" references="R1050"/>	<!--English-->
 			<languagePopulation type="tzm" literacyPercent="25" populationPercent="9.8" officialStatus="official"/>	<!--Central Atlas Tamazight-->
 			<languagePopulation type="shi" populationPercent="8.7"/>	<!--Tachelhit-->
@@ -3653,10 +3653,10 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="MU" gdp="33530000000" literacyPercent="88.8" population="1310500">	<!--Mauritius-->
 			<languagePopulation type="mfe" populationPercent="90"/>	<!--Morisyen-->
+			<languagePopulation type="fr" populationPercent="73" officialStatus="official" references="R1335"/>	<!--French-->
 			<languagePopulation type="en" populationPercent="72" officialStatus="official" references="R1152"/>	<!--English-->
 			<languagePopulation type="bho" populationPercent="27"/>	<!--Bhojpuri-->
 			<languagePopulation type="ur" populationPercent="5.2"/>	<!--Urdu-->
-			<languagePopulation type="fr" populationPercent="3" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="ta" populationPercent="2.5"/>	<!--Tamil-->
 		</territory>
 		<territory type="MV" gdp="11650000000" literacyPercent="98.4" population="388858">	<!--Maldives-->
@@ -4214,7 +4214,7 @@ XXX Code for transations where no currency is involved
 		<territory type="TN" gdp="153600000000" literacyPercent="79.1" population="12048800">	<!--Tunisia-->
 			<languagePopulation type="aeb" populationPercent="90"/>	<!--Tunisian Arabic-->
 			<languagePopulation type="ar" populationPercent="90" officialStatus="official"/>	<!--Arabic-->
-			<languagePopulation type="fr" populationPercent="74" officialStatus="official" references="R1132"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="52" officialStatus="official" references="R1335"/>	<!--French-->
 		</territory>
 		<territory type="TO" gdp="700400000" literacyPercent="99" population="104889">	<!--Tonga-->
 			<languagePopulation type="to" populationPercent="95" officialStatus="official"/>	<!--Tongan-->
@@ -4226,7 +4226,6 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ku" populationPercent="5.5"/>	<!--Kurdish-->
 			<languagePopulation type="apc" populationPercent="5.2" references="R1173"/>	<!--Levantine Arabic-->
 			<languagePopulation type="zza" populationPercent="1.4"/>	<!--Zaza-->
-			<languagePopulation type="kaa" populationPercent="0.1" references="R1199"/>	<!--Kara-Kalpak-->
 			<languagePopulation type="kbd" populationPercent="0.77"/>	<!--Kabardian-->
 			<languagePopulation type="az" populationPercent="0.74"/>	<!--Azerbaijani-->
 			<languagePopulation type="az_Arab" populationPercent="0.65"/>	<!--Azerbaijani (Arabic)-->
@@ -4235,6 +4234,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="bg" populationPercent="0.42"/>	<!--Bulgarian-->
 			<languagePopulation type="ady" populationPercent="0.39"/>	<!--Adyghe-->
 			<languagePopulation type="kiu" populationPercent="0.19"/>	<!--Kirmanjki-->
+			<languagePopulation type="kaa" populationPercent="0.1" references="R1199"/>	<!--Kara-Kalpak-->
 			<languagePopulation type="hy" populationPercent="0.056"/>	<!--Armenian-->
 			<languagePopulation type="ka" populationPercent="0.056"/>	<!--Georgian-->
 			<languagePopulation type="sr_Latn" writingPercent="5" populationPercent="0.028" references="R1017"/>	<!--Serbian (Latin)-->
@@ -4257,6 +4257,8 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="TW" gdp="1143000000000" literacyPercent="96.1" population="23595300">	<!--Taiwan-->
 			<languagePopulation type="zh_Hant" populationPercent="95" officialStatus="official"/>	<!--Chinese (Traditional)-->
+			<languagePopulation type="nan" populationPercent="57" officialStatus="official" references="R1333"/>	<!--Min Nan Chinese-->
+			<languagePopulation type="hak" populationPercent="11" officialStatus="official" references="R1334"/>	<!--Hakka Chinese-->
 			<languagePopulation type="trv" populationPercent="0.02"/>	<!--Taroko-->
 		</territory>
 		<territory type="TZ" gdp="234100000000" literacyPercent="67.8" population="67462100">	<!--Tanzania-->
@@ -5503,7 +5505,6 @@ XXX Code for transations where no currency is involved
 		<reference type="R1027" uri="https://www.cia.gov/cia/publications/factbook/geos/pu.html">Many minor langs; Portuguese official</reference>
 		<reference type="R1028" uri="http://www.seasite.niu.edu/tagalog/essays_on_philippine_languages.htm">In this and other sources, such as Ethnologue, there is no estimate for number of users. http://en.wikipedia.org/wiki/Filipino_language http://www.ethnologue.com/show_language.asp?code=fil </reference>
 		<reference type="R1029" uri="http://www.ethnologue.com/show_language.asp?code=hat">Most of the population uses Creole; see also http://www.country-studies.com/haiti/creole,-literacy,-and-education.html http://en.wikipedia.org/wiki/French_language#Haiti</reference>
-		<reference type="R1030" uri="http://www.ethnologue.com/show_language.asp?code=fra">400k 2nd language speakers</reference>
 		<reference type="R1031" uri="http://www.ethnologue.com/show_country.asp?name=CV">Official language, 37-77% literacy</reference>
 		<reference type="R1032" uri="http://www.ethnologue.com/show_country.asp?name=ER">Official language, used in some schools.</reference>
 		<reference type="R1033" uri="http://www.ciil.org/Main/Announcement/MBE_Programme/paper/paper2.htm">http://www.censusindia.net/cendat/datatable26.html</reference>
@@ -5605,7 +5606,6 @@ XXX Code for transations where no currency is involved
 		<reference type="R1129" uri="http://www.ethnologue.com/show_language.asp?code=skr">[missing]</reference>
 		<reference type="R1130" uri="http://en.wikipedia.org/wiki/R%C3%A9union">- Education is in French; using literacy rate * pop for French-using population</reference>
 		<reference type="R1131" uri="http://en.wikipedia.org/wiki/Singapore">  English is the first language learned by half the children by the time they reach preschool age; using 92.6% of pop for the English figure</reference>
-		<reference type="R1132" uri="http://en.wikipedia.org/wiki/Tunisia#Language">- using pop * literacy rate</reference>
 		<reference type="R1133" uri="http://en.wikipedia.org/wiki/Swahili_language">- 90 percent of approximately 39 million Tanzanians speak Swahili</reference>
 		<reference type="R1134" uri="http://en.wikipedia.org/wiki/Swahili_language">- Baganda generally don't speak Swahili, but it is in common use among the 25 million people elsewhere in the country, and is currently being implemented in schools nationwide (use 75% of Cpop for this figure)</reference>
 		<reference type="R1135" uri="https://en.wikipedia.org/wiki/Talian_dialect">[missing]</reference>
@@ -5805,5 +5805,8 @@ XXX Code for transations where no currency is involved
 		<reference type="R1330" uri="https://en.wikipedia.org/wiki/Languages_of_the_United_Kingdom">Analyzed from 2011 UK census and other sources</reference>
 		<reference type="R1331" uri="https://en.wikipedia.org/wiki/Languages_of_Canada">In total 86.2% of Canadians have working knowledge of English while 29.8% have a working knowledge of French.</reference>
 		<reference type="R1332" uri="https://statisticsmaldives.gov.mv/statistical-release-iii-education">2014 Maldives: 98% literacy in Divehi, 75% in English</reference>
+		<reference type="R1333" uri="https://en.wikipedia.org/wiki/Taiwanese_Hokkien">[missing]</reference>
+		<reference type="R1334" uri="https://en.wikipedia.org/wiki/Taiwanese_Hakka">[missing]</reference>
+		<reference type="R1335" uri="https://www.francophonie.org/sites/default/files/2021-04/LFDM-20Edition-2019-La-langue-fran%C3%A7aise-dans-le-monde.pdf">[missing]</reference>
 	</references>
 </supplementalData>
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/country_language_population.tsv b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/country_language_population.tsv
index 64c5e34ffd8..132baa43703 100644
--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/country_language_population.tsv
+++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/country_language_population.tsv
@@ -336,7 +336,7 @@ Denmark	DK	"5,809,502"	99%	"287,800,000,000"		Swedish	sv	13%			No estimate avail
 Diego Garcia	DG	500	99%	"22,460,000"	de_facto_official	English	en	495			http://en.wikipedia.org/wiki/Diego_Garcia
 Djibouti	DJ	"884,017"	68%	"3,640,000,000"		Afar	aa	42%
 Djibouti	DJ	"884,017"	68%	"3,640,000,000"	official	Arabic	ar	7.3%
-Djibouti	DJ	"884,017"	68%	"3,640,000,000"	official	French	fr	"19,000"
+Djibouti	DJ	"884,017"	68%	"3,640,000,000"	official	French	fr	50%			https://www.francophonie.org/sites/default/files/2021-04/LFDM-20Edition-2019-La-langue-fran%C3%A7aise-dans-le-monde.pdf
 Djibouti	DJ	"884,017"	68%	"3,640,000,000"		Somali	so	41%
 Dominica	DM	"74,027"	94%	"783,000,000"	official	English	en	94%
 Dominican Republic	DO	"10,298,756"	90%	"173,000,000,000"		English	en	"8,000"
@@ -505,7 +505,7 @@ Guinea-Bissau	GW	"1,833,247"	55%	"3,171,000,000"		Fulah (Adlam)	ff_Adlm	1			No e
 Guinea-Bissau	GW	"1,833,247"	55%	"3,171,000,000"		Mankanya	knf	"47,900"			http://www.ethnologue.com/18/language/knf/
 Guinea-Bissau	GW	"1,833,247"	55%	"3,171,000,000"	official	Portuguese	pt	100%			https://www.cia.gov/cia/publications/factbook/geos/pu.html Many minor langs; Portuguese official
 Guyana	GY	"740,685"	92%	"6,301,000,000"	official	English	en	100%
-Haiti	HT	"10,788,440"	49%	"19,970,000,000"	official	French	fr	4.7%	100%		http://www.ethnologue.com/show_language.asp?code=fra 400k 2nd language speakers
+Haiti	HT	"10,788,440"	49%	"19,970,000,000"	official	French	fr	42%	100%		https://www.francophonie.org/sites/default/files/2021-04/LFDM-20Edition-2019-La-langue-fran%C3%A7aise-dans-le-monde.pdf
 Haiti	HT	"10,788,440"	49%	"19,970,000,000"	official	Haitian Creole	ht	81%			"http://www.ethnologue.com/show_language.asp?code=hat Most of the population uses Creole; see also http://www.country-studies.com/haiti/creole,-literacy,-and-education.html http://en.wikipedia.org/wiki/French_language#Haiti"
 Heard & McDonald Islands	HM	1	99%	"53,170"		Unknown language	und	1	100%		"https://www.cia.gov/cia/publications/factbook/geos/hm.html Uninhabited, barren, sub-Antarctic islands"
 Honduras	HN	"9,182,766"	85%	"46,300,000,000"		English	en	"40,400"
@@ -757,7 +757,7 @@ Latvia	LV	"1,923,559"	100%	"54,020,000,000"		Russian	ru	38%
 Lebanon	LB	"6,100,075"	90%	"88,250,000,000"	official	Arabic	ar	86%
 Lebanon	LB	"6,100,075"	90%	"88,250,000,000"		Armenian	hy	5.2%
 Lebanon	LB	"6,100,075"	90%	"88,250,000,000"		English	en	40%
-Lebanon	LB	"6,100,075"	90%	"88,250,000,000"		French	fr	"22,300"
+Lebanon	LB	"6,100,075"	90%	"88,250,000,000"		French	fr	38%			https://www.francophonie.org/sites/default/files/2021-04/LFDM-20Edition-2019-La-langue-fran%C3%A7aise-dans-le-monde.pdf
 Lebanon	LB	"6,100,075"	90%	"88,250,000,000"		Kurdish (Arabic)	ku_Arab	"101,000"
 Lebanon	LB	"6,100,075"	90%	"88,250,000,000"		Levantine Arabic	apc	"6,759,000"			https://en.wikipedia.org/wiki/Levantine_Arabic#Speakers_by_country
 Lesotho	LS	"1,962,461"	90%	"6,656,000,000"	official	English	en	27%			"http://www.ethnologue.com/show_country.asp?name=LS Lesotho English-using pop estimated at 5%, no figs available. Probably too low."
@@ -839,7 +839,7 @@ Mauritania	MR	"3,840,429"	59%	"17,280,000,000"		Fulah (Adlam)	ff_Adlm	1			No est
 Mauritania	MR	"3,840,429"	59%	"17,280,000,000"		Wolof	wo	"10,000"
 Mauritius	MU	"1,364,283"	89%	"28,270,000,000"		Bhojpuri	bho	27%
 Mauritius	MU	"1,364,283"	89%	"28,270,000,000"	official	English	en	72%			http://www.chass.utoronto.ca/~cpercy/courses/6362-chiba.htm
-Mauritius	MU	"1,364,283"	89%	"28,270,000,000"	official	French	fr	3%
+Mauritius	MU	"1,364,283"	89%	"28,270,000,000"	official	French	fr	73%			https://www.francophonie.org/sites/default/files/2021-04/LFDM-20Edition-2019-La-langue-fran%C3%A7aise-dans-le-monde.pdf
 Mauritius	MU	"1,364,283"	89%	"28,270,000,000"		Morisyen	mfe	90%
 Mauritius	MU	"1,364,283"	89%	"28,270,000,000"		Tamil	ta	"34,200"
 Mauritius	MU	"1,364,283"	89%	"28,270,000,000"		Urdu	ur	5.2%
@@ -880,7 +880,7 @@ Montserrat	MS	"5,315"	97%	"167,400,000"	official	English	en	"3,490"
 Morocco	MA	"34,314,130"	67%	"298,600,000,000"	official	Arabic	ar	62%
 Morocco	MA	"34,314,130"	67%	"298,600,000,000"	official	Central Atlas Tamazight	tzm	9.8%	25%
 Morocco	MA	"34,314,130"	67%	"298,600,000,000"		English	en	14%			"http://www.ethnologue.com/show_country.asp?name=MA Ethnologue says 80k users of French. No other figures found yet, but this seems too low."
-Morocco	MA	"34,314,130"	67%	"298,600,000,000"	de_facto_official	French	fr	20%			"http://www.ethnologue.com/show_country.asp?name=MA Ethnologue says 80k users of French. No other figures found yet, but this seems too low."
+Morocco	MA	"34,314,130"	67%	"298,600,000,000"	de_facto_official	French	fr	35%			https://www.francophonie.org/sites/default/files/2021-04/LFDM-20Edition-2019-La-langue-fran%C3%A7aise-dans-le-monde.pdf
 Morocco	MA	"34,314,130"	67%	"298,600,000,000"		Moroccan Arabic	ary	87%
 Morocco	MA	"34,314,130"	67%	"298,600,000,000"		Riffian (Tifinagh)	rif_Tfng	4.9%	5%
 Morocco	MA	"34,314,130"	67%	"298,600,000,000"		Riffian (Latin)	rif	4.9%	5%
@@ -1274,7 +1274,7 @@ Sweden	SE	"10,040,995"	99%	"518,000,000,000"	recognized	Tavringer Romani	rmu	"9,
 Sweden	SE	"10,040,995"	99%	"518,000,000,000"	recognized	Tornedalen Finnish	fit	"55,500"
 Sweden	SE	"10,040,995"	99%	"518,000,000,000"	recognized	Yiddish	yi	"3,000"
 Switzerland	CH	"8,292,809"	99%	"523,100,000,000"		English	en	61%			http://en.wikipedia.org/wiki/French_language
-Switzerland	CH	"8,292,809"	99%	"523,100,000,000"	official	French	fr	21%			http://en.wikipedia.org/wiki/French_language
+Switzerland	CH	"8,292,809"	99%	"523,100,000,000"	official	French	fr	67%			https://www.francophonie.org/sites/default/files/2021-04/LFDM-20Edition-2019-La-langue-fran%C3%A7aise-dans-le-monde.pdf
 Switzerland	CH	"8,292,809"	99%	"523,100,000,000"	official	German	de	73%
 Switzerland	CH	"8,292,809"	99%	"523,100,000,000"	official	Italian	it	4.3%
 Switzerland	CH	"8,292,809"	99%	"523,100,000,000"		Lombard	lmo	4.1%	5%		5% writing pop estimated in absence of other data
@@ -1341,7 +1341,7 @@ Trinidad & Tobago	TT	"1,215,527"	99%	"42,850,000,000"	official	English	en	88%
 Trinidad & Tobago	TT	"1,215,527"	99%	"42,850,000,000"		Spanish	es	"4,100"
 Tristan da Cunha	TA	275	99%	"12,350,000"		English	en	272
 Tunisia	TN	"11,516,189"	79%	"137,700,000,000"	official	Arabic	ar	90%
-Tunisia	TN	"11,516,189"	79%	"137,700,000,000"	official	French	fr	74%			http://en.wikipedia.org/wiki/Tunisia#Language - using pop * literacy rate
+Tunisia	TN	"11,516,189"	79%	"137,700,000,000"	official	French	fr	52%			https://www.francophonie.org/sites/default/files/2021-04/LFDM-20Edition-2019-La-langue-fran%C3%A7aise-dans-le-monde.pdf
 Tunisia	TN	"11,516,189"	79%	"137,700,000,000"		Tunisian Arabic	aeb	90%
 Turkey	TR	"81,257,239"	94%	"2,186,000,000,000"		Abkhazian	ab	"4,000"			http://www.ethnologue.com/show_language.asp?code=abk 96% bilingual in Turkish.
 Turkey	TR	"81,257,239"	94%	"2,186,000,000,000"		Adyghe	ady	"316,000"