diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 47f15f057..7944f71e6 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -21576,13 +21576,12 @@ fun flavin_N : N ; -- 14870924 a ketone that forms the nucleus o fun flavivirus_N : N ; -- 01332795 animal viruses belonging to the family Flaviviridae fun flavone_N : N ; -- 14869513 a colorless crystalline compound that is part of a number of white or yellow plant pigments fun flavonoid_N : N ; -- 14869658 any of a large class of plant pigments having a chemical structure based on or similar to flavone -fun flavor_N : N ; -fun flavorer_N : N ; -- 07809368 something added to food primarily for the savor it imparts fun flavorful_A : A ; -- 02396911 full of flavor fun flavorlessness_N : N ; -- 04997032 the property of having no flavor fun flavorsomeness_N : N ; -- 04995940 having an appetizing flavor fun flavour_N : N ; fun flavour_V2 : V2 ; -- 02191766 lend flavor to; "Season the chicken breast after roasting it" +fun flavourer_N : N ; -- 07809368 something added to food primarily for the savor it imparts fun flavouring_N : N ; -- 07809368 something added to food primarily for the savor it imparts fun flavourless_A : A ; -- 02399595 lacking taste or flavor or tang; "a bland diet"; "insipid hospital food"; "flavorless supermarket tomatoes"; "vapid beer"; "vapid tea" fun flaw_N : N ; @@ -33414,7 +33413,6 @@ fun machinist_N : N ; -- 10279018 a craftsman skilled in operating fun machismo_N : N ; -- 04667180 exaggerated masculinity fun machmeter_N : N ; -- 03702582 speedometer for measuring the speed of an aircraft relative to the speed of sound fun macho_N : N ; -- 10279219 a male exhibiting or characterized by machismo -fun macintosh_N : N ; fun mackerel_N : N ; fun mackinaw_N : N ; fun mackintosh_N : N ; @@ -36792,7 +36790,6 @@ fun myiasis_N : N ; -- 14453840 infestation of the body by the la fun mylodon_N : N ; -- 02459485 large (bear-sized) extinct edentate mammal of the Pleistocene in South America fun mylodontid_N : N ; -- 02459190 a variety of extinct edentate fun myna_N : N ; -- 01577659 tropical Asian starlings -fun mynah_N : N ; -- 01577659 tropical Asian starlings fun myocardial_A : A ; -- 03013124 of or relating to the myocardium fun myocardium_N : N ; -- 05391000 the middle muscular layer of the heart wall fun myoclonus_N : N ; -- 14361415 a clonic spasm of a muscle or muscle group diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index a50eac135..1a716778c 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -21582,13 +21582,12 @@ lin flavin_N = mkN007 "флавин" ; lin flavivirus_N = mkN007 "флавивирус" ; lin flavone_N = mkN007 "флаваноид" ; lin flavonoid_N = mkN007 "флавоноид" ; -lin flavor_N = variants {} ; -lin flavorer_N = variants {} ; lin flavorful_A = mkA079 "ароматен" ; lin flavorlessness_N = variants {} ; lin flavorsomeness_N = variants {} ; lin flavour_N = mkN001 "вкус" ; lin flavour_V2 = dirV2 (dualV (mkV186 "овкусявам") (mkV173 "овкуся")) ; +lin flavourer_N = mkN031 "овкусител" ; lin flavouring_N = mkN071 "овкусяване" ; lin flavourless_A = mkA079 "безвкусен" ; lin flaw_N = variants {mkN041 "вихрушка"; mkN007 "дефект"; mkN007 "кусур"; mkN041 "кухина"; mkN041 "махана"; mkN014 "недостатък"} ; ---- @@ -33433,7 +33432,6 @@ lin machinist_N = mkN007a "машинист" ; lin machismo_N = mkN011 "мачизъм" ; lin machmeter_N = variants {} ; lin macho_N = mkN040 "мачо" ; -lin macintosh_N = variants {} ; lin mackerel_N = mkN047 "скумрия" ; ---- lin mackinaw_N = mkN054 "макино" ; lin mackintosh_N = mkN007 "шлифер" ; @@ -36824,7 +36822,6 @@ lin myiasis_N = mkN007 "миазис" ; lin mylodon_N = variants {} ; lin mylodontid_N = variants {} ; lin myna_N = variants {} ; -lin mynah_N = variants {} ; lin myocardial_A = mkA079 "миокарден" ; lin myocardium_N = mkN041 "миокарда" ; lin myoclonus_N = mkN007 "миоклонус" ; diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index 69fc7c822..ec95b9f73 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -13273,9 +13273,8 @@ lin flatwork_N = mkN "机械熨烫件" ; -- open-multilingual-wordnet lin flaunt_V = mkV "炫耀" ; lin flaunt_V2 = mkV2 "炫耀" ; lin flavin_N = mkN "核黄素" | mkN "黄素" ; -- open-multilingual-wordnet -lin flavor_N = mkN "口味" | mkN "味道" | mkN "尝" ; lin flavorful_A = mkA "味浓" | mkA "好风味" | mkA "有味道" | mkA "有香味" ; -- open-multilingual-wordnet -lin flavour_N = mkN "香味" "种" ; +lin flavour_N = mkN "香味" "种" | mkN "口味" | mkN "味道" | mkN "尝" ; lin flaw_N = mkN "缺陷" ; lin flaw_V2 = mkV2 "破裂" ; lin flawless_A = mkA "无瑕疵" ; @@ -20124,7 +20123,6 @@ lin machinery_N = mkN "机械" ; lin machinist_N = mkN "机械师" ; lin machmeter_N = mkN "马赫表" | mkN "马赫计" ; -- open-multilingual-wordnet lin macho_N = mkN "男子漢" | mkN "男子汉" ; -- status=guess -- status=guess -lin macintosh_N = mkN "橡皮布防水衣" | mkN "马金托什雨衣" ; -- open-multilingual-wordnet lin mackerel_N = mkN "鯖魚" | mkN "鲭鱼" ; -- status=guess -- status=guess lin mackinaw_N = mkN "麦基诺厚呢" ; -- open-multilingual-wordnet lin mackintosh_N = mkN "橡皮布防水衣" | mkN "马金托什雨衣" ; -- open-multilingual-wordnet diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index d1745e91a..b73bcdc05 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -140,7 +140,7 @@ lin ablutionary_A = mkA "ablutionary" ; lin abnegation_N = mkN "abnegation" ; lin abnegator_N = mkN "abnegator" ; lin abnormal_A = compoundA (mkA "abnormal"); -lin abnormality_N = mkN "abnormality" "abnormalities"; +lin abnormality_N = variants {mkN "abnormality" "abnormalities"; mkN "abnormalcy" "abnormalcies"}; lin abo_N = mkN "Abo" "Abos"; lin aboard_Adv = mkAdv "aboard"; lin aboard_Prep = mkPrep "aboard"; @@ -503,7 +503,7 @@ lin achlorhydric_A = mkA "achlorhydric" ; lin acholia_N = mkN "acholia" ; lin achondrite_N = mkN "achondrite" ; lin achondritic_A = mkA "achondritic" ; -lin achondroplasia_N = mkN "achondroplasia" ; +lin achondroplasia_N = variants {mkN "achondroplasia"; mkN "achondroplasty"} ; lin achondroplastic_A = mkA "achondroplastic" ; lin achromatic_A = mkA "achromatic" ; lin achromatin_N = mkN "achromatin" ; @@ -2026,7 +2026,7 @@ lin ammoniuria_N = mkN "ammoniuria" ; lin ammunition_N = mkN "ammunition" ; lin amnesia_N = mkN "amnesia" ; lin amnesic_A = mkA "amnesic" ; -lin amnesic_N = mkN "amnesic" ; +lin amnesic_N = variants {mkN "amnesic"; mkN "amnesiac"} ; lin amnestic_A = mkA "amnestic" ; lin amnesty_N = mkN "amnesty" "amnesties"; lin amniocentesis_N = mkN "amniocentesis" ; @@ -2314,7 +2314,7 @@ lin anesthetist_N = mkN "anesthetist" "anesthetists"; lin anesthetize_V2 = mkV2 (mkV "anesthetize" "anesthetizes" "anesthetized" "anesthetized" "anesthetizing"); lin anesthyl_N = mkN "anesthyl" ; lin anestrous_A = mkA "anestrous" ; -lin anestrus_N = mkN "anestrus" ; +lin anestrus_N = variants {mkN "anestrus"; mkN "anestrum"; mkN "anoestrus"; mkN "anoestrum"} ; lin aneuploid_A = mkA "aneuploid" ; lin aneuploidy_N = mkN "aneuploidy" ; lin aneurysm_N = mkN "aneurysm" ; @@ -2405,7 +2405,7 @@ lin angulation_N = mkN "angulation" ; lin angus_PN = mkPN "Angus"; lin angwantibo_N = mkN "angwantibo" ; lin anhedonia_N = mkN "anhedonia" ; -lin anhidrosis_N = mkN "anhidrosis" ; +lin anhidrosis_N = variants {mkN "anhidrosis"; mkN "anhydrosis"} ; lin anhydride_N = mkN "anhydride" ; lin anhydrous_A = mkA "anhydrous" ; lin ani_N = mkN "ani" ; @@ -3219,7 +3219,7 @@ lin archaeology_N = mkN "archaeology" ; lin archaeopteryx_N = mkN "archaeopteryx" ; lin archaeornis_N = mkN "archaeornis" ; lin archaic_A = compoundA (mkA "archaic"); -lin archaism_N = mkN "archaism" "archaisms"; +lin archaism_N = variants {mkN "archaism" "archaisms"; mkN "archaicism" "archaicisms"}; lin archaist_N = mkN "archaist" ; lin archaistic_A = mkA "archaistic" ; lin archangel_N = mkN "archangel" "archangels"; @@ -4862,7 +4862,7 @@ lin banquet_N = mkN "banquet" "banquets"; lin banquet_V = mkV "banquet" "banquets" "banqueted" "banqueted" "banqueting"; lin banquet_V2 = mkV2 (mkV "banquet" "banquets" "banqueted" "banqueted" "banqueting"); lin banquette_N = mkN "banquette" ; -lin banshee_N = mkN "banshee" "banshees"; +lin banshee_N = variants {mkN "banshee" "banshees"; mkN "banshie" "banshies"}; lin bant_V = mkV "bant" "bants" "banted" "banted" "banting"; lin bantam_A = mkA "bantam" ; lin bantam_N = mkN "bantam" "bantams"; @@ -5629,7 +5629,7 @@ lin bender_N = mkN "bender" ; lin bending_N = mkN "bending" ; lin beneath_Adv = mkAdv "beneath"; lin beneath_Prep = mkPrep "beneath"; -lin benedick_N = mkN "benedick" "benedicks"; +lin benedick_N = variants {mkN "benedick" "benedicks"; mkN "benedict" "benedicts"}; lin benedictine_A = compoundA (mkA "benedictine"); lin benedictine_N = mkN "benedictine" "benedictines"; lin benediction_N = mkN "benediction" "benedictions"; @@ -5885,7 +5885,7 @@ lin bicolor_A = mkA "bicolor" ; lin biconcave_A = mkA "biconcave" ; lin biconvex_A = mkA "biconvex" ; lin bicorn_A = mkA "bicorn" ; -lin bicorn_N = mkN "bicorn" ; +lin bicorn_N = variants {mkN "bicorn"; mkN "bicorne"} ; lin bicuspid_A = mkA "bicuspid" ; lin bicycle_N = mkN "bicycle" "bicycles"; lin bicycle_V = mkV "bicycle" "bicycles" "bicycled" "bicycled" "bicycling"; @@ -7170,7 +7170,7 @@ lin bow_V = mkV "bow" "bows" "bowed" "bowed" "bowing"; lin bow_V2 = mkV2 (mkV "bow" "bows" "bowed" "bowed" "bowing"); lin bow_wow_N = mkN "bow-wow" "bow-wows"; lin bowburn_PN = mkPN "Bowburn"; -lin bowdlerization_N = mkN "bowdlerization" ; +lin bowdlerization_N = variants {mkN "bowdlerization"; mkN "bowdlerisation"} ; lin bowdlerize_V2 = mkV2 (mkV "bowdlerize" "bowdlerizes" "bowdlerized" "bowdlerized" "bowdlerizing"); lin bowel_N = mkN "bowel" "bowels"; lin bower_N = mkN "bower" "bowers"; @@ -8552,7 +8552,7 @@ lin called_A = mkA "called" ; lin caller_A = mkA "caller" ; lin caller_N = mkN "caller" "callers"; lin calliandra_N = mkN "calliandra" ; -lin calligrapher_N = mkN "calligrapher" ; +lin calligrapher_N = variants {mkN "calligrapher"; mkN "calligraphist"} ; lin calligraphic_A = mkA "calligraphic" ; lin calligraphy_N = mkN "calligraphy" ; lin calling_N = mkN "calling" "callings"; @@ -8788,7 +8788,7 @@ lin canonical_A = compoundA (mkA "canonical"); lin canonist_A = mkA "canonist" ; lin canonist_N = mkN "canonist" ; lin canonization_N = mkN "canonization" "canonizations"; -lin canonize_V2 = mkV2 (mkV "canonize" "canonizes" "canonized" "canonized" "canonizing"); +lin canonize_V2 = variants {mkV2 (mkV "canonize" "canonizes" "canonized" "canonized" "canonizing"); mkV2 (mkV "canonise" "canonises" "canonised" "canonised" "canonising")}; lin canopied_A = compoundA (mkA "canopied"); lin canopy_N = mkN "canopy" "canopies"; lin canorous_A = mkA "canorous" ; @@ -9640,7 +9640,7 @@ lin centennial_A = compoundA (mkA "centennial"); lin centennial_N = mkN "centennial" "centennials"; lin center_A = mkA "center"; lin centered_A = mkA "centered" ; -lin centerfold_N = mkN "centerfold" ; +lin centerfold_N = variants {mkN "centerfold"; mkN "centrefold"} ; lin centering_N = mkN "centering" ; lin centerline_N = mkN "centerline" ; lin centesimal_A = mkA "centesimal" ; @@ -9845,7 +9845,7 @@ lin chamberlain_N = mkN "chamberlain" "chamberlains"; lin chambermaid_N = mkN "chambermaid" "chambermaids"; lin chamberpot_N = mkN "chamberpot" "chamberpots"; lin chambray_N = mkN "chambray" ; -lin chameleon_N = mkN "chameleon" "chameleons"; +lin chameleon_N = variants {mkN "chameleon" "chameleons"; mkN "chamaeleon" "chamaeleons"}; lin chammy_leather_N = variants {mkN "chammy-leather" "chammy-leathers"; mkN "chammy leather" "chammy leathers"}; lin chamois_N = mkN "chamois" "chamoises"; lin chamois_leather_N = variants {mkN "chamois-leather" "chamois-leathers"; mkN "chamois leather" "chamois leathers"}; @@ -10556,7 +10556,7 @@ lin chromatogram_N = mkN "chromatogram" ; lin chromatographic_A = irregAdv (mkA "chromatographic") (variants {"chromatographically"; "chromatographicly"}) ; lin chromatography_N = mkN "chromatography" ; lin chrome_N = mkN "chrome" ; -lin chromesthesia_N = mkN "chromesthesia" ; +lin chromesthesia_N = variants {mkN "chromesthesia"; mkN "chromaesthesia"} ; lin chromite_N = mkN "chromite" ; lin chromium_N = mkN "chromium" ; lin chromoblastomycosis_N = mkN "chromoblastomycosis" ; @@ -13172,7 +13172,7 @@ lin cosmetologist_N = mkN "cosmetologist" ; lin cosmetology_N = mkN "cosmetology" ; lin cosmic_A = compoundA (mkA "cosmic"); lin cosmid_N = mkN "cosmid" ; -lin cosmogony_N = mkN "cosmogony" "cosmogonies"; +lin cosmogony_N = variants {mkN "cosmogony" "cosmogonies"; mkN "cosmogeny" "cosmogenies"}; lin cosmographer_N = mkN "cosmographer" ; lin cosmography_N = mkN "cosmography" ; lin cosmolatry_N = mkN "cosmolatry" ; @@ -13720,7 +13720,7 @@ lin crematorium_N = mkN "crematorium" "crematoriums"; lin crematory_N = mkN "crematory" "crematories"; lin creme_de_menthe_N = mkN "crème de menthe" ; lin crenate_A = mkA "crenate" ; -lin crenel_N = mkN "crenel" ; +lin crenel_N = variants {mkN "crenel"; mkN "crenelle"} ; lin crenelation_N = mkN "crenelation" ; lin crenellated_A = compoundA (mkA "crenellated"); lin crenulate_A = mkA "crenulate" ; @@ -17327,7 +17327,7 @@ lin douche_N = mkN "douche" "douches"; lin doug_PN = mkPN "Doug"; lin dough_N = mkN "dough" ; lin doughboy_N = mkN "doughboy" ; -lin doughnut_N = mkN "doughnut" "doughnuts"; +lin doughnut_N = variants {mkN "doughnut" "doughnuts"; mkN "donut" "donuts"}; lin doughty_A = compoundA (mkA "doughty"); lin doughy_A = mkA "doughy" "doughier"; lin douglas_PN = mkPN "Douglas"; @@ -18870,7 +18870,7 @@ lin encasement_N = mkN "encasement" ; lin encaustic_A = compoundA (mkA "encaustic"); lin encaustic_N = mkN "encaustic" ; lin encephalartos_N = mkN "encephalartos" ; -lin encephalitis_N = mkN "encephalitis" ; +lin encephalitis_N = variants {mkN "encephalitis"; mkN "cephalitis"} ; lin encephalocele_N = mkN "encephalocele" ; lin encephalogram_N = mkN "encephalogram" ; lin encephalography_N = mkN "encephalography" ; @@ -19338,7 +19338,7 @@ lin epilepticFem_N = mkN feminine (mkN "epileptic" "epileptics"); lin epilepticMasc_N = mkN masculine (mkN "epileptic" "epileptics"); lin epileptic_A = compoundA (mkA "epileptic"); lin epilithic_A = mkA "epilithic" ; -lin epilogue_N = mkN "epilogue" "epilogues"; +lin epilogue_N = variants {mkN "epilogue" "epilogues"; mkN "epilog" "epilogs"}; lin epimorphic_A = mkA "epimorphic" ; lin epinephrine_N = mkN "epinephrine" ; lin epiphany_N = mkN "epiphany" ; @@ -19620,7 +19620,7 @@ lin esthete_N = mkN "esthete" "esthetes"; lin esthetic_A = compoundA (mkA "esthetic"); lin esthetic_N = mkN "esthetic" ; lin esthetical_A = compoundA (mkA "esthetical"); -lin esthetician_N = mkN "esthetician" ; +lin esthetician_N = variants {mkN "esthetician"; mkN "aesthetician"} ; lin esthetics_N = mkN "esthetics" "esthetics"; lin estimable_A = compoundA (mkA "estimable"); lin estimate_N = mkN "estimate" "estimates"; @@ -19641,7 +19641,7 @@ lin estrogen_N = mkN "estrogen" ; lin estrogenic_A = mkA "estrogenic" ; lin estrone_N = mkN "estrone" ; lin estrous_A = mkA "estrous" ; -lin estrus_N = mkN "estrus" ; +lin estrus_N = variants {mkN "estrus"; mkN "oestrus"} ; lin estuarine_A = mkA "estuarine" ; lin estuary_N = mkN "estuary" "estuaries"; lin et_al_PN = mkPN "Et al"; @@ -19707,7 +19707,7 @@ lin etymologist_N = mkN "etymologist" "etymologists"; lin etymology_N = mkN "etymology" "etymologies"; lin etymon_N = mkN "etymon" ; lin eubacteria_N = mkN "eubacteria" ; -lin eucalyptus_N = mkN "eucalyptus" "eucalyptuses"; +lin eucalyptus_N = variants {mkN "eucalyptus" "eucalyptuses"; mkN "eucalypt" "eucalypts"}; lin eucharist_N = mkN "Eucharist" "Eucharists"; lin euchre_N = mkN "euchre" ; lin euclidean_A = compoundA (mkA (variants {"euclidean"; "euclidian"})); @@ -20671,7 +20671,7 @@ lin farm_V2 = mkV2 (mkV "farm" "farms" "farmed" "farmed" "farming"); lin farm_out_V2 = mkV2 (partV (mkV "farm") "out"); lin farmer_N = mkN "farmer" "farmers"; lin farmerette_N = mkN "farmerette" ; -lin farmhand_N = mkN "farmhand" "farmhands"; +lin farmhand_N = variants {mkN "farmhand" "farmhands"; mkN "fieldhand" "fieldhands"}; lin farmhouse_N = mkN "farmhouse" "farmhouses"; lin farming_N = mkN "farming"; lin farmland_N = mkN "farmland" ; @@ -21660,7 +21660,7 @@ lin flatterer_N = mkN "flatterer" "flatterers"; lin flattering_A = mkA "flattering" ; lin flattery_N = mkN "flattery" "flatteries"; lin flattop_N = mkN "flattop" "flattops"; -lin flatulence_N = mkN "flatulence" ; +lin flatulence_N = variants {mkN "flatulence"; mkN "flatulency"} ; lin flatulent_A = mkA "flatulent" ; lin flatware_N = mkN "flatware" ; lin flatwork_N = mkN "flatwork" ; @@ -21674,13 +21674,12 @@ lin flavin_N = mkN "flavin" ; lin flavivirus_N = mkN "flavivirus" ; lin flavone_N = mkN "flavone" ; lin flavonoid_N = mkN "flavonoid" ; -lin flavor_N = mkN "flavor" ; -lin flavorer_N = mkN "flavorer" ; lin flavorful_A = mkA "flavorful" ; lin flavorlessness_N = mkN "flavorlessness" ; lin flavorsomeness_N = mkN "flavorsomeness" ; lin flavour_N = mkN (variants {"flavour"; "flavor"}); lin flavour_V2 = mkV2 (mkV "flavour" "flavours" "flavoured" "flavoured" "flavouring"); +lin flavourer_N = variants {mkN "flavourer"; mkN "flavorer"} ; lin flavouring_N = mkN "flavouring" "flavourings"; lin flavourless_A = compoundA (mkA "flavourless"); lin flaw_N = mkN "flaw" "flaws"; @@ -21730,7 +21729,7 @@ lin flex_N = mkN "flex" "flexes"; lin flex_V2 = mkV2 (mkV "flex" "flexes" "flexed" "flexed" "flexing"); lin flexibility_N = mkN "flexibility" ; lin flexible_A = compoundA (mkA "flexible"); -lin flexion_N = mkN "flexion" ; +lin flexion_N = variants {mkN "flexion"; mkN "flection"} ; lin flexuous_A = mkA "flexuous" ; lin flexure_N = mkN "flexure" ; lin flibbertigibbet_N = mkN "flibbertigibbet" "flibbertigibbets"; @@ -23156,7 +23155,7 @@ lin galvanism_N = mkN "galvanism" ; lin galvanization_N = mkN "galvanization" ; lin galvanize_V2 = mkV2 (mkV "galvanize" "galvanizes" "galvanized" "galvanized" "galvanizing"); lin galvanize_VS = mkVS (mkV "galvanize"); -lin galvanizer_N = mkN "galvanizer" ; +lin galvanizer_N = variants {mkN "galvanizer"; mkN "galvaniser"} ; lin galvanometer_N = mkN "galvanometer" ; lin galway_PN = mkPN "Galway"; lin gam_N = mkN "gam" ; @@ -24762,7 +24761,7 @@ lin grey_V2 = variants {mkV2 (mkV "grey" "greys" "greyed" "greyed" "greying"); m lin grey_headed_A = compoundA (mkA "grey-headed"); lin grey_out_V2 = mkV2 (partV (mkV "grey") "out"); lin greyback_N = mkN "greyback" ; -lin greybeard_N = mkN "greybeard" "greybeards"; +lin greybeard_N = variants {mkN "greybeard" "greybeards"; mkN "graybeard" "graybeards"}; lin greyhen_N = mkN "greyhen" ; lin greyhound_N = mkN "greyhound" "greyhounds"; lin greyish_A = compoundA (mkA "greyish"); @@ -25724,7 +25723,7 @@ lin harper_N = mkN "harper" "harpers"; lin harpist_N = mkN "harpist" "harpists"; lin harpoon_N = mkN "harpoon" "harpoons"; lin harpoon_V2 = mkV2 (mkV "harpoon" "harpoons" "harpooned" "harpooned" "harpooning"); -lin harpooner_N = mkN "harpooner" ; +lin harpooner_N = variants {mkN "harpooner"; mkN "harpooneer"} ; lin harpsichord_N = mkN "harpsichord" "harpsichords"; lin harpsichordist_N = mkN "harpsichordist" "harpsichordists"; lin harpulla_N = mkN "harpulla" ; @@ -26225,7 +26224,7 @@ lin hematochezia_N = mkN "hematochezia" ; lin hematochrome_N = mkN "hematochrome" ; lin hematocolpometra_N = mkN "hematocolpometra" ; lin hematocolpos_N = mkN "hematocolpos" ; -lin hematocrit_N = mkN "hematocrit" ; +lin hematocrit_N = variants {mkN "hematocrit"; mkN "haematocrit"} ; lin hematocytopenia_N = mkN "hematocytopenia" ; lin hematocyturia_N = mkN "hematocyturia" ; lin hematologic_A = mkA "hematologic" ; @@ -26269,7 +26268,7 @@ lin hemolysis_N = mkN "hemolysis" ; lin hemolytic_A = mkA "hemolytic" ; lin hemophilia_N = mkN "hemophilia" ; lin hemophiliac_N = mkN "hemophiliac" "hemophiliacs"; -lin hemoprotein_N = mkN "hemoprotein" ; +lin hemoprotein_N = variants {mkN "hemoprotein"; mkN "haemoprotein"} ; lin hemoptysis_N = mkN "hemoptysis" ; lin hemorrhage_N = mkN "hemorrhage" "hemorrhages"; lin hemorrhage_V = mkV "hemorrhage"; @@ -27005,7 +27004,7 @@ lin honour_V2 = mkV2 (mkV (variants {"honour"; "honor"})); lin honourable_A = compoundA (mkA (variants {"honourable"; "honorable"})); lin honourableness_N = mkN (variants {"honourableness"; "honorableness"}); lin hoo_PN = mkPN "Hoo"; -lin hooch_N = mkN "hooch" ; +lin hooch_N = variants {mkN "hooch"; mkN "hootch"} ; lin hood_N = mkN "hood" "hoods"; lin hood_V2 = mkV2 (mkV "hood" "hoods" "hooded" "hooded" "hooding"); lin hoodlum_N = mkN "hoodlum" "hoodlums"; @@ -27611,7 +27610,7 @@ lin hyperboloid_N = mkN "hyperboloid" ; lin hyperboloidal_A = mkA "hyperboloidal" ; lin hypercalcemia_N = mkN "hypercalcemia" ; lin hypercalciuria_N = mkN "hypercalciuria" ; -lin hypercapnia_N = mkN "hypercapnia" ; +lin hypercapnia_N = variants {mkN "hypercapnia"; mkN "hypercarbia"} ; lin hypercatalectic_A = mkA "hypercatalectic" ; lin hypercatalectic_N = mkN "hypercatalectic" ; lin hypercellularity_N = mkN "hypercellularity" ; @@ -27657,7 +27656,7 @@ lin hypertensive_A = mkA "hypertensive" ; lin hypertensive_N = mkN "hypertensive" ; lin hypertext_N = mkN "hypertext" ; lin hyperthermal_A = mkA "hyperthermal" ; -lin hyperthermia_N = mkN "hyperthermia" ; +lin hyperthermia_N = variants {mkN "hyperthermia"; mkN "hyperthermy"} ; lin hyperthyroidism_N = mkN "hyperthyroidism" ; lin hypertonia_N = mkN "hypertonia" ; lin hypertonic_A = mkA "hypertonic" ; @@ -29770,7 +29769,7 @@ lin iodotyrosine_N = mkN "iodotyrosine" ; lin ion_N = mkN "ion" "ions"; lin ionic_A = compoundA (mkA "ionic"); lin ionization_N = mkN "ionization" ; -lin ionize_V = mkV "ionize" "ionizes" "ionized" "ionized" "ionizing"; +lin ionize_V = variants {mkV "ionize" "ionizes" "ionized" "ionized" "ionizing"; mkV "ionise" "ionises" "ionised" "ionised" "ionising"}; lin ionize_V2 = mkV2 (mkV "ionize" "ionizes" "ionized" "ionized" "ionizing"); lin ionosphere_N = mkN "ionosphere" "ionospheres"; lin iontophoresis_N = mkN "iontophoresis" ; @@ -33567,10 +33566,9 @@ lin machinist_N = mkN "machinist" "machinists"; lin machismo_N = mkN "machismo" ; lin machmeter_N = mkN "machmeter" ; lin macho_N = mkN "macho" ; -lin macintosh_N = mkN "macintosh" ; lin mackerel_N = mkN "mackerel" "mackerel"; lin mackinaw_N = mkN "mackinaw" ; -lin mackintosh_N = mkN "mackintosh" "mackintoshes"; +lin mackintosh_N = variants {mkN "mackintosh" "mackintoshes"; mkN "macintosh"}; lin mackle_N = mkN "mackle" ; lin macon_N = mkN "macon" ; lin macrame_N = mkN "macrame" ; @@ -34285,7 +34283,7 @@ lin marseillaise_N = mkN "Marseillaise" "Marseillaises"; lin marseille_N = mkN "marseille" ; lin marseilles_PN = mkPN "Marseilles"; lin marsh_N = mkN "marsh" "marshes"; -lin marshal_N = mkN "marshal" "marshals"; +lin marshal_N = variants {mkN "marshal" "marshals"; mkN "marshall" "marshalls"}; lin marshal_V2 = mkV2 (mkV "marshal" "marshals" "marshalled" "marshalled" "marshalling"); lin marshalling_yard_N = variants {mkN "marshalling-yard" "marshalling-yards"; mkN "marshalling yard" "marshalling yards"}; lin marshalship_N = mkN "marshalship" ; @@ -34776,7 +34774,7 @@ lin megascopic_A = mkA "megascopic" ; lin megasporangium_N = mkN "megasporangium" ; lin megaspore_N = mkN "megaspore" ; lin megasporophyll_N = mkN "megasporophyll" ; -lin megatherian_N = mkN "megatherian" ; +lin megatherian_N = variants {mkN "megatherian"; mkN "megatheriid"} ; lin megaton_N = mkN "megaton" "megatons"; lin megawatt_N = mkN "megawatt" ; lin megestrol_N = mkN "megestrol" ; @@ -36049,7 +36047,7 @@ lin monandrous_A = mkA "monandrous" ; lin monandry_N = mkN "monandry" ; lin monarch_N = mkN "monarch" "monarchs"; lin monarchal_A = mkA "monarchal" ; -lin monarchic_A = compoundA (mkA "monarchic"); +lin monarchic_A = variants {compoundA (mkA "monarchic"); compoundA (mkA "monarchical")}; lin monarchism_N = mkN "monarchism" ; lin monarchist_N = mkN "monarchist" "monarchists"; lin monarchy_N = mkN "monarchy" "monarchies"; @@ -36145,7 +36143,7 @@ lin monocyte_N = mkN "monocyte" ; lin monocytosis_N = mkN "monocytosis" ; lin monodic_A = mkA "monodic" ; lin monoecious_A = mkA "monoecious" ; -lin monogamist_N = mkN "monogamist" "monogamists"; +lin monogamist_N = variants {mkN "monogamist" "monogamists"; mkN "monogynist"}; lin monogamous_A = compoundA (mkA "monogamous"); lin monogamy_N = mkN "monogamy" ; lin monogenesis_N = mkN "monogenesis" ; @@ -36203,7 +36201,7 @@ lin monotypic_A = mkA "monotypic" ; lin monounsaturated_A = mkA "monounsaturated" ; lin monovalent_A = mkA "monovalent" ; lin monoxide_N = mkN "monoxide" "monoxides"; -lin monozygotic_A = mkA "monozygotic" ; +lin monozygotic_A = variants {mkA "monozygotic"; mkA "monozygous"} ; lin mons_N = mkN "mons" ; lin monsieur_N = mkN "Monsieur" "IRREG"; lin monsignor_N = mkN "Monsignor" "Monsignors"; @@ -36952,8 +36950,7 @@ lin myelomeningocele_N = mkN "myelomeningocele" ; lin myiasis_N = mkN "myiasis" ; lin mylodon_N = mkN "mylodon" ; lin mylodontid_N = mkN "mylodontid" ; -lin myna_N = mkN "myna" "mynas"; -lin mynah_N = mkN "mynah" "mynahs"; +lin myna_N = variants {mkN "myna" "mynas"; mkN "mynah" "mynahs"; mkN "mina" "minas"; mkN "minah" "minahs"}; lin myocardial_A = mkA "myocardial" ; lin myocardium_N = mkN "myocardium" ; lin myoclonus_N = mkN "myoclonus" ; @@ -41163,7 +41160,7 @@ lin pearl_oyster_N = variants {mkN "pearl-oyster" "pearl-oysters"; mkN "pearl oy lin pearl_sago_N = variants {mkN "pearl-sago"; mkN "pearl sago"}; lin pearlfish_N = mkN "pearlfish" ; lin pearlite_N = mkN "pearlite" ; -lin pearlwort_N = mkN "pearlwort" ; +lin pearlwort_N = variants {mkN "pearlwort"; mkN "pearlweed"; mkN "pearl-weed"} ; lin pearly_A = mkA "pearly" "pearlier"; lin pearmain_N = mkN "Pearmain" "Pearmains"; lin peasantFem_N = mkN feminine (mkN "peasant" "peasants"); @@ -41877,7 +41874,7 @@ lin phalloplasty_N = mkN "phalloplasty" ; lin phallus_N = mkN "phallus" "phalluses"; lin phalsa_N = mkN "phalsa" ; lin phaneromania_N = mkN "phaneromania" ; -lin phantasm_N = mkN "phantasm" "phantasms"; +lin phantasm_N = variants {mkN "phantasm" "phantasms"; mkN "phantasma" "phantasmas"; mkN "fantasm" "fantasms"}; lin phantasmagoria_N = mkN "phantasmagoria" "phantasmagorias"; lin phantasmagoric_A = mkA "phantasmagoric" ; lin phantasmal_A = compoundA (mkA "phantasmal"); @@ -43229,7 +43226,7 @@ lin polyanthus_N = mkN "polyanthus" "polyanthuses"; lin polyarteritis_N = mkN "polyarteritis" ; lin polyatomic_A = mkA "polyatomic" ; lin polybutylene_N = mkN "polybutylene" ; -lin polychaete_N = mkN "polychaete" ; +lin polychaete_N = variants {mkN "polychaete"; mkN "polychete"} ; lin polychromatic_A = mkA "polychromatic" ; lin polychrome_N = mkN "polychrome" ; lin polycrystalline_A = mkA "polycrystalline" ; @@ -43640,7 +43637,7 @@ lin potboiler_N = mkN "potboiler" "potboilers"; lin potbound_A = compoundA (mkA "potbound"); lin potboy_N = mkN "potboy" "potboys"; lin poteen_N = mkN "poteen" ; -lin potency_N = mkN "potency" "potencies"; +lin potency_N = variants {mkN "potency" "potencies"; mkN "potence" "potences"}; lin potent_A = compoundA (mkA "potent"); lin potentate_N = mkN "potentate" "potentates"; lin potential_A = compoundA (mkA "potential"); @@ -44861,7 +44858,7 @@ lin protoplasm_N = mkN "protoplasm" ; lin prototherian_N = mkN "prototherian" ; lin prototype_N = mkN "prototype" "prototypes"; lin protozoal_A = mkA "protozoal" ; -lin protozoan_N = mkN "protozoan" ; +lin protozoan_N = variants {mkN "protozoan"; mkN "protozoon"} ; lin protozoological_A = mkA "protozoological" ; lin protozoologist_N = mkN "protozoologist" ; lin protozoology_N = mkN "protozoology" ; @@ -45206,7 +45203,7 @@ lin pulsate_V2 = mkV2 (mkV "pulsate" "pulsates" "pulsated" "pulsated" "pulsating lin pulsation_N = mkN "pulsation" "pulsations"; lin pulse_N = mkN "pulse" "pulses"; lin pulse_V = mkV "pulse" "pulses" "pulsed" "pulsed" "pulsing"; -lin pulverization_N = mkN "pulverization" ; +lin pulverization_N = variants {mkN "pulverization"; mkN "pulverisation"} ; lin pulverize_V = mkV "pulverize" "pulverizes" "pulverized" "pulverized" "pulverizing"; lin pulverize_V2 = mkV2 (mkV "pulverize" "pulverizes" "pulverized" "pulverized" "pulverizing"); lin puma_N = mkN "puma" "pumas"; @@ -48273,7 +48270,7 @@ lin riverside_N = mkN "riverside" "riversides"; lin rivet_N = mkN "rivet" "rivets"; lin rivet_V = mkV "rivet"; lin rivet_V2 = mkV2 (mkV "rivet" "rivets" "riveted" "riveted" "riveting"); -lin riveter_N = mkN "riveter" "riveters"; +lin riveter_N = variants {mkN "riveter" "riveters"; mkN "rivetter" "rivetters"}; lin riviera_PN = mkPN "Riviera"; lin rivulet_N = mkN "rivulet" "rivulets"; lin rivulus_N = mkN "rivulus" ; @@ -50311,7 +50308,7 @@ lin secrecy_N = mkN "secrecy" ; lin secret_A = compoundA (mkA "secret"); lin secret_N = mkN "secret" "secrets"; lin secretarial_A = compoundA (mkA "secretarial"); -lin secretariat_N = mkN "secretariat" "secretariats"; +lin secretariat_N = variants {mkN "secretariat" "secretariats"; mkN "secretariate" "secretariates"}; lin secretary_N = mkN "secretary" "secretaries"; lin secretary_general_N = mkN "secretary-general" "secretary-generals"; lin secretaryship_N = mkN "secretaryship" ; @@ -51186,7 +51183,7 @@ lin sheetlike_A = mkA "sheetlike" ; lin sheffield_PN = mkPN "Sheffield"; lin shegetz_N = mkN "shegetz" ; lin sheik_N = mkN "sheik" "sheiks"; -lin sheika_N = mkN "sheika" ; +lin sheika_N = variants {mkN "sheika"; mkN "sheikha"} ; lin sheikdom_N = mkN "sheikdom" "sheikdoms"; lin sheikh_N = mkN "sheikh" "sheikhs"; lin sheikhdom_N = mkN "sheikhdom" "sheikhdoms"; @@ -51247,7 +51244,7 @@ lin shigella_N = mkN "shigella" ; lin shigellosis_N = mkN "shigellosis" ; lin shihkiachwang_PN = mkPN "Shihkiachwang"; lin shiitake_N = mkN "shiitake" ; -lin shiksa_N = mkN "shiksa" ; +lin shiksa_N = variants {mkN "shiksa"; mkN "shikse"} ; lin shildon_PN = mkPN "Shildon"; lin shill_N = mkN "shill" ; lin shillelagh_N = mkN "shillelagh" "shillelaghs"; @@ -51810,7 +51807,7 @@ lin signification_N = mkN "signification" "significations"; lin significative_A = compoundA (mkA "significative"); lin signify_V = mkV "signify" "signifies" "signified" "signified" "signifying"; lin signify_V2 = mkV2 (mkV "signify" "signifies" "signified" "signified" "signifying"); -lin signor_N = mkN "signor" "signors"; +lin signor_N = variants {mkN "signor" "signors"; mkN "signior" "signiors"}; lin signora_N = mkN "signora" "signoras"; lin signore_N = mkN "signore" ; lin signorina_N = mkN "signorina" "signorinas"; @@ -53595,7 +53592,7 @@ lin spectatorFem_N = mkN feminine (mkN "spectator" "spectators"); lin spectatorMasc_N = mkN masculine (mkN "spectator" "spectators"); lin spectinomycin_N = mkN "spectinomycin" ; lin spectral_A = compoundA (mkA "spectral"); -lin spectre_N = mkN "spectre" "spectres"; +lin spectre_N = variants {mkN "spectre" "spectres"; mkN "specter" "specters"}; lin spectrogram_N = mkN "spectrogram" ; lin spectrograph_N = mkN "spectrograph" ; lin spectrographic_A = irregAdv (mkA "spectrographic") (variants {"spectrographically"; "spectrographicly"}) ; @@ -56155,7 +56152,7 @@ lin susceptibility_N = mkN "susceptibility" "susceptibilities"; lin susceptible_A = compoundA (mkA "susceptible"); lin sushi_N = mkN "sushi" ; lin susie_PN = mkPN "Susie"; -lin suslik_N = mkN "suslik" ; +lin suslik_N = variants {mkN "suslik"; mkN "souslik"} ; lin suspect_A = compoundA (mkA "suspect"); lin suspect_N = mkN "suspect" "suspects"; lin suspect_V2 = mkV2 (mkV "suspect" "suspects" "suspected" "suspected" "suspecting"); @@ -56444,7 +56441,7 @@ lin syllogistic_A = compoundA (mkA "syllogistic"); lin sylph_N = mkN "sylph" "sylphs"; lin sylph_like_A = variants {compoundA (mkA "sylph-like"); compoundA (mkA "sylphlike")}; lin sylvan_A = compoundA (mkA "sylvan"); -lin sylvan_N = mkN "sylvan" ; +lin sylvan_N = variants {mkN "sylvan"; mkN "silvan"} ; lin sylvanite_N = mkN "sylvanite" ; lin sylvia_PN = mkPN "Sylvia"; lin sylvite_N = mkN "sylvite" ; @@ -57932,7 +57929,7 @@ lin thoughtless_A = compoundA (mkA "thoughtless"); lin thoughtlessness_N = mkN "thoughtlessness" ; lin thousandfold_A = compoundA (mkA "thousandfold"); lin thousandfold_Adv = mkAdv "thousandfold"; -lin thraldom_N = mkN "thraldom" ; +lin thraldom_N = variants {mkN "thraldom"; mkN "thralldom"} ; lin thrall_N = mkN "thrall" "thralls"; lin thrash_N = mkN "thrash" ; lin thrash_V = mkV "thrash" "thrashes" "thrashed" "thrashed" "thrashing"; @@ -59334,7 +59331,7 @@ lin triclinic_A = mkA "triclinic" ; lin triclinium_N = mkN "triclinium" ; lin tricolor_N = mkN "tricolor" ; lin tricolour_N = mkN "tricolour" "tricolours"; -lin tricorn_N = mkN "tricorn" ; +lin tricorn_N = variants {mkN "tricorn"; mkN "tricorne"} ; lin tricot_N = mkN "tricot" ; lin tricuspid_A = mkA "tricuspid" ; lin tricycle_N = mkN "tricycle" "tricycles"; @@ -62121,7 +62118,7 @@ lin vapidity_N = mkN "vapidity" ; lin vapidness_N = mkN "vapidness" ; lin vapor_N = mkN "vapor" ; lin vaporific_A = mkA "vaporific" ; -lin vaporization_N = mkN "vaporization" "vaporizations"; +lin vaporization_N = variants {mkN "vaporization" "vaporizations"; mkN "vaporisation" "vaporisations"}; lin vaporize_V = mkV "vaporize" "vaporizes" "vaporized" "vaporized" "vaporizing"; lin vaporize_V2 = mkV2 (mkV "vaporize" "vaporizes" "vaporized" "vaporized" "vaporizing"); lin vaporizer_N = mkN "vaporizer" ; @@ -62694,7 +62691,7 @@ lin visitant_N = mkN "visitant" "visitants"; lin visitation_N = mkN "visitation" "visitations"; lin visiting_N = mkN "visiting" ; lin visitor_N = mkN "visitor" "visitors"; -lin visor_N = mkN "visor" "visors"; +lin visor_N = variants {mkN "visor" "visors"; mkN "vizor" "vizors"}; lin visored_A = mkA "visored" ; lin vista_N = mkN "vista" "vistas"; lin visual_A = compoundA (mkA "visual"); @@ -62706,7 +62703,7 @@ lin vital_A = compoundA (mkA "vital"); lin vitalism_N = mkN "vitalism" ; lin vitalist_N = mkN "vitalist" "vitalists"; lin vitality_N = mkN "vitality" ; -lin vitalization_N = mkN "vitalization" ; +lin vitalization_N = variants {mkN "vitalization"; mkN "vitalisation"} ; lin vitalize_V2 = mkV2 (mkV "vitalize" "vitalizes" "vitalized" "vitalized" "vitalizing"); lin vitalness_N = mkN "vitalness" ; lin vitamin_N = mkN "vitamin" "vitamins"; @@ -62880,7 +62877,7 @@ lin vso_PN = mkPN "Vso"; lin vulcanite_N = mkN "vulcanite" ; lin vulcanization_N = mkN "vulcanization" "vulcanizations"; lin vulcanize_V2 = mkV2 (mkV "vulcanize" "vulcanizes" "vulcanized" "vulcanized" "vulcanizing"); -lin vulcanizer_N = mkN "vulcanizer" ; +lin vulcanizer_N = variants {mkN "vulcanizer"; mkN "vulcaniser"} ; lin vulgar_A = compoundA (mkA "vulgar"); lin vulgarian_N = mkN "vulgarian" "vulgarians"; lin vulgarism_N = mkN "vulgarism" "vulgarisms"; @@ -63048,7 +63045,7 @@ lin walloping_A = compoundA (mkA "walloping"); lin wallow_N = mkN "wallow" "wallows"; lin wallow_V = mkV "wallow" "wallows" "wallowed" "wallowed" "wallowing"; lin wallpaper_N = mkN "wallpaper" ; -lin wallpaperer_N = mkN "wallpaperer" ; +lin wallpaperer_N = variants {mkN "wallpaperer"; mkN "wall-paperer"} ; lin wallsend_PN = mkPN "Wallsend"; lin wally_N = mkN "wally" ; lin wally_PN = mkPN "Wally"; @@ -64302,8 +64299,8 @@ lin wolverton_PN = mkPN "Wolverton"; lin woman_N = mkN feminine (mkN "woman" "women"); lin womanhood_N = mkN "womanhood" ; lin womanish_A = compoundA (mkA "womanish"); -lin womanize_V = mkV "womanize" "womanizes" "womanized" "womanized" "womanizing"; -lin womanizer_N = mkN "womanizer" "womanizers"; +lin womanize_V = variants {mkV "womanize" "womanizes" "womanized" "womanized" "womanizing"; mkV "womanise" "womanises" "womanised" "womanised" "womanising"}; +lin womanizer_N = variants {mkN "womaniser" "womanisers"; mkN "womaniser" "womanisers"}; lin womankind_N = mkN "womankind" ; lin womanlike_A = compoundA (mkA "womanlike"); lin womanliness_N = mkN "womanliness" ; diff --git a/lib/src/translator/DictionaryEst.gf b/lib/src/translator/DictionaryEst.gf index 964e2c5fb..5f379f7e5 100644 --- a/lib/src/translator/DictionaryEst.gf +++ b/lib/src/translator/DictionaryEst.gf @@ -8386,9 +8386,8 @@ lin flatulence_N = mkN "puhitus" | mkN "ülespuhutud kõnepruuk" ; lin flatworm_N = mkN "lameuss" ; lin flaunt_N = mkN "eputamine" | mkN "uhkeldama" | mkN "uhkusega näitama" ; lin flautist_N = mkN "flötist" | mkN "flöödimängija" ; -lin flavorer_N = mkN "lõhnaaine" | mkN "maitseaine" ; +lin flavourer_N = mkN "lõhnaaine" | mkN "maitseaine" ; lin flavouring_N = mkN "lõhna andev" | mkN "maitseaine" | mkN "maitset lisav" ; -lin flavour_N = mkN "aroom" | mkN "maitse" | mkN "maitsestama" | mkN "maitset andma" ; lin flaw_N = mkN "mõra" | mkN "puudus" | mkN "viga" ; lin flax_N = mkN "lina" ; lin fleabag_N = mkN "kirbukott" ; @@ -13586,7 +13585,6 @@ lin muzzle_N = mkN "düüs" | mkN "koon" | mkN "suukorv" | mkN "suukorvi pähe p lin mycelium_N = mkN "seeneniidistik" ; lin mycologist_N = mkN "mükoloog" | mkN "seeneteadlane" ; lin mycology_N = mkN "mükoloogia" | mkN "seeneteadus" ; -lin mynah_N = mkN "maina" ; lin myna_N = mkN "maina" ; lin myocardium_N = mkN "müokard" | mkN "südamelihas" ; lin myopia_N = mkN "lühinägelikkus" | mkN "müoopia" ; @@ -22143,7 +22141,7 @@ lin flare_path_N = mkN "maandumisraja tuled" ; lin flare_up_N = mkN "ägestuma" | mkN "lõkkele lööma" | mkN "puhkema" ; lin flats_N = mkN "plätud" ; lin flatware_N = mkN "söögiriistad" | mkN "taldrikud" ; -lin flavor_N = mkN "aroom" | mkN "maitse" | mkN "maitsestama" | mkN "maitset andma" | mkN "mekk" ; +lin flavour_N = mkN "aroom" | mkN "maitse" | mkN "maitsestama" | mkN "maitset andma" | mkN "mekk" ; lin fleer_N = mkN "põlglikult irvitama" ; lin flesh_wound_N = mkN "lihahaav" ; lin flick_knife_N = mkN "vedrunuga" ; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 8a04e43b2..1dc73e6f8 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -20010,12 +20010,12 @@ lin flavin_N = mkWN (k5 "flaviini") ; --UNCHK lin flavivirus_N = mkWN (compoundN "flavi" (k39 "virus")) ; --UNCHK lin flavone_N = mkWN "flavoni" ; --UNCHK lin flavonoid_N = mkWN "flavonoidi" ; --UNCHK -lin flavorer_N = mkWN (k48 "mauste") ; --UNCHK lin flavorful_A = mkWA (k41A "maukas") ; --UNCHK lin flavorlessness_N = mkWN (k40 "mauttomuus") ; --UNCHK lin flavorsomeness_N = mkWN (k40 "maukkuus") ; --UNCHK lin flavour_N = mkN "maku" ; --WN (k1A "maku") "vahva" ; lin flavour_V2 = mkWV2 (k53 "höystää") ; --UNCHK +lin flavourer_N = mkWN (k48 "mauste") ; --UNCHK lin flavouring_N = mkWN (k48 "mauste") ; --UNCHK lin flavourless_A = mkWA (k1 "valju") ; --UNCHK lin flaw_N = mkWN (k48 "virhe") ; --UNCHK @@ -30860,7 +30860,6 @@ lin machinist_N = mkWN (k10 "koneistaja") ; --f54 lin machismo_N = mkWN (k2 "machoilu") ; --UNCHK lin machmeter_N = mkWN (compoundN "mach-" (k6 "mittari")) ; --UNCHK lin macho_N = mkWN (k1 "macho") ; --UNCHK -lin macintosh_N = mkWN (compoundN "sade" (k5A "takki")) ; --UNCHK lin mackerel_N = mkWN (k5 "makrilli") ; --UNCHK lin mackinaw_N = mkWN (k41A "villakangas") ; --UNCHK lin mackintosh_N = mkWN (compoundN "sade" (k5A "takki")) ; --UNCHK @@ -33990,7 +33989,6 @@ lin myiasis_N = mkWN (compoundN "myi" (k5 "aasi")) ; --UNCHK lin mylodon_N = mkWN "mylodon" ; --UNCHK lin mylodontid_N = mkWN "mylodontid" ; --UNCHK lin myna_N = mkWN (compoundN "laulu" (k38 "kottarainen")) "pyhä" ; --UNCHK -lin mynah_N = mkWN (compoundN "laulu" (k38 "kottarainen")) "pyhä" ; --UNCHK lin mynämäki_PN = mkPN (mkN "Mynämäki" "Mynämäkiä") ; lin myocardial_A = mkWA (compoundA "myokardia" (k38 "alinen")) ; --UNCHK lin myocardium_N = mkWN (compoundN "sydän" (k39 "lihas")) ; --UNCHK diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index 4e6009196..4da1eb9d9 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -11768,7 +11768,7 @@ lin flatworm_N = mkN "Platyhelminthes" | mkN "plathelminthe" | mkN "plathelminth lin flaunt_V2 = mkV2 (mkV "étaler") ; -- tocheck lin flautist_N = mkN "flûtiste" ; -- tocheck lin flavivirus_N = mkN "flavivirus" ; -- UWN -lin flavorer_N = mkN "aromate" | mkN "aromatisant" | mkN "assaisonnement" | mkN "parfum" | mkN "épice" ; -- UWN +lin flavourer_N = mkN "aromate" | mkN "aromatisant" | mkN "assaisonnement" | mkN "parfum" | mkN "épice" ; -- UWN lin flavour_N = mkN "saveur" feminine | mkN "style" masculine | mkN "goût" ; -- tocheck lin flavour_V2 = mkV2 (mkV "assaisonner") ; -- tocheck lin flavouring_N = mkN "aromate" | mkN "aromatisant" | mkN "assaisonnement" | mkN "parfum" | mkN "épice" ; -- UWN @@ -17998,7 +17998,6 @@ lin machinery_N = mkN "mécanique" feminine ; -- tocheck lin machinist_N = mkN "machiniste" masculine ; -- tocheck lin machismo_N = mkN "machisme" masculine ; -- tocheck lin macho_N = mkN "macho" masculine ; -- tocheck -lin macintosh_N = mkN "mack" ; -- UWN lin mackerel_N = mkN "maquereau" masculine ; -- tocheck lin mackintosh_N = mkN "mack" ; -- UWN lin macon_N = mkN "macon" ; -- UWN @@ -19745,8 +19744,7 @@ lin myelofibrosis_N = mkN "myélofibrose_primitive" | mkN "splénomégalie_myél lin myelography_N = mkN "myélographie" ; -- UWN lin myiasis_N = mkN "myiase" | mkN "myiases" ; -- UWN lin mylodon_N = mkN "mylodon" ; -- UWN -lin myna_N = mkN "mainate" masculine ; -- tocheck -lin mynah_N = mkN "gracula" | mkN "mainate" | mkN "mainates" ; -- UWN +lin myna_N = mkN "gracula" | mkN "mainate" | mkN "mainates" ; -- UWN lin myocardium_N = mkN "myocarde" masculine ; -- tocheck lin myoclonus_N = mkN "myoclonie" | mkN "rapide" ; -- UWN lin myofibril_N = mkN "myofibrille" ; -- UWN diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index 7ba992c1a..327375c72 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -21583,13 +21583,12 @@ lin flavin_N = variants {} ; lin flavivirus_N = variants {} ; lin flavone_N = variants {} ; lin flavonoid_N = variants {} ; -lin flavor_N = mkN "Geschmacksverstärker" masculine ; -- status=guess -lin flavorer_N = variants {} ; lin flavorful_A = variants {} ; lin flavorlessness_N = variants {} ; lin flavorsomeness_N = variants {} ; lin flavour_N = mkN "Geschmacksstoff" masculine | mkN "Geschmacksverstärker" masculine ; -- status=guess status=guess lin flavour_V2 = mkV2 (mkV "würzen") ; -- status=guess, src=wikt +lin flavourer_N = variants {} ; lin flavouring_N = variants {} ; lin flavourless_A = variants {} ; lin flaw_N = mkN "Windbö" feminine ; -- status=guess @@ -33419,7 +33418,6 @@ lin machinist_N = variants {} ; lin machismo_N = mkN "Maschismo" masculine ; -- status=guess lin machmeter_N = variants {} ; lin macho_N = mkN "Macho" "Machos" masculine ; -- status=guess -lin macintosh_N = variants {} ; lin mackerel_N = mkN "Makrele" "Makrelen" feminine ; -- status=guess lin mackinaw_N = variants {} ; lin mackintosh_N = variants {} ; @@ -36794,7 +36792,6 @@ lin myiasis_N = mkN "Myiasis" feminine ; -- status=guess lin mylodon_N = variants {} ; lin mylodontid_N = variants {} ; lin myna_N = mkN "Maina" feminine ; -- status=guess -lin mynah_N = variants {} ; lin myocardial_A = variants {} ; lin myocardium_N = mkN "Myokard" "Myokarde" neuter ; -- status=guess lin myoclonus_N = variants {} ; diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index 1e4151d9a..25a4454e8 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -17369,7 +17369,7 @@ lin muzzle_N = mkN "मोहरा" ; -- tocheck lin muzzle_V2 = mkV2 (compoundV "मुँह" (mkV "बाँधना")) ; -- tocheck lin muzzy_A = mkA "अस्पष्ट" ; -- tocheck lin mycology_N = mkN "कवक-विज्ञान" ; -- tocheck -lin mynah_N = mkN "मैना" ; -- tocheck +lin myna_N = mkN "मैना" ; -- tocheck lin myopia_N = mkN "अदूरदर्शिता" ; -- tocheck lin myopic_A = mkA "निकटदृष्टि ग्रस्त" ; -- tocheck lin myriad_A = mkA "असंख्य" ; -- tocheck diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index 3956d852a..aa12097d7 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -11642,8 +11642,8 @@ lin flaunt_V2 = mkV2 (lucir_V) | mkV2 (mkV "presumir") | mkV2 (mkV "ostentar") ; lin flautist_N = mkN "flautista" ; --UWN lin flavivirus_N = mkN "flavivirus" ; --UWN lin flavonoid_N = mkN "flavonoide" ; --UWN -lin flavorer_N = mkN "condimento" ; --UWN lin flavour_N = mkN "sabor" masculine ; -- status=guess +lin flavourer_N = mkN "condimento" ; --UWN lin flavouring_N = mkN "condimento" ; --UWN lin flaw_N = mkN "falla" ; -- status=guess lin flawless_A = mkA "impecable" | mkA "perfecto" ; -- status=guess status=guess @@ -17838,7 +17838,6 @@ lin machinist_N = mkN "maquinista" masculine | mkN "mecánico" ; -- status=guess lin machismo_N = mkN "machismo" ; -- status=guess lin machmeter_N = mkN "máchmetro" ; --UWN lin macho_N = mkN "macho" ; -- status=guess -lin macintosh_N = mkN "macintosh" ; --UWN lin mackerel_N = mkN "caballa" ; -- status=guess lin mackintosh_N = mkN "macintosh" ; --UWN lin macrocephalic_A = mkA "macrocéfalo" ; -- status=guess diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 714b8d62d..75704144b 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -21461,12 +21461,12 @@ lin flavin_N = variants {} ; -- status=guess lin flavivirus_N = variants {} ; -- status=guess lin flavone_N = mkN "flavon" ; -- src=google lin flavonoid_N = variants {} ; -- status=guess -lin flavorer_N = variants {} ; -- status=guess lin flavorful_A = variants {} ; -- status=guess lin flavorlessness_N = variants {} ; -- status=guess lin flavorsomeness_N = variants {} ; -- status=guess lin flavour_N = mkN "smak" "smaker" | mkN "krydda" ; -- SaldoWN -- comment=8 lin flavour_V2 = mkV2 "smaksätta" "smaksätter" "smaksätt" "smaksatte" "smaksatt" "smaksatt" ; -- status=guess +lin flavourer_N = variants {} ; -- status=guess lin flavouring_N = mkN "arom" "aromer" ; lin flavourless_A = mkA "smaklös" ; -- status=guess lin flaw_N = mkN "spricka" ; -- comment=3 @@ -33201,7 +33201,6 @@ lin machinist_N = mkN "maskinist" "maskinister" ; -- comment=2 lin machismo_N = variants {} ; -- status=guess lin machmeter_N = variants {} ; -- status=guess lin macho_N = variants {} ; -- status=guess -lin macintosh_N = variants {} ; -- status=guess lin mackerel_N = mkN "makrill" ; -- status=guess lin mackinaw_N = variants {} ; -- status=guess lin mackintosh_N = variants {} ; -- status=guess @@ -36564,7 +36563,6 @@ lin myiasis_N = variants {} ; -- status=guess lin mylodon_N = variants {} ; -- status=guess lin mylodontid_N = variants {} ; -- status=guess lin myna_N = variants {} ; -- status=guess -lin mynah_N = variants {} ; -- status=guess lin myocardial_A = variants {} ; -- status=guess lin myocardium_N = mkN "myokardium" ; -- src=google lin myoclonus_N = mkN "myoklonus" ; -- src=google diff --git a/lib/src/translator/DictionaryTha.gf b/lib/src/translator/DictionaryTha.gf index 2905f39d5..a0125c987 100644 --- a/lib/src/translator/DictionaryTha.gf +++ b/lib/src/translator/DictionaryTha.gf @@ -14786,11 +14786,10 @@ lin flavin_N = mkN "ฟลาวิน" ; -- src=panlex lin flavivirus_N = mkN "ไวรัสฟลาวิ" ; -- src=panlex lin flavone_N = mkN "ฟลาโวน" ; -- src=panlex lin flavonoid_N = mkN "ฟลาโวนอยด์" ; -- src=panlex -lin flavor_N = mkN "รส" | mkN "กลิ่น" | mkN "รสเครื่องปรุง" | mkN "รส" | mkN "กลิ่น" | mkN "ปรุงรส" | mkN "รสชาติ" | mkN "รสนิยม" | mkN "แต่งกลิ่น" | mkN "สารที่ให้กลิ่นหรือรสดังกล่าว" ; -- src=panlex -lin flavorer_N = mkN "สารปรุงแต่ง" | mkN "เครื่องปรุง" | mkN "เครื่องปรุงรส" | mkN "สารปรุงแต่งอาหาร" ; -- src=panlex lin flavorlessness_N = mkN "ความไม่มีรสชาติ" ; -- src=panlex lin flavorsomeness_N = mkN "ความมีรสชาติ" ; -- src=panlex lin flavour_N = mkN "รส" | mkN "กลิ่น" | mkN "รสเครื่องปรุง" | mkN "รส" | mkN "กลิ่น" | mkN "ปรุงรส" | mkN "รสชาติ" | mkN "รสนิยม" | mkN "ใจความ" | mkN "แก่นสาร" | mkN "จุดสําคัญ" | mkN "แต่งกลิ่น" | mkN "สารที่ให้กลิ่นหรือรสดังกล่าว" ; -- src=panlex +lin flavourer_N = mkN "สารปรุงแต่ง" | mkN "เครื่องปรุง" | mkN "เครื่องปรุงรส" | mkN "สารปรุงแต่งอาหาร" ; -- src=panlex lin flavouring_N = mkN "สารปรุงแต่ง" | mkN "เครื่องปรุง" | mkN "เครื่องปรุงรส" | mkN "สารปรุงแต่งอาหาร" | mkN "ของชูรส" | mkN "สิ่งปรุงรส" | mkN "สิ่งที่ให้กลิ่น" ; -- src=panlex lin flavourless_A = mkA "จืด" | mkA "ซึ่งไม่มีรสชาติ" ; -- src=panlex lin flaw_N = mkN "ข้อผิดพลาด" | mkN "ความบกพร่อง" | mkN "ตําหนิ" | mkN "รอยแตก" | mkN "ข้อด้อย" | mkN "รอยร้าว" | mkN "ข้อตําหนิ" | mkN "ข้อบกพร่อง" | mkN "จุดบกพร่อง" | mkN "พายุที่เกิดขึ้นอย่างกะทันหันและเป็นช่วงสั้นๆ" ; -- src=panlex @@ -22738,10 +22737,9 @@ lin machinist_N = mkN "ผู้ควบคุมเครื่องจัก lin machismo_N = mkN "ความเป็นชายชาตรี" | mkN "ความเป็นลูกผู้ชาย" | mkN "ความเป็นชายอกสามศอก" | mkN "ความแข็งขัน" | mkN "ความเป็นลูกผู้ชาย" | mkN "ความมีลักษณะเป็นชาย" ; -- src=panlex lin machmeter_N = mkN "มัชมิเตอร์" ; -- src=panlex lin macho_N = mkN "คนที่มีความเป็นลูกผู้ชาย" ; -- src=panlex -lin macintosh_N = mkN "เสื้อกันฝน" ; -- src=panlex lin mackerel_N = mkN "ปลาแมกเคอเรล" | mkN "ปลาแมคเคอเรล" | mkN "เนื้อปลาแมคเคอเรล" | mkN "ปลาทะเลแม็กเคอเร็ล" ; -- src=panlex lin mackinaw_N = mkN "ผ้าแมกคินนอว์" | mkN "เรือแม็กคินอว์" ; -- src=panlex -lin mackintosh_N = mkN "เสื้อกันฝน" | mkN "เสื้อกันฝน" | mkN "ผ้าดังกล่าว" | mkN "เสื้อฝนชนิดหนึ่งที่ทําด้วยผ้ายาง" ; -- src=panlex +lin mackintosh_N = mkN "เสื้อกันฝน" | mkN "ผ้าดังกล่าว" | mkN "เสื้อฝนชนิดหนึ่งที่ทําด้วยผ้ายาง" ; -- src=panlex lin mackle_N = mkN "ความมัว" | mkN "ทําให้พร่า" | mkN "กลายเป็นมัว" | mkN "กลายเป็นพร่า" ; -- src=panlex lin macon_N = mkN "ไวน์มาคอน" ; -- src=panlex lin macrame_N = mkN "ศิลปะการผูกเงื่อนเพื่อตกแต่ง" ; -- src=panlex @@ -25105,8 +25103,7 @@ lin myelogram_N = mkN "ไมเออเลอแกรม" ; -- src=panlex lin myeloma_N = mkN "เนื้องอกไขกระดูก" ; -- src=panlex lin mylodon_N = mkN "ไมโลดอน" ; -- src=panlex lin mylodontid_N = mkN "ไมโลดอนทิด" ; -- src=panlex -lin myna_N = mkN "นกขุนทอง" | mkN "นกขุนทอง" ; -- src=panlex -lin mynah_N = mkN "นกขุนทอง" | mkN "นกที่พูดเลียนเสียงคนได้" ; -- src=panlex +lin myna_N = mkN "นกขุนทอง" | mkN "นกขุนทอง" | mkN "นกที่พูดเลียนเสียงคนได้" ; -- src=panlex lin myocardium_N = mkN "กล้ามเนื้อหัวใจ" ; -- src=panlex lin myoclonus_N = mkN "กล้ามเนื้อกระตุกรัว" ; -- src=panlex lin myofibril_N = mkN "เส้นใยฝอยกล้ามเนื้อ" ; -- src=panlex diff --git a/lib/src/translator/translate.probs b/lib/src/translator/translate.probs index cd4409a40..de5158981 100644 --- a/lib/src/translator/translate.probs +++ b/lib/src/translator/translate.probs @@ -21704,12 +21704,12 @@ flavin_N 3.729715012475897e-6 flavivirus_N 3.729715012475897e-6 flavone_N 3.729715012475897e-6 flavonoid_N 3.729715012475897e-6 -flavorer_N 3.729715012475897e-6 flavorful_A 1.0773191989054437e-5 flavorlessness_N 3.729715012475897e-6 flavorsomeness_N 3.729715012475897e-6 flavour_N 1.118914503742769e-5 flavour_V2 1.609865254278217e-5 +flavourer_N 3.729715012475897e-6 flavouring_N 3.729715012475897e-6 flavourless_A 1.0773191989054437e-5 flaw_N 5.967544019961435e-5 @@ -33497,7 +33497,6 @@ machinist_N 2.051343256861743e-4 machismo_N 3.729715012475897e-6 machmeter_N 3.729715012475897e-6 macho_N 3.729715012475897e-6 -macintosh_N 3.729715012475897e-6 mackerel_N 3.729715012475897e-6 mackinaw_N 3.729715012475897e-6 mackintosh_N 3.729715012475897e-6 @@ -36859,7 +36858,6 @@ myiasis_N 3.729715012475897e-6 mylodon_N 3.729715012475897e-6 mylodontid_N 3.729715012475897e-6 myna_N 3.729715012475897e-6 -mynah_N 3.729715012475897e-6 myocardial_A 1.0773191989054437e-5 myocardium_N 3.729715012475897e-6 myoclonus_N 3.729715012475897e-6