From 6bcbf50a1798e437693eb1f43b5cd194d990624a Mon Sep 17 00:00:00 2001
From: inari <inari@chalmers.se>
Date: Mon, 10 Mar 2014 13:42:51 +0000
Subject: [PATCH] ask_for_V3 in Dictionary* + unicode fixing in DictionaryFre

---
 lib/src/translator/Dictionary.gf    |   1 +
 lib/src/translator/DictionaryBul.gf |   1 +
 lib/src/translator/DictionaryChi.gf |   1 +
 lib/src/translator/DictionaryEng.gf |   1 +
 lib/src/translator/DictionaryFin.gf |  17 +-
 lib/src/translator/DictionaryFre.gf | 786 ++++++++++++++--------------
 lib/src/translator/DictionaryGer.gf |  10 +
 lib/src/translator/DictionaryHin.gf |   6 +
 lib/src/translator/DictionarySwe.gf |   1 +
 9 files changed, 424 insertions(+), 400 deletions(-)

diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf
index 1761494cf..f06f9cdfa 100644
--- a/lib/src/translator/Dictionary.gf
+++ b/lib/src/translator/Dictionary.gf
@@ -62306,6 +62306,7 @@ fun ask_after_V2 : V2;
 fun ask_around_V : V;
 fun ask_around_V2 : V2;
 fun ask_for_V2 : V2;
+fun ask_for_V3 : V3;
 fun ask_in_V2 : V2;
 fun ask_out_V2 : V2;
 fun ask_over_V2 : V2;
diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf
index ec714f61b..90cc46db4 100644
--- a/lib/src/translator/DictionaryBul.gf
+++ b/lib/src/translator/DictionaryBul.gf
@@ -62300,6 +62300,7 @@ lin ask_after_V2 = variants {};
 lin ask_around_V = variants {};
 lin ask_around_V2 = variants {};
 lin ask_for_V2 = variants {};
+lin ask_for_V3 = variants {};
 lin ask_in_V2 = variants {};
 lin ask_out_V2 = variants {};
 lin ask_over_V2 = variants {};
diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf
index e5d0ec00c..60a63d7dd 100644
--- a/lib/src/translator/DictionaryChi.gf
+++ b/lib/src/translator/DictionaryChi.gf
@@ -11572,6 +11572,7 @@ balmy_A = mkA "芳香" ; -- 1
 awry_A = mkA "曲解" ; -- 1
 atrocity_N = mkN "暴行" ; -- 1
 ask_for_V2 = mkV2 "请求" ; -- 1
+ask_for_V3 = variants {} ;
 aria_N = mkN "咏叹调" "首" ; -- 1
 aplomb_N = mkN "泰然自若" [] ; -- 1
 angst_N = mkN "焦虑" [] ; -- 1
diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf
index c68af99b5..91c7f1488 100644
--- a/lib/src/translator/DictionaryEng.gf
+++ b/lib/src/translator/DictionaryEng.gf
@@ -62401,6 +62401,7 @@ lin ask_after_V2 = prepV2 (mkV "ask") (mkPrep "after");
 lin ask_around_V = partV (mkV "ask") "around";
 lin ask_around_V2 = mkV2 (partV (mkV "ask") "around");
 lin ask_for_V2 = prepV2 (mkV "ask") (mkPrep "for");
+lin ask_for_V3 = mkV3 (mkV "ask") noPrep (mkPrep "for");
 lin ask_in_V2 = mkV2 (partV (mkV "ask") "in");
 lin ask_out_V2 = mkV2 (partV (mkV "ask") "out");
 lin ask_over_V2 = mkV2 (partV (mkV "ask") "over");
diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf
index 4583c9948..f7b82db2f 100644
--- a/lib/src/translator/DictionaryFin.gf
+++ b/lib/src/translator/DictionaryFin.gf
@@ -3023,11 +3023,12 @@ aside_Adv = mkWAdv (k99 "syrjään") ; --UNCHK
 aside_N = mkWN (compoundN "reuna" (k39 "huomautus")) ; --UNCHK
 asinine_A = mkWA (k10 "tyhjä") ; --UNCHK
 asininity_N = mkWN (k40 "uppiniskaisuus") ; --UNCHK
-ask_VQ = mkWVQ (k54A "pyytää") ; --UNCHK
-ask_VV = mkWVV (k54A "pyytää") ; --UNCHK
-ask_for_V2 = mkWV2 (k52 "kysyä") ; --UNCHK
+ask_VQ = mkVQ (mkV "kysyä") ;
+ask_VV = mkVV (mkV "pyytää" "pyysi") infIllat ;
+ask_for_V2 = mkV2 (mkV "pyytää" "pyysi") partitive ;
+ask_for_V3 = mkV3 (mkV "pyytää" "pyysi") (mkPrep ablative) (mkPrep partitive) ;
 ask_in_V2 = mkWV2 (k54A "pyytää") "sisään" ; --UNCHK
-ask_out_V2 = mkWV2 (k64 "viedä") "ulos" ; --UNCHK
+ask_out_V2 = mkWV2 (k54A "pyytää") "ulos" ; --UNCHK
 ask_over_V2 = mkWV2 (k54A "pyytää") "käymään" ; --UNCHK
 ask_round_V2 = mkWV2 (k54A "pyytää") "käymään" ; --UNCHK
 askance_A = mkWA (k99 "sirrillään") ; --UNCHK
@@ -3038,8 +3039,8 @@ asking_N = mkWN (k1A "pyyntö") ; --UNCHK
 aslant_A = mkWA (k1 "vino") ; --UNCHK
 aslant_Adv = mkWAdv (k99 "viistoon") ; --UNCHK
 asleep_Adv = mkWAdv (k99 "nukuksissa") ; --UNCHK
-asocial_A = mkWA (k34A "sopeutumaton") "yhteiskuntaan" ; --UNCHK
-asp_N = mkWN (k48 "haje") "Naja" ; --UNCHK
+asocial_A = mkA "asosiaalinen" ;
+asp_N = mkN "aspis" (mkN "kyy") ;
 asparaginase_N = mkWN (compoundN "Els" (k5 "par")) ; --UNCHK
 asparagine_N = mkWN "asparagiini" ; --UNCHK
 asparagus_N = mkWN (k9 "parsa") ; --UNCHK
@@ -54801,7 +54802,7 @@ engine_N = mkWN (k6 "moottori") ;  --f57
 conduct_V2 = mkWV2 (k53A "johtaa") ;  --f57
 circuit_N = mkWN (k39 "kierros") ;  --f57
 author_N = mkWN (k12 "tekijä") ;  --f57
-ask_V2 = mkWV2 (k54A "pyytää") ;  --f57
+ask_V2 = mkV2 (mkV "kysyä") ; --f57 --pyytää in ask_for_V2
 twice_Adv = mkWAdv (k99 "kahdesti") ;  --f56
 retail_V = mkV vOlla "myytävänä" ;  --f56
 reduce_V = mkV "vähentää" ;  --f56
@@ -55359,7 +55360,7 @@ avert_V2 = mkV2 "välttää" partitive ;  --mkWV2 (k53 "nostaa") "pois" ;
 associate_V = mkV "assosioitua" ;  --mkWV (k62 "assosioida") ;
 assertion_N = mkWN (k39 "julistus") ; 
 assert_V2 = mkWV2 (k53A "vakuuttaa") ; 
-ask_V2V = mkWV2V (k54A "pyytää") ; 
+ask_V2V = mkV2V (mkV "pyytää" "pyysi") ; 
 arouse_V2 = mkV2 "herättää" ;  --mkWV2 (k52A "havahtua") ;
 architectural_A = mkWA (k38 "arkkitehtoninen") ; 
 anticipate_VS = mkWVS (k62 "ennakoida") ; 
diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf
index f2927345c..fe23c53b8 100644
--- a/lib/src/translator/DictionaryFre.gf
+++ b/lib/src/translator/DictionaryFre.gf
@@ -406,7 +406,7 @@ lin
   stove_N = L.stove_N; --CHECKED
   straight_A = L.straight_A; --CHECKED
   studentMasc_N = L.student_N; --CHECKED
-  studentFem_N = mkN "étudiante" feminine;
+  studentFem_N = mkN "étudiante" feminine;
   stupid_A = L.stupid_A; --CHECKED
   suck_V2 = L.suck_V2; --CHECKED
   sun_N = L.sun_N; --CHECKED
@@ -464,7 +464,7 @@ lin
   year_N = L.year_N; --CHECKED
   yellow_A = L.yellow_A; --CHECKED
   young_A = L.young_A; --CHECKED
-aardvark_N = mkN "oryctérope" masculine;
+aardvark_N = mkN "oryctérope" masculine;
 aardwolf_N = mkN "protèle" masculine;
 abaca_N = mkN "abaca" masculine;
 abacus_N = mkN "abaque" masculine | mkN "abaque" feminine;
@@ -694,7 +694,7 @@ acquisition_N = mkN "acquisition" feminine;
 acquittal_N = mkN "acquittement" masculine;
 acre_N = mkN "acre" feminine;
 acreage_N = mkN "acréage" masculine;
-acrid_A = mkA "âcre";
+acrid_A = mkA "âcre";
 acrimonious_A = mkA "acrimonieux";
 acrobatMasc_N = mkN "acrobate" masculine;
 acrobatFem_N = mkN "acrobate" feminine;
@@ -875,14 +875,14 @@ affront_V2 = mkV2 (mkV "défier") | mkV2 (reflV (mkV "confronter"));
 afraid_A = mkA "effrayé";
 after_Adv = mkAdv "après";
 afterbirth_N = mkN "délivrance" feminine;
-afterlife_N = mkN "au-delà" masculine;
+afterlife_N = mkN "au-delà" masculine;
 aftermath_N = mkN "regain" masculine;
 afternoon_N = mkN "après-midi";
 aftershock_N = mkN "réplique" feminine;
 afterwards_Adv = mkAdv "après";
-again_Adv = mkAdv "déjà";
+again_Adv = mkAdv "déjà";
 agate_N = mkN "agate";
-age_N = mkN "âge" masculine | mkN "génération" feminine | mkN "époque" feminine;
+age_N = mkN "âge" masculine | mkN "génération" feminine | mkN "époque" feminine;
 age_V2 = mkV2 (mkV "vieillir");
 ageing_N = mkN "vieillissement";
 agency_N = mkN "agence" feminine;
@@ -924,7 +924,7 @@ aikido_N = mkN "aikido" masculine;
 ail_V2 = mkV2 (mkV "manquer");
 aim_N = mkN "cible" feminine | mkN "objectif" masculine;
 aim_V2 = mkV2 (mkV "cibler") | mkV2 (mkV "viser");
-aioli_N = mkN "aïoli";
+aioli_N = mkN "aïoli";
 air_N = mkN "air" masculine | mkN "aria" feminine;
 air_V2 = mkV2 (mkV "aérer");
 aircraft_N = mkN "aéronef" masculine;
@@ -933,11 +933,11 @@ airport_N = mkN "aéroport" masculine;
 airtight_A = mkA "hermétique";
 airwoman_N = mkN "aviatrice" feminine;
 aisle_N = mkN "rayon" masculine;
-aitch_N = mkN "âche";
-ajar_A = mkA "entrebâillé";
+aitch_N = mkN "âche";
+ajar_A = mkA "entrebâillé";
 akee_N = mkN "aki" masculine;
 akin_A = mkA "apparenté" | mkA "analogue";
-alabaster_N = mkN "albâtre" masculine;
+alabaster_N = mkN "albâtre" masculine;
 alacrity_N = mkN "empressement" masculine | mkN "rapidité" feminine;
 alanine_N = mkN "alanine" feminine;
 alarm_N = mkN "alarme" feminine | mkN "réveille-matin" masculine;
@@ -992,7 +992,7 @@ aliyah_N = mkN "Alya";
 alkali_N = mkN "alcali" masculine;
 alkalimetry_N = mkN "alcalimétrie" feminine;
 alkaline_A = mkA "alcalin";
-alkaloid_N = mkN "alcaloïde" masculine;
+alkaloid_N = mkN "alcaloïde" masculine;
 alkene_N = mkN "alcène" masculine;
 allegation_N = mkN "assertion";
 allegiance_N = mkN "fidélité";
@@ -1077,7 +1077,7 @@ amber_A = mkA "ambré";
 amber_N = mkN "ambre" masculine;
 ambidexterity_N = mkN "ambidextrie" feminine;
 ambidextrous_A = mkA "ambidextre";
-ambiguity_N = mkN "ambiguïté" feminine;
+ambiguity_N = mkN "ambiguïté" feminine;
 ambiguous_A = mkA "ambigu";
 ambition_N = mkN "ambition" feminine;
 ambitious_A = mkA "ambitieux";
@@ -1121,7 +1121,7 @@ amphetamine_N = mkN "amphétamine" feminine;
 amphibian_N = mkN "amphibien" masculine;
 amphibious_A = mkA "amphibie";
 amphibole_N = mkN "amphibole" feminine;
-amphitheatre_N = mkN "amphithéâtre" masculine;
+amphitheatre_N = mkN "amphithéâtre" masculine;
 amphora_N = mkN "amphore" feminine;
 ample_A = mkA "ample";
 amplifier_N = mkN "amplificateur" masculine;
@@ -1165,7 +1165,7 @@ anastylosis_N = mkN "anastylose" feminine;
 anathema_N = mkN "anathème" feminine;
 anatomical_A = mkA "anatomique";
 anatomy_N = mkN "anatomie" feminine;
-ancestor_N = mkN "ancêtre";
+ancestor_N = mkN "ancêtre";
 ancestral_A = mkA "ancestral";
 ancestry_N = mkN "ascendance" feminine;
 anchor_N = mkN "ancre" feminine;
@@ -1178,7 +1178,7 @@ ancillary_A = mkA "subordonné";
 androgen_N = mkN "androgène" masculine;
 androgynous_A = mkA "asexué" | mkA "androgyne";
 androgyny_N = mkN "androgynie" feminine;
-android_N = mkN "androïde" masculine;
+android_N = mkN "androïde" masculine;
 androphobia_N = mkN "androphobie" feminine;
 anecdotal_A = mkA "anecdotique";
 anecdote_N = mkN "anecdote" feminine;
@@ -1200,8 +1200,8 @@ anger_N = mkN "colère" feminine;
 angioma_N = mkN "angiome" masculine;
 angle_N = mkN "angle" masculine;
 anglicism_N = mkN "anglicisme";
-angry_A = mkA "fâché";
-angstrom_N = mkN "ångström" masculine;
+angry_A = mkA "fâché";
+angstrom_N = mkN "ångström" masculine | mkN "angstrom" masculine ;
 angular_A = mkA "angulaire" | mkA "anguleux";
 anhedonia_N = mkN "anhédonie" feminine;
 anhydride_N = mkN "anhydride" masculine;
@@ -1235,7 +1235,7 @@ annotation_N = mkN "annotation" feminine;
 announce_V2 = mkV2 (mkV "annoncer");
 announcement_N = mkN "annonce" feminine;
 announcer_N = mkN "annonceur" masculine;
-annoy_V2 = mkV2 (mkV "gêner");
+annoy_V2 = mkV2 (mkV "gêner");
 annoyance_N = mkN "irritation" feminine;
 annual_A = mkA "annuel";
 annul_V2 = mkV2 (mkV "annuler");
@@ -1307,7 +1307,7 @@ antihero_N = mkN "antihéros";
 antihistamine_N = mkN "antihistaminique" masculine;
 antihypertensive_N = mkN "antihypertensif" masculine;
 antilepton_N = mkN "antilepton" masculine;
-antimacassar_N = mkN "têtière";
+antimacassar_N = mkN "têtière";
 antimatter_N = mkN "antimatière" feminine;
 antimicrobial_A = mkA "antimicrobien";
 antimony_N = mkN "antimoine" masculine;
@@ -1455,10 +1455,10 @@ arch_N = mkN "arche" feminine | mkN "arc" masculine;
 archaeological_A = mkA "archéologique";
 archaeologist_N = mkN "archéologue";
 archaeology_N = mkN "archéologie" feminine;
-archaic_A = mkA "archaïque";
-archaism_N = mkN "archaïsme" masculine;
+archaic_A = mkA "archaïque";
+archaism_N = mkN "archaïsme" masculine;
 archangel_N = mkN "archange";
-archbishop_N = mkN "archevêque" masculine;
+archbishop_N = mkN "archevêque" masculine;
 archdiocese_N = mkN "archidiocèse" feminine;
 archduchess_N = mkN "archiduchesse" feminine;
 archduchy_N = mkN "archiduché" masculine;
@@ -1473,7 +1473,7 @@ architectMasc_N = mkN "architecte" masculine;
 architectFem_N = mkN "architecte" feminine;
 architecture_N = mkN "architecture" feminine;
 archive_N = mkN "archives";
-archpriest_N = mkN "archiprêtre" masculine;
+archpriest_N = mkN "archiprêtre" masculine;
 archway_N = mkN "arcade" feminine;
 ardent_A = mkA "ardent";
 ardor_N = mkN "ardeur" | mkN "ardeur" feminine;
@@ -1525,7 +1525,7 @@ arrangement_N = mkN "arrangement" masculine;
 array_N = mkN "tableau" masculine;
 arrears_N = mkN "arriéré" masculine;
 arrest_N = mkN "arrestation" feminine;
-arrest_V2 = mkV2 (mkV "arrêter");
+arrest_V2 = mkV2 (mkV "arrêter");
 arrival_N = mkN "arrivée" feminine;
 arrive_V2 = mkV2 (mkV "arriver") | mkV2 (mkV "réussir");
 arrogant_A = mkA "arrogant";
@@ -1567,7 +1567,7 @@ ascender_N = mkN "hampe";
 ascension_N = mkN "ascension" feminine;
 ascertain_V2 = mkV2 (mkV "constater");
 ascetic_A = mkA "ascétique";
-ascetic_N = mkN "Ascète" masculine;
+ascetic_N = mkN "ascète" masculine;
 asceticism_N = mkN "ascétisme" masculine;
 ascribe_V2 = mkV2 (mkV "attribuer") | mkV2 (mkV "imputer");
 ascription_N = mkN "attribution" feminine;
@@ -1575,13 +1575,15 @@ ascus_N = mkN "asque";
 asepsis_N = mkN "asepsie";
 asexual_A = mkA "asexué" | mkA "asexuel";
 asexuality_N = mkN "asexualité";
-ash_N = mkN "cendre" feminine | mkN "frêne" masculine;
+ash_N = mkN "cendre" feminine | mkN "frêne" masculine;
 ashamed_A = mkA "honteux";
 ashcan_N = mkN "cendrier" masculine;
 ashen_A = mkA "cendré";
 ashtray_N = mkN "cendrier" masculine;
 asinine_A = mkA "asinin";
 ask_V2V = mkV2V (mkV "demander");
+ask_for_V2 = mkV2 (mkV "demander") ; --UNCHK
+ask_for_V3 = mkV3 (mkV "demander") ; --UNCHK
 asleep_A = mkA "endormi";
 asocial_A = mkA "asocial";
 asparagine_N = mkN "asparagine" feminine;
@@ -1598,7 +1600,7 @@ aspirate_V2 = mkV2 (mkV "aspirer") | mkV2 (mkV "inspirer");
 aspiration_N = mkN "aspiration";
 aspirator_N = mkN "aspirateur" masculine;
 aspirin_N = mkN "aspirine" feminine;
-ass_N = mkN "âne" masculine | mkN "cul" masculine;
+ass_N = mkN "âne" masculine | mkN "cul" masculine;
 assail_V2 = mkV2 (mkV I.assaillir_V2);
 assailant_N = mkN "agresseur" masculine;
 assassin_N = mkN "assassin" masculine;
@@ -1638,7 +1640,7 @@ astatine_N = mkN "astate" masculine;
 aster_N = mkN "aster" feminine;
 asterisk_N = mkN "astérisque" masculine;
 asterism_N = mkN "astérisme" masculine;
-asteroid_N = mkN "astéroïde" masculine;
+asteroid_N = mkN "astéroïde" masculine;
 asthenia_N = mkN "asthénie" feminine;
 asthenosphere_N = mkN "asthénosphère" feminine;
 asthma_N = mkN "asthme";
@@ -1847,7 +1849,7 @@ awesome_A = mkA "magnifique" | mkA "impressionnant";
 awful_A = mkA "terrible";
 awkward_A = mkA "embarrassant" | mkA "maladroit" | mkA "inconvenant";
 awkwardness_N = mkN "maladresse" feminine;
-awl_N = mkN "alêne" feminine;
+awl_N = mkN "alêne" feminine;
 awning_N = mkN "marquise" feminine;
 axe_N = mkN "hache" feminine | mkN "gratte" | mkN "couperet" masculine;
 axial_A = mkA "axial";
@@ -1862,8 +1864,8 @@ azalea_N = mkN "azalée" feminine;
 azimuth_N = mkN "azimut" masculine;
 azure_A = mkA "azur";
 azure_N = mkN "azur" masculine;
-baa_N = mkN "bêlement" masculine;
-baa_V = mkV (mkV "bêler");
+baa_N = mkN "bêlement" masculine;
+baa_V = mkV (mkV "bêler");
 babble_N = mkN "babillage" masculine | mkN "jargon" masculine | mkN "babil" masculine;
 babble_V2 = mkV2 (mkV "babiller") | mkV2 (mkV "bavarder") | mkV2 (mkV "marmonner");
 babbler_N = mkN "babillard";
@@ -1908,21 +1910,21 @@ bail_N = mkN "caution" feminine | mkN "écope" feminine;
 bail_V2 = mkV2 (mkV "écoper");
 bailiff_N = mkN "bailli" masculine | mkN "huissier" masculine;
 bailiwick_N = mkN "bailliage" masculine;
-bait_N = mkN "appât" masculine;
-bait_V2 = mkV2 (mkV "appâter");
+bait_N = mkN "appât" masculine;
+bait_V2 = mkV2 (mkV "appâter");
 baker_N = mkN "boulanger" masculine;
 bakery_N = mkN "boulangerie" feminine;
 baking_N = mkN "cuisson" feminine;
 baklava_N = mkN "baklava";
 baksheesh_N = mkN "bakchich" masculine;
 balaclava_N = mkN "passe-montagne" masculine;
-balalaika_N = mkN "balalaïka" feminine;
+balalaika_N = mkN "balalaïka" feminine;
 balance_N = mkN "balance" feminine | mkN "équilibre" masculine | mkN "solde" masculine;
 balance_V2 = mkV2 (mkV "apurer");
 balanitis_N = mkN "balanite" feminine;
 balcony_N = mkN "balcon" masculine;
 bald_A = mkA "chauve" | mkA "lisse";
-balderdash_N = mkN "bêtises";
+balderdash_N = mkN "bêtises";
 baldness_N = mkN "calvitie" feminine;
 baleful_A = mkA "sinistre";
 balk_V2 = mkV2 (mkV "regimber");
@@ -1976,7 +1978,7 @@ banter_N = mkN "plaisanterie";
 banter_V2 = mkV2 (mkV "badiner") | mkV2 (mkV "taquiner");
 banyan_N = mkN "banian" masculine;
 baobab_N = mkN "baobab" masculine;
-baptism_N = mkN "baptême" masculine;
+baptism_N = mkN "baptême" masculine;
 baptismal_A = mkA "baptismal";
 baptize_V2 = mkV2 (mkV "baptiser");
 bar_N = mkN "barre" feminine | mkN "bar" masculine | mkN "comptoir" masculine | mkN "mesure" feminine;
@@ -1994,7 +1996,7 @@ barberry_N = mkN "épine-vinette" feminine;
 barbican_N = mkN "barbacane" feminine;
 barbiturate_N = mkN "barbiturique";
 bard_N = mkN "barde" masculine;
-bardolatry_N = mkN "bardolâtrie";
+bardolatry_N = mkN "bardolâtrie";
 bare_A = mkA "nu";
 bargain_N = mkN "accord" masculine;
 barge_N = mkN "chaland" masculine;
@@ -2016,7 +2018,7 @@ barrel_N = mkN "tonneau" | mkN "canon" masculine | mkN "barillet" masculine | mk
 barricade_N = mkN "barricade" feminine;
 barricade_V2 = mkV2 (mkV "barricader");
 barrier_N = mkN "barrière" | mkN "limite";
-barrister_N = mkN "bâtonnier" masculine;
+barrister_N = mkN "bâtonnier" masculine;
 barrow_N = mkN "brouette";
 bartender_N = mkN "barman" masculine;
 barter_N = mkN "troc" masculine;
@@ -2043,8 +2045,8 @@ basophil_N = mkN "basophile" masculine;
 bass_A = mkA "bas";
 bass_N = mkN "perche" masculine | mkN "basse" feminine;
 bassoon_N = mkN "basson" masculine;
-bastard_N = mkN "bâtard" masculine | mkN "enculé" masculine;
-baste_V2 = mkV2 (mkV "bâtir");
+bastard_N = mkN "bâtard" masculine | mkN "enculé" masculine;
+baste_V2 = mkV2 (mkV "bâtir");
 bastille_N = mkN "bastille";
 bat_N = mkN "chauve-souris" feminine | mkN "batte" feminine;
 batch_N = mkN "fournée" feminine | mkN "lot" masculine;
@@ -2078,7 +2080,7 @@ bawl_V2 = mkV2 (mkV "hurler");
 bay_A = mkA "bai";
 bay_N = mkN "laurier" masculine | mkN "baie" feminine | mkN "compartiment" masculine;
 bay_V = mkV (mkV "aboyer");
-bayonet_N = mkN "baïonnette" feminine;
+bayonet_N = mkN "baïonnette" feminine;
 bazaar_N = mkN "bazar" masculine;
 bazooka_N = mkN "bazooka" masculine;
 beach_N = mkN "plage" feminine;
@@ -2098,7 +2100,7 @@ bearberry_N = mkN "bearberry";
 beard_N = mkN "barbe" feminine;
 bearer_N = mkN "porteur" | mkN "porteur" masculine;
 bearing_N = mkN "roulement" masculine | mkN "azimut" masculine;
-beast_N = mkN "bête" feminine;
+beast_N = mkN "bête" feminine;
 beat_V2 = mkV2 (mkV I.battre_V2) | mkV2 (mkV I.vaincre_V2);
 beater_N = mkN "bazou" | mkN "batteur" masculine;
 beatify_V2 = mkV2 (mkV "béatifier");
@@ -2116,13 +2118,13 @@ bedridden_A = mkA "alité";
 bedroom_N = mkN "chambre" feminine;
 bedsore_N = mkN "escarre" feminine;
 bedspread_N = mkN "jeté" masculine;
-bedstead_N = mkN "châlit";
+bedstead_N = mkN "châlit";
 bedwetter_N = mkN "pisse-au-lit";
 bee_N = mkN "abeille" feminine;
-beech_N = mkN "hêtre" masculine;
+beech_N = mkN "hêtre" masculine;
 beechnut_N = mkN "faine" feminine;
 beef_N = mkN "boeuf" masculine;
-beefcake_N = mkN "bellâtre" masculine;
+beefcake_N = mkN "bellâtre" masculine;
 beefsteak_N = mkN "bifteck" masculine;
 beehive_N = mkN "ruche" feminine | mkN "ruchée" feminine;
 beekeeper_N = mkN "apiculteur";
@@ -2199,7 +2201,7 @@ benign_A = mkA "bienveillant" | mkA "bénin";
 bent_A = mkA "courbé";
 benzene_N = mkN "benzène" masculine;
 benzodiazepine_N = mkN "benzodiazépine" masculine;
-benzoic_A = mkA "benzoïque";
+benzoic_A = mkA "benzoïque";
 benzoin_N = mkN "benjoin" masculine;
 bequeath_V2 = mkV2 (mkV "léguer") | mkV2 (mkV "donner") | mkV2 (mkV I.transmettre_V2);
 bequest_N = mkN "testament" masculine;
@@ -2223,7 +2225,7 @@ bestiality_N = mkN "bestialité" feminine | mkN "zoophilie" feminine;
 bestow_V2 = mkV2 (mkV "accorder");
 bet_N = mkN "pari";
 bet_V2 = mkV2 (mkV "parier");
-beta_N = mkN "bêta" masculine;
+beta_N = mkN "bêta" masculine;
 betel_N = mkN "bétel" masculine;
 betray_V2 = mkV2 (mkV "trahir");
 betrayer_N = mkN "dénonciateur";
@@ -2333,15 +2335,15 @@ biscuit_N = mkN "biscuit";
 bisexual_A = mkA "bisexuel" | mkA "bisexué";
 bisexual_N = mkN "bisexuel" masculine;
 bisexuality_N = mkN "bisexualité" feminine;
-bishop_N = mkN "évêque" masculine | mkN "fou" masculine;
-bishopric_N = mkN "évêché" masculine | mkN "épiscopat" masculine;
+bishop_N = mkN "évêque" masculine | mkN "fou" masculine;
+bishopric_N = mkN "évêché" masculine | mkN "épiscopat" masculine;
 bismuth_N = mkN "bismuth" masculine;
 bison_N = mkN "bison" masculine | mkN "bison";
 bistro_N = mkN "bistro" masculine;
 bit_N = mkN "bit" masculine | mkN "mors" masculine;
 bitch_N = mkN "chienne" | mkN "saleté" feminine | mkN "garce" feminine;
 bitch_V = mkV (mkV "chialer");
-bite_N = mkN "morsure" feminine | mkN "bouchée" feminine | mkN "piqûre" feminine;
+bite_N = mkN "morsure" feminine | mkN "bouchée" feminine | mkN "piqûre" feminine;
 bitter_A = mkA "amer" | mkA "dur" | mkA "haineux";
 bittern_N = mkN "butor" masculine;
 bitterness_N = mkN "amertume" feminine;
@@ -2386,7 +2388,7 @@ blatant_A = mkA "flagrant";
 blather_V = mkV (mkV "déblatérer");
 blaxploitation_N = mkN "blaxploitation" feminine;
 blaze_N = mkN "feu" masculine;
-blaze_V2 = mkV2 (mkV "brûler") | mkV2 (mkV "baliser") | mkV2 (mkV "briller");
+blaze_V2 = mkV2 (mkV "brûler") | mkV2 (mkV "baliser") | mkV2 (mkV "briller");
 blazer_N = mkN "blazer" feminine;
 blazon_N = mkN "blason";
 blazon_V2 = mkV2 (mkV "blasonner");
@@ -2417,7 +2419,7 @@ blister_V2 = mkV2 (mkV "cloquer") | mkV2 (mkV "critiquer");
 blithe_A = mkA "joyeux" | mkA "indifférent";
 blizzard_N = mkN "blizzard" masculine;
 bloated_A = mkA "gonflé" | mkA "gigantesque";
-block_N = mkN "bloc" masculine | mkN "billot" masculine | mkN "rue" feminine | mkN "immeuble" masculine | mkN "tête" | mkN "blocage" masculine;
+block_N = mkN "bloc" masculine | mkN "billot" masculine | mkN "rue" feminine | mkN "immeuble" masculine | mkN "tête" | mkN "blocage" masculine;
 block_V2 = mkV2 (mkV "boucher") | mkV2 (mkV "contrer") | mkV2 (mkV "bloquer");
 blockade_N = mkN "blocus" masculine;
 blockbuster_N = mkN "blockbuster" masculine;
@@ -2454,13 +2456,13 @@ blueberry_N = mkN "myrtille" feminine;
 bluefish_N = mkN "tassergal" masculine;
 blueprint_N = mkN "blueprint" masculine | mkN "modèle" masculine;
 blues_N = mkN "blues" masculine;
-bluish_A = mkA "bleuâtre";
+bluish_A = mkA "bleuâtre";
 blunderbuss_N = mkN "tromblon" masculine;
 blunt_A = mkA "abrupt" | mkA "émoussé" | mkA "sot";
 blunt_V2 = mkV2 (mkV "émousser") | mkV2 (mkV "réprimer");
 blur_N = mkN "tache" feminine | mkN "flou" masculine;
 blur_V2 = mkV2 (reflV (mkV "estomper")) | mkV2 (mkV "estomper") | mkV2 (mkV "flou");
-blurt_V2 = mkV2 (mkV "lâcher");
+blurt_V2 = mkV2 (mkV "lâcher");
 blush_N = mkN "rougeur" feminine | mkN "fard" masculine;
 blush_V = mkV (mkV "rougir");
 blustery_A = mkA "bruyant";
@@ -2525,7 +2527,7 @@ bong_N = mkN "bang" masculine;
 bongo_N = mkN "bongo" masculine;
 bonhomie_N = mkN "bonhomie" feminine;
 bonnet_N = mkN "capot" masculine;
-bonsai_N = mkN "bonsaï" masculine;
+bonsai_N = mkN "bonsaï" masculine;
 bonus_N = mkN "boni" masculine;
 bony_A = mkA "osseux";
 boo_V2 = mkV2 (mkV "huer");
@@ -2557,7 +2559,7 @@ booth_N = mkN "cabine" feminine | mkN "stand" masculine;
 bootleg_A = mkA "non-officiel";
 bootlegger_N = mkN "bootlegger";
 bootmaker_N = mkN "bottier" masculine;
-bootstrap_N = mkN "languette" | mkN "amorçage";
+bootstrap_N = mkN "languette" | mkN "amorçage";
 booty_N = mkN "dépouille" feminine | mkN "fesses";
 boracic_A = mkA "fauché";
 borate_N = mkN "borate" masculine;
@@ -2575,14 +2577,14 @@ boron_N = mkN "bore" masculine;
 borough_N = mkN "arrondissement" masculine;
 borrow_V2 = mkV2 (mkV "emprunter") | mkV2 (mkV I.retenir_V2);
 borrower_N = mkN "emprunteur" masculine;
-borzoi_N = mkN "barzoï" masculine;
+borzoi_N = mkN "barzoï" masculine;
 bosom_N = mkN "sein" masculine;
 boson_N = mkN "boson" masculine;
 botanical_A = mkA "botanique";
 botany_N = mkN "botanique" feminine;
-botch_V2 = mkV2 (mkV "saccager") | mkV2 (mkV "bâcler");
+botch_V2 = mkV2 (mkV "saccager") | mkV2 (mkV "bâcler");
 botfly_N = mkN "oestre" masculine;
-bother_V2V = mkV2V (mkV "embêter") | mkV2V (mkV "bâdrer");
+bother_V2V = mkV2V (mkV "embêter") | mkV2V (mkV "bâdrer");
 bottle_N = mkN "bouteille" feminine | mkN "biberon" masculine | mkN "culot" masculine;
 bottle_V2 = mkV2 (mkV "embouteiller");
 bottleneck_N = mkN "goulot" masculine;
@@ -2636,7 +2638,7 @@ bracelet_N = mkN "bracelet" masculine;
 brachial_A = mkA "brachial";
 bracken_N = mkN "ptéridium" masculine;
 bracket_N = mkN "parenthèse" feminine | mkN "crochet" masculine;
-brackish_A = mkA "saumâtre";
+brackish_A = mkA "saumâtre";
 bract_N = mkN "bractée" feminine;
 bradycardia_N = mkN "bradycardie" feminine;
 brag_N = mkN "brag" masculine;
@@ -2649,7 +2651,7 @@ braid_V2 = mkV2 (mkV "tresser");
 braille_N = mkN "braille" masculine;
 brain_N = mkN "cerveau" masculine;
 brainchild_N = mkN "création" feminine;
-brain_teaser_N = mkN "casse-tête" masculine;
+brain_teaser_N = mkN "casse-tête" masculine;
 brainwash_V2 = mkV2 (mkV "décerveler");
 braise_V2 = mkV2 (mkV "braiser");
 brake_N = mkN "frein" masculine;
@@ -2699,7 +2701,7 @@ breech_N = mkN "culotte" feminine;
 breeches_N = mkN "culotte" feminine;
 breed_N = mkN "race" feminine;
 breed_V2 = mkV2 (reflV (mkV I.reproduire_V2));
-breeze_N = mkN "gâteau" masculine | mkN "brise" feminine;
+breeze_N = mkN "gâteau" masculine | mkN "brise" feminine;
 breezy_A = mkA "aéré";
 brethren_N = mkN "confrères";
 breviary_N = mkN "bréviaire" masculine;
@@ -2711,7 +2713,7 @@ briar_N = mkN "églantier" masculine | mkN "bruyère" feminine;
 bribe_N = mkN "pot-de-vin" masculine;
 bribery_N = mkN "corruption" feminine;
 brick_N = mkN "brique";
-bricklayer_N = mkN "maçon" masculine;
+bricklayer_N = mkN "maçon" masculine;
 brickyard_N = mkN "briqueterie";
 bridge_N = mkN "pont" masculine | mkN "bridge" masculine | mkN "pont" | mkN "passerelle" feminine | mkN "chevalet" masculine;
 bridle_N = mkN "bride";
@@ -2744,7 +2746,7 @@ broadcast_N = mkN "émission" feminine;
 broadcast_V2 = mkV2 (mkV "diffuser");
 broadcasting_N = mkN "radiodiffusion" feminine;
 broaden_V2 = mkV2 (reflV (mkV "élargir"));
-broadsword_N = mkN "estramaçon" masculine;
+broadsword_N = mkN "estramaçon" masculine;
 brocade_N = mkN "brocart" masculine;
 broccoli_N = mkN "brocoli" masculine;
 brochure_N = mkN "brochure" feminine;
@@ -2756,14 +2758,14 @@ bromine_N = mkN "brome" masculine;
 bromoform_N = mkN "bromoforme" masculine;
 bronchitis_N = mkN "bronchite" feminine;
 bronchus_N = mkN "bronche";
-bronze_A = mkA "hâlé";
+bronze_A = mkA "hâlé";
 bronze_N = mkN "bronze" masculine | mkN "bronze";
 brooch_N = mkN "broche" feminine;
 brood_N = mkN "couvée" feminine;
 brood_V = mkV (reflV (mkV I.morfondre_V)) | mkV (mkV "couver");
 brook_N = mkN "ruisseau" masculine;
 brooklet_N = mkN "ruisselet" masculine;
-broom_N = mkN "balai" masculine | mkN "genêt" masculine;
+broom_N = mkN "balai" masculine | mkN "genêt" masculine;
 broth_N = mkN "bouillon" masculine;
 brothel_N = mkN "bordel" masculine;
 brother_N = mkN "frère" masculine | mkN "pair" masculine;
@@ -2774,7 +2776,7 @@ brow_N = mkN "front" | mkN "sourcil";
 browbeat_V2 = mkV2 (mkV "intimider");
 brown_N = mkN "marron";
 brown_V2 = mkV2 (mkV "brunir");
-brownish_A = mkA "brunâtre";
+brownish_A = mkA "brunâtre";
 browse_V = mkV (mkV "brouter") | mkV (mkV "naviguer") | mkV (mkV "feuilleter");
 brucellosis_N = mkN "brucellose" feminine;
 bruise_N = mkN "bleu" masculine;
@@ -2832,7 +2834,7 @@ bulimic_N = mkN "boulimique";
 bulk_N = mkN "masse" | mkN "vrac" masculine;
 bulkhead_N = mkN "cloison" feminine;
 bulky_A = mkA "gros";
-bull_N = mkN "mâle" masculine | mkN "taureau" masculine | mkN "bulle" feminine | mkN "bêtises" | mkN "sceau" masculine | mkN "vaches";
+bull_N = mkN "mâle" masculine | mkN "taureau" masculine | mkN "bulle" feminine | mkN "bêtises" | mkN "sceau" masculine | mkN "vaches";
 bulldog_N = mkN "bouledogue" masculine;
 bulldozer_N = mkN "bulldozer" masculine;
 bullet_N = mkN "balle" feminine | mkN "puce" masculine;
@@ -2889,9 +2891,9 @@ burl_N = mkN "loupe" feminine;
 burlesque_A = mkA "burlesque";
 burlesque_N = mkN "parodie";
 burly_A = mkA "fort";
-burn_N = mkN "brûlure" feminine;
-burn_V2 = mkV2 (mkV "brûler") | mkV2 (mkV "graver");
-burner_N = mkN "brûleur" masculine | mkN "graveur" masculine;
+burn_N = mkN "brûlure" feminine;
+burn_V2 = mkV2 (mkV "brûler") | mkV2 (mkV "graver");
+burner_N = mkN "brûleur" masculine | mkN "graveur" masculine;
 burp_N = mkN "rot" masculine;
 burp_V2 = mkV2 (mkV "roter");
 burr_N = mkN "barbe" feminine | mkN "bardane" feminine;
@@ -2949,7 +2951,7 @@ cabaret_N = mkN "cabaret" masculine;
 cabbage_N = mkN "chou" masculine;
 cabin_N = mkN "cabine" feminine | mkN "cabane" feminine;
 cabinet_N = mkN "cabinet" masculine | mkN "armoire" feminine;
-cable_N = mkN "câble" masculine;
+cable_N = mkN "câble" masculine;
 cacao_N = mkN "cacaoyer" masculine;
 cackle_N = mkN "caquet" masculine | mkN "ricanement" masculine;
 cackle_V = mkV (mkV "caqueter");
@@ -2966,8 +2968,8 @@ cafeteria_N = mkN "caféteria" feminine | mkN "cafétéria" feminine;
 caffeine_N = mkN "caféine" feminine;
 cage_N = mkN "cage" feminine;
 cage_V2 = mkV2 (mkV "encager");
-caiman_N = mkN "caïman" masculine;
-cake_N = mkN "gâteau";
+caiman_N = mkN "caïman" masculine;
+cake_N = mkN "gâteau";
 calabash_N = mkN "calebasse" feminine;
 calamitous_A = mkA "calamiteux";
 calamity_N = mkN "calamité" feminine;
@@ -3017,7 +3019,7 @@ camcorder_N = mkN "caméscope" masculine;
 camel_N = mkN "chameau" masculine;
 camellia_N = mkN "camélia" masculine;
 camembert_N = mkN "camembert" masculine;
-cameo_N = mkN "camaïeu" masculine;
+cameo_N = mkN "camaïeu" masculine;
 cameraman_N = mkN "caméraman" masculine;
 camomile_N = mkN "camomille" feminine;
 camouflage_N = mkN "camouflage" masculine | mkN "camouflage" | mkN "déguisement" masculine;
@@ -3051,7 +3053,7 @@ candor_N = mkN "candeur" feminine;
 candy_N = mkN "bonbon" masculine;
 candy_V2 = mkV2 (mkV "candir");
 cane_N = mkN "canne" feminine | mkN "canne" | mkN "bastonnade";
-cane_V2 = mkV2 (mkV "bâtonner");
+cane_V2 = mkV2 (mkV "bâtonner");
 cannabis_N = mkN "cannabis" masculine;
 cannibal_N = mkN "cannibale";
 cannibalism_N = mkN "cannibalisme" masculine;
@@ -3059,7 +3061,7 @@ cannibalistic_A = mkA "cannibale";
 cannon_N = mkN "canon" masculine;
 cannonade_N = mkN "canonnade" feminine;
 canny_A = mkA "prudent";
-canoe_N = mkN "canoë" masculine;
+canoe_N = mkN "canoë" masculine;
 canoeist_N = mkN "canoéiste";
 canon_N = mkN "canon" masculine | mkN "chanoine" masculine;
 canonization_N = mkN "canonisation" feminine;
@@ -3128,7 +3130,7 @@ cardigan_N = mkN "cardigan" masculine;
 cardinal_A = mkA "cardinal";
 cardinal_N = mkN "cardinal" masculine | mkN "cardinal";
 cardinality_N = mkN "cardinalité" feminine;
-cardioid_N = mkN "cardioïde" feminine;
+cardioid_N = mkN "cardioïde" feminine;
 cardiologistMasc_N = mkN "cardiologue";
 cardiologistFem_N = mkN "cardiologue";
 cardiology_N = mkN "cardiologie" feminine;
@@ -3164,7 +3166,7 @@ carnivore_N = mkN "carnivore" masculine;
 carnivorous_A = mkA "carnivore";
 carob_N = mkN "caroube" feminine | mkN "caroubier" masculine;
 carol_N = mkN "carole" feminine | mkN "choeur" masculine;
-carotenoid_N = mkN "caroténoïde";
+carotenoid_N = mkN "caroténoïde";
 carp_N = mkN "carpe" feminine;
 carp_V2 = mkV2 (mkV "maugréer");
 carpal_N = mkN "carpien";
@@ -3207,16 +3209,16 @@ casserole_N = mkN "timbale" feminine | mkN "cocotte" feminine;
 cassette_N = mkN "cassette" feminine;
 cassock_N = mkN "soutane" feminine;
 cassowary_N = mkN "casoar" masculine;
-cast_N = mkN "plâtre";
+cast_N = mkN "plâtre";
 cast_V2 = mkV2 (mkV "jeter") | mkV2 (mkV "sonder") | mkV2 (mkV "couler");
 castaway_N = mkN "naufragé";
 caste_N = mkN "caste" feminine;
 caster_N = mkN "roulette" feminine;
-castigate_V2 = mkV2 (mkV "châtier") | mkV2 (mkV "réviser");
+castigate_V2 = mkV2 (mkV "châtier") | mkV2 (mkV "réviser");
 casting_N = mkN "moulage" | mkN "audition";
-castle_N = mkN "château" masculine;
+castle_N = mkN "château" masculine;
 castle_V = mkV (mkV "roquer");
-castrate_V2 = mkV2 (mkV "châtrer");
+castrate_V2 = mkV2 (mkV "châtrer");
 castration_N = mkN "castration" feminine;
 castrato_N = mkN "castrat" masculine;
 casual_A = mkA "occasionnel";
@@ -3300,7 +3302,7 @@ cease_V2V = mkV2V (mkV "cesser");
 cedar_N = mkN "cèdre" | mkN "cèdre" masculine;
 cede_V2 = mkV2 (mkV "céder");
 cedilla_N = mkN "cédille" feminine;
-celebrate_V2 = mkV2 (mkV "fêter") | mkV2 (mkV "célébrer");
+celebrate_V2 = mkV2 (mkV "fêter") | mkV2 (mkV "célébrer");
 celebrated_A = mkA "célèbre";
 celebration_N = mkN "célébration" feminine;
 celebrity_N = mkN "célébrité" feminine;
@@ -3317,7 +3319,7 @@ cellistFem_N = mkN "celliste" feminine;
 cello_N = mkN "violoncelle" masculine;
 cellophane_N = mkN "cellophane" feminine;
 cellular_A = mkA "cellulaire";
-celluloid_N = mkN "ducinéma" masculine | mkN "celluloïd" masculine;
+celluloid_N = mkN "ducinéma" masculine | mkN "celluloïd" masculine;
 cellulose_N = mkN "cellulose" feminine;
 cement_N = mkN "colle" feminine | mkN "ciment" | mkN "ciment" masculine;
 cement_V2 = mkV2 (mkV "cimenter");
@@ -3443,10 +3445,10 @@ chase_N = mkN "poursuite" feminine;
 chase_V2 = mkV2 (mkV I.poursuivre_V2);
 chaser_N = mkN "pousse-café" masculine | mkN "poursuivant" masculine;
 chasm_N = mkN "fossé" masculine;
-chassis_N = mkN "châssis" masculine;
+chassis_N = mkN "châssis" masculine;
 chaste_A = mkA "chaste";
-chastise_V2 = mkV2 (mkV "châtier");
-chastisement_N = mkN "châtiment" masculine;
+chastise_V2 = mkV2 (mkV "châtier");
+chastisement_N = mkN "châtiment" masculine;
 chastity_N = mkN "chasteté" feminine;
 chasuble_N = mkN "chasuble" feminine;
 chat_V2 = mkV2 (mkV "discuter") | mkV2 (mkV "jaser");
@@ -3491,8 +3493,8 @@ chess_N = mkN "échecs";
 chessboard_N = mkN "échiquier" masculine;
 chest_N = mkN "coffre" masculine | mkN "poitrine" feminine;
 chestnut_A = mkA "marron";
-chestnut_N = mkN "châtaigne" feminine | mkN "marron" masculine | mkN "châtaigner" masculine;
-chew_V2 = mkV2 (mkV "mâcher");
+chestnut_N = mkN "châtaigne" feminine | mkN "marron" masculine | mkN "châtaigner" masculine;
+chew_V2 = mkV2 (mkV "mâcher");
 chi_N = mkN "chi" masculine;
 chiaroscuro_N = mkN "clair-obscur" masculine;
 chiasmus_N = mkN "chiasme" masculine;
@@ -3577,7 +3579,7 @@ chorister_N = mkN "choeureur" masculine;
 chortle_N = mkN "gloussement" masculine;
 chortle_V = mkV (mkV "glousser");
 chorus_N = mkN "choeur" masculine | mkN "refrain" masculine;
-chrism_N = mkN "chrême" masculine;
+chrism_N = mkN "chrême" masculine;
 christen_V2 = mkV2 (mkV "baptiser");
 chromatic_A = mkA "chromatique";
 chromium_N = mkN "chrome" masculine;
@@ -3728,8 +3730,8 @@ clementine_N = mkN "clémentine" feminine;
 clench_V2 = mkV2 (mkV "serrer");
 clerestory_N = mkN "clair-étage" masculine;
 clergy_N = mkN "clergé" masculine;
-clergyman_N = mkN "prêtre" masculine;
-cleric_N = mkN "prêtre" masculine;
+clergyman_N = mkN "prêtre" masculine;
+cleric_N = mkN "prêtre" masculine;
 clerical_A = mkA "clérical";
 clerk_N = mkN "greffier" masculine;
 clevis_N = mkN "chape";
@@ -3776,15 +3778,15 @@ clot_N = mkN "imbecile" masculine | mkN "caillot" masculine;
 clot_V2 = mkV2 (mkV "coaguler");
 cloth_N = mkN "tenue" feminine | mkN "tissu" masculine;
 clotheshorse_N = mkN "étendoir" masculine;
-clothing_N = mkN "vêtements";
+clothing_N = mkN "vêtements";
 cloudburst_N = mkN "averse" feminine;
 cloud_cuckoo_land_N = mkN "Coucouville-les-Nuées";
 cloudy_A = mkA "nuageux" | mkA "trouble" | mkA "brumeux";
 clove_N = mkN "gousse";
 clover_N = mkN "trèfle" masculine;
 clown_N = mkN "clown" masculine | mkN "bouffon" masculine;
-club_N = mkN "club" masculine | mkN "club" | mkN "bâton" masculine | mkN "boîte" feminine | mkN "trèfle" masculine;
-club_V2 = mkV2 (mkV "bâtonner");
+club_N = mkN "club" masculine | mkN "club" | mkN "bâton" masculine | mkN "boîte" feminine | mkN "trèfle" masculine;
+club_V2 = mkV2 (mkV "bâtonner");
 cluck_N = mkN "gloussement";
 cluck_V = mkV (mkV "glousser");
 clue_N = mkN "indice" feminine | mkN "preuve" feminine;
@@ -3794,7 +3796,7 @@ clumsy_A = mkA "gauche";
 cluster_N = mkN "groupe";
 clutch_N = mkN "embrayage" | mkN "nichée" feminine;
 clutch_V2 = mkV2 (mkV "agripper");
-clutter_N = mkN "bric-à-brac" masculine;
+clutter_N = mkN "bric-à-brac" masculine;
 coach_N = mkN "coche" masculine | mkN "voiture" feminine | mkN "entraîneur" masculine;
 coach_V2 = mkV2 (mkV "entraîner");
 coachman_N = mkN "cocher" masculine;
@@ -3821,13 +3823,13 @@ cobbler_N = mkN "cordonnier" masculine;
 cobblestone_N = mkN "pavé";
 cobra_N = mkN "naja";
 coca_N = mkN "coca";
-cocaine_N = mkN "cocaïne" feminine;
+cocaine_N = mkN "cocaïne" feminine;
 coccygeal_A = mkA "coccygien";
 coccyx_N = mkN "coccyx" masculine;
 cochineal_N = mkN "cochenille" feminine;
 cochlea_N = mkN "cochlée" feminine;
 cochlear_A = mkA "cochléaire";
-cock_N = mkN "mâle" masculine | mkN "coq" masculine | mkN "bite" feminine;
+cock_N = mkN "mâle" masculine | mkN "coq" masculine | mkN "bite" feminine;
 cock_V2 = mkV2 (mkV "baiser");
 cockade_N = mkN "cocarde" feminine;
 cockatoo_N = mkN "cacatoès" masculine;
@@ -3880,16 +3882,16 @@ coil_N = mkN "bobine" feminine | mkN "stérilet" masculine | mkN "spire" feminin
 coil_V2 = mkV2 (mkV "enrouler");
 coin_N = mkN "jeton" masculine | mkN "monnaie" feminine;
 coin_V2 = mkV2 (mkV "inventer");
-coincide_V = mkV (mkV "coïncider");
-coincidence_N = mkN "coïncidence" feminine;
+coincide_V = mkV (mkV "coïncider");
+coincidence_N = mkN "coïncidence" feminine;
 coinsurance_N = mkN "franchise" feminine;
-coitus_N = mkN "coït" masculine;
+coitus_N = mkN "coït" masculine;
 coke_N = mkN "charbon" | mkN "coca" masculine | mkN "coke" feminine;
 cola_N = mkN "coca" masculine;
 colander_N = mkN "passoire" feminine;
 colchicine_N = mkN "colchicine" feminine;
 cold_N = mkN "rhume" masculine | mkN "froid" masculine;
-cold_blooded_A = mkA "poïkilotherme";
+cold_blooded_A = mkA "poïkilotherme";
 coldness_N = mkN "froideur" feminine | mkN "froid" masculine;
 coleslaw_N = mkN "coleslaw" masculine;
 colic_N = mkN "colique" feminine;
@@ -3940,7 +3942,7 @@ colter_N = mkN "coutre" masculine;
 columbine_N = mkN "ancolie" feminine;
 column_N = mkN "colonne" feminine | mkN "colonne";
 coma_N = mkN "chevelure" feminine | mkN "coma" masculine;
-comb_N = mkN "crête" feminine | mkN "peigne" masculine;
+comb_N = mkN "crête" feminine | mkN "peigne" masculine;
 comb_V2 = mkV2 (mkV "peigner");
 combat_N = mkN "combat" masculine;
 combat_V2 = mkV2 (mkV I.combattre_V2);
@@ -4312,7 +4314,7 @@ contest_N = mkN "concours" masculine;
 contestable_A = mkA "contestable";
 context_N = mkN "contexte" masculine;
 contextual_A = mkA "contextuel";
-contiguity_N = mkN "contiguïté" feminine;
+contiguity_N = mkN "contiguïté" feminine;
 contiguous_A = mkA "contigu";
 continent_N = mkN "continent" masculine;
 continental_A = mkA "continental";
@@ -4414,7 +4416,7 @@ copra_N = mkN "coprah" masculine;
 coproduction_N = mkN "coproduction" feminine;
 copse_N = mkN "taillis" masculine;
 copula_N = mkN "copule" feminine;
-copulate_V = mkV (mkV "coïter");
+copulate_V = mkV (mkV "coïter");
 copy_N = mkN "copie" feminine;
 copy_V2 = mkV2 (mkV "imiter") | mkV2 (mkV "copier") | mkV2 (mkV I.recevoir_V2);
 copycat_N = mkN "copycat" masculine;
@@ -4493,9 +4495,9 @@ cosmology_N = mkN "cosmologie" feminine;
 cosmonaut_N = mkN "cosmonaute" masculine;
 cosmopolitan_A = mkA "cosmopolite";
 cosmos_N = mkN "cosmos" masculine;
-cost_N = mkN "coût" masculine;
-cost_V2 = mkV2 (mkV "coûter");
-costly_A = mkA "coûteux";
+cost_N = mkN "coût" masculine;
+cost_V2 = mkV2 (mkV "coûter");
+costly_A = mkA "coûteux";
 costume_N = mkN "costume" masculine;
 costumier_N = mkN "costumier" masculine;
 cosy_A = mkA "douillet";
@@ -4525,7 +4527,7 @@ countercurrent_N = mkN "contre-courant" masculine;
 counterespionage_N = mkN "contre-espionnage" masculine;
 counterexample_N = mkN "contrexemple" masculine;
 counterfeit_A = mkA "contrefait";
-counterfeit_N = mkN "contrefaçon";
+counterfeit_N = mkN "contrefaçon";
 counterfeit_V2 = mkV2 (mkV I.contrefaire_V2);
 counterfeiter_N = mkN "faux-monnayeur" masculine;
 counterintelligence_N = mkN "contre-espionnage" masculine;
@@ -4572,8 +4574,8 @@ covet_V2 = mkV2 (mkV "convoiter");
 covetousness_N = mkN "convoitise" feminine;
 covey_N = mkN "mec" masculine;
 coward_N = mkN "couard" masculine;
-cowardice_N = mkN "lâcheté" feminine;
-cowardly_A = mkA "lâche";
+cowardice_N = mkN "lâcheté" feminine;
+cowardly_A = mkA "lâche";
 cowboy_N = mkN "cow-boy";
 cower_V = mkV (reflV (mkV "recroqueviller"));
 cowgirl_N = mkN "vachère" feminine;
@@ -4595,11 +4597,11 @@ cradle_N = mkN "berceau" masculine;
 cradle_V2 = mkV2 (mkV "bercer");
 craftsman_N = mkN "artisan" masculine;
 crafty_A = mkA "rusé";
-cram_V2 = mkV2 (reflV (mkV "gaver")) | mkV2 (mkV "gaver") | mkV2 (mkV "bâcler") | mkV2 (mkV "bourrer") | mkV2 (mkV "bachoter") | mkV2 (mkV "bûcher");
+cram_V2 = mkV2 (reflV (mkV "gaver")) | mkV2 (mkV "gaver") | mkV2 (mkV "bâcler") | mkV2 (mkV "bourrer") | mkV2 (mkV "bachoter") | mkV2 (mkV "bûcher");
 cramp_N = mkN "crampe" feminine;
 cranberry_N = mkN "canneberge" feminine;
 crane_N = mkN "grue" feminine;
-cranial_A = mkA "crânien";
+cranial_A = mkA "crânien";
 crank_N = mkN "manivelle" feminine;
 crankshaft_N = mkN "vilebrequin";
 crap_N = mkN "crotte" feminine;
@@ -4645,11 +4647,11 @@ crematorium_N = mkN "crématorium" masculine;
 crenel_N = mkN "créneau" masculine;
 creole_N = mkN "créole" masculine;
 creosote_N = mkN "créosote" masculine;
-crepe_N = mkN "crêpe" feminine;
+crepe_N = mkN "crêpe" feminine;
 crepuscular_A = mkA "crépusculaire";
 crescent_N = mkN "croissant";
 cress_N = mkN "cresson" masculine;
-crest_N = mkN "crête" feminine | mkN "huppe";
+crest_N = mkN "crête" feminine | mkN "huppe";
 cretin_N = mkN "crétin" masculine;
 crevasse_N = mkN "crevasse" feminine;
 crevice_N = mkN "fissure";
@@ -4690,7 +4692,7 @@ crop_V2 = mkV2 (mkV "découper");
 croquet_N = mkN "croquet" masculine;
 croquette_N = mkN "croquette";
 crosier_N = mkN "crosse" feminine;
-cross_A = mkA "fâché" | mkA "contraire" | mkA "transversal";
+cross_A = mkA "fâché" | mkA "contraire" | mkA "transversal";
 cross_N = mkN "croix" | mkN "croix" feminine;
 cross_V2 = mkV2 (mkV "contrecarrer") | mkV2 (mkV "traverser") | mkV2 (mkV "croiser");
 crossbill_N = mkN "bec-croisé" masculine;
@@ -4733,7 +4735,7 @@ crusade_N = mkN "croisade" feminine;
 crusader_N = mkN "croisé" masculine;
 crush_N = mkN "barricade" feminine | mkN "béguin";
 crush_V2 = mkV2 (reflV (mkV "écraser")) | mkV2 (mkV "écraser") | mkV2 (mkV "concasser");
-crust_N = mkN "croûte" feminine;
+crust_N = mkN "croûte" feminine;
 crustacean_N = mkN "crustacé" masculine;
 crutch_N = mkN "béquille" | mkN "soutient" masculine;
 cry_N = mkN "pleur" masculine | mkN "cri" masculine;
@@ -4758,8 +4760,8 @@ cuckold_N = mkN "cocu" masculine;
 cuckold_V2 = mkV2 (mkV "cocufier");
 cuckoo_N = mkN "coucou" masculine;
 cucumber_N = mkN "concombre" masculine;
-cuddle_N = mkN "câlin" masculine;
-cuddle_V2 = mkV2 (mkV "cajoler") | mkV2 (mkV "câliner");
+cuddle_N = mkN "câlin" masculine;
+cuddle_V2 = mkV2 (mkV "cajoler") | mkV2 (mkV "câliner");
 cuddly_A = mkA "calin";
 cue_N = mkN "diriger";
 cuff_N = mkN "manchette" feminine;
@@ -4850,8 +4852,8 @@ cyclamen_N = mkN "cyclamen" masculine;
 cycle_N = mkN "tour" masculine | mkN "cycle" masculine;
 cycling_N = mkN "cyclisme";
 cyclist_N = mkN "cycliste";
-cycloid_A = mkA "cycloïde" | mkA "cycloïdal";
-cycloid_N = mkN "cycloïde" feminine;
+cycloid_A = mkA "cycloïde" | mkA "cycloïdal";
+cycloid_N = mkN "cycloïde" feminine;
 cyclone_N = mkN "cyclone" masculine;
 cyclopropane_N = mkN "cyclopropane" masculine;
 cyclops_N = mkN "cyclope" masculine;
@@ -4898,11 +4900,11 @@ daily_N = mkN "quotidien" masculine;
 dainty_A = mkA "délicat";
 dairy_N = mkN "laiterie" feminine | mkN "laiterie" | mkN "laitages" | mkN "crémerie";
 dais_N = mkN "estrade";
-daisy_N = mkN "marguerite" feminine | mkN "pâquerette" feminine;
+daisy_N = mkN "marguerite" feminine | mkN "pâquerette" feminine;
 dale_N = mkN "combe" feminine;
 dalliance_N = mkN "baguenaudage" | mkN "flirt";
 dam_N = mkN "barrage" masculine;
-damage_N = mkN "dégât" masculine;
+damage_N = mkN "dégât" masculine;
 damage_V2 = mkV2 (mkV "endommager");
 damask_A = mkA "lie-de-vin";
 damask_N = mkN "lie-de-vin" | mkN "damas";
@@ -4941,13 +4943,13 @@ darmstadtium_N = mkN "darmstadtium" masculine;
 darn_V2 = mkV2 (mkV "repriser");
 dart_N = mkN "dard" masculine | mkN "fléchettes";
 darts_N = mkN "fléchettes";
-dash_N = mkN "tiret" masculine | mkN "trait" masculine | mkN "sprint" masculine | mkN "soupçon" masculine;
+dash_N = mkN "tiret" masculine | mkN "trait" masculine | mkN "sprint" masculine | mkN "soupçon" masculine;
 dash_V2 = mkV2 (reflV (mkV "précipiter"));
 data_N = mkN "données" | mkN "donnée" feminine;
 date_V2 = mkV2 (mkV "vieillir") | mkV2 (mkV "dater");
 dative_A = mkA "datif";
 dative_N = mkN "datif" masculine;
-daub_N = mkN "croûte" feminine;
+daub_N = mkN "croûte" feminine;
 daub_V2 = mkV2 (mkV "barbouiller");
 daughter_N = mkN "fille" feminine;
 daughter_in_law_N = mkN "bru" feminine;
@@ -4956,8 +4958,8 @@ daunting_A = mkA "décourageant" | mkA "colossal";
 dauphin_N = mkN "dauphin" masculine;
 dawn_N = mkN "aube" feminine;
 dawn_V = mkV (reflV (mkV "lever")) | mkV (mkV I.naître_V);
-daydream_N = mkN "rêverie" feminine;
-daydream_V = mkV (mkV "rêvasser");
+daydream_N = mkN "rêverie" feminine;
+daydream_V = mkV (mkV "rêvasser");
 daylight_N = mkN "jour" masculine;
 daytime_N = mkN "journée" feminine;
 daze_N = mkN "stupéfaction";
@@ -4985,8 +4987,8 @@ dearness_N = mkN "cherté";
 dearth_N = mkN "disette" feminine | mkN "pénurie" feminine;
 death_N = mkN "mort" feminine;
 deathblow_N = mkN "coup";
-debacle_N = mkN "débâcle" feminine | mkN "fiasco" masculine;
-debase_V2 = mkV2 (mkV "abâtardir");
+debacle_N = mkN "débâcle" feminine | mkN "fiasco" masculine;
+debase_V2 = mkV2 (mkV "abâtardir");
 debatable_A = mkA "discutable";
 debate_N = mkN "débat" masculine | mkN "discussion" feminine;
 debate_V2 = mkV2 (mkV I.débattre_V2);
@@ -5345,7 +5347,7 @@ detectable_A = mkA "détectable";
 detective_N = mkN "détective" masculine | mkN "détective";
 detector_N = mkN "détecteur" masculine;
 detention_N = mkN "détention" feminine;
-deter_V2 = mkV2 (mkV "empêcher") | mkV2 (mkV "dissuader");
+deter_V2 = mkV2 (mkV "empêcher") | mkV2 (mkV "dissuader");
 detergent_A = mkA "détergent";
 detergent_N = mkN "détergent" masculine;
 deteriorate_V2 = mkV2 (mkV "détériorer");
@@ -5484,7 +5486,7 @@ diligent_A = mkA "industrieux";
 dill_N = mkN "aneth" masculine;
 dilute_A = mkA "dilué" | mkA "faible";
 dilute_V2 = mkV2 (mkV "diluer");
-dim_A = mkA "tamisé" | mkA "flou" | mkA "bête";
+dim_A = mkA "tamisé" | mkA "flou" | mkA "bête";
 dimension_N = mkN "dimension" feminine;
 dimensional_A = mkA "dimensionnel";
 diminish_V2 = mkV2 (mkV I.réduire_V2) | mkV2 (mkV "rétrécir") | mkV2 (mkV "diminuer") | mkV2 (mkV "amincir");
@@ -5509,8 +5511,8 @@ dioxide_N = mkN "dioxyde" masculine;
 dip_V2 = mkV2 (mkV "tremper");
 diphtheria_N = mkN "diphthérie" feminine;
 diphthong_N = mkN "diphtongue" feminine;
-diploid_A = mkA "diploïde";
-diploidy_N = mkN "diploïdie" feminine;
+diploid_A = mkA "diploïde";
+diploidy_N = mkN "diploïdie" feminine;
 diploma_N = mkN "diplôme" masculine;
 diplomacy_N = mkN "diplomatie";
 diplomat_N = mkN "diplomate" masculine;
@@ -5531,7 +5533,7 @@ disabuse_V2 = mkV2 (mkV "détromper");
 disaccharide_N = mkN "disaccharide" masculine;
 disaffected_A = mkA "rebelle";
 disagreement_N = mkN "désaccord" masculine;
-disambiguation_N = mkN "désambiguïsation";
+disambiguation_N = mkN "désambiguïsation";
 disappear_V = mkV (mkV I.disparaître_V2);
 disappearance_N = mkN "disparition" feminine;
 disappoint_V2 = mkV2 (mkV I.décevoir_V2);
@@ -5554,7 +5556,7 @@ discipline_N = mkN "discipline" | mkN "discipline" feminine;
 disclose_V2 = mkV2 (mkV "révéler");
 disclosure_N = mkN "révélation" feminine;
 discography_N = mkN "discographie" feminine;
-discoid_A = mkA "discoïde";
+discoid_A = mkA "discoïde";
 discoloration_N = mkN "décoloration" feminine;
 discomfit_V2 = mkV2 (mkV I.déconfire_V2);
 discomfort_N = mkN "incomfort" masculine;
@@ -5597,14 +5599,14 @@ disgruntled_A = mkA "mécontent" | mkA "malheureux";
 disgruntlement_N = mkN "insatisfaction" feminine;
 disguise_N = mkN "déguisement" masculine;
 disguise_V2 = mkV2 (mkV "déguiser");
-disgust_N = mkN "dégoût" masculine;
-disgust_V2 = mkV2 (mkV "dégoûter");
-disgusting_A = mkA "dégoûtant";
+disgust_N = mkN "dégoût" masculine;
+disgust_V2 = mkV2 (mkV "dégoûter");
+disgusting_A = mkA "dégoûtant";
 dish_N = mkN "plat" masculine | mkN "assiette" | mkN "canon" masculine | mkN "vaisselle" feminine | mkN "parabole" feminine;
 disharmonious_A = mkA "dysharmonique";
 dishcloth_N = mkN "torchon" masculine | mkN "lavette" feminine;
 dishearten_V2 = mkV2 (mkV "décourager");
-dishonest_A = mkA "malhonnête";
+dishonest_A = mkA "malhonnête";
 dishonour_N = mkN "déshonneur" masculine;
 dishonour_V2 = mkV2 (mkV "déshonneur");
 dishwasher_N = mkN "lave-vaisselle" masculine | mkN "plongeur" masculine;
@@ -5614,7 +5616,7 @@ disinfection_N = mkN "désinfection" feminine;
 disinformation_N = mkN "désinformation" feminine;
 disingenuous_A = mkA "sournois";
 disintegrate_V2 = mkV2 (mkV "désintégrer");
-disinterest_N = mkN "désintérêt" masculine;
+disinterest_N = mkN "désintérêt" masculine;
 disinterested_A = mkA "désintéressé";
 disinterestedness_N = mkN "désintéressement";
 disjunction_N = mkN "disjonction" feminine;
@@ -5764,7 +5766,7 @@ documentation_N = mkN "documentation" feminine;
 dodecagon_N = mkN "dodécagone" masculine;
 dodecahedron_N = mkN "dodécaèdre" masculine;
 dodge_V2 = mkV2 (mkV "éviter") | mkV2 (mkV "esquiver");
-dodgy_A = mkA "perverti" | mkA "malhonnête" | mkA "louche" | mkA "périlleux";
+dodgy_A = mkA "perverti" | mkA "malhonnête" | mkA "louche" | mkA "périlleux";
 dodo_N = mkN "dodo" masculine | mkN "fossile" masculine;
 doe_N = mkN "biche" feminine | mkN "daine" feminine | mkN "hase" feminine | mkN "lapine" feminine;
 doge_N = mkN "doge" masculine;
@@ -5797,7 +5799,7 @@ don_V2 = mkV2 (mkV I.mettre_V2);
 donate_V2 = mkV2 (mkV "donner");
 donation_N = mkN "donation" feminine;
 dongle_N = mkN "dongle" masculine;
-donkey_N = mkN "âne" masculine;
+donkey_N = mkN "âne" masculine;
 donor_N = mkN "donateur";
 doodle_V = mkV (mkV "griffonner");
 doom_N = mkN "mort" feminine | mkN "ruine" feminine;
@@ -5809,7 +5811,7 @@ doorknocker_N = mkN "heurtoir" masculine;
 doorman_N = mkN "portier" masculine;
 doormat_N = mkN "paillasson" masculine | mkN "carpette" feminine;
 doorstep_N = mkN "seuil" masculine;
-door_to_door_A = mkA "porte-à-porte";
+door_to_door_A = mkA "porte-à-porte";
 dopamine_N = mkN "dopamine" feminine;
 dope_N = mkN "éponge" feminine | mkN "vernis" masculine | mkN "dope" feminine | mkN "idiot" masculine | mkN "infos" | mkN "patine" feminine;
 doppelganger_N = mkN "sosie";
@@ -5829,7 +5831,7 @@ doubt_N = mkN "doute" masculine;
 doubt_V2 = mkV2 (mkV "douter");
 doubtful_A = mkA "douteux";
 douche_N = mkN "douche" feminine;
-dough_N = mkN "pâte" feminine | mkN "fric" masculine;
+dough_N = mkN "pâte" feminine | mkN "fric" masculine;
 doughnut_N = mkN "beignet" masculine;
 dour_A = mkA "sévère" | mkA "morose" | mkA "rigide";
 douse_V2 = mkV2 (mkV "immerger");
@@ -5887,9 +5889,9 @@ drawing_N = mkN "pige" feminine | mkN "dessin" masculine;
 dread_N = mkN "crainte" feminine;
 dread_V2 = mkV2 (mkV "redouter");
 dreadful_A = mkA "affreux";
-dream_N = mkN "rêve" masculine;
-dream_V2 = mkV2 (mkV "rêver") | mkV2 (mkV "rêvasser");
-dreamer_N = mkN "rêveur" masculine;
+dream_N = mkN "rêve" masculine;
+dream_V2 = mkV2 (mkV "rêver") | mkV2 (mkV "rêvasser");
+dreamer_N = mkN "rêveur" masculine;
 dreamlike_A = mkA "onirique";
 dreary_A = mkA "terne";
 dreg_N = mkN "lie";
@@ -5906,11 +5908,11 @@ drift_N = mkN "dérive" feminine;
 drift_V2 = mkV2 (mkV "dévier") | mkV2 (mkV "errer") | mkV2 (mkV "dériver");
 drifter_N = mkN "vagabond" masculine;
 drill_N = mkN "coutil" masculine | mkN "chignole" feminine | mkN "exercice" masculine | mkN "drill" masculine | mkN "foreuse" feminine;
-drill_V2 = mkV2 (mkV "forer") | mkV2 (mkV "entraîner") | mkV2 (mkV "approfondir") | mkV2 (mkV "rabâcher") | mkV2 (reflV (mkV "entraîner"));
+drill_V2 = mkV2 (mkV "forer") | mkV2 (mkV "entraîner") | mkV2 (mkV "approfondir") | mkV2 (mkV "rabâcher") | mkV2 (reflV (mkV "entraîner"));
 drink_N = mkN "boire" | mkN "verre" masculine | mkN "boisson" feminine;
 drinkable_A = mkA "buvable" | mkA "potable";
 drinker_N = mkN "buveur" masculine;
-drip_N = mkN "goutte-à-goutte" masculine;
+drip_N = mkN "goutte-à-goutte" masculine;
 drip_V2 = mkV2 (mkV "goutter") | mkV2 (mkV "suinter");
 dripping_N = mkN "dégoulinade" feminine;
 drive_N = mkN "lecteur" masculine | mkN "pulsion" feminine;
@@ -5978,7 +5980,7 @@ duct_N = mkN "tuyau" masculine;
 ductile_A = mkA "ductile";
 ductility_N = mkN "ductilité" feminine;
 dude_N = mkN "type" masculine;
-due_A = mkA "dû";
+due_A = mkA "dû";
 duel_N = mkN "duel" masculine;
 duel_V = mkV (mkV "dueller");
 duet_N = mkN "duo" masculine;
@@ -6110,7 +6112,7 @@ eczema_N = mkN "eczéma" masculine;
 eddy_N = mkN "contre-courant";
 edelweiss_N = mkN "edelweiss" masculine;
 edema_N = mkN "oedème" masculine;
-edge_N = mkN "bord" masculine | mkN "côté" masculine | mkN "arête" feminine | mkN "carre" feminine;
+edge_N = mkN "bord" masculine | mkN "côté" masculine | mkN "arête" feminine | mkN "carre" feminine;
 edgy_A = mkA "nerveux" | mkA "limite";
 edible_A = mkA "comestible";
 edict_N = mkN "édit" masculine;
@@ -6154,9 +6156,9 @@ eggcup_N = mkN "coquetier" masculine;
 eggplant_N = mkN "aubergine" feminine;
 eglantine_N = mkN "églantine" feminine;
 ego_N = mkN "moi" masculine;
-egoism_N = mkN "égoïsme" masculine;
-egoist_N = mkN "égoïste";
-egotist_N = mkN "égoïste";
+egoism_N = mkN "égoïsme" masculine;
+egoist_N = mkN "égoïste";
+egotist_N = mkN "égoïste";
 egregious_A = mkA "flagrant";
 egress_N = mkN "sortie" feminine;
 egret_N = mkN "aigrette" feminine;
@@ -6378,7 +6380,7 @@ energetically_Adv = mkAdv "énergiquement";
 energy_N = mkN "énergie" feminine;
 enervate_V2 = mkV2 (mkV "affaiblir");
 engage_V2 = mkV2 (mkV "engager") | mkV2 (mkV "embrayer");
-engagement_N = mkN "fiançailles";
+engagement_N = mkN "fiançailles";
 engender_V2 = mkV2 (mkV "engendrer");
 engine_N = mkN "moteur" masculine | mkN "locomotive" feminine;
 engineer_N = mkN "ingénieur" | mkN "machiniste" masculine;
@@ -6405,15 +6407,15 @@ ennoble_V2 = mkV2 (mkV "anoblir");
 enol_N = mkN "énol" masculine;
 enologist_N = mkN "oenologue";
 enormous_A = mkA "énorme";
-enquiry_N = mkN "enquête" feminine;
+enquiry_N = mkN "enquête" feminine;
 enrich_V2 = mkV2 (mkV "enrichir");
 enrichment_N = mkN "enrichissement" masculine;
 enroll_V2 = mkV2 (mkV "enrôler") | mkV2 (reflV (mkV I.inscrire_V2));
 enrolment_N = mkN "inscription" feminine;
 ensemble_N = mkN "ensemble" masculine;
-enshrine_V2 = mkV2 (mkV "enchâsser");
+enshrine_V2 = mkV2 (mkV "enchâsser");
 ensign_N = mkN "pavillon" masculine | mkN "aspirant" masculine;
-ensnare_V2 = mkV2 (mkV "empêtrer") | mkV2 (mkV "piéger");
+ensnare_V2 = mkV2 (mkV "empêtrer") | mkV2 (mkV "piéger");
 ensue_V = mkV (mkV "résulter");
 ensure_V2 = mkV2 (reflV (mkV "assurer"));
 entail_V2 = mkV2 (mkV "comporter");
@@ -6432,7 +6434,7 @@ enthuse_V = mkV (mkV "enthousiasmer");
 enthusiasm_N = mkN "enthousiasme" masculine;
 enthusiast_N = mkN "enthousiaste" | mkN "passionné";
 enthusiastic_A = mkA "enthousiaste";
-entice_V2 = mkV2 (mkV "appâter");
+entice_V2 = mkV2 (mkV "appâter");
 entire_A = mkA "entier";
 entirety_N = mkN "entièreté" feminine;
 entitlement_N = mkN "allocation" feminine | mkN "revendication" feminine;
@@ -6474,7 +6476,7 @@ epic_N = mkN "épopée";
 epicardium_N = mkN "épicarde" masculine;
 epicentre_N = mkN "épicentre" masculine;
 epicycle_N = mkN "épicycle";
-epicycloid_N = mkN "épicycloïde" feminine;
+epicycloid_N = mkN "épicycloïde" feminine;
 epidemic_A = mkA "épidémique";
 epidemic_N = mkN "épidémie";
 epidemiologic_A = mkA "épidémiologique";
@@ -6596,7 +6598,7 @@ estimate_V2V = mkV2V (mkV "estimer");
 estrange_V2 = mkV2 (reflV (mkV "aliéner"));
 estrogen_N = mkN "oestrogène" masculine;
 estuary_N = mkN "estuaire" masculine;
-eta_N = mkN "êta" masculine;
+eta_N = mkN "êta" masculine;
 etch_V2 = mkV2 (mkV "graver") | mkV2 (mkV "marquer");
 etching_N = mkN "gravure" feminine;
 eternal_A = mkA "éternel";
@@ -6644,7 +6646,7 @@ evangelist_N = mkN "évangéliste";
 evaporate_V2 = mkV2 (mkV "évaporer");
 evaporation_N = mkN "évaporation" feminine | mkN "évaporation";
 even_A = mkA "pair" | mkA "plat";
-even_Adv = mkAdv "encore" | mkAdv "exactement" | mkAdv "même";
+even_Adv = mkAdv "encore" | mkAdv "exactement" | mkAdv "même";
 even_V2 = mkV2 (mkV "aplatir");
 evening_N = mkN "soir" masculine;
 event_N = mkN "événement" masculine;
@@ -6860,8 +6862,8 @@ extrapolation_N = mkN "extrapolation" feminine;
 extrasensory_A = mkA "extrasensoriel";
 extraterrestrial_A = mkA "extraterrestre";
 extravagant_A = mkA "extravagant";
-extreme_A = mkA "extrême";
-extreme_N = mkN "extrême" masculine;
+extreme_A = mkA "extrême";
+extreme_N = mkN "extrême" masculine;
 extremism_N = mkN "extrémisme" masculine;
 extremist_N = mkN "extrémiste" masculine;
 extremity_N = mkN "extrémité" feminine;
@@ -6909,7 +6911,7 @@ fad_N = mkN "mode" feminine;
 fade_V2 = mkV2 (reflV (mkV "affadir")) | mkV2 (reflV (mkV "évanouir"));
 fado_N = mkN "Fado" masculine;
 fag_N = mkN "clope" feminine | mkN "pédé" masculine;
-faience_N = mkN "faïence" feminine;
+faience_N = mkN "faïence" feminine;
 fail_V2V = mkV2V (mkV "négliger") | mkV2V (mkV "recaler") | mkV2V (mkV "échouer");
 failure_N = mkN "échec" masculine | mkN "raté" masculine | mkN "panne" feminine;
 fain_Adv = mkAdv "volontiers";
@@ -6963,7 +6965,7 @@ fantasize_V = mkV (mkV "fantasmer");
 fantastic_A = mkA "fantastique";
 fantastically_Adv = mkAdv "fantastiquement";
 fantasy_N = mkN "fantasme" masculine | mkN "fantaisie" feminine;
-far_A = mkA "extrême" | mkA "lointain" | mkA "reculé";
+far_A = mkA "extrême" | mkA "lointain" | mkA "reculé";
 farad_N = mkN "farad" masculine;
 farandole_N = mkN "farandole";
 farce_N = mkN "farce" feminine;
@@ -6985,11 +6987,11 @@ fascinating_A = mkA "fascinant";
 fascism_N = mkN "fascisme" masculine;
 fascist_A = mkA "fasciste";
 fascist_N = mkN "fasciste" masculine;
-fashion_N = mkN "mode" feminine | mkN "façon" feminine;
-fashion_V2 = mkV2 (mkV "façonner");
+fashion_N = mkN "mode" feminine | mkN "façon" feminine;
+fashion_V2 = mkV2 (mkV "façonner");
 fast_A = mkA "rapide";
 fast_Adv = mkAdv "rapidement";
-fast_V = mkV (mkV "jeûner");
+fast_V = mkV (mkV "jeûner");
 fasten_V2 = mkV2 (mkV "attacher");
 fastener_N = mkN "fermeture" feminine;
 fastidious_A = mkA "exigeant" | mkA "pointilleux" | mkA "méticuleux";
@@ -7033,7 +7035,7 @@ fearlessness_N = mkN "intrépidité" feminine;
 fearsome_A = mkA "effroyable";
 feasibility_N = mkN "faisabilité" feminine;
 feasible_A = mkA "faisable";
-feast_N = mkN "fête" feminine;
+feast_N = mkN "fête" feminine;
 feat_N = mkN "exploit" masculine;
 feature_N = mkN "fonctionnalité" feminine | mkN "caractéristique" feminine | mkN "trait";
 febrile_A = mkA "fébrile";
@@ -7113,7 +7115,7 @@ feudalism_N = mkN "féodalisme" masculine;
 fever_N = mkN "fièvre" feminine;
 fevered_A = mkA "fiévreux" | mkA "enflammé";
 feverish_A = mkA "fiévreux";
-fey_A = mkA "magique" | mkA "envoûté";
+fey_A = mkA "magique" | mkA "envoûté";
 fez_N = mkN "fez" masculine;
 fiasco_N = mkN "fiasco" masculine;
 fib_N = mkN "bobard" masculine;
@@ -7211,12 +7213,12 @@ fireproof_A = mkA "ignifuge";
 firewall_N = mkN "pare-feu" masculine;
 firmware_N = mkN "micrologiciel" masculine;
 firstborn_N = mkN "premier-né";
-fishbone_N = mkN "arête" feminine;
-fisher_N = mkN "pékan" masculine | mkN "pêcheur";
-fisherman_N = mkN "pêcheur" masculine;
-fishery_N = mkN "pêcherie" feminine;
-fishhook_N = mkN "hameçon" masculine;
-fishing_N = mkN "pêche" feminine;
+fishbone_N = mkN "arête" feminine;
+fisher_N = mkN "pékan" masculine | mkN "pêcheur";
+fisherman_N = mkN "pêcheur" masculine;
+fishery_N = mkN "pêcherie" feminine;
+fishhook_N = mkN "hameçon" masculine;
+fishing_N = mkN "pêche" feminine;
 fishmonger_N = mkN "poissonnier" masculine;
 fishwife_N = mkN "poissarde";
 fishy_A = mkA "suspect";
@@ -7246,9 +7248,9 @@ flagstone_N = mkN "dalle" feminine;
 flail_N = mkN "fléau" masculine;
 flail_V2 = mkV2 (reflV (mkV I.débattre_V2));
 flair_N = mkN "style" masculine | mkN "don" masculine;
-flake_N = mkN "lâche" masculine | mkN "éclat" masculine;
+flake_N = mkN "lâche" masculine | mkN "éclat" masculine;
 flake_V = mkV (mkV "peler");
-flaky_A = mkA "lâcheur";
+flaky_A = mkA "lâcheur";
 flamboyant_A = mkA "extravagant";
 flame_N = mkN "polémique" feminine | mkN "flamme" feminine;
 flamen_N = mkN "flamine" masculine;
@@ -7259,7 +7261,7 @@ flange_N = mkN "bride" feminine;
 flank_N = mkN "flanchet" masculine | mkN "flanc" masculine;
 flannel_N = mkN "flanelle" feminine;
 flap_N = mkN "abattant" masculine;
-flapper_N = mkN "garçonne" feminine;
+flapper_N = mkN "garçonne" feminine;
 flare_N = mkN "atterrissage" masculine;
 flash_V2 = mkV2 (mkV "clignoter") | mkV2 (reflV (mkV "exhiber"));
 flashback_N = mkN "flashback" masculine;
@@ -7276,8 +7278,8 @@ flatter_V2 = mkV2 (mkV "flatter");
 flatterer_N = mkN "flatteur" masculine;
 flatulence_N = mkN "flatulence" feminine;
 flaunt_V2 = mkV2 (mkV "étaler");
-flautist_N = mkN "flûtiste";
-flavour_N = mkN "saveur" feminine | mkN "style" masculine | mkN "goût";
+flautist_N = mkN "flûtiste";
+flavour_N = mkN "saveur" feminine | mkN "style" masculine | mkN "goût";
 flavour_V2 = mkV2 (mkV "assaisonner");
 flaw_N = mkN "tumulte" masculine | mkN "faille" feminine | mkN "bourrasque" feminine | mkN "défaut" masculine;
 flawless_A = mkA "parfait";
@@ -7354,7 +7356,7 @@ fluorite_N = mkN "fluorite" feminine;
 fluorocarbon_N = mkN "fluorocarbone";
 flush_N = mkN "flush";
 flush_V2 = mkV2 (mkV "rougir");
-flute_N = mkN "flûte" feminine;
+flute_N = mkN "flûte" feminine;
 flutter_V2 = mkV2 (mkV "voleter");
 fluvial_A = mkA "fluvial";
 flux_N = mkN "décapant" masculine;
@@ -7368,7 +7370,7 @@ foal_V = mkV (mkV "pouliner");
 foam_N = mkN "écume" feminine;
 foam_V = mkV (mkV "écumer");
 foamy_A = mkA "mousseux";
-fob_N = mkN "châtelaine" feminine;
+fob_N = mkN "châtelaine" feminine;
 focus_N = mkN "attention" feminine | mkN "épicentre" masculine | mkN "foyer" masculine;
 focus_V2 = mkV2 (mkV "focaliser") | mkV2 (reflV (mkV "concentrer")) | mkV2 (mkV "concentrer");
 fodder_N = mkN "fourrage" masculine;
@@ -7413,7 +7415,7 @@ footpath_N = mkN "trottoir" masculine;
 footstep_N = mkN "pas" masculine;
 footstool_N = mkN "repose-pied" masculine;
 footwear_N = mkN "souliers";
-fop_N = mkN "bellâtre" masculine;
+fop_N = mkN "bellâtre" masculine;
 foppish_A = mkA "soigné";
 forage_N = mkN "fourrager" | mkN "fourrage" masculine;
 forage_V = mkV (mkV "fourrager");
@@ -7427,10 +7429,10 @@ forceps_N = mkN "forceps";
 forcible_A = mkA "forcé" | mkA "violent" | mkA "impressionnant" | mkA "puissant";
 ford_N = mkN "gué" masculine;
 forearm_N = mkN "avant-bras" masculine;
-forebear_N = mkN "ancêtre" masculine;
+forebear_N = mkN "ancêtre" masculine;
 forecast_N = mkN "prévision" feminine;
 forecast_V2 = mkV2 (mkV I.prévoir_V2);
-forefather_N = mkN "aïeul" masculine;
+forefather_N = mkN "aïeul" masculine;
 forefinger_N = mkN "index" masculine;
 forefront_N = mkN "avant-garde" feminine;
 forego_V2 = mkV2 (mkV "précéder");
@@ -7447,19 +7449,19 @@ foresee_V2 = mkV2 (mkV I.prévoir_V2);
 foreshadow_V2 = mkV2 (mkV "présager");
 foreshore_N = mkN "estran";
 foresight_N = mkN "clairvoyance" feminine;
-forest_N = mkN "forêt" feminine;
-forestall_V2 = mkV2 (mkV "empêcher");
+forest_N = mkN "forêt" feminine;
+forestall_V2 = mkV2 (mkV "empêcher");
 forested_A = mkA "forestier";
 forester_N = mkN "forestier" masculine;
 forestry_N = mkN "sylviculture" feminine;
-foretaste_N = mkN "avant-goût" masculine;
+foretaste_N = mkN "avant-goût" masculine;
 foretell_V2 = mkV2 (mkV I.prédire_V2);
 foreword_N = mkN "avant-propos" masculine;
 forfeit_V2 = mkV2 (mkV I.perdre_V2) | mkV2 (mkV "abandonner");
-forge_N = mkN "contrefaçon" feminine | mkN "forge" feminine;
+forge_N = mkN "contrefaçon" feminine | mkN "forge" feminine;
 forge_V2 = mkV2 (mkV "falsifier") | mkV2 (mkV "forger");
 forger_N = mkN "faussaire" masculine | mkN "forgeron" masculine;
-forgery_N = mkN "contrefaçon";
+forgery_N = mkN "contrefaçon";
 forgetful_A = mkA "oublieux";
 forget_me_not_N = mkN "ne-m'oubliez-pas" masculine;
 forgettable_A = mkA "oubliable";
@@ -7569,7 +7571,7 @@ freshness_N = mkN "fraîcheur" feminine;
 fret_N = mkN "frette" feminine;
 fret_V2 = mkV2 (mkV "dévorer") | mkV2 (mkV "inquiéter") | mkV2 (mkV "ajourer") | mkV2 (reflV (mkV "inquiéter"));
 fretful_A = mkA "irritable" | mkA "agité";
-friable_A = mkA "désagrégable" | mkA "friable" | mkA "lâche";
+friable_A = mkA "désagrégable" | mkA "friable" | mkA "lâche";
 friar_N = mkN "frère" masculine;
 fricative_N = mkN "fricative" feminine;
 friction_N = mkN "friction" feminine | mkN "désaccord" masculine | mkN "frottement" masculine;
@@ -7585,7 +7587,7 @@ frightening_A = mkA "effrayant";
 frightful_A = mkA "effrayant";
 frigid_A = mkA "frigide";
 frill_N = mkN "froufrou" masculine;
-frilly_A = mkA "crêpé";
+frilly_A = mkA "crêpé";
 fringe_N = mkN "frange" feminine | mkN "radicaux" masculine | mkN "périphérie" feminine;
 fringe_V2 = mkV2 (mkV "franger");
 frisk_V2 = mkV2 (mkV "fouiller");
@@ -7598,7 +7600,7 @@ frock_N = mkN "froc" masculine;
 frog_N = mkN "talon" masculine | mkN "grenouille" feminine;
 frogman_N = mkN "homme-grenouille" masculine;
 frolic_V = mkV (mkV "fôlatrer");
-front_N = mkN "avant" masculine | mkN "façade" feminine | mkN "front" masculine;
+front_N = mkN "avant" masculine | mkN "façade" feminine | mkN "front" masculine;
 frontal_A = mkA "frontal";
 frontier_N = mkN "frontière" feminine;
 frost_N = mkN "gel" masculine | mkN "givre" masculine;
@@ -7606,7 +7608,7 @@ frostbite_N = mkN "gelure" feminine;
 froth_N = mkN "mousse" feminine;
 frothy_A = mkA "mousseux";
 frown_N = mkN "froncement";
-frown_V = mkV (mkV "râler");
+frown_V = mkV (mkV "râler");
 fructify_V2 = mkV2 (mkV "fructifier");
 fructose_N = mkN "fructose" masculine;
 frugal_A = mkA "frugal";
@@ -7633,7 +7635,7 @@ fulfil_V2 = mkV2 (mkV I.satisfaire_V2);
 fulfilment_N = mkN "satisfaction" feminine;
 fuller_N = mkN "tailleur" masculine;
 full_scale_A = mkA "complet";
-fumble_V2 = mkV2 (mkV "tâtonner") | mkV2 (mkV "tripoter");
+fumble_V2 = mkV2 (mkV "tâtonner") | mkV2 (mkV "tripoter");
 fume_V2 = mkV2 (mkV "fulminer");
 fumitory_N = mkN "fumeterre" feminine;
 fun_N = mkN "amusement" masculine;
@@ -7692,19 +7694,19 @@ futuristic_A = mkA "futuriste";
 futurology_N = mkN "futurologie" feminine;
 fuzzy_A = mkA "flou";
 gab_N = mkN "bagou" masculine;
-gable_N = mkN "gâble" masculine;
+gable_N = mkN "gâble" masculine;
 gadget_N = mkN "gadget";
 gadolinium_N = mkN "gadolinium" masculine;
 gaffe_N = mkN "gaffe" feminine;
 gaffer_N = mkN "éclairagiste" | mkN "contre-maître" masculine;
-gag_N = mkN "haut-le-coeur" | mkN "bâillon" masculine;
-gag_V2 = mkV2 (mkV "bâillonner");
+gag_N = mkN "haut-le-coeur" | mkN "bâillon" masculine;
+gag_V2 = mkV2 (mkV "bâillonner");
 gaga_A = mkA "gaga";
 gain_N = mkN "gain" masculine;
 gain_V2 = mkV2 (mkV "gagner");
 gainsay_V2 = mkV2 (mkV I.contredire_V2);
 gait_N = mkN "démarche" feminine | mkN "allure" masculine;
-gaiter_N = mkN "guêtre" feminine;
+gaiter_N = mkN "guêtre" feminine;
 galactic_A = mkA "astronomique" | mkA "galactique";
 galactose_N = mkN "galactose" masculine;
 galangal_N = mkN "galangue";
@@ -7744,7 +7746,7 @@ gangster_N = mkN "gangster" masculine;
 gangway_N = mkN "passage" masculine | mkN "passavant" masculine | mkN "passerelle" feminine;
 gantry_N = mkN "portique";
 gap_N = mkN "brèche" feminine | mkN "col" masculine | mkN "trouée" feminine;
-gape_V = mkV (mkV "bâiller");
+gape_V = mkV (mkV "bâiller");
 garage_N = mkN "garage" masculine | mkN "garage";
 garbage_N = mkN "ordures";
 garden_V = mkV (mkV "jardiner");
@@ -7758,7 +7760,7 @@ gargle_V2 = mkV2 (reflV (mkV "gargariser"));
 gargoyle_N = mkN "gargouille" feminine;
 garland_N = mkN "guirlande" | mkN "guirlande" feminine;
 garlic_N = mkN "ail" masculine;
-garment_N = mkN "vêtement" masculine;
+garment_N = mkN "vêtement" masculine;
 garner_N = mkN "grenier" masculine;
 garner_V2 = mkV2 (mkV "rassembler") | mkV2 (mkV "engranger");
 garnet_N = mkN "grenat";
@@ -7784,7 +7786,7 @@ gastroscopy_N = mkN "gastroscopie";
 gastrulation_N = mkN "gastrulation" feminine;
 gat_N = mkN "flingue" masculine;
 gate_N = mkN "grille" feminine | mkN "portail" masculine | mkN "porte" feminine;
-gateau_N = mkN "gâteau" masculine;
+gateau_N = mkN "gâteau" masculine;
 gatecrash_V2 = mkV2 (reflV (mkV "incruster"));
 gatecrasher_N = mkN "incruste";
 gateway_N = mkN "gateway" masculine | mkN "porte" feminine | mkN "porte";
@@ -7936,7 +7938,7 @@ glad_A = mkA "content";
 gladden_V2 = mkV2 (mkV "réjouir");
 glade_N = mkN "clairière" feminine;
 gladiator_N = mkN "gladiateur" masculine;
-gladiolus_N = mkN "glaïeul" masculine;
+gladiolus_N = mkN "glaïeul" masculine;
 glamorize_V2 = mkV2 (mkV "glamouriser");
 glamorous_A = mkA "glamoureux";
 gland_N = mkN "glande" feminine;
@@ -7949,7 +7951,7 @@ glass_N = mkN "verre" masculine;
 glassful_N = mkN "rasade" feminine;
 glaucoma_N = mkN "glaucome" masculine;
 glaucous_A = mkA "pruiné" | mkA "glauque";
-glaze_N = mkN "glaçage" masculine | mkN "glacis" masculine | mkN "glaçure" feminine | mkN "givre" masculine;
+glaze_N = mkN "glaçage" masculine | mkN "glacis" masculine | mkN "glaçure" feminine | mkN "givre" masculine;
 glaze_V2 = mkV2 (mkV "glacer") | mkV2 (mkV "vitrer") | mkV2 (reflV (mkV "embuer"));
 glazier_N = mkN "vitrier" masculine;
 gleam_N = mkN "rayon" masculine;
@@ -7962,7 +7964,7 @@ glibness_N = mkN "désinvolture" feminine;
 glide_V = mkV (mkV "glisser") | mkV (mkV "planer");
 glider_N = mkN "planeur" masculine;
 glimmer_N = mkN "lueur" feminine;
-glimpse_N = mkN "aperçu" masculine;
+glimpse_N = mkN "aperçu" masculine;
 glioma_N = mkN "gliome" masculine;
 glisten_V = mkV (mkV I.reluire_V2);
 glitter_V = mkV (mkV "briller");
@@ -7982,7 +7984,7 @@ glossy_A = mkA "luisant";
 glottal_A = mkA "glottique";
 glottis_N = mkN "glotte" feminine;
 glow_V = mkV (mkV "briller");
-glucocorticoid_N = mkN "glucocorticoïde" masculine;
+glucocorticoid_N = mkN "glucocorticoïde" masculine;
 glucose_N = mkN "glucose" masculine;
 glucoside_N = mkN "glucoside" masculine;
 glue_N = mkN "colle" feminine;
@@ -8086,9 +8088,9 @@ governor_N = mkN "gouverneur" masculine;
 gown_N = mkN "robe" feminine | mkN "toge";
 grab_N = mkN "saisir";
 grab_V2 = mkV2 (mkV "attraper");
-grace_N = mkN "grâce" feminine | mkN "bénédicité" masculine;
+grace_N = mkN "grâce" feminine | mkN "bénédicité" masculine;
 graceful_A = mkA "gracieux";
-gracefulness_N = mkN "grâce" feminine;
+gracefulness_N = mkN "grâce" feminine;
 grade_N = mkN "mention" feminine | mkN "classe" feminine;
 grader_N = mkN "niveleuse" feminine;
 gradient_N = mkN "gradient" masculine | mkN "pente" | mkN "pente" feminine;
@@ -8137,10 +8139,10 @@ grasp_V2 = mkV2 (mkV "saisir") | mkV2 (mkV I.comprendre_V2);
 grass_V2 = mkV2 (mkV "moucharder");
 grasshopper_N = mkN "sauterelle" feminine;
 grassroots_A = mkA "local";
-grate_V2 = mkV2 (mkV "râper");
+grate_V2 = mkV2 (mkV "râper");
 grateful_A = mkA "reconnaissant";
 gratefulness_N = mkN "reconnaissance";
-grater_N = mkN "râpe" feminine;
+grater_N = mkN "râpe" feminine;
 gratify_V2 = mkV2 (mkV "gratifier");
 gratis_A = mkA "gratuit";
 gratitude_N = mkN "gratitude" feminine;
@@ -8170,7 +8172,7 @@ greedy_A = mkA "avaricieux";
 green_N = mkN "vert" masculine;
 greenhorn_N = mkN "béjaune";
 greenhouse_N = mkN "serre" feminine;
-greenish_A = mkA "verdâtre";
+greenish_A = mkA "verdâtre";
 greet_V2 = mkV2 (mkV "saluer");
 greeting_N = mkN "salutation" feminine;
 gregarious_A = mkA "grégaire" | mkA "sociable";
@@ -8195,8 +8197,8 @@ grisly_A = mkA "épouvantable";
 gristle_N = mkN "cartilage" masculine;
 grit_N = mkN "cran" | mkN "gravillon";
 grit_V2 = mkV2 (mkV "Grincer");
-groan_N = mkN "grognement" masculine | mkN "râle" masculine;
-groan_V2 = mkV2 (mkV "râler");
+groan_N = mkN "grognement" masculine | mkN "râle" masculine;
+groan_V2 = mkV2 (mkV "râler");
 grocer_N = mkN "épicier";
 grocery_N = mkN "épicerie" feminine;
 grog_N = mkN "grog" masculine;
@@ -8205,9 +8207,9 @@ groin_N = mkN "aine" feminine;
 groom_N = mkN "fiancé" masculine | mkN "palefrenier" masculine;
 groom_V2 = mkV2 (mkV "préparer");
 groove_N = mkN "rainure" feminine;
-grope_V2 = mkV2 (mkV "tâtonner") | mkV2 (mkV "tripoter");
+grope_V2 = mkV2 (mkV "tâtonner") | mkV2 (mkV "tripoter");
 groschen_N = mkN "groschen" masculine;
-gross_A = mkA "grossier" | mkA "dégoûtant" | mkA "brut";
+gross_A = mkA "grossier" | mkA "dégoûtant" | mkA "brut";
 grotesque_A = mkA "grotesque";
 grotto_N = mkN "grotte" feminine;
 grouch_N = mkN "grincheux";
@@ -8238,7 +8240,7 @@ grumble_V2 = mkV2 (mkV "gronder") | mkV2 (mkV "gargouiller") | mkV2 (mkV "roncho
 grumpy_A = mkA "grognon";
 grunt_N = mkN "bidasse" feminine | mkN "grognement";
 grunt_V2 = mkV2 (mkV "grogner");
-guaiacum_N = mkN "gaïac" masculine;
+guaiacum_N = mkN "gaïac" masculine;
 guanaco_N = mkN "guanaco" masculine;
 guanine_N = mkN "guanine" feminine;
 guano_N = mkN "guano" masculine;
@@ -8324,7 +8326,7 @@ hag_N = mkN "sorcière" feminine;
 haggard_A = mkA "hagard";
 haggle_V = mkV (mkV "marchander");
 hagiography_N = mkN "hagiographie" feminine;
-haiku_N = mkN "haïku" masculine;
+haiku_N = mkN "haïku" masculine;
 hail_N = mkN "grêle" feminine;
 hail_V2 = mkV2 (mkV "grêler") | mkV2 (mkV "héler") | mkV2 (mkV "saluer");
 hailstone_N = mkN "grêlon" masculine;
@@ -8344,7 +8346,7 @@ halibut_N = mkN "flétan" masculine;
 halitosis_N = mkN "halitose";
 hall_N = mkN "foyer" masculine | mkN "hall" masculine | mkN "couloir" masculine | mkN "manoir" masculine | mkN "salle" feminine;
 hallelujah_N = mkN "alléluia";
-hallmark_N = mkN "poinçon" masculine;
+hallmark_N = mkN "poinçon" masculine;
 hallow_N = mkN "saint" masculine;
 hallow_V2 = mkV2 (mkV "sanctifier");
 hallucination_N = mkN "hallucination" feminine;
@@ -8374,13 +8376,13 @@ handicap_N = mkN "handicap" masculine;
 handicraft_N = mkN "artisanat" masculine;
 handkerchief_N = mkN "foulard" masculine | mkN "mouchoir" masculine;
 handle_N = mkN "indicateur" masculine | mkN "paris" | mkN "poignée" feminine | mkN "indicatif" masculine | mkN "outil" masculine | mkN "anse" feminine;
-handle_V2 = mkV2 (mkV "tâter") | mkV2 (mkV "gérer") | mkV2 (mkV "manipuler") | mkV2 (mkV "traiter") | mkV2 (mkV "manier");
+handle_V2 = mkV2 (mkV "tâter") | mkV2 (mkV "gérer") | mkV2 (mkV "manipuler") | mkV2 (mkV "traiter") | mkV2 (mkV "manier");
 handlebar_N = mkN "guidon";
 handling_N = mkN "manipulation" feminine;
 handout_N = mkN "aumône" feminine | mkN "polycopié" masculine;
 handover_N = mkN "passation" feminine;
 handrail_N = mkN "rambarde" feminine;
-handsaw_N = mkN "égoïne" feminine;
+handsaw_N = mkN "égoïne" feminine;
 handsome_A = mkA "beau";
 handstand_N = mkN "équilibre" masculine;
 handy_A = mkA "pratique" | mkA "maniable";
@@ -8392,7 +8394,7 @@ hangman_N = mkN "bourreau" masculine | mkN "pendu" masculine;
 hangnail_N = mkN "envie" feminine;
 haphazard_A = mkA "désordonné";
 hapless_A = mkA "malheureux";
-haploid_A = mkA "haploïde";
+haploid_A = mkA "haploïde";
 happen_V2 = mkV2 (mkV I.advenir_V);
 happening_N = mkN "happening";
 happiness_N = mkN "bonheur" masculine;
@@ -8451,8 +8453,8 @@ hassium_N = mkN "hassium" masculine;
 hassle_N = mkN "dispute" | mkN "tracas";
 hassle_V2 = mkV2 (mkV "provoquer") | mkV2 (mkV "harceler");
 hassock_N = mkN "pouf" masculine;
-haste_N = mkN "hâte" feminine;
-hasten_V2 = mkV2 (reflV (mkV "dépêcher")) | mkV2 (mkV "hâter");
+haste_N = mkN "hâte" feminine;
+hasten_V2 = mkV2 (reflV (mkV "dépêcher")) | mkV2 (mkV "hâter");
 hatch_N = mkN "couvée" feminine | mkN "trappe" feminine | mkN "écoutille" feminine | mkN "passe-plat" masculine;
 hatch_V2 = mkV2 (mkV I.éclore_V2);
 hatchback_N = mkN "hayon" masculine;
@@ -8537,7 +8539,7 @@ hedonist_N = mkN "hédoniste";
 heed_N = mkN "attention" feminine;
 heed_V2 = mkV2 (mkV "surveiller") | mkV2 (mkV "observer");
 heedless_A = mkA "insouciant";
-heel_N = mkN "croûton" masculine | mkN "talon" masculine;
+heel_N = mkN "croûton" masculine | mkN "talon" masculine;
 heel_V2 = mkV2 (mkV "talonner");
 heft_N = mkN "poids" masculine;
 hegemony_N = mkN "hégémonie" feminine;
@@ -8579,7 +8581,7 @@ hematoma_N = mkN "hématome" masculine;
 hematopoiesis_N = mkN "hématopoïèse" feminine;
 hemisphere_N = mkN "hémisphère" feminine | mkN "hémisphère" masculine;
 hemline_N = mkN "ourlet" masculine | mkN "ourlet";
-hemlock_N = mkN "ciguë" feminine | mkN "pruche" feminine;
+hemlock_N = mkN "ciguë" feminine | mkN "pruche" feminine;
 hemochromatosis_N = mkN "hématochromatose" feminine;
 hemodynamics_N = mkN "hémodynamique";
 hemoglobin_N = mkN "hémoglobine" feminine;
@@ -8587,7 +8589,7 @@ hemorrhoid_N = mkN "hémorroïde" feminine;
 hemp_N = mkN "chanvre" masculine;
 hen_N = mkN "poule" feminine;
 henbane_N = mkN "jusquiame" feminine;
-hence_Adv = mkAdv "ainsi" | mkAdv "d'où" | mkAdv "d'ici";
+hence_Adv = mkAdv "ainsi" | mkAdv "d'où" | mkAdv "d'ici";
 henceforth_Adv = mkAdv "dorénavant";
 henchman_N = mkN "sbire" masculine;
 hendiadys_N = mkN "hendiadys";
@@ -8646,7 +8648,7 @@ heterosexuality_N = mkN "hétérosexualité" feminine;
 heterozygote_N = mkN "hétérozygote";
 heuristic_A = mkA "euristique";
 heuristic_N = mkN "heuristique" feminine;
-hew_V2 = mkV2 (mkV "tailler") | mkV2 (reflV (mkV "conformer")) | mkV2 (mkV "façonner");
+hew_V2 = mkV2 (mkV "tailler") | mkV2 (reflV (mkV "conformer")) | mkV2 (mkV "façonner");
 hex_N = mkN "sortilège" masculine | mkN "sorcière" feminine;
 hexadecimal_A = mkA "hexadécimal";
 hexagon_N = mkN "hexagone" masculine;
@@ -8661,12 +8663,12 @@ hibernation_N = mkN "hibernation" feminine;
 hiccup_N = mkN "hoquet" masculine | mkN "accroc" masculine;
 hiccup_V = mkV (mkV "hoqueter");
 hick_N = mkN "plouc";
-hickey_N = mkN "suçon" masculine | mkN "truc" masculine;
+hickey_N = mkN "suçon" masculine | mkN "truc" masculine;
 hide_N = mkN "cache" feminine | mkN "cuir" masculine;
 hide_V2 = mkV2 (mkV "cacher") | mkV2 (reflV (mkV "cacher"));
 hideous_A = mkA "hideux";
 hideout_N = mkN "cachette" feminine;
-hie_V = mkV (reflV (mkV "hâter"));
+hie_V = mkV (reflV (mkV "hâter"));
 hierarchical_A = mkA "hiérarchique";
 hierarchy_N = mkN "hiérarchie" feminine;
 hieratic_A = mkA "hiératique";
@@ -8696,7 +8698,7 @@ hindrance_N = mkN "entrave" feminine;
 hindsight_N = mkN "recul" masculine;
 hinge_N = mkN "gond" masculine;
 hinny_N = mkN "bardot";
-hint_N = mkN "soupçon" masculine | mkN "indication";
+hint_N = mkN "soupçon" masculine | mkN "indication";ç
 hinterland_N = mkN "arrière-pays";
 hip_N = mkN "hanche" feminine | mkN "cynorrhodon" masculine;
 hippocampus_N = mkN "hippocampe" masculine;
@@ -8715,7 +8717,7 @@ historic_A = mkA "historique";
 historical_A = mkA "historique";
 historiography_N = mkN "historiographie" feminine;
 history_N = mkN "histoire" feminine | mkN "historique" masculine;
-histrionic_A = mkA "histrionique" | mkA "théâtral";
+histrionic_A = mkA "histrionique" | mkA "théâtral";
 histrionics_N = mkN "histrionisme";
 hit_N = mkN "frappe" feminine | mkN "coup" masculine | mkN "hit" masculine | mkN "taffe" feminine | mkN "contrat" masculine;
 hitch_N = mkN "hic" masculine | mkN "dispositif" | mkN "noeud" | mkN "accroc" masculine;
@@ -8802,7 +8804,7 @@ honour_N = mkN "honneur" masculine;
 hood_N = mkN "hotte" feminine | mkN "capot" masculine | mkN "capuche" | mkN "capote" feminine;
 hoodlum_N = mkN "voyou" masculine | mkN "bandit" masculine;
 hoof_N = mkN "sabot";
-hook_N = mkN "hameçon" masculine | mkN "crochet" masculine;
+hook_N = mkN "hameçon" masculine | mkN "crochet" masculine;
 hook_V2 = mkV2 (mkV "accrocher");
 hookah_N = mkN "houka" feminine;
 hooker_N = mkN "putain" feminine | mkN "talonneur" masculine;
@@ -8835,7 +8837,7 @@ horology_N = mkN "horologie" feminine;
 horoscope_N = mkN "horoscope" masculine;
 horrible_A = mkA "horrible";
 horrific_A = mkA "horrifique";
-horror_N = mkN "horreur" masculine | mkN "dégoût";
+horror_N = mkN "horreur" masculine | mkN "dégoût";
 horsefly_N = mkN "taon" masculine;
 horsehair_N = mkN "crin" masculine;
 horseman_N = mkN "cavalier" masculine;
@@ -8916,7 +8918,7 @@ humpback_N = mkN "bossu" masculine | mkN "bosse" feminine;
 humpbacked_A = mkA "bossu";
 humus_N = mkN "humus" masculine;
 hunch_N = mkN "intuition";
-hunch_V2 = mkV2 (reflV (mkV "voûter"));
+hunch_V2 = mkV2 (reflV (mkV "voûter"));
 hunchback_N = mkN "bossu" masculine;
 hunger_N = mkN "faim" feminine | mkN "soif" feminine;
 hunt_N = mkN "chasse" feminine;
@@ -9032,8 +9034,8 @@ icehouse_N = mkN "glacière";
 ichthyology_N = mkN "ichtyologie" feminine;
 ichthyosaur_N = mkN "ichtyosaure" masculine;
 ichthyosis_N = mkN "ichtyose" feminine;
-icicle_N = mkN "glaçon" masculine;
-icing_N = mkN "glaçage" masculine;
+icicle_N = mkN "glaçon" masculine;
+icing_N = mkN "glaçage" masculine;
 icon_N = mkN "icône" feminine | mkN "icon" masculine;
 iconoclasm_N = mkN "iconoclasme" masculine;
 icosahedron_N = mkN "icosaèdre" masculine;
@@ -9374,7 +9376,7 @@ inexplicable_A = mkA "inexplicable";
 inextricable_A = mkA "inextricable";
 infallibility_N = mkN "infaillibilité" feminine;
 infallible_A = mkA "infaillible";
-infamous_A = mkA "infâme";
+infamous_A = mkA "infâme";
 infamy_N = mkN "infamie";
 infant_N = mkN "nourrisson" masculine;
 infanticide_N = mkN "infanticide" masculine;
@@ -9468,7 +9470,7 @@ injure_V2 = mkV2 (mkV "blesser");
 injury_N = mkN "blessure" feminine;
 injustice_N = mkN "injustice" feminine;
 ink_N = mkN "encre" feminine;
-inkling_N = mkN "soupçon" masculine;
+inkling_N = mkN "soupçon" masculine;
 inkwell_N = mkN "encrier" masculine;
 inlay_N = mkN "incrustation" feminine;
 inlet_N = mkN "crique" feminine;
@@ -9750,7 +9752,7 @@ irregular_A = mkA "irregulier";
 irregularity_N = mkN "irregularité" feminine;
 irrelevant_A = mkA "non-pertinent";
 irremediable_A = mkA "irrémédiable";
-irreplaceable_A = mkA "irremplaçable";
+irreplaceable_A = mkA "irremplaçable";
 irrepressible_A = mkA "irrépressible";
 irreproachable_A = mkA "irréprochable";
 irresistibility_N = mkN "irrésistibilité" feminine;
@@ -9796,9 +9798,9 @@ ivy_N = mkN "lierre" masculine;
 jab_N = mkN "pique";
 jabiru_N = mkN "jabiru" masculine;
 jabot_N = mkN "jabot" masculine;
-jack_N = mkN "cric" masculine | mkN "âne" masculine | mkN "valet" masculine | mkN "jack";
+jack_N = mkN "cric" masculine | mkN "âne" masculine | mkN "valet" masculine | mkN "jack";
 jackal_N = mkN "chacal" masculine;
-jackass_N = mkN "âne" masculine;
+jackass_N = mkN "âne" masculine;
 jackdaw_N = mkN "choucas" masculine;
 jacket_N = mkN "veste" feminine | mkN "couverture" feminine;
 jackfruit_N = mkN "jacque" masculine;
@@ -9822,7 +9824,7 @@ jasmine_N = mkN "jasmin" masculine;
 jasper_N = mkN "jaspe" masculine;
 jaundice_N = mkN "jaunisse" feminine;
 javelin_N = mkN "javelot" masculine;
-jaw_N = mkN "mâchoire" feminine;
+jaw_N = mkN "mâchoire" feminine;
 jay_N = mkN "geai" masculine;
 jazz_N = mkN "jazz" masculine;
 jealous_A = mkA "jaloux";
@@ -9862,7 +9864,7 @@ jingoism_N = mkN "jingoïsme" masculine;
 jinn_N = mkN "jinn" masculine;
 jinx_N = mkN "porte-malheur" | mkN "maléfice" masculine;
 jitter_N = mkN "crainte";
-job_N = mkN "tâche" feminine | mkN "travail" masculine | mkN "plastie" feminine;
+job_N = mkN "tâche" feminine | mkN "travail" masculine | mkN "plastie" feminine;
 jobbery_N = mkN "corruption" feminine;
 jockey_N = mkN "jockey" masculine;
 jocular_A = mkA "facétieux";
@@ -9958,7 +9960,7 @@ kebab_N = mkN "kebab" masculine;
 keel_N = mkN "quille" feminine;
 keep_N = mkN "donjon" masculine;
 keep_V2A = mkV2A (mkV "garder") | mkV2A (mkV "conserver");
-keeper_N = mkN "conservateur" masculine | mkN "gardien" masculine | mkN "gâche" feminine | mkN "passant" masculine;
+keeper_N = mkN "conservateur" masculine | mkN "gardien" masculine | mkN "gâche" feminine | mkN "passant" masculine;
 keepsake_N = mkN "souvenir" masculine;
 keg_N = mkN "tonnelet" masculine;
 kelp_N = mkN "laminaire" feminine;
@@ -10103,7 +10105,7 @@ lacrosse_N = mkN "crosse" feminine;
 lactation_N = mkN "lactation" feminine | mkN "allaitement" masculine;
 lactose_N = mkN "lactose" masculine;
 lacustrine_A = mkA "lacustre";
-lad_N = mkN "palefrenier" masculine | mkN "garçon" masculine;
+lad_N = mkN "palefrenier" masculine | mkN "garçon" masculine;
 ladder_N = mkN "échelle" feminine;
 lade_V2 = mkV2 (mkV "charger");
 laden_A = mkA "chargé";
@@ -10321,7 +10323,7 @@ lesion_N = mkN "lésion" feminine;
 less_A = mkA "moins";
 less_Adv = mkAdv "moins";
 lessee_N = mkN "locataire";
-lesson_N = mkN "leçon" feminine;
+lesson_N = mkN "leçon" feminine;
 lessor_N = mkN "bailleur" masculine;
 let_N = mkN "filet" masculine;
 let_V2V = mkV2V (mkV "laisser") | mkV2V (mkV "louer");
@@ -10521,7 +10523,7 @@ loan_V2 = mkV2 (mkV "prêter");
 loanword_N = mkN "emprunt" masculine;
 loath_A = mkA "hostile" | mkA "réticent";
 loathe_V2 = mkV2 (mkV "détester");
-loathing_N = mkN "dégoût" masculine;
+loathing_N = mkN "dégoût" masculine;
 loathsome_A = mkA "odieux";
 lob_N = mkN "lob" masculine;
 lobby_N = mkN "lobby" masculine | mkN "vestibule" masculine;
@@ -10551,9 +10553,9 @@ lodge_N = mkN "loge" feminine | mkN "cabane" feminine;
 lodge_V2 = mkV2 (mkV "demeurer");
 loess_N = mkN "loess" masculine;
 lofty_A = mkA "haut";
-log_N = mkN "bûche" feminine | mkN "tronc" masculine;
+log_N = mkN "bûche" feminine | mkN "tronc" masculine;
 log_V2 = mkV2 (mkV "couper");
-loganberry_N = mkN "mûroise" feminine;
+loganberry_N = mkN "mûroise" feminine;
 logarithm_N = mkN "logarithme" masculine;
 loge_N = mkN "loge" feminine;
 logic_N = mkN "logique" feminine;
@@ -10567,7 +10569,7 @@ logogram_N = mkN "logogramme" masculine;
 loin_N = mkN "filet" | mkN "lombe" | mkN "lombes";
 loincloth_N = mkN "pagne" masculine;
 loins_N = mkN "lombes";
-loiter_V2 = mkV2 (mkV "flâner");
+loiter_V2 = mkV2 (mkV "flâner");
 lollipop_N = mkN "sucette";
 lone_A = mkA "seul" | mkA "isolé" | mkA "unique";
 loneliness_N = mkN "solitude" feminine;
@@ -10588,7 +10590,7 @@ loop_N = mkN "boucle" feminine;
 loop_V2 = mkV2 (mkV "boucler");
 loophole_N = mkN "échappatoire" feminine | mkN "meurtrière" feminine;
 loopy_A = mkA "timbré";
-loose_A = mkA "lâche";
+loose_A = mkA "lâche";
 loose_V2 = mkV2 (mkV I.défaire_V2);
 loosen_V2 = mkV2 (mkV "desserrer");
 loosestrife_N = mkN "lysimaque" feminine | mkN "salicaire" feminine;
@@ -10598,7 +10600,7 @@ looter_N = mkN "pilleur" masculine;
 lopsided_A = mkA "bancal";
 loquacious_A = mkA "loquace";
 loquacity_N = mkN "loquacité" feminine;
-lord_N = mkN "seigneur" masculine | mkN "châtelain";
+lord_N = mkN "seigneur" masculine | mkN "châtelain";
 lordosis_N = mkN "lordose" feminine;
 lordship_N = mkN "Monsieur" masculine | mkN "domaine" feminine;
 lorikeet_N = mkN "loriquet" masculine;
@@ -10653,7 +10655,7 @@ lukewarm_A = mkA "tiède";
 lull_V2 = mkV2 (mkV "apaiser");
 lullaby_N = mkN "berceuse" feminine;
 lumbago_N = mkN "lumbago" masculine;
-lumberjack_N = mkN "bûcheron" masculine;
+lumberjack_N = mkN "bûcheron" masculine;
 lumen_N = mkN "lumen";
 luminescence_N = mkN "luminescence" feminine;
 luminosity_N = mkN "luminosité" feminine;
@@ -10671,7 +10673,7 @@ lupine_A = mkA "vorace";
 lupine_N = mkN "lupin" | mkN "lupin" masculine;
 lurch_N = mkN "embardée";
 lure_N = mkN "leurre" masculine | mkN "attrait" masculine;
-lurid_A = mkA "jaunâtre" | mkA "blafard" | mkA "choquant";
+lurid_A = mkA "jaunâtre" | mkA "blafard" | mkA "choquant";
 lurk_V = mkV (mkV "traîner");
 lush_N = mkN "alcoolique" masculine;
 lust_N = mkN "luxure" feminine;
@@ -10703,14 +10705,14 @@ ma_N = mkN "maman" feminine;
 macabre_A = mkA "macabre";
 macaque_N = mkN "macaque" masculine;
 macaroni_N = mkN "macaronis";
-macaronic_A = mkA "bâtard" | mkA "macaronique";
+macaronic_A = mkA "bâtard" | mkA "macaronique";
 macaroon_N = mkN "macaron";
 macaw_N = mkN "ara" masculine;
 mace_N = mkN "macis" masculine | mkN "masse" feminine;
 macerate_V2 = mkV2 (mkV "macérer");
 maceration_N = mkN "macération" feminine;
 machete_N = mkN "machette";
-machicolation_N = mkN "mâchicoulis" masculine;
+machicolation_N = mkN "mâchicoulis" masculine;
 machination_N = mkN "machination" feminine;
 machine_N = mkN "machine";
 machinery_N = mkN "mécanique" feminine;
@@ -10728,7 +10730,7 @@ macroeconomics_N = mkN "macroéconomie" feminine;
 macron_N = mkN "macron" masculine;
 macrophage_N = mkN "macrophage" masculine;
 macula_N = mkN "macula" feminine;
-mad_A = mkA "fâché" | mkA "fou";
+mad_A = mkA "fâché" | mkA "fou";
 madam_N = mkN "madame" feminine;
 madder_N = mkN "garance";
 madman_N = mkN "fou" masculine;
@@ -10792,8 +10794,8 @@ malacology_N = mkN "malacologie" feminine;
 malady_N = mkN "maladie" feminine;
 malaise_N = mkN "malaise" masculine;
 malaria_N = mkN "paludisme" masculine;
-male_A = mkA "mâle";
-male_N = mkN "mâle" masculine | mkN "homme" masculine;
+male_A = mkA "mâle";
+male_N = mkN "mâle" masculine | mkN "homme" masculine;
 malediction_N = mkN "malédiction" feminine;
 maleficent_A = mkA "maléfique";
 malevolence_N = mkN "malveillance" feminine;
@@ -10951,7 +10953,7 @@ masculinization_N = mkN "masculinisation" feminine;
 mask_N = mkN "masque" masculine | mkN "masque";
 masochism_N = mkN "masochisme" masculine;
 masochist_N = mkN "masochiste";
-mason_N = mkN "maçon" masculine;
+mason_N = mkN "maçon" masculine;
 masquerade_V = mkV (mkV "mascarade");
 mass_N = mkN "masse" feminine | mkN "messe" feminine;
 massacre_N = mkN "massacre" masculine;
@@ -10961,7 +10963,7 @@ massage_V2 = mkV2 (mkV "masser");
 masseur_N = mkN "masseur" masculine;
 massif_N = mkN "massif" masculine;
 massive_A = mkA "massif";
-mast_N = mkN "mât" masculine;
+mast_N = mkN "mât" masculine;
 mastectomy_N = mkN "masectomie" feminine;
 master_N = mkN "maître" masculine;
 masterpiece_N = mkN "chef-d'oeuvre" masculine;
@@ -10995,8 +10997,8 @@ matter_N = mkN "matière" feminine | mkN "affaire" feminine;
 matter_V = mkV (mkV "importer");
 mattock_N = mkN "pioche";
 mattress_N = mkN "matelas" masculine;
-mature_A = mkA "mûr";
-mature_V2 = mkV2 (mkV "mûrir");
+mature_A = mkA "mûr";
+mature_V2 = mkV2 (mkV "mûrir");
 matutinal_A = mkA "matutinal";
 maudlin_A = mkA "larmoyant" | mkA "histrionique";
 maul_N = mkN "merlin" masculine;
@@ -11026,7 +11028,7 @@ meadowlark_N = mkN "sturnelle" feminine;
 meager_A = mkA "maigre";
 meagerness_N = mkN "maigreur" feminine;
 meagre_A = mkA "maigre";
-meal_N = mkN "moûture" feminine | mkN "repas" masculine;
+meal_N = mkN "moûture" feminine | mkN "repas" masculine;
 mealy_A = mkA "farineux";
 mealy_mouthed_A = mkA "hypocrite";
 mean_A = mkA "méchant" | mkA "moyen" | mkA "inférieur";
@@ -11471,7 +11473,7 @@ monetarism_N = mkN "monétarisme" masculine;
 monetary_A = mkA "monétaire";
 money_N = mkN "argent" | mkN "liquide" masculine | mkN "argent" masculine;
 mongoose_N = mkN "mangouste";
-mongrel_N = mkN "bâtard" masculine;
+mongrel_N = mkN "bâtard" masculine;
 monism_N = mkN "monisme" masculine;
 monitor_N = mkN "écran" masculine | mkN "moniteur" masculine;
 monitor_V2 = mkV2 (mkV "contrôler");
@@ -11623,7 +11625,7 @@ mud_N = mkN "boue" feminine;
 muddle_V2 = mkV2 (mkV I.confondre_V2);
 muddy_A = mkA "boueux";
 mudguard_N = mkN "garde-boue" masculine;
-mudra_N = mkN "mudrâ";
+mudra_N = mkN "mudrâ";
 muezzin_N = mkN "muezzin" masculine;
 muff_N = mkN "manchon" masculine;
 muffin_N = mkN "muffin" masculine;
@@ -11633,8 +11635,8 @@ mug_V2 = mkV2 (mkV "agresser");
 muggy_A = mkA "étouffant";
 mugwort_N = mkN "armoise" feminine;
 mujahid_N = mkN "moudjahid" masculine;
-mulatto_N = mkN "mulâtre";
-mulberry_N = mkN "mûrier" | mkN "mûre" feminine;
+mulatto_N = mkN "mulâtre";
+mulberry_N = mkN "mûrier" | mkN "mûre" feminine;
 mulch_N = mkN "paillage" feminine;
 mulch_V2 = mkV2 (mkV "pailler");
 mulct_V2 = mkV2 (mkV "mulcter");
@@ -11698,7 +11700,7 @@ musket_N = mkN "mousquet" masculine;
 musketeer_N = mkN "mousquetaire" masculine;
 muslin_N = mkN "mousseline";
 mussel_N = mkN "moule" feminine;
-must_N = mkN "must" | mkN "moût";
+must_N = mkN "must" | mkN "moût";
 mustard_N = mkN "moutarde" feminine;
 muster_N = mkN "modèle" masculine;
 musty_A = mkA "moisi";
@@ -11806,7 +11808,7 @@ nature_N = mkN "nature" feminine;
 naturism_N = mkN "naturisme" masculine;
 naturopathy_N = mkN "naturopathie" feminine;
 naughty_A = mkA "méchant" | mkA "risqué";
-nausea_N = mkN "haut-le-coeur" masculine | mkN "nausée" feminine | mkN "dégoût" masculine;
+nausea_N = mkN "haut-le-coeur" masculine | mkN "nausée" feminine | mkN "dégoût" masculine;
 nauseous_A = mkA "nauséeux";
 nautical_A = mkA "nautique";
 nautilus_N = mkN "nautilus" masculine;
@@ -11844,7 +11846,7 @@ needle_V2 = mkV2 (mkV I.coudre_V2) | mkV2 (mkV "taquiner");
 needlefish_N = mkN "aiguillette" feminine;
 needless_A = mkA "superflu";
 needlework_N = mkN "ouvrage" masculine;
-nefarious_A = mkA "infâme";
+nefarious_A = mkA "infâme";
 negation_N = mkN "négation" feminine;
 negative_A = mkA "négatif";
 negative_N = mkN "négatif" masculine;
@@ -12124,7 +12126,7 @@ oasis_N = mkN "oasis" feminine;
 oat_N = mkN "avoine" feminine;
 oath_N = mkN "juron" masculine | mkN "serment" masculine;
 oatmeal_N = mkN "gruau" masculine | mkN "grège" masculine;
-obdurate_A = mkA "opiniâtre";
+obdurate_A = mkA "opiniâtre";
 obedience_N = mkN "obéissance" feminine;
 obedient_A = mkA "obéissant";
 obelisk_N = mkN "obélisque" masculine;
@@ -12460,7 +12462,7 @@ outing_N = mkN "outing";
 outlaw_N = mkN "hors-la-loi";
 outlet_N = mkN "issue" feminine | mkN "exutoire" masculine;
 outlier_N = mkN "lambeau" | mkN "valeur";
-outline_N = mkN "contour" masculine | mkN "synopsis" | mkN "aperçu" masculine | mkN "silhouette" feminine | mkN "ébauche" feminine | mkN "esquisse" feminine | mkN "résumé" masculine;
+outline_N = mkN "contour" masculine | mkN "synopsis" | mkN "aperçu" masculine | mkN "silhouette" feminine | mkN "ébauche" feminine | mkN "esquisse" feminine | mkN "résumé" masculine;
 outline_V2 = mkV2 (mkV "entourer");
 outlook_N = mkN "perspective" | mkN "vue" feminine;
 outmoded_A = mkA "dépassé" | mkA "démodé";
@@ -12602,10 +12604,10 @@ palatable_A = mkA "bon" | mkA "passable";
 palatal_A = mkA "palatal";
 palate_N = mkN "palais" masculine;
 palaver_N = mkN "palabre" | mkN "palabres";
-pale_A = mkA "pâle";
+pale_A = mkA "pâle";
 pale_N = mkN "pal";
-pale_V = mkV (mkV "pâlir");
-paleness_N = mkN "pâleur" feminine;
+pale_V = mkV (mkV "pâlir");
+paleness_N = mkN "pâleur" feminine;
 paleoanthropology_N = mkN "paléoanthropologie" feminine;
 paleobotany_N = mkN "paléobotanique" feminine;
 paleontological_A = mkA "paléontologique";
@@ -12621,7 +12623,7 @@ palladium_N = mkN "palladium" masculine;
 pallet_N = mkN "paillasse" feminine | mkN "palette" feminine;
 palliate_V2 = mkV2 (mkV "pallier");
 palliative_A = mkA "palliatif";
-pallor_N = mkN "pâleur" feminine;
+pallor_N = mkN "pâleur" feminine;
 palm_N = mkN "paume" feminine;
 palm_V2 = mkV2 (mkV "enpalmer");
 palpable_A = mkA "palpable";
@@ -12713,8 +12715,8 @@ parasol_N = mkN "ombrelle" feminine;
 paratrooper_N = mkN "para" masculine;
 parcel_N = mkN "parcelle" feminine | mkN "colis" masculine;
 parchment_N = mkN "parchemin" masculine | mkN "vélin" masculine;
-pardon_N = mkN "pardon" masculine | mkN "grâce" feminine;
-pardon_V2 = mkV2 (mkV "grâce") | mkV2 (mkV "pardonner");
+pardon_N = mkN "pardon" masculine | mkN "grâce" feminine;
+pardon_V2 = mkV2 (mkV "grâce") | mkV2 (mkV "pardonner");
 pardonable_A = mkA "pardonnable";
 pare_V2 = mkV2 (mkV "éplucher") | mkV2 (mkV "rogner");
 parent_N = mkN "parent" masculine;
@@ -12793,8 +12795,8 @@ passkey_N = mkN "passe-partout" masculine;
 passport_N = mkN "passeport" masculine;
 past_A = mkA "passé" | mkA "dernier";
 past_N = mkN "passé" masculine;
-pasta_N = mkN "pâtes";
-paste_N = mkN "strass" masculine | mkN "pâte" feminine | mkN "pâte";
+pasta_N = mkN "pâtes";
+paste_N = mkN "strass" masculine | mkN "pâte" feminine | mkN "pâte";
 paste_V2 = mkV2 (mkV "coller");
 pasteurize_V2 = mkV2 (mkV "pasteuriser");
 pastiche_N = mkN "pastiche" masculine;
@@ -12803,8 +12805,8 @@ pastime_N = mkN "passe-temps" masculine;
 pastor_N = mkN "pasteur" masculine;
 pastoral_A = mkA "pastoral";
 pastrami_N = mkN "pastrami" masculine;
-pastry_N = mkN "pâtisserie" feminine;
-pasture_N = mkN "pâture" feminine;
+pastry_N = mkN "pâtisserie" feminine;
+pasture_N = mkN "pâture" feminine;
 pat_V2 = mkV2 (mkV "tapoter");
 pataca_N = mkN "pataca" feminine;
 patch_N = mkN "patch" masculine;
@@ -12820,7 +12822,7 @@ patience_N = mkN "patience" feminine;
 patient_A = mkA "patient";
 patient_N = mkN "patient" masculine;
 patina_N = mkN "patine" feminine | mkN "patène" feminine;
-patisserie_N = mkN "pâtisserie" feminine;
+patisserie_N = mkN "pâtisserie" feminine;
 patriarch_N = mkN "patriarche" masculine;
 patrimony_N = mkN "patrimoine" masculine;
 patriot_N = mkN "patriote";
@@ -13072,7 +13074,7 @@ pervasive_A = mkA "pénétrant";
 perverse_A = mkA "pervers";
 pervert_N = mkN "déviant" masculine | mkN "pervers" masculine;
 peseta_N = mkN "peseta" feminine;
-pesky_A = mkA "agaçant";
+pesky_A = mkA "agaçant";
 peso_N = mkN "peso" masculine;
 pessimism_N = mkN "pessimisme" masculine;
 pessimistic_A = mkA "pessimiste";
@@ -13217,7 +13219,7 @@ pictorial_N = mkN "illustré" masculine;
 picture_N = mkN "cinéma" masculine | mkN "photo" feminine | mkN "image" feminine;
 picturesque_A = mkA "pittoresque";
 pidgin_N = mkN "pidgin" masculine;
-pie_N = mkN "tourte" feminine | mkN "tarte" feminine | mkN "gâteau";
+pie_N = mkN "tourte" feminine | mkN "tarte" feminine | mkN "gâteau";
 piebald_A = mkA "pie";
 piece_N = mkN "pièce" feminine | mkN "morceau" masculine;
 pier_N = mkN "jetée" feminine | mkN "pilier" masculine | mkN "pile" feminine;
@@ -13265,7 +13267,7 @@ pine_V = mkV (mkV "languir");
 pineapple_N = mkN "ananas" masculine;
 pink_A = mkA "rose";
 pink_N = mkN "rose" masculine | mkN "oeillet" masculine;
-pinkish_A = mkA "rosâtre";
+pinkish_A = mkA "rosâtre";
 pinna_N = mkN "pavillon" masculine;
 pinnacle_N = mkN "cime" | mkN "pic";
 pint_N = mkN "chopine" | mkN "demi";
@@ -13345,9 +13347,9 @@ plantain_N = mkN "plantain" masculine;
 plantation_N = mkN "plantation" feminine;
 planter_N = mkN "planteur" masculine;
 plasmid_N = mkN "plasmide";
-plaster_N = mkN "plâtre" masculine | mkN "onguent" masculine;
-plaster_V2 = mkV2 (mkV "plâtrer") | mkV2 (mkV I.enduire_V2);
-plasterer_N = mkN "plâtrier" masculine;
+plaster_N = mkN "plâtre" masculine | mkN "onguent" masculine;
+plaster_V2 = mkV2 (mkV "plâtrer") | mkV2 (mkV I.enduire_V2);
+plasterer_N = mkN "plâtrier" masculine;
 plastic_A = mkA "plastique";
 plasticity_N = mkN "plasticité" feminine;
 plate_N = mkN "plat" masculine | mkN "plaque" feminine | mkN "assiette" feminine | mkN "dentier" masculine | mkN "planche" feminine;
@@ -13365,7 +13367,7 @@ play_N = mkN "jeu" masculine;
 playback_N = mkN "reprise" feminine;
 playboy_N = mkN "playboy" masculine;
 player_N = mkN "joueur" masculine | mkN "lecteur" masculine;
-playful_A = mkA "folâtre";
+playful_A = mkA "folâtre";
 playlist_N = mkN "playlist" feminine;
 playwright_N = mkN "dramaturge";
 plaza_N = mkN "place";
@@ -13393,7 +13395,7 @@ pleurisy_N = mkN "pleurésie" feminine;
 pliable_A = mkA "pliable";
 pliers_N = mkN "pince" feminine;
 plinth_N = mkN "plinthe" masculine;
-plodder_N = mkN "bâilleur";
+plodder_N = mkN "bâilleur";
 plonk_N = mkN "pinard" masculine;
 plosion_N = mkN "plosion" feminine;
 plosive_N = mkN "occlusif" masculine;
@@ -13495,7 +13497,7 @@ polluter_N = mkN "pollueur";
 pollution_N = mkN "défilement" masculine | mkN "pollution" feminine;
 polo_N = mkN "polo" masculine;
 polonium_N = mkN "polonium" masculine;
-poltroon_N = mkN "lâche";
+poltroon_N = mkN "lâche";
 polyandrous_A = mkA "polyandre";
 polyandry_N = mkN "polyandrie";
 polyester_N = mkN "polyester" masculine;
@@ -13546,7 +13548,7 @@ pontificate_V = mkV (mkV "pontifier");
 pontoon_N = mkN "ponton" masculine;
 pony_N = mkN "poney" masculine;
 ponytail_N = mkN "queue-de-cheval" feminine;
-pooch_N = mkN "bâtard" masculine | mkN "clébard" masculine;
+pooch_N = mkN "bâtard" masculine | mkN "clébard" masculine;
 poodle_N = mkN "caniche" masculine;
 poof_N = mkN "tapette" feminine | mkN "pet" masculine;
 pool_N = mkN "piscine" | mkN "piscine" feminine;
@@ -13964,7 +13966,7 @@ prone_A = mkA "enclin" | mkA "prédisposé";
 prong_N = mkN "dent" feminine;
 pronoun_N = mkN "pronom" masculine;
 pronounce_V2 = mkV2 (mkV "déclarer") | mkV2 (mkV "déclamer") | mkV2 (mkV "prononcer");
-pronounceable_A = mkA "prononçable";
+pronounceable_A = mkA "prononçable";
 pronto_Adv = mkAdv "illico";
 pronunciation_N = mkN "prononciation" feminine;
 proof_N = mkN "épreuve" feminine | mkN "preuve" feminine;
@@ -14152,16 +14154,16 @@ pump_N = mkN "pompe" feminine;
 pump_V2 = mkV2 (mkV "pomper");
 pumpkin_N = mkN "citrouille" | mkN "citrouille" feminine;
 pun_N = mkN "calembour" masculine;
-punch_N = mkN "punch" | mkN "poinçon" masculine | mkN "poinçonnage" masculine | mkN "poinçonneuse" feminine;
-punch_V2 = mkV2 (mkV "poinçonner");
+punch_N = mkN "punch" | mkN "poinçon" masculine | mkN "poinçonnage" masculine | mkN "poinçonneuse" feminine;
+punch_V2 = mkV2 (mkV "poinçonner");
 punctilio_N = mkN "pointille" feminine;
 punctilious_A = mkA "pointilleux";
 punctual_A = mkA "ponctuel";
 punctuality_N = mkN "ponctualité" feminine;
 punctuation_N = mkN "ponctuation" feminine;
-puncture_N = mkN "piqûre";
+puncture_N = mkN "piqûre";
 pundit_N = mkN "pandit" masculine | mkN "pontificateur";
-pungent_A = mkA "âcre";
+pungent_A = mkA "âcre";
 punish_V2 = mkV2 (mkV "punir");
 punishable_A = mkA "punissable";
 punishment_N = mkN "punition" feminine;
@@ -14187,7 +14189,7 @@ puritan_A = mkA "puritain";
 purity_N = mkN "pureté" feminine;
 purple_A = mkA "violet";
 purple_N = mkN "violet";
-purplish_A = mkA "violâtre";
+purplish_A = mkA "violâtre";
 purport_V2V = mkV2V (mkV I.prétendre_V2);
 purpose_N = mkN "intention" feminine | mkN "but" masculine | mkN "sujet" masculine;
 purposely_Adv = mkAdv "exprès";
@@ -14214,7 +14216,7 @@ pygmy_N = mkN "pygmée" masculine;
 pylon_N = mkN "pylône" masculine | mkN "pylône";
 pyorrhea_N = mkN "pyorrhée" feminine;
 pyramid_N = mkN "pyramide" feminine;
-pyre_N = mkN "bûcher" masculine;
+pyre_N = mkN "bûcher" masculine;
 pyrimidine_N = mkN "pyrimidine" feminine;
 pyrite_N = mkN "pyrite" feminine;
 pyrolysis_N = mkN "pyrolyse";
@@ -14376,9 +14378,9 @@ rafter_N = mkN "chevron" masculine;
 rag_N = mkN "chiffon" masculine | mkN "haillon" masculine | mkN "rag" masculine | mkN "loque" feminine | mkN "torchon" masculine;
 rage_N = mkN "rage" feminine;
 rage_V = mkV (mkV "rager");
-ragout_N = mkN "ragoût" masculine;
+ragout_N = mkN "ragoût" masculine;
 raid_N = mkN "raid" masculine;
-rail_N = mkN "rails" masculine | mkN "rail" masculine | mkN "râle" masculine;
+rail_N = mkN "rails" masculine | mkN "rail" masculine | mkN "râle" masculine;
 railcar_N = mkN "automotrice" feminine;
 railwayman_N = mkN "cheminot" masculine;
 rain_V2 = mkV2 (mkV I.pleuvoir_V);
@@ -14388,8 +14390,8 @@ rainfall_N = mkN "précipitations" feminine;
 rainy_A = mkA "pluvieux";
 raise_N = mkN "augmentation" feminine;
 raise_V2V = mkV2V (mkV "élever") | mkV2V (mkV "lever");
-rake_N = mkN "roué" masculine | mkN "râteau" masculine | mkN "rame" masculine;
-rake_V2 = mkV2 (mkV "fouiller") | mkV2 (mkV "arroser") | mkV2 (mkV "râtisser");
+rake_N = mkN "roué" masculine | mkN "râteau" masculine | mkN "rame" masculine;
+rake_V2 = mkV2 (mkV "fouiller") | mkV2 (mkV "arroser") | mkV2 (mkV "râtisser");
 rakish_A = mkA "négligé" | mkA "débauché";
 rally_N = mkN "rallye" masculine;
 rally_V2V = mkV2V (mkV "rallier");
@@ -14418,8 +14420,8 @@ rank_N = mkN "rangée" feminine;
 rank_V2 = mkV2 (mkV "coter") | mkV2 (mkV "ranger") | mkV2 (mkV "classer");
 ranking_N = mkN "classement" masculine;
 ransack_V2 = mkV2 (mkV "fouiller");
-ransom_N = mkN "rançon" feminine;
-ransom_V2 = mkV2 (mkV "rançonner");
+ransom_N = mkN "rançon" feminine;
+ransom_V2 = mkV2 (mkV "rançonner");
 rant_N = mkN "harangue" feminine;
 rapacious_A = mkA "rapace";
 rapacity_N = mkN "rapacité" feminine;
@@ -14438,7 +14440,7 @@ rarity_N = mkN "rareté" feminine;
 rascal_N = mkN "fripouille" feminine;
 rash_A = mkA "impulsif";
 rash_N = mkN "irritation" | mkN "épidémie" feminine;
-rasp_N = mkN "râpe" feminine;
+rasp_N = mkN "râpe" feminine;
 rasp_V2 = mkV2 (mkV "grincer");
 raspberry_N = mkN "framboisier" masculine | mkN "framboise" feminine;
 rat_N = mkN "rat" masculine;
@@ -14606,7 +14608,7 @@ recycling_N = mkN "recyclage" masculine;
 red_N = mkN "rouge" masculine;
 redact_V2 = mkV2 (mkV "caviarder");
 redden_V2 = mkV2 (mkV "rougir");
-reddish_A = mkA "rougeâtre";
+reddish_A = mkA "rougeâtre";
 redeem_V2 = mkV2 (mkV "racheter");
 redeemable_A = mkA "remboursable" | mkA "corrigible";
 redeemer_N = mkN "rédempteur" masculine;
@@ -14702,7 +14704,7 @@ rehabilitate_V2 = mkV2 (mkV "réhabiliter");
 rehabilitation_N = mkN "réhabilitation" feminine;
 rehear_V2 = mkV2 (mkV I.réentendre_V2);
 rehearsal_N = mkN "répétition" feminine;
-rehearse_V2 = mkV2 (mkV "répéter") | mkV2 (mkV "rabâcher");
+rehearse_V2 = mkV2 (mkV "répéter") | mkV2 (mkV "rabâcher");
 reign_N = mkN "règne" masculine;
 reign_V = mkV (mkV "régner");
 reimburse_V2 = mkV2 (mkV "rembourser");
@@ -14730,12 +14732,12 @@ relative_A = mkA "relatif";
 relative_N = mkN "parent" masculine;
 relativism_N = mkN "relativisme" masculine;
 relativity_N = mkN "relativité" feminine;
-relax_V2 = mkV2 (reflV (mkV I.détendre_V2)) | mkV2 (mkV "relâcher");
+relax_V2 = mkV2 (reflV (mkV I.détendre_V2)) | mkV2 (mkV "relâcher");
 relaxation_N = mkN "relaxation" | mkN "relaxation" feminine;
 relay_N = mkN "relais" masculine;
 relay_V2 = mkV2 (mkV I.transmettre_V2) | mkV2 (mkV "relayer");
 release_N = mkN "version" feminine;
-release_V2 = mkV2 (mkV "lâcher") | mkV2 (mkV I.sortir_V);
+release_V2 = mkV2 (mkV "lâcher") | mkV2 (mkV I.sortir_V);
 relegate_V2 = mkV2 (mkV "reléguer");
 relegation_N = mkN "relégation" feminine;
 relentless_A = mkA "implacable";
@@ -14749,7 +14751,7 @@ relic_N = mkN "relique";
 relief_N = mkN "relief" masculine | mkN "soulagement" masculine | mkN "relève" feminine;
 relieve_V2 = mkV2 (mkV "soulager");
 religious_A = mkA "religieux";
-relinquish_V2 = mkV2 (mkV "(re)lâcher") | mkV2 (mkV "abandonner");
+relinquish_V2 = mkV2 (mkV "(re)lâcher") | mkV2 (mkV "abandonner");
 reliquary_N = mkN "reliquaire" masculine;
 relish_N = mkN "relish" feminine;
 relish_V2 = mkV2 (mkV "parfumer") | mkV2 (mkV "savourer");
@@ -14815,8 +14817,8 @@ repertoire_N = mkN "répertoire";
 repetition_N = mkN "répétition" feminine;
 repetitive_A = mkA "répétitif";
 replace_V2 = mkV2 (mkV "remplacer");
-replaceable_A = mkA "remplaçable";
-replacement_N = mkN "remplaçant" masculine;
+replaceable_A = mkA "remplaçable";
+replacement_N = mkN "remplaçant" masculine;
 replenish_V2 = mkV2 (mkV "réapprovisionner");
 replica_N = mkN "réplique" feminine;
 replication_N = mkN "réponse" feminine | mkN "duplicata" masculine | mkN "réplication" feminine;
@@ -14828,7 +14830,7 @@ reportedly_Adv = mkAdv "supposément";
 reporterMasc_N = mkN "reporter" masculine;
 reporterFem_N = mkN "reporter" feminine;
 repository_N = mkN "tombeau" masculine | mkN "chambre-forte" feminine | mkN "dépôt";
-reprehensible_A = mkA "blâmable" | mkA "répréhensible";
+reprehensible_A = mkA "blâmable" | mkA "répréhensible";
 represent_V2 = mkV2 (mkV "représenter") | mkV2 (mkV "jouer");
 representation_N = mkN "représentation";
 repress_V2 = mkV2 (mkV "réprimer") | mkV2 (mkV I.retenir_V2);
@@ -15052,7 +15054,7 @@ ridge_N = mkN "crête" feminine | mkN "dorsale" feminine | mkN "faîte" masculin
 ridiculous_A = mkA "ridicule";
 rifle_N = mkN "fusil" masculine;
 rig_N = mkN "costume" masculine | mkN "grééments" | mkN "foreuse" feminine;
-rig_V2 = mkV2 (reflV (mkV "cuirasser")) | mkV2 (mkV "bâcler") | mkV2 (mkV "truquer");
+rig_V2 = mkV2 (reflV (mkV "cuirasser")) | mkV2 (mkV "bâcler") | mkV2 (mkV "truquer");
 rigging_N = mkN "gréement" masculine;
 right_A = mkA "droit" | mkA "correct";
 right_N = mkN "droit" masculine | mkN "droite" feminine;
@@ -15072,13 +15074,13 @@ ring_N = mkN "anneau" masculine | mkN "piste" feminine | mkN "cercle" masculine
 ring_4_V2 = mkV2 (mkV "sonner");
 ringgit_N = mkN "ringgit" masculine;
 ringworm_N = mkN "teigne" feminine;
-rinse_N = mkN "rinçage" masculine;
+rinse_N = mkN "rinçage" masculine;
 rinse_V2 = mkV2 (mkV "rincer");
 riot_N = mkN "émeute" feminine;
 rioter_N = mkN "émeutier" masculine;
 rip_V2 = mkV2 (mkV "ripper");
-ripe_A = mkA "mûr" | mkA "accompli";
-ripen_V2 = mkV2 (mkV "mûrir");
+ripe_A = mkA "mûr" | mkA "accompli";
+ripen_V2 = mkV2 (mkV "mûrir");
 rip_off_N = mkN "arnaque" feminine;
 riposte_N = mkN "riposte";
 ripper_N = mkN "éventreur" masculine;
@@ -15150,7 +15152,7 @@ rorqual_N = mkN "rorqual" masculine;
 rosary_N = mkN "rosaire";
 rose_A = mkA "rose";
 rose_N = mkN "rosacée" feminine | mkN "rose" feminine | mkN "pomme";
-roseate_A = mkA "rosâtre";
+roseate_A = mkA "rosâtre";
 rosemary_N = mkN "romarin" masculine;
 rosin_N = mkN "colophane" feminine;
 roster_N = mkN "liste" feminine;
@@ -15170,7 +15172,7 @@ roundel_N = mkN "cocarde";
 rouse_V2 = mkV2 (mkV "éveiller");
 rout_N = mkN "raout" masculine;
 route_N = mkN "route" feminine;
-router_N = mkN "routeur" | mkN "défonçeuse";
+router_N = mkN "routeur" | mkN "défonçeuse";
 routine_N = mkN "routine" feminine;
 row_N = mkN "ligne" feminine;
 row_V2 = mkV2 (mkV "ramer");
@@ -15201,7 +15203,7 @@ rug_N = mkN "tapis";
 rugby_N = mkN "rugby" masculine;
 rugged_A = mkA "turbulent" | mkA "robuste";
 ruin_N = mkN "ruine" feminine;
-ruin_V2 = mkV2 (mkV "ruiner") | mkV2 (mkV "abîmer") | mkV2 (mkV "gâcher");
+ruin_V2 = mkV2 (mkV "ruiner") | mkV2 (mkV "abîmer") | mkV2 (mkV "gâcher");
 rule_V2 = mkV2 (mkV "gouverner");
 ruler_N = mkN "dirigeant" feminine | mkN "règle" feminine;
 rulership_N = mkN "pouvoir";
@@ -15232,7 +15234,7 @@ rupee_N = mkN "roupie" feminine;
 rupture_N = mkN "rupture" feminine;
 rural_A = mkA "rural";
 ruse_N = mkN "ruse" feminine;
-rush_N = mkN "hâte" feminine | mkN "jonc" masculine;
+rush_N = mkN "hâte" feminine | mkN "jonc" masculine;
 rush_V2V = mkV2V (reflV (mkV "dépêcher"));
 rusk_N = mkN "biscotte";
 rust_N = mkN "rouille" feminine;
@@ -15284,10 +15286,10 @@ sadistic_A = mkA "sadique";
 sadness_N = mkN "tristesse" feminine;
 sadomasochism_N = mkN "sadomasochisme" masculine;
 safari_N = mkN "safari" masculine;
-safe_A = mkA "sauf" | mkA "sûr";
+safe_A = mkA "sauf" | mkA "sûr";
 safe_N = mkN "coffre-fort" masculine;
 safe_conduct_N = mkN "sauf-conduit" masculine;
-safety_N = mkN "sécurité" feminine | mkN "sûreté" feminine;
+safety_N = mkN "sécurité" feminine | mkN "sûreté" feminine;
 saffron_N = mkN "safran";
 sage_A = mkA "raisonnable";
 sage_N = mkN "sauge" feminine | mkN "sage" masculine;
@@ -15412,8 +15414,8 @@ saucepan_N = mkN "casserole" feminine;
 saucer_N = mkN "soucoupe" feminine;
 sauerkraut_N = mkN "choucroute" feminine;
 sauna_N = mkN "sauna" feminine;
-saunter_N = mkN "flâner";
-saunter_V = mkV (mkV "flâner");
+saunter_N = mkN "flâner";
+saunter_V = mkV (mkV "flâner");
 sausage_N = mkN "saucisson" masculine | mkN "saucisse" feminine;
 savagery_N = mkN "sauvagerie" feminine;
 savanna_N = mkN "savane" feminine;
@@ -15432,7 +15434,7 @@ saxophone_N = mkN "saxophone" masculine;
 saxophonist_N = mkN "saxophoniste";
 say_V2 = mkV2 (mkV "disons") | mkV2 (mkV I.dire_V2) | mkV2 (mkV "indiquer");
 saying_N = mkN "dicton" masculine;
-scab_N = mkN "croûte";
+scab_N = mkN "croûte";
 scabbard_N = mkN "fourreau" masculine;
 scabies_N = mkN "gale" feminine;
 scaffold_N = mkN "échafaud" masculine;
@@ -15627,7 +15629,7 @@ section_N = mkN "section";
 sector_N = mkN "secteur";
 secular_A = mkA "séculaire" | mkA "profane" | mkA "séculier";
 secularism_N = mkN "sécularisme" masculine;
-secure_A = mkA "sûr";
+secure_A = mkA "sûr";
 security_N = mkN "titre" masculine | mkN "sécurité" feminine;
 sedan_N = mkN "berline" feminine | mkN "palanquin" masculine;
 sedative_A = mkA "sédatif";
@@ -15651,7 +15653,7 @@ seeker_N = mkN "demandeur";
 seem_V2 = mkV2 (mkV "sembler");
 seer_N = mkN "voyant";
 seersucker_N = mkN "crépon" masculine;
-seesaw_N = mkN "balançoire" feminine;
+seesaw_N = mkN "balançoire" feminine;
 seethe_V2 = mkV2 (mkV "bouillonner");
 segment_N = mkN "segment" masculine;
 segment_V2 = mkV2 (mkV "segmenter");
@@ -15826,7 +15828,7 @@ sexton_N = mkN "sacristain" masculine;
 sexual_A = mkA "sexuel";
 sexuality_N = mkN "sexualité" feminine | mkN "sexe" masculine;
 sexy_A = mkA "sexy";
-shabby_A = mkA "râpé" | mkA "minable";
+shabby_A = mkA "râpé" | mkA "minable";
 shack_N = mkN "cabanon" masculine;
 shackle_N = mkN "menottes" | mkN "manille" feminine;
 shackle_V2 = mkV2 (mkV "enchainer");
@@ -15850,7 +15852,7 @@ shallow_N = mkN "haut-fond" masculine;
 sham_N = mkN "faux-semblant" masculine | mkN "feinte" feminine;
 sham_V2 = mkV2 (mkV "tromper");
 shaman_N = mkN "chaman" masculine;
-shambles_N = mkN "capharnaüm" masculine | mkN "fouillis" masculine;
+shambles_N = mkN "capharnaüm" masculine | mkN "fouillis" masculine;
 shame_N = mkN "honte" feminine;
 shameful_A = mkA "honteux";
 shamelessness_N = mkN "dévergondage" feminine;
@@ -15868,12 +15870,12 @@ shareholder_N = mkN "actionnaire";
 shareware_N = mkN "shareware" masculine;
 shark_N = mkN "requin" masculine;
 sharpen_V2 = mkV2 (mkV "affiler");
-sharpener_N = mkN "affûteuse" feminine;
+sharpener_N = mkN "affûteuse" feminine;
 sharpness_N = mkN "tranchant" masculine | mkN "finesse" feminine | mkN "netteté" feminine | mkN "acuité" feminine | mkN "acidité" feminine;
 shatter_V2 = mkV2 (mkV "fracasser") | mkV2 (mkV "éclater");
 shave_V2 = mkV2 (mkV "raser") | mkV2 (reflV (mkV "raser"));
 shaven_A = mkA "rasé";
-shawl_N = mkN "châle" masculine;
+shawl_N = mkN "châle" masculine;
 sheaf_N = mkN "faisceau" masculine;
 shear_N = mkN "cisailles" | mkN "tonte" feminine;
 shear_V2 = mkV2 (mkV "couper") | mkV2 (mkV "cisailler") | mkV2 (mkV I.tondre_V2);
@@ -15947,7 +15949,7 @@ shopperFem_N = mkN "acheteuse" feminine;
 shopping_N = mkN "shopping" masculine;
 shore_N = mkN "bord" masculine;
 shoreline_N = mkN "rivage" masculine;
-shoring_N = mkN "étançonnement" masculine;
+shoring_N = mkN "étançonnement" masculine;
 short_V2 = mkV2 (mkV "court-circuiter");
 shortage_N = mkN "défaut" masculine;
 shortcoming_N = mkN "défaut";
@@ -15969,7 +15971,7 @@ shower_N = mkN "averse" feminine | mkN "douche" feminine;
 shower_V2 = mkV2 (mkV "doucher");
 showman_N = mkN "showman" masculine;
 showroom_N = mkN "showroom" masculine;
-showy_A = mkA "tape-à-l'oeil";
+showy_A = mkA "tape-à-l'oeil";
 shrapnel_N = mkN "shrapnel" masculine;
 shred_N = mkN "lambeau" masculine;
 shred_V2 = mkV2 (mkV "déchiqueter") | mkV2 (mkV I.fondre_V2);
@@ -16172,7 +16174,7 @@ skirt_N = mkN "jupe" feminine;
 skit_N = mkN "sketch" masculine;
 skua_N = mkN "labbe" feminine;
 skulk_V = mkV (reflV (mkV "cacher"));
-skull_N = mkN "crâne" masculine;
+skull_N = mkN "crâne" masculine;
 skullcap_N = mkN "scutellaire" feminine | mkN "kippa" feminine;
 skunk_N = mkN "moufette" feminine;
 skydiving_N = mkN "parachutisme" masculine;
@@ -16193,7 +16195,7 @@ slang_N = mkN "argot" masculine;
 slant_N = mkN "connotation" feminine | mkN "biais" feminine;
 slant_V2 = mkV2 (mkV "biaiser") | mkV2 (mkV "incliner");
 slap_N = mkN "claque" feminine;
-slapdash_A = mkA "bâclé";
+slapdash_A = mkA "bâclé";
 slapper_N = mkN "putain" feminine;
 slash_N = mkN "entaille" feminine;
 slash_V2 = mkV2 (mkV "entailler");
@@ -16239,7 +16241,7 @@ slip_N = mkN "glissade" feminine | mkN "fiche" feminine;
 slip_V2 = mkV2 (mkV "glisser");
 slipper_N = mkN "chausson" masculine;
 slippery_A = mkA "glissant";
-slipshod_A = mkA "bâclé";
+slipshod_A = mkA "bâclé";
 slit_N = mkN "fente" feminine;
 slither_V = mkV (mkV "glisser");
 sliver_N = mkN "languette" | mkN "tour" | mkN "écharde";
@@ -16300,7 +16302,7 @@ smug_A = mkA "suffisant";
 smuggler_N = mkN "contrebandier" masculine;
 smuggling_N = mkN "trafique" masculine;
 smugness_N = mkN "indulgence" feminine;
-snack_N = mkN "casse-croûte";
+snack_N = mkN "casse-croûte";
 snag_N = mkN "pépin" masculine;
 snail_N = mkN "escargot" masculine;
 snake_V = mkV (mkV "serpenter");
@@ -16484,9 +16486,9 @@ sorry_Interj = mkInterj "désolé";
 sort_N = mkN "triage" masculine | mkN "tri" masculine | mkN "type" masculine;
 sort_V2 = mkV2 (mkV "trier");
 sorting_N = mkN "classement";
-so_so_Adv = mkAdv "couci-couça";
+so_so_Adv = mkAdv "couci-couça";
 sot_N = mkN "sot" masculine;
-soul_N = mkN "âme" feminine | mkN "soul" feminine;
+soul_N = mkN "âme" feminine | mkN "soul" feminine;
 sound_A = mkA "complet" | mkA "sain";
 sound_N = mkN "sonde" feminine | mkN "son" masculine;
 sound_V2 = mkV2 (mkV "exprimer") | mkV2 (mkV "sonder") | mkV2 (mkV "sonner") | mkV2 (mkV "prononcer") | mkV2 (mkV "tester");
@@ -16634,7 +16636,7 @@ splinter_N = mkN "faction" feminine | mkN "éclat" masculine;
 splurge_V = mkV (reflV (mkV "ruer"));
 splutter_V2 = mkV2 (mkV "postillonner");
 spoil_N = mkN "butin";
-spoil_V2 = mkV2 (mkV "gâter");
+spoil_V2 = mkV2 (mkV "gâter");
 spoiler_N = mkN "aileron" masculine | mkN "spoiler" masculine;
 spoilsport_N = mkN "rabat-joie" masculine;
 spoke_N = mkN "rayon" masculine;
@@ -16707,7 +16709,7 @@ squabble_V = mkV (reflV (mkV "chamailler"));
 squadron_N = mkN "escadron" masculine;
 squall_N = mkN "grain" masculine;
 squall_V = mkV (mkV "hurler");
-squander_V2 = mkV2 (mkV "gâcher");
+squander_V2 = mkV2 (mkV "gâcher");
 square_A = mkA "carré";
 square_N = mkN "case" feminine | mkN "place" feminine | mkN "carré" masculine | mkN "carreau" masculine | mkN "équerre" feminine;
 squash_N = mkN "courge" feminine | mkN "squash" masculine;
@@ -16743,7 +16745,7 @@ stack_N = mkN "pile" feminine;
 stack_V2 = mkV2 (mkV "empiler");
 stacker_N = mkN "gerbeur" masculine;
 stadium_N = mkN "stade" masculine;
-staff_N = mkN "personnel" masculine | mkN "portée" feminine | mkN "bâton" masculine;
+staff_N = mkN "personnel" masculine | mkN "portée" feminine | mkN "bâton" masculine;
 stag_N = mkN "boeuf" | mkN "cerf" masculine;
 stage_N = mkN "scène" feminine | mkN "calèche" feminine | mkN "étape" feminine | mkN "platine" feminine;
 stage_V2 = mkV2 (mkV "organiser");
@@ -16803,7 +16805,7 @@ startle_V2 = mkV2 (mkV I.surprendre_V2) | mkV2 (mkV "sursauter");
 startup_N = mkN "startup" feminine;
 starvation_N = mkN "inanition" feminine;
 starve_V2 = mkV2 (mkV "affamer");
-state_N = mkN "état" masculine | mkN "État" masculine;
+state_N = mkN "état" masculine ;
 state_V2 = mkV2 (mkV "déclarer");
 stateless_A = mkA "apatride";
 statement_N = mkN "instruction" feminine | mkN "relevé" masculine | mkN "déclaration" feminine;
@@ -16872,7 +16874,7 @@ stertorous_A = mkA "stertoreux";
 stethoscope_N = mkN "stéthoscope" masculine;
 stevedore_N = mkN "stevedore" masculine;
 stevia_N = mkN "stévie" | mkN "stévia" feminine;
-stew_N = mkN "ragoût" masculine;
+stew_N = mkN "ragoût" masculine;
 stew_V2 = mkV2 (mkV "frémir") | mkV2 (mkV "transpirer");
 steward_N = mkN "intendant" masculine;
 stewardship_N = mkN "intendant" masculine;
@@ -16904,7 +16906,7 @@ stimulate_V2 = mkV2 (mkV "stimuler");
 stimulating_A = mkA "stimulant";
 stimulation_N = mkN "stimulation" feminine;
 stimulus_N = mkN "stimulus" masculine;
-sting_N = mkN "piqûre" feminine;
+sting_N = mkN "piqûre" feminine;
 sting_V2 = mkV2 (mkV "piquer");
 stinger_N = mkN "aiguillon" masculine;
 stinginess_N = mkN "avarice";
@@ -17005,7 +17007,7 @@ stress_N = mkN "stress" masculine | mkN "accentuation" feminine | mkN "tension"
 stress_V2 = mkV2 (mkV "stresser") | mkV2 (mkV "souligner") | mkV2 (mkV "emphaser");
 stretch_N = mkN "étirement";
 stretch_V2 = mkV2 (reflV (mkV I.étendre_V2)) | mkV2 (reflV (mkV "étirer")) | mkV2 (mkV I.étendre_V2);
-stretcher_N = mkN "paneresse" feminine | mkN "châssis" masculine | mkN "civière" feminine;
+stretcher_N = mkN "paneresse" feminine | mkN "châssis" masculine | mkN "civière" feminine;
 stretcher_bearer_N = mkN "brancardier" masculine;
 strew_V2 = mkV2 (mkV "parsemer");
 strict_A = mkA "strict";
@@ -17027,7 +17029,7 @@ strive_V = mkV (reflV (mkV "efforcer"));
 stroke_N = mkN "coup" masculine | mkN "trait" masculine | mkN "brasse" feminine | mkN "caresse" feminine;
 stroke_V2 = mkV2 (mkV "caresser");
 stroll_N = mkN "promenade" feminine;
-stroll_V = mkV (mkV "flâner");
+stroll_V = mkV (mkV "flâner");
 stroller_N = mkN "landau" masculine;
 strong_A = mkA "solide" | mkA "fort";
 stronghold_N = mkN "bastion" masculine;
@@ -17055,7 +17057,7 @@ study_V2 = mkV2 (mkV "étudier");
 stuff_N = mkN "truc" | mkN "substance";
 stuff_V2 = mkV2 (mkV "péter") | mkV2 (mkV "fourrer") | mkV2 (mkV I.mettre_V2);
 stuffing_N = mkN "farce" feminine;
-stuffy_A = mkA "fâché";
+stuffy_A = mkA "fâché";
 stumble_N = mkN "chute" feminine | mkN "bourde" feminine;
 stumble_V = mkV (mkV "butter") | mkV (mkV "trébucher");
 stump_N = mkN "estompe" feminine | mkN "souche" feminine;
@@ -17073,7 +17075,7 @@ stye_N = mkN "orgelet" masculine;
 style_N = mkN "modèle" masculine;
 stylish_A = mkA "élégant";
 stylist_N = mkN "styliste";
-stylus_N = mkN "stylet" masculine | mkN "saphir" masculine | mkN "stylo" masculine | mkN "poinçon";
+stylus_N = mkN "stylet" masculine | mkN "saphir" masculine | mkN "stylo" masculine | mkN "poinçon";
 stymie_V2 = mkV2 (mkV "obstruer");
 subaltern_N = mkN "subalterne";
 subarctic_A = mkA "subarctique";
@@ -17130,7 +17132,7 @@ substance_N = mkN "substance" feminine;
 substantial_A = mkA "substantiel";
 substantive_A = mkA "direct" | mkA "substantif";
 substantive_N = mkN "substantif" masculine;
-substitute_N = mkN "remplaçant" masculine;
+substitute_N = mkN "remplaçant" masculine;
 substitution_N = mkN "remplacement" masculine;
 substrate_N = mkN "substrat" masculine;
 subsume_V2 = mkV2 (mkV "généraliser") | mkV2 (mkV "subsumer");
@@ -17281,7 +17283,7 @@ supremacy_N = mkN "suprématie" feminine;
 supreme_A = mkA "suprême";
 sura_N = mkN "sourate" feminine;
 surcharge_N = mkN "surcharge" feminine;
-sure_A = mkA "sûr";
+sure_A = mkA "sûr";
 surf_N = mkN "brisants";
 surface_N = mkN "surface" feminine;
 surfer_N = mkN "surfeur" masculine | mkN "internaute";
@@ -17304,7 +17306,7 @@ surrealist_N = mkN "surréaliste";
 surrender_N = mkN "capitulation" feminine;
 surrender_V2 = mkV2 (mkV "capituler");
 surreptitious_A = mkA "furtif";
-surrogate_N = mkN "substitut" masculine | mkN "remplaçant" masculine;
+surrogate_N = mkN "substitut" masculine | mkN "remplaçant" masculine;
 surround_V2 = mkV2 (mkV "entourer") | mkV2 (mkV I.enceindre_V2);
 surveillance_N = mkN "surveillance" feminine;
 survey_N = mkN "enquête" feminine | mkN "reconnaissance" feminine | mkN "arpentage" masculine;
@@ -17316,18 +17318,18 @@ survivor_N = mkN "survivant" masculine;
 susceptible_A = mkA "susceptible";
 sushi_N = mkN "sushi" masculine;
 suslik_N = mkN "souslik" masculine;
-suspect_V2 = mkV2 (mkV "soupçonner");
+suspect_V2 = mkV2 (mkV "soupçonner");
 suspend_V2 = mkV2 (mkV I.suspendre_V2);
 suspender_N = mkN "jarretelle" feminine | mkN "bretelles";
-suspicion_N = mkN "suspicion" feminine | mkN "soupçon";
-suspicious_A = mkA "suspect" | mkA "soupçonneux";
+suspicion_N = mkN "suspicion" feminine | mkN "soupçon";
+suspicious_A = mkA "suspect" | mkA "soupçonneux";
 sustain_V2 = mkV2 (mkV I.maintenir_V2) | mkV2 (mkV I.subvenir_V2);
 sustainability_N = mkN "soutenabilité" feminine | mkN "durabilité" feminine;
 sustainable_A = mkA "durable" | mkA "viable";
 suture_N = mkN "suture" feminine;
 swaddle_V2 = mkV2 (mkV "emmailloter");
 swag_N = mkN "balluchon" | mkN "butin" masculine;
-swagger_N = mkN "hâblerie" feminine;
+swagger_N = mkN "hâblerie" feminine;
 swagger_V = mkV (reflV (mkV "pavaner"));
 swallow_N = mkN "hirondelle" feminine;
 swallow_V2 = mkV2 (mkV "avaler");
@@ -17340,7 +17342,7 @@ swap_V2 = mkV2 (mkV "échanger");
 sward_N = mkN "pelouse" feminine | mkN "gazon" masculine;
 swarm_N = mkN "nuée" feminine | mkN "essaim";
 swarm_V2 = mkV2 (mkV "grouiller");
-swashbuckler_N = mkN "fier-à-bras";
+swashbuckler_N = mkN "fier-à-bras";
 swashbuckling_A = mkA "truculent";
 swastika_N = mkN "svastika" masculine;
 swat_V2 = mkV2 (mkV "frapper");
@@ -17374,7 +17376,7 @@ swindle_N = mkN "escroquerie" feminine;
 swindle_V2 = mkV2 (mkV "escroquer") | mkV2 (mkV "entourlouper");
 swindler_N = mkN "escroc";
 swine_N = mkN "porc" masculine;
-swing_N = mkN "revirement" masculine | mkN "balançoire" feminine | mkN "balancement" masculine | mkN "swing" masculine | mkN "Swing" masculine;
+swing_N = mkN "revirement" masculine | mkN "balançoire" feminine | mkN "balancement" masculine | mkN "swing" masculine | mkN "Swing" masculine;
 swing_V2 = mkV2 (mkV "osciller") | mkV2 (mkV "swinguer") | mkV2 (reflV (mkV "balancer"));
 swinger_N = mkN "échangiste";
 swipe_V2 = mkV2 (mkV "glisser");
@@ -17388,7 +17390,7 @@ sword_N = mkN "épée" feminine;
 swordfish_N = mkN "espadon" masculine;
 swordsman_N = mkN "épéiste";
 swot_N = mkN "boulot" masculine;
-swot_V2 = mkV2 (mkV "bûcher");
+swot_V2 = mkV2 (mkV "bûcher");
 sybarite_N = mkN "sybarite" masculine;
 sycamore_N = mkN "platane" masculine;
 sycophancy_N = mkN "flagornerie" feminine;
@@ -17517,7 +17519,7 @@ tame_V2 = mkV2 (mkV "apprivoiser");
 tamer_N = mkN "dresseur" masculine;
 tamper_V = mkV (mkV "altérer");
 tampon_N = mkN "tampon" masculine;
-tan_A = mkA "hâlé";
+tan_A = mkA "hâlé";
 tan_N = mkN "bronzage" masculine;
 tan_V2 = mkV2 (mkV "bronzer") | mkV2 (mkV "tanner");
 tandem_N = mkN "tandem" masculine;
@@ -17556,7 +17558,7 @@ target_N = mkN "cible" feminine;
 target_V2V = mkV2V (mkV "cibler");
 tarmac_N = mkN "tarmac" masculine;
 tarn_N = mkN "lac";
-tarpaulin_N = mkN "bâche" feminine | mkN "bâche";
+tarpaulin_N = mkN "bâche" feminine | mkN "bâche";
 tarpon_N = mkN "tarpon" masculine;
 tarragon_N = mkN "estragon";
 tarsal_A = mkA "tarsien";
@@ -17566,12 +17568,12 @@ tart_A = mkA "amer";
 tart_N = mkN "tarte" | mkN "putain" | mkN "salope";
 tartan_N = mkN "tartane" feminine | mkN "tartan" masculine;
 tartar_N = mkN "tartre" masculine;
-task_N = mkN "corvée" feminine | mkN "tâche" feminine | mkN "tâche";
-taste_N = mkN "avant-goût" masculine | mkN "goût" masculine;
-taste_V2 = mkV2 (mkV "goûter");
+task_N = mkN "corvée" feminine | mkN "tâche" feminine | mkN "tâche";
+taste_N = mkN "avant-goût" masculine | mkN "goût" masculine;
+taste_V2 = mkV2 (mkV "goûter");
 tastebud_N = mkN "papille" feminine;
 tasteless_A = mkA "fade";
-taster_N = mkN "goûteur" masculine;
+taster_N = mkN "goûteur" masculine;
 tasting_N = mkN "dégustation" feminine;
 tasty_A = mkA "savoureux" | mkA "élégant";
 tatter_N = mkN "lambeau" masculine;
@@ -17596,7 +17598,7 @@ taxidermy_N = mkN "taxidermie" feminine;
 taximeter_N = mkN "taximètre" masculine;
 taxonomy_N = mkN "taxinomie" feminine;
 taxpayer_N = mkN "contribuable";
-tea_N = mkN "thé" masculine | mkN "tisane" feminine | mkN "goûter" masculine;
+tea_N = mkN "thé" masculine | mkN "tisane" feminine | mkN "goûter" masculine;
 teach_V2V = mkV2V (mkV "guider") | mkV2V (mkV "enseigner");
 teaching_N = mkN "enseignement" masculine | mkN "doctrine" feminine;
 teak_N = mkN "teck" masculine;
@@ -17763,7 +17765,7 @@ thanks_Interj = mkInterj "merci";
 thatch_N = mkN "chaume" masculine;
 thaw_N = mkN "dégel";
 thaw_V2 = mkV2 (mkV "dégeler");
-theatrical_A = mkA "théâtral";
+theatrical_A = mkA "théâtral";
 theft_N = mkN "vol" masculine;
 theism_N = mkN "théisme" masculine;
 thematic_A = mkA "thématique";
@@ -17824,7 +17826,7 @@ thirst_N = mkN "soif" feminine;
 thirst_V2 = mkV2 (mkV "désirer");
 thirsty_A = mkA "assoiffé";
 thistle_N = mkN "chardon" masculine;
-thither_Adv = mkAdv "là";
+thither_Adv = mkAdv "là";
 thong_N = mkN "tongs" | mkN "lanière" feminine;
 thorax_N = mkN "thorax" masculine;
 thorium_N = mkN "thorium" masculine;
@@ -17875,7 +17877,7 @@ thug_N = mkN "bandit" masculine;
 thulium_N = mkN "thulium" masculine;
 thumb_N = mkN "pouce" masculine;
 thumb_V2 = mkV2 (mkV "feuilleter");
-thumbnail_N = mkN "l'ongle" | mkN "croquis" masculine | mkN "aperçu" masculine;
+thumbnail_N = mkN "l'ongle" | mkN "croquis" masculine | mkN "aperçu" masculine;
 thumbtack_N = mkN "punaise";
 thump_V2 = mkV2 (mkV "tambouriner");
 thunder_N = mkN "tonnerre" masculine;
@@ -17991,7 +17993,7 @@ tolerate_V2 = mkV2 (mkV "tolérer");
 toll_N = mkN "péage" masculine;
 toll_V2 = mkV2 (mkV "sonner");
 toluene_N = mkN "toluène" masculine;
-tom_N = mkN "mâle" masculine | mkN "matou";
+tom_N = mkN "mâle" masculine | mkN "matou";
 tomahawk_N = mkN "tomahawk" masculine;
 tomato_N = mkN "tomate" feminine;
 tomb_N = mkN "tombe" feminine;
@@ -18011,7 +18013,7 @@ tonsillitis_N = mkN "amygdalite" feminine;
 tonsure_N = mkN "tonsure" feminine;
 too_Adv = mkAdv "trop" | mkAdv "aussi";
 tool_N = mkN "outil" masculine | mkN "mouton" masculine;
-tool_V2 = mkV2 (mkV "façonner");
+tool_V2 = mkV2 (mkV "façonner");
 toolbox_N = mkN "toolbox" feminine;
 toot_N = mkN "prout";
 toothless_A = mkA "édenté";
@@ -18100,7 +18102,7 @@ tractor_N = mkN "tracteur" masculine;
 trade_N = mkN "commerce" masculine;
 trade_V2 = mkV2 (mkV "échanger");
 tradeoff_N = mkN "compromis";
-trader_N = mkN "commerçant" masculine;
+trader_N = mkN "commerçant" masculine;
 tradesman_N = mkN "artisan" masculine;
 tradition_N = mkN "tradition" feminine;
 traditional_A = mkA "traditionnel";
@@ -18254,7 +18256,7 @@ tricycle_N = mkN "tricycle" masculine;
 trident_N = mkN "trident" masculine;
 triennial_A = mkA "triennal";
 trifle_N = mkN "broutille" feminine | mkN "babiole" feminine | mkN "bagatelle" feminine;
-trigger_N = mkN "gâchette" | mkN "gâchette" feminine;
+trigger_N = mkN "gâchette" | mkN "gâchette" feminine;
 triggerfish_N = mkN "baliste" masculine;
 trigonometric_A = mkA "trigonométrique";
 trigonometry_N = mkN "trigonométrie" feminine;
@@ -18318,7 +18320,7 @@ troublesome_A = mkA "gênant";
 trough_N = mkN "gouttière" | mkN "thalweg" masculine | mkN "creux" masculine | mkN "auge";
 troupe_N = mkN "troupe" feminine;
 trout_N = mkN "truite" feminine;
-trowel_N = mkN "déplantoir" masculine | mkN "truelle" feminine | mkN "gâche" feminine;
+trowel_N = mkN "déplantoir" masculine | mkN "truelle" feminine | mkN "gâche" feminine;
 truce_N = mkN "trêve" feminine;
 truck_N = mkN "camion" masculine;
 truculent_A = mkA "agressif";
@@ -18430,7 +18432,7 @@ twitch_N = mkN "tic" masculine;
 twitch_V2 = mkV2 (mkV "spasmer");
 two_faced_A = mkA "fourbe";
 tycoon_N = mkN "magnat" masculine;
-tyke_N = mkN "bâtard" masculine;
+tyke_N = mkN "bâtard" masculine;
 type_N = mkN "caractère" masculine | mkN "type" masculine;
 type_V2 = mkV2 (mkV "taper");
 typescript_N = mkN "tapuscrit" masculine;
@@ -18525,7 +18527,7 @@ underling_N = mkN "subordonné" masculine;
 underlying_A = mkA "sous-jacent";
 undermine_V2 = mkV2 (mkV "saper");
 underneath_Adv = mkAdv "dessous";
-underpants_N = mkN "caleçon";
+underpants_N = mkN "caleçon";
 underprivileged_A = mkA "défavorisé";
 underrate_V2 = mkV2 (mkV "sous-estimer");
 underscore_V2 = mkV2 (mkV "souligner");
@@ -18539,7 +18541,7 @@ undertake_V2 = mkV2 (mkV I.entreprendre_V2);
 undertaker_N = mkN "croque-mort";
 undertone_N = mkN "nuance" feminine | mkN "sous-entendu" feminine;
 underwear_N = mkN "sous-vêtement" masculine;
-underworld_N = mkN "pègre" feminine | mkN "au-delà" masculine;
+underworld_N = mkN "pègre" feminine | mkN "au-delà" masculine;
 undesirable_A = mkA "indésirable";
 undiluted_A = mkA "pur";
 undo_V2 = mkV2 (mkV "annuler") | mkV2 (mkV I.défaire_V2);
@@ -18573,7 +18575,7 @@ unguent_N = mkN "onguent" masculine;
 unhappy_A = mkA "malheureux" | mkA "mécontent";
 unheard_of_A = mkA "inouï";
 unhinge_V2 = mkV2 (mkV "déséquilibrer");
-unhorse_V2 = mkV2 (mkV "désarçonner");
+unhorse_V2 = mkV2 (mkV "désarçonner");
 unhurt_A = mkA "indemne";
 unicellular_A = mkA "unicellulaire";
 unicorn_N = mkN "licorne" feminine;
@@ -18842,7 +18844,7 @@ vast_A = mkA "vaste";
 vastness_N = mkN "immensité";
 vat_N = mkN "cuve" feminine;
 vaudeville_N = mkN "vaudeville" masculine;
-vault_N = mkN "voûte" | mkN "voûte" feminine;
+vault_N = mkN "voûte" | mkN "voûte" feminine;
 vault_V2 = mkV2 (mkV "bondir");
 vaunt_N = mkN "vantardise" feminine;
 veal_N = mkN "veau" masculine;
@@ -19183,7 +19185,7 @@ waste_V2 = mkV2 (mkV I.détruire_V2) | mkV2 (mkV "tuer") | mkV2 (mkV "gaspiller"
 wasteland_N = mkN "désert" masculine;
 watch_N = mkN "garde" | mkN "montre" feminine;
 watch_V2V = mkV2V (mkV "surveiller") | mkV2V (mkV "regarder");
-watchdog_N = mkN "mâtin" masculine;
+watchdog_N = mkN "mâtin" masculine;
 watchful_A = mkA "attentif";
 watchmaker_N = mkN "horlogerie" feminine;
 watchman_N = mkN "guetteur" masculine;
@@ -19232,7 +19234,7 @@ weatherman_N = mkN "météorologue";
 weave_N = mkN "armure" feminine;
 weave_V2 = mkV2 (mkV "tisser") | mkV2 (reflV (mkV "faufiler"));
 weaver_N = mkN "tisserin" masculine | mkN "tisserand" masculine;
-web_N = mkN "bobine" feminine | mkN "palmure" feminine | mkN "bande" feminine | mkN "réseau" masculine | mkN "âme" feminine | mkN "panier" masculine | mkN "âme" | mkN "Web" masculine;
+web_N = mkN "bobine" feminine | mkN "palmure" feminine | mkN "bande" feminine | mkN "réseau" masculine | mkN "âme" feminine | mkN "panier" masculine | mkN "âme" | mkN "Web" masculine;
 webbed_A = mkA "palmé";
 webcam_N = mkN "webcam" feminine;
 weber_N = mkN "weber" masculine;
@@ -19297,7 +19299,7 @@ wheelbase_N = mkN "empattement" masculine;
 wheezy_A = mkA "asthmatique";
 whelk_N = mkN "buccin" masculine;
 whelp_N = mkN "chiot";
-whence_Adv = mkAdv "d'où";
+whence_Adv = mkAdv "d'où";
 whenever_Adv = mkAdv "quand";
 whereto_Adv = mkAdv "auquel";
 whey_N = mkN "petit-lait" masculine;
@@ -19518,8 +19520,8 @@ yarrow_N = mkN "achillée" feminine;
 yashmak_N = mkN "litham" masculine;
 yataghan_N = mkN "yatagan" masculine;
 yaw_N = mkN "lacet" masculine;
-yawn_N = mkN "bâillement" masculine;
-yawn_V = mkV (mkV "bâiller");
+yawn_N = mkN "bâillement" masculine;
+yawn_V = mkV (mkV "bâiller");
 yearbook_N = mkN "annuaire" masculine;
 yearly_A = mkA "annuel";
 yearly_Adv = mkAdv "annuellement";
@@ -19545,7 +19547,7 @@ yodel_V2 = mkV2 (mkV "iodler");
 yoga_N = mkN "yoga" masculine;
 yogi_N = mkN "yogi" masculine;
 yoke_N = mkN "joug" masculine;
-yonder_Adv = mkAdv "là-bas";
+yonder_Adv = mkAdv "là-bas";
 yore_N = mkN "jadis";
 young_N = mkN "petit" masculine | mkN "jeune" masculine;
 youth_N = mkN "jeunesse" feminine | mkN "jeune" masculine | mkN "jeune" feminine;
diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf
index 3d50cdb1b..eda0815bb 100644
--- a/lib/src/translator/DictionaryGer.gf
+++ b/lib/src/translator/DictionaryGer.gf
@@ -1919,6 +1919,16 @@ lin ask_V2V = variants {};
 lin ask_VS = variants {};
 lin ask_VV = variants {};
 lin ask_VQ = variants {};
+lin ask_about_V2 = variants {};
+lin ask_after_V2 = variants {};
+lin ask_around_V = variants {};
+lin ask_around_V2 = variants {};
+lin ask_for_V2 = variants {};
+lin ask_for_V3 = variants {};
+lin ask_in_V2 = variants {};
+lin ask_out_V2 = variants {};
+lin ask_over_V2 = variants {};
+lin ask_round_V2 = variants {};
 lin askance_Adv = variants {};
 lin askern_PN = variants {};
 lin askew_A = mk3A "schief" "schiefer" "schiefste";
diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf
index f0c12f9fb..438e1e608 100644
--- a/lib/src/translator/DictionaryHin.gf
+++ b/lib/src/translator/DictionaryHin.gf
@@ -1734,10 +1734,16 @@ lin ask_V = mkV "पूछना" ;       -- old       -- old
 lin ask_V2 = mkV2 (mkV "पूछना") ;
 lin ask_VQ = mkVQ (mkV "पूछना" );
 lin ask_VS = mkVS (mkV "पूछना" );
+lin ask_about_V2 = variants {};
 lin ask_after_V2 = mkV2 (compoundV "स्वास्थ्य के बारे में" (mkV "पूछना")) ;
 lin ask_around_V = compoundV "पता" (mkV "लगाना") ;       -- old
 lin ask_around_V2 = mkV2 (compoundV "पता" (mkV "लगाना")) ;
 lin ask_for_V2 = mkV2 (mkV "पूछना") ;
+lin ask_for_V3 = variants {};
+lin ask_in_V2 = variants {};
+lin ask_out_V2 = variants {};
+lin ask_over_V2 = variants {};
+lin ask_round_V2 = variants {};
 lin askance_Adv = mkAdv "संदेह से" ;       -- old       -- old
 lin askew_A = mkA "तिरछा" ;       -- old       -- old
 lin askew_Adv = mkAdv "तिरछा" ;       -- old       -- old
diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf
index 82cfa1bc8..104bb9d13 100644
--- a/lib/src/translator/DictionarySwe.gf
+++ b/lib/src/translator/DictionarySwe.gf
@@ -3659,6 +3659,7 @@ lin ask_after_V2 = dirV2 (partV (mkV "frågar")"ut");
 lin ask_around_V = mkV "rådfrågar" ; -- comment=8
 lin ask_around_V2 = dirV2 (partV (mkV "frågar")"ut");
 lin ask_for_V2 = dirV2 (partV (mkV "frågar")"ut");
+lin ask_for_V3 = variants {} ;
 lin ask_in_V2 = dirV2 (partV (mkV "frågar")"ut");
 lin ask_out_V2 = dirV2 (partV (mkV "frågar")"ut");
 lin ask_over_V2 = dirV2 (partV (mkV "frågar")"ut");