diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 99055672f..6b00e6da3 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -7,7 +7,7 @@ flags oper advV : V -> Adv -> V = \v,_ -> v ; ---- ----oper advV : V -> Adv -> V = \v,adv -> v ** {s = \\a,f => v.s ! a ! f ++ adv.s} ; ---- "prefix" right after the verb -lin a_bomb_N = variants {} ; +lin a_bomb_N = compoundN (mkA079 "атомен") (mkN041 "бомба") ; lin a_fortiori_Adv = variants {} ; lin a_la_carte_Adv = variants {} ; lin a_la_mode_Adv = variants {} ; @@ -18,7 +18,7 @@ lin aa_N = variants {} ; lin aachen_PN = mkPN "Аахен" Masc ; lin aalii_N = variants {} ; lin aardvark_N = mkN007 "мравояд" ; -lin aardwolf_N = variants {} ; +lin aardwolf_N = compoundN (mkA079 "земен") (mkN014 "вълк") ; lin aarhus_PN = mkPN "Орхюс" Masc ; lin ab_initio_Adv = variants {} ; lin aba_N = variants {} ; @@ -29,7 +29,7 @@ lin abacus_N = mkN014 "абак" ; lin abaft_Adv = variants {} ; lin abaft_Prep = variants {} ; lin abalone_N = mkN007 "охлюв" ; -lin abampere_N = variants {} ; +lin abampere_N = mkN007 "ампер" ; lin abandon_N = mkN071 "изоставяне" ; lin abandon_V2 = dirV2 (dualV (mkV187 "изоставям") (mkV173 "изоставя")) ; lin abandonment_N = mkN071 "напускане" ; @@ -50,7 +50,7 @@ lin abattoir_N = mkN041 "кланица" ; lin abaxial_A = variants {} ; lin abaya_N = mkN047 "абая" ; lin abbacy_N = mkN054 "абатство"; -lin abbatial_A = variants {} ; +lin abbatial_A = mkA078 "игуменски" ; lin abbe_N = mkN007a "игумен" ; lin abbess_N = mkN041 "игуменка" ; lin abbey_N = mkN054 "абатство" ; @@ -58,7 +58,7 @@ lin abbot_N = mkN007a "абат" ; lin abbreviate_V2 = dirV2 (dualV (mkV186 "съкращавам") (mkV174 "съкратя")) ; lin abbreviation_N = mkN041 "абревиатура" ; lin abc_N = variants {} ; -lin abcoulomb_N = variants {} ; +lin abcoulomb_N = mkN005 "абкулон" ; lin abdicable_A = variants {} ; lin abdicate_V = singleV (mkV186 "абдикирам") ; lin abdicate_V2 = dirV2 (singleV (mkV186 "абдикирам")) ; @@ -120,8 +120,8 @@ lin ability_N = mkN049 "способност" ; lin abingdon_PN = mkPN "Абингдън" Masc ; lin abiogenesis_N = mkN041 "абиогенеза" ; lin abiogenetic_A = mkA079 "абиогенетичен" ; -lin abiogenist_N = variants {} ; -lin abiotrophy_N = variants {} ; +lin abiogenist_N = mkN007a "абиогенист" ; +lin abiotrophy_N = mkN047 "абиотрофия" ; lin abject_A = mkA079 "унизителен" ; lin abjection_N = mkN071 "унижаване" ; lin abjuration_N = mkN071 "отричане" ; @@ -277,7 +277,7 @@ lin abstruseness_N = mkN071 "неразбиране" ; lin absurd_A = mkA079 "абсурден" ; lin absurd_N = mkN007 "абсурд" ; lin absurdity_N = mkN049 "абсурдност" ; -lin abulia_N = variants {} ; +lin abulia_N = mkN039 "абулия"; lin abulic_A = variants {} ; lin abundance_N = mkN072 "изобилие" ; lin abundant_A = mkA079 "обилен" ; @@ -289,8 +289,8 @@ lin abut_V = variants {} ; lin abutment_N = variants {} ; lin abutter_N = variants {} ; lin abuzz_A = mkA076 "гъмжащ" ; -lin abvolt_N = variants {} ; -lin abwatt_N = variants {} ; +lin abvolt_N = mkN001 "абволт" ; +lin abwatt_N = mkN001 "абват" ; lin abysm_N = mkN041 "бездна" ; lin abysmal_A = mkA079 "дълбоководен" ; ---- lin abyss_N = mkN041 "бездна" ; ---- @@ -2295,7 +2295,7 @@ lin anemography_N = variants {} ; lin anemometer_N = mkN009 "анемометър" ; ---- lin anemometric_A = variants {} ; lin anemometry_N = variants {} ; -lin anemone_N = variants {mkN041 "анемона"; mkN041 "съсънка"} ; ---- +lin anemone_N = mkN047 "анемония" ; lin anemophilous_A = variants {} ; lin anencephalic_A = variants {} ; lin anencephaly_N = mkN039 "аненцефалия" ; @@ -20923,7 +20923,7 @@ lin femoral_A = mkA076 "бедрен" ; ---- lin femtochemistry_N = variants {} ; lin femtometer_N = variants {} ; lin femtosecond_N = mkN041 "фемтосекунда" ; -lin femtovolt_N = variants {} ; +lin femtovolt_N = mkN001 "фемтоволт" ; lin femur_N = variants {} ; lin fen_N = variants {mkN054 "блато"; mkN007 "мочур"} ; ---- lin fence_N = mkN072 "заграждение" ; ---- @@ -34728,7 +34728,7 @@ lin megaspore_N = variants {} ; lin megasporophyll_N = variants {} ; lin megatherian_N = variants {} ; lin megaton_N = mkN007 "мегатон" ; -lin megawatt_N = mkN007 "мегават" ; ---- +lin megawatt_N = mkN007 "мегават" ; lin megestrol_N = mkN007 "мегестрол" ; lin megillah_N = variants {} ; lin megilp_N = variants {} ; @@ -35260,7 +35260,7 @@ lin microsurgery_N = mkN047 "микрохирургия" ; lin microtome_N = mkN007 "микротом" ; lin microtubule_N = mkN007 "микротубул" ; lin microvolt_N = mkN001 "микроволт" ; -lin microwave_N = mkN041 "микровълна" ; ---- +lin microwave_N = mkN041 "микровълна" ; lin micturition_N = mkN071 "уриниране" ; lin mid_A = mkA079 "среден" ; lin mid_Prep = variants {} ; @@ -42196,7 +42196,7 @@ lin picometer_N = variants {} ; lin picornavirus_N = mkN007 "пикорнавирус" ; lin picosecond_N = mkN041 "пикосекунда" ; lin picot_N = mkN054 "пико" ; -lin picovolt_N = variants {} ; +lin picovolt_N = mkN001 "пиковолт" ; lin picric_A = mkA076 "пикринов" ; ---- lin pictograph_N = mkN041a "пиктограма" ; lin pictographic_A = mkA078 "пиктографски" ; @@ -50115,12 +50115,12 @@ lin scyphus_N = variants {} ; lin scythe_N = mkN041 "коса" ; lin scythe_V2 = variants {} ; lin sea_N = dualN (mkN065 "море") (mkA078 "морски") ; -lin sea_anemone_N = variants {} ; -lin sea_animal_N = variants {} ; +lin sea_anemone_N = compoundN (mkA078 "морски") (mkN047 "анемония") ; +lin sea_animal_N = compoundN (mkA078 "морски") (mkN062 "животно") ; lin sea_bathing_N = variants {} ; lin sea_boat_N = variants {} ; lin sea_bream_N = variants {} ; -lin sea_breeze_N = variants {} ; +lin sea_breeze_N = compoundN (mkA078 "морски") (mkN001 "бриз") ; lin sea_coal_N = variants {} ; lin sea_cow_N = variants {} ; lin sea_dog_N = variants {} ; @@ -62745,10 +62745,10 @@ lin volitional_A = mkA078 "волеви" ; ---- lin volley_N = mkN065 "воле" ; lin volley_V = variants {} ; lin volley_V2 = variants {} ; -lin volleyball_N = mkN040a "волейбол" ; ---- -lin volt_N = mkN001 "волт" ; ---- -lin voltage_N = mkN007 "волтаж" ; ---- -lin voltaic_A = mkA076 "волтов" ; ---- +lin volleyball_N = mkN040a "волейбол" ; +lin volt_N = mkN001 "волт" ; +lin voltage_N = mkN007 "волтаж" ; +lin voltaic_A = mkA076 "волтов" ; lin volte_face_N = mkN007 "волтфас" ; lin voltmeter_N = mkN009 "волтметър" ; ---- lin volubility_N = mkN049 "речовитост" ; ---- @@ -63290,7 +63290,7 @@ lin waterweed_N = variants {} ; lin waterworks_N = variants {} ; lin watery_A = mkA079 "воден" ; ---- lin watford_PN = mkPN "Уатфорд" Masc ; -lin watt_N = mkN001 "ват" ; ---- +lin watt_N = mkN001 "ват" ; lin wattage_N = mkN049 "мощност" ; lin wattle_N = mkN041 "брада" ; ---- lin wattmeter_N = mkN009 "ватметър" ; diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 205e672cd..40d36bacb 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -273,7 +273,7 @@ lin abstruseness_N = mkN "abstruseness" ; lin absurd_A = compoundA (mkA "absurd"); lin absurd_N = mkN "absurd" ; lin absurdity_N = mkN "absurdity" "absurdities"; -lin abulia_N = mkN "abulia" ; +lin abulia_N = variants {mkN "abulia"; mkN "aboulia"} ; lin abulic_A = mkA "abulic" ; lin abundance_N = mkN "abundance" ; lin abundant_A = compoundA (mkA "abundant");