diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 24fe137e5..a7eddf355 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -3084,7 +3084,7 @@ lin appreciator_N = mkN031a "ценител" ; lin apprehend_V2 = variants {} ; lin apprehender_N = variants {} ; lin apprehensible_A = mkA076 "разбираем" ; ---- -lin apprehension_N = variants {mkN007 "арест"; mkN001 "страх"; mkN071 "схващане"; mkN072 "съмнение"} ; ---- +lin apprehension_N = variants {mkN001 "страх"; mkN071 "схващане"; mkN072 "съмнение"} ; ---- lin apprehensive_A = mkA076 "загрижен" ; lin apprentice_N = mkN014a "чирак" ; lin apprentice_V2 = variants {} ; @@ -3439,7 +3439,7 @@ lin arras_N = mkN007 "арас" ; lin array_N = mkN054 "облекло" ; ---- lin array_V2 = variants {} ; lin arrears_N = mkN047 "бакия" ; ---- -lin arrest_N = mkN071 "екстрадиране" ; +lin arrest_N = mkN007 "арест" ; lin arrest_V2 = dirV2 (singleV (mkV186 "арестувам")) ; lin arrester_N = mkN007 "задържател" ; ---- lin arresting_A = mkA079 "поразителен" ; ---- @@ -6593,7 +6593,7 @@ lin blowtorch_N = mkN041b "горелка" ; lin blowtube_N = variants {} ; lin blowy_A = mkA076 "ветровит" ; lin blowzy_A = mkA079 "зачервен" ; -lin blubber_N = mkN077 "мас" ; +lin blubber_N = mkN042 "мас" ; lin blubber_V = variants {} ; lin blubber_V2 = variants {} ; lin blubberer_N = variants {} ; @@ -7987,7 +7987,7 @@ lin bum_A = variants {} ; lin bum_N = mkN041 "хаймана" ; ---- lin bum_V = singleV (mkV148 "пека") ; ---- lin bum_V2 = variants {} ; -lin bumblebee_N = mkN041 "пчела" ; +lin bumblebee_N = compoundN (mkA079 "земен") (mkN041 "пчела") ; lin bumbling_A = mkA076 "тромав" ; lin bumboat_N = variants {} ; lin bumf_N = mkN042 "книжа" ; @@ -8239,7 +8239,7 @@ lin butter_up_V2 = variants {} ; lin butterbean_N = variants {} ; lin butterbur_N = variants {} ; lin buttercrunch_N = variants {} ; -lin buttercup_N = mkN065 "лютиче" ; ---- +lin buttercup_N = mkN065 "лютиче" ; lin butterfat_N = variants {} ; lin butterfingers_N = mkN041a "палачинка" ; lin butterfish_N = variants {} ; @@ -12153,7 +12153,7 @@ lin concoction_N = variants {mkN071 "измисляне"; mkN007 "концент lin concomitance_N = mkN049 "едновременност" ; ---- lin concomitant_A = mkA079 "едновременен" ; ---- lin concomitant_N = mkN054 "съпътстващо" ; -lin concord_N = variants {mkN040a "мир"; mkN072 "съгласие"; mkN047 "хармония"} ; ---- +lin concord_N = variants {mkN072 "съгласие"; mkN047 "хармония"} ; ---- lin concordance_N = mkN007 "конкорданс" ; lin concordant_A = mkA079 "съгласен" ; ---- lin concordat_N = mkN007a "конкордат" ; @@ -12880,7 +12880,7 @@ lin coping_stone_N = variants {} ; lin copious_A = variants {mkA076 "богат"; mkA079 "изобилен"; mkA076 "плодовит"; mkA079 "предостатъчен"} ; ---- lin coplanar_A = variants {} ; lin copolymer_N = mkN022 "съполимер" ; -lin copper_N = dualN (mkN077 "мед") (mkA079 "меден") ; +lin copper_N = dualN (mkN042 "мед") (mkA079 "меден") ; lin copper_V2 = variants {} ; lin copper_bottom_V2 = variants {} ; lin copper_bottomed_A = variants {} ; @@ -14514,7 +14514,7 @@ lin dabble_V2 = variants {} ; lin dabbler_N = variants {mkN007 "дилетант"; mkN031a "любител"} ; ---- lin dabchick_N = variants {} ; lin dacca_PN = mkPN "Дака" Masc ; -lin dace_N = mkN001 "клен" ; ---- +lin dace_N = mkN041 "лъчеперка" ; lin dacha_N = mkN074 "вила" ; lin dachshund_N = mkN008 "дакел" ; lin dacite_N = variants {} ; @@ -26935,14 +26935,14 @@ lin hone_V2 = dirV2 (singleV (mkV186 "прецизирам")) ; ---- lin hone_in_on_V2 = variants {} ; lin honest_A = mkA079 "честен" ; lin honesty_N = variants {mkN049 "честност"; mkN049 "искреност"} ; -lin honey_A = mkA079 "меден" ; -lin honey_N = dualN (mkN001 "мед") (mkA079 "меден") ; -lin honeybee_N = mkN041 "пчела" ; +lin honey_A = mkA076 "меден" ; +lin honey_N = dualN (mkN001 "мед") (mkA076 "меден") ; +lin honeybee_N = compoundN (mkA079 "медоносен") (mkN041 "пчела") ; lin honeycomb_N = mkN041 "шупла" ; lin honeycomb_V2 = variants {} ; lin honeycreeper_N = variants {} ; lin honeydew_N = variants {} ; -lin honeyed_A = mkA079 "меден" ; +lin honeyed_A = mkA076 "меден" ; lin honeyflower_N = variants {} ; lin honeylike_A = variants {} ; lin honeymoon_N = variants {} ; @@ -31526,7 +31526,7 @@ lin larboard_N = mkN007 "бакборд" ; lin larcenist_N = variants {} ; lin larceny_N = mkN071 "ограбване" ; lin larch_N = mkN041 "лиственица" ; -lin lard_N = mkN077 "мас" ; +lin lard_N = mkN042 "мас" ; lin lard_V2 = variants {} ; lin larder_N = mkN007 "килер" ; lin large_A = mkA081 "голям" ; @@ -34074,11 +34074,11 @@ lin map_V2 = variants {} ; lin map_out_V = variants {} ; lin map_reader_N = variants {} ; lin mapinguari_N = variants {} ; -lin maple_N = mkN001 "клен" ; -lin maple_leaf_N = variants {} ; +lin maple_N = dualN (mkN001 "клен") (mkA076 "кленов") ; +lin maple_leaf_N = compoundN (mkA076 "кленов") (mkN054 "листо") ; lin maplelike_A = variants {} ; lin mapmaking_N = mkN071 "картографиране" ; -lin mapping_N = mkN071 "картографиране" ; ---- +lin mapping_N = mkN071 "картографиране" ; lin maquiladora_N = variants {} ; lin maquis_N = mkN075 "маки" ; lin mar_PN = mkPN "Мар" Masc ; @@ -41319,7 +41319,7 @@ lin pending_Prep = variants {} ; lin pendlebury_PN = mkPN "Пендлебъри" Masc ; lin pendragon_N = variants {} ; lin pendulous_A = mkA076 "увиснал" ; -lin pendulum_N = variants {mkN008 "ветропоказалец"; mkN054 "махало"} ; ---- +lin pendulum_N = mkN054 "махало" ; lin penelope_PN = mkPN "Пенелопе" Masc ; lin peneplain_N = mkN007 "пенеплен" ; lin penetrability_N = mkN049 "проницаемост" ; @@ -53364,17 +53364,17 @@ lin spa_N = mkN007 "извор" ; ---- lin space_N = mkN054 "пространство" ; lin space_V2 = variants {} ; lin space_bar_N = variants {} ; -lin space_capsule_N = variants {} ; +lin space_capsule_N = compoundN (mkA078 "космически") (mkN041 "капсула") ; lin space_heater_N = variants {} ; lin space_helmet_N = variants {} ; -lin space_rocket_N = variants {} ; -lin space_time_N = variants {} ; -lin space_vehicle_N = variants {} ; -lin spacecraft_N = variants {} ; +lin space_rocket_N = compoundN (mkA078 "космически") (mkN041 "ракета") ; +lin space_time_N = mkN069 "пространство-време" ; +lin space_vehicle_N = compoundN (mkA078 "космически") (mkN007 "апарат") ; +lin spacecraft_N = compoundN (mkA078 "космически") (mkN007 "апарат") ; lin spaceflight_N = variants {} ; -lin spaceship_N = variants {} ; +lin spaceship_N = compoundN (mkA078 "космически") (mkN007 "кораб") ; lin spacesuit_N = mkN009 "скафандър" ; -lin spacetime_N = variants {} ; +lin spacetime_N = mkN069 "пространство-време" ; lin spacewalker_N = variants {} ; lin spaceward_Adv = variants {} ; lin spacing_N = mkN041 "разредка" ; ---- @@ -53501,7 +53501,7 @@ lin spec_N = mkN008a "спец" ; lin special_A = mkA079 "специален" ; lin special_N = substantiveN (mkA079 "специален") (AMasc Human) ; lin specialism_N = mkN011 "специализъм" ; -lin specialist_A = variants {} ; +lin specialist_A = mkA076 "специализиран" ; lin specialist_N = dualN (mkN007 "специалист") (mkA076 "специализиран") ; lin specialistic_A = mkA078 "специалистки" ; lin speciality_N = mkN049 "специалност" ; @@ -53680,7 +53680,7 @@ lin spin_off_V2 = variants {} ; lin spin_out_V = variants {} ; lin spin_out_V2 = variants {} ; lin spinach_N = mkN014 "спанак" ; -lin spinal_A = mkA079 "гръбначен" ; ---- +lin spinal_A = mkA079 "гръбначен" ; lin spindle_N = mkN054 "вретено" ; lin spindle_berry_N = variants {} ; lin spindle_legged_A = variants {} ; @@ -53741,7 +53741,7 @@ lin spirochete_N = mkN007 "спирохет" ; lin spirogram_N = variants {} ; lin spirograph_N = variants {} ; lin spirogyra_N = variants {} ; -lin spirometer_N = mkN009 "спирометър" ; ---- +lin spirometer_N = mkN009 "спирометър" ; lin spirometry_N = mkN047 "спирометрия" ; lin spironolactone_N = mkN007 "спиронолактон" ; lin spirt_N = mkN001 "спирт" ; @@ -53759,7 +53759,7 @@ lin spiteful_A = variants {mkA079 "ехиден"; mkA079 "злобен"; mkA079 lin spitefulness_N = mkN041 "злоба" ; lin spitfire_N = variants {} ; lin spitter_N = mkN014 "плювалник" ; -lin spitting_N = mkN071 "плюене" ; ---- +lin spitting_N = mkN071 "плюене" ; lin spittle_N = variants {mkN041 "плитка"; mkN041 "храчка"} ; ---- lin spittoon_N = mkN014 "плювалник" ; lin spitz_N = mkN001 "шпиц" ; @@ -53850,10 +53850,10 @@ lin spongefly_N = variants {} ; lin sponger_N = variants {mkN039 "авантаджия"; mkN007 "дармоед"; mkN007b "използвач"; mkN039 "келепирджия"; mkN039 "муфтаджия"; mkN008a "тунеядец"; mkN014 "хрантутеник"} ; ---- lin sponginess_N = variants {} ; lin spongioblast_N = variants {} ; -lin spongy_A = mkA076 "шуплив" ; ---- -lin sponsor_N = mkN054 "кумство" ; -lin sponsor_V2 = dirV2 (singleV (mkV186 "спонсорирам")) ; ---- -lin sponsorship_N = mkN054 "кумство" ; ---- +lin spongy_A = mkA076 "шуплив" ; +lin sponsor_N = dualN (mkN007a "спонсор") (mkA078 "спонсорски") ; +lin sponsor_V2 = dirV2 (singleV (mkV186 "спонсорирам")) ; +lin sponsorship_N = mkN054 "спонсорство" ; lin spontaneity_N = mkN049 "непосредственост" ; ---- lin spontaneous_A = mkA079 "спонтанен" ; lin spontaneousness_N = mkN049 "спонтанност" ; @@ -53876,7 +53876,7 @@ lin sporadic_A = mkA079 "спорадичен" ; lin sporadically_Adv = variants {} ; lin sporangiophore_N = variants {} ; lin sporangium_N = mkN032a "спорангий" ; -lin spore_N = mkN041 "спора" ; ---- +lin spore_N = mkN041 "спора" ; lin sporocarp_N = variants {} ; lin sporogenous_A = mkA079 "спорогенен" ; lin sporophore_N = variants {} ; @@ -58843,7 +58843,7 @@ lin tractive_A = mkA079 "теглителен" ; ---- lin tractor_N = mkN007 "трактор" ; lin tracy_PN = mkPN "Трейси" Masc ; lin trad_N = mkN001 "трад" ; -lin trade_N = compoundN (mkN047 "търговия") (mkA078 "търговски") ; +lin trade_N = dualN (mkN047 "търговия") (mkA078 "търговски") ; lin trade_V = singleV (mkV186 "търгувам") ; lin trade_V2 = dirV2 (singleV (mkV186 "търгувам")) ; lin trade_away_V = advV OP_trade_V OP_away_Adv ; -- guess-p-verb @@ -63043,7 +63043,7 @@ lin wanton_N = mkN041 "развратница" ; lin wanton_V = singleV (mkV177 "крещя") ; ---- lin wantonness_N = variants {mkN049 "буйност"; mkN072 "леконравие"} ; ---- lin wapiti_N = variants {} ; -lin war_N = mkN071 "екстрадиране" ; +lin war_N = mkN041 "война" ; lin war_V = singleV (mkV186 "воювам") ; lin war_baby_N = variants {} ; lin war_bride_N = variants {} ; @@ -63074,7 +63074,7 @@ lin ware_V2 = variants {} ; lin warehouse_N = variants {mkN066 "влагалище"; mkN054 "депо"; mkN047 "магазия"; mkN001 "склад"} ; ---- lin warehouser_N = variants {} ; lin warehousing_N = mkN071 "складиране" ; -lin warfare_N = variants {mkN007 "бран"; mkN041 "война"; mkN071 "воюване"} ; ---- +lin warfare_N = variants {mkN007 "бран"; mkN071 "воюване"} ; ---- lin warfarin_N = mkN018 "варфарин" ; lin warhead_N = variants {} ; lin warhorse_N = variants {} ; diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 5c76740b5..205e672cd 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -14250,8 +14250,8 @@ lin cupule_N = mkN "cupule" ; lin cur_N = mkN "cur" "curs"; lin curability_N = mkN "curability" ; lin curable_A = compoundA (mkA "curable"); -lin curacao_N = mkN "curaçao" ; -lin curacoa_N = mkN "curaçoa" ; +lin curacao_N = variants {mkN "curaçao"; mkN "curacao"} ; +lin curacoa_N = variants {mkN "curaçoa"; mkN "curacoa"} ; lin curacy_N = mkN "curacy" "curacies"; lin curandera_N = mkN "curandera" ; lin curandero_N = mkN "curandero" ; @@ -15165,7 +15165,7 @@ lin deep_A = mkA "deep" "deeper"; lin deep_Adv = mkAdv "deep"; lin deep_N = mkN "deep" "deeps"; lin deep_freeze_N = mkN "deep-freeze" "deep-freezes"; -lin deep_freeze_V2 = mkV2 (mkV "deep-" IrregEng.freeze_V); +lin deep_freeze_V2 = variants {mkV2 (mkV "deep-" IrregEng.freeze_V); mkV2 (irregV "deep freeze" "deep froze" "deep frozen")}; lin deep_laid_A = compoundA (mkA "deep-laid"); lin deep_mined_A = compoundA (mkA "deep-mined"); lin deep_rooted_A = compoundA (mkA "deep-rooted"); diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 2b8622801..a9099d86e 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -8183,7 +8183,7 @@ lin butter_V2 = mkV2 (mkV "breda" "bredde" "brett") ; -- status=guess, src=wikt lin butterbean_N = mkN "butter" ; -- src=google lin butterbur_N = variants {} ; -- status=guess lin buttercrunch_N = variants {} ; -- status=guess -lin buttercup_N = mkN "smörblomma" ; -- status=guess +lin buttercup_N = mkN "smörblomma" ; lin butterfat_N = mkN "smörfett" ; -- src=google lin butterfingers_N = mkN "butter" ; -- src=google lin butterfish_N = mkN "butter" ; -- src=google @@ -54495,7 +54495,7 @@ lin straw_A = variants {} ; -- status=guess lin straw_N = mkN "sugrör" neutrum | mkN "strå" "strået" "strån" "stråna" ; -- SaldoWN -- comment=2 lin straw_V2 = variants {} ; -- status=guess lin straw_coloured_A = variants {} ; -- status=guess -lin strawberry_N = mkN "jordgubbe" utrum | mkN "jordgubbe" utrum ; -- SaldoWN +lin strawberry_N = mkN "jordgubb" utrum | mkN "jordgubbe" utrum ; -- SaldoWN lin strawboard_N = mkN "halm" ; lin strawflower_N = variants {} ; -- status=guess lin strawworm_N = variants {} ; -- status=guess