diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 6a0e8b05e..52ee8cf8d 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -789,8 +789,8 @@ lin adept_A = mkA079 "опитен" ; lin adept_N = mkN007b "познавач"; lin adeptness_N = variants {}; lin adequacy_N = mkN049 "адекватност"; -lin adequate_A = mkA079 "съответен"; -lin adequately_Adv = variants {}; +lin adequate_A = mkA079 "адекватен"; +lin adequately_Adv = mkAdv "адекватно"; lin adesite_N = variants {}; lin adhere_V = medialV (dualV (mkV186 "придържам") (mkV179 "придържа")) Acc; lin adherence_N = mkN071 "придържане"; @@ -1322,7 +1322,7 @@ lin agree_V = medialV (dualV (mkV186 "съгласявам") (mkV174 "съгла lin agree_VS = mkVS (medialV (dualV (mkV186 "съгласявам") (mkV174 "съглася")) Acc); lin agree_VV = mkVV (medialV (dualV (mkV186 "съгласявам") (mkV174 "съглася")) Acc); lin agree_on_V = variants {}; -lin agree_with_V2 = variants {}; +lin agree_with_V2 = prepV2 (medialV (dualV (mkV186 "съгласявам") (mkV174 "съглася")) Acc) with_Prep; lin agreeable_A = mkA079 "приятен"; lin agreeableness_N = mkN049 "приятност"; ---- lin agreed_A = mkA079 "договорен" ; @@ -1846,10 +1846,10 @@ lin alternate_A = variants {mkA079 "алтернативен"; mkA076 "кръс lin alternate_V = singleV (mkV186 "редувам"); lin alternate_V2 = dirV2 (singleV (mkV186 "редувам")); lin alternately_Adv = variants {}; -lin alternation_N = mkN071 "редуване" ; ---- +lin alternation_N = mkN071 "редуване"; lin alternative_A = mkA079 "алтернативен"; -lin alternative_N = mkN041 "алтернатива" ; -lin alternatively_Adv = variants {}; +lin alternative_N = mkN041 "алтернатива"; +lin alternatively_Adv = mkAdv "алтернативно"; lin alternator_N = mkN007 "алтернатор"; lin althea_N = mkN047 "алтея"; lin although_Subj = ss ["въпреки че"]; @@ -1984,7 +1984,7 @@ lin amen_Interj = ss "амин"; lin amenability_N = variants {mkN049 "отговорност"; mkN049 "сговорчивост"}; ---- lin amenable_A = mkA076 "отзивчив" ; ---- lin amend_V = variants {singleV (mkV186 "коригирам"); dualV (mkV186 "подобрявам") (mkV174 "подобря"); dualV (mkV187 "поправям") (mkV173 "поправя"); dualV (mkV187 "променям") (mkV174 "променя")}; ---- -lin amend_V2 = variants {}; +lin amend_V2 = dirV2 (actionV (mkV187 "изменям") (mkV174 "изменя")); lin amend_V2V = variants {}; lin amendable_A = mkA076 "поправим" ; ---- lin amendatory_A = variants {}; @@ -2065,7 +2065,7 @@ lin amoeba_N = mkN041 "амеба"; ---- lin amoebic_A = mkA079 "амебен" ; lin amok_Adv = variants {}; lin among_Prep = mkPrep "измежду" Acc; -lin amongst_Prep = variants {}; +lin amongst_Prep = mkPrep "между" Acc; lin amora_N = variants {}; lin amoral_A = mkA079 "аморален"; lin amoralism_N = mkN011 "аморализъм"; @@ -2587,7 +2587,7 @@ lin anorthitic_A = variants {}; lin anorthopia_N = variants {}; lin anosmia_N = mkN039 "аносмия"; lin anosmic_A = variants {}; -lin another_Det = variants {}; +lin another_Det = mkDeterminerSg "друг" "друга" "друго"; lin another_Quant = mkQuant "друг" "друга" "друго" "други"; lin anovulation_N = mkN039 "ановулация"; lin anoxemia_N = variants {}; @@ -3463,7 +3463,7 @@ lin aroma_N = dualN (variants {mkN007 "аромат"; mkN049 "ароматичн lin aromatherapy_N = mkN047 "ароматерапия"; lin aromatic_A = mkA079 "ароматен"; lin arose_V2 = dirV2 (dualV (mkV186 "възниквам") (mkV152 "възникна")); ---- -lin around_AdN = variants {}; +lin around_AdN = ss "около"; lin around_Adv = variants {}; lin around_Prep = variants {}; lin arousal_N = mkN041 "възбуда"; @@ -3694,7 +3694,7 @@ lin ask_about_V2 = variants {}; lin ask_after_V2 = variants {}; lin ask_around_V = variants {}; lin ask_around_V2 = variants {}; -lin ask_for_V2 = variants {}; +lin ask_for_V2 = dirV2 (stateV (mkV186 "искам")); lin ask_for_V3 = variants {}; lin ask_in_V2 = variants {}; lin ask_out_V2 = variants {}; @@ -5511,7 +5511,7 @@ lin befitting_A = mkA076 "подобаващ"; ---- lin befogged_A = variants {}; lin before_Adv = variants {}; lin before_Prep = mkPrep "преди" Acc; -lin before_Subj = variants {}; +lin before_Subj = ss "преди"; lin beforehand_A = mkA079 "предварителен" ; ---- lin beforehand_Adv = variants {}; lin befoul_V2 = dirV2 (dualV (mkV186 "замърсявам") (mkV174 "замърся")); ---- @@ -6849,11 +6849,11 @@ lin boil_N = mkN032 "цирей"; ---- lin boil_V = singleV (mkV177 "вря"); lin boil_V2 = dirV2 (singleV (mkV174 "варя")); lin boil_down_V2 = variants {}; -lin boil_down_to_V2 = variants {}; +lin boil_down_to_V2 = prepV2 (medialV (actionV (mkV186 "свеждам") (mkV145 "сведа")) Acc) (mkPrep "до" Acc); lin boil_over_V = dualV (mkV186 "накипявам") (mkV177 "накипя"); lin boil_up_V = variants {}; lin boil_up_V2 = variants {}; -lin boiler_N = mkN008 "котел" ; ---- +lin boiler_N = mkN008 "котел"; lin boilerplate_N = mkN005 "шаблон"; lin boilersuit_N = variants {}; lin boiling_Adv = variants {}; @@ -7148,7 +7148,7 @@ lin botcher_N = mkN014a "нескопосник"; ---- lin botchy_A = variants {}; lin botfly_N = variants {}; lin both7and_DConj = {s=[]; conj=0; distr=True; n = Pl}; -lin both_Adv = variants {}; +lin both_Adv = mkAdv "двамата"; lin both_Det = mkDeterminerPl "и двата"; lin bother_N = mkN047 "беля"; ---- lin bother_V = variants {singleV (mkV175 "безпокоя"); singleV (mkV177 "главоболя"); singleV (mkV176 "грижа"); dualV (mkV186 "досаждам") (mkV174 "досадя"); dualV (mkV186 "дотягам") (mkV152 "дотегна"); dualV (mkV186 "закачам") (mkV176 "закача"); dualV (mkV186 "затруднявам") (mkV174 "затрудня"); dualV (mkV186 "обезпокоявам") (mkV175 "обезпокоя"); dualV (mkV186 "отегчавам") (mkV176 "отегча"); dualV (mkV186 "смущавам") (mkV174 "смутя"); singleV (mkV176 "тревожа")}; ---- @@ -7827,7 +7827,7 @@ lin brown_V = variants {dualV (mkV186 "запичам") (mkV148 "запека"); lin brown_V2 = variants {}; lin brownie_N = mkN007 "скаут"; lin brownish_A = mkA076 "кафеникав" ; -lin brownstone_N = variants {}; +lin brownstone_N = compoundN (mkA076 "кафяв") (mkN017 "камък"); lin browntail_N = variants {}; lin browse_N = mkN071 "разлистване"; lin browse_V = dualV (mkV186 "разлиствам") (mkV173 "разлистя"); @@ -9841,7 +9841,7 @@ lin cerous_A = variants {}; lin cert_N = mkN007 "серт"; lin certain_1_A = mkA079 "сигурен"; lin certain_2_A = mkA076 "определен"; -lin certainly_Adv = variants {}; +lin certainly_Adv = mkAdv "със сигурност"; lin certainty_N = mkN049 "сигурност"; lin certifiable_A = mkA076 "невменяем"; ---- lin certificate_N = mkN007 "сертификат"; @@ -10011,7 +10011,7 @@ lin chant_N = mkN007 "напев"; lin chant_V = variants {dualV (mkV186 "напявам") (mkV164 "напея"); singleV (mkV164 "пея")}; ---- lin chant_V2 = variants {}; lin chanter_N = mkN001 "псалт"; -lin chanterelle_N = variants {}; +lin chanterelle_N = compoundN (mkA087 "пачи") (mkN022 "крак"); lin chantey_N = mkN050 "песен"; lin chantlike_A = variants {}; lin chantry_N = variants {}; @@ -11283,7 +11283,7 @@ lin clot_V = singleV (mkV186 "коагулирам") ; ---- lin clot_V2 = variants {}; lin cloth_N = variants {mkN041 "кърпа"; mkN001 "плат"; mkN054 "платно"; mkN054 "сукно"}; ---- lin clothe_V2 = dirV2 (variants {dualV (mkV186 "обвивам") (mkV163 "обвия") ; dualV (mkV186 "осигурявам") (mkV174 "осигуря")}); ---- -lin clothes_N = variants {}; +lin clothes_N = mkN041 "дреха"; lin clothes_basket_N = variants {}; lin clothes_hanger_N = variants {}; lin clothes_moth_N = mkN008 "молец" ; ---- @@ -12944,7 +12944,7 @@ lin conveyer_N = mkN007 "транспортер"; ---- lin conveyer_belt_N = variants {}; lin conveyor_N = mkN007 "транспортер"; ---- lin convict_N = variants {mkN014a "затворник"; mkN014a "каторжник"}; ---- -lin convict_V2 = variants {}; +lin convict_V2 = prepV2 (actionV (mkV186 "осъждам") (mkV173 "осъдя")) (mkPrep "по" Acc); lin conviction_N = mkN041 "присъда" ; ---- lin convince_V2 = dirV2 (dualV (mkV186 "убеждавам") (mkV174 "убедя")); lin convince_V2V = mkV2V (dualV (mkV186 "убеждавам") (mkV174 "убедя")) noPrep noPrep; @@ -13225,9 +13225,9 @@ lin correction_N = mkN071 "коригиране" ; lin correctional_A = variants {mkA079 "изправителен"; mkA079 "поправителен"}; ---- lin corrections_N = mkN047 "корекция" ; ---- lin correctitude_N = mkN049 "коректност"; -lin corrective_A = mkA079 "изправителен" ; ---- -lin corrective_N = mkN007 "коректив"; ---- -lin correctly_Adv = variants {}; +lin corrective_A = mkA079 "изправителен"; +lin corrective_N = mkN007 "коректив"; +lin correctly_Adv = mkAdv "коректно"; lin correctness_N = variants {mkN052a "вярност"; mkN049 "коректност"; mkN049 "правилност"; mkN041 "правота"; mkN049 "точност"}; ---- lin correlate_N = mkN007 "корелат"; ---- lin correlate_V = singleV (mkV186 "съгласувам") ; ---- @@ -14187,9 +14187,9 @@ lin crusty_A = variants {mkA076 "крив"; mkA076 "проклет"; mkA076 "с lin crutch_N = mkN041 "подставка" ; ---- lin crux_N = mkN041 "проблема"; ---- lin cruzeiro_N = mkN054 "крузейро"; -lin cry_N = mkN014 "крясък" ; ---- -lin cry_V = singleV (mkV155 "плача") ; ---- -lin cry_V2 = dirV2 (singleV (mkV164 "лея")); ---- +lin cry_N = mkN014 "крясък"; +lin cry_V = singleV (mkV155 "плача"); +lin cry_V2 = dirV2 (dualV (mkV186 "извиквам") (mkV186 "извикам")); lin cry_off_V2 = variants {}; lin cry_out_V = variants {}; lin crybaby_N = mkN040 "ревльо"; @@ -16718,7 +16718,7 @@ lin discursive_A = mkA076 "несвързан"; lin discursiveness_N = mkN049 "несвързаност"; lin discus_N = mkN007 "дискус"; lin discuss_V2 = dirV2 (dualV (mkV186 "обсъждам") (mkV173 "обсъдя")); -lin discuss_VS = variants {}; +lin discuss_VS = mkVS (dualV (mkV186 "обсъждам") (mkV173 "обсъдя")); lin discussant_N = substantiveN (mkA076 "дискутиращ") (AMasc Human); lin discussion_N = mkN047 "дискусия" ; lin disdain_N = mkN072 "презрение"; ---- @@ -18323,7 +18323,7 @@ lin ease_off_V2 = variants {}; lin ease_up_V = variants {}; lin easel_N = variants {mkN014 "станок"; mkN007 "статив"; mkN041 "стойка"}; ---- lin easement_N = mkN007 "сервитут"; ---- -lin easily_Adv = variants {}; +lin easily_Adv = mkAdv "лесно"; lin easiness_N = mkN049 "непринуденост"; ---- lin easing_N = variants {mkN072 "намаление"; mkN071 "намаляване"}; ---- lin easington_PN = mkPN "Изингтън" Masc; @@ -18658,7 +18658,7 @@ lin eisegesis_N = variants {}; lin eisteddfod_N = variants {}; lin either7or_DConj = {s=[]; conj=1; distr=True; n = Sg}; lin either_Adv = variants {}; -lin either_Det = variants {}; +lin either_Det = mkDeterminerSg "който и да е" "която и да е" "което и да е"; lin ejaculate_V2 = variants {}; lin ejaculation_N = mkN072 "междуметие" ; ---- lin ejaculator_N = variants {}; @@ -19327,7 +19327,7 @@ lin ensnare_V2 = variants {}; lin ensue_V = variants {dualV (mkV186 "произлизам") (mkV147 "произляза"); dualV (mkV186 "произтичам") (mkV148 "произтека"); dualV (mkV186 "произхождам") (mkV173 "произходя")}; ---- lin ensure_V = dualV (mkV186 "осигурявам") (mkV174 "осигуря"); ---- lin ensure_V2 = dirV2 (singleV (mkV186 "гарантирам")); ---- -lin ensure_VS = variants {}; +lin ensure_VS = mkVS (singleV (mkV186 "гарантирам")); lin entablature_N = mkN007 "антаблеман"; lin entail_N = mkN072 "предположение"; lin entail_V2 = variants {}; @@ -21424,8 +21424,8 @@ lin fife_PN = mkPN "Фифе" Masc; lin fig_N = mkN047 "смокиня"; lin fig_leaf_N = variants {}; lin fight_N = mkN041 "борба" ; -lin fight_V = variants {singleV (mkV163 "бия"); singleV (mkV173 "боря"); singleV (mkV173 "давя"); dualV (mkV186 "преборвам") (mkV173 "преборя"); singleV (mkV186 "ратувам"); dualV (mkV186 "сражавам") (mkV174 "сразя")}; ---- -lin fight_V2 = variants {}; +lin fight_V = variants {medialV (singleV (mkV173 "боря")) Acc; dualV (mkV186 "преборвам") (mkV173 "преборя"); dualV (mkV186 "сражавам") (mkV174 "сразя")}; ---- +lin fight_V2 = prepV2 (medialV (singleV (mkV173 "боря")) Acc) (mkPrep "срещу" Acc); lin fight_back_V = variants {}; lin fight_back_V2 = variants {}; lin fight_it_out_V2 = variants {}; @@ -22186,7 +22186,7 @@ lin fly_V = singleV (mkV177 "летя") ; ---- lin fly_V2 = dirV2 (singleV (mkV177 "летя")); ---- lin fly_about_V = variants {}; lin fly_around_V = variants {}; -lin fly_at_V2 = variants {}; +lin fly_at_V2 = prepV2 (actionV (mkV186 "развявам") (mkV164 "развея")) (mkPrep "на" Acc); lin fly_by_V = variants {}; lin fly_fish_V = variants {}; lin fly_fishing_N = variants {}; @@ -22432,7 +22432,7 @@ lin forecast_V2 = dirV2 (dualV (mkV186 "предвиждам") (mkV174 "пред lin forecast_VS = mkVS (dualV (mkV186 "предвиждам") (mkV174 "предвидя")); lin forecaster_N = mkN031a "гадател"; lin forecastle_N = mkN007 "бак"; ---- -lin foreclose_V = variants {}; +lin foreclose_V = medialV (actionV (mkV186 "изключвам") (mkV176 "изключа")) Acc; lin foreclose_V2 = variants {}; lin foreclosure_N = mkN041 "възбрана" ; ---- lin forecourt_N = variants {}; @@ -24432,7 +24432,7 @@ lin go_around_V = variants {}; lin go_as_you_please_A = variants {}; lin go_at_V2 = variants {}; lin go_away_V = variants {}; -lin go_back_V = variants {}; +lin go_back_V = medialV (actionV (mkV186 "връщам") (mkV152 "върна")) Acc; lin go_back_V2 = variants {}; lin go_back_on_V2 = variants {}; lin go_before_V = variants {}; @@ -24477,10 +24477,10 @@ lin go_over_V = variants {}; lin go_over_V2 = variants {}; lin go_over_to_V2 = variants {}; lin go_past_V2 = variants {}; -lin go_round_V = variants {}; +lin go_round_V = actionV (mkV187 "обикалям") (mkV174 "обиколя"); lin go_slow_N = variants {}; lin go_through_V = variants {}; -lin go_through_V2 = variants {}; +lin go_through_V2 = prepV2 (actionV (mkV186 "минавам") (mkV152 "мина")) (mkPrep "през" Acc); lin go_through_with_V2 = variants {}; lin go_to_V2 = variants {}; lin go_to_meeting_A = variants {}; @@ -25633,7 +25633,7 @@ lin halesowen_PN = mkPN "Халесоуен" Masc; lin half_A = variants {}; lin half_Adv = variants {}; lin half_N = mkN041 "половина" ; -lin half_Predet = variants {}; +lin half_Predet = {s = \\_ => "половин"}; lin half_baked_A = mkA076 "недообмислен" ; lin half_blood_N = variants {}; lin half_breed_N = mkN007 "метис"; @@ -27144,7 +27144,7 @@ lin holystone_N = variants {}; lin holystone_V2 = variants {}; lin homage_N = mkN072 "преклонение"; ---- lin home_A = variants {mkA079 "вътрешен"; mkA079 "домашен"; mkA079 "местен"; mkA076 "тилов"}; ---- -lin home_Adv = variants {}; +lin home_Adv = mkAdv "вкъщи"; lin home_N = dualN (mkN001 "дом") (mkA079 "домашен"); lin home_baked_A = variants {}; lin home_brewed_A = mkA079 "домашно-приготвен"; @@ -28645,8 +28645,8 @@ lin impurity_N = variants {mkN049 "нецеломъдреност"; mkN047 "не lin imputation_N = mkN072 "обвинение" ; ---- lin impute_V2 = variants {}; lin imputrescible_A = mkA076 "негниещ"; -lin in_1_Adv = variants {}; -lin in_2_Adv = variants {}; +lin in_1_Adv = mkAdv "вътре"; +lin in_2_Adv = mkAdv "вътре"; lin in_A = mkA079 "вътрешен" ; ---- lin in_N = mkN001 "под"; ---- lin in_Prep = mkPrep (pre {"в" ; "във" / strs {"в" ; "ф" ; "В" ; "Ф"}}) Acc; @@ -28874,7 +28874,7 @@ lin incorporation_N = variants {mkN071 "вграждане"; mkN071 "влага lin incorporative_A = variants {}; lin incorporeal_A = variants {mkA079 "безплътен"; mkA079 "безтелесен"; mkA076 "невеществен"; mkA079 "нематериален"}; ---- lin incorrect_A = mkA079 "некоректен"; -lin incorrectly_Adv = variants {}; +lin incorrectly_Adv = mkAdv "некоректно"; lin incorrectness_N = variants {mkN049 "невярност"; mkN049 "некоректност"; mkN049 "неправилност"; mkN049 "погрешност"}; ---- lin incorrigible_A = mkA076 "непоправим"; ---- lin incorrupt_A = variants {mkA076 "ненакърнен"; mkA076 "неопетнен"; mkA076 "неподкупен"; mkA076 "непокварен"; mkA076 "неразвален"}; ---- @@ -28886,9 +28886,9 @@ lin increase_V = dualV (mkV186 "нараствам") (mkV145 "нараста"); lin increase_V2 = dirV2 (dualV (mkV186 "увеличавам") (mkV176 "увелича")); lin increased_A = mkA079 "увеличен"; lin increasing_A = mkA076 "увеличаващ"; -lin increasingly_AdA = variants {}; -lin increasingly_AdV = variants {}; -lin increasingly_Adv = variants {}; +lin increasingly_AdA = mkAdv ("все по-"++Prelude.BIND); +lin increasingly_AdV = mkAdv "все по"; +lin increasingly_Adv = mkAdv "все повече"; lin incredibility_N = variants {mkN049 "невероятност"; mkN049 "неимоверност"; mkN049 "неправдоподобност"}; ---- lin incredible_A = variants {mkA079 "баснословен"; mkA079 "неимоверен"; mkA079 "неправдоподобен"}; ---- lin incredibly_Adv = variants {}; @@ -29567,7 +29567,7 @@ lin instantaneous_A = variants {mkA076 "мигновен"; mkA079 "момент lin instantiation_N = variants {}; lin instantly_Adv = variants {}; lin instar_N = variants {}; -lin instead_Adv = variants {}; +lin instead_Adv = mkAdv "вместо това"; lin instead_of_Prep = mkPrep "вместо" Acc; lin instep_N = mkN054 "ходилото"; lin instigate_V2 = dirV2 (variants {dualV (mkV186 "предизвиквам") (mkV186 "предизвикам") ; dualV (mkV186 "предприемам") (mkV171 "предприема")}); ---- @@ -31469,8 +31469,8 @@ lin knout_N = mkN014 "камшик"; lin know_N = mkN065 "ноу"; lin know_V = dualV (mkV188 "знам") (mkV162 "зная"); lin know_V2 = dirV2 (dualV (mkV188 "знам") (mkV162 "зная")); -lin know_VQ = variants {}; -lin know_VS = variants {}; +lin know_VQ = mkVQ (dualV (mkV188 "знам") (mkV162 "зная")); +lin know_VS = mkVS (dualV (mkV188 "знам") (mkV162 "зная")); lin know_all_N = variants {}; lin know_how_N = variants {}; lin knowable_A = mkA076 "познаваем" ; @@ -32667,7 +32667,7 @@ lin lie_around_V = variants {}; lin lie_back_V = variants {}; lin lie_detector_N = variants {}; lin lie_down_V = variants {}; -lin lie_down_on_V2 = variants {}; +lin lie_down_on_V2 = prepV2 (stateV (mkV178 "лежа")) (mkPrep "на" Acc); lin lie_in_N = variants {}; lin lie_with_V2 = variants {}; lin liebfraumilch_N = variants {}; @@ -33666,10 +33666,10 @@ lin lucifugous_A = variants {}; lin luck_N = mkN072 "щастие"; ---- lin luck_into_V2 = variants {}; lin luck_out_V = variants {}; -lin luckily_Adv = variants {}; +lin luckily_Adv = mkAdv "за щастие"; lin luckless_A = variants {mkA079 "несретен"; mkA079 "нещастен"}; ---- lin lucknow_PN = mkPN "Лакнау" Masc; -lin lucky_A = mkA076 "щастлив" ; ---- +lin lucky_A = mkA076 "щастлив"; lin lucrative_A = variants {mkA079 "доходен"; mkA079 "доходоносен"; mkA079 "изгоден"; mkA079 "приходоносен"; mkA079 "рентабилен"}; ---- lin lucre_N = mkN041 "печалба"; lin lucubration_N = variants {}; @@ -34158,7 +34158,7 @@ lin make_over_V2 = variants {}; lin make_towards_V2 = variants {}; lin make_up_N = mkN001 "грим"; lin make_up_V = variants {}; -lin make_up_V2 = variants {}; +lin make_up_V2 = dirV2 (actionV (mkV187 "направям") (mkV173 "направя")); lin make_up_for_V2 = variants {}; lin make_up_to_V2 = variants {}; lin make_with_V2 = variants {}; @@ -36343,7 +36343,7 @@ lin modish_A = mkA079 "модерен" ; lin modiste_N = mkN041 "модистка"; ---- lin mods_N = mkN001 "мод"; lin modular_A = mkA079 "модулен"; ---- -lin modulate_V = variants {dualV (mkV186 "извивам") (mkV163 "извия"); dualV (mkV187 "изменям") (mkV174 "изменя"); singleV (mkV186 "модулирам"); dualV (mkV186 "пригаждам") (mkV174 "пригодя"); dualV (mkV187 "променям") (mkV174 "променя")}; ---- +lin modulate_V = variants {dualV (mkV186 "извивам") (mkV163 "извия"); singleV (mkV186 "модулирам"); dualV (mkV186 "пригаждам") (mkV174 "пригодя"); dualV (mkV187 "променям") (mkV174 "променя")}; ---- lin modulate_V2 = dirV2 (singleV (mkV186 "регулирам")); ---- lin modulation_N = variants {mkN071 "изменяне"; mkN047 "модулация"; mkN071 "модулиране"; mkN071 "променяне"}; ---- lin module_N = mkN007 "модул"; @@ -36697,9 +36697,9 @@ lin mordant_A = variants {mkA079 "жлъчен"; mkA076 "заядлив"; mkA079 lin mordant_N = variants {mkN007 "фиксаж"; mkN007 "фиксатив"}; ---- lin morePl_Det = mkDeterminerPl "повече"; lin moreSg_Det = mkDeterminerSg "повече" "повече" "повече"; -lin more_Adv = variants {}; +lin more_Adv = mkAdv "повече"; lin more_N = variants {}; -lin more_Quant = variants {}; +lin more_Quant = let po = "по-"++Prelude.BIND in mkQuant po po po po; lin more_than_AdN = ss "повече от"; lin more_than_Predet = {s = \\_ => "повече от"}; lin morecambe_PN = mkPN "Морекамбе" Masc; @@ -36799,7 +36799,7 @@ lin mossy_A = mkA076 "мъхест" ; lin most_Adv = variants {}; lin most_Det = mkDeterminerPl "повечето"; lin mostaccioli_N = variants {}; -lin mostly_Adv = variants {}; +lin mostly_Adv = mkAdv "повечето"; lin mote_N = mkN041 "прашинка"; ---- lin motel_N = mkN007 "мотел"; ---- lin motet_N = mkN007 "мотет"; @@ -37487,7 +37487,7 @@ lin name_dropping_N = variants {}; lin name_part_N = variants {}; lin nameko_N = variants {}; lin nameless_A = mkA079 "безименен"; -lin namely_Adv = variants {}; +lin namely_Adv = mkAdv "най-вече"; lin nameplate_N = mkN041b "табелка"; lin namer_N = variants {}; lin namesake_N = variants {mkN007a "адаш"; mkN008a "едноимец"; mkN014a "съименник"}; ---- @@ -38031,7 +38031,7 @@ lin neve_N = mkN007 "фирн"; ---- lin never_AdV = mkAdV "никога"; lin never_Adv = variants {}; lin nevermore_Adv = variants {}; -lin nevertheless_Adv = variants {}; +lin nevertheless_Adv = mkAdv "въпреки това"; lin neville_PN = mkPN "Невил" Masc; lin nevirapine_N = mkN018 "невирапин"; lin new_A = mkA076 "нов" ; @@ -38287,7 +38287,7 @@ lin no_Quant = {s = \\_=> table { lin no_ball_N = variants {}; lin no_fewer_than_AdN = ss "не по-малко от"; lin no_go_A = variants {}; -lin no_longer_AdV = variants {}; +lin no_longer_AdV = mkAdV "вече не"; lin no_man's_land_N = variants {}; lin no_more_than_AdN = ss "не повече от"; lin no_one_NP = variants {}; @@ -38794,11 +38794,11 @@ lin nothingness_N = variants {mkN049 "баналност"; mkN047 "дребол lin nothings_N = mkN041a "безсмислица"; lin nothosaur_N = variants {}; lin notice_N = mkN072 "внимание" ; -lin notice_V2 = dirV2 (dualV (mkV186 "забелязвам") (mkV183 "забележа")); ---- -lin notice_VS = variants {}; -lin notice_board_N = variants {}; +lin notice_V2 = dirV2 (dualV (mkV186 "забелязвам") (mkV183 "забележа")); +lin notice_VS = mkVS (dualV (mkV186 "забелязвам") (mkV183 "забележа")); +lin notice_board_N = compoundN (mkN041 "дъска") "за обяви"; lin noticeable_A = mkA079 "очевиден"; -lin noticeably_Adv = variants {}; +lin noticeably_Adv = mkAdv "чувствително"; lin noticer_N = variants {}; lin notifiable_A = variants {}; lin notification_N = mkN071 "известяване" ; @@ -39341,8 +39341,8 @@ lin oft_Adv = variants {}; lin oft_times_Adv = variants {}; lin often_AdA = mkAdA "често"; lin often_AdV = mkAdV "често"; -lin often_Adv = variants {}; -lin oftener_Adv = variants {}; +lin often_Adv = mkAdv "често"; +lin oftener_Adv = mkAdv "най-често"; lin ogee_N = variants {}; lin ogle_V = variants {}; lin ogle_V2 = variants {}; @@ -40048,7 +40048,7 @@ lin out_Prep = variants {}; lin out_V2 = variants {}; lin out_from_Prep = variants {}; lin out_herod_V2 = variants {}; -lin out_of_Prep = variants {}; +lin out_of_Prep = mkPrep "извън" Acc; lin out_of_date_A = variants {}; lin out_of_door_A = variants {}; lin out_of_doors_Adv = variants {}; @@ -41305,7 +41305,7 @@ lin pass_away_V = variants {}; lin pass_back_V2 = variants {}; lin pass_by_V = variants {}; lin pass_by_V2 = variants {}; -lin pass_down_V2 = variants {}; +lin pass_down_V2 = dirV2 (actionV (mkV186 "предавам") (mkV168 "предам")); lin pass_for_V2 = variants {}; lin pass_off_V = variants {}; lin pass_off_V2 = variants {}; @@ -41993,10 +41993,10 @@ lin perfecter_N = variants {}; lin perfectibility_N = mkN054 "съвършенство"; lin perfectible_A = mkA076 "усъвършенствуем"; lin perfection_N = mkN054 "съвършенство"; -lin perfectionism_N = mkN011 "перфекционизъм"; ---- -lin perfectionist_N = mkN007 "перфекционист"; ---- +lin perfectionism_N = mkN011 "перфекционизъм"; +lin perfectionist_N = mkN007 "перфекционист"; lin perfective_N = variants {}; -lin perfectly_Adv = variants {}; +lin perfectly_Adv = mkAdv "перфектно"; lin perfervid_A = variants {}; lin perfidious_A = variants {mkA079 "вероломен"; mkA079 "коварен"; mkA084 "неверен"; mkA079 "перфиден"; mkA078 "предателски"}; ---- lin perfidiousness_N = variants {mkN054 "вероломство"; mkN054 "коварство"}; ---- @@ -44622,7 +44622,7 @@ lin press_ahead_V = variants {}; lin press_box_N = variants {}; lin press_clipping_N = variants {}; lin press_cutting_N = variants {}; -lin press_for_V2 = variants {}; +lin press_for_V2 = prepV2 (actionV (mkV186 "настоявам") (mkV180 "настоя")) for_Prep; lin press_forward_with_V2 = variants {}; lin press_gallery_N = variants {}; lin press_gang_N = variants {}; @@ -44659,7 +44659,7 @@ lin prestressed_A = variants {}; lin prestwich_PN = mkPN "Престуйч" Masc; lin prestwick_PN = mkPN "Престуйк" Masc; lin presumable_A = variants {mkA076 "безсъмнен"; mkA076 "предполагаем"}; ---- -lin presumably_Adv = variants {}; +lin presumably_Adv = mkAdv "предполага се"; lin presume_V = variants {dualV (mkV186 "допускам") (mkV152 "допусна"); dualV (mkV186 "предполагам") (mkV176 "предположа"); singleV (mkV186 "презумирам")}; ---- lin presume_V2 = dirV2 (dualV (mkV186 "предполагам") (mkV176 "предположа")); ---- lin presume_VS = variants {}; @@ -46292,15 +46292,15 @@ lin quieten_V2 = variants {}; lin quieten_down_V2 = variants {}; lin quietism_N = mkN011 "квиетизъм"; lin quietist_N = variants {}; -lin quietly_Adv = variants {}; -lin quietness_N = mkN072 "спокойствие"; ---- +lin quietly_Adv = mkAdv "тихомълком"; +lin quietness_N = mkN072 "спокойствие"; lin quietude_N = mkN072 "спокойствие"; lin quietus_N = variants {}; lin quiff_N = mkN007 "перчем"; lin quill_N = mkN041 "писалка" ; ---- lin quill_feather_N = variants {}; lin quillwort_N = variants {}; -lin quilt_N = mkN007 "юрган" ; ---- +lin quilt_N = mkN007 "юрган"; lin quilt_V2 = variants {}; lin quilting_N = mkN042 "юрган"; lin quin_N = mkN041a "петорка"; @@ -49011,8 +49011,8 @@ lin roost_N = mkN014 "курник"; lin roost_V = variants {}; lin rooster_N = mkN008b "петел"; ---- lin root_N = mkN007 "корен" ; -lin root_V = variants {dualV (mkV186 "вкоренявам") (mkV174 "вкореня"); dualV (mkV187 "изравям") (mkV174 "изравня")}; ---- -lin root_V2 = variants {}; +lin root_V = variants {dualV (mkV186 "вкоренявам") (mkV174 "вкореня"); dualV (mkV187 "изравям") (mkV174 "изравня")}; +lin root_V2 = dirV2 (variants {dualV (mkV186 "вкоренявам") (mkV174 "вкореня"); dualV (mkV187 "изравям") (mkV174 "изравня")}); lin root_about_V = variants {}; lin root_around_V2 = variants {}; lin root_for_V2 = variants {}; @@ -49371,7 +49371,7 @@ lin run_N = mkN001 "тек" ; lin run_V = singleV (mkV186 "тичам") ; ---- lin run_V2 = variants {}; lin run_across_V2 = variants {}; -lin run_after_V2 = variants {}; +lin run_after_V2 = prepV2 (singleV (mkV186 "тичам")) (mkPrep "след" Acc); lin run_against_V2 = variants {}; lin run_along_V = variants {}; lin run_around_V = variants {}; @@ -50866,7 +50866,7 @@ lin secretin_N = mkN018 "секретин"; lin secretion_N = mkN047 "секреция" ; ---- lin secretive_A = variants {mkA085 "потаен"; mkA079 "скришен"}; ---- lin secretiveness_N = mkN049 "прикритост"; ---- -lin secretly_Adv = variants {}; +lin secretly_Adv = mkAdv "тайно"; lin secretory_A = mkA079 "отделителен"; ---- lin sect_N = mkN041 "секта"; ---- lin sectarian_A = mkA078 "сектантски"; ---- @@ -51454,7 +51454,7 @@ lin set_to_N = variants {}; lin set_to_V = variants {}; lin set_up_N = variants {}; lin set_up_V = variants {}; -lin set_up_V2 = variants {}; +lin set_up_V2 = dirV2 (actionV (mkV186 "настройвам") (mkV175 "настроя")); lin set_upon_V2 = variants {}; lin seta_N = mkN074 "сета"; lin setback_N = variants {mkN041 "несполука"; mkN007 "неуспех"}; ---- @@ -52500,7 +52500,7 @@ lin simultaneousness_N = mkN049 "едновременност"; lin simvastatin_N = mkN018 "симвастатин"; lin sin_N = mkN002 "грях"; lin sin_V = variants {dualV (mkV186 "прегрешавам") (mkV176 "прегреша"); dualV (mkV186 "сбърквам") (mkV186 "сбъркам"); dualV (mkV186 "съгрешавам") (mkV176 "съгреша")}; ---- -lin since_Adv = variants {}; +lin since_Adv = mkAdv "понеже"; lin since_Prep = mkPrep "след" Acc; lin since_Subj = variants {}; lin since_then_Adv = mkAdv "от тогава"; @@ -54934,8 +54934,8 @@ lin stance_N = mkN047 "позиция" ; lin stanch_V2 = variants {}; lin stanchion_N = mkN074 "подпора"; lin stand_N = mkN047 "позиция" ; -lin stand_V = variants {dualV (mkV186 "допускам") (mkV152 "допусна"); dualV (mkV186 "издържам") (mkV179 "издържа"); dualV (mkV187 "изправям") (mkV173 "изправя"); dualV (mkV186 "изтърпявам") (mkV177 "изтърпя"); singleV (mkV174 "крепя"); dualV (mkV186 "настоявам") (mkV180 "настоя"); dualV (mkV187 "поставям") (mkV173 "поставя"); dualV (mkV186 "претърпявам") (mkV177 "претърпя"); singleV (mkV180 "противостоя"); singleV (mkV174 "противя"); singleV (mkV186 "слагам"); singleV (mkV186 "солидаризирам"); singleV (mkV180 "стоя"); singleV (mkV178 "стърча"); dualV (mkV186 "съпротивявам") (mkV174 "съпротивя"); singleV (mkV177 "търпя")}; ---- -lin stand_V2 = variants {}; +lin stand_V = singleV (mkV180 "стоя"); +lin stand_V2 = dirV2 (singleV (mkV177 "търпя")); lin stand_about_V = variants {}; lin stand_around_V = variants {}; lin stand_aside_V = variants {}; @@ -57366,7 +57366,7 @@ lin take_on_V2 = variants {}; lin take_out_V = variants {}; lin take_out_V2 = variants {}; lin take_over_V = variants {}; -lin take_over_V2 = variants {}; +lin take_over_V2 = dirV2 (actionV (mkV187 "пренасям") (mkV145 "пренеса")); lin take_through_V2 = variants {}; lin take_to_V2 = variants {}; lin take_up_N = mkN071 "възприемане"; @@ -58271,7 +58271,7 @@ lin thallus_N = mkN007 "талус"; lin thalweg_N = mkN038 "талвега"; lin thame_PN = mkPN "Тейм" Masc; lin than_A = variants {}; -lin than_Prep = variants {}; +lin than_Prep = mkPrep "от" Acc; lin than_Subj = variants {}; lin thanatology_N = mkN047 "танатология"; lin thanatophobia_N = variants {}; @@ -58365,7 +58365,7 @@ lin thereabouts_Adv = variants {}; lin thereafter_Adv = variants {}; lin thereby_Adv = variants {}; lin therefor_Adv = variants {}; -lin therefore_Adv = variants {}; +lin therefore_Adv = mkAdv "следователно"; lin therefrom_Adv = variants {}; lin therein_Adv = variants {}; lin thereinafter_Adv = variants {}; @@ -58723,7 +58723,7 @@ lin thurmaston_PN = mkPN "Турмастън" Masc; lin thurrock_PN = mkPN "Туррок" Masc; lin thurs_PN = mkPN "Турс" Masc; lin thurso_PN = mkPN "Турсо" Masc; -lin thus_Adv = variants {}; +lin thus_Adv = mkAdv "по този начин"; lin thwack_N = variants {}; lin thwack_V2 = variants {}; lin thwart_N = mkN071 "осуетяване"; @@ -59372,11 +59372,11 @@ lin totalitarian_N = mkN031a "тоталитар"; lin totalitarianism_N = mkN011 "тоталитаризъм"; lin totality_N = variants {mkN049 "съвкупност"; mkN049 "целокупност"; mkN052 "цялост"}; ---- lin totalizator_N = mkN007 "тотализатор"; -lin totally_Adv = variants {}; +lin totally_Adv = mkAdv "изцяло"; lin totara_N = variants {}; lin tote_N = mkN054 "тото"; ---- lin tote_V2 = variants {}; -lin totem_N = mkN007 "тотем"; ---- +lin totem_N = mkN007 "тотем"; lin totem_pole_N = variants {}; lin totemic_A = mkA079 "тотемен"; lin totemism_N = mkN011 "тотемизъм"; ---- @@ -61466,8 +61466,8 @@ lin unforgiving_A = mkA079 "безпощаден" ; ---- lin unformed_A = variants {mkA076 "неоформен"; mkA076 "неулегнал"}; ---- lin unforthcoming_A = variants {}; lin unfortunate_A = variants {mkA079 "несретен"; mkA079 "неудачен"; mkA079 "нещастен"}; ---- -lin unfortunate_N = mkN072 "съжаление" ; ---- -lin unfortunately_Adv = variants {}; +lin unfortunate_N = mkN072 "съжаление"; +lin unfortunately_Adv = mkAdv "за съжаление"; lin unfounded_A = variants {mkA079 "безоснователен"; mkA076 "безпочвен"; mkA076 "необоснован"; mkA079 "неоснователен"; mkA079 "несъстоятелен"}; ---- lin unframed_A = variants {}; lin unfree_A = mkA079 "несвободен" ; @@ -62488,7 +62488,7 @@ lin uptime_N = mkN001 "ъптайм"; lin upton_PN = mkPN "Уптън" Masc; lin uptown_A = variants {}; lin uptown_Adv = variants {}; -lin uptown_N = variants {}; +lin uptown_N = compoundN (compoundN (mkA079 "горен") (mkN049 "част")) "на града"; lin upturn_N = mkN007 "подем" ; ---- lin upturned_A = mkA076 "преобърнат"; lin upward_A = mkA079 "нанагорен"; ---- @@ -64442,7 +64442,7 @@ lin wherewithal_N = mkN007 "ресурс"; lin wherry_N = mkN041 "лодка"; lin whet_V2 = variants {}; lin whether_Prep = variants {}; -lin whether_Subj = variants {}; +lin whether_Subj = {s="дали"}; lin whetstone_N = variants {mkN047 "билгия"; mkN001 "брус"; mkN054 "острило"; mkN054 "точило"}; ---- lin whey_N = mkN041 "суроватка"; lin which_IQuant = {s = table GenNum [table QForm ["кой";"който"]; diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 7f14f97bf..6d8b9d9cf 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -11325,7 +11325,7 @@ lin clot_V = mkV "clot" "clots" "clotted" "clotted" "clotting"; lin clot_V2 = mkV2 (mkV "clot" "clots" "clotted" "clotted" "clotting"); lin cloth_N = mkN "cloth" "cloths"; lin clothe_V2 = mkV2 (mkV "clothe" "clothes" "clothed" "clothed" "clothing"); -lin clothes_N = mkN "clothes" "clothes" ; +lin clothes_N = mkN "clothes" "clothes"; lin clothes_basket_N = mkN "clothes-basket" "clothes-baskets"; lin clothes_hanger_N = mkN "clothes-hanger" "clothes-hangers"; lin clothes_moth_N = mkN "clothes-moth" "clothes-moths";