From 7c7495776e46ab6f9c1aaeec3cfd325c4e747214 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

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

CLDR-11888 Redo automated scripts after merge conflicts
---
 common/supplemental/likelySubtags.xml         |  4 +--
 common/supplemental/supplementalData.xml      | 19 +++++++-------
 .../localeIdentifiers/likelySubtags.txt       | 13 +++++++---
 .../localeIdentifiers/localeDisplayName.txt   | 26 +++++++++++++++++++
 .../util/data/country_language_population.tsv | 14 +++++-----
 5 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/common/supplemental/likelySubtags.xml b/common/supplemental/likelySubtags.xml
index 42eb17c054b..ce418366c17 100644
--- a/common/supplemental/likelySubtags.xml
+++ b/common/supplemental/likelySubtags.xml
@@ -895,7 +895,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-->
@@ -924,7 +924,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-->
diff --git a/common/supplemental/supplementalData.xml b/common/supplemental/supplementalData.xml
index 7e87532db12..4eac2684ba4 100644
--- a/common/supplemental/supplementalData.xml
+++ b/common/supplemental/supplementalData.xml
@@ -1574,7 +1574,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"/>
@@ -2739,9 +2739,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="R1030"/>	<!--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-->
@@ -2899,10 +2899,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="R1030"/>	<!--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-->
@@ -3188,7 +3188,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="R1030"/>	<!--French-->
 		</territory>
 		<territory type="HU" gdp="388900000000" literacyPercent="99" population="9855750">	<!--Hungary-->
 			<languagePopulation type="hu" populationPercent="100" officialStatus="official"/>	<!--Hungarian-->
@@ -3495,9 +3495,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="R1030"/>	<!--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-->
@@ -3554,8 +3554,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="R1030"/>	<!--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-->
@@ -3659,10 +3659,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="R1030"/>	<!--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-->
@@ -4225,7 +4225,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="R1030"/>	<!--French-->
 		</territory>
 		<territory type="TO" gdp="700400000" literacyPercent="99" population="104889">	<!--Tonga-->
 			<languagePopulation type="to" populationPercent="95" officialStatus="official"/>	<!--Tongan-->
@@ -5517,7 +5517,7 @@ 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="R1030" uri="https://www.francophonie.org/sites/default/files/2021-04/LFDM-20Edition-2019-La-langue-fran%C3%A7aise-dans-le-monde.pdf">[missing]</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>
@@ -5619,7 +5619,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>
diff --git a/common/testData/localeIdentifiers/likelySubtags.txt b/common/testData/localeIdentifiers/likelySubtags.txt
index aca47b1a577..d78ef667ce9 100644
--- a/common/testData/localeIdentifiers/likelySubtags.txt
+++ b/common/testData/localeIdentifiers/likelySubtags.txt
@@ -512,6 +512,11 @@ hsb-AQ ;	hsb-Latn-AQ ;	hsb-AQ ;
 hsb-DE ;	hsb-Latn-DE ;	hsb ;	
 hsb-Egyp ;	hsb-Egyp-DE ;	hsb-Egyp ;	
 hsb-Latn ;	hsb-Latn-DE ;	hsb ;	
+ht ;	ht-Latn-HT ;	ht ;	
+ht-AQ ;	ht-Latn-AQ ;	ht-AQ ;	
+ht-Egyp ;	ht-Egyp-HT ;	ht-Egyp ;	
+ht-HT ;	ht-Latn-HT ;	ht ;	
+ht-Latn ;	ht-Latn-HT ;	ht ;	
 hu ;	hu-Latn-HU ;	hu ;	
 hu-AQ ;	hu-Latn-AQ ;	hu-AQ ;	
 hu-Egyp ;	hu-Egyp-HU ;	hu-Egyp ;	
@@ -1173,7 +1178,7 @@ und-Cyrl-UZ ;	uz-Cyrl-UZ ;	uz-Cyrl ;
 und-Cyrl-XK ;	sr-Cyrl-XK ;	sr-XK ;	
 und-DE ;	de-Latn-DE ;	de ;	
 und-DG ;	en-Latn-DG ;	en-DG ;	
-und-DJ ;	aa-Latn-DJ ;	aa-DJ ;	
+und-DJ ;	fr-Latn-DJ ;	fr-DJ ;	
 und-DK ;	da-Latn-DK ;	da ;	
 und-DM ;	en-Latn-DM ;	en-DM ;	
 und-DO ;	es-Latn-DO ;	es-DO ;	
@@ -1236,7 +1241,7 @@ und-Guru-IN ;	pa-Guru-IN ;	pa ;
 und-HK ;	zh-Hant-HK ;	zh-HK ;	
 und-HN ;	es-Latn-HN ;	es-HN ;	
 und-HR ;	hr-Latn-HR ;	hr ;	
-und-HT ;	ht-Latn-HT ;	ht ;	
+und-HT ;	fr-Latn-HT ;	fr-HT ;	
 und-HU ;	hu-Latn-HU ;	hu ;	
 und-Hans ;	zh-Hans-CN ;	zh ;	
 und-Hans-AQ ;	zh-Hans-AQ ;	zh-AQ ;	
@@ -1365,7 +1370,7 @@ und-Latn-CY ;	tr-Latn-CY ;	tr-CY ;
 und-Latn-CZ ;	cs-Latn-CZ ;	cs ;	
 und-Latn-DE ;	de-Latn-DE ;	de ;	
 und-Latn-DG ;	en-Latn-DG ;	en-DG ;	
-und-Latn-DJ ;	aa-Latn-DJ ;	aa-DJ ;	
+und-Latn-DJ ;	fr-Latn-DJ ;	fr-DJ ;	
 und-Latn-DK ;	da-Latn-DK ;	da ;	
 und-Latn-DM ;	en-Latn-DM ;	en-DM ;	
 und-Latn-DO ;	es-Latn-DO ;	es-DO ;	
@@ -1401,7 +1406,7 @@ und-Latn-GY ;	en-Latn-GY ;	en-GY ;
 und-Latn-HK ;	en-Latn-HK ;	en-HK ;	
 und-Latn-HN ;	es-Latn-HN ;	es-HN ;	
 und-Latn-HR ;	hr-Latn-HR ;	hr ;	
-und-Latn-HT ;	ht-Latn-HT ;	ht ;	
+und-Latn-HT ;	fr-Latn-HT ;	fr-HT ;	
 und-Latn-HU ;	hu-Latn-HU ;	hu ;	
 und-Latn-IC ;	es-Latn-IC ;	es-IC ;	
 und-Latn-ID ;	id-Latn-ID ;	id ;	
diff --git a/common/testData/localeIdentifiers/localeDisplayName.txt b/common/testData/localeIdentifiers/localeDisplayName.txt
index 9abbc13423c..39e14107e8f 100644
--- a/common/testData/localeIdentifiers/localeDisplayName.txt
+++ b/common/testData/localeIdentifiers/localeDisplayName.txt
@@ -1310,6 +1310,32 @@ nl-Latn-BE; flamšćina (łaćonsce)
 zh-Hans-fonipa; chinšćina [zjednorjena] (FONIPA)
 
 
+@locale=ht
+@languageDisplay=standard
+
+en-MM; anglais (Myanmar [Birmanie])
+es; espagnol
+es-419; espagnol (Amérique latine)
+es-Cyrl-MX; espagnol (cyrillique, Mexique)
+hi-Latn; hindi (latin)
+nl-BE; néerlandais (Belgique)
+nl-Latn-BE; néerlandais (latin, Belgique)
+zh-Hans-fonipa; chinois (simplifié, alphabet phonétique international)
+
+
+@locale=ht
+@languageDisplay=dialect
+
+en-MM; anglais (Myanmar [Birmanie])
+es; espagnol
+es-419; espagnol d’Amérique latine
+es-Cyrl-MX; espagnol du Mexique (cyrillique)
+hi-Latn; hindi (latin)
+nl-BE; flamand
+nl-Latn-BE; flamand (latin)
+zh-Hans-fonipa; chinois simplifié (alphabet phonétique international)
+
+
 @locale=hu
 @languageDisplay=standard
 
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 7ed8c346c61..36da53753c2 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"
@@ -510,7 +510,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"
@@ -762,7 +762,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."
@@ -844,7 +844,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%
@@ -885,7 +885,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%
@@ -1281,7 +1281,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
@@ -1348,7 +1348,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"