removed some clashes from Dictionary ; corrected the probability of IdRP after elimination of that_RP

lib/src/translator/CheckDict.hs

@@ -97,7 +97,7 @@ splitFun f = case span (/='_') (reverse f) of (tac,nuf) -> (reverse nuf, reverse
 ------ word statistics
 
 isUnchecked line = isInfixOf "--" line           -- checked = no comments
-isUnknown line = isInfixOf "variants" line       -- known = not variants {}
+isUnknown line = isInfixOf "{}" line       -- known = not variants {}
 
 statLang lang = do
   dict <- readFile (gfFile "Dictionary" lang) >>= return . lines

lib/src/translator/DictionaryChi.gf

@@ -15821,7 +15821,6 @@ lin telescope_N = mkN "望远镜" ;
 lin televise_V2 = mkV2 "转播" ;
 lin television_N = L.television_N ;
 lin telex_N = mkN "电传" ;
-lin tell_V3 = mkV3 "告诉" ;--"说" ; ----
 lin tell_from_V3 = mkV3 "告诉" ;--"说" ; ----
 lin tell_V = mkV "告诉" ;
 lin tell_V2 = mkV2 "告诉" ;

lib/src/translator/DictionaryDut.gf

@@ -16804,7 +16804,6 @@ lin telephone_V = mkV "telefoneren" ; -- status=guess, src=wikt
 lin telephone_V2 = mkV2 (mkV "telefoneren") ; -- status=guess, src=wikt
 lin telescope_N = mkN "telescoop" masculine | mkN "kijker" masculine ; -- status=guess status=guess
 lin television_N = L.television_N ;
-lin tell_V3 = mkV3 (mkV "vertellen") ;
 lin tell_from_V3 = mkV3 (mkV "onderscheiden") ;
 lin tell_V = mkV "vertellen" ;
 lin tell_V2 = mkV2 (mkV "vertellen") ;

lib/src/translator/DictionaryFin.gf

@@ -50946,7 +50946,6 @@ lin television_N = L.television_N ;
 lin telex_N = mkWN (compoundN "tele" (k6 "printteri")) ; --UNCHK
 lin telfer_N = mkWN (k33 "nostin") ; --UNCHK
 lin teliospore_N = mkWN (compoundN "teliosp" (k48 "ori")) ; --UNCHK
-lin tell_V3 = mkV3 (mkV "kertoa") accusative (mkPrep allative) ;
 lin tell_from_V3 = mkV3 (mkV "erottaa") accusative (mkPrep elative) ;
 lin tell_V = mkV "kertoa" ;
 lin tell_V2 = mkV2 "kertoa" ;

lib/src/translator/DictionaryFre.gf

@@ -20146,9 +20146,8 @@ lin tell_V2 = mkV2 "raconter" ;
 lin tell_V2Q = mkV2Q (mkV "raconter") P.dative ;
 lin tell_V2S = mkV2S (mkV "raconter") ;
 lin tell_V2V = mkV2V (mkV I.dire_V2) P.dative P.genitive ;
-lin tell_V3 = mkV3 (mkV I.dire_V2) ;
+lin tell_VS = mkVS (mkV "raconter") ;
-lin tell_VS = variants{} ;
+lin tell_VV = mkVV (mkV "raconter") ; 
-lin tell_VV = variants{} ;
 lin teller_N = mkN "caissier" masculine | mkN "diseur" masculine ; -- tocheck
 lin telluride_N = mkN "tellurure" masculine ; -- tocheck
 lin tellurium_N = mkN "tellure" masculine ; -- tocheck

lib/src/translator/DictionaryGer.gf

@@ -20134,7 +20134,6 @@ lin telescopy_N = mkN "Telescopie" feminine ; -- status=guess
 lin televise_V2 = mkV2 (junkV (mkV "durch") "Fernsehsender übertragen") ; -- status=guess, src=wikt
 lin television_N = L.television_N ;
 lin telex_N = mkN "Telex" neuter ; -- status=guess
-lin tell_V3 = mkV3 (no_geV (mkV "erzählen")) ;
 lin tell_from_V3 = mkV3 (fixprefixV "unter" I.scheiden_V) accPrep von_Prep ;
 lin tell_V = no_geV (mkV "erzählen") ;
 lin tell_V2 = mkV2 (no_geV (mkV "erzählen")) ;

lib/src/translator/DictionaryIta.gf

@@ -17000,7 +17000,6 @@ lin tell_V2 = mkV2 "raccontare" ;
 lin tell_V2Q = variants{}; -- mkV2 "raccontare" ;
 lin tell_V2S = variants{}; -- mkV2 "raccontare" ;
 lin tell_V2V = variants{}; -- mkV2 "raccontare" ;
-lin tell_V3 = variants{}; -- mkV2 "raccontare" ;
 lin tell_VS = variants{}; -- mkV2 "raccontare" ;
 lin tell_VV = variants{}; -- mkV "raccontare" ;
 lin telltale_N = mkN "mostravento" ; -- status=guess

lib/src/translator/DictionarySpa.gf

@@ -20509,7 +20509,6 @@ lin telescope_N = mkN "telescopio" ; -- status=guess
 lin telescopic_A = mkA "telescópico" ; -- status=guess
 lin televise_V2 = mkV2 (mkV "televisar") ; -- status=guess, src=wikt
 lin television_N = L.television_N ;
-lin tell_V3 = mkV3 (mkV "contar") ;
 lin tell_from_V3 = mkV3 (mkV "distinguir");
 lin tell_V = mkV "contar" ;
 lin tell_V2 = mkV2 (mkV "contar") ;

lib/src/translator/DictionarySwe.gf

@@ -57877,7 +57877,6 @@ lin tell_V2 = mkV2 "berätta" ;
 lin tell_V2Q = mkV2Q (mkV "berätta") (mkPrep "för") ;
 lin tell_V2S = mkV2S (mkV "berätta") (mkPrep "för") ;
 lin tell_V2V = mkV2V (mkV "berätta") (mkPrep []) (mkPrep "för") ;
-lin tell_V3 = mkV3 (mkV "skvallrar");
 lin tell_VS = mkVS (mkV "berätta") ;
 lin tell_VV = mkVV (mkV "berätta") ;
 lin tell_apart_V2 = dirV2 (partV (mkV "skilja" "skilde" "skilt") "av") ; -- status=guess

lib/src/translator/todo/TopDictionaryBul.gf

@@ -97,9 +97,9 @@ lin than_Subj = variants{} ; --
 lin more_Adv = variants{} ; -- 
 lin about_Prep = mkPrep "за" Acc;
 lin now_Adv = mkAdv "сега";
-lin last_A = mkA079 "предишен" ;
+lin last_A = variants{} ; -- 
-lin last_1_A = variants{} ; -- 
+lin last_1_A = mkA079 "последен";
-lin last_2_A = variants{} ; -- 
+lin last_2_A = mkA079 "предишен";
 lin other_A = mkA076 "друг" ;
 lin give_V3 = mkV3 (dualV (mkV186 "давам") (mkV168 "дам")) (mkPrep "на" Acc) noPrep;
 lin give_V2 = dirV2 (dualV (mkV186 "давам") (mkV168 "дам"));
@@ -418,9 +418,9 @@ lin hear_VS = variants{}; -- dirV2 (dualV (mkV186 "чувам") (mkV163 "чуя"
 lin hear_V2V = mkV2V (dualV (mkV186 "чувам") (mkV163 "чуя")) noPrep noPrep; ----
 lin hear_V2 = dirV2 (dualV (mkV186 "чувам") (mkV163 "чуя")); ----
 lin hear_V = variants{}; -- dirV2 (dualV (mkV186 "чувам") (mkV163 "чуя")); ----
-lin room_N = mkN054 "пространство" ;
+lin room_N = variants{} ; -- 
-lin room_1_N = variants{} ; -- 
+lin room_1_N = mkN047 "стая";
-lin room_2_N = variants{} ; -- 
+lin room_2_N = mkN054 "пространство";
 lin whether_Subj = variants{} ; -- 
 lin water_N = mkN041 "вода" ;
 lin form_N = mkN041 "форма";
@@ -512,9 +512,9 @@ lin face_N = mkN066 "лице" ;
 lin sit_VA = variants{}; -- singleV (mkV177 "седя");
 lin sit_V2 = dirV2 (variants {singleV (mkV186 "заседавам") ; singleV (mkV142 "съм")}); ----
 lin sit_V = singleV (mkV177 "седя");
-lin market_N = mkN007 "пазар" ;
+lin market_N = variants{} ; -- 
-lin market_1_N = variants{} ; -- 
+lin market_1_N = mkN007 "пазар";
-lin market_2_N = variants{} ; -- 
+lin market_2_N = mkN007 "пазар";
 lin appear_VV = mkVV (variants {dualV (mkV186 "изглеждам") (mkV186 "изгледам")}); ----
 lin appear_VS = variants{}; -- dirV2 (dualV (mkV186 "показвам") (mkV156 "покажа"));
 lin appear_VA = mkVA (dualV (mkV186 "изглеждам") (mkV186 "изгледам"));
@@ -630,9 +630,9 @@ lin position_N = mkN072 "положение" ;
 lin low_A = mkA080 "низък" ;
 lin cost_N = mkN041 "цена" ;
 lin little_Det = variants{} ; -- 
-lin matter_N = mkN007 "въпрос" ;
+lin matter_N = variants{} ; -- 
-lin matter_1_N = variants{} ; -- 
+lin matter_1_N = mkN047 "материя";
-lin matter_2_N = variants{} ; -- 
+lin matter_2_N = mkN007 "въпрос";
 lin community_N = mkN049 "общност" ;
 lin remain_VV = mkVV (dualV (mkV186 "оставам") (mkV152 "остана"));
 lin remain_VS = variants{}; -- dirV2 (dualV (mkV186 "оставам") (mkV152 "остана"));
@@ -703,9 +703,9 @@ lin build_V = singleV (mkV175 "строя");
 lin spend_V2 = dirV2 (singleV (mkV176 "харча"));
 lin spend_V = singleV (mkV176 "харча");
 lin force_N = mkN041 "сила" ;
-lin condition_N = mkN047 "кондиция" ;
+lin condition_N = variants{} ; -- 
-lin condition_1_N = variants{} ; -- 
+lin condition_1_N = mkN072 "условие";
-lin condition_2_N = variants{} ; -- 
+lin condition_2_N = mkN047 "кондиция";
 lin paper_N = mkN047 "хартия" ; ----
 lin off_Prep = variants{} ; -- 
 lin major_A = mkA079 "главен" ;
@@ -776,9 +776,9 @@ lin department_N = mkN007 "отдел" ;
 lin management_N = mkN071 "водене" ;
 lin morning_N = mkN054 "утро" ;
 lin draw_V2V = mkV2V (variants {dualV (mkV186 "привличам") (mkV149 "привлека") ; dualV (mkV186 "извличам") (mkV149 "извлека") ; dualV (mkV186 "обръщам") (mkV152 "обърна")}) noPrep noPrep; ----
-lin draw_V2 = dirV2 (variants {dualV (mkV186 "привличам") (mkV149 "привлека") ; dualV (mkV186 "извличам") (mkV149 "извлека") ; dualV (mkV186 "обръщам") (mkV152 "обърна")}); ----
+lin draw_V2 = variants{}; -- mkV2V (variants {dualV (mkV186 "привличам") (mkV149 "привлека") ; dualV (mkV186 "извличам") (mkV149 "извлека") ; dualV (mkV186 "обръщам") (mkV152 "обърна")}) noPrep noPrep; ----
-lin draw_1_V2 = variants{} ; -- 
+lin draw_1_V2 = dirV2 (stateV (mkV173 "тегля"));
-lin draw_2_V2 = variants{} ; -- 
+lin draw_2_V2 = dirV2 (dualV (mkV186 "рисувам") (mkV186 "нарисувам"));
 lin draw_V = dualV (mkV187 "съставям") (mkV173 "съставя") ; ----
 lin hope_VV = mkVV (medialV (singleV (mkV186 "надявам")) Acc);
 lin hope_VS = mkVS (medialV (singleV (mkV186 "надявам")) Acc);
@@ -810,7 +810,7 @@ lin game_2_N = variants{} ; --
 lin game_1_N = variants{} ; -- 
 lin food_N = dualN (mkN041 "храна") (mkA079 "хранителен");
 lin role_N = mkN047 "роля"; ----
-lin role_2_N = variants{} ; -- 
+lin role_2_N = mkN047 "роля";
 lin role_1_N = mkN047 "роля" ;
 lin practice_N = mkN041 "практика" ;
 lin bank_N = dualN (mkN041 "банка") (mkA076 "банков");
@@ -858,9 +858,9 @@ lin land_N = mkN047 "земя";
 lin trade_N = mkN047 "търговия";
 lin watch_VS = mkVS (singleV (mkV186 "гледам"));
 lin watch_V2V = mkV2V (singleV (mkV186 "гледам")) noPrep noPrep;
-lin watch_V2 = dirV2 (singleV (mkV186 "гледам"));
+lin watch_V2 = variants{}; -- mkV2V (singleV (mkV186 "гледам")) noPrep noPrep;
-lin watch_1_V2 = variants{} ; -- 
+lin watch_1_V2 = dirV2 (singleV (mkV186 "гледам"));
-lin watch_2_V2 = variants{} ; -- 
+lin watch_2_V2 = dirV2 (stateV (mkV186 "наблюдавам"));
 lin watch_V = singleV (mkV186 "гледам");
 lin white_A = mkA081 "бял" ;
 lin situation_N = mkN047 "ситуация" ;
@@ -1306,7 +1306,7 @@ lin compare_V = dualV (mkV186 "сравнявам") (mkV174 "сравня");
 lin suffer_V2 = prepV2 (singleV (mkV186 "страдам")) (mkPrep "от" Acc);
 lin suffer_V = singleV (mkV186 "страдам");
 lin individual_A = mkA079 "индивидуален" ;
-lin forward_Adv = variants{} ; -- 
+lin forward_Adv = mkAdv "напред";
 lin announce_VS = mkVS (singleV (mkV186 "анонсирам"));
 lin announce_V2 = dirV2 (singleV (mkV186 "анонсирам"));
 lin user_N = variants{} ; -- 
@@ -1374,7 +1374,7 @@ lin train_V = singleV (mkV186 "тренирам");
 lin maintain_VS = variants{}; -- dirV2 (singleV (mkV186 "поддържам"));
 lin maintain_V2 = dirV2 (singleV (mkV186 "поддържам"));
 lin maintain_V = variants{}; -- dirV2 (singleV (mkV186 "поддържам"));
-lin attempt_N = mkN007 "опит";
+lin attempt_N = variants{} ; -- 
 lin leg_N = mkN022 "крак" ;
 lin investment_N = mkN071 "инвестиране" ;
 lin save_V2 = dirV2 (variants {dualV (mkV186 "спасявам") (mkV174 "спася") ; dualV (mkV186 "спестявам") (mkV174 "спестя")}); ----
@@ -1727,7 +1727,7 @@ lin move_N = mkN071 "прехвърляне" ;
 lin message_N = mkN072 "съобщение";
 lin fear_N = mkN001 "страх";
 lin afternoon_N = mkN049 "вечер";
-lin drink_V2 = variants{}; -- singleV (mkV163 "пия");
+lin drink_V2 = dirV2 (singleV (mkV163 "пия"));
 lin drink_V = singleV (mkV163 "пия");
 lin fully_Adv = variants{} ; -- 
 lin race_N = mkN041 "надпревара" ;
@@ -2436,7 +2436,7 @@ lin unlikely_A = mkA079 "невероятен";
 lin properly_Adv = variants{} ; -- 
 lin guest_N = dualN (mkN007a "гост") (mkA076 "гостуващ");
 lin code_N = mkN054 "правило" ;
-lin hill_N = mkN041 "планина" ; ----
+lin hill_N = mkN001 "хълм";
 lin screen_N = mkN007 "екран";
 lin household_N = mkN054 "домакинство";
 lin sequence_N = mkN041 "редица" ;
@@ -2498,7 +2498,7 @@ lin step_V2 = variants{}; -- dualV (mkV186 "прекрачвам") (mkV176 "пр
 lin step_V = dualV (mkV186 "прекрачвам") (mkV176 "прекрача"); ----
 lin curriculum_N = mkN041 "програма"; ----
 lin noise_N = mkN001 "шум" ; ----
-lin lunch_N = mkN040a "обяд";
+lin lunch_N = variants{} ; -- 
 lin fear_VS = mkVS (medialV (singleV (mkV186 "страхувам")) Acc);
 lin fear_V2 = prepV2 (medialV (singleV (mkV186 "страхувам")) Acc) (mkPrep "от" Acc);
 lin fear_V = medialV (singleV (mkV186 "страхувам")) Acc;
@@ -2602,7 +2602,7 @@ lin wing_N = mkN056 "крило" ;
 lin surprise_N = mkN041 "изненада";
 lin male_N = dualN (mkN024 "мъж") (mkA078 "мъжки");
 lin ring_N = variants{} ; -- 
-lin pub_N = variants{} ; -- 
+lin pub_N = mkN001 "бар";
 lin fruit_N = mkN001 "плод" ;
 lin passage_N = mkN007 "преход" ; ----
 lin illustrate_VS = variants{}; -- dirV2 (singleV (mkV186 "илюстрирам")); ----
@@ -3021,7 +3021,7 @@ lin acknowledge_V = dualV (mkV186 "признавам") (mkV161 "призная"
 lin register_V2 = dirV2 (singleV (mkV186 "регистрирам")); ----
 lin register_V = variants{}; -- dirV2 (singleV (mkV186 "регистрирам")); ----
 lin regime_N = variants{} ; -- 
-lin regime_2_N = variants{} ; -- 
+lin regime_2_N = mkN007 "режим";
 lin regime_1_N = mkN007 "режим" ;
 lin fault_N = mkN007 "разлом" ; ----
 lin dispute_N = mkN001 "спор" ;
@@ -3046,7 +3046,7 @@ lin obligation_N = mkN049 "обвързаност" ;
 lin gene_N = dualN (mkN007 "ген") (mkA079 "карциногенен");
 lin yellow_A = mkA076 "жълт";
 lin republic_N = mkN041 "република" ;
-lin shadow_N = variants{} ; -- 
+lin shadow_N = mkN041a "сянка";
 lin dear_A = mkA076 "скъп";
 lin analyse_V2 = dirV2 (singleV (mkV186 "анализирам"));
 lin anywhere_Adv = variants{} ; -- 
@@ -3410,7 +3410,7 @@ lin solid_A = mkA079 "стабилен" ;
 lin cloud_N = mkN014 "облак" ;
 lin across_Adv = variants{}; -- mkPrep "през" Acc;
 lin level_A = mkA079 "равен";
-lin enquiry_N = variants{} ; -- 
+lin enquiry_N = mkN071 "запитване";
 lin fight_N = mkN041 "борба" ;
 lin abuse_N = mkN041 "злоупотреба" ;
 lin golf_N = mkN001 "голф";
@@ -3484,7 +3484,7 @@ lin disaster_N = mkN072 "бедствие" ; ----
 lin darkness_N = mkN041 "тъмнина" ; ----
 lin bid_N = mkN041 "оферта" ;
 lin sake_N = mkN069 "име" ; ----
-lin sake_2_N = variants{} ; -- 
+lin sake_2_N = mkN065 "саке";
 lin sake_1_N = mkN069 "име" ; ----
 lin organize_V2V = mkV2V (singleV (mkV186 "организирам")) noPrep noPrep; ----
 lin organize_V2 = dirV2 (singleV (mkV186 "организирам"));
@@ -3828,7 +3828,7 @@ lin open_Adv = variants{} ; --
 lin journal_N = mkN014 "дневник" ; ----
 lin shopping_N = mkN071 "купуване" ;
 lin equivalent_N = mkN007 "еквивалент" ;
-lin palace_N = mkN008 "дворец" ; ----
+lin palace_N = mkN008 "дворец";
 lin exceed_V2 = dirV2 (dualV (mkV187 "надхвърлям") (mkV173 "надхвърля"));
 lin isolated_A = variants{} ; -- 
 lin poetry_N = mkN047 "поезия" ; ----
@@ -3850,7 +3850,7 @@ lin behind_Adv = variants{}; -- mkPrep "зад" Acc;
 lin ward_N = variants{} ; -- 
 lin profile_N = mkN007 "профил" ;
 lin fat_A = mkA076 "дебел";
-lin comfort_N = mkN054 "удобство" ;
+lin comfort_N = dualN (mkN007 "комфорт") (mkA079 "комфортен");
 lin bathroom_N = mkN047 "баня";
 lin shell_N = mkN041 "граната" ;
 lin reward_N = mkN041 "награда";
@@ -3974,7 +3974,7 @@ lin continuous_A = mkA079 "продължителен";
 lin concert_N = mkN007 "концерт" ;
 lin breast_N = mkN041 "гърда" ;
 lin extraordinary_A = mkA079 "извънреден" ;
-lin squad_N = variants{} ; -- 
+lin squad_N = mkN007 "взвод";
 lin wonder_N = mkN060 "чудо";
 lin cream_N = mkN001 "крем";
 lin tennis_N = mkN007 "тенис" ; ----
@@ -4037,7 +4037,7 @@ lin stir_V2 = dirV2 (singleV (mkV186 "вълнувам")); ----
 lin stir_V = dualV (mkV186 "помръдвам") (mkV152 "помръдна") ; ----
 lin storm_N = mkN047 "буря";
 lin mail_N = dualN (mkN041 "поща") (mkA078 "пощенски");
-lin rugby_N = variants{} ; -- 
+lin rugby_N = mkN065 "ръгби";
 lin virtue_N = mkN041 "сила" ;
 lin specimen_N = mkN007 "специмен";
 lin psychology_N = mkN047 "психология" ; ----
@@ -4093,7 +4093,7 @@ lin burst_V2 = variants{} ; --
 lin burst_V = variants{} ; -- 
 lin charter_N = mkN041 "грамота" ; ----
 lin feminist_N = variants{} ; -- 
-lin discourse_N = variants{} ; -- 
+lin discourse_N = mkN007 "дискурс";
 lin reflection_N = mkN072 "отражение";
 lin carbon_N = mkN007 "въглерод" ; ----
 lin sophisticated_A = mkA076 "изтънчен";
@@ -4102,7 +4102,7 @@ lin taxation_N = mkN071 "таксуване" ;
 lin prosecution_N = mkN071 "преследване" ;
 lin softly_Adv = variants{} ; -- 
 lin asleep_A = variants{} ; -- 
-lin aids_N = variants{} ; -- 
+lin aids_N = mkN049 "помощ";
 lin publicity_N = mkN049 "публичност" ;
 lin departure_N = mkN071 "заминаване" ;
 lin welcome_A = mkA076 "желан";
@@ -4347,8 +4347,8 @@ lin borough_N = mkN041 "община" ;
 lin well_A = variants{} ; -- 
 lin suspicion_N = mkN072 "съмнение" ;
 lin portrait_N = dualN (mkN007 "портрет") (mkA079 "портретен");
-lin local_N = variants{} ; -- 
+lin local_N = mkN007 "локал";
-lin jew_N = variants{} ; -- 
+lin jew_N = mkN018 "евреин";
 lin fragment_N = variants{} ; -- 
 lin revolutionary_A = mkA079 "революционен" ;
 lin evaluate_V2 = dirV2 (dualV (mkV186 "оценявам") (mkV174 "оценя"));
@@ -4429,8 +4429,8 @@ lin urgent_A = mkA079 "спешен" ;
 lin prompt_V2V = mkV2V (dualV (mkV186 "накарвам") (mkV186 "накарам")) noPrep noPrep; ----
 lin prompt_V2 = dirV2 (dualV (mkV186 "подбуждам") (mkV173 "подбудя"));
 lin mate_N = variants{} ; -- 
-lin mate_2_N = variants{} ; -- 
+lin mate_2_N = mkN065 "мате";
-lin mate_1_N = variants{} ; -- 
+lin mate_1_N = mkN041a "половинка";
 lin exposure_N = mkN049 "изложеност";
 lin server_N = mkN007 "сървър" ; ----
 lin distinctive_A = variants{} ; -- 
@@ -4593,7 +4593,7 @@ lin nearby_A = mkA079 "околен" ;
 lin experienced_A = mkA079 "опитен";
 lin lorry_N = mkN007 "камион" ;
 lin exclusive_A = mkA079 "монополен"; ----
-lin graphics_N = variants{} ; -- 
+lin graphics_N = mkN038 "графика";
 lin stimulate_V2 = dirV2 (singleV (mkV186 "стимулирам"));
 lin warmth_N = mkN041 "топлина";
 lin therapy_N = mkN047 "терапия" ; ----
@@ -4882,7 +4882,7 @@ lin bastard_N = variants{} ; --
 lin ingredient_N = variants{} ; -- 
 lin dull_A = mkA080 "тежък" ; ----
 lin cater_V = variants{} ; -- 
-lin scholar_N = mkN001 "учен";
+lin scholar_N = substantiveN (mkA076 "учен") (AMasc Human);
 lin faint_A = mkA076 "слаб" ; ----
 lin ghost_N = mkN001 "дух";
 lin sculpture_N = mkN041 "скулптура" ; ----
@@ -5028,7 +5028,7 @@ lin brave_A = mkA076 "смел";
 lin tutor_N = variants{} ; -- 
 lin tune_N = mkN047 "мелодия";
 lin debut_N = mkN007 "дебют"; ----
-lin debut_2_N = variants{} ; -- 
+lin debut_2_N = mkN007 "дебют";
 lin debut_1_N = mkN007 "дебют" ; ----
 lin continued_A = variants{} ; -- 
 lin bid_V2 = variants{}; -- singleV (mkV186 "умолявам") ; ----
@@ -5056,7 +5056,7 @@ lin plead_V = singleV (mkV186 "умолявам") ; ----
 lin duck_N = mkN041 "патица";
 lin breed_N = mkN041 "порода";
 lin assistant_A = variants{} ; -- 
-lin pint_N = variants{} ; -- 
+lin pint_N = mkN041 "пинта";
 lin abolish_V2 = dirV2 (dualV (mkV187 "отхвърлям") (mkV173 "отхвърля"));
 lin translation_N = mkN007 "превод";
 lin princess_N = mkN047 "княгиня" ; ----
@@ -5166,7 +5166,7 @@ lin fascinating_A = variants{} ; --
 lin disappointment_N = mkN072 "разочарование" ;
 lin auditor_N = mkN007a "одитор";
 lin hostility_N = mkN054 "неприятелство" ;
-lin spending_N = variants{} ; -- 
+lin spending_N = mkN007 "разход";
 lin scarcely_Adv = variants{} ; -- 
 lin compulsory_A = mkA076 "необходим" ; ----
 lin photographer_N = mkN007a "фотограф";
@@ -5252,7 +5252,7 @@ lin advocate_V2 = dirV2 (singleV (mkV186 "адвокатствам"));
 lin polytechnic_N = mkN041 "политехника"; ----
 lin inhabitant_N = mkN031a "жител" ;
 lin evil_A = mkA076 "лош";
-lin slave_N = variants{} ; -- 
+lin slave_N = mkN007 "роб";
 lin reservation_N = mkN049 "резервираност" ;
 lin slam_V2 = variants{} ; -- 
 lin slam_V = variants{} ; -- 
@@ -5286,7 +5286,7 @@ lin nowadays_Adv = variants{} ; --
 lin giant_A = variants{} ; -- 
 lin waiting_N = variants{} ; -- 
 lin tap_N = mkN071 "потупване" ; ----
-lin shit_N = variants{} ; -- 
+lin shit_N = mkN041 "пука";
 lin sandwich_N = mkN007 "сандвич";
 lin vanish_V = dualV (mkV186 "изчезвам") (mkV152 "изчезна") ; ----
 lin commerce_N = mkN054 "стопанство" ;
@@ -5419,7 +5419,7 @@ lin workstation_N = variants{} ; --
 lin prey_N = mkN041 "плячка"; ----
 lin manual_N = mkN014 "наръчник" ; ----
 lin cure_N = variants{} ; -- 
-lin cure_2_N = variants{} ; -- 
+lin cure_2_N = mkN071 "излекуване";
 lin cure_1_N = mkN072 "лечение" ; ----
 lin overall_N = variants{} ; -- 
 lin tighten_V2 = dirV2 (dualV (mkV186 "затягам") (mkV152 "затегна"));
@@ -5528,7 +5528,7 @@ lin model_V = variants{} ; --
 lin inn_N = variants{} ; -- 
 lin initial_N = mkN007 "инициал";
 lin suspension_N = mkN071 "суспендиране" ;
-lin respondent_N = variants{} ; -- 
+lin respondent_N = mkN007a "респондент";
 lin over_N = mkN041 "наддавка"; ----
 lin naval_A = mkA078 "морски" ;
 lin monthly_A = mkA079 "месечен" ;
@@ -5709,7 +5709,7 @@ lin taxpayer_N = mkN008a "данъкоплатец" ;
 lin corruption_N = mkN047 "корупция" ;
 lin accurately_Adv = variants{} ; -- 
 lin honour_V2 = dirV2 (dualV (mkV186 "почитам") (mkV145 "почета"));
-lin depict_V2 = dirV2 (variants {dualV (mkV186 "рисувам") (mkV186 "нарисувам") ; dualV (mkV187 "представям") (mkV173 "представя") ; dualV (mkV186 "описвам") (mkV159 "опиша")}); ----
+lin depict_V2 = dirV2 (dualV (mkV186 "описвам") (mkV159 "опиша"));
 lin pencil_N = mkN007 "молив" ; ----
 lin drown_V2 = dirV2 (singleV (mkV173 "давя")); ----
 lin drown_V = variants{}; -- dirV2 (singleV (mkV173 "давя")); ----
@@ -5741,7 +5741,7 @@ lin grief_N = mkN049 "жалост" ;
 lin erect_V2 = dirV2 (variants {dualV (mkV186 "издигам") (mkV152 "издигна") ; dualV (mkV187 "изправям") (mkV173 "изправя")}); ----
 lin tuck_V2 = variants{} ; -- 
 lin tuck_V = variants{} ; -- 
-lin meantime_N = variants{} ; -- 
+lin meantime_N = mkN072 "междувремие";
 lin barrel_N = mkN007 "барел";
 lin lawn_N = mkN041 "ливада";
 lin hut_N = variants{} ; -- 
@@ -5849,7 +5849,7 @@ lin noble_A = mkA079 "благороден" ;
 lin mask_N = mkN041 "маска" ; ----
 lin lecturer_N = mkN007a "лектор";
 lin girlfriend_N = mkN041 "приятелка";
-lin forehead_N = mkN054 "чело"; ----
+lin forehead_N = mkN054 "чело";
 lin timetable_N = mkN014 "график" ;
 lin symbolic_A = mkA079 "символичен" ; ----
 lin farming_N = mkN054 "фермерство";
@@ -5901,7 +5901,7 @@ lin fatal_A = mkA079 "фатален";
 lin banker_N = mkN007a "банкер" ;
 lin compensate_V2 = dirV2 (singleV (mkV186 "компенсирам"));
 lin compensate_V = singleV (mkV186 "компенсирам");
-lin make_up_N = variants{} ; -- 
+lin make_up_N = mkN001 "грим";
 lin seat_V2 = variants{} ; -- 
 lin popularity_N = mkN049 "популярност" ;
 lin interior_A = mkA079 "вътрешен";
@@ -6044,7 +6044,7 @@ lin temporarily_Adv = variants{} ; --
 lin rain_V2 = variants{} ; -- 
 lin rain_V = variants{} ; -- 
 lin pin_N = mkN041 "карфица" ;
-lin villa_N = variants{} ; -- 
+lin villa_N = mkN074 "вила";
 lin rod_N = mkN041 "пръчица" ;
 lin frontier_N = mkN041 "граница" ; ----
 lin enforcement_N = mkN071 "налагане";
@@ -6099,7 +6099,7 @@ lin pump_N = mkN041 "помпа";
 lin probe_N = mkN071 "изследване" ;
 lin feedback_N = variants{} ; -- 
 lin aspiration_N = mkN047 "аспирация" ;
-lin suspect_N = variants{} ; -- 
+lin suspect_N = mkN007 "заподозрян";
 lin solar_A = mkA076 "слънчев";
 lin fare_N = mkN041 "храна" ; ----
 lin carve_V2 = variants{}; -- singleV (mkV149 "сека") ; ----
@@ -6143,7 +6143,7 @@ lin burning_A = variants{} ; --
 lin vitamin_N = mkN007 "витамин" ; ----
 lin sail_N = variants{} ; -- 
 lin lemon_N = mkN007 "лимон" ; ----
-lin foreigner_N = mkN008a "чужденец" ; ----
+lin foreigner_N = mkN008a "чужденец";
 lin powder_N = variants{} ; -- 
 lin persistent_A = variants{} ; -- 
 lin bat_N = mkN007 "прилеп";
@@ -6206,7 +6206,7 @@ lin supervise_V2 = dirV2 (singleV (mkV186 "контролирам")); ----
 lin supervise_V = variants{}; -- dirV2 (singleV (mkV186 "контролирам")); ----
 lin sickness_N = variants{} ; -- 
 lin package_V2 = dirV2 (singleV (mkV186 "пакетирам"));
-lin intake_N = variants{} ; -- 
+lin intake_N = mkN007 "прием";
 lin within_Adv = variants{}; -- mkPrep "в" Acc;
 lin inland_A = variants{} ; -- 
 lin beast_N = mkN002a "звяр";
@@ -6273,7 +6273,7 @@ lin inheritance_N = mkN071 "наследяване";
 lin heal_V2 = variants{} ; -- 
 lin heal_V = variants{} ; -- 
 lin sovereignty_N = mkN007 "суверенитет" ;
-lin enzyme_N = variants{} ; -- 
+lin enzyme_N = mkN007 "ензим";
 lin host_V2 = variants{} ; -- 
 lin neighbouring_A = variants{} ; -- 
 lin corn_N = mkN041 "царевица" ; ----
@@ -6374,7 +6374,7 @@ lin specialize_V = singleV (mkV186 "специализирам");
 lin steer_V2 = dirV2 (variants {dualV (mkV186 "насочвам") (mkV176 "насоча") ; singleV (mkV186 "направлявам")}); ----
 lin steer_V = variants{}; -- dirV2 (variants {dualV (mkV186 "насочвам") (mkV176 "насоча") ; singleV (mkV186 "направлявам")}); ----
 lin selected_A = variants{} ; -- 
-lin like_N = variants{} ; -- 
+lin like_N = mkN071 "харесване";
 lin confer_V2 = dirV2 (dualV (mkV187 "предоставям") (mkV173 "предоставя")); ----
 lin confer_V = dualV (mkV186 "дарявам") (mkV174 "даря") ; ----
 lin usage_N = mkN041 "употреба" ;
@@ -6432,7 +6432,7 @@ lin endure_V = variants{}; -- dirV2 (dualV (mkV186 "устоявам") (mkV180 "
 lin verbal_A = mkA079 "вербален" ;
 lin stride_V2 = dirV2 (dualV (mkV186 "минавам") (mkV152 "мина")); ----
 lin stride_V = singleV (mkV176 "крача"); ----
-lin nursing_N = variants{} ; -- 
+lin nursing_N = mkN071 "кърмене";
 lin exert_V2 = dirV2 (dualV (mkV186 "упражнявам") (mkV174 "упражня")); ----
 lin compatible_A = mkA076 "съвместим";
 lin causal_A = mkA079 "причинен";
@@ -6478,7 +6478,7 @@ lin boil_V2 = dirV2 (singleV (mkV174 "варя"));
 lin boil_V = singleV (mkV177 "вря");
 lin static_A = mkA079 "статичен";
 lin scent_N = mkN072 "ухание";
-lin civilian_N = variants{} ; -- 
+lin civilian_N = substantiveN (mkA079 "цивилен") (AMasc Human);
 lin monk_N = mkN016 "монах";
 lin abruptly_Adv = variants{} ; -- 
 lin keyboard_N = mkN041 "клавиатура";
@@ -6521,7 +6521,7 @@ lin maid_N = variants{} ; --
 lin furnish_V2 = dirV2 (dualV (mkV187 "представям") (mkV173 "представя")); ----
 lin ethical_A = variants{} ; -- 
 lin bicycle_N = variants{} ; -- 
-lin sick_N = variants{} ; -- 
+lin sick_N = substantiveN (mkA079 "болен") (AMasc Human);
 lin sack_N = mkN001 "сак";
 lin renaissance_N = mkN007 "ренесанс" ;
 lin luxury_N = dualN (mkN001 "лукс") (mkA079 "луксозен");
@@ -6712,7 +6712,7 @@ lin pill_N = variants{} ; --
 lin noisy_A = variants{} ; -- 
 lin feather_N = mkN054 "перо";
 lin lexical_A = mkA079 "лексикален";
-lin staircase_N = variants{} ; -- 
+lin staircase_N = mkN066 "стълбище";
 lin autonomous_A = mkA079 "автономен" ;
 lin viewpoint_N = mkN066 "гледище"; ----
 lin projection_N = mkN047 "проекция" ;
@@ -6874,7 +6874,7 @@ lin stab_V = variants{} ; --
 lin rude_A = variants{} ; -- 
 lin offset_V2 = dirV2 (dualV (mkV186 "измествам") (mkV173 "изместя"));
 lin thinking_N = mkN009 "размисъл";
-lin mainframe_N = variants{} ; -- 
+lin mainframe_N = mkN001 "мейнфрейм";
 lin flock_N = variants{} ; -- 
 lin amateur_A = variants{} ; -- 
 lin academy_N = mkN047 "академия" ;
@@ -6963,7 +6963,7 @@ lin bomber_N = mkN007 "бомбардировач"; ----
 lin voltage_N = mkN007 "волтаж"; ----
 lin unusually_Adv = variants{} ; -- 
 lin toast_N = variants{} ; -- 
-lin feel_N = variants{} ; -- 
+lin feel_N = mkN071 "усещане";
 lin suffering_N = mkN072 "страдание" ;
 lin polish_V2 = variants{}; -- singleV (mkV186 "шлифовам");
 lin polish_V = singleV (mkV186 "шлифовам");
@@ -6977,14 +6977,14 @@ lin goat_N = dualN (mkN041 "коза") (mkA088 "кози");
 lin conceptual_A = mkA079 "концептуален";
 lin ant_N = mkN041 "мравка";
 lin inflict_V2 = variants{} ; -- 
-lin bowler_N = variants{} ; -- 
+lin bowler_N = mkN070 "бомбе";
 lin roar_V2 = variants{} ; -- 
 lin roar_V = variants{} ; -- 
 lin drain_N = mkN071 "отводняване" ; ----
 lin wrong_N = variants{} ; -- 
 lin galaxy_N = mkN041 "галактика";
 lin aluminium_N = mkN032 "алуминий";
-lin receptor_N = variants{} ; -- 
+lin receptor_N = mkN007 "рецептор";
 lin preach_V2 = dirV2 (dualV (mkV186 "проповядвам") (mkV186 "проповядам")); ----
 lin preach_V = dualV (mkV186 "проповядвам") (mkV186 "проповядам") ; ----
 lin parade_N = mkN007 "парад" ;
@@ -7023,7 +7023,7 @@ lin immune_A = variants{} ; --
 lin retreat_N = mkN072 "отстъпление" ; ----
 lin master_V2 = dirV2 (dualV (mkV186 "усвоявам") (mkV175 "усвоя")); ----
 lin injured_A = variants{} ; -- 
-lin holly_N = variants{} ; -- 
+lin holly_N = mkN065 "холи";
 lin battle_V2 = variants{} ; -- 
 lin battle_V = variants{} ; -- 
 lin solidarity_N = mkN049 "солидарност" ;
@@ -7195,7 +7195,7 @@ lin manipulation_N = mkN047 "манипулация" ;
 lin inquest_N = variants{} ; -- 
 lin decrease_N = mkN071 "намаляване" ;
 lin cellar_N = mkN041 "изба";
-lin counsellor_N = mkN014a "съветник"; ----
+lin counsellor_N = mkN014a "съветник";
 lin avenue_N = mkN065 "авеню";
 lin rubber_A = variants{} ; -- 
 lin labourer_N = mkN014a "работник";
@@ -7204,7 +7204,7 @@ lin damn_V2 = dirV2 (dualV (mkV186 "заклеймявам") (mkV174 "закле
 lin comfortably_Adv = variants{} ; -- 
 lin tense_A = variants{} ; -- 
 lin socket_N = variants{} ; -- 
-lin par_N = variants{} ; -- 
+lin par_N = mkN007 "номинал";
 lin thrust_N = mkN072 "доверие";
 lin scenario_N = mkN032 "сценарий" ;
 lin frankly_Adv = variants{} ; -- 
@@ -7286,7 +7286,7 @@ lin handy_A = mkA079 "полезен";
 lin deprivation_N = variants{} ; -- 
 lin attacker_N = variants{} ; -- 
 lin assault_V2 = variants{} ; -- 
-lin screening_N = variants{} ; -- 
+lin screening_N = mkN015 "скрининг";
 lin retired_A = variants{} ; -- 
 lin quick_Adv = variants{} ; -- 
 lin portable_A = variants{} ; -- 
@@ -7301,7 +7301,7 @@ lin seasonal_A = mkA079 "сезонен" ;
 lin plasma_N = mkN041 "плазма" ; ----
 lin stunning_A = mkA079 "изумителен"; ----
 lin spray_N = mkN028a "спрей";
-lin referral_N = variants{} ; -- 
+lin referral_N = mkN071 "сезиране";
 lin promptly_Adv = variants{} ; -- 
 lin fluctuation_N = mkN047 "флунктуация";
 lin decorative_A = mkA079 "декоративен";
@@ -7432,12 +7432,12 @@ lin climber_N = mkN007b "катерач" ; ----
 lin photographic_A = mkA078 "фотографски" ;
 lin haunt_V2 = dirV2 (dualV (mkV186 "преследвам") (mkV174 "преследя")); ----
 lin fiercely_Adv = variants{} ; -- 
-lin dining_N = variants{} ; -- 
+lin dining_N = mkN047 "трапезария";
 lin sodium_N = mkN032 "натрий";
 lin gossip_N = mkN001 "слух";
 lin bundle_N = mkN007 "вързоп";
 lin bend_N = variants{} ; -- 
-lin recruit_N = variants{} ; -- 
+lin recruit_N = mkN008a "новобранец";
 lin hen_N = mkN065 "пиле" ; ----
 lin fragile_A = variants{} ; -- 
 lin deteriorate_V2 = variants{} ; -- 
@@ -7454,7 +7454,7 @@ lin trolley_N = mkN032 "тролей";
 lin rotation_N = mkN047 "ротация" ;
 lin denial_N = mkN071 "отричане" ;
 lin boiler_N = mkN008 "котел" ; ----
-lin amp_N = variants{} ; -- 
+lin amp_N = mkN031 "усилвател";
 lin trivial_A = mkA079 "тривиален";
 lin shout_N = variants{} ; -- 
 lin overtake_V2 = dirV2 (variants {dualV (mkV186 "задминавам") (mkV152 "задмина") ; dualV (mkV186 "изпреварвам") (mkV173 "изпреваря")}); ----
@@ -7493,12 +7493,12 @@ lin glow_N = variants{} ; --
 lin raised_A = variants{} ; -- 
 lin prolonged_A = variants{} ; -- 
 lin voucher_N = variants{} ; -- 
-lin t_shirt_N = variants{} ; -- 
+lin t_shirt_N = mkN041 "тениска";
 lin linger_V = dualV (mkV186 "помайвам") (mkV162 "помая"); ----
 lin humble_A = mkA080 "малък";
 lin honey_N = dualN (mkN049 "мед") (mkA079 "меден");
 lin scream_N = mkN014 "писък" ;
-lin postcard_N = variants{} ; -- 
+lin postcard_N = mkN041b "картичка";
 lin managing_A = variants{} ; -- 
 lin alien_A = mkA076 "чужд";
 lin trouble_V2 = dirV2 (dualV (mkV186 "притеснявам") (mkV174 "притесня"));
@@ -7513,7 +7513,7 @@ lin blast_V = singleV (mkV174 "тръбя") ; ----
 lin syntactic_A = mkA079 "синтактичен";
 lin scrape_V2 = variants{} ; -- 
 lin scrape_V = variants{} ; -- 
-lin residue_N = variants{} ; -- 
+lin residue_N = mkN014 "остатък";
 lin procession_N = variants{} ; -- 
 lin pioneer_N = mkN007 "пионер";
 lin intercourse_N = variants{} ; -- 
@@ -7625,9 +7625,9 @@ lin whip_V = variants{}; -- dirV2 (dualV (mkV186 "побеждавам") (mkV174
 lin sticky_A = variants{} ; -- 
 lin regret_N = mkN071 "жалене" ;
 lin incapable_A = variants{} ; -- 
-lin franchise_N = variants{} ; -- 
+lin franchise_N = mkN007 "франчайз";
 lin dentist_N = mkN031a "зъболекар";
-lin contrary_N = variants{} ; -- 
+lin contrary_N = mkN054 "противоположно";
 lin profitability_N = variants{} ; -- 
 lin enthusiast_N = mkN007a "ентусиаст"; ----
 lin crop_V2 = variants{} ; -- 
@@ -7663,7 +7663,7 @@ lin noticeable_A = mkA079 "очевиден";
 lin mankind_N = mkN054 "човечество"; ----
 lin majesty_N = mkN054 "величество" ;
 lin pigeon_N = mkN007 "гълъб" ; ----
-lin goalkeeper_N = variants{} ; -- 
+lin goalkeeper_N = mkN031a "вратар";
 lin ambiguous_A = mkA079 "многозначен";
 lin walker_N = mkN008a "пешеходец"; ----
 lin virgin_N = mkN041 "девственица";
@@ -7684,7 +7684,7 @@ lin denounce_V2 = dirV2 (dualV (mkV186 "осъждам") (mkV173 "осъдя"));
 lin confession_N = mkN072 "признание" ;
 lin turkey_N = mkN041 "пуйка";
 lin toll_N = variants{} ; -- 
-lin pal_N = variants{} ; -- 
+lin pal_N = mkN031a "приятел";
 lin transcription_N = mkN047 "транскрипция" ;
 lin sulphur_N = mkN043 "сяра" ; ----
 lin provisional_A = mkA079 "временен" ;
@@ -7771,7 +7771,7 @@ lin harmful_A = variants{} ; --
 lin bump_V2 = dirV2 (dualV (mkV187 "удрям") (mkV173 "ударя"));
 lin bump_V = medialV (dualV (mkV187 "удрям") (mkV173 "ударя")) Acc;
 lin bodily_A = mkA079 "телесен";
-lin grasp_N = variants{} ; -- 
+lin grasp_N = mkN071 "хващане";
 lin finished_A = variants{} ; -- 
 lin facade_N = mkN041 "фасада";
 lin cushion_N = mkN041 "възглавница"; ----
@@ -7806,7 +7806,7 @@ lin bail_N = mkN047 "гаранция" ;
 lin unwanted_A = variants{} ; -- 
 lin tight_Adv = variants{} ; -- 
 lin plausible_A = mkA079 "благовиден"; ----
-lin midfield_N = variants{} ; -- 
+lin midfield_N = mkN041 "полузащита";
 lin alert_A = mkA076 "пенлив" ; ----
 lin feminine_A = mkA078 "женски" ;
 lin drainage_N = mkN047 "канализация" ;
@@ -7830,7 +7830,7 @@ lin spouse_N = variants{} ; --
 lin produce_N = variants{} ; -- 
 lin forge_V2 = dirV2 (singleV (mkV186 "фалшифицирам"));
 lin forge_V = singleV (mkV186 "фалшифицирам");
-lin salon_N = variants{} ; -- 
+lin salon_N = mkN005 "салон";
 lin handicapped_A = variants{} ; -- 
 lin sway_V2 = dirV2 (singleV (mkV160 "люлея"));
 lin sway_V = medialV (singleV (mkV160 "люлея")) Acc;

lib/src/translator/todo/TopDictionaryChi.gf

@@ -156,8 +156,8 @@ lin thing_N = mkN "事情" ;
 lin tell_VV = mkVV "告诉" ;
 lin tell_VS = mkVS "告诉" ;
 lin tell_V3 = mkV3 "告诉" ;--"说" ;
-lin tell_1_V3 = mkV3 "告诉" ;--"说" ; ----
+lin tell_1_V3 = variants{} ; -- 
-lin tell_2_V3 = mkV3 "告诉" ;--"说" ; ----
+lin tell_2_V3 = variants{} ; -- 
 lin tell_V2V = mkV2V "告诉" ;
 lin tell_V2S = mkV2S "告诉" ;
 lin tell_V2Q = mkV2Q (mkV "告诉") ;

lib/src/translator/todo/TopDictionaryEng.gf

@@ -97,7 +97,7 @@ lin than_Subj = {s = "than"} ;
 lin more_Adv = mkAdv "more";
 lin about_Prep = mkPrep "about";
 lin now_Adv = mkAdv "now";
-lin last_A = irregAdv (mkA "last") "last";
+lin last_A = variants{} ; -- 
 lin last_1_A = irregAdv (mkA "last") "last";
 lin last_2_A = irregAdv (mkA "last") "last";
 lin other_A = compoundA (mkA "other");
@@ -150,8 +150,8 @@ lin thing_N = mkN "thing" "things";
 lin tell_VV = mkVV (IrregEng.tell_V);
 lin tell_VS = mkVS (IrregEng.tell_V);
 lin tell_V3 = mkV3 (IrregEng.tell_V) noPrep noPrep;
-lin tell_1_V3 = mkV3 (IrregEng.tell_V) noPrep noPrep;
+lin tell_1_V3 = variants{} ; -- 
-lin tell_2_V3 = mkV3 (IrregEng.tell_V) noPrep noPrep;
+lin tell_2_V3 = variants{} ; -- 
 lin tell_V2V = mkV2V (IrregEng.tell_V) noPrep to_Prep;
 lin tell_V2S = mkV2S (IrregEng.tell_V) noPrep;
 lin tell_V2Q = mkV2Q (IrregEng.tell_V) noPrep;
@@ -273,7 +273,7 @@ lin high_A = mkA "high" "higher";
 lin about_Adv = mkAdv "about";
 lin something_NP = regNP "something" singular ;
 lin school_N = mkN "school" "schools";
-lin in_Adv = mkAdv "in";
+lin in_Adv = variants{}; -- mkPrep "in";
 lin in_1_Adv = mkAdv "in";
 lin in_2_Adv = mkAdv "in";
 lin small_A = mkA "small" "smaller";
@@ -418,7 +418,7 @@ lin hear_VS = mkVS (IrregEng.hear_V);
 lin hear_V2V = mkV2V (IrregEng.hear_V) noPrep to_Prep ;
 lin hear_V2 = mkV2 (IrregEng.hear_V);
 lin hear_V = IrregEng.hear_V;
-lin room_N = mkN "room" "rooms";
+lin room_N = variants{} ; -- 
 lin room_1_N = mkN "room" "rooms";
 lin room_2_N = mkN "room" "rooms";
 lin whether_Subj = mkSubj "whether" ;
@@ -512,7 +512,7 @@ lin face_N = mkN "face" "faces";
 lin sit_VA = mkVA (IrregEng.sit_V);
 lin sit_V2 = mkV2 (IrregEng.sit_V);
 lin sit_V = IrregEng.sit_V;
-lin market_N = mkN "market" "markets";
+lin market_N = variants{} ; -- 
 lin market_1_N = mkN "market" "markets";
 lin market_2_N = mkN "market" "markets";
 lin appear_VV = mkVV (mkV "appear" "appears" "appeared" "appeared" "appearing");
@@ -630,7 +630,7 @@ lin position_N = mkN "position" "positions";
 lin low_A = mkA "low" "lower";
 lin cost_N = mkN "cost" "costs";
 lin little_Det = mkDeterminer singular "little" ;
-lin matter_N = mkN "matter" "matters";
+lin matter_N = variants{} ; -- 
 lin matter_1_N = mkN "matter" "matters";
 lin matter_2_N = mkN "matter" "matters";
 lin community_N = mkN "community" "communities";
@@ -703,7 +703,7 @@ lin build_V = IrregEng.build_V;
 lin spend_V2 = mkV2 (IrregEng.spend_V);
 lin spend_V = IrregEng.spend_V;
 lin force_N = mkN "force" "forces";
-lin condition_N = mkN "condition" "conditions";
+lin condition_N = variants{} ; -- 
 lin condition_1_N = mkN "condition" "conditions";
 lin condition_2_N = mkN "condition" "conditions";
 lin paper_N = mkN "paper" "papers";
@@ -776,7 +776,7 @@ lin department_N = mkN "department" "departments";
 lin management_N = mkN "management" "managements";
 lin morning_N = mkN "morning" "mornings";
 lin draw_V2V = mkV2V (IrregEng.draw_V) noPrep to_Prep ;
-lin draw_V2 = mkV2 (IrregEng.draw_V);
+lin draw_V2 = variants{}; -- mkV2V (IrregEng.draw_V) noPrep to_Prep ;
 lin draw_1_V2 = mkV2 (IrregEng.draw_V);
 lin draw_2_V2 = mkV2 (IrregEng.draw_V);
 lin draw_V = IrregEng.draw_V;
@@ -858,7 +858,7 @@ lin land_N = mkN "land" "lands";
 lin trade_N = mkN "trade" "trades";
 lin watch_VS = mkVS (mkV "watch" "watches" "watched" "watched" "watching");
 lin watch_V2V = mkV2V (mkV "watch" "watches" "watched" "watched" "watching") noPrep to_Prep ;
-lin watch_V2 = mkV2 (mkV "watch" "watches" "watched" "watched" "watching");
+lin watch_V2 = variants{}; -- mkV2V (mkV "watch" "watches" "watched" "watched" "watching") noPrep to_Prep ;
 lin watch_1_V2 = mkV2 (mkV "watch" "watches" "watched" "watched" "watching");
 lin watch_2_V2 = mkV2 (mkV "watch" "watches" "watched" "watched" "watching");
 lin watch_V = mkV "watch" "watches" "watched" "watched" "watching";
@@ -1374,7 +1374,7 @@ lin train_V = mkV "train" "trains" "trained" "trained" "training";
 lin maintain_VS = mkVS (mkV "maintain" "maintains" "maintained" "maintained" "maintaining");
 lin maintain_V2 = mkV2 (mkV "maintain" "maintains" "maintained" "maintained" "maintaining");
 lin maintain_V = mkV "maintain";
-lin attempt_N = mkN "attempt" "attempts";
+lin attempt_N = variants{} ; -- 
 lin leg_N = mkN "leg" "legs";
 lin investment_N = mkN "investment" "investments";
 lin save_V2 = mkV2 (mkV "save" "saves" "saved" "saved" "saving");
@@ -2131,7 +2131,7 @@ lin insist_VS = mkVS (mkV "insist" "insists" "insisted" "insisted" "insisting");
 lin insist_V2 = mkV2 (mkV "insist" "insists" "insisted" "insisted" "insisting");
 lin insist_V = mkV "insist" "insists" "insisted" "insisted" "insisting";
 lin farmer_N = mkN "farmer" "farmers";
-lin until_Prep = mkPrep "until";
+lin until_Prep = mkPrep "until" | mkPrep "till" | mkPrep "til" | mkPrep "'til" ;
 lin traffic_N = mkN "traffic" ;
 lin dinner_N = mkN "dinner" "dinners";
 lin consumer_N = mkN "consumer" "consumers";
@@ -3888,7 +3888,7 @@ lin pretend_VS = mkVS (mkV "pretend" "pretends" "pretended" "pretended" "pretend
 lin pretend_V2 = mkV2 (mkV "pretend" "pretends" "pretended" "pretended" "pretending");
 lin pretend_V = mkV "pretend" "pretends" "pretended" "pretended" "pretending";
 lin plant_V2 = mkV2 (mkV "plant" "plants" "planted" "planted" "planting");
-lin till_Prep = mkPrep "till";
+lin till_Prep = variants{} ; -- 
 lin known_A = mkA "known" ;
 lin admission_N = mkN "admission" "admissions";
 lin tissue_N = mkN "tissue" "tissues";
@@ -7195,7 +7195,7 @@ lin manipulation_N = mkN "manipulation" "manipulations";
 lin inquest_N = mkN "inquest" "inquests";
 lin decrease_N = mkN "decrease" "decreases";
 lin cellar_N = mkN "cellar" "cellars";
-lin counsellor_N = mkN "counsellor" "counsellors";
+lin counsellor_N = mkN (variants {"counsellor"; "counselor"});
 lin avenue_N = mkN "avenue" "avenues";
 lin rubber_A = mkA "rubber" ;
 lin labourer_N = mkN "labourer" "labourers";

lib/src/translator/todo/TopDictionaryFin.gf

@@ -173,8 +173,8 @@ lin thing_N = mkN "asia" ;
 lin tell_VV = mkVV (mkV "käskeä") infIllat ;
 lin tell_VS = mkVS (mkV "kertoa") ;
 lin tell_V3 = mkV3 (mkV "kertoa") accusative (casePrep allative) ;
-lin tell_1_V3 = mkV3 (mkV "kertoa") accusative (mkPrep allative) ;
+lin tell_1_V3 = variants{} ; -- 
-lin tell_2_V3 = mkV3 (mkV "erottaa") accusative (mkPrep elative) ;
+lin tell_2_V3 = variants{} ; -- 
 lin tell_V2V = mkV2V (mkV "kertoa") genitive infPresPart ;
 lin tell_V2S = mkV2S (mkV "kertoa") (mkPrep allative) ;
 lin tell_V2Q = mkV2Q (mkV "kysyä") (mkPrep ablative) ;
@@ -620,7 +620,7 @@ lin offer_V3 = mkV3 (mkV "tarjota") ;
 lin offer_V2V = mkV2V (mkV "tarjota") ; ---- subcat
 lin offer_V2 = mkV2 (mkV "tarjota") ; --f358
 lin offer_V = mkV "tarjota" ; --f141
-lin late_A = mkA "myöhäinen" ; --- split edesmennyt
+lin late_A = mkA "myöhäinen" ;
 lin voice_N = mkN "ääni" ; --f52
 lin both_Adv = mkAdv "molemmat" ; ---- cat
 lin once_Adv = mkAdv "kerran" ;
@@ -784,6 +784,7 @@ lin certain_2_A = mkA "tietty" ;
 lin certain_1_A = mkA (mkN "varma") "varmempi" "varmin" ;
 lin student_N = mkN "opiskelija" ;
 lin half_Predet = mkPredet "puoliksi" ;
+lin half_Predet = mkPredet "puoliksi" ;
 lin around_Prep = mkPrep "ympärillä" ;
 lin language_N = L.language_N ;
 lin walk_V2 = mkV2 "kävelyttää" partitive ; --mkWV2 (k63 "saada") "piste" ;
@@ -854,7 +855,8 @@ lin report_V = mkV "raportoida" ;
 lin pass_V2 = mkWV2 (mkV (mkV "päästää") "läpi") ; --- split ohittaa ; ojentaa ; viettää
 lin pass_V = mkV (mkV "päästä") "läpi" ; --- split mennä läpi ; vaipua
 lin black_A = L.black_A ;
-lin stage_N = mkN "vaihe" ; --- split mkN "näyttämö" ; mkWN (k5A "etappi") ; --f57
+lin stage_N = mkN "vaihe" | mkN "näyttämö" ; --- split
+lin meeting_N = mkN "kokous" ;
 lin meeting_N = mkN "kokous" ;
 lin sometimes_Adv = mkAdv "joskus" | mkWAdv (k99 "ajoittain") ; --f89
 lin thus_Adv = mkAdv "siten" ;
@@ -1535,7 +1537,6 @@ lin professional_A = mkA "ammattimainen" ;
 lin less_Det = mkDet Sg (exceptNomN (mkN "vähempä") "vähemmän") ;
 lin once_Subj = mkSubj "sitten kun" ;
 lin item_N = mkN "kohta" ; --- split mkN "esine" | mkN "objekti"
----- checked by IL till item_N in the BNC order
 lin fly_VS = mkWVS (k52A "haihtua") ; --UNCHK
 lin fly_V2 = mkV2 "lennättää" partitive ; --WV2 (k52A "haihtua") ;
 lin fly_V = L.fly_V ;
@@ -2153,7 +2154,7 @@ lin insist_VS = mkWVS (k53A "vakuuttaa") ; --f77
 lin insist_V2 = mkWV2 (k53A "vakuuttaa") ; --UNCHK
 lin insist_V = mkV "inttää" ;
 lin farmer_N = mkN "viljelijä" ;
-lin until_Prep = postPrep elative "asti" ;
+lin until_Prep = postPrep elative "asti" | postPrep illative "saakka" ;
 lin traffic_N = mkN "liikenne" ; --f64
 lin dinner_N = mkWN (k38 "päivällinen") ; --UNCHK
 lin consumer_N = mkWN (k10 "kuluttaja") ; --f319
@@ -3910,7 +3911,7 @@ lin pretend_VS = mkWVS (k67A "uskotella") ; --UNCHK
 lin pretend_V2 = mkWV2 (k67A "uskotella") ; --UNCHK
 lin pretend_V = mkWV (k67A "uskotella") ; --UNCHK
 lin plant_V2 = mkWV2 (k53A "juurruttaa") ; --UNCHK
-lin till_Prep = mkPrep illative "asti" ;
+lin till_Prep = variants{} ; -- 
 lin known_A = variants{} ; -- 
 lin admission_N = mkWN (k1 "tulo") ; --UNCHK
 lin tissue_N = mkWN (k39 "kudos") ; --UNCHK

lib/src/translator/todo/TopDictionaryFre.gf

@@ -167,11 +167,11 @@ lin down_Adv = mkAdv "en bas" ;
 lin yeah_Interj = mkInterj "oui" ; ----
 lin so_Subj = M.mkSubjSubj "de façon que" ;
 lin thing_N = mkN "chose" feminine ;
-lin tell_VV = variants{}; -- mkV2V (mkV I.dire_V2) P.dative P.genitive ;
+lin tell_VV = mkVV (mkV "raconter") ;
-lin tell_VS = variants{}; -- mkV2S (mkV "raconter") ;
+lin tell_VS = mkVS (mkV "raconter") ;
-lin tell_V3 = mkV3 (mkV I.dire_V2) ;
+lin tell_V3 = mkV3 (mkV "raconter") P.accusative P.dative ;
-lin tell_1_V3 = mkV3 (mkV "raconter") P.accusative P.dative ;
+lin tell_1_V3 = variants{} ; -- 
-lin tell_2_V3 = mkV3 (mkV "distinguer") P.accusative P.genitive ;
+lin tell_2_V3 = variants{} ; -- 
 lin tell_V2V = mkV2V (mkV I.dire_V2) P.dative P.genitive ;
 lin tell_V2S = mkV2S (mkV "raconter") ;
 lin tell_V2Q = mkV2Q (mkV "raconter") P.dative ;
@@ -456,7 +456,7 @@ lin meet_V = reflV (mkV I.voir_V2) ;
 lin level_N = mkN "niveau" masculine ;
 lin level_2_N = mkN "niveau" masculine | mkN "plan" ;
 lin level_1_N = mkN "niveau" masculine ;
-lin until_Subj = M.mkSubjSubj ("jusqu´à ce" ++ Ph.elisQue) ;
+lin until_Subj = M.mkSubjSubj ("jusqu'à ce" ++ Ph.elisQue) ;
 lin though_Subj = M.mkSubjSubj ("bien" + Ph.elisQue) | M.mkSubjSubj ("quoi" + Ph.elisQue) ;
 lin policy_N = mkN "politique" feminine ;
 lin include_VV = deVV (mkV I.inclure_V2) ; --- subcat
@@ -2151,7 +2151,7 @@ lin insist_VS = variants{}; -- mkV2 (mkV "insister") ; -- tocheck
 lin insist_V2 = mkV2 (mkV "insister") ; -- tocheck
 lin insist_V = variants{}; -- mkV2 (mkV "insister") ; -- tocheck
 lin farmer_N = mkN "agriculteur" masculine ; -- tocheck
-lin until_Prep = variants{} ; -- 
+lin until_Prep = mkPrep ("jusqu'à ce" ++ Ph.elisQue) ;
 lin traffic_N = mkN "traite" feminine | mkN "circulation" feminine ; -- tocheck
 lin dinner_N = mkN "dîner" masculine | mkN "déjeuner" masculine ; -- tocheck
 lin consumer_N = mkN "consommateur" ; -- tocheck
@@ -7215,7 +7215,7 @@ lin manipulation_N = variants{} ; --
 lin inquest_N = variants{} ; -- 
 lin decrease_N = variants{} ; -- 
 lin cellar_N = mkN "cellier" masculine ; -- tocheck
-lin counsellor_N = variants{} ; -- 
+lin counsellor_N = mkN "conseiller" masculine;
 lin avenue_N = mkN "avenue" feminine ; -- tocheck
 lin rubber_A = variants{} ; -- 
 lin labourer_N = variants{} ; -- 

lib/src/translator/todo/TopDictionaryGer.gf

@@ -158,8 +158,8 @@ lin thing_N = mkN "Sache" | mkN "Ding" "Dinge" neuter ;
 lin tell_VV = mkVV (no_geV (mkV "erzählen")) ; -- comment=subcat
 lin tell_VS = mkVS (no_geV (mkV "erzählen")) ;
 lin tell_V3 = mkV3 (no_geV (mkV "erzählen")) ;
-lin tell_1_V3 = mkV3 (no_geV (mkV "erzählen")) ;
+lin tell_1_V3 = variants{} ; -- 
-lin tell_2_V3 = mkV3 (fixprefixV "unter" I.scheiden_V) accPrep von_Prep ;
+lin tell_2_V3 = variants{} ; -- 
 lin tell_V2V = mkV2V (no_geV (mkV "erzählen")) ;
 lin tell_V2S = mkV2S (no_geV (mkV "erzählen")) ;
 lin tell_V2Q = mkV2Q (no_geV (mkV "erzählen")) ;

lib/src/translator/todo/TopDictionaryHin.gf

@@ -7198,7 +7198,7 @@ lin manipulation_N = mkN "काम निकालना" ; -- tocheck
 lin inquest_N = mkN "अन्वीक्षण" ; -- tocheck
 lin decrease_N = mkN "कमी" ; -- tocheck
 lin cellar_N = mkN "वाइन का गोदाम" ; -- tocheck
-lin counsellor_N = mkN "ग्रीष्म-शिविर संचालक" ; -- tocheck
+lin counsellor_N = mkN "ग्रीष्म-शिविर संचालक" | mkN "वकील" ; -- tocheck
 lin avenue_N = mkN "छायादार मार्ग" ; -- tocheck
 lin rubber_A = mkA "रबर" ; -- tocheck
 lin labourer_N = mkN "मजदूर" ; -- tocheck

lib/src/translator/todo/TopDictionaryIta.gf

@@ -163,9 +163,9 @@ lin so_Subj = subSubj "finché" ;
 lin thing_N = mkN "cosa" ; -- status=guess
 lin tell_VV = variants{}; -- mkV "raccontare" ;
 lin tell_VS = variants{}; -- mkV2 "raccontare" ;
-lin tell_V3 = variants{}; -- mkV2 "raccontare" ;
+lin tell_V3 = mkV3 (mkV "raccontare") ;
-lin tell_1_V3 = mkV3 (mkV "raccontare") ;
+lin tell_1_V3 = variants{} ; -- 
-lin tell_2_V3 = mkV3 I.distinguere_V P.accusative P.genitive ;
+lin tell_2_V3 = variants{} ; -- 
 lin tell_V2V = variants{}; -- mkV2 "raccontare" ;
 lin tell_V2S = variants{}; -- mkV2 "raccontare" ;
 lin tell_V2Q = variants{}; -- mkV2 "raccontare" ;
@@ -2145,7 +2145,7 @@ lin insist_VS = variants{} ; --
 lin insist_V2 = variants{} ; -- 
 lin insist_V = variants{} ; -- 
 lin farmer_N = mkN "agricoltore" masculine | mkN "fattore" masculine ; -- status=guess status=guess
-lin until_Prep = variants{} ; -- 
+lin until_Prep = mkPrep "fine" ;
 lin traffic_N = mkN "rotatoria" ; -- status=guess
 lin dinner_N = mkN "cena" ; -- status=guess
 lin consumer_N = mkN "consumatore" | mkN "consumatrice" feminine ; -- status=guess status=guess

lib/src/translator/todo/TopDictionarySpa.gf

@@ -156,8 +156,8 @@ lin thing_N = mkN "cosa" ;
 lin tell_VV = mkVV (mkV "mandar") ;
 lin tell_VS = mkVS (mkV "contar") ;
 lin tell_V3 = mkV3 (mkV "contar") ;
-lin tell_1_V3 = mkV3 (mkV "contar") ;
+lin tell_1_V3 = variants{} ; -- 
-lin tell_2_V3 = mkV3 (mkV "distinguir");
+lin tell_2_V3 = variants{} ; -- 
 lin tell_V2V = mkV2V (mkV "contar") ;
 lin tell_V2S = mkV2S (mkV "contar") ;
 lin tell_V2Q = mkV2Q (mkV "contar") on_Prep ;

lib/src/translator/todo/TopDictionarySwe.gf

@@ -151,9 +151,9 @@ lin so_Subj = lin Subj {s = "så att"};
 lin thing_N = mkN "ting" "ting" ;
 lin tell_VV = mkVV (mkV "berätta") ;
 lin tell_VS = mkVS (mkV "berätta") ;
-lin tell_V3 = mkV3 (mkV "skvallrar");
+lin tell_V3 = mkV3 (mkV "berätta") (mkPrep "för") ;
-lin tell_1_V3 = mkV3 (mkV "berätta") (mkPrep "för") ;
+lin tell_1_V3 = variants{} ; -- 
-lin tell_2_V3 = mkV3 (mkV "skilja" "skiljer" "skilt") (mkPrep "från") ;
+lin tell_2_V3 = variants{} ; -- 
 lin tell_V2V = mkV2V (mkV "berätta") (mkPrep []) (mkPrep "för") ;
 lin tell_V2S = mkV2S (mkV "berätta") (mkPrep "för") ;
 lin tell_V2Q = mkV2Q (mkV "berätta") (mkPrep "för") ;

lib/src/translator/translate.probs

@@ -112,7 +112,7 @@ GerundAP	8.826488612457696e-3
 GerundN	1.2505734436831681e-2
 IDig	0.30795600628481645
 IIDig	0.6920439937151835
-IdRP	0.6011897228198962
+IdRP	0.9011897228198962
 IdetCN	7.051282051282051e-2
 IdetIP	5.128205128205128e-2
 IdetQuant	0.14285714285714285
@@ -57740,7 +57740,6 @@ thanks_Interj	7.633587786259542e-3
 thanks_to_Prep	1.3969964576161252e-4
 thanksgiving_N	3.729715012475897e-6
 that_Quant	1.0123530088876233e-2
-that_RP	0.36881407416782686
 that_Subj	0.2891566265060241
 that_of_Prep	9.978546125829467e-6
 thatch_N	3.729715012475897e-6