From 2bff7d8c210f5e67bb0fbae14e93c48b2b3341d1 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Thu, 24 Oct 2013 08:04:59 +0000 Subject: [PATCH] more in DictEngBul --- lib/src/bulgarian/DictEngBul.gf | 165 ++++++++++++++++---------------- lib/src/english/DictEng.gf | 3 +- lib/src/english/DictEngAbs.gf | 1 - 3 files changed, 84 insertions(+), 85 deletions(-) diff --git a/lib/src/bulgarian/DictEngBul.gf b/lib/src/bulgarian/DictEngBul.gf index 30a62583e..698f9e845 100644 --- a/lib/src/bulgarian/DictEngBul.gf +++ b/lib/src/bulgarian/DictEngBul.gf @@ -6736,7 +6736,7 @@ lin bondsman_N = variants {}; lin bonduc_N = variants {}; lin bondwoman_N = variants {}; lin bone_A = variants {}; -lin bone_N = mkN007 "кокал" ; +lin bone_N = dualN (mkN007 "кокал") (mkA076 "кокален"); lin bone_V2 = variants {}; lin bone_dry_A = variants {}; lin bone_head_N = variants {}; @@ -7212,7 +7212,7 @@ lin brazilian_N = variants {}; lin brazilwood_N = variants {}; lin breach_N = variants {}; lin breach_V2 = variants {}; -lin bread_N = mkN001 "хляб"; +lin bread_N = dualN (mkN001 "хляб") (mkA079 "хлебен"); lin breadbasket_N = variants {}; lin breadboard_N = variants {}; lin breadcrumb_N = variants {}; @@ -9913,7 +9913,7 @@ lin chigoe_N = variants {}; lin chilblain_N = mkN071 "измръзване"; lin chilblained_A = variants {}; lin child's_play_N = variants {}; -lin child_N = mkN067 "дете" ; +lin child_N = dualN (mkN067 "дете") (mkA078 "детски"); lin child_bearing_N = variants {}; lin childbearing_A = variants {}; lin childbirth_N = mkN071 "раждане"; @@ -10939,31 +10939,32 @@ lin coati_N = variants {}; lin coating_N = mkN072 "покритие" ; lin coatrack_N = variants {}; lin coattail_N = variants {}; -lin coauthor_N = variants {}; +lin coauthorMasc_N = dualN (mkN007a "съавтор") (mkA078 "съавторски"); +lin coauthorFem_N = dualN (mkN041 "съавторка") (mkA078 "съавторски"); lin coax_V = variants {}; lin coax_V2 = variants {}; -lin coaxial_A = variants {}; +lin coaxial_A = mkA079 "коаксиален"; lin coaxing_N = variants {}; lin coaxingly_Adv = variants {}; lin cob_N = variants {}; lin cob_nut_N = variants {}; -lin cobalt_N = mkN007 "кобалт" ; ---- +lin cobalt_N = dualN (mkN007 "кобалт") (mkA076 "кобалтов"); lin cobaltite_N = variants {}; lin cobber_N = variants {}; lin cobble_N = variants {}; lin cobble_V2 = variants {}; -lin cobbler_N = mkN031a "обущар" ; ---- +lin cobbler_N = dualN (mkN031a "обущар") (mkA078 "обущарски"); lin cobblers_N = variants {}; lin cobblestone_N = variants {}; lin cobham_PN = variants {}; lin cobia_N = variants {}; lin cobnut_N = variants {}; -lin cobra_N = mkN041 "кобра" ; ---- -lin cobweb_N = mkN041 "паяжина" ; ---- +lin cobra_N = mkN041 "кобра"; +lin cobweb_N = mkN041 "паяжина"; lin cobwebby_A = variants {}; lin coca_N = variants {}; lin coca_cola_N = variants {}; -lin cocaine_N = mkN007 "кокаин" ; +lin cocaine_N = dualN (mkN007 "кокаин") (mkA076 "кокаинов"); lin cocarboxylase_N = variants {}; lin coccal_A = variants {}; lin coccidioidomycosis_N = variants {}; @@ -11004,25 +11005,25 @@ lin cockloft_N = variants {}; lin cockney_A = variants {}; lin cockney_N = variants {}; lin cockpit_N = variants {}; -lin cockroach_N = mkN041 "хлебарка" ; ---- +lin cockroach_N = mkN041 "хлебарка"; lin cockscomb_N = variants {}; lin cockspur_N = variants {}; lin cocksucker_N = variants {}; lin cocksure_A = mkA076 "наперен" ; ---- -lin cocktail_N = mkN007 "коктейл" ; ---- +lin cocktail_N = mkN007 "коктейл"; lin cockup_N = variants {}; lin cocky_A = variants {}; lin coco_N = variants {}; lin cocoa_N = dualN (mkN065 "какао") (mkA076 "какаов"); lin cocobolo_N = variants {}; lin coconut_N = dualN (mkN001 "кокос") (mkA076 "кокосов"); -lin cocoon_N = mkN007 "пашкул" ; ---- +lin cocoon_N = mkN007 "пашкул"; lin cocoon_V2 = variants {}; lin cocooning_N = variants {}; lin cocotte_N = variants {}; lin cocozelle_N = variants {}; lin cocuswood_N = variants {}; -lin cod_N = mkN041 "треска" ; ---- +lin cod_N = mkN041 "треска"; lin cod_PN = variants {}; lin cod_V = variants {}; lin cod_V2 = variants {}; @@ -20197,7 +20198,7 @@ lin fell_V2 = variants {}; lin fellah_N = variants {}; lin fellatio_N = variants {}; lin felloe_N = variants {}; -lin fellow_N = mkN014 "човек" ; ---- +lin fellow_N = dualN (mkN014 "човек") (mkA078 "човешки"); lin fellow_feeling_N = variants {}; lin fellow_traveller_N = variants {}; lin fellowship_N = variants {}; @@ -22083,7 +22084,7 @@ lin funniness_N = variants {}; lin funny_A = variants {}; lin funny_bone_N = variants {}; lin funrun_N = variants {}; -lin fur_N = mkN041 "кожа" ; ---- +lin fur_N = dualN (mkN041 "кожа") (mkA079 "кожен"); lin furan_N = variants {}; lin furbelow_N = variants {}; lin furbish_V2 = variants {}; @@ -23178,10 +23179,10 @@ lin goal_kick_N = variants {}; lin goal_line_N = variants {}; lin goalie_N = variants {}; lin goalkeeper_N = variants {}; -lin goalless_A = variants {}; +lin goalless_A = mkA079 "безцелен"; lin goalmouth_N = variants {}; lin goalpost_N = variants {}; -lin goat_N = mkN041 "коза"; +lin goat_N = dualN (mkN041 "коза") (mkA088 "кози"); lin goatee_N = variants {}; lin goateed_A = variants {}; lin goatfish_N = variants {}; @@ -25334,7 +25335,7 @@ lin hickey_N = variants {}; lin hickory_N = variants {}; lin hiddenite_N = variants {}; lin hiddenness_N = variants {}; -lin hide_N = mkN041 "кожа" ; ---- +lin hide_N = dualN (mkN041 "кожа") (mkA079 "кожен"); lin hide_V = medialV (singleV (mkV186 "скривам")) Acc; lin hide_V2 = dirV2 (singleV (mkV186 "скривам")); lin hide_and_seek_N = mkN041 "криеница"; @@ -25676,13 +25677,13 @@ lin holystone_V2 = variants {}; lin homage_N = variants {}; lin home_A = variants {}; lin home_Adv = variants {}; -lin home_N = mkN001 "дом" ; +lin home_N = dualN (mkN001 "дом") (mkA079 "домашен"); lin home_baked_A = variants {}; lin home_brewed_A = variants {}; lin home_cured_A = variants {}; lin home_farm_N = variants {}; lin home_grown_A = variants {}; -lin home_made_A = variants {}; +lin home_made_A = mkA079 "домашен"; lin homebound_A = variants {}; lin homebound_N = variants {}; lin homeboy_N = variants {}; @@ -25736,7 +25737,7 @@ lin hominid_N = variants {}; lin hominine_A = variants {}; lin hominoid_N = variants {}; lin hominy_N = variants {}; -lin homo_N = mkN014 "човек" ; ---- +lin homo_N = dualN (mkN014 "човек") (mkA078 "човешки"); lin homo_sapiens_N = variants {}; lin homocercal_A = variants {}; lin homocyclic_A = variants {}; @@ -26133,8 +26134,8 @@ lin hullabaloo_N = variants {}; lin hum_N = variants {}; lin hum_V = variants {}; lin hum_V2 = variants {}; -lin human_A = mkA079 "човечен" ; -lin human_N = mkN014 "човек" ; +lin human_A = mkA079 "човечен"; +lin human_N = dualN (mkN014 "човек") (mkA078 "човешки"); lin humane_A = variants {}; lin humaneness_N = variants {}; lin humanism_N = mkN011 "хуманизъм" ; ---- @@ -29881,7 +29882,7 @@ lin korean_N = variants {}; lin koruna_N = variants {}; lin kos_N = variants {}; lin kosher_A = variants {}; -lin kosher_N = variants {}; +lin kosher_N = mkN007 "кошер"; lin koto_N = variants {}; lin kotow_N = variants {}; lin kotow_V = variants {}; @@ -30560,7 +30561,7 @@ lin least_Adv = variants {}; lin least_N = variants {}; lin leastways_Adv = variants {}; lin leastwise_Adv = variants {}; -lin leather_N = mkN041 "кожа" ; +lin leather_N = dualN (mkN041 "кожа") (mkA079 "кожен"); lin leather_jacket_N = variants {}; lin leatherette_N = variants {}; lin leatherhead_PN = variants {}; @@ -32317,7 +32318,7 @@ lin mailman_N = mkN039 "пощаджия" ; lin mailsorter_N = variants {}; lin maim_V2 = variants {}; lin main_A = mkA079 "първичен" ; -lin main_N = mkN065 "море"; +lin main_N = dualN (mkN065 "море") (mkA078 "морски"); lin maine_PN = variants {}; lin mainframe_N = variants {}; lin mainland_N = mkN007 "континент"; @@ -35114,13 +35115,13 @@ lin muesli_N = variants {}; lin muezzin_N = variants {}; lin muff_N = variants {}; lin muff_V2 = variants {}; -lin muffin_N = variants {}; +lin muffin_N = mkN007 "мъфин"; lin muffin_man_N = variants {}; lin muffle_N = variants {}; lin muffle_V2 = variants {}; lin muffler_N = variants {}; lin mufti_N = variants {}; -lin mug_N = mkN041 "чаша" ; ---- +lin mug_N = mkN041 "чаша"; lin mug_V2 = variants {}; lin muggee_N = variants {}; lin mugger_N = variants {}; @@ -35582,8 +35583,8 @@ lin nandrolone_N = variants {}; lin nankeen_N = variants {}; lin nanking_PN = variants {}; lin nanning_PN = variants {}; -lin nanny_N = mkN041 "коза" ; ---- -lin nanny_goat_N = variants {}; +lin nanny_N = mkN041 "бавачка"; +lin nanny_goat_N = dualN (mkN041 "коза") (mkA088 "кози"); lin nanogram_N = variants {}; lin nanometer_N = variants {}; lin nanomia_N = variants {}; @@ -36967,7 +36968,7 @@ lin nursery_N = mkN041 "ясла" ; lin nurseryman_N = variants {}; lin nursing_N = variants {}; lin nursing_home_N = variants {}; -lin nursling_N = mkN067 "дете" ; ---- +lin nursling_N = dualN (mkN067 "дете") (mkA078 "детски"); lin nurtural_A = variants {}; lin nurturance_N = variants {}; lin nurturant_A = variants {}; @@ -37087,7 +37088,7 @@ lin obligate_A = variants {}; lin obligate_V2 = variants {}; lin obligate_V2V = variants {}; lin obligation_N = mkN049 "обвързаност" ; -lin obligational_A = variants {}; +lin obligational_A = mkA079 "задължителен"; lin obligatory_A = mkA079 "задължителен"; lin oblige_V2 = dirV2 (dualV (mkV186 "задължавам") (mkV178 "задължа")); lin oblige_V2V = mkV2V (dualV (mkV186 "задължавам") (mkV178 "задължа")) noPrep noPrep; @@ -38823,11 +38824,11 @@ lin panamanian_A = variants {}; lin panamanian_N = variants {}; lin panatela_N = variants {}; lin panatella_N = variants {}; -lin pancake_N = variants {}; +lin pancake_N = dualN (mkN041 "палачинка") (mkA076 "палачинков"); lin pancarditis_N = variants {}; lin panchayat_N = variants {}; lin panchromatic_A = variants {}; -lin pancreas_N = mkN007 "панкреас" ; ---- +lin pancreas_N = mkN007 "панкреас"; lin pancreatectomy_N = variants {}; lin pancreatic_A = variants {}; lin pancreatin_N = variants {}; @@ -39626,7 +39627,7 @@ lin peek_N = variants {}; lin peek_V = variants {}; lin peek_a_boo_N = variants {}; lin peekaboo_N = variants {}; -lin peel_N = mkN041 "кожа" ; ---- +lin peel_N = dualN (mkN041 "кожа") (mkA079 "кожен"); lin peel_V = variants {}; lin peel_V2 = variants {}; lin peeler_N = variants {}; @@ -39961,7 +39962,7 @@ lin periosteum_N = variants {}; lin peripatetic_A = variants {}; lin peripatetic_N = variants {}; lin peripeteia_N = variants {}; -lin peripheral_A = variants {}; +lin peripheral_A = mkA079 "периферен"; lin peripheral_N = variants {}; lin periphery_N = variants {}; lin periphrasis_N = variants {}; @@ -42339,10 +42340,10 @@ lin preschooler_N = variants {}; lin prescience_N = variants {}; lin prescient_A = mkA079 "далновиден"; lin prescot_PN = variants {}; -lin prescribe_V = variants {}; -lin prescribe_V2 = variants {}; +lin prescribe_V = actionV (mkV186 "предписвам") (mkV159 "предпиша"); +lin prescribe_V2 = dirV2 (actionV (mkV186 "предписвам") (mkV159 "предпиша")); lin prescript_N = variants {}; -lin prescription_N = variants {}; +lin prescription_N = mkN072 "предписание"; lin prescriptive_A = variants {}; lin prescriptivism_N = variants {}; lin preseason_N = variants {}; @@ -43746,8 +43747,8 @@ lin quadrature_N = mkN041 "квадратура"; lin quadrennium_N = variants {}; lin quadric_N = variants {}; lin quadriceps_N = variants {}; -lin quadrilateral_A = variants {}; -lin quadrilateral_N = mkN014 "четириъгълник" ; ---- +lin quadrilateral_A = mkA079 "четиристранен"; +lin quadrilateral_N = mkN014 "четириъгълник"; lin quadrille_N = variants {}; lin quadrillion_N = variants {}; lin quadrillionth_A = variants {}; @@ -45186,7 +45187,7 @@ lin reindeer_N = variants {}; lin reindict_V2 = variants {}; lin reinforce_V2 = variants {}; lin reinforcement_N = mkN071 "засилване" ; -lin reinstall_V2 = variants {}; +lin reinstall_V2 = dirV2 (stateV (mkV186 "преинсталирам")); lin reinstate_V2 = variants {}; lin reinstatement_N = variants {}; lin reinstitute_V2 = variants {}; @@ -46255,7 +46256,7 @@ lin rimini_PN = variants {}; lin rimless_A = variants {}; lin rimose_A = variants {}; lin rimu_N = variants {}; -lin rind_N = mkN041 "кожа"; +lin rind_N = dualN (mkN041 "кожа") (mkA079 "кожен"); lin rinderpest_N = variants {}; lin ring_N = variants {}; lin ring_V = singleV (mkV177 "звъня"); @@ -47063,29 +47064,29 @@ lin saddler_N = variants {}; lin saddlery_N = variants {}; lin sadhe_N = variants {}; lin sadhu_N = variants {}; -lin sadism_N = variants {}; -lin sadist_N = variants {}; -lin sadistic_A = variants {}; -lin sadness_N = variants {}; -lin sado_masochist_N = variants {}; -lin sadomasochism_N = variants {}; -lin sadomasochist_N = variants {}; -lin sadomasochistic_A = variants {}; +lin sadism_N = mkN011 "садизъм"; +lin sadist_N = mkN007 "садист"; +lin sadistic_A = mkA079 "садистичен"; +lin sadness_N = mkN041 "тъга"; +lin sadomasochism_N = mkN011 "садомазохизъм"; +lin sadomasochistMasc_N = mkN007 "садомазохист"; +lin sadomasochistFem_N = mkN041 "садомазохистка"; +lin sadomasochistic_A = mkA079 "садомазохистичен"; lin sae_N = variants {}; -lin safari_N = variants {}; -lin safe_A = mkA079 "сигурен" ; -lin safe_N = variants {}; +lin safari_N = mkN065 "сафари"; +lin safe_A = mkA079 "сигурен"; +lin safe_N = mkN001 "сейф"; lin safe_conduct_N = variants {}; lin safe_deposit_A = variants {}; lin safe_deposit_N = variants {}; -lin safebreaker_N = variants {}; -lin safecracker_N = variants {}; +lin safebreaker_N = mkN007b "касоразбивач"; +lin safecracker_N = mkN007b "касоразбивач"; lin safeguard_N = mkN047 "гаранция" ; lin safeguard_V2 = variants {}; lin safehold_N = variants {}; lin safekeeping_N = variants {}; -lin safeness_N = variants {}; -lin safety_N = mkN049 "сигурност" ; +lin safeness_N = mkN049 "безопасност"; +lin safety_N = mkN049 "сигурност"; lin safety_belt_N = variants {}; lin safety_bolt_N = variants {}; lin safety_catch_N = variants {}; @@ -47098,7 +47099,7 @@ lin safety_pin_N = variants {}; lin safety_razor_N = variants {}; lin safety_valve_N = mkN014 "отдушник" ; ---- lin safflower_N = variants {}; -lin saffron_N = mkN007 "шафран" ; ---- +lin saffron_N = dualN (mkN007 "шафран") (mkA076 "шафранов"); lin saffron_walden_PN = variants {}; lin safranine_N = variants {}; lin sag_N = variants {}; @@ -48155,7 +48156,7 @@ lin scyphozoan_N = variants {}; lin scyphus_N = variants {}; lin scythe_N = mkN041 "коса" ; lin scythe_V2 = variants {}; -lin sea_N = mkN065 "море" ; +lin sea_N = dualN (mkN065 "море") (mkA078 "морски"); lin sea_anemone_N = variants {}; lin sea_animal_N = variants {}; lin sea_bathing_N = variants {}; @@ -48970,7 +48971,7 @@ lin shadow_V2 = variants {}; lin shadow_boxing_N = variants {}; lin shadowboxing_N = variants {}; lin shadowing_N = variants {}; -lin shadowy_A = variants {}; +lin shadowy_A = mkA076 "сенчест"; lin shady_A = variants {}; lin shaft_N = variants {}; lin shag_N = variants {}; @@ -52454,7 +52455,7 @@ lin stickweed_N = variants {}; lin sticky_A = variants {}; lin stiff_A = variants {}; lin stiff_Adv = variants {}; -lin stiff_N = mkN014 "човек" ; ---- +lin stiff_N = dualN (mkN001 "труп") (mkA079 "трупен"); lin stiff_necked_A = variants {}; lin stiffen_V = variants {}; lin stiffen_V2 = variants {}; @@ -52820,11 +52821,11 @@ lin street_N = mkN041 "улица" ; lin street_PN = variants {}; lin street_girl_N = variants {}; lin street_urchin_N = variants {}; -lin streetcar_N = mkN032 "трамвай"; +lin streetcar_N = dualN (mkN032 "трамвай") (mkA085 "трамваен"); lin streetlight_N = variants {}; lin streetwalker_N = variants {}; lin streetwise_A = variants {}; -lin strength_N = mkN049 "мощ" ; +lin strength_N = mkN049 "мощ"; lin strengthen_V = dualV (mkV186 "заяквам") (mkV152 "заякна"); lin strengthen_V2 = dirV2 (dualV (mkV186 "засилвам") (mkV173 "засиля")); lin strengthener_N = variants {}; @@ -52841,7 +52842,7 @@ lin streptolysin_N = variants {}; lin streptomyces_N = variants {}; lin streptomycin_N = variants {}; lin streptothricin_N = variants {}; -lin stress_N = mkN001 "стрес"; +lin stress_N = dualN (mkN001 "стрес") (mkA076 "стресов"); lin stress_V2 = variants {}; lin stress_VS = variants {}; lin stress_mark_N = variants {}; @@ -52865,7 +52866,7 @@ lin stricken_A = variants {}; lin strickle_N = variants {}; lin strict_A = mkA079 "стриктен" ; lin strictness_N = mkN049 "стриктност"; -lin stricture_N = mkN041 "структура"; +lin stricture_N = dualN (mkN041 "структура") (mkA079 "структурен"); lin stride_N = variants {}; lin stride_V = variants {}; lin stride_V2 = variants {}; @@ -53581,7 +53582,7 @@ lin superjacent_A = variants {}; lin superlative_A = variants {}; lin superlative_N = variants {}; lin superman_N = variants {}; -lin supermarket_N = mkN007 "супермаркет" ; ---- +lin supermarket_N = mkN007 "супермаркет"; lin supermarketer_N = variants {}; lin supermodel_N = variants {}; lin supermom_N = variants {}; @@ -54055,8 +54056,8 @@ lin sylvan_N = variants {}; lin sylvanite_N = variants {}; lin sylvia_PN = variants {}; lin sylvite_N = variants {}; -lin symbiosis_N = mkN041 "симбиоза" ; ---- -lin symbiotic_A = variants {}; +lin symbiosis_N = dualN (mkN041 "симбиоза") (mkA079 "симбиозен"); +lin symbiotic_A = mkA079 "симбиозен"; lin symbiotically_Adv = variants {}; lin symbol_N = mkN007 "символ" ; lin symbolatry_N = variants {}; @@ -55699,7 +55700,7 @@ lin tier_N = variants {}; lin tiercel_N = variants {}; lin tiered_A = variants {}; lin tiff_N = variants {}; -lin tiger_N = mkN009 "тигър"; +lin tiger_N = dualN (mkN009 "тигър") (mkA076 "тигров"); lin tiger_lily_N = variants {}; lin tigerish_A = variants {}; lin tight_A = mkA084 "тесен" ; @@ -56432,10 +56433,10 @@ lin traitorous_A = mkA078 "предателски"; lin traitress_N = mkN041 "предателка"; lin trajectory_N = mkN047 "траектория"; lin tralee_PN = variants {}; -lin tram_N = mkN032 "трамвай"; +lin tram_N = dualN (mkN032 "трамвай") (mkA085 "трамваен"); lin tram_car_N = variants {}; lin tramcar_N = variants {}; -lin tramline_N = mkN032 "трамвай" ; ---- +lin tramline_N = dualN (mkN032 "трамвай") (mkA085 "трамваен"); lin trammel_N = variants {}; lin trammel_V2 = variants {}; lin tramontane_A = variants {}; @@ -56449,7 +56450,7 @@ lin trample_V = variants {}; lin trample_V2 = variants {}; lin trampler_N = variants {}; lin trampoline_N = variants {}; -lin tramway_N = mkN032 "трамвай" ; ---- +lin tramway_N = dualN (mkN032 "трамвай") (mkA085 "трамваен"); lin trance_N = mkN001 "транс"; lin trancelike_A = variants {}; lin tranche_N = variants {}; @@ -60266,15 +60267,15 @@ lin vs_PN = variants {}; lin vs_Prep = variants {}; lin vso_PN = variants {}; lin vulcanite_N = variants {}; -lin vulcanization_N = variants {}; -lin vulcanize_V2 = variants {}; -lin vulcanizer_N = variants {}; -lin vulgar_A = variants {}; +lin vulcanization_N = mkN047 "вулканизация"; +lin vulcanize_V2 = dirV2 (stateV (mkV186 "вулканизирам")); +lin vulcanizer_N = mkN007 "вулканизатор"; +lin vulgar_A = mkA079 "вулгарен"; lin vulgarian_N = variants {}; -lin vulgarism_N = variants {}; -lin vulgarity_N = variants {}; -lin vulgarization_N = variants {}; -lin vulgarize_V2 = variants {}; +lin vulgarism_N = mkN011 "вулгаризъм"; +lin vulgarity_N = mkN049 "вулгарност"; +lin vulgarization_N = mkN071 "вулгаризиране"; +lin vulgarize_V2 = dirV2 (stateV (mkV186 "вулгаризирам")); lin vulgarizer_N = variants {}; lin vulgate_N = variants {}; lin vulnerability_N = mkN049 "чувствителност" ; diff --git a/lib/src/english/DictEng.gf b/lib/src/english/DictEng.gf index b84e9e527..2fc8c933d 100644 --- a/lib/src/english/DictEng.gf +++ b/lib/src/english/DictEng.gf @@ -46987,9 +46987,8 @@ lin sadism_N = mkN "sadism" ; lin sadist_N = mkN "sadist" "sadists"; lin sadistic_A = compoundA (mkA "sadistic"); lin sadness_N = mkN "sadness" ; -lin sado_masochist_N = mkN "sado - masochist" "sado - masochists"; lin sadomasochism_N = mkN "sadomasochism" ; -lin sadomasochist_N = mkN "sadomasochist" ; +lin sadomasochist_N = mkN (variants {"sadomasochist"; "sado - masochist"}); lin sadomasochistic_A = mkA "sadomasochistic" ; lin sae_N = mkN "sae" ; lin safari_N = mkN "safari" "safaris"; diff --git a/lib/src/english/DictEngAbs.gf b/lib/src/english/DictEngAbs.gf index cd9950640..639badcef 100644 --- a/lib/src/english/DictEngAbs.gf +++ b/lib/src/english/DictEngAbs.gf @@ -46921,7 +46921,6 @@ fun sadism_N : N; fun sadist_N : N; fun sadistic_A : A; fun sadness_N : N; -fun sado_masochist_N : N; fun sadomasochism_N : N; fun sadomasochist_N : N; fun sadomasochistic_A : A;