diff --git a/lib/src/bulgarian/DictEngBul.gf b/lib/src/bulgarian/DictEngBul.gf index 0bd4f08cc..865f3020e 100644 --- a/lib/src/bulgarian/DictEngBul.gf +++ b/lib/src/bulgarian/DictEngBul.gf @@ -3426,14 +3426,14 @@ lin arresting_A = variants {}; lin arrhythmic_A = variants {}; lin arriere_pensee_N = variants {}; lin arrival_N = mkN071 "пристигане" ; -lin arrive_V = dualV (mkV186 "идвам") (mkV146a "дойда") ; ---- +lin arrive_V = dualV (mkV186 "пристигам") (mkV152 "пристигна"); lin arrive_V2 = variants {}; lin arroba_N = variants {}; -lin arrogance_N = mkN049 "арогантност" ; ---- -lin arrogant_A = mkA079 "арогантен" ; ---- +lin arrogance_N = mkN049 "арогантност"; +lin arrogant_A = mkA079 "арогантен"; lin arrogate_V2 = variants {}; lin arrogator_N = variants {}; -lin arrow_N = mkN041 "стрела" ; ---- +lin arrow_N = mkN041 "стрела"; lin arrowhead_N = variants {}; lin arrowroot_N = variants {}; lin arrowsmith_N = variants {}; @@ -3655,7 +3655,7 @@ lin asphyxia_N = variants {}; lin asphyxiate_V2 = variants {}; lin asphyxiating_A = variants {}; lin asphyxiation_N = variants {}; -lin aspic_N = mkN065 "желе" ; ---- +lin aspic_N = mkN065 "желе"; lin aspidistra_N = variants {}; lin aspirant_A = variants {}; lin aspirant_N = variants {}; @@ -4476,7 +4476,7 @@ lin backhand_N = variants {}; lin backhanded_A = variants {}; lin backhander_N = variants {}; lin backhoe_N = variants {}; -lin backing_N = mkN007 "пълнеж" ; ---- +lin backing_N = mkN041 "подкрепа"; lin backlash_N = mkN071 "ритане" ; ---- lin backless_A = variants {}; lin backlighting_N = variants {}; @@ -4606,22 +4606,22 @@ lin baiting_N = variants {}; lin baiza_N = variants {}; lin baize_N = variants {}; lin bake_V = variants {}; -lin bake_V2 = variants {}; -lin bakelite_N = variants {}; -lin baker_N = mkN031a "пекар" ; ---- -lin bakery_N = mkN041 "хлебарница" ; ---- +lin bake_V2 = dirV2 (dualV (mkV148 "пека") (mkV148 "опека")); +lin bakelite_N = mkN007 "бакелит"; +lin baker_N = mkN031a "пекар"; +lin bakery_N = mkN041 "хлебарница"; lin baking_N = variants {}; lin baking_hot_A = variants {}; -lin baking_powder_N = variants {}; -lin baklava_N = variants {}; +lin baking_powder_N = mkN007 "бакпулвер"; +lin baklava_N = mkN041 "баклава"; lin baksheesh_N = variants {}; lin baku_PN = variants {}; lin balaclava_N = variants {}; lin balagan_N = variants {}; -lin balalaika_N = variants {}; +lin balalaika_N = mkN041 "балалайка"; lin balance_N = mkN007 "баланс" ; -lin balance_V = singleV (mkV186 "компенсирам") ; ---- -lin balance_V2 = variants {}; +lin balance_V = stateV (mkV186 "балансирам"); +lin balance_V2 = dirV2 (singleV (mkV186 "балансирам")); lin balance_sheet_N = variants {}; lin balance_wheel_N = variants {}; lin balancer_N = variants {}; @@ -5045,7 +5045,7 @@ lin basipetal_A = variants {}; lin basis_N = mkN041 "база" ; lin basiscopic_A = variants {}; lin bask_V = variants {}; -lin basket_N = mkN001 "кош" ; ---- +lin basket_N = variants {mkN001 "кош"; mkN041 "кошница"}; lin basketball_N = mkN040a "баскетбол" ; ---- lin basketry_N = variants {}; lin basketweaver_N = variants {}; @@ -5106,13 +5106,13 @@ lin batholith_N = variants {}; lin batholithic_A = variants {}; lin bathos_N = variants {}; lin bathrobe_N = mkN047 "хавлия" ; ---- -lin bathroom_N = mkN047 "баня" ; ---- -lin bathtub_N = mkN047 "баня" ; ---- +lin bathroom_N = mkN047 "баня"; +lin bathtub_N = mkN041 "вана"; lin bathyal_A = variants {}; lin bathymeter_N = variants {}; lin bathymetric_A = variants {}; lin bathymetry_N = variants {}; -lin bathyscaphe_N = variants {}; +lin bathyscaphe_N = mkN007 "батискаф"; lin bathysphere_N = variants {}; lin batik_N = variants {}; lin batiste_N = mkN041 "батиста" ; ---- @@ -5379,7 +5379,7 @@ lin begin_ing_VV = mkVV (dualV (mkV186 "започвам") (mkV152 "започн lin begin_to_VV = mkVV (dualV (mkV186 "започвам") (mkV152 "започна")); lin beginner_N = variants {}; lin beginning_N = mkN054 "начало" ; -lin begonia_N = variants {}; +lin begonia_N = mkN047 "бегония"; lin begrimed_A = mkA079 "мръсен" ; ---- lin begrudge_V2 = variants {}; lin beguile_V2 = variants {}; @@ -6148,7 +6148,7 @@ lin black_lead_N = variants {}; lin black_lead_V2 = variants {}; lin blackamoor_N = variants {}; lin blackball_V2 = variants {}; -lin blackberry_N = variants {}; +lin blackberry_N = dualN (mkN041 "къпина") (mkA076 "къпинов"); lin blackbird_N = mkN001 "кос" ; ---- lin blackboard_N = variants {}; lin blackbuck_N = variants {}; @@ -6990,7 +6990,7 @@ lin bounteous_A = variants {}; lin bountied_A = variants {}; lin bountiful_A = variants {}; lin bounty_N = variants {}; -lin bouquet_N = variants {}; +lin bouquet_N = mkN007 "букет"; lin bourbon_N = variants {}; lin bourgeois_A = variants {}; lin bourgeois_N = variants {}; @@ -7141,7 +7141,7 @@ lin brake_V = singleV (mkV186 "спирам"); lin brake_V2 = variants {}; lin brakeman_N = variants {}; lin braky_A = variants {}; -lin bramble_N = mkN041 "къпина"; +lin bramble_N = mkN041 "калина"; lin brambling_N = variants {}; lin bran_N = mkN041 "трица"; lin bran_new_A = variants {}; @@ -7616,7 +7616,7 @@ lin buck_N = variants {}; lin buck_V = variants {}; lin buck_V2 = variants {}; lin buckboard_N = variants {}; -lin bucket_N = mkN007 "букет"; +lin bucket_N = mkN041 "кофа"; lin bucket_V = variants {}; lin bucketful_N = variants {}; lin buckeye_N = variants {}; @@ -8202,7 +8202,7 @@ lin caitiff_A = variants {}; lin caitiff_N = variants {}; lin cajole_V2 = variants {}; lin cajolery_N = variants {}; -lin cake_N = mkN041 "торта" ; ---- +lin cake_N = mkN041 "торта"; lin cake_V = variants {}; lin cake_V2 = variants {}; lin cakewalk_N = variants {}; @@ -8372,11 +8372,11 @@ lin cambridgeshire_PN = variants {}; lin cambuslang_PN = variants {}; lin camcorder_N = variants {}; lin camden_PN = variants {}; -lin camel_N = mkN041 "камила" ; ---- +lin camel_N = mkN041 "камила"; lin camel_hair_N = variants {}; -lin camellia_N = mkN047 "камелия" ; ---- +lin camellia_N = mkN047 "камелия"; lin camelpox_N = variants {}; -lin camembert_N = variants {}; +lin camembert_N = mkN007 "камембер"; lin cameo_N = variants {}; lin camera_N = mkN041 "камера" ; lin cameraman_N = variants {}; @@ -8693,9 +8693,9 @@ lin carbon_paper_N = variants {}; lin carbonaceous_A = variants {}; lin carbonado_N = variants {}; lin carbonara_N = variants {}; -lin carbonate_N = variants {}; -lin carbonated_A = variants {}; -lin carbonation_N = variants {}; +lin carbonate_N = dualN (mkN007 "карбонат") (mkA079 "карбонатен"); +lin carbonated_A = mkA076 "газиран"; +lin carbonation_N = mkN071 "газиране"; lin carbonic_A = variants {}; lin carboniferous_A = variants {}; lin carbonization_N = mkN071 "овъгляване" ; ---- @@ -8742,9 +8742,10 @@ lin cardiograph_N = variants {}; lin cardiographic_A = variants {}; lin cardiography_N = variants {}; lin cardioid_N = variants {}; -lin cardiologic_A = variants {}; -lin cardiologist_N = variants {}; -lin cardiology_N = variants {}; +lin cardiologic_A = mkA078 "кардиоложки"; +lin cardiologistMasc_N = dualN (mkN015a "кардиолог") (mkA078 "кардиоложки"); +lin cardiologistFem_N = dualN (mkN041 "минераложка") (mkA078 "кардиоложки"); +lin cardiology_N = dualN (mkN047 "кардиология") (mkA078 "кардиоложки"); lin cardiomegaly_N = variants {}; lin cardiomyopathy_N = variants {}; lin cardiopulmonary_A = variants {}; @@ -8811,7 +8812,7 @@ lin carnal_A = variants {}; lin carnallite_N = variants {}; lin carnassial_A = variants {}; lin carnation_A = variants {}; -lin carnation_N = variants {}; +lin carnation_N = dualN (mkN007 "карамфил") (mkA076 "карамфилов"); lin carnauba_N = variants {}; lin carnelian_N = variants {}; lin carnforth_PN = variants {}; @@ -10673,8 +10674,8 @@ lin clincher_N = variants {}; lin cling_N = variants {}; lin cling_V = variants {}; lin clingfish_N = variants {}; -lin clinic_N = mkN041 "болница" ; ---- -lin clinical_A = mkA079 "клиничен" ; ---- +lin clinic_N = dualN (mkN041 "клиника") (mkA079 "клиничен"); +lin clinical_A = mkA079 "клиничен"; lin clinician_N = variants {}; lin clinid_N = variants {}; lin clink_N = variants {}; @@ -11090,7 +11091,7 @@ lin cogitate_V = dualV (mkV187 "обмислям") (mkV173 "обмисля") ; - lin cogitate_V2 = variants {}; lin cogitation_N = mkN072 "размишление" ; ---- lin cogitative_A = variants {}; -lin cognac_N = variants {}; +lin cognac_N = mkN014 "коняк"; lin cognate_A = variants {}; lin cognate_N = variants {}; lin cognition_N = mkN072 "познание" ; ---- @@ -11141,7 +11142,7 @@ lin colander_N = mkN054 "решето" ; ---- lin colchester_PN = variants {}; lin colchicine_N = variants {}; lin cold_A = mkA076 "студен" ; -lin cold_N = mkN041 "настинка" ; ---- +lin cold_N = mkN041 (variants {"настинка"; "простуда"}); lin cold_blooded_A = variants {}; lin cold_hearted_A = variants {}; lin cold_shoulder_V2 = variants {}; @@ -12185,8 +12186,8 @@ lin contiguity_N = variants {}; lin contiguous_A = variants {}; lin continence_N = mkN049 "умереност" ; ---- lin continent_A = variants {}; -lin continent_N = mkN007 "континент" ; ---- -lin continental_A = mkA079 "континентален" ; ---- +lin continent_N = mkN007 "континент"; +lin continental_A = mkA079 "континентален"; lin contingency_N = variants {}; lin contingent_A = mkA076 "зависещ" ; ---- lin contingent_N = mkN007 "контингент" ; @@ -13153,17 +13154,17 @@ lin crayon_V2 = variants {}; lin craze_N = variants {}; lin crazed_A = variants {}; lin craziness_N = variants {}; -lin crazy_A = variants {}; +lin crazy_A = mkA076 "луд"; lin crazy_N = variants {}; lin creak_N = mkN071 "скърцане" ; ---- lin creak_V = variants {}; lin creaky_A = mkA076 "вехт" ; ---- -lin cream_N = variants {}; +lin cream_N = mkN001 "крем"; lin cream_V2 = variants {}; lin creamcups_N = variants {}; lin creamery_N = variants {}; lin creaminess_N = variants {}; -lin creamy_A = variants {}; +lin creamy_A = mkA079 "кремообразен"; lin crease_N = variants {}; lin crease_V = variants {}; lin crease_V2 = variants {}; @@ -13341,7 +13342,7 @@ lin crocket_N = variants {}; lin crocketed_A = variants {}; lin crocodile_N = mkN007 "крокодил" ; ---- lin crocolite_N = variants {}; -lin crocus_N = mkN007 "шафран" ; ---- +lin crocus_N = mkN007 "минзухар"; lin croesus_PN = variants {}; lin croft_N = variants {}; lin crofter_N = variants {}; @@ -13890,7 +13891,7 @@ lin cyberpunk_N = variants {}; lin cybersex_N = variants {}; lin cyborg_N = variants {}; lin cycad_N = variants {}; -lin cyclamen_N = mkN041 "циклама" ; ---- +lin cyclamen_N = dualN (mkN041 "циклама") (mkA076 "цикламен"); lin cycle_N = mkN009 "цикъл" ; lin cycle_V = variants {}; lin cyclic_A = mkA079 "цикличен" ; ---- @@ -14046,7 +14047,7 @@ lin dagger_N = mkN041 "кама" ; ---- lin daggerboard_N = variants {}; lin dago_N = variants {}; lin daguerreotype_N = variants {}; -lin dahlia_N = mkN047 "далия" ; ---- +lin dahlia_N = mkN047 "далия"; lin dail_eireann_N = variants {}; lin daily_A = mkA079 "дневен" ; lin daily_Adv = variants {}; @@ -14136,7 +14137,7 @@ lin dandelion_N = mkN065 "глухарче" ; ---- lin dander_N = variants {}; lin dandified_A = mkA076 "предвзет" ; ---- lin dandle_V2 = variants {}; -lin dandruff_N = mkN007 "пърхот" ; ---- +lin dandruff_N = mkN007 "пърхот"; lin dandy_A = variants {}; lin dandy_N = mkN065 "конте" ; ---- lin dane_N = variants {}; @@ -15116,9 +15117,10 @@ lin dermal_A = variants {}; lin dermatitis_N = variants {}; lin dermatoglyphic_N = variants {}; lin dermatoglyphics_N = variants {}; -lin dermatologic_A = variants {}; -lin dermatologist_N = variants {}; -lin dermatology_N = mkN047 "дерматология" ; ---- +lin dermatologic_A = mkA078 "дерматоложки"; +lin dermatologistMasc_N = dualN (mkN015 "дерматолог") (mkA078 "дерматоложки"); +lin dermatologistFem_N = dualN (mkN041 "дерматоложка") (mkA078 "дерматоложки"); +lin dermatology_N = dualN (mkN047 "дерматология") (mkA078 "дерматоложки"); lin dermatome_N = variants {}; lin dermatomycosis_N = variants {}; lin dermatomyositis_N = variants {}; @@ -15418,8 +15420,8 @@ lin dhoti_N = variants {}; lin dhow_N = variants {}; lin di_PN = variants {}; lin diabatic_A = variants {}; -lin diabetes_N = variants {}; -lin diabetic_A = variants {}; +lin diabetes_N = mkN007 "диабет"; +lin diabetic_A = mkA079 "диабетичен"; lin diabetic_N = mkN014a "диабетик"; lin diabolatry_N = variants {}; lin diabolic_A = variants {}; @@ -17765,7 +17767,7 @@ lin eggbeater_N = variants {}; lin eggcup_N = variants {}; lin egghead_N = variants {}; lin eggnog_N = variants {}; -lin eggplant_N = variants {}; +lin eggplant_N = mkN007 "патладжан"; lin eggshake_N = variants {}; lin eggshell_N = variants {}; lin eglantine_N = variants {}; @@ -19668,7 +19670,7 @@ lin exurbia_N = variants {}; lin exuviae_N = variants {}; lin exuvial_A = variants {}; lin eyas_N = variants {}; -lin eye_N = mkN063 "око" ; +lin eye_N = dualN (mkN063 "око") (mkA079 "очен"); lin eye_V2 = variants {}; lin eye_catching_A = variants {}; lin eye_opener_N = variants {}; @@ -19676,7 +19678,7 @@ lin eye_shadow_N = variants {}; lin eyeball_N = variants {}; lin eyeball_V2 = variants {}; lin eyebath_N = variants {}; -lin eyebrow_N = mkN041 "вежда" ; ---- +lin eyebrow_N = mkN041 "вежда"; lin eyecatching_A = variants {}; lin eyecup_N = variants {}; lin eyedness_N = variants {}; @@ -20448,7 +20450,7 @@ lin fiery_A = variants {}; lin fiesta_N = variants {}; lin fife_N = variants {}; lin fife_PN = variants {}; -lin fig_N = variants {}; +lin fig_N = mkN047 "смокиня"; lin fig_leaf_N = variants {}; lin fight_N = mkN041 "борба" ; lin fight_V = variants {}; @@ -21060,7 +21062,7 @@ lin flower_girl_N = mkN041 "цветарка"; lin flowerbed_N = variants {}; lin flowered_A = variants {}; lin flowerless_A = mkA079 "безцветен"; -lin flowerpot_N = variants {}; +lin flowerpot_N = mkN047 "саксия"; lin flowery_A = mkA079 "цветен"; lin floxuridine_N = variants {}; lin flu_N = mkN001 "грип" ; @@ -21186,11 +21188,11 @@ lin fogbank_N = variants {}; lin fogbound_A = variants {}; lin fogey_N = variants {}; lin foggia_PN = variants {}; -lin foggy_A = variants {}; +lin foggy_A = mkA076 "мъглив"; lin foghorn_N = variants {}; lin foglamp_N = variants {}; lin fogsignal_N = variants {}; -lin fogyish_A = variants {}; +lin fogyish_A = mkA076 "мъгляв"; lin fohn_N = variants {}; lin foible_N = variants {}; lin foil_N = variants {}; @@ -22469,8 +22471,9 @@ lin gastritis_N = mkN007 "гастрит"; lin gastrocnemius_N = variants {}; lin gastroduodenal_A = variants {}; lin gastroenteritis_N = variants {}; -lin gastroenterologist_N = variants {}; -lin gastroenterology_N = variants {}; +lin gastroenterologistMasc_N = dualN (mkN015 "гастроентеролог") (mkA078 "гастроентероложки"); +lin gastroenterologistFem_N = dualN (mkN041 "гастроентероложка") (mkA078 "гастроентероложки"); +lin gastroenterology_N = dualN (mkN047 "гастроентерология") (mkA078 "гастроентероложки"); lin gastroenterostomy_N = variants {}; lin gastroesophageal_A = variants {}; lin gastrogavage_N = variants {}; @@ -22877,7 +22880,7 @@ lin gimel_N = variants {}; lin gimlet_N = variants {}; lin gimmick_N = mkN047 "джунджурия" ; lin gimmickry_N = variants {}; -lin gin_N = variants {}; +lin gin_N = mkN001 "джин"; lin gin_V2 = variants {}; lin gina_PN = variants {}; lin ginger_A = variants {}; @@ -22941,7 +22944,7 @@ lin gladden_V2 = variants {}; lin glade_N = variants {}; lin gladiator_N = mkN007a "гладиатор"; lin gladiatorial_A = mkA078 "гладиаторски"; -lin gladiolus_N = variants {}; +lin gladiolus_N = mkN041 "гладиола"; lin gladness_N = variants {}; lin gladsome_A = variants {}; lin gladys_PN = variants {}; @@ -23818,7 +23821,7 @@ lin grouch_V = variants {}; lin grouchy_A = variants {}; lin ground_N = mkN041 "основа"; lin ground_V = variants {}; -lin ground_V2 = variants {}; +lin ground_V2 = dirV2 (singleV (mkV184 "меля")); lin ground_bait_N = variants {}; lin ground_fish_N = variants {}; lin ground_plan_N = variants {}; @@ -24121,9 +24124,10 @@ lin gynaecologist_N = variants {}; lin gynaecology_N = variants {}; lin gynandromorphic_A = variants {}; lin gynecocracy_N = variants {}; -lin gynecological_A = variants {}; -lin gynecologist_N = variants {}; -lin gynecology_N = variants {}; +lin gynecological_A = variants {mkA079 "гинекологичен"; mkA078 "гинекологически"}; +lin gynecologistMasc_N = dualN (mkN015 "гинеколог") (mkA078 "гинеколожки"); +lin gynecologistFem_N = dualN (mkN041 "гинеколожка") (mkA078 "гинеколожки"); +lin gynecology_N = mkN047 "гинекология"; lin gynecomastia_N = variants {}; lin gyneolatry_N = variants {}; lin gynobase_N = variants {}; @@ -24772,7 +24776,7 @@ lin haze_V2 = variants {}; lin hazel_A = variants {}; lin hazel_N = variants {}; lin hazel_PN = variants {}; -lin hazelnut_N = variants {}; +lin hazelnut_N = dualN (mkN014 "лешник") (mkA076 "лешников"); lin haziness_N = variants {}; lin hazy_A = variants {}; lin he_Pron = mkPron "той" "него" "му" "негов" "неговия" "неговият" "негова" "неговата" "негово" "неговото" "негови" "неговите" (GSg Masc) P3; @@ -25792,8 +25796,8 @@ lin hone_N = variants {}; lin hone_V2 = variants {}; lin honest_A = variants {}; lin honesty_N = variants {}; -lin honey_A = variants {}; -lin honey_N = variants {}; +lin honey_A = mkA079 "меден"; +lin honey_N = dualN (mkN049 "мед") (mkA079 "меден"); lin honeybee_N = variants {}; lin honeycomb_N = variants {}; lin honeycomb_V2 = variants {}; @@ -26002,7 +26006,7 @@ lin hot_tempered_A = variants {}; lin hot_water_bottle_N = variants {}; lin hotbed_N = variants {}; lin hotbox_N = variants {}; -lin hotchpotch_N = variants {}; +lin hotchpotch_N = mkN007 "гювеч"; lin hotdog_N = variants {}; lin hotel_N = dualN (mkN007 "хотел") (mkA078 "хотелски"); lin hotelier_N = variants {}; @@ -26281,7 +26285,7 @@ lin hutch_N = variants {}; lin hutment_N = variants {}; lin hutted_A = variants {}; lin hwainan_PN = variants {}; -lin hyacinth_N = variants {}; +lin hyacinth_N = mkN007 "зюмбюл"; lin hyaena_N = variants {}; lin hyaline_A = variants {}; lin hyaline_N = variants {}; @@ -28178,15 +28182,15 @@ lin interconnect_V = variants {}; lin interconnect_V2 = variants {}; lin interconnectedness_N = variants {}; lin interconnection_N = mkN041 "взаимовръзка" ; -lin intercontinental_A = variants {}; +lin intercontinental_A = mkA079 "междуконтинентален"; lin intercostal_A = variants {}; lin intercostal_N = variants {}; lin intercourse_N = variants {}; lin interdenominational_A = variants {}; lin interdepartmental_A = variants {}; lin interdepartmental_Adv = variants {}; -lin interdependence_N = variants {}; -lin interdependent_A = variants {}; +lin interdependence_N = mkN049 "взаимозависимост"; +lin interdependent_A = mkA076 "взаимозависим"; lin interdict_N = mkN041 "забрана" ; ---- lin interdict_V2 = variants {}; lin interdiction_N = mkN041 "забрана" ; ---- @@ -28778,7 +28782,7 @@ lin italic_A = variants {}; lin italic_N = variants {}; lin italicize_V2 = variants {}; lin italy_PN = mkPN "Италия" Fem; -lin itch_N = variants {}; +lin itch_N = mkN007 "сърбеж"; lin itch_V = variants {}; lin itchy_A = variants {}; lin item_Adv = variants {}; @@ -28878,7 +28882,7 @@ lin jakes_N = variants {}; lin jalapeno_N = variants {}; lin jalopy_N = variants {}; lin jalousie_N = variants {}; -lin jam_N = variants {}; +lin jam_N = mkN054 "сладко"; lin jam_V = dualV (mkV186 "преяждам") (mkV169 "преям") ; ---- lin jam_V2 = variants {}; lin jam_VS = variants {}; @@ -28981,10 +28985,10 @@ lin jell_V = variants {}; lin jell_V2 = variants {}; lin jellaba_N = variants {}; lin jello_N = variants {}; -lin jelly_N = variants {}; +lin jelly_N = mkN065 "желе"; lin jelly_V = variants {}; lin jelly_V2 = variants {}; -lin jellyfish_N = variants {}; +lin jellyfish_N = mkN041 "медуза"; lin jellyroll_N = variants {}; lin jemmy_N = variants {}; lin jennet_N = variants {}; @@ -29609,7 +29613,7 @@ lin kidnap_V2 = variants {}; lin kidnapper_N = variants {}; lin kidnapping_N = variants {}; lin kidney_N = mkN014 "бъбрек" ; -lin kidney_bean_N = variants {}; +lin kidney_bean_N = dualN (mkN001 "боб") (mkA076 "бобен"); lin kidsgrove_PN = variants {}; lin kieserite_N = variants {}; lin kiev_PN = variants {}; @@ -30833,7 +30837,7 @@ lin letterman_N = variants {}; lin letterpress_N = variants {}; lin letters_N = variants {}; lin letting_N = variants {}; -lin lettuce_N = variants {}; +lin lettuce_N = mkN047 "маруля"; lin letup_N = variants {}; lin leu_N = variants {}; lin leucine_N = variants {}; @@ -31095,7 +31099,7 @@ lin likening_N = variants {}; lin likewise_Adv = variants {}; lin liking_N = variants {}; lin likuta_N = variants {}; -lin lilac_N = variants {}; +lin lilac_N = dualN (mkN014 "люляк") (mkA076 "люляков"); lin lilangeni_N = variants {}; lin liliaceous_A = variants {}; lin lilian_PN = variants {}; @@ -31105,7 +31109,7 @@ lin lilliputian_N = variants {}; lin lilt_N = variants {}; lin lilt_V = variants {}; lin lilt_V2 = variants {}; -lin lily_N = variants {}; +lin lily_N = mkN047 "лилия"; lin lily_PN = variants {}; lin lily_livered_A = variants {}; lin lily_white_A = variants {}; @@ -33926,8 +33930,8 @@ lin mildew_V = variants {}; lin mildew_V2 = variants {}; lin mildness_N = variants {}; lin mildred_PN = variants {}; -lin mile_N = variants {}; -lin mileage_N = variants {}; +lin mile_N = mkN041 "миля"; +lin mileage_N = mkN007 "километраж"; lin mileometer_N = variants {}; lin miler_N = variants {}; lin miles_PN = variants {}; @@ -34001,8 +34005,7 @@ lin milligram_N = variants {}; lin millihenry_N = variants {}; lin milliliter_N = variants {}; lin millime_N = variants {}; -lin millimeter_N = variants {}; -lin millimetre_N = variants {}; +lin millimetre_N = mkN010 "милиметър"; lin milline_N = variants {}; lin milliner_N = variants {}; lin millinery_N = mkN054 "шапкарство" ; @@ -34828,7 +34831,7 @@ lin more_than_Predet = {s = \\_ => "повече от"}; lin morecambe_PN = variants {}; lin moreen_N = variants {}; lin morel_N = variants {}; -lin morello_N = variants {}; +lin morello_N = mkN047 "вишня"; lin moreover_Adv = mkAdv "освен това"; lin mores_N = variants {}; lin moresque_A = variants {}; @@ -35148,7 +35151,7 @@ lin mujtihad_N = variants {}; lin mukataa_N = variants {}; lin mukden_PN = variants {}; lin mulatto_N = variants {}; -lin mulberry_N = variants {}; +lin mulberry_N = mkN041 "черница"; lin mulch_N = variants {}; lin mulch_V2 = variants {}; lin mulct_V2 = variants {}; @@ -35625,8 +35628,8 @@ lin naranjilla_N = variants {}; lin narborough_PN = variants {}; lin narc_N = variants {}; lin narcissism_N = mkN011 "нарцисизъм"; -lin narcissist_N = variants {}; -lin narcissus_N = variants {}; +lin narcissist_N = dualN (mkN007 "нарцисист") (mkA076 "нарцисов"); +lin narcissus_N = dualN (mkN007 "нарцис") (mkA076 "нарцисов"); lin narcolepsy_N = variants {}; lin narcoleptic_A = variants {}; lin narcoleptic_N = variants {}; @@ -36051,9 +36054,10 @@ lin neurohormone_N = variants {}; lin neurolemma_N = variants {}; lin neurolinguist_N = dualN (mkN007 "невролингвист") (mkA078 "невролингвистки"); lin neurolinguistics_N = mkN041 "невролингвистика"; -lin neurological_A = variants {}; -lin neurologist_N = variants {}; -lin neurology_N = mkN047 "неврология" ; ---- +lin neurological_A = mkA078 "невроложки"; +lin neurologistMasc_N = dualN (mkN015 "невролог") (mkA078 "невроложки"); +lin neurologistFem_N = dualN (mkN041 "невроложка") (mkA078 "невроложки"); +lin neurology_N = dualN (mkN047 "неврология") (mkA078 "невроложки"); lin neuroma_N = variants {}; lin neuromatous_A = variants {}; lin neuromotor_A = variants {}; @@ -36974,14 +36978,14 @@ lin numskull_N = variants {}; lin nun_N = mkN047 "монахиня"; lin nuncio_N = variants {}; lin nuneaton_PN = variants {}; -lin nunnery_N = mkN016 "метох" ; ---- +lin nunnery_N = mkN016 "метох"; lin nuptial_A = variants {}; lin nurenburg_PN = variants {}; -lin nurse_N = variants {}; +lin nurse_N = variants {compoundN (mkA078 "медицински") (mkN041a "сестра"); mkN041 "санитарка"}; lin nurse_V2 = variants {}; lin nurseling_N = variants {}; lin nursemaid_N = variants {}; -lin nurser_N = variants {}; +lin nurser_N = mkN031a "санитар"; lin nursery_N = mkN041 "ясла" ; lin nurseryman_N = variants {}; lin nursing_N = variants {}; @@ -37432,7 +37436,7 @@ lin okay_Interj = ss "добре"; lin okay_V2 = variants {}; lin oklahoma_PN = mkPN "Оклахома" Fem; lin oklahoma_city_PN = variants {}; -lin okra_N = variants {}; +lin okra_N = mkN047 "бамя"; lin ola_N = variants {}; lin old_A = mkA079 "вековен" ; lin old_N = variants {}; @@ -37474,8 +37478,8 @@ lin oligopoly_N = variants {}; lin oligosaccharide_N = variants {}; lin oligospermia_N = variants {}; lin oliguria_N = variants {}; -lin olive_A = variants {}; -lin olive_N = variants {}; +lin olive_A = mkA076 "маслинов"; +lin olive_N = dualN (mkN041 "маслина") (mkA076 "маслинов"); lin olive_PN = variants {}; lin olive_tree_N = variants {}; lin olivelike_A = variants {}; @@ -37900,7 +37904,9 @@ lin ornithomimid_N = variants {}; lin ornithopod_N = variants {}; lin orogeny_N = variants {}; lin oroide_N = variants {}; -lin orology_N = mkN047 "урология"; +lin orologistMasc_N = dualN (mkN015 "уролог") (mkA078 "урологически"); +lin orologistFem_N = dualN (mkN041 "уроложка") (mkA078 "урологически"); +lin orology_N = dualN (mkN047 "урология") (mkA079 "урологичен"); lin oropharyngeal_A = variants {}; lin oropharynx_N = variants {}; lin orotund_A = mkA079 "плътен"; @@ -37933,7 +37939,7 @@ lin orthopaedic_A = mkA079 "ортопедичен"; lin orthopaedics_N = mkN047 "ортопедия"; lin orthopedic_A = mkA079 "ортопедичен"; lin orthopedics_N = mkN047 "ортопедия"; -lin orthopedist_N = variants {}; +lin orthopedist_N = mkN007 (variants {"ортопед"; "ортопедист"}); lin orthopnea_N = variants {}; lin orthopter_N = variants {}; lin orthoptic_A = variants {}; @@ -38208,7 +38214,7 @@ lin outweigh_V2 = variants {}; lin outwit_V2 = variants {}; lin outwork_N = variants {}; lin ouzel_N = variants {}; -lin ouzo_N = variants {}; +lin ouzo_N = mkN065 "узо"; lin oval_A = mkA079 "овален" ; lin oval_N = dualN (mkN007 "овал") (mkA079 "овален"); lin ovarian_A = variants {}; @@ -38900,7 +38906,7 @@ lin panoramic_A = mkA079 "панорамен" ; lin panpipe_N = variants {}; lin pansexual_N = variants {}; lin pansinusitis_N = variants {}; -lin pansy_N = variants {}; +lin pansy_N = mkN041 (variants {"теменужка"; "теменуга"}); lin pant_N = variants {}; lin pant_V = variants {}; lin pant_V2 = variants {}; @@ -39208,7 +39214,7 @@ lin parthenogenesis_N = variants {}; lin parthenote_N = variants {}; lin parthian_A = variants {}; lin parti_coloured_A = variants {}; -lin partial_A = mkA079 "частен" ; +lin partial_A = mkA079 "частичен"; lin partiality_N = mkN072 "предубеждение" ; ---- lin partialness_N = variants {}; lin partible_A = variants {}; @@ -39623,9 +39629,9 @@ lin pederasty_N = mkN047 "педерастия" ; ---- lin pedestal_N = variants {}; lin pedestrian_A = variants {}; lin pedestrian_N = variants {}; -lin pediatric_A = variants {}; -lin pediatrician_N = variants {}; -lin pediatrics_N = variants {}; +lin pediatric_A = mkA079 "педиатричен"; +lin pediatrician_N = dualN (mkN009 "педиатър") (mkA078 "педиатърски"); +lin pediatrics_N = mkN047 "педиатрия"; lin pedicab_N = variants {}; lin pedicel_N = variants {}; lin pediculicide_N = variants {}; @@ -39930,10 +39936,11 @@ lin perform_V = dualV (mkV187 "представям") (mkV173 "представ lin perform_V2 = variants {}; lin performance_N = mkN072 "изпълнение" ; lin performer_N = variants {}; -lin perfume_N = variants {}; -lin perfume_V2 = variants {}; -lin perfumer_N = variants {}; -lin perfumery_N = variants {}; +lin perfume_N = mkN007 "парфюм"; +lin perfume_V2 = dirV2 (stateV (mkV186 "парфюмирам")); +lin perfumerMasc_N = mkN007 "парфюмерист"; +lin perfumerFem_N = mkN041 "парфюмеристка"; +lin perfumery_N = mkN047 "парфюмерия"; lin perfunctory_A = variants {}; lin perfusion_N = variants {}; lin pergola_N = variants {}; @@ -40580,7 +40587,7 @@ lin picket_V = variants {}; lin picket_V2 = variants {}; lin picking_N = variants {}; lin pickings_N = variants {}; -lin pickle_N = variants {}; +lin pickle_N = mkN047 "туршия"; lin pickle_V2 = variants {}; lin pickpocket_N = variants {}; lin pickup_N = variants {}; @@ -42152,9 +42159,9 @@ lin precession_N = variants {}; lin prechlorination_N = variants {}; lin precinct_N = variants {}; lin preciosity_N = variants {}; -lin precious_A = mkA079 "ценен"; +lin precious_A = mkA079 (variants {"скъпоценен"; "ценен"}); lin precious_Adv = variants {}; -lin preciousness_N = variants {}; +lin preciousness_N = mkN049 (variants {"скъпоценност"; "ценност"}); lin precipice_N = variants {}; lin precipitant_N = variants {}; lin precipitate_A = variants {}; @@ -42480,7 +42487,7 @@ lin pretty_A = mkA076 "красив"; lin pretty_AdA = mkAdA "съвсем"; lin pretty_N = variants {}; lin pretty_pretty_A = variants {}; -lin pretzel_N = variants {}; +lin pretzel_N = mkN041 "соленка"; lin prevail_V = dualV (mkV186 "побеждавам") (mkV174 "победя"); lin prevail_V2 = variants {}; lin prevalence_N = mkN071 "преобладаване" ; @@ -44247,7 +44254,7 @@ lin rainmaking_N = variants {}; lin rainproof_A = variants {}; lin rainstorm_N = variants {}; lin rainwater_N = variants {}; -lin rainy_A = variants {}; +lin rainy_A = mkA079 "дъждовен"; lin raisable_A = variants {}; lin raise_N = mkN072 "увеличение"; lin raise_V2 = dirV2 (dualV (mkV186 "повишавам") (mkV176 "повиша")); @@ -44393,7 +44400,7 @@ lin rascal_N = variants {}; lin rascality_N = variants {}; lin rascally_A = variants {}; lin rase_V2 = variants {}; -lin rash_A = variants {}; +lin rash_A = mkA076 "обринат"; lin rash_N = mkN007 "обрив"; lin rasher_N = variants {}; lin rashness_N = mkN054 "безразсъдство"; @@ -53746,7 +53753,7 @@ lin surfriding_N = variants {}; lin surge_N = mkN041 "вълна" ; lin surge_V = variants {}; lin surge_V2 = variants {}; -lin surgeon_N = variants {}; +lin surgeon_N = mkN015 "хирург"; lin surgeonfish_N = variants {}; lin surgery_N = variants {}; lin surgical_A = variants {}; @@ -54779,7 +54786,7 @@ lin teddy_boy_N = variants {}; lin tedious_A = variants {}; lin tediousness_N = variants {}; lin tedium_N = variants {}; -lin tee_N = dualN (mkN028 "чай") (mkA076 "чаен"); +lin tee_N = variants {}; lin tee_V = variants {}; lin tee_V2 = variants {}; lin tee_shirt_N = variants {}; @@ -55812,7 +55819,7 @@ lin timothy_N = variants {}; lin timothy_PN = variants {}; lin timpanist_N = variants {}; lin timucu_N = variants {}; -lin tin_N = variants {}; +lin tin_N = dualN (mkN047 "тенекия") (mkA076 "тенекиен"); lin tin_V2 = variants {}; lin tin_opener_N = variants {}; lin tin_pan_alley_N = variants {}; @@ -56005,7 +56012,7 @@ lin toil_V = variants {}; lin toil_V2V = variants {}; lin toil_VV = variants {}; lin toiler_N = variants {}; -lin toilet_N = mkN047 "баня" ; ---- +lin toilet_N = dualN (variants {mkN007 "тоалет"; mkN041 "тоалетна"}) (mkA079 "тоалетен"); lin toilet_paper_N = variants {}; lin toilet_powder_N = variants {}; lin toilet_roll_N = variants {}; @@ -56091,7 +56098,7 @@ lin tongueflower_N = variants {}; lin tongueless_A = variants {}; lin tonguelike_A = variants {}; lin tonic_A = variants {}; -lin tonic_N = variants {}; +lin tonic_N = mkN014 "тоник"; lin tonic_sol_fa_N = variants {}; lin tonicity_N = variants {}; lin tonight_Adv = mkAdv "тази вечер"; @@ -57838,7 +57845,7 @@ lin unconscientiousness_N = variants {}; lin unconscionable_A = variants {}; lin unconscious_A = variants {}; lin unconscious_N = variants {}; -lin unconsciousness_N = variants {}; +lin unconsciousness_N = mkN072 "безсъзнание"; lin unconsidered_A = variants {}; lin unconsolidated_A = variants {}; lin unconstipated_A = variants {}; @@ -59703,6 +59710,9 @@ lin venerate_V2 = variants {}; lin veneration_N = variants {}; lin venerator_N = variants {}; lin venereal_A = variants {}; +lin venereologistMasc_N = dualN (mkN015 "венеролог") (mkA078 "венероложки"); +lin venereologistFem_N = dualN (mkN041 "венерожка") (mkA078 "венероложки"); +lin venereology_N = dualN (mkN047 "венерология") (mkA078 "венероложки"); lin venesection_N = variants {}; lin venetian_A = variants {}; lin venezia_PN = variants {}; @@ -60014,7 +60024,7 @@ lin vinegariness_N = variants {}; lin vinegarroon_N = variants {}; lin vinegary_A = variants {}; lin vinery_N = variants {}; -lin vineyard_N = mkN065 "лозе" ; ---- +lin vineyard_N = mkN065 "лозе"; lin vinifera_N = variants {}; lin vinification_N = variants {}; lin vino_N = variants {}; @@ -61430,7 +61440,7 @@ lin windswept_A = variants {}; lin windward_A = variants {}; lin windward_Adv = variants {}; lin windward_N = variants {}; -lin windy_A = variants {}; +lin windy_A = mkA076 "ветровит"; lin wine_N = mkN054 "вино"; lin wine_V2 = variants {}; lin wineberry_N = variants {}; diff --git a/lib/src/english/DictEng.gf b/lib/src/english/DictEng.gf index 17b84f4e9..070291b13 100644 --- a/lib/src/english/DictEng.gf +++ b/lib/src/english/DictEng.gf @@ -8755,7 +8755,8 @@ lin cardiographic_A = mkA "cardiographic" ; lin cardiography_N = mkN "cardiography" ; lin cardioid_N = mkN "cardioid" ; lin cardiologic_A = mkA "cardiologic" ; -lin cardiologist_N = mkN "cardiologist" ; +lin cardiologistMasc_N = mkN masculine (mkN "cardiologist"); +lin cardiologistFem_N = mkN feminine (mkN "cardiologist"); lin cardiology_N = mkN "cardiology" ; lin cardiomegaly_N = mkN "cardiomegaly" ; lin cardiomyopathy_N = mkN "cardiomyopathy" ; @@ -15126,7 +15127,8 @@ lin dermatitis_N = mkN "dermatitis" ; lin dermatoglyphic_N = mkN "dermatoglyphic" ; lin dermatoglyphics_N = mkN "dermatoglyphics" ; lin dermatologic_A = mkA "dermatologic" ; -lin dermatologist_N = mkN "dermatologist" "dermatologists"; +lin dermatologistMasc_N = mkN masculine (mkN "dermatologist" "dermatologists"); +lin dermatologistFem_N = mkN feminine (mkN "dermatologist" "dermatologists"); lin dermatology_N = mkN "dermatology" ; lin dermatome_N = mkN "dermatome" ; lin dermatomycosis_N = mkN "dermatomycosis" ; @@ -22479,7 +22481,8 @@ lin gastritis_N = mkN "gastritis" ; lin gastrocnemius_N = mkN "gastrocnemius" ; lin gastroduodenal_A = mkA "gastroduodenal" ; lin gastroenteritis_N = mkN "gastroenteritis" ; -lin gastroenterologist_N = mkN "gastroenterologist" ; +lin gastroenterologistMasc_N = mkN masculine (mkN "gastroenterologist"); +lin gastroenterologistFem_N = mkN feminine (mkN "gastroenterologist"); lin gastroenterology_N = mkN "gastroenterology" ; lin gastroenterostomy_N = mkN "gastroenterostomy" ; lin gastroesophageal_A = mkA "gastroesophageal" ; @@ -24132,7 +24135,8 @@ lin gynaecology_N = mkN "gynaecology" ; lin gynandromorphic_A = mkA "gynandromorphic" ; lin gynecocracy_N = mkN "gynecocracy" ; lin gynecological_A = compoundA (mkA "gynecological"); -lin gynecologist_N = mkN "gynecologist" "gynecologists"; +lin gynecologistMasc_N = mkN masculine (mkN "gynecologist" "gynecologists"); +lin gynecologistFem_N = mkN feminine (mkN "gynecologist" "gynecologists"); lin gynecology_N = mkN "gynecology" ; lin gynecomastia_N = mkN "gynecomastia" ; lin gyneolatry_N = mkN "gyneolatry" ; @@ -36072,7 +36076,8 @@ lin neurolemma_N = mkN "neurolemma" ; lin neurolinguist_N = mkN "neurolinguist" ; lin neurolinguistics_N = mkN "neurolinguistics" ; lin neurological_A = mkA "neurological" ; -lin neurologist_N = mkN "neurologist" "neurologists"; +lin neurologistMasc_N = mkN masculine (mkN "neurologist" "neurologists"); +lin neurologistFem_N = mkN feminine (mkN "neurologist" "neurologists"); lin neurology_N = mkN "neurology" ; lin neuroma_N = mkN "neuroma" ; lin neuromatous_A = mkA "neuromatous" ; @@ -36971,7 +36976,8 @@ lin numerator_N = mkN "numerator" "numerators"; lin numeric_A = compoundA (mkA "numeric"); lin numerical_A = compoundA (mkA "numerical"); lin numerological_A = mkA "numerological" ; -lin numerologist_N = mkN "numerologist" ; +lin numerologistMasc_N = mkN masculine (mkN "numerologist"); +lin numerologistFem_N = mkN feminine (mkN "numerologist"); lin numerology_N = mkN "numerology" ; lin numerous_A = compoundA (mkA "numerous"); lin numerousness_N = mkN "numerousness" ; @@ -37909,6 +37915,8 @@ lin ornithomimid_N = mkN "ornithomimid" ; lin ornithopod_N = mkN "ornithopod" ; lin orogeny_N = mkN "orogeny" ; lin oroide_N = mkN "oroide" ; +lin orologistMasc_N = mkN masculine (mkN "orologist"); +lin orologistFem_N = mkN feminine (mkN "orologist"); lin orology_N = mkN "orology" ; lin oropharyngeal_A = mkA "oropharyngeal" ; lin oropharynx_N = mkN "oropharynx" ; @@ -39632,7 +39640,7 @@ lin pedestal_N = mkN "pedestal" "pedestals"; lin pedestrian_A = compoundA (mkA "pedestrian"); lin pedestrian_N = mkN "pedestrian" "pedestrians"; lin pediatric_A = mkA "pediatric" ; -lin pediatrician_N = mkN "pediatrician" "pediatricians"; +lin pediatrician_N = mkN human (mkN "pediatrician" "pediatricians"); lin pediatrics_N = mkN "pediatrics" "pediatrics"; lin pedicab_N = mkN "pedicab" "pedicabs"; lin pedicel_N = mkN "pedicel" ; @@ -39940,7 +39948,8 @@ lin performance_N = mkN "performance" "performances"; lin performer_N = mkN "performer" "performers"; lin perfume_N = mkN "perfume" "perfumes"; lin perfume_V2 = mkV2 (mkV "perfume" "perfumes" "perfumed" "perfumed" "perfuming"); -lin perfumer_N = mkN "perfumer" "perfumers"; +lin perfumerMasc_N = mkN masculine (mkN "perfumer" "perfumers"); +lin perfumerFem_N = mkN feminine (mkN "perfumer" "perfumers"); lin perfumery_N = mkN "perfumery" ; lin perfunctory_A = compoundA (mkA "perfunctory"); lin perfusion_N = mkN "perfusion" ; @@ -59721,6 +59730,9 @@ lin venerate_V2 = mkV2 (mkV "venerate" "venerates" "venerated" "venerated" "vene lin veneration_N = mkN "veneration" "venerations"; lin venerator_N = mkN "venerator" ; lin venereal_A = compoundA (mkA "venereal"); +lin venereologistMasc_N = mkN masculine (mkN "venereologist"); +lin venereologistFem_N = mkN feminine (mkN "venereologist"); +lin venereology_N = mkN "venereology"; lin venesection_N = mkN "venesection" ; lin venetian_A = compoundA (mkA "venetian"); lin venezia_PN = mkPN "Venezia"; diff --git a/lib/src/english/DictEngAbs.gf b/lib/src/english/DictEngAbs.gf index eec68ac1d..cd67dd43f 100644 --- a/lib/src/english/DictEngAbs.gf +++ b/lib/src/english/DictEngAbs.gf @@ -8736,7 +8736,8 @@ fun cardiographic_A : A; fun cardiography_N : N; fun cardioid_N : N; fun cardiologic_A : A; -fun cardiologist_N : N; +fun cardiologistMasc_N : N; +fun cardiologistFem_N : N; fun cardiology_N : N; fun cardiomegaly_N : N; fun cardiomyopathy_N : N; @@ -15107,7 +15108,8 @@ fun dermatitis_N : N; fun dermatoglyphic_N : N; fun dermatoglyphics_N : N; fun dermatologic_A : A; -fun dermatologist_N : N; +fun dermatologistMasc_N : N; +fun dermatologistFem_N : N; fun dermatology_N : N; fun dermatome_N : N; fun dermatomycosis_N : N; @@ -22453,7 +22455,8 @@ fun gastritis_N : N; fun gastrocnemius_N : N; fun gastroduodenal_A : A; fun gastroenteritis_N : N; -fun gastroenterologist_N : N; +fun gastroenterologistMasc_N : N; +fun gastroenterologistFem_N : N; fun gastroenterology_N : N; fun gastroenterostomy_N : N; fun gastroesophageal_A : A; @@ -24106,7 +24109,8 @@ fun gynaecology_N : N; fun gynandromorphic_A : A; fun gynecocracy_N : N; fun gynecological_A : A; -fun gynecologist_N : N; +fun gynecologistMasc_N : N; +fun gynecologistFem_N : N; fun gynecology_N : N; fun gynecomastia_N : N; fun gyneolatry_N : N; @@ -35997,7 +36001,8 @@ fun neurolemma_N : N; fun neurolinguist_N : N; fun neurolinguistics_N : N; fun neurological_A : A; -fun neurologist_N : N; +fun neurologistMasc_N : N; +fun neurologistFem_N : N; fun neurology_N : N; fun neuroma_N : N; fun neuromatous_A : A; @@ -36895,7 +36900,8 @@ fun numerator_N : N; fun numeric_A : A; fun numerical_A : A; fun numerological_A : A; -fun numerologist_N : N; +fun numerologistMasc_N : N; +fun numerologistFem_N : N; fun numerology_N : N; fun numerous_A : A; fun numerousness_N : N; @@ -37833,6 +37839,8 @@ fun ornithomimid_N : N; fun ornithopod_N : N; fun orogeny_N : N; fun oroide_N : N; +fun orologistMasc_N : N; +fun orologistFem_N : N; fun orology_N : N; fun oropharyngeal_A : A; fun oropharynx_N : N; @@ -39864,7 +39872,8 @@ fun performance_N : N; fun performer_N : N; fun perfume_N : N; fun perfume_V2 : V2; -fun perfumer_N : N; +fun perfumerMasc_N : N; +fun perfumerFem_N : N; fun perfumery_N : N; fun perfunctory_A : A; fun perfusion_N : N; @@ -59624,6 +59633,9 @@ fun venerate_V2 : V2; fun veneration_N : N; fun venerator_N : N; fun venereal_A : A; +fun venereologistMasc_N : N; +fun venereologistFem_N : N; +fun venereology_N : N; fun venesection_N : N; fun venetian_A : A; fun venezia_PN : PN; diff --git a/lib/src/finnish/DictEngFin.gf b/lib/src/finnish/DictEngFin.gf index 7c7c05589..e65da0301 100644 --- a/lib/src/finnish/DictEngFin.gf +++ b/lib/src/finnish/DictEngFin.gf @@ -29913,7 +29913,8 @@ neurolemma_N = mkWN (k7A "tuppi") "hermosyyn" ; --UNCHK neurolinguist_N = mkWN (compoundN "neuro" (k5 "lingvisti")) ; --UNCHK neurolinguistics_N = mkWN (compoundN "neuro" (k9A "lingvistiikka")) ; --UNCHK neurological_A = mkWA (k38 "neurologinen") ; --UNCHK -neurologist_N = mkWN (k5 "neurologi") ; --UNCHK +neurologistMasc_N = mkWN (k5 "neurologi") ; --UNCHK +neurologistFem_N = mkWN (k5 "neurologi") ; --UNCHK neurology_N = mkWN (k12 "neurologia") "kliininen" ; --UNCHK neuroma_N = mkWN (compoundN "hermo" (k33 "kasvain")) ; --UNCHK neuromotor_A = mkWA (compoundA "neuro" (k38 "motorinen")) ; --UNCHK @@ -30623,7 +30624,8 @@ numerator_N = mkWN (k10 "osoittaja") ; --UNCHK numeric_A = mkWA (k38 "numeerinen") ; --UNCHK numerical_A = mkWA (k38 "matemaattinen") ; --UNCHK numerological_A = mkWA (compoundA "numero" (k38 "loginen")) ; --UNCHK -numerologist_N = mkWN "numerologi" ; --UNCHK +numerologistMasc_N = mkWN "numerologi" ; --UNCHK +numerologistFem_N = mkWN "numerologi" ; --UNCHK numerology_N = mkWN (k12 "numerologia") ; --UNCHK numerousness_N = mkWN (k40 "paljous") ; --UNCHK numinous_A = mkWA "numeeninen" ; --UNCHK diff --git a/lib/src/french/DictEngFre.gf b/lib/src/french/DictEngFre.gf index a556d31f7..9b7d5ebb9 100644 --- a/lib/src/french/DictEngFre.gf +++ b/lib/src/french/DictEngFre.gf @@ -3128,7 +3128,8 @@ cardinal_A = mkA "cardinal"; cardinal_N = mkN "cardinal" masculine | mkN "cardinal"; cardinality_N = mkN "cardinalité" feminine; cardioid_N = mkN "cardioïde" feminine; -cardiologist_N = mkN "cardiologue"; +cardiologistMasc_N = mkN "cardiologue"; +cardiologistFem_N = mkN "cardiologue"; cardiology_N = mkN "cardiologie" feminine; cardiopulmonary_A = mkA "cardiopulmonaire"; cardiovascular_A = mkA "cardiovasculaire"; @@ -5276,7 +5277,8 @@ deride_V2 = mkV2 (mkV "bafouer"); derision_N = mkN "dérision"; derivative_N = mkN "dérivée" feminine; derive_V2 = mkV2 (mkV "dériver") | mkV2 (mkV I.déduire_V2); -dermatologist_N = mkN "dermatologue"; +dermatologistMasc_N = mkN "dermatologue"; +dermatologistFem_N = mkN "dermatologue"; dermatology_N = mkN "dermatologie" feminine; dermis_N = mkN "derme" masculine; derogatory_A = mkA "désobligeant"; @@ -8296,7 +8298,8 @@ guzzle_V2 = mkV2 (mkV "engloutir"); gymnasium_N = mkN "gymnase" masculine | mkN "lycée" masculine; gymnast_N = mkN "gymnaste"; gymnastics_N = mkN "gymnastique" feminine; -gynaecologist_N = mkN "gynécologue"; +gynaecologistMasc_N = mkN "gynécologue"; +gynaecologistFem_N = mkN "gynécologue"; gynecological_A = mkA "gynécologique"; gynecology_N = mkN "gynécologie" feminine; gynecomastia_N = mkN "gynécomastie" feminine; @@ -11897,7 +11900,8 @@ nettle_V2 = mkV2 (mkV "piquer"); network_N = mkN "réseau" masculine | mkN "tissus" masculine; neuralgic_A = mkA "névralgique"; neurological_A = mkA "neurologique"; -neurologist_N = mkN "neurologue"; +neurologistMasc_N = mkN "neurologue"; +neurologistFem_N = mkN "neurologue"; neurology_N = mkN "neurologie" feminine; neuromuscular_A = mkA "neuromusculaire"; neuroscience_N = mkN "neuroscience"; @@ -12882,7 +12886,8 @@ pederasty_N = mkN "pédérastie" feminine; pedestal_N = mkN "piédestal" masculine; pedestrian_A = mkA "banal" | mkA "piéton"; pedestrian_N = mkN "piéton" masculine; -pediatrician_N = mkN "pédiatre"; +pediatricianMasc_N = mkN "pédiatre"; +pediatricianFem_N = mkN "pédiatre"; pediatrics_N = mkN "pédiatrie" feminine; pedicab_N = mkN "velotaxi" masculine; pedicel_N = mkN "pédicelle"; @@ -12978,7 +12983,8 @@ performance_N = mkN "performance" feminine | mkN "représentation" feminine | mk performer_N = mkN "artiste"; perfume_N = mkN "parfum" masculine; perfume_V2 = mkV2 (mkV "parfumer"); -perfumer_N = mkN "parfumeur" masculine; +perfumerMasc_N = mkN "parfumeur" masculine; +perfumerFem_N = mkN "parfumeuse" feminine; perfumery_N = mkN "parfumerie" feminine; perfunctory_A = mkA "sommaire"; pergola_N = mkN "pergola" feminine; diff --git a/lib/src/german/DictEngGer.gf b/lib/src/german/DictEngGer.gf index fdeaff9b3..75297759c 100644 --- a/lib/src/german/DictEngGer.gf +++ b/lib/src/german/DictEngGer.gf @@ -9752,7 +9752,8 @@ lin derivative_N = reg2N "Derivat" "Derivate" neuter; lin derive_V = irregV "erlangen" "erlangt" "erlangte" "erlangte" "erlangt"; lin derive_V2 = dirV2 (irregV "erlangen" "erlangt" "erlangte" "erlangte" "erlangt"); lin dermatitis_N = reg2N "Dermatitis" "Dermatitiden" feminine; -lin dermatologist_N = reg2N "Dermatologe" "Dermatologen" masculine; +lin dermatologistMasc_N = reg2N "Dermatologe" "Dermatologen" masculine; +lin dermatologistFem_N = reg2N "Dermatologin" "Dermatologinnen" feminine; lin dermatology_N = variants {}; lin derogate_V = variants {}; lin derogation_N = variants {}; @@ -16209,7 +16210,8 @@ lin gynaecological_A = variants {}; lin gynaecologist_N = reg2N "Frauenarzt" "Frauenärzte" masculine; lin gynaecology_N = variants {}; lin gynecological_A = regA "gynäkologisch"; -lin gynecologist_N = variants {}; +lin gynecologistMasc_N = variants {}; +lin gynecologistFem_N = variants {}; lin gyp_N = variants {}; lin gyp_V2 = variants {}; lin gypsum_N = reg2N "Gips" "Gipse" masculine; @@ -24523,7 +24525,8 @@ lin neurasthenia_N = variants {}; lin neurasthenic_A = variants {}; lin neurasthenic_N = variants {}; lin neuritis_N = variants {}; -lin neurologist_N = variants {}; +lin neurologistMasc_N = variants {}; +lin neurologistFem_N = variants {}; lin neurology_N = variants {}; lin neurosis_N = reg2N "Neurose" "Neurosen" feminine; lin neurotic_A = mk3A "neurotisch" "neurotischer" "neurotischste"; @@ -26862,7 +26865,8 @@ lin pederasty_N = variants {}; lin pedestal_N = reg2N "Piedestal" "Piedestale" neuter; lin pedestrian_A = variants {}; lin pedestrian_N = variants {}; -lin pediatrician_N = variants {}; +lin pediatricianMasc_N = variants {}; +lin pediatricianFem_N = variants {}; lin pediatrics_N = variants {}; lin pedicab_N = variants {}; lin pedicure_N = variants {}; @@ -27074,7 +27078,8 @@ lin performance_N = mkN "Aufführung"; lin performer_N = variants {}; lin perfume_N = reg2N "Duft" "Düfte" masculine; lin perfume_V2 = variants {}; -lin perfumer_N = reg2N "Parfümeur" "Parfümeure" masculine; +lin perfumerMasc_N = reg2N "Parfümeur" "Parfümeure" masculine; +lin perfumerFem_N = regN "Parfümeurin"; lin perfunctory_A = variants {}; lin pergola_N = variants {}; lin perhaps_Adv = variants {}; diff --git a/lib/src/swedish/DictEngSwe.gf b/lib/src/swedish/DictEngSwe.gf index d7999ccea..f49399b33 100644 --- a/lib/src/swedish/DictEngSwe.gf +++ b/lib/src/swedish/DictEngSwe.gf @@ -1,4 +1,4 @@ ---# -path=.:src/swedish:src/english +--# -path=.:src/swedish:../english concrete DictEngSwe of DictEngAbs = CatSwe ** open ParadigmsSwe, (L = LexiconSwe), (M = MakeStructuralSwe), (S = SyntaxSwe) in { @@ -4049,7 +4049,7 @@ lin atypicality_N = variants {}; lin au_fait_A = variants {}; lin au_fond_Adv = variants {}; lin au_pair_N = variants {}; -lin aubergine_N = variants {}; +lin aubergine_N = mkN "aubergine" "auberginer"; lin aubrietia_N = variants {}; lin auburn_A = variants {}; lin auckland_PN = variants {}; @@ -8462,7 +8462,7 @@ lin caitiff_A = variants {}; lin caitiff_N = variants {}; lin cajole_V2 = variants {}; lin cajolery_N = variants {}; -lin cake_N = mkN "skorpa"; -- comment=11 +lin cake_N = mkN "tårta"; lin cake_V = mkV "bita" "bet" "bitit"; -- comment=2 lin cake_V2 = variants {}; lin cakewalk_N = variants {}; @@ -9022,7 +9022,8 @@ lin cardiographic_A = variants {}; lin cardiography_N = variants {}; lin cardioid_N = variants {}; lin cardiologic_A = variants {}; -lin cardiologist_N = mkN "kardiolog" "kardiologer"; +lin cardiologistMasc_N = mkN "kardiolog" "kardiologer"; +lin cardiologistFem_N = mkN "kardiolog" "kardiologer"; lin cardiology_N = mkN "kardiologi"; lin cardiomegaly_N = variants {}; lin cardiomyopathy_N = variants {}; @@ -10186,7 +10187,7 @@ lin cherimoya_N = variants {}; lin cherish_V2 = variants {}; lin cheroot_N = variants {}; lin cherry_A = mkA "körsbärsröd"; -lin cherry_N = mkN "körsbärsträd" neutrum; -- comment=3 +lin cherry_N = mkN "körsbär" neutrum; lin cherrystone_N = variants {}; lin chert_N = variants {}; lin cherty_A = variants {}; @@ -10219,7 +10220,7 @@ lin chew_over_V2 = dirV2 (partV (mkV "tuggar")"om"); lin chew_up_V2 = dirV2 (partV (mkV "tuggar")"om"); lin chewable_A = variants {}; lin chewer_N = variants {}; -lin chewing_gum_N = variants {}; +lin chewing_gum_N = mkN "tuggummi" "tuggummit" "tuggummin" "tuggummina"; lin chewink_N = variants {}; lin chewy_A = mkA "seg"; -- comment=2 lin chez_Prep = variants {}; @@ -12654,7 +12655,7 @@ lin contiguous_A = mkA "intilliggande"; -- comment=2 lin continence_N = mkN "avhållsamhet" | mkN "återhållsamhet" | mkN "måttlighet"; -- status=guess status=guess status=guess lin continent_A = mkA "avhållsam" "avhållsamt" "avhållsamma" "avhållsamma" "avhållsammare" "avhållsammast" "avhållsammaste"; -- comment=2 lin continent_N = mkN "kontinent" "kontinenter"; -- comment=3 -lin continental_A = variants {}; +lin continental_A = mkA "kontinental"; lin contingency_N = mkN "eventualitet" "eventualiteter"; -- comment=2 lin contingent_A = mkA "avhängig"; -- status=guess lin contingent_N = mkN "andel" "andelen" "andelar" "andelarna"; -- status=guess @@ -14640,6 +14641,7 @@ lin damask_A = variants {}; lin damask_N = mkN "damast" "damaster"; lin dame_N = variants {}; lin dammar_N = variants {}; +lin dammit_Interj = mkInterj "fan"; lin damn_A = compoundA (regA "förbannad"); -- comment=3 lin damn_Interj = mkInterj "fan" ; lin damn_N = mkN "jäkel"; -- comment=5 @@ -15670,7 +15672,8 @@ lin dermatitis_N = mkN "dermatit" "dermatiter"; lin dermatoglyphic_N = variants {}; lin dermatoglyphics_N = variants {}; lin dermatologic_A = variants {}; -lin dermatologist_N = mkN "dermatolog" "dermatologer"; +lin dermatologistMasc_N = mkN "dermatolog" "dermatologer"; +lin dermatologistFem_N = mkN "dermatolog" "dermatologer"; lin dermatology_N = mkN "dermatologi"; lin dermatome_N = variants {}; lin dermatomycosis_N = variants {}; @@ -20587,7 +20590,7 @@ lin familiarity_N = mkN "närgångenhet" "närgångenheter"; -- comment=5 lin familiarization_N = mkN "införande"; lin familiarize_V2 = dirV2 (partV (mkV "sprida" "spred" "spritt")"ut"); lin familiarizing_A = variants {}; -lin family_N = mkN "barn" neutrum; -- comment=9 +lin family_N = mkN "familj" "familjer"; lin famine_N = mkN "svält"; lin famish_V = variants {}; lin famish_V2 = variants {}; @@ -21179,7 +21182,7 @@ lin fiery_A = mkA "hetsig"; -- comment=8 lin fiesta_N = variants {}; lin fife_N = variants {}; lin fife_PN = variants {}; -lin fig_N = mkN "fikonträd" neutrum; -- comment=2 +lin fig_N = mkN "fikon" neutrum; lin fig_leaf_N = variants {}; lin fight_N = mkN "kamp"; -- comment=11 lin fight_V = mkV "strida" "stridde" "stritt"; -- comment=8 @@ -23319,7 +23322,8 @@ lin gastritis_N = mkN "kronisk gastrit"; -- status=guess lin gastrocnemius_N = variants {}; lin gastroduodenal_A = variants {}; lin gastroenteritis_N = variants {}; -lin gastroenterologist_N = variants {}; +lin gastroenterologistMasc_N = variants {}; +lin gastroenterologistFem_N = variants {}; lin gastroenterology_N = variants {}; lin gastroenterostomy_N = variants {}; lin gastroesophageal_A = variants {}; @@ -24319,6 +24323,7 @@ lin golfing_N = variants {}; lin goliard_N = variants {}; lin goliath_N = variants {}; lin golliwog_N = variants {}; +lin golly_Interj = variants {}; lin golosh_N = variants {}; lin gomphothere_N = variants {}; lin gonad_N = mkN "könskörtel" | (mkN "gonad" "gonader"); -- status=guess status=guess @@ -25179,7 +25184,8 @@ lin gynaecology_N = variants {}; lin gynandromorphic_A = variants {}; lin gynecocracy_N = variants {}; lin gynecological_A = mkA "gynekologisk"; -lin gynecologist_N = mkN "gynekolog" "gynekologer"; +lin gynecologistMasc_N = mkN "gynekolog" "gynekologer"; +lin gynecologistFem_N = mkN "gynekolog" "gynekologer"; lin gynecology_N = mkN "gynekologi"; lin gynecomastia_N = variants {}; lin gyneolatry_N = variants {}; @@ -30100,7 +30106,7 @@ lin japaneseMasc_N = mkN "japanska"; -- comment=3 lin japanese_A = mkA "japansk"; lin jape_N = variants {}; lin japonica_N = variants {}; -lin jar_N = mkN "stöt"; -- comment=20 +lin jar_N = mkN "burk"; lin jar_V = mkV "tvistar"; -- comment=17 lin jar_V2 = dirV2 (partV (mkV "skakar")"om"); -- comment=2 lin jarful_N = variants {}; @@ -32011,7 +32017,7 @@ lin lekvar_N = variants {}; lin lemma_N = (mkN "lemma" "lemmat" "lemman" "lemmana") | (mkN "uppslagsord" neutrum); -- status=guess status=guess lin lemming_N = mkN "lämmel" "lämmeln" "lämlar" "lämlarna"; lin lemniscus_N = variants {}; -lin lemon_N = mkN "citronträd" neutrum; -- comment=9 +lin lemon_N = mkN "citron" "citroner"; lin lemonade_N = mkN "läskedryck" "läskedrycker"; -- comment=2 lin lemongrass_N = mkN "citrongräs"; -- status=guess lin lemonwood_N = variants {}; @@ -33732,7 +33738,7 @@ lin majestic_A = mkA "majestätisk"; lin majestically_Adv = variants {}; lin majesty_N = mkN "majestät" neutrum; -- comment=2 lin majolica_N = variants {}; -lin major_A = mkA "gammal" "gammalt" "gamla" "äldre" "äldst"; -- comment=4 +lin major_A = mkA "stor" "större" "störst"; lin major_N = mkN "stor"; -- comment=4 lin major_V = variants {}; lin major_domo_N = variants {}; @@ -36284,7 +36290,7 @@ lin more_than_Predet = variants {}; lin morecambe_PN = variants {}; lin moreen_N = variants {}; lin morel_N = mkN "murkla"; -lin morello_N = variants {}; +lin morello_N = mkN "surkörsbär" neutrum; lin moreover_Adv = mkAdv "dessutom"; -- comment=2 lin mores_N = mkN "sedvänja"; lin moresque_A = variants {}; @@ -36992,6 +36998,7 @@ lin nacre_N = mkN "pärlemor"; -- status=guess lin nacreous_A = variants {}; lin nadir_N = variants {}; lin nadolol_N = variants {}; +lin nae_Interj = mkInterj "nej"; lin nafcillin_N = variants {}; lin naff_off_V = variants {}; lin nag_N = mkN "plåga"; -- comment=2 @@ -37489,7 +37496,7 @@ lin netting_N = variants {}; lin nettle_N = mkN "nässla"; -- comment=2 lin nettle_V2 = mkV2 (mkV "nässla") | mkV2 (mkV "brännä"); -- status=guess, src=wikt status=guess, src=wikt lin nettlerash_N = variants {}; -lin network_N = mkN "system" neutrum; -- comment=3 +lin network_N = mkN "nätverk" neutrum; lin networklike_A = variants {}; lin neural_A = variants {}; lin neuralgia_N = variants {}; @@ -37526,7 +37533,8 @@ lin neurolemma_N = variants {}; lin neurolinguist_N = variants {}; lin neurolinguistics_N = variants {}; lin neurological_A = mkA "neurologisk"; -lin neurologist_N = mkN "neurolog" "neurologer"; +lin neurologistMasc_N = mkN "neurolog" "neurologer"; +lin neurologistFem_N = mkN "neurolog" "neurologer"; lin neurology_N = variants {}; lin neuroma_N = variants {}; lin neuromatous_A = variants {}; @@ -38434,7 +38442,8 @@ lin numerator_N = mkN "täljare" utrum; -- comment=2 lin numeric_A = mkA "numerisk"; lin numerical_A = mkA "numerär"; -- comment=2 lin numerological_A = variants {}; -lin numerologist_N = variants {}; +lin numerologistMasc_N = variants {}; +lin numerologistFem_N = variants {}; lin numerology_N = variants {}; lin numerous_A = mkA "talrik"; lin numerousness_N = variants {}; @@ -39133,7 +39142,7 @@ lin operate_on_V2 = dirV2 (partV (mkV "arbetar")"av"); lin operatic_A = mkA "teatralisk"; lin operating_table_N = variants {}; lin operating_theatre_N = variants {}; -lin operation_N = mkN "funktion" "funktioner"; -- comment=22 +lin operation_N = mkN "operation" "operationer"; lin operational_A = mkA "funktionsduglig"; -- comment=2 lin operationalism_N = variants {}; lin operationalist_A = variants {}; @@ -39385,6 +39394,8 @@ lin ornithomimid_N = variants {}; lin ornithopod_N = variants {}; lin orogeny_N = variants {}; lin oroide_N = variants {}; +lin orologistMasc_N = variants {}; +lin orologistFem_N = variants {}; lin orology_N = variants {}; lin oropharyngeal_A = variants {}; lin oropharynx_N = variants {}; @@ -40727,7 +40738,7 @@ lin parthenogenesis_N = variants {}; lin parthenote_N = variants {}; lin parthian_A = variants {}; lin parti_coloured_A = variants {}; -lin partial_A = mkA "partisk"; -- comment=6 +lin partial_A = mkA "partisk"; lin partiality_N = variants {}; lin partialness_N = variants {}; lin partible_A = variants {}; @@ -41497,7 +41508,8 @@ lin performance_N = mkN "utförande"; -- comment=8 lin performer_N = mkN "uppträdande"; lin perfume_N = mkN "parfym" "parfymer"; -- comment=4 lin perfume_V2 = variants {}; -lin perfumer_N = variants {}; +lin perfumerMasc_N = variants {}; +lin perfumerFem_N = variants {}; lin perfumery_N = mkN "parfymeri" "parfymerit" "parfymerier" "parfymerierna"; lin perfunctory_A = mkA "rutinmässig"; -- comment=4 lin perfusion_N = variants {}; @@ -42549,7 +42561,7 @@ lin placard_V2 = variants {}; lin placate_V2 = mkV2 (mkV "blidkar"); -- status=guess, src=wikt lin placatingly_Adv = variants {}; lin placation_N = variants {}; -lin place_N = mkN "anställning"; -- comment=23 +lin place_N = mkN "plats" "platser"; lin place_V2 = mkV2 (mkV (mkV "placera") "sig"); -- status=guess, src=wikt lin place_bet_N = variants {}; lin place_name_N = variants {}; @@ -44303,7 +44315,7 @@ lin prisoner_N = mkN "fånge" utrum; -- comment=3 lin prisonlike_A = variants {}; lin pristine_A = variants {}; lin privacy_N = mkN "privatliv" neutrum; -- comment=4 -lin private_A = mkA "sluten" "slutet"; -- comment=3 +lin private_A = mkA "privat" "privat"; lin private_N = mkN "slut" neutrum; lin privateer_N = variants {}; lin privation_N = mkN "umbärande"; @@ -48451,7 +48463,7 @@ lin rosario_PN = variants {}; lin rosary_N = mkN "radband" neutrum; -- status=guess lin roscommon_PN = variants {}; lin rose_A = mkA "rosa"; -- comment=2 -lin rose_N = mkN "stril"; -- comment=7 +lin rose_N = mkN "ros" "rosor"; lin rose_PN = variants {}; lin rose_V = mkV "rosar"; -- comment=3 lin rose_V2 = variants {}; @@ -57033,7 +57045,7 @@ lin tayside_PN = variants {}; lin tb_N = variants {}; lin tbilisi_PN = variants {}; lin te_deum_N = variants {}; -lin tea_N = mkN "teblad" neutrum; -- comment=3 +lin tea_N = mkN "te" "tet" "teer" "teerna"; lin tea_bag_N = variants {}; lin tea_break_N = variants {}; lin tea_caddy_N = variants {}; @@ -57369,7 +57381,7 @@ lin tenpin_N = variants {}; lin tenpins_N = variants {}; lin tenrec_N = variants {}; lin tense_A = mkA "spännande"; -- comment=4 -lin tense_N = mkN "spännande"; -- comment=2 +lin tense_N = mkN "tempus" neutrum; lin tense_V = mkV "spänna" "spände" "spänt"; -- comment=2 lin tense_V2 = variants {}; lin tenseness_N = variants {}; @@ -62218,6 +62230,9 @@ lin venerate_V2 = variants {}; lin veneration_N = mkN "vördnad" "vördnader"; -- comment=2 lin venerator_N = variants {}; lin venereal_A = mkA "venerisk"; +lin venereologistMasc_N = mkN "venereologist"; +lin venereologistFem_N = mkN "venereologist"; +lin venereology_N = mkN "venereologi"; lin venesection_N = variants {}; lin venetian_A = variants {}; lin venezia_PN = variants {}; diff --git a/lib/src/swedish/ParadigmsSwe.gf b/lib/src/swedish/ParadigmsSwe.gf index 17c498249..368d1ad7a 100644 --- a/lib/src/swedish/ParadigmsSwe.gf +++ b/lib/src/swedish/ParadigmsSwe.gf @@ -357,12 +357,9 @@ oper mkN : (museum,museet,museer,museerna : Str) -> N = mk4N ; mkN : (museum,museet,museer,museerna : Str) -> Gender -> N = mk5N ; mkN : (regering, makt : N) -> N = \a,b -> lin N { - s = \\n,d,c => a.co + b.s ! n ! d ! c ; + s = \\n,d,c => b.s ! n ! d ! c ; g = b.g ; - co = case b.co of { - _ + "s" => a.co + b.co ; - co => a.co + co + "s" - } + co = "" } ; } ;