a big patch with a number of changes in the dictionaries to harmonize them with WordNet

lib/src/translator/DictionaryFre.gf

@@ -820,7 +820,7 @@ lin airlock_N = mkN "sas" masculine ; -- tocheck
 lin airplane_N = L.airplane_N ;
 lin airport_N = mkN "aéroport" masculine ; -- tocheck
 lin airship_N = mkN "ballon_dirigeable" | mkN "dirigeable" ; -- UWN
-lin airsickness_N = mkN "mal_de_l'air" ; -- UWN
+lin air_sickness_N = mkN "mal de l'air" ; -- UWN
 lin airspace_N = mkN "espace_aérien" ; -- UWN
 lin airspeed_N = mkN "vitesses" ; -- UWN
 lin airtight_A = mkA "hermétique" ; -- tocheck
@@ -1037,7 +1037,7 @@ lin also_AdV = mkAdV "aussi" | mkAdV "itou" | mkAdV "notamment" | mkAdV "pareill
 lin also_Adv = mkAdv "aussi" ;
 lin alstroemeria_N = mkN "alstroemeria" | mkN "alstrœmère" ; -- UWN
 lin altar_N = mkN "autel" ; -- tocheck
-lin altarpiece_N = mkN "retable" ; -- UWN
+lin altar_piece_N = mkN "retable" ; -- UWN
 lin alter_V = variants {} ; --
 lin alter_V2 = variants {} ; --
 lin alteration_N = mkN "adaptation" | mkN "ajustement" | mkN "modification" ; -- UWN
@@ -1434,7 +1434,7 @@ lin ant_N = mkN "fourmi" feminine ; -- tocheck
 lin antagonism_N = mkN "antagonisme" masculine ; -- tocheck
 lin antagonistic_A = mkA "antagonique" ; -- tocheck
 lin antbird_N = mkN "thamnophilidae" | mkN "thamnophilidés" ; -- UWN
-lin anteater_N = mkN "fourmilier" masculine ; -- tocheck
+lin ant_eater_N = mkN "fourmilier" masculine ; -- tocheck
 lin antebellum_A = mkA "d'avant-guerre" ; -- tocheck
 lin antecedence_N = mkN "priorité" ; -- UWN
 lin antecedent_A = mkA "antécédent" | mkA "antérieur" | mkA "précédent" ; -- UWN
@@ -1452,7 +1452,7 @@ lin anterograde_A = mkA "antérograde" ; -- tocheck
 lin anteroom_N = mkN "antichambre" | mkN "hall" | mkN "vestibule" ; -- UWN
 lin anthem_N = mkN "hymne" masculine | mkN "hymne" feminine ; -- tocheck
 lin anther_N = mkN "anthère" feminine ; -- tocheck
-lin anthill_N = mkN "fourmilière" ; -- tocheck
+lin ant_hill_N = mkN "fourmilière" ; -- tocheck
 lin anthologist_N = mkN "anthologiste" ; -- tocheck
 lin anthology_N = mkN "anthologie" ; -- UWN
 lin anthony_PN = mkPN "Anthony" ; -- status=guess src=geonames
@@ -1474,7 +1474,7 @@ lin anthropomorphic_A = mkA "anthropomorphique" ; -- UWN
 lin anthropomorphism_N = mkN "anthropomorphisme" masculine ; -- tocheck
 lin anthropophagy_N = mkN "anthropophagie" feminine ; -- tocheck
 lin anthurium_N = mkN "anthurium" ; -- UWN
-lin antiaircraft_A = mkA "anti-aérien" ; -- tocheck
+lin anti_aircraft_A = mkA "anti-aérien" ; -- tocheck
 lin antialiasing_N = mkN "anticrènelage" ; -- UWN
 lin antibacterial_A = mkA "antibactérien" ; -- tocheck
 lin antibacterial_N = mkN "antibactérien" masculine ; -- tocheck
@@ -1502,7 +1502,7 @@ lin antifungal_N = mkN "antifongique" masculine ; -- tocheck
 lin antigen_N = mkN "antigène" ; -- UWN
 lin antigenic_A = mkA "antigénique" ; -- tocheck
 lin antigua_PN = mkPN "Antigua" ; -- status=guess src=geonames
-lin antihero_N = mkN "antihéros" ; -- tocheck
+lin anti_hero_N = mkN "antihéros" ; -- tocheck
 lin antihistamine_N = mkN "antihistaminique" masculine ; -- tocheck
 lin antihypertensive_N = mkN "antihypertensif" masculine ; -- tocheck
 lin antilepton_N = mkN "antilepton" masculine ; -- tocheck
@@ -1518,7 +1518,7 @@ lin antinomy_N = mkN "antinomie" feminine ; -- tocheck
 lin antioxidant_N = mkN "antioxydant" masculine ; -- tocheck
 lin antiparticle_N = mkN "antiparticule" feminine ; -- tocheck
 lin antipathetic_A = mkA "antagonique" ; -- UWN
-lin antipersonnel_A = mkA "antipersonnel" ; -- UWN
+lin anti_personnel_A = mkA "antipersonnel" ; -- UWN
 lin antiperspirant_N = mkN "antisudorifique" masculine ; -- tocheck
 lin antiphon_N = mkN "antienne" ; -- UWN
 lin antiphonary_N = mkN "antiphonaire" ; -- UWN
@@ -1882,7 +1882,7 @@ lin armchair_N = mkN "fauteuil" ; -- tocheck
 lin armed_A = variants {} ; --
 lin armet_N = mkN "armet" masculine ; -- tocheck
 lin armful_N = mkN "brassée" feminine ; -- tocheck
-lin armhole_N = mkN "emmanchure" feminine ; -- tocheck
+lin arm_hole_N = mkN "emmanchure" feminine ; -- tocheck
 lin armistice_N = mkN "armistice" masculine ; -- tocheck
 lin armoire_N = mkN "armoire" ; -- UWN
 lin armor_N = mkN "armure" feminine | mkN "cuirasse" feminine ; -- tocheck
@@ -2004,7 +2004,7 @@ lin ashamed_A = mkA "honteux" ; -- tocheck
 lin ashbourne_PN = mkPN "Ashbourne" ; -- status=guess src=geonames
 lin ashby_PN = mkPN "Ashby" ; -- status=guess src=geonames
 lin ashby_de_la_zouch_PN = mkPN "Ashby de la Zouch" ; -- status=guess src=geonames
-lin ashcan_N = mkN "cendrier" masculine ; -- tocheck
+lin ash_can_N = mkN "cendrier" masculine ; -- tocheck
 lin ashen_A = mkA "cendré" ; -- tocheck
 lin ashes_N = L.ashes_N ;
 lin ashford_PN = mkPN "Ashford" ; -- status=guess src=geonames
@@ -2531,7 +2531,7 @@ lin backside_N = mkN "arrière" masculine ; -- tocheck
 lin backstair_A = mkA "clandestin" ; -- UWN
 lin backstay_N = mkN "pataras" ; -- UWN
 lin backtalk_N = mkN "bouche" | mkN "embouchure" | mkN "lèvre" ; -- UWN
-lin backup_N = mkN "sauvegarde" feminine ; -- tocheck
+lin back_up_N = mkN "sauvegarde" feminine ; -- tocheck
 lin backward_Adv = mkAdv "dos" ; -- UWN
 lin backwards_Adv = mkAdv "arrière" | mkAdv "dos" | mkAdv "sens_devant_derrière" ; -- UWN
 lin backwater_N = mkN "patelin" masculine ; -- tocheck
@@ -2649,7 +2649,7 @@ lin bandit_N = mkN "voleur" masculine ; -- tocheck
 lin banditry_N = mkN "banditisme" masculine ; -- tocheck
 lin bandoleer_N = mkN "bandoulière" feminine ; -- tocheck
 lin bandolier_N = mkN "bandoulière" ; -- UWN
-lin bandsaw_N = mkN "scie_à_ruban" | mkN "scieuse" ; -- UWN
+lin band_saw_N = mkN "scie_à_ruban" | mkN "scieuse" ; -- UWN
 lin bandstand_N = mkN "Kiosque" | mkN "kiosque" | mkN "être_debout" ; -- UWN
 lin bandung_PN = mkPN "Bandung" ; -- status=guess src=geonames
 lin bandwidth_N = mkN "débit" ; -- tocheck
@@ -3107,7 +3107,7 @@ lin bergamo_PN = mkPN "Bergame" ; -- status=guess src=geonames
 lin bergamot_N = mkN "bergamote" ; -- tocheck
 lin bergen_PN = mkPN "Bergen" ; -- status=guess src=geonames
 lin bergenia_N = mkN "bergenia" ; -- UWN
-lin beriberi_N = mkN "béribéri" masculine ; -- tocheck
+lin beri_beri_N = mkN "béribéri" masculine ; -- tocheck
 lin berkelium_N = mkN "berkélium" masculine ; -- tocheck
 lin berkhamsted_PN = mkPN "Berkhamsted" ; -- status=guess src=geonames
 lin berlin_N = mkN "berlin" ; -- UWN
@@ -3350,7 +3350,7 @@ lin bittercress_N = mkN "cardamine" | mkN "dentaire" ; -- UWN
 lin bittern_N = mkN "butor" masculine ; -- tocheck
 lin bitterness_N = mkN "amertume" feminine ; -- tocheck
 lin bitters_N = mkN "amer" ; -- UWN
-lin bittersweet_A = mkA "doux-amer" ; -- tocheck
+lin bitter_sweet_A = mkA "doux-amer" ; -- tocheck
 lin bitumen_N = mkN "bitume" masculine ; -- tocheck
 lin bivalent_A = mkA "double" ; -- UWN
 lin bivalve_N = mkN "bivalve" masculine ; -- tocheck
@@ -3492,10 +3492,10 @@ lin bloke_N = mkN "gars" masculine ; -- tocheck
 lin blond_A = mkA "blond" | mkA "blonde" ; -- UWN
 lin blonde_A = mkA "blond" | mkA "blonde" ; -- UWN
 lin blood_N = L.blood_N ;
-lin bloodbath_N = mkN "massacre" masculine ; -- tocheck
+lin blood_bath_N = mkN "massacre" masculine ; -- tocheck
 lin bloodcurdling_A = mkA "cauchemardesque" ; -- UWN
 lin bloodhound_N = mkN "limier" masculine ; -- tocheck
-lin bloodletting_N = mkN "saignée" feminine ; -- tocheck
+lin blood_letting_N = mkN "saignée" feminine ; -- tocheck
 lin bloodlust_N = mkN "soif_de_sang" ; -- UWN
 lin bloodroot_N = mkN "sanguinaire" ; -- tocheck
 lin bloodshed_N = mkN "carnage" masculine ; -- tocheck
@@ -3546,7 +3546,7 @@ lin blue_N = mkN "bleu" masculine ; -- tocheck
 lin blue_V2 = mkV2 (mkV "bleuter") | mkV2 (mkV "bleuir") ; -- tocheck
 lin blueberry_N = mkN "myrtille" feminine ; -- tocheck
 lin bluefish_N = mkN "tassergal" masculine ; -- tocheck
-lin bluejacket_N = mkN "marin" | mkN "matelot" ; -- UWN
+lin blue_jacket_N = mkN "marin" | mkN "matelot" ; -- UWN
 lin blueprint_N = mkN "blueprint" masculine | mkN "modèle" masculine ; -- tocheck
 lin blues_N = mkN "blues" masculine ; -- tocheck
 lin bluestocking_N = mkN "bas-bleu" ; -- UWN
@@ -3680,11 +3680,11 @@ lin book_V2 = mkV2 (mkV "réserver") ; -- tocheck
 lin bookbinder_N = mkN "relieur" masculine ; -- tocheck
 lin bookbinding_N = mkN "reliure" ; -- UWN
 lin bookcase_N = mkN "bibliothèque" feminine ; -- tocheck
-lin bookend_N = mkN "serre-livre" masculine ; -- tocheck
+lin book_end_N = mkN "serre-livre" masculine ; -- tocheck
 lin bookie_N = mkN "bookmaker" ; -- UWN
 lin booking_N = mkN "réservation" feminine | mkN "réserve" feminine ; -- tocheck
 lin bookish_A = mkA "scolaire" ; -- tocheck
-lin bookkeeper_N = mkN "comptable" ; -- UWN
+lin book_keeper_N = mkN "comptable" ; -- UWN
 lin bookkeeping_N = mkN "comptabilité" | mkN "comptable" ; -- UWN
 lin booklet_N = mkN "livret" masculine ; -- tocheck
 lin bookmaker_N = mkN "bookmaker" masculine ; -- tocheck
@@ -3941,7 +3941,7 @@ lin breakwater_N = mkN "brise-lames" masculine ; -- tocheck
 lin bream_N = mkN "brème" feminine | mkN "pageot" masculine ; -- tocheck
 lin breast_N = L.breast_N ;
 lin breastfeed_V2 = mkV2 (mkV "allaiter") ; -- tocheck
-lin breastplate_N = mkN "égide" ; -- UWN
+lin breast_plate_N = mkN "égide" ; -- UWN
 lin breaststroke_N = mkN "brasse" feminine ; -- tocheck
 lin breaststroker_N = mkN "brasseur" ; -- UWN
 lin breastwork_N = mkN "parapet" ; -- UWN
@@ -4225,7 +4225,7 @@ lin bullish_A = mkA "haussier" ; -- UWN
 lin bullpen_N = mkN "toril" masculine ; -- tocheck
 lin bullring_N = mkN "arène" feminine ; -- tocheck
 lin bullshit_N = mkN "conneries" ; -- tocheck
-lin bullterrier_N = mkN "bull_terrier" ; -- UWN
+lin bull_terrier_N = mkN "bull_terrier" ; -- UWN
 lin bully_N = mkN "tyran" masculine ; -- tocheck
 lin bully_V2 = mkV2 (mkV "tourmenter") ; -- tocheck
 lin bullying_N = mkN "harcèlement" masculine ; -- tocheck
@@ -4571,7 +4571,7 @@ lin campaigner_N = mkN "candidat" | mkN "nominé" ; -- UWN
 lin campanile_N = mkN "campanile" ; -- UWN
 lin campanula_N = mkN "campanula" | mkN "campanule" | mkN "campanules" ; -- UWN
 lin campbeltown_PN = mkPN "Campbeltown" ; -- status=guess src=geonames
-lin campfire_N = mkN "Feu_de_camp" | mkN "feu_de_camp" ; -- UWN
+lin camp_fire_N = mkN "Feu_de_camp" | mkN "feu_de_camp" ; -- UWN
 lin camphor_N = mkN "camphre" masculine ; -- tocheck
 lin camping_N = mkN "camping" ; -- tocheck
 lin campion_N = mkN "silene" | mkN "silène" ; -- UWN
@@ -4604,7 +4604,7 @@ lin candidateFem_N = mkN "candidat" | mkN "nominé" ; -- UWN
 lin candidateMasc_N = mkN "candidat" ;
 lin candle_N = mkN "bougie" feminine ; -- tocheck
 lin candlelight_N = mkN "bougie" | mkN "chandelle" ; -- UWN
-lin candlepower_N = mkN "bougie" feminine ; -- tocheck
+lin candle_power_N = mkN "bougie" feminine ; -- tocheck
 lin candlestick_N = mkN "chandelier" masculine ; -- tocheck
 lin candlewick_N = mkN "mèche" feminine ; -- tocheck
 lin candor_N = mkN "candeur" feminine ; -- tocheck
@@ -5178,7 +5178,7 @@ lin chain_N = mkN "chaîne" feminine ; -- tocheck
 lin chain_V2 = mkV2 (mkV "chaîner") | mkV2 (mkV "enchaîner") ; -- tocheck
 lin chair_N = L.chair_N ;
 lin chair_V2 = mkV2 (mkV "présider") ; -- tocheck
-lin chairlift_N = mkN "Télésiège" | mkN "télésiège" ; -- UWN
+lin chair_lift_N = mkN "Télésiège" | mkN "télésiège" ; -- UWN
 lin chairman_N = variants {} ; --
 lin chalcedony_N = mkN "calcédoine" ; -- tocheck
 lin chalcocite_N = mkN "chalcocite" | mkN "chalcosine" ; -- UWN
@@ -5432,7 +5432,7 @@ lin chime_V2 = mkV2 (mkV "carillonner") ; -- tocheck
 lin chimera_N = mkN "chimère" feminine ; -- tocheck
 lin chimeric_A = mkA "chimérique" ; -- UWN
 lin chimney_N = mkN "cheminée" feminine ; -- tocheck
-lin chimneysweep_N = mkN "balayer" ; -- UWN
+lin chimney_sweep_N = mkN "balayer" ; -- UWN
 lin chimneysweeper_N = mkN "balayer" ; -- UWN
 lin chimpanzee_N = mkN "chimpanzé" masculine ; -- tocheck
 lin chin_N = mkN "menton" masculine ; -- tocheck
@@ -5745,7 +5745,7 @@ lin clean_up_V2 = prepV2 OP_clean_V OP_up_Prep ; -- guess-p-verb
 lin cleaner_N = mkN "nettoyant" masculine | mkN "nettoyeur" masculine | mkN "pressing" masculine ; -- tocheck
 lin cleaning_N = mkN "lavage" | mkN "nettoyage" ; -- UWN
 lin cleanliness_N = mkN "propreté" ; -- tocheck
-lin cleanup_N = mkN "nettoyage" masculine ; -- tocheck
+lin clean_up_N = mkN "nettoyage" masculine ; -- tocheck
 lin clear_A = mkA "clair" | mkA "libre" | mkA "dégagé" ;
 lin clear_Adv = mkAdv "clairement" ; -- UWN
 lin clear_V = variants {} ; -- mkV2V (mkV "débarrasser") | mkV2V (reflV (mkV "éclaircir")) | mkV2V (mkV "clarifier") ; -- tocheck
@@ -5856,7 +5856,7 @@ lin clot_V2 = mkV2 (mkV "coaguler") ; -- tocheck
 lin cloth_N = mkN "tenue" feminine | mkN "tissu" masculine ; -- tocheck
 lin clothes_N = variants {} ; --
 lin clotheshorse_N = mkN "étendoir" masculine ; -- tocheck
-lin clothespin_N = mkN "pince_à_linge" | mkN "épingle_à_linge" ; -- UWN
+lin clothes_pin_N = mkN "pince_à_linge" | mkN "épingle_à_linge" ; -- UWN
 lin clothing_N = mkN "vêtements" ; -- tocheck
 lin cloud_N = L.cloud_N ;
 lin cloud_cuckoo_land_N = mkN "Coucouville-les-Nuées" ; -- tocheck
@@ -5931,7 +5931,7 @@ lin cobaltite_N = mkN "cobaltite" ; -- UWN
 lin cobbler_N = mkN "cordonnier" masculine ; -- tocheck
 lin cobblestone_N = mkN "pavé" ; -- tocheck
 lin cobham_PN = mkPN "Cobham" ; -- status=guess src=geonames
-lin cobnut_N = mkN "aveline" | mkN "noisette" ; -- UWN
+lin cob_nut_N = mkN "aveline" | mkN "noisette" ; -- UWN
 lin cobra_N = mkN "naja" ; -- tocheck
 lin coca_N = mkN "coca" ; -- tocheck
 lin cocaine_N = mkN "cocaïne" feminine ; -- tocheck
@@ -5989,7 +5989,7 @@ lin coercive_A = mkA "coercitif" ; -- UWN
 lin coetaneous_A = mkA "contemporain" ; -- UWN
 lin coeval_A = mkA "contemporain" ; -- UWN
 lin coeval_N = mkN "contemporain" ; -- UWN
-lin coexist_V = mkV (mkV "coexister") ; -- tocheck
+lin co_exist_V = mkV (mkV "coexister") ; -- tocheck
 lin coexistence_N = mkN "coexistence" feminine ; -- tocheck
 lin coffee_N = mkN "café" masculine | mkN "caféier" masculine ; -- tocheck
 lin coffer_N = mkN "caisson" masculine | mkN "coffre" masculine ; -- tocheck
@@ -7134,7 +7134,7 @@ lin counterclockwise_Adv = mkAdv "sens_antihoraire" ; -- UWN
 lin counterculture_N = mkN "contreculture" ; -- UWN
 lin countercurrent_N = mkN "contre-courant" masculine ; -- tocheck
 lin counterespionage_N = mkN "contre-espionnage" masculine ; -- tocheck
-lin counterexample_N = mkN "contrexemple" masculine ; -- tocheck
+lin counter_example_N = mkN "contrexemple" masculine ; -- tocheck
 lin counterfeit_A = mkA "contrefait" ; -- tocheck
 lin counterfeit_N = mkN "contrefaçon" ; -- tocheck
 lin counterfeit_V2 = mkV2 (mkV I.contrefaire_V2) ; -- tocheck
@@ -7314,7 +7314,7 @@ lin credit_N = mkN "crédit" masculine | mkN "crédit" ; -- tocheck
 lin credit_V2 = variants {} ; --
 lin creditor_N = mkN "créancier" masculine ; -- tocheck
 lin credits_N = mkN "générique" ; -- UWN
-lin creditworthy_A = mkA "responsable" ; -- UWN
+lin credit_worthy_A = mkA "responsable" ; -- UWN
 lin credulity_N = mkN "crédulité" ; -- UWN
 lin credulous_A = mkA "crédule" ; -- tocheck
 lin credulousness_N = mkN "crédulité" ; -- UWN
@@ -7372,7 +7372,7 @@ lin cripple_N = mkN "estropié" masculine ; -- tocheck
 lin cripple_V2 = mkV2 (mkV "estropier") ; -- tocheck
 lin crisis_N = mkN "crise" feminine ; -- tocheck
 lin crisscross_N = mkN "croix" | mkN "marque" ; -- UWN
-lin crisscross_V2 = mkV2 (mkV "sillonner") ; -- tocheck
+lin criss_cross_V2 = mkV2 (mkV "sillonner") ; -- tocheck
 lin cristobalite_N = mkN "cristobalite" ; -- UWN
 lin criterion_N = mkN "critère" masculine ; -- tocheck
 lin critic_N = mkN "critique" | mkN "critique" masculine ; -- tocheck
@@ -7578,14 +7578,14 @@ lin cunning_N = mkN "fourberie" feminine ; -- tocheck
 lin cunt_N = mkN "chatte" feminine | mkN "con" masculine ; -- tocheck
 lin cup_N = mkN "coupe" feminine | mkN "tasse" feminine | mkN "bonnet" masculine ; -- tocheck
 lin cupar_PN = mkPN "Cupar" ; -- status=guess src=geonames
-lin cupbearer_N = mkN "échanson" ; -- UWN
+lin cup_bearer_N = mkN "échanson" ; -- UWN
 lin cupboard_N = mkN "armoire" feminine ; -- tocheck
 lin cupful_N = mkN "tasse" feminine ; -- tocheck
 lin cupidity_N = mkN "avarice" | mkN "cupidité" ; -- UWN
 lin cupola_N = mkN "coupole" feminine ; -- tocheck
 lin cupric_A = mkA "cuprique" ; -- tocheck
 lin cuprite_N = mkN "cuprite" ; -- UWN
-lin cupronickel_N = mkN "cupronickel" ; -- UWN
+lin cupro_nickel_N = mkN "cupronickel" ; -- UWN
 lin cur_N = mkN "clébard" masculine ; -- tocheck
 lin curacy_N = mkN "vicariat" masculine ; -- tocheck
 lin curassow_N = mkN "hocco" masculine ; -- tocheck
@@ -7939,7 +7939,7 @@ lin death_N = mkN "mort" feminine ;
 lin deathblow_N = mkN "coup" ; -- tocheck
 lin deathly_A = variants {} ;
 lin deathly_Adv = adjAdv deathly_A ; -- derived
-lin deathrate_N = mkN "morbidité" | mkN "mortalite" | mkN "mortalité" | mkN "taux_de_mortalité" ; -- UWN
+lin death_rate_N = mkN "morbidité" | mkN "mortalite" | mkN "mortalité" | mkN "taux_de_mortalité" ; -- UWN
 lin deathtrap_N = mkN "deathtrap" ; -- UWN
 lin debacle_N = mkN "débâcle" feminine | mkN "fiasco" masculine ; -- tocheck
 lin debase_V2 = mkV2 (mkV "abâtardir") ; -- tocheck
@@ -9297,7 +9297,7 @@ lin double_up_V = advV OP_double_V OP_up_Adv ; -- guess-p-verb
 lin double_up_as_V2 = prepV2 (advV OP_double_V OP_up_Adv ) OP_as_Prep ; -- guess-p-verb
 lin doublespeak_N = mkN "double_langage" ; -- UWN
 lin doublet_N = mkN "doublon" masculine ; -- tocheck
-lin doublethink_N = mkN "doublepensée" feminine ; -- tocheck
+lin double_think_N = mkN "doublepensée" feminine ; -- tocheck
 lin doubleton_N = mkN "doubleton" masculine ; -- tocheck
 lin doubling_N = mkN "double" | mkN "doublement" | mkN "tache" ; -- UWN
 lin doubloon_N = mkN "doublon" ; -- UWN
@@ -9906,7 +9906,7 @@ lin egalitarian_A = mkA "égalitaire" ; -- tocheck
 lin egalitarian_N = mkN "égalitaire" ; -- tocheck
 lin egalitarianism_N = mkN "égalitarisme" masculine ; -- tocheck
 lin egg_N = L.egg_N ;
-lin eggcup_N = mkN "coquetier" masculine ; -- tocheck
+lin egg_cup_N = mkN "coquetier" masculine ; -- tocheck
 lin eggnog_N = mkN "lait_de_poule" | mkN "liqueur_aux_œufs" ; -- UWN
 lin eggplant_N = mkN "aubergine" feminine ; -- tocheck
 lin eggshell_N = mkN "coque" | mkN "coquille" ; -- UWN
@@ -11273,8 +11273,8 @@ lin farnham_PN = mkPN "Farnham" ; -- status=guess src=geonames
 lin farnworth_PN = mkPN "Farnworth" ; -- status=guess src=geonames
 lin faro_N = mkN "faro" ; -- UWN
 lin farrier_N = mkN "maréchal-ferrant" masculine ; -- tocheck
-lin farseeing_A = mkA "long" ; -- UWN
-lin farsighted_A = mkA "hypermétrope" ; -- tocheck
+lin far_seeing_A = mkA "long" ; -- UWN
+lin far_sighted_A = mkA "hypermétrope" ; -- tocheck
 lin fart_N = mkN "pet" masculine ; -- tocheck
 lin fart_V = mkV (mkV "péter") ; -- tocheck
 lin farthing_N = mkN "farthing" masculine ; -- tocheck
@@ -11709,7 +11709,7 @@ lin fisher_N = mkN "pékan" masculine | mkN "pêcheur" ; -- tocheck
 lin fisherman_N = mkN "pêcheur" masculine ; -- tocheck
 lin fishery_N = mkN "pêcherie" feminine ; -- tocheck
 lin fisheye_A = mkA "grand-angle" ; -- UWN
-lin fishhook_N = mkN "hameçon" masculine ; -- tocheck
+lin fish_hook_N = mkN "hameçon" masculine ; -- tocheck
 lin fishing_N = mkN "pêche" feminine ; -- tocheck
 lin fishmonger_N = mkN "poissonnier" masculine ; -- tocheck
 lin fishnet_N = mkN "filet" | mkN "filet_de_pêche" ; -- UWN
@@ -11787,7 +11787,7 @@ lin flask_N = mkN "flacon" masculine | mkN "fiole" feminine ; -- tocheck
 lin flat_A = mkA "plan" | mkA "bémol" | mkA "bas" | mkA "ennuyeux" | mkA "plat" ; -- tocheck
 lin flat_Adv = mkAdv "pile" ; -- tocheck
 lin flat_N = mkN "bémol" masculine ; -- tocheck
-lin flatcar_N = mkN "truc" ; -- UWN
+lin flat_car_N = mkN "truc" ; -- UWN
 lin flatmate_N = mkN "colocataire" ; -- tocheck
 lin flatness_N = mkN "matité" feminine | mkN "platitude" feminine | mkN "planéité" feminine ; -- tocheck
 lin flatten_V = mkV "baisser" | mkV "bémoliser" ; -- UWN
@@ -12010,7 +12010,7 @@ lin footmark_N = mkN "empreinte" | mkN "pas" ; -- UWN
 lin footnote_N = mkN "page" | mkN "supplément" ; -- UWN
 lin footpath_N = mkN "trottoir" masculine ; -- tocheck
 lin footprint_N = mkN "empreinte" ; -- UWN
-lin footrace_N = mkN "course" ; -- UWN
+lin foot_race_N = mkN "course" ; -- UWN
 lin footslogger_N = mkN "fantassin" ; -- UWN
 lin footstep_N = mkN "pas" masculine ; -- tocheck
 lin footstool_N = mkN "repose-pied" masculine ; -- tocheck
@@ -12257,7 +12257,7 @@ lin freelance_N = mkN "mercenaire" | mkN "pigiste" ; -- tocheck
 lin freeloader_N = mkN "resquilleur" masculine ; -- tocheck
 lin freemasonry_N = mkN "franc-maçonnerie" | mkN "maçonnerie" ; -- UWN
 lin freesia_N = mkN "freesia" ; -- tocheck
-lin freestanding_A = mkA "séparer" ; -- UWN
+lin free_standing_A = mkA "séparer" ; -- UWN
 lin freetail_N = mkN "molossidae" ; -- UWN
 lin freeware_N = mkN "graticiel" masculine ; -- tocheck
 lin freeway_N = mkN "autoroute" ; -- tocheck
@@ -12609,7 +12609,7 @@ lin gaseous_A = mkA "gazeux" ; -- tocheck
 lin gash_N = mkN "entaille" ; -- tocheck
 lin gasify_V2 = mkV2 (mkV "gazéifier") ; -- tocheck
 lin gasket_N = mkN "joint" masculine ; -- tocheck
-lin gasmask_N = mkN "respirateur" ; -- UWN
+lin gas_mask_N = mkN "respirateur" ; -- UWN
 lin gasohol_N = mkN "carburol" ; -- UWN
 lin gasoline_N = mkN "essence" feminine ; -- tocheck
 lin gasp_V = variants {} ; -- mkV2 (mkV "haleter") ; -- tocheck
@@ -12886,7 +12886,7 @@ lin gherkin_N = mkN "cornichon" masculine ; -- tocheck
 lin ghetto_N = mkN "ghetto" masculine ; -- tocheck
 lin ghost_N = mkN "fantôme" masculine ; -- tocheck
 lin ghostly_A = mkA "fantomatique" ; -- tocheck
-lin ghostwriter_N = mkN "fantasme" | mkN "fantôme" | mkN "nègre" ; -- UWN
+lin ghost_writer_N = mkN "fantasme" | mkN "fantôme" | mkN "nègre" ; -- UWN
 lin ghoul_N = mkN "goule" feminine ; -- tocheck
 lin giant_A = variants {} ; --
 lin giant_N = mkN "géant" masculine | mkN "géant" ; -- tocheck
@@ -13067,7 +13067,7 @@ lin glove_N = L.glove_N ;
 lin glow_N = variants {} ; --
 lin glow_V = mkV (mkV "briller") ; -- tocheck
 lin gloweringly_Adv = mkAdv "maussadement" | mkAdv "sombrement" ; -- UWN
-lin glowworm_N = mkN "ver_luisant" ; -- UWN
+lin glow_worm_N = mkN "ver luisant" ; -- UWN
 lin gloxinia_N = mkN "gloxinia" ; -- UWN
 lin glucagon_N = mkN "Glucagon" | mkN "glucagon" ; -- UWN
 lin glucocorticoid_N = mkN "glucocorticoïde" masculine ; -- tocheck
@@ -13193,7 +13193,7 @@ lin gobbledygook_N = mkN "charabia" masculine | mkN "galimatias" masculine ; --
 lin gobbler_N = mkN "glouton" ; -- tocheck
 lin goblet_N = mkN "gobelet" masculine ; -- tocheck
 lin goblin_N = mkN "gobelin" masculine ; -- tocheck
-lin goby_N = mkN "gobie" masculine ; -- tocheck
+lin go_by_N = mkN "gobie" masculine ; -- tocheck
 lin god_N = mkN "dieu" masculine | mkN "idole" ; -- tocheck
 lin godalming_PN = mkPN "Godalming" ; -- status=guess src=geonames
 lin godchild_N = mkN "comte_cain" | mkN "filleul" ; -- UWN
@@ -13844,7 +13844,7 @@ lin handlebar_N = mkN "guidon" ; -- tocheck
 lin handling_N = mkN "manipulation" feminine ; -- tocheck
 lin handmaid_N = mkN "bonne" | mkN "domestique" | mkN "servante" ; -- UWN
 lin handoff_N = mkN "handover" ; -- UWN
-lin handout_N = mkN "aumône" feminine | mkN "polycopié" masculine ; -- tocheck
+lin hand_out_N = mkN "aumône" feminine | mkN "polycopié" masculine ; -- tocheck
 lin handover_N = mkN "passation" feminine ; -- tocheck
 lin handrail_N = mkN "rambarde" feminine ; -- tocheck
 lin hands_N = mkN "garde" ; -- UWN
@@ -13911,7 +13911,7 @@ lin hard_1_A = mkA "dur" | mkA "fort" | mkA "dure" | mkA "irréfutable" ; -- toc
 lin hard_2_A = mkA "dur" | mkA "fort" | mkA "dure" | mkA "irréfutable" | {-UWN-} mkA "ardu" | mkA "difficile" ; -- UWN -- tocheck
 lin hardboard_N = mkN "aggloméré" ; -- tocheck
 lin harden_V2 = mkV2 (mkV "durcir") | mkV2 (mkV "endurcir") ; -- tocheck
-lin hardheaded_A = mkA "pragmatique" | mkA "pratique" ; -- UWN
+lin hard_headed_A = mkA "pragmatique" | mkA "pratique" ; -- UWN
 lin hardly_AdV = adjAdv hard_2_A ; -- derived
 lin hardly_Adv = mkAdv "difficilement" | mkAdv "guère" | mkAdv "pratiquement" | mkAdv "à_peine" ; -- UWN
 lin hardness_N = mkN "dureté" feminine ; -- tocheck
@@ -14382,7 +14382,7 @@ lin hide_away_V2 = mkV2 (advV OP_hide_V OP_away_Adv ) ; -- guess-p-verb
 lin hide_out_V = advV OP_hide_V OP_out_Adv ; -- guess-p-verb
 lin hideaway_N = mkN "antre" | mkN "cache" | mkN "recul" | mkN "reculer" ; -- UWN
 lin hideous_A = mkA "hideux" ; -- tocheck
-lin hideout_N = mkN "cachette" feminine ; -- tocheck
+lin hide_out_N = mkN "cachette" feminine ; -- tocheck
 lin hiding_N = mkN "dissimulation" ; -- UWN
 lin hie_V = mkV (reflV (mkV "hâter")) ; -- tocheck
 lin hierarch_N = mkN "archiprêtre" | mkN "hiérarque" | mkN "primat" | mkN "primate" | mkN "prélat" | mkN "prélature" ; -- UWN
@@ -14418,7 +14418,7 @@ lin hiker_N = mkN "randonneur" | mkN "trekkeur" ; -- UWN
 lin hilarious_A = mkA "hilarant" ; -- tocheck
 lin hilarity_N = mkN "hilarité" feminine ; -- tocheck
 lin hill_N = L.hill_N ;
-lin hillbilly_N = mkN "Hillbilly" | mkN "hillbilly" | mkN "péquenaud" ; -- UWN
+lin hill_billy_N = mkN "Hillbilly" | mkN "hillbilly" | mkN "péquenaud" ; -- UWN
 lin hillock_N = mkN "butte" | mkN "colline" | mkN "hamac" | mkN "monticule" ; -- UWN
 lin hilltop_N = mkN "front" ; -- UWN
 lin hilly_A = mkA "vallonné" ; -- tocheck
@@ -14575,7 +14575,7 @@ lin homecoming_N = mkN "retour" ; -- UWN
 lin homeland_N = mkN "patrie" feminine ; -- tocheck
 lin homeless_A = variants {} ; --
 lin homelessness_N = mkN "itinérance" ; -- tocheck
-lin homemade_A = mkA "maison" ; -- UWN
+lin home_made_A = mkA "maison" ; -- UWN
 lin homeobox_N = mkN "Homéoboîte_et_homéodomaine" | mkN "homéoboîte" | mkN "homéoboîte_et_homéodomaine" ; -- UWN
 lin homeopathy_N = mkN "homéopathie" feminine ; -- tocheck
 lin homeostasis_N = mkN "homéostasie" feminine ; -- tocheck
@@ -15655,7 +15655,7 @@ lin informant_N = mkN "informateur" masculine ; -- tocheck
 lin information_N = mkN "information" | mkN "renseignement" masculine ;
 lin informational_A = mkA "informationnel" ; -- tocheck
 lin informative_A = mkA "instructif" ; -- tocheck
-lin infrared_A = mkA "infrarouge" ; -- tocheck
+lin infra_red_A = mkA "infrarouge" ; -- tocheck
 lin infrared_N = mkN "infrarouge" ; -- tocheck
 lin infrasonic_A = mkA "infrasonore" ; -- UWN
 lin infrastructure_N = mkN "infrastructure" feminine ; -- tocheck
@@ -15740,7 +15740,7 @@ lin inoffensive_A = mkA "inoffensif" ; -- tocheck
 lin inordinate_A = mkA "déraisonnable" | mkA "excessif" ; -- UWN
 lin inorganic_A = mkA "inorganique" ; -- tocheck
 lin inositol_N = mkN "inositol" ; -- UWN
-lin inpatient_N = mkN "patient_hospitalier" ; -- UWN
+lin in_patient_N = mkN "patient hospitalier" ; -- UWN
 lin input_N = mkN "entrée" feminine ; -- tocheck
 lin inquest_N = mkN "enquête" ; -- UWN
 lin inquire_V2 = mkV2 (mkV "enquêter") ; -- tocheck
@@ -16015,7 +16015,7 @@ lin intransigency_N = mkN "intransigeance" ; -- UWN
 lin intransigent_A = mkA "intransigeant" ; -- tocheck
 lin intransitive_A = mkA "intransitif" ; -- tocheck
 lin intransitivity_N = mkN "intransitivité" feminine ; -- tocheck
-lin intrauterine_A = mkA "intra-utérin" ; -- tocheck
+lin intra_uterine_A = mkA "intra-utérin" ; -- tocheck
 lin intravenous_A = mkA "intraveineux" ; -- tocheck
 lin intrepid_A = mkA "intrépide" ; -- tocheck
 lin intricacy_N = mkN "élaboration" ; -- UWN
@@ -16404,7 +16404,7 @@ lin jowl_N = mkN "joue" feminine | mkN "bajoue" feminine ; -- tocheck
 lin joy_N = mkN "joie" feminine ; -- tocheck
 lin joyful_A = mkA "allègre" ; -- tocheck
 lin joyous_A = mkA "joyeux" ; -- tocheck
-lin joystick_N = mkN "manche" masculine ; -- tocheck
+lin joy_stick_N = mkN "manche" masculine ; -- tocheck
 lin jubilant_A = mkA "triomphal" | mkA "triomphant" ; -- UWN
 lin jubilee_N = mkN "jubilé" masculine ; -- tocheck
 lin judas_N = mkN "judas" ; -- UWN
@@ -16749,7 +16749,7 @@ lin knee_N = L.knee_N ;
 lin kneecap_N = mkN "rotule" feminine ; -- tocheck
 lin kneel_N = mkN "agenouillement" | mkN "baraquage" | mkN "génuflexion" ; -- UWN
 lin kneel_V = mkV (reflV (mkV "agenouiller")) ; -- tocheck
-lin knickknack_N = mkN "bric-à-brac" ; -- UWN
+lin knick_knack_N = mkN "bric-à-brac" ; -- UWN
 lin knife_N = mkN "couteau" masculine ; -- tocheck
 lin knight_N = mkN "cavalier" masculine | mkN "chevalier" masculine ; -- tocheck
 lin knightly_A = mkA "chevaleresque" | mkA "galant" ; -- UWN
@@ -16962,7 +16962,7 @@ lin lap_N = mkN "côté" | mkN "genoux" ; -- tocheck
 lin lap_V = mkV "laver" ; -- UWN
 lin lap_V2 = mkV2 (mkV "laper") ; -- tocheck
 lin laparotomy_N = mkN "laparotomie" feminine ; -- tocheck
-lin lapdog_N = mkN "chien-chien" masculine ; -- tocheck
+lin lap_dog_N = mkN "chien-chien" masculine ; -- tocheck
 lin lapel_N = mkN "revers" masculine ; -- tocheck
 lin lapis_lazuli_N = mkN "lapis-lazuli" | mkN "lazuli" ; -- UWN
 lin lapse_N = mkN "erreur" ; -- tocheck
@@ -17097,8 +17097,8 @@ lin layby_N = mkN "Aire_de_repos" | mkN "aire_de_repos" | mkN "pull-off" ; -- UW
 lin layer_N = mkN "pondeuse" feminine | mkN "couche" feminine | mkN "marcotte" feminine ; -- tocheck
 lin layette_N = mkN "layette" ; -- UWN
 lin layman_N = mkN "laïc" masculine | mkN "profane" ; -- tocheck
-lin layoff_N = mkN "Dégraissage" | mkN "dégraissage" | mkN "licenciement" ; -- UWN
-lin layout_N = mkN "plan" | mkN "disposition" feminine ; -- tocheck
+lin lay_off_N = mkN "Dégraissage" | mkN "dégraissage" | mkN "licenciement" ; -- UWN
+lin lay_out_N = mkN "plan" | mkN "disposition" feminine ; -- tocheck
 lin layover_N = mkN "arrêt" | mkN "escale" | mkN "étape" ; -- UWN
 lin lazar_N = mkN "lépreux" | mkN "léprosé" ; -- UWN
 lin laziness_N = mkN "paresse" feminine ; -- tocheck
@@ -17413,14 +17413,14 @@ lin lieutenant_N = mkN "lieutenant" masculine ; -- tocheck
 lin life_N = mkN "vie" feminine ;
 lin lifeboat_N = mkN "canot" | mkN "canot_de_sauvetage" ; -- UWN
 lin lifeguard_N = mkN "maitre-nageur" masculine | mkN "sauveteur" masculine ; -- tocheck
-lin lifespan_N = variants {} ; --
+lin life_span_N = variants {} ; --
 lin lifestyle_N = variants {} ; --
 lin lifetime_N = mkN "éternité" feminine ; -- tocheck
 lin lift_N = mkN "portance" masculine | mkN "ascenseur" masculine ; -- tocheck
 lin lift_V = variants {} ; -- mkV2 (mkV "lever") ; -- tocheck
 lin lift_V2 = mkV2 (mkV "lever") ; -- tocheck
 lin lift_off_V = advV OP_lift_V OP_off_Adv ; -- guess-p-verb
-lin liftoff_N = mkN "décollage" masculine ; -- tocheck
+lin lift_off_N = mkN "décollage" masculine ; -- tocheck
 lin ligament_N = mkN "ligament" masculine ; -- tocheck
 lin ligand_N = mkN "Ligand" | mkN "ligand" ; -- UWN
 lin ligation_N = mkN "ligature" ; -- UWN
@@ -17740,7 +17740,7 @@ lin logicism_N = mkN "logicisme" ; -- UWN
 lin logion_N = mkN "logion" ; -- UWN
 lin logistic_A = mkA "logistique" ; -- tocheck
 lin logistics_N = mkN "logistique" feminine ; -- tocheck
-lin logjam_N = mkN "embouteillage" masculine | mkN "bourrage" masculine ; -- tocheck
+lin log_jam_N = mkN "embouteillage" masculine | mkN "bourrage" masculine ; -- tocheck
 lin logo_N = mkN "logo" masculine ; -- tocheck
 lin logogram_N = mkN "logogramme" masculine ; -- tocheck
 lin loin_N = mkN "filet" | mkN "lombe" | mkN "lombes" ; -- tocheck
@@ -17932,7 +17932,7 @@ lin lumbago_N = mkN "lumbago" masculine ; -- tocheck
 lin lumber_N = mkN "batte_de_baseball" ; -- UWN
 lin lumberjack_N = mkN "bûcheron" masculine ; -- tocheck
 lin lumberman_N = mkN "bûcheron" ; -- UWN
-lin lumbermill_N = mkN "scierie" ; -- UWN
+lin lumber_mill_N = mkN "scierie" ; -- UWN
 lin lumen_N = mkN "lumen" ; -- tocheck
 lin luminary_N = mkN "haine_et_passions" | mkN "notabilité" | mkN "notable" | mkN "notoriété" | mkN "personnage" ; -- UWN
 lin luminescence_N = mkN "luminescence" feminine ; -- tocheck
@@ -18007,7 +18007,7 @@ lin lynx_N = mkN "lynx" masculine ; -- tocheck
 lin lyonnaise_A = mkA "lyonnais" ; -- tocheck
 lin lyons_PN = mkPN "Lyons" ; -- status=guess src=geonames
 lin lyre_N = mkN "lyre" feminine ; -- tocheck
-lin lyrebird_N = mkN "menuridae" | mkN "ménuridés" ; -- UWN
+lin lyre_bird_N = mkN "menuridae" | mkN "ménuridés" ; -- UWN
 lin lyricist_N = mkN "parolier" ; -- UWN
 lin lysin_N = mkN "lysine" ; -- UWN
 lin lysine_N = mkN "lysine" feminine ; -- tocheck
@@ -18028,7 +18028,7 @@ lin macaroon_N = mkN "macaron" ; -- tocheck
 lin macaw_N = mkN "ara" masculine ; -- tocheck
 lin macclesfield_PN = mkPN "Macclesfield" ; -- status=guess src=geonames
 lin mace_N = mkN "macis" masculine | mkN "masse" feminine ; -- tocheck
-lin macebearer_N = mkN "macis" ; -- UWN
+lin mace_bearer_N = mkN "macis" ; -- UWN
 lin macerate_V = mkV "amaigrir" | mkV "macérer" ; -- UWN
 lin macerate_V2 = mkV2 (mkV "macérer") ; -- tocheck
 lin maceration_N = mkN "macération" feminine ; -- tocheck
@@ -18420,7 +18420,7 @@ lin marketing_N = mkN "mercatique" feminine ; -- tocheck
 lin marketplace_N = mkN "marché" masculine ; -- tocheck
 lin marking_N = mkN "marquage" ; -- UWN
 lin marksman_N = mkN "tireur_d'élite" ; -- UWN
-lin markup_N = mkN "majoration" feminine | mkN "balise" | mkN "marge" ; -- tocheck
+lin mark_up_N = mkN "majoration" feminine | mkN "balise" | mkN "marge" ; -- tocheck
 lin marl_N = mkN "marne" feminine ; -- tocheck
 lin marlborough_PN = mkPN "Marlborough" ; -- status=guess src=geonames
 lin marlin_N = mkN "marlin" ; -- tocheck
@@ -19048,7 +19048,7 @@ lin milk_N = L.milk_N ;
 lin milk_V2 = mkV2 (mkV I.traire_V2) ; -- tocheck
 lin milkmaid_N = mkN "laitière" feminine ; -- tocheck
 lin milkman_N = mkN "laitier" masculine ; -- tocheck
-lin milkshake_N = mkN "milk-shake" masculine ; -- tocheck
+lin milk_shake_N = mkN "milk-shake" masculine ; -- tocheck
 lin milkwort_N = mkN "polygale" masculine ; -- tocheck
 lin milky_A = mkA "laiteux" ; -- tocheck
 lin mill_N = mkN "moulin" | mkN "manufacture" feminine | mkN "moulin" masculine ; -- tocheck
@@ -19256,7 +19256,7 @@ lin mixed_A = variants {} ; --
 lin mixer_N = mkN "batte-beurre" feminine ; -- tocheck
 lin mixture_N = mkN "mélange" masculine ; -- tocheck
 lin mizzen_N = mkN "artimon" masculine ; -- tocheck
-lin mizzenmast_N = mkN "artimon" masculine ; -- tocheck
+lin mizzen_mast_N = mkN "artimon" masculine ; -- tocheck
 lin ml_N = mkN "centimètre_cube" | mkN "millilitre" | mkN "ml" ; -- UWN
 lin mnemonic_A = mkA "mnémonique" ; -- tocheck
 lin mnemonic_N = mkN "mnémonique" ; -- tocheck
@@ -19675,7 +19675,7 @@ lin multiculturalism_N = mkN "multiculturalisme" masculine ; -- tocheck
 lin multiethnic_A = mkA "multiethnique" ; -- tocheck
 lin multifarious_A = mkA "divers" ; -- UWN
 lin multilateral_A = mkA "multilatéral" ; -- tocheck
-lin multilingual_A = mkA "plurilingue" ; -- tocheck
+lin multi_lingual_A = mkA "plurilingue" ; -- tocheck
 lin multimedia_N = mkN "multimédia" masculine ; -- tocheck
 lin multinational_A = mkA "multinational" ; -- tocheck
 lin multiple_A = mkA "multiple" ; -- tocheck
@@ -19957,7 +19957,7 @@ lin nearby_A = mkA "proche" ; -- tocheck
 lin nearby_Adv = variants {} ; --
 lin nearly_Adv = adjAdv near_A ; -- -- derived
 lin nearness_N = mkN "proximité" | mkN "voisinage" ; -- UWN
-lin nearsighted_A = mkA "myope" ; -- UWN
+lin near_sighted_A = mkA "myope" ; -- UWN
 lin neat_A = mkA "pur" | mkA "net" ; -- tocheck
 lin neath_PN = mkPN "Neath" ; -- status=guess src=geonames
 lin nebuchadnezzar_N = mkN "nabuchodonosor" ; -- UWN
@@ -20813,7 +20813,7 @@ lin open_V = mkV L.open_V2 ;
 lin open_V2 = L.open_V2 ;
 lin open_up_V = advV OP_open_V OP_up_Adv ; -- guess-p-verb
 lin open_up_V2 = prepV2 OP_open_V OP_up_Prep ; -- guess-p-verb
-lin openhearted_A = mkA "accommodant" | mkA "affable" | mkA "amène" | mkA "gentil" ; -- UWN
+lin open_hearted_A = mkA "accommodant" | mkA "affable" | mkA "amène" | mkA "gentil" ; -- UWN
 lin opening_N = mkN "ouverture" feminine | mkN "trou" masculine ; -- tocheck
 lin opera_N = mkN "opéra" masculine ; -- tocheck
 lin operand_N = mkN "opérande" masculine ; -- tocheck
@@ -21177,7 +21177,7 @@ lin overproduction_N = mkN "surproduction" feminine ; -- tocheck
 lin overrate_V2 = mkV2 (mkV "surévaluer") ; -- tocheck
 lin overreact_V = mkV (reflV (mkV "emporter")) ; -- tocheck
 lin overriding_A = mkA "primordial" | mkA "prépondérant" | mkA "souverain" ; -- UWN
-lin overripe_A = mkA "blet" ; -- UWN
+lin over_ripe_A = mkA "blet" ; -- UWN
 lin overrun_V2 = mkV2 (mkV "exceder") ; -- tocheck
 lin oversea_A = mkA "outre-mer" ; -- UWN
 lin overseas_A = mkA "outremer" ; -- tocheck
@@ -21242,7 +21242,7 @@ lin oxygenate_V2 = mkV2 (mkV "oxygéner") ; -- tocheck
 lin oxymoron_N = mkN "oxymore" masculine ; -- tocheck
 lin oxytocin_N = mkN "ocytocine" ; -- tocheck
 lin oyster_N = mkN "sot-l'y-laisse" | mkN "huître" feminine ; -- tocheck
-lin oystercatcher_N = mkN "huîtrier" masculine ; -- tocheck
+lin oyster_catcher_N = mkN "huîtrier" masculine ; -- tocheck
 lin ozena_N = mkN "ozaena" ; -- UWN
 lin ozone_N = mkN "ozone" masculine ; -- tocheck
 lin ozonide_N = mkN "Ozonide" | mkN "ozonide" ; -- UWN
@@ -21287,7 +21287,7 @@ lin pad_V2 = mkV2 (mkV "rembourrer") ; -- tocheck
 lin padding_N = mkN "rembourrage" masculine ; -- tocheck
 lin paddle_N = mkN "palette" feminine | mkN "pale" feminine | mkN "pagaie" feminine | mkN "palme" feminine | mkN "volet" masculine | mkN "spatule" feminine | mkN "hélice" feminine | mkN "raquette" feminine | mkN "pagayage" masculine ; -- tocheck
 lin paddle_V2 = mkV2 (mkV "pagayer") | mkV2 (mkV "paletter") ; -- tocheck
-lin paddlewheel_N = mkN "roue_à_aubes" ; -- UWN
+lin paddle_wheel_N = mkN "roue à aubes" ; -- UWN
 lin paddock_N = mkN "paddock" ; -- UWN
 lin paddy_N = mkN "rizière" ; -- tocheck
 lin pademelon_N = mkN "thylogale" masculine ; -- tocheck
@@ -21911,7 +21911,7 @@ lin penniless_A = mkA "désargenté" ; -- tocheck
 lin penny_N = mkN "penny" masculine ; -- tocheck
 lin pennywhistle_N = mkN "flûte_irlandaise" | mkN "siffler" | mkN "sifflet" ; -- UWN
 lin penology_N = mkN "pénologie" ; -- UWN
-lin penpusher_N = mkN "gratte-papier" ; -- UWN
+lin pen_pusher_N = mkN "gratte-papier" ; -- UWN
 lin penrith_PN = mkPN "Penrith" ; -- status=guess src=geonames
 lin penryn_PN = mkPN "Penryn" ; -- status=guess src=geonames
 lin pension_N = mkN "pension" feminine ; -- tocheck
@@ -22660,7 +22660,7 @@ lin playfellow_N = mkN "playmate" ; -- UWN
 lin playful_A = mkA "folâtre" ; -- tocheck
 lin playlist_N = mkN "playlist" feminine ; -- tocheck
 lin playmate_N = mkN "playmate" ; -- UWN
-lin playoff_N = mkN "série_éliminatoire" ; -- UWN
+lin play_off_N = mkN "série_éliminatoire" ; -- UWN
 lin playpen_N = mkN "parc" ; -- UWN
 lin playroom_N = mkN "salle_de_jeux" ; -- UWN
 lin plaything_N = mkN "jouet" ; -- UWN
@@ -22784,8 +22784,8 @@ lin poacher_N = mkN "braconnier" masculine ; -- tocheck
 lin poaching_N = mkN "braconnage" masculine ; -- tocheck
 lin pocket_N = mkN "poche" feminine ; -- tocheck
 lin pocket_V2 = mkV2 (mkV "empocher") ; -- tocheck
-lin pocketbook_N = mkN "porte-monnaie" | mkN "sac" | mkN "sac_à_main" ; -- UWN
-lin pocketknife_N = mkN "canif" masculine ; -- tocheck
+lin pocket_book_N = mkN "porte-monnaie" | mkN "sac" | mkN "sac_à_main" ; -- UWN
+lin pocket_knife_N = mkN "canif" masculine ; -- tocheck
 lin pod_N = mkN "cosse" feminine | mkN "nacelle" feminine ; -- tocheck
 lin podgy_A = mkA "replet" ; -- tocheck
 lin podiatry_N = mkN "podologie" ; -- UWN
@@ -24169,7 +24169,7 @@ lin quarrelsomeness_N = mkN "agressivité" | mkN "pugnacité" ; -- UWN
 lin quarry_N = mkN "proie" feminine | mkN "carrière" feminine ; -- tocheck
 lin quart_N = mkN "pinte" feminine ; -- tocheck
 lin quarter_N = mkN "quart" masculine | mkN "quartier" masculine | mkN "trimestre" masculine ; -- tocheck
-lin quarterdeck_N = mkN "demi-dunette" feminine ; -- tocheck
+lin quarter_deck_N = mkN "demi-dunette" feminine ; -- tocheck
 lin quarterfinal_N = mkN "quart_de_finale" ; -- UWN
 lin quarterly_A = mkA "trimestriel" ; -- tocheck
 lin quarterly_Adv = mkAdv "trimestriellement" ; -- tocheck
@@ -24670,7 +24670,7 @@ lin record_N = mkN "enregistrement" masculine | mkN "record" masculine | mkN "di
 lin record_V2 = mkV2 (mkV "enregistrer") ; -- tocheck
 lin recorder_N = mkN "enregistreur" masculine ; -- tocheck
 lin recording_N = mkN "enregistrement" masculine ; -- tocheck
-lin recount_V2 = mkV2 (mkV "recompter") | mkV2 (mkV "raconter") ; -- tocheck
+lin re_count_V2 = mkV2 (mkV "recompter") | mkV2 (mkV "raconter") ; -- tocheck
 lin recourse_N = mkN "aide" | mkN "recours" | mkN "refuge" | mkN "ressource" ; -- UWN
 lin recover_V = variants {} ; -- mkV2V (mkV "récupérer") | mkV2V (mkV "recouvrer") ; -- tocheck
 lin recoverable_A = mkA "recouvrable" ; -- UWN
@@ -24782,8 +24782,8 @@ lin refocusing_N = mkN "recadrage" ; -- UWN
 lin reforest_V2 = mkV2 (mkV "reboiser") ; -- tocheck
 lin reforestation_N = mkN "reboisement" masculine ; -- tocheck
 lin reform_N = mkN "réforme" feminine ; -- tocheck
-lin reform_V = variants {} ; --
-lin reform_V2 = variants {} ; --
+lin re_form_V = variants {} ; --
+lin re_form_V2 = variants {} ; --
 lin reformer_N = mkN "réformateur" ; -- UWN
 lin reformism_N = mkN "réformisme" ; -- UWN
 lin reformulate_V2 = mkV2 (mkV "reformuler") ; -- tocheck
@@ -25626,7 +25626,7 @@ lin room_1_N = mkN "chambre" | mkN "pièce" ;
 lin room_2_N = mkN "place" | mkN "espace" ;
 lin room_N = mkN "pièce" feminine | mkN "espace" feminine ;
 lin roomer_N = mkN "cou" ; -- UWN
-lin roommate_N = mkN "camarade" | mkN "colocataire" ; -- tocheck
+lin room_mate_N = mkN "camarade" | mkN "colocataire" ; -- tocheck
 lin roomy_A = mkA "spacieux" ; -- tocheck
 lin rooster_N = mkN "coq" masculine ; -- tocheck
 lin root_N = L.root_N ;
@@ -26040,7 +26040,7 @@ lin sand_V2 = mkV2 (mkV "sabler") ; -- tocheck
 lin sandal_N = mkN "sandale" feminine ; -- tocheck
 lin sandalwood_N = mkN "santal" masculine ; -- tocheck
 lin sandbach_PN = mkPN "Sandbach" ; -- status=guess src=geonames
-lin sandbar_N = mkN "plature" ; -- UWN
+lin sand_bar_N = mkN "plature" ; -- UWN
 lin sandblast_N = mkN "sabler" ; -- UWN
 lin sandblast_V2 = mkV2 (mkV "sabler") ; -- tocheck
 lin sandbox_N = mkN "bac_à_sable" ; -- UWN
@@ -26447,7 +26447,7 @@ lin seafood_N = mkN "Fruit_de_mer" | mkN "fruit_de_mer" | mkN "fruits_de_mer" ;
 lin seaford_PN = mkPN "Seaford" ; -- status=guess src=geonames
 lin seagull_N = mkN "mouette" feminine ; -- tocheck
 lin seaham_PN = mkPN "Seaham" ; -- status=guess src=geonames
-lin seahorse_N = mkN "hippocampe" ; -- UWN
+lin sea_horse_N = mkN "hippocampe" ; -- UWN
 lin seal_N = mkN "sceau" masculine | mkN "joint" | mkN "phoque" masculine ; -- tocheck
 lin seal_V = variants {} ; -- mkV2A (mkV "sceller") ; -- tocheck
 lin seal_V2 = variants {} ; -- mkV2A (mkV "sceller") ; -- tocheck
@@ -26475,7 +26475,7 @@ lin seasoner_N = mkN "aromate" | mkN "aromatisant" | mkN "assaisonnement" | mkN
 lin seasoning_N = mkN "assaisonnement" masculine ; -- tocheck
 lin seat_N = mkN "assise" feminine | mkN "siège" masculine | mkN "séant" masculine | mkN "siège" ; -- tocheck
 lin seattle_PN = mkPN "Seattle" ; -- status=guess src=geonames
-lin seawater_N = mkN "eau_de_mer" | mkN "eau_salée" | mkN "saumure" ; -- UWN
+lin sea_water_N = mkN "eau_de_mer" | mkN "eau_salée" | mkN "saumure" ; -- UWN
 lin seaweed_N = mkN "algues" ; -- tocheck
 lin sebum_N = mkN "sébum" masculine ; -- tocheck
 lin secession_N = mkN "sécession" feminine ; -- tocheck
@@ -26484,7 +26484,7 @@ lin seclusion_N = mkN "isolement" masculine ; -- tocheck
 lin second_N = mkN "seconde" feminine ; -- tocheck
 lin secondary_A = mkA "secondaire" ; -- tocheck
 lin secondary_N = mkN "accessoire" ; -- UWN
-lin secondhand_A = mkA "occasion" ; -- UWN
+lin second_hand_A = mkA "occasion" ; -- UWN
 lin secondly_Adv = variants {} ; --
 lin secrecy_N = mkN "secret" masculine ; -- tocheck
 lin secret_A = mkA "secret" ; -- tocheck
@@ -26630,13 +26630,12 @@ lin semaphore_N = mkN "sémaphore" masculine ; -- tocheck
 lin semarang_PN = mkPN "Semarang" ; -- status=guess src=geonames
 lin semen_N = mkN "semence" feminine ; -- tocheck
 lin semester_N = mkN "semestre" ; -- tocheck
-lin semi_final_N = variants {} ; --
+lin semi_final_N = mkN "demi-finale" masculine ; -- tocheck
 lin semiannual_A = mkA "semi-annuel" ; -- tocheck
 lin semibreve_N = mkN "ronde" feminine ; -- tocheck
 lin semicircle_N = mkN "demi-cercle" masculine ; -- tocheck
 lin semicolon_N = mkN "point-virgule" masculine ; -- tocheck
 lin semiconductor_N = mkN "semiconducteur" masculine ; -- tocheck
-lin semifinal_N = mkN "demi-finale" masculine ; -- tocheck
 lin semifinalist_N = mkN "demi-finaliste" ; -- UWN
 lin semimonthly_A = mkA "bimensuel" | mkA "bimestriel" ; -- UWN
 lin semimonthly_Adv = mkAdv "bimensuel" | mkAdv "bimestriel" ; -- UWN
@@ -27203,7 +27202,7 @@ lin sidecar_N = mkN "side-car" ; -- UWN
 lin sidereal_A = mkA "sidéral" ; -- tocheck
 lin sideropenia_N = mkN "hyposidérémie" ; -- UWN
 lin siderosis_N = mkN "sidérose" ; -- UWN
-lin sidestroke_N = mkN "nage_indienne" ; -- UWN
+lin side_stroke_N = mkN "nage_indienne" ; -- UWN
 lin sidetrack_N = mkN "bardage" ; -- UWN
 lin sidewalk_N = mkN "trottoir" masculine ; -- tocheck
 lin sideways_Adv = variants {} ; --
@@ -27288,7 +27287,7 @@ lin silva_N = mkN "sylva" ; -- UWN
 lin silvan_A = mkA "sylvestre" ; -- UWN
 lin silver_A = mkA "argenté" ; -- tocheck
 lin silver_N = L.silver_N ;
-lin silverfish_N = mkN "poisson_d'argent" ; -- UWN
+lin silver_fish_N = mkN "poisson_d'argent" ; -- UWN
 lin silversmith_N = mkN "chaudronnier_d'argent" ; -- UWN
 lin silverware_N = mkN "argenterie" feminine ; -- tocheck
 lin silvery_A = mkA "argenté" ; -- tocheck
@@ -27555,7 +27554,7 @@ lin sleepover_N = mkN "soirée_pyjama" ; -- UWN
 lin sleepwalker_N = mkN "somnambule" ; -- UWN
 lin sleepwalking_N = mkN "somnambulisme" masculine ; -- tocheck
 lin sleepy_A = mkA "somnolent" ; -- tocheck
-lin sleepyhead_N = mkN "endormi" masculine ; -- tocheck
+lin sleepy_head_N = mkN "endormi" masculine ; -- tocheck
 lin sleet_N = mkN "grésil" masculine ; -- tocheck
 lin sleet_V = mkV (mkV "grésiller") ; -- tocheck
 lin sleeve_N = mkN "chemise" | mkN "pochette" | mkN "manche" feminine ; -- tocheck
@@ -28460,7 +28459,7 @@ lin staircase_N = mkN "escalier" masculine ; -- tocheck
 lin stairway_N = mkN "Escalier" | mkN "escalier" ; -- UWN
 lin stake_N = mkN "pieu" masculine | mkN "enjeu" masculine ; -- tocheck
 lin stake_V2 = variants {} ; --
-lin stakeholder_N = mkN "plaideur" masculine | mkN "intervenant" masculine ; -- tocheck
+lin stake_holder_N = mkN "plaideur" masculine | mkN "intervenant" masculine ; -- tocheck
 lin stalactite_N = mkN "stalactite" masculine ; -- tocheck
 lin stalagmite_N = mkN "stalagmite" masculine ; -- tocheck
 lin stale_A = mkA "vieilli" ; -- tocheck
@@ -29247,7 +29246,7 @@ lin suffrutescent_A = mkA "sous-frutescent" ; -- UWN
 lin sugar_N = mkN "bise" feminine | mkN "sucre" masculine ; -- tocheck
 lin sugar_V2 = mkV2 (mkV "sucrer") ; -- tocheck
 lin sugarberry_N = mkN "micocoulier" ; -- UWN
-lin sugarcane_N = mkN "canne_à_sucre" ; -- UWN
+lin sugar_cane_N = mkN "canne à sucre" ; -- UWN
 lin sugary_A = mkA "sucré" ; -- UWN
 lin suggest_V = (mkV "proposer") | (mkV "suggérer") ;
 lin suggest_V2 = mkV2 (mkV "proposer") | mkV2 (mkV "suggérer") ;
@@ -29796,6 +29795,7 @@ lin take_in_V2 = prepV2 (lin V OP_take_V2) OP_in_Prep ; -- guess-p-verb
 lin take_it_V2 = variants {} ; -- guess-p-verb
 lin take_it_out_on_V2 = variants {} ; -- guess-p-verb
 lin take_it_upon_yourself_V = variants {} ; -- guess-p-verb
+lin take_off_N = mkN "décollage" masculine ; -- tocheck
 lin take_off_V = advV (lin V OP_take_V2) OP_off_Adv ; -- guess-p-verb
 lin take_off_V2 = prepV2 (lin V OP_take_V2) OP_off_Prep ; -- guess-p-verb
 lin take_on_V = advV (lin V OP_take_V2) OP_on_Adv ; -- guess-p-verb
@@ -29808,7 +29808,6 @@ lin take_through_V2 = prepV2 (lin V OP_take_V2) OP_through_Prep ; -- guess-p-ver
 lin take_to_V2 = prepV2 (lin V OP_take_V2) OP_to_Prep ; -- guess-p-verb
 lin take_up_V = advV (lin V OP_take_V2) OP_up_Adv ; -- guess-p-verb
 lin take_up_V2 = prepV2 (lin V OP_take_V2) OP_up_Prep ; -- guess-p-verb
-lin takeoff_N = mkN "décollage" masculine ; -- tocheck
 lin takeover_N = mkN "acquisition" | mkN "prise_de_pouvoir" ; -- UWN
 lin talapoin_N = mkN "talapoin" masculine ; -- tocheck
 lin talc_N = mkN "talc" ; -- UWN
@@ -29999,7 +29998,7 @@ lin teaching_N = mkN "enseignement" masculine | mkN "doctrine" feminine ; -- toc
 lin teacup_N = mkN "tasse_à_thé" ; -- UWN
 lin teahouse_N = mkN "salon_de_thé" ; -- UWN
 lin teak_N = mkN "teck" masculine ; -- tocheck
-lin teakettle_N = mkN "bouilloire" masculine ; -- tocheck
+lin tea_kettle_N = mkN "bouilloire" masculine ; -- tocheck
 lin teal_N = mkN "sarcelle" feminine ; -- tocheck
 lin team_N = mkN "équipe" feminine ;
 lin teammate_N = mkN "coéquipier" masculine ; -- tocheck
@@ -30017,7 +30016,7 @@ lin tear_off_V2 = prepV2 OP_tear_V OP_off_Prep ; -- guess-p-verb
 lin tear_out_V = advV OP_tear_V OP_out_Adv ; -- guess-p-verb
 lin tear_up_V = advV OP_tear_V OP_up_Adv ; -- guess-p-verb
 lin tear_up_V2 = prepV2 OP_tear_V OP_up_Prep ; -- guess-p-verb
-lin teardrop_N = mkN "larme" feminine ; -- tocheck
+lin tear_drop_N = mkN "larme" feminine ; -- tocheck
 lin tearful_A = mkA "larmoyant" ; -- tocheck
 lin tearing_N = mkN "arrosage" ; -- UWN
 lin tearoom_N = mkN "salon_de_thé" ; -- UWN
@@ -30932,7 +30931,7 @@ lin traitor_N = mkN "traître" masculine ; -- tocheck
 lin trajectory_N = mkN "trajectoire" feminine ; -- tocheck
 lin tralee_PN = mkPN "Tralee" ; -- status=guess src=geonames
 lin tram_N = mkN "tramway" masculine ; -- tocheck
-lin tramcar_N = mkN "tram" | mkN "tramway" | mkN "trolley" | mkN "trolleybus" ; -- UWN
+lin tram_car_N = mkN "tram" | mkN "tramway" | mkN "trolley" | mkN "trolleybus" ; -- UWN
 lin trammel_N = mkN "crémaillère" feminine ; -- tocheck
 lin tramontane_A = mkA "transmontain" ; -- UWN
 lin tramp_N = mkN "garce" feminine | mkN "vagabond" masculine ; -- tocheck
@@ -32779,7 +32778,7 @@ lin waterfowl_N = mkN "aquatique" | mkN "oiseau" | mkN "oiseau_aquatique" ; -- U
 lin waterfront_N = mkN "berge" ; -- UWN
 lin watering_N = mkN "arrosage" ; -- UWN
 lin waterless_A = mkA "anhydre" | mkA "aride" | mkA "sec" ; -- UWN
-lin waterline_N = mkN "ligne_de_flottaison" ; -- UWN
+lin water_line_N = mkN "ligne_de_flottaison" ; -- UWN
 lin waterlogged_A = mkA "boueux" | mkA "marécageux" ; -- UWN
 lin waterloo_PN = mkPN "Waterloo" ; -- status=guess src=geonames
 lin waterman_N = mkN "canotier" | mkN "waterman" ; -- UWN
@@ -32851,7 +32850,7 @@ lin weasel_N = mkN "belette" feminine ; -- tocheck
 lin weather_N = mkN "temps" masculine | mkN "intempéries" feminine ; -- tocheck
 lin weathercock_N = mkN "girouette" feminine ; -- tocheck
 lin weatherman_N = mkN "météorologue" ; -- tocheck
-lin weathervane_N = mkN "girouette" ; -- UWN
+lin weather_vane_N = mkN "girouette" ; -- UWN
 lin weave_N = mkN "armure" feminine ; -- tocheck
 lin weave_V = variants {} ; -- mkV2 (mkV "tisser") | mkV2 (reflV (mkV "faufiler")) ; -- tocheck
 lin weave_V2 = mkV2 (mkV "tisser") | mkV2 (reflV (mkV "faufiler")) ; -- tocheck
@@ -33894,4 +33893,4 @@ oper OP_shrug_V2 : V2 = variants {} ; --
 oper OP_shut_V2 : V2 = mkV2 (mkV "fermer") ; -- tocheck
 oper OP_take_V2 : V2 = I.prendre_V2 ;
 oper OP_urge_V2 : V2 = variants {} ; -- mkV2V (mkV "insister") | mkV2V (mkV "pousser") | mkV2V (mkV "inciter") | mkV2V (mkV "provoquer") ; -- tocheck
-}
+}