diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index b5e9f3d19..fff5adc67 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -13307,7 +13307,6 @@ fun cougar_N : N ; fun cough_N : N ; fun cough_V : V ; fun cough_up_V2 : V2 ; -----* fun could_N : N ; fun coulisse_N : N ; fun coulomb_N : N ; fun coulter_N : N ; @@ -20185,7 +20184,6 @@ fun expectable_A : A ; fun expectancy_N : N ; fun expectant_A : A ; fun expectation_N : N ; -----* fun expectations_N : N ; fun expected_A : A ; fun expectedness_N : N ; fun expectorant_N : N ; @@ -23748,7 +23746,7 @@ fun gesticulation_N : N ; fun gestural_A : A ; fun gesture_N : N ; fun gesture_V : V ; -----* fun get_N : N ; +fun get_N : N ; fun get_V2 : V2 ; fun get_V2V : V2V ; fun get_VV : VV ; @@ -34480,7 +34478,7 @@ fun masque_N : N ; fun masquerade_N : N ; fun masquerade_V : V ; fun masquerader_N : N ; -----* fun mass_A : A ; +fun mass_A : A ; fun mass_N : N ; fun mass_V : V ; fun mass_V2 : V2 ; @@ -37828,7 +37826,6 @@ fun newtonian_A : A ; fun newtonian_N : N ; fun newtown_PN : PN ; fun next_A : A ; -----* fun next_N : N ; fun next_Prep : Prep ; fun next_to_Prep : Prep ; fun nexus_N : N ; @@ -61819,7 +61816,6 @@ fun untidy_A : A ; fun untie_V : V ; fun untie_V2 : V2 ; fun untied_A : A ; -----* fun until_Adv : Adv ; fun until_Prep : Prep ; fun until_Subj : Subj ; fun untilled_A : A ; @@ -63951,7 +63947,6 @@ fun when_Subj : Subj ; fun whence_Adv : Adv ; fun whencesoever_A : A ; fun whenever_Adv : Adv ; -----* fun where_Adv : Adv ; fun where_IAdv : IAdv ; fun where_Subj : Subj ; fun where_as_Prep : Prep ; @@ -64699,7 +64694,6 @@ fun worshipful_A : A ; fun worshipper_N : N ; fun worst_A : A ; fun worst_Adv : Adv ; -----* fun worst_N : N ; fun worst_V2 : V2 ; fun worsted_N : N ; fun wort_N : N ; @@ -64714,7 +64708,6 @@ fun worthwhile_A : A ; fun worthwhileness_N : N ; fun worthy_A : A ; fun worthy_N : N ; -----* fun would_N : N ; fun would_be_A : A ; fun wound_N : N ; fun wound_V2 : V2 ; diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index d5d1851b4..a7efc6496 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -3133,7 +3133,6 @@ lin approx_PN = mkPN "Аппроx" Masc ; lin approximate_A = mkA079 "приблизителен" ; lin approximate_V = variants {dualV (mkV186 "доближавам") (mkV176 "доближа"); dualV (mkV186 "приближавам") (mkV176 "приближа")} ; ---- lin approximate_V2 = variants {} ; -lin approximately_A = mkA079 "приблизителен" ; lin approximation_N = mkN072 "приближение" ; lin appurtenance_N = mkN049 "принадлежност" ; ---- lin apr_PN = mkPN "Апр" Masc ; @@ -13311,7 +13310,6 @@ lin cougar_N = mkN041 "пума" ; ---- lin cough_N = mkN041 "кашлица" ; ---- lin cough_V = singleV (mkV187 "кашлям") ; ---- lin cough_up_V2 = variants {} ; -lin could_N = variants {} ; lin coulisse_N = mkN032 "улей" ; ---- lin coulomb_N = mkN005 "кулон" ; lin coulter_N = mkN007 "ботуш" ; @@ -20186,7 +20184,6 @@ lin expectable_A = mkA076 "предвидим" ; lin expectancy_N = mkN071 "очакване" ; lin expectant_A = mkA076 "очакван" ; lin expectation_N = mkN071 "очакване" ; -lin expectations_N = variants {} ; lin expected_A = mkA076 "очакван" ; lin expectedness_N = mkN049 "очакваност" ; lin expectorant_N = mkN054 "отхрачващо" ; @@ -37860,7 +37857,6 @@ lin newtonian_A = mkA076 "нютонов" ; lin newtonian_N = variants {} ; lin newtown_PN = mkPN "Нютаун" Masc ; lin next_A = mkA076 "следващ" ; -lin next_N = variants {} ; lin next_Prep = variants {} ; lin next_to_Prep = variants {} ; lin nexus_N = variants {} ; @@ -61864,7 +61860,6 @@ lin untidy_A = variants {mkA079 "безпорядъчен"; mkA079 "безред lin untie_V = variants {dualV (mkV186 "отвързвам") (mkV156 "отвържа"); dualV (mkV186 "развързвам") (mkV156 "развържа")} ; ---- lin untie_V2 = variants {} ; lin untied_A = mkA076 "необвързан" ; -lin until_Adv = variants {} ; lin until_Prep = mkPrep "докато" Acc ; lin until_Subj = ss "докато" ; lin untilled_A = variants {mkA076 "необработваем"; mkA076 "необработен"; mkA076 "неразработен"} ; ---- @@ -63995,7 +63990,6 @@ lin when_Subj = ss "когато" ; lin whence_Adv = variants {} ; lin whencesoever_A = variants {} ; lin whenever_Adv = variants {} ; -lin where_Adv = variants {} ; lin where_IAdv = mkIAdv "къде" ; lin where_Subj = {s="където"} ; lin where_as_Prep = variants {} ; @@ -64744,7 +64738,6 @@ lin worshipful_A = mkA078 "поклонничелски" ; lin worshipper_N = mkN014a "поклонник" ; lin worst_A = variants {} ; lin worst_Adv = variants {} ; -lin worst_N = variants {} ; lin worst_V2 = variants {} ; lin worsted_N = variants {} ; lin wort_N = mkN041 "шира" ; @@ -64759,7 +64752,6 @@ lin worthwhile_A = mkA079 "полезен" ; ---- lin worthwhileness_N = variants {} ; lin worthy_A = mkA079 "ценен" ; lin worthy_N = mkN041 "особа" ; ---- -lin would_N = variants {} ; lin would_be_A = variants {} ; lin wound_N = mkN041 "рана" ; lin wound_V2 = dirV2 (dualV (mkV186 "ранявам") (mkV174 "раня")) ; diff --git a/lib/src/translator/DictionaryCat.gf b/lib/src/translator/DictionaryCat.gf index 4d8939dbf..0faed3ff6 100644 --- a/lib/src/translator/DictionaryCat.gf +++ b/lib/src/translator/DictionaryCat.gf @@ -17537,7 +17537,6 @@ lin wheelbase_N = mkN "intereix" masculine ; --auto lin when_IAdv = mkAdv "quan" ; --auto lin when_Subj = S.when_Subj ; lin whence_Adv = mkAdv "d'on" ; --auto -lin where_Adv = mkAdv "a on" | mkAdv "on" ; --auto lin where_IAdv = mkAdv "a on" | mkAdv "on" ; --auto lin where_Subj = mkSubj "on" Indic ; lin wherever_Adv = mkAdv "onsevulga que" ; --auto diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index 32b555b82..6b775cfea 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -2319,7 +2319,6 @@ lin approver_N = mkN "批准者" ; -- open-multilingual-wordnet lin approx_PN = foreignPN "Approx" ; -- comment=src=eng status=guess lin approximate_A = mkA "大概" ; lin approximate_V2 = mkV2 "近似" ; -lin approximately_A = mkA "大约" | mkA "近" ; lin approximation_N = mkN "近似算法" ; -- status=guess lin apr_PN = foreignPN "Apr" ; -- comment=src=eng status=guess lin apractic_A = mkA "运用不能症" ; -- open-multilingual-wordnet @@ -22316,7 +22315,6 @@ lin newton_le_willows_PN = foreignPN "Newton-le-willows" ; -- comment=src=eng st lin newton_mearns_PN = foreignPN "Newton mearns" ; -- comment=src=eng status=guess lin newtown_PN = mkPN ("纽敦" | "新镇") ; -- comment=src=geonames status=guess lin next_A = mkA "下" | mkA "其次" | mkA "来" | {-HSK-} mkA "下一个" ; -lin next_N = mkN "下" | mkN "其次" | mkN "来" | {-HSK-} mkN "秒""" ; lin next_Prep = mkPrep "比邻" ; lin nexus_N = mkN "关系" "种" ; lin nib_N = mkN "喙" | mkN "嘴" | mkN "鸟嘴" ; -- open-multilingual-wordnet @@ -34630,7 +34628,6 @@ lin unthinkable_A = mkA "不可想象" ; lin untidy_A = mkA "不整洁" | mkA "不整齐" | mkA "凌乱" | mkA "懒散" ; -- open-multilingual-wordnet lin untie_V = mkV "解開" | mkV "解开" ; -- status=guess, src=wikt -- status=guess, src=wikt lin untie_V2 = mkV2 (mkV "解開") | mkV2 (mkV "解开") ; -- status=guess, src=wikt -- status=guess, src=wikt -lin until_Adv = mkAdv "到" ; lin until_Prep = mkPrep "直到" ; lin until_Subj = mkSubj "直到" ; lin untimbered_A = mkA "无支撑" ; -- open-multilingual-wordnet @@ -35760,7 +35757,6 @@ lin whelk_N = mkN "峨螺" ; -- status=guess lin when_IAdv = S.when_IAdv ; lin when_Subj = S.when_Subj ; lin whenever_Adv = mkAdv "每当" ; -lin where_Adv = mkAdv "哪兒" | mkAdv "哪儿" | mkAdv "哪裡" | mkAdv "哪里" ; -- status=guess -- status=guess -- status=guess -- status=guess lin where_IAdv = S.where_IAdv ; lin where_Subj = mkSubj "哪里" ; lin whereabouts_N = mkN "所在地" | mkN "所在" ; -- status=guess -- status=guess diff --git a/lib/src/translator/DictionaryDut.gf b/lib/src/translator/DictionaryDut.gf index cd6590e01..dda2cb4be 100644 --- a/lib/src/translator/DictionaryDut.gf +++ b/lib/src/translator/DictionaryDut.gf @@ -1026,7 +1026,6 @@ lin approve_V = mkV (mkV "instemmen") "met" ; -- status=guess, src=wikt lin approve_V2 = mkV2 (mkV (mkV "instemmen") "met") ; -- status=guess, src=wikt lin approved_A = variants {} ; -- lin approx_PN = mkPN "Approx" ; -- src=eng status=guess -lin approximately_A = variants {} ; lin approximation_N = mkN "benaderen" | mkN "schatten" ; -- status=guess status=guess lin apr_PN = mkPN "Apr" ; -- src=eng status=guess lin apricot_N = mkN "abrikoos" feminine ; -- status=guess @@ -13629,7 +13628,6 @@ lin newton_le_willows_PN = mkPN "Newton-le-willows" ; -- src=eng status=guess lin newton_mearns_PN = mkPN "Newton mearns" ; -- src=eng status=guess lin newtown_PN = mkPN "Newtown" ; -- src=geonames status=guess lin next_A = mkA "naast" | mkA "dichtst" ; -- status=guess status=guess -lin next_N = mkN "de volgende" masculine ; -- status=guess lin nexus_N = mkN "band" masculine | mkN "verbinding" feminine ; -- status=guess status=guess lin nibble_N = mkN "nibble" ; -- status=guess lin nibble_V = mkV "knabbelen" ; -- status=guess, src=wikt @@ -22158,7 +22156,6 @@ lin when_IAdv = S.when_IAdv ; lin when_Subj = S.when_Subj ; lin whence_Adv = mkAdv "waarvandaan" ; -- status=guess lin whenever_Adv = mkAdv "wanneer ook" ; -- status=guess -lin where_Adv = mkAdv "waar" | mkAdv "waarheen" | mkAdv "waarvan" | mkAdv "waarvandaan" ; -- status=guess status=guess status=guess status=guess lin where_IAdv = S.where_IAdv ; lin where_Subj = mkSubj "waar" ; lin whereabouts_N = mkN "waaromtrent" ; -- status=guess diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index b69e21386..85e708509 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -13365,7 +13365,6 @@ lin cough_N = mkN "cough" "coughs"; lin cough_V = mkV "cough" "coughs" "coughed" "coughed" "coughing"; --subcat lin cough_V2 = mkV2 (mkV "cough" "coughs" "coughed" "coughed" "coughing"); lin cough_up_V2 = mkV2 (partV (mkV "cough") "up"); -lin could_N = mkN "could" ; lin coulisse_N = mkN "coulisse" ; lin coulomb_N = mkN "coulomb" ; lin coulter_N = mkN "coulter" "coulters"; @@ -20276,7 +20275,6 @@ lin expectable_A = mkA "expectable" ; lin expectancy_N = mkN "expectancy" "expectancies"; lin expectant_A = compoundA (mkA "expectant"); lin expectation_N = mkN "expectation" "expectations"; -lin expectations_N = mkN "expectations" ; lin expected_A = mkA "expected" ; lin expectedness_N = mkN "expectedness" ; lin expectorant_N = mkN "expectorant" "expectorants"; @@ -38000,7 +37998,6 @@ lin newtonian_A = compoundA (mkA "newtonian"); lin newtonian_N = mkN "newtonian" "newtonians"; lin newtown_PN = mkPN "Newtown"; lin next_A = irregAdv (compoundA (mkA "next")) "next"; -lin next_N = mkN "next" "next"; lin next_Prep = mkPrep "next"; lin next_to_Prep = mkPrep "next to"; lin nexus_N = mkN "nexus" "nexuses"; @@ -62117,7 +62114,6 @@ lin untidy_A = mkA "untidy" "untidier"; lin untie_V = mkV "untie" "IRREG" "IRREG" "IRREG" "IRREG"; lin untie_V2 = mkV2 (mkV "untie" "IRREG" "IRREG" "IRREG" "IRREG"); lin untied_A = mkA "untied" ; -lin until_Adv = mkAdv "until" ; lin until_Prep = mkPrep "until" | mkPrep "till" | mkPrep "til" | mkPrep "'til" ; lin until_Subj = mkSubj "until" ; lin untilled_A = mkA "untilled" ; @@ -64255,7 +64251,6 @@ lin when_Subj = mkSubj "when"; lin whence_Adv = mkAdv "whence"; lin whencesoever_A = compoundA (mkA "whencesoever"); lin whenever_Adv = mkAdv "whenever"; -lin where_Adv = mkAdv "where" ; lin where_IAdv = {s="where"}; lin where_Subj = mkSubj "where"; lin where_as_Prep = mkPrep "where as"; @@ -65005,7 +65000,6 @@ lin worshipful_A = compoundA (mkA "worshipful"); lin worshipper_N = mkN human (mkN "worshipper" "worshippers"); lin worst_A = mkA "worst" ; lin worst_Adv = mkAdv "worst"; -lin worst_N = mkN "worst" ; lin worst_V2 = mkV2 (mkV "worst" "worsts" "worsted" "worsted" "worsting"); lin worsted_N = mkN "worsted" ; lin wort_N = mkN "wort" ; @@ -65020,7 +65014,6 @@ lin worthwhile_A = compoundA (mkA "worthwhile"); lin worthwhileness_N = mkN "worthwhileness" ; lin worthy_A = mkA "worthy" "worthier"; lin worthy_N = mkN "worthy" "worthies"; -lin would_N = mkN "would" ; lin would_be_A = compoundA (mkA "would-be"); lin wound_N = mkN "wound" "wounds"; lin wound_V2 = mkV2 (mkV "wound" "wounds" "wounded" "wounded" "wounding"); diff --git a/lib/src/translator/DictionaryEst.gf b/lib/src/translator/DictionaryEst.gf index 0be13d8e8..8f2d4f623 100644 --- a/lib/src/translator/DictionaryEst.gf +++ b/lib/src/translator/DictionaryEst.gf @@ -21870,7 +21870,6 @@ lin corps_diplomatique_N = mkN "diplomaatiline korpus" ; lin cotton_cake_N = mkN "pressitud puuvillaseemned" ; lin cotton_plant_N = mkN "puuvillapõõsas" ; lin cotton_wool_N = mkN "puuvill" | mkN "vatt" ; -lin could_N = mkN "võima" ; lin coulomb_N = mkN "kulon" ; lin council_board_N = mkN "nõupidamislaud" ; lin counterattack_N = mkN "vasturünnak" | mkN "vasturünnakule minema" ; @@ -22676,7 +22675,6 @@ lin nerve_centre_N = mkN "juhtimiskeskus" | mkN "närvikeskus" ; lin nest_egg_N = mkN "pesamuna" | mkN "silmatera" ; lin nettlerash_N = mkN "nõgestõbi" ; lin newlywed_N = mkN "äsjaabiellunu" ; -lin next_N = mkN "edasi" | mkN "järgmine" ; lin night_bird_N = mkN "öölind" ; lin night_light_N = mkN "öölamp" | mkN "öövalgustus" ; lin night_watch_N = mkN "öövalve" ; @@ -23491,7 +23489,6 @@ lin wooly_N = mkN "hägune" | mkN "karvane" | mkN "sassis" | mkN "villane" ; lin work_in_N = mkN "sisse andma" | mkN "sisse saama" ; lin work_out_N = mkN "lahenema" | mkN "välja mõtlema" | mkN "välja töötama" | mkN "võimlema" ; lin worry_N = mkN "muretsema" | mkN "muret tekitama" | mkN "vaevama" ; -lin worst_N = mkN "halvim" | mkN "kõige halvem" ; lin wounded_N = mkN "haavatud" ; lin wrangle_N = mkN "välja kauplema" ; lin wrap_N = mkN "käärima" | mkN "pakkima" | mkN "ümber mässima" ; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index d85812c77..59665b71d 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -60246,4 +60246,4 @@ oper OP_shut_V2 : V2 = mkWV2 (k52A "sulkeutua") ; --UNCHK oper OP_take_V2 : V2 = mkV2 "ottaa" ; oper OP_urge_V2 : V2 = mkWV2 (k53 "ahdistaa") ; --f88 -} \ No newline at end of file +} diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index 74f29a77f..c127e96a1 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -1703,7 +1703,6 @@ lin approved_A = variants {} ; -- lin approvingly_Adv = mkAdv "approbativement" ; -- UWN lin approximate_A = mkA "approximant" | mkA "approximatif" ; -- tocheck lin approximate_V2 = mkV2 (mkV "approximer") ; -- tocheck -lin approximately_A = variants {} ; lin approximation_N = mkN "rapprochement" masculine | mkN "approximation" feminine ; -- tocheck lin apraxia_N = mkN "apraxie" ; -- UWN lin apricot_N = mkN "abricot" masculine | mkN "abricotier" masculine ; -- tocheck diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index 8481a7112..e04ea9fee 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -3140,7 +3140,6 @@ lin approx_PN = mkPN "Approx" ; -- src=eng status=guess lin approximate_A = mkA "annähernd" | mkA "ungefähr" | mkA "zirka" | mkA "circa" ; -- status=guess status=guess status=guess status=guess lin approximate_V = mkV "annähern" ; -- status=guess, src=wikt lin approximate_V2 = mkV2 (mkV "annähern") ; -- status=guess, src=wikt -lin approximately_A = variants {} ; lin approximation_N = variants {} ; lin appurtenance_N = variants {} ; lin apr_PN = mkPN "Apr" ; -- src=eng status=guess @@ -13318,7 +13317,6 @@ lin cougar_N = mkN "Puma" "Pumas" masculine | mkN "Berglöwe" masculine | mkN "S lin cough_N = mkN "Husten" "Husten" masculine ; -- status=guess lin cough_V = irregV "husten" "hustet" "hustete" "huste" "gehustet" ; -- status=guess, src=wikt lin cough_up_V2 = variants {} ; -lin could_N = variants {} ; lin coulisse_N = variants {} ; lin coulomb_N = mkN "Coulomb" neuter ; -- status=guess lin coulter_N = variants {} ; @@ -20193,7 +20191,6 @@ lin expectable_A = variants {} ; lin expectancy_N = mkN "Erwartung" ; -- status=guess lin expectant_A = variants {} ; lin expectation_N = mkN "Erwartung" ; -- status=guess -lin expectations_N = variants {} ; lin expected_A = mkA "erwartet" ; -- status=guess lin expectedness_N = variants {} ; lin expectorant_N = mkN "Schleimlöser" masculine | mkN "Abhustemittel" neuter | mkN "Expektorans" neuter | mkN "Hustenlöser" masculine | mkN "schleimlösendes Mittel" neuter ; -- status=guess status=guess status=guess status=guess status=guess @@ -22161,7 +22158,7 @@ lin foochow_PN = mkPN "Foochow" ; -- src=eng status=guess lin food_N = mkN "Essen" neuter | mkN "Lebensmittel" feminine ; --- split: this was good food / shop food lin foodless_A = variants {} ; lin foodstuff_N = mkN "Nahrungsmittel" "Nahrungsmittel" neuter ; -- status=guess -lin fool_N = mkN "der  ;Damenflügel" "die  ;Damenflügel" masculine ; -- status=guess +lin fool_N = variants {}; lin fool_V2 = mkV2 (mkV "täuschen" | regV "schwindeln" | mkV "betrügen" | irregV "verarschen" "verarscht" "verarschte" "verarschte" "verarscht") ; -- status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt lin fool_about_V = variants {} ; lin fool_around_V = variants {} ; @@ -26046,7 +26043,7 @@ lin headmaster_N = variants {} ; -- lin headmastership_N = variants {} ; lin headmistress_N = mkN "Schulleiterin" feminine | mkN "Rekorin" feminine | mkN "Direktorin" feminine ; -- status=guess status=guess status=guess lin headmistressship_N = variants {} ; -lin headpiece_N = mkN "der  ;Damenflügel" "die  ;Damenflügel" masculine ; -- status=guess +lin headpiece_N = variants {}; lin headpin_N = variants {} ; lin headquarter_N = variants {} ; lin headquarters_N = mkN "Zentrale" "Zentralen" feminine ; -- status=guess @@ -31481,7 +31478,7 @@ lin ladyfish_N = variants {} ; lin ladylike_A = variants {} ; lin ladylikeness_N = variants {} ; lin ladylove_N = mkN "Feinsliebchen" "Feinsliebchen" neuter ; -- status=guess -lin ladyship_N = mkN "die  ;Vorstoßvariante" "die  ;Vorstoßvarianten" feminine ; -- status=guess +lin ladyship_N = variants {}; lin laelia_N = variants {} ; lin laetrile_N = variants {} ; lin lag_N = variants {} ; @@ -33276,7 +33273,7 @@ lin lordliness_N = variants {} ; lin lordly_A = variants {} ; lin lordolatry_N = variants {} ; lin lordosis_N = variants {} ; -lin lordship_N = mkN "der  ;Damenflügel" "die  ;Damenflügel" masculine ; -- status=guess +lin lordship_N = variants {}; lin lore_N = variants {} ; lin lorgnette_N = variants {} ; lin lorica_N = variants {} ; @@ -37830,7 +37827,6 @@ lin newtonian_A = variants {} ; lin newtonian_N = variants {} ; lin newtown_PN = mkPN "Newtown" ; -- src=geonames status=guess lin next_A = mkA "nächster" ; -- status=guess -lin next_N = mkN "der  ;Damenflügel" "die  ;Damenflügel" masculine ; -- status=guess lin next_Prep = variants {} ; lin next_to_Prep = variants {} ; lin nexus_N = mkN "Zentrum" "Zentren" neuter ; -- status=guess @@ -43508,7 +43504,7 @@ lin pomposity_N = variants {} ; lin pompous_A = mkA "pompös" ; -- status=guess lin ponce_N = variants {} ; lin poncho_N = variants {} ; -lin pond_N = mkN "der  ;Damenflügel" "die  ;Damenflügel" masculine ; -- status=guess +lin pond_N = variants {} ; lin ponder_V = mkV "überlegen" | prefixV "nach" (irregV "denken" "denkt" "dachte" "dächte" "gedacht") ; -- status=guess, src=wikt status=guess, src=wikt lin ponder_V2 = mkV2 (mkV "überlegen" | prefixV "nach" (irregV "denken" "denkt" "dachte" "dächte" "gedacht")) ; -- status=guess, src=wikt status=guess, src=wikt lin ponderable_A = variants {} ; @@ -48547,7 +48543,7 @@ lin roisterer_N = variants {} ; lin role_1_N = variants {} ; -- lin role_2_N = variants {} ; -- lin roleplaying_N = mkN "Rollenspiel" "Rollenspiele" neuter ; -- status=guess -lin roll_N = mkN "das  ;Larsen-System" "die  ;Larsen-Systeme" neuter | mkN "das  ;Larsen-System" "die  ;Larsen-Systeme" neuter ; -- status=guess status=guess +lin roll_N = variants {} ; lin roll_V = irregV "laufen" "lauft" "lief" "liefe" "gelaufen" ; -- status=guess, src=wikt lin roll_V2 = mkV2 (irregV "laufen" "lauft" "lief" "liefe" "gelaufen") ; -- status=guess, src=wikt lin roll_back_V = advV OP_roll_V OP_back_Adv ; -- guess-p-verb @@ -53273,7 +53269,7 @@ lin solicit_V = mkV "belästigen" | mkV "stören" ; -- status=guess, src=wikt st lin solicit_V2 = mkV2 (mkV "belästigen") | mkV2 (mkV "stören") ; -- status=guess, src=wikt status=guess, src=wikt lin solicitation_N = variants {} ; lin solicitorFem_N = variants {} ; -lin solicitorMasc_N = mkN "Solicitor" masculine | mkN "Rechtsanwalt" "Rechtsanwälte" masculine | mkN "der  ;Damenflügel" "die  ;Damenflügel" masculine ; -- status=guess status=guess status=guess +lin solicitorMasc_N = mkN "Solicitor" masculine | mkN "Rechtsanwalt" "Rechtsanwälte" masculine ; -- status=guess status=guess status=guess lin solicitor_general_N = variants {} ; lin solicitorship_N = variants {} ; lin solicitous_A = mk3A "beflissen" "beflissener" "beflissenste" | mkA "dienstbeflissen" | mkA "sorgsam" ; -- status=guess status=guess status=guess @@ -59017,7 +59013,7 @@ lin towel_rack_N = variants {} ; lin towel_rail_N = variants {} ; lin toweling_N = variants {} ; lin towelling_N = variants {} ; -lin tower_N = mkN "der  ;Damenflügel" "die  ;Damenflügel" masculine ; -- status=guess +lin tower_N = variants {} ; lin tower_V = variants {} ; lin tower_block_N = variants {} ; lin tower_hamlets_PN = mkPN "Tower hamlets" ; -- src=eng status=guess @@ -61815,8 +61811,7 @@ lin untidy_A = mk3A "unordentlich" "unordentlicher" "unordentlichste" ; -- statu lin untie_V = mkReflV "lösen" ; -- status=guess, src=wikt lin untie_V2 = mkV2 (mkReflV "lösen") ; -- status=guess, src=wikt lin untied_A = variants {} ; -lin until_Adv = variants {} ; -lin until_Prep = variants {} ; -- +lin until_Prep = variants {} ; lin until_Subj = ss "bis" ; lin untilled_A = variants {} ; lin untimbered_A = variants {} ; @@ -63945,7 +63940,6 @@ lin when_Subj = ss "wenn" | ss "als" ; -- comment=split in German ; could be par lin whence_Adv = mkAdv "woher" ; -- status=guess lin whencesoever_A = variants {} ; lin whenever_Adv = mkAdv "wenn" | mkAdv "wann" | mkAdv "wann" ; -- status=guess status=guess status=guess -lin where_Adv = mkAdv "wo" | mkAdv "wohin" | mkAdv "woher" ; -- status=guess status=guess status=guess lin where_IAdv = S.where_IAdv ; lin where_Subj = ss "wo" ; lin where_as_Prep = variants {} ; @@ -64691,7 +64685,6 @@ lin worshipful_A = variants {} ; lin worshipper_N = mkN "Anbeter" masculine | mkN "Anbeterin" feminine ; -- status=guess status=guess lin worst_A = mkA "schlectest" ; ---- not A lin worst_Adv = mkAdv "schlimmstenfalls" ; -- status=guess -lin worst_N = variants {} ; lin worst_V2 = variants {} ; lin worsted_N = variants {} ; lin wort_N = variants {} ; @@ -64706,7 +64699,6 @@ lin worthwhile_A = mkA "lohnend" | mk3A "wertvoll" "wertvoller" "wertvollste" ; lin worthwhileness_N = variants {} ; lin worthy_A = mkA "würdig" ; -- status=guess lin worthy_N = variants {} ; -lin would_N = variants {} ; lin would_be_A = variants {} ; lin wound_N = mkN "Wunde" "Wunden" feminine | mkN "Verletzung" ; -- status=guess status=guess lin wound_V2 = mkV2 (irregV "verletzen" "verletzt" "verletzte" "verletzte" "verletzt") ; -- status=guess, src=wikt diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index 76dd7eff7..561a1c159 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -33374,7 +33374,6 @@ lin worshiper_N = mkN "अंधभक्त" ; -- tocheck lin worshipper_N = mkN "अंधभक्त" ; -- tocheck lin worst_A = mkA "सर्वाधिक बुरा" ; -- tocheck lin worst_Adv = mkAdv "सबसे खराब" ; -- tocheck -lin worst_N = mkN "सबसे ज्यादा नुक़सान" ; -- tocheck lin worst_V2 = mkV2 (compoundV "बुरी तरह से पछाड़" (mkV "देना")) ; -- tocheck lin worsted_N = mkN "वूर्स्टेड" ; -- tocheck lin worth_A = mkA "योग्य" ; -- tocheck diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf index c960e35b8..fdea640e7 100644 --- a/lib/src/translator/DictionaryIta.gf +++ b/lib/src/translator/DictionaryIta.gf @@ -1494,7 +1494,6 @@ lin approval_N = mkN "approvazione" feminine ; -- status=guess lin approve_V = mkV "approvare" ; -- status=guess, src=wikt lin approve_V2 = mkV2 (mkV "approvare") ; -- status=guess, src=wikt lin approved_A = variants {} ; -- -lin approximately_A = variants {} ; lin approximation_N = mkN "approssimazione" feminine ; -- status=guess lin apricot_N = mkN "albicocca" ; -- status=guess lin apron_N = mkN "grembiule" masculine ; -- status=guess @@ -17884,7 +17883,6 @@ lin newt_N = mkN "tritone" ; -- UWN lin newton_N = mkN "newton" masculine ; -- status=guess lin newtown_PN = mkPN "Newtown" ; -- status=guess src=geonames lin next_A = mkA "vicino" | mkA "prossimo" ; -- status=guess status=guess -lin next_N = mkN "il prossimo" | mkN "la prossima" ; -- status=guess status=guess lin nexus_N = mkN "centro" ; -- status=guess lin ngultrum_N = mkN "ngultrum" | mkN "ngultrum_butanese" ; -- UWN lin ngwee_N = mkN "ngwee" | mkN "ngwee_zambiano" ; -- UWN diff --git a/lib/src/translator/DictionaryJpn.gf b/lib/src/translator/DictionaryJpn.gf index 0316c9f7e..a6412667a 100644 --- a/lib/src/translator/DictionaryJpn.gf +++ b/lib/src/translator/DictionaryJpn.gf @@ -15848,7 +15848,6 @@ lin whelk_N = mkN "エゾバイ" | mkN "ツブ" ; lin when_IAdv = S.when_IAdv ; lin when_Subj = S.when_Subj ; lin whenever_Adv = ParadigmsJpn.mkAdv "いつでも" ; -lin where_Adv = mkAdv "何処" | mkAdv "どこ" | mkAdv "どうなる" ; lin where_IAdv = S.where_IAdv ; lin where_Subj = variants{} ; -- lin whereabouts_N = mkN "所在" | mkN "在所" ; diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index dcd7136be..cc786cbef 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -1809,7 +1809,6 @@ lin approve_V2 = mkV2 (aprobar_V) ; -- status=guess lin approved_A = variants {} ; -- lin approvingly_Adv = mkAdv "con aprobación" ; -- status=guess lin approximate_A = mkA "aproximado" ; -- status=guess -lin approximately_A = variants {} ; lin approximation_N = mkN "aproximación" feminine ; -- status=guess lin apraxia_N = mkN "apraxia" ; -- status=guess lin apricot_N = mkN "albaricoque" | mkN "chabacano" ; -- status=guess @@ -19791,7 +19790,6 @@ lin newswoman_N = mkN "presentadora_de_noticias" ; --UWN lin newton_N = mkN "newton" masculine ; -- status=guess lin newtown_PN = mkPN "Newtown" ; -- status=guess src=geonames lin next_A = mkA "próximo" ; -- status=guess -lin next_N = mkN "siguiente" masculine | mkN "próxima" | mkN "próximo" ; -- status=guess status=guess status=guess lin nexus_N = mkN "centro" ; -- status=guess lin nib_N = mkN "pico" ; --UWN lin nibble_V = mkV "comiscar" | mkV "comisquear" | mkV "picotear" ; -- status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 8a4d966f6..eb0678736 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -3126,7 +3126,6 @@ lin approx_PN = mkPN "Approx" ; -- src=eng status=guess lin approximate_A = mkA "ungefärlig" ; -- comment=2 lin approximate_V = mkV "approximerar" ; -- comment=2 lin approximate_V2 = variants {} ; -- status=guess -lin approximately_A = variants {} ; lin approximation_N = mkN "närmande" ; -- comment=2 lin appurtenance_N = mkN "tillbehör" neutrum ; -- status=guess lin apr_PN = mkPN "Apr" ; -- src=eng status=guess @@ -37493,7 +37492,6 @@ lin newtonian_A = variants {} ; -- status=guess lin newtonian_N = mkN "newtonsk"; -- src=google lin newtown_PN = mkPN "Newtown" neutrum ; -- src=geonames status=guess lin next_A = mkA "nästa" ; -- status=guess -lin next_N = mkN "nästa" ; -- comment=3 lin next_Prep = mkPrep "nästintill" ; ---- Prep ? lin next_to_Prep = mkPrep "bredvid" | mkPrep "intill" ; lin nexus_N = variants {} ; -- status=guess @@ -63301,7 +63299,6 @@ lin when_Subj = S.when_Subj ; lin whence_Adv = mkAdv "varifrån" | mkAdv "var i från" | (mkAdv "vadan") ; -- status=guess status=guess status=guess lin whencesoever_A = variants {} ; -- status=guess lin whenever_Adv = mkAdv "närsom" | mkAdv "när som helst" | mkAdv "närhelst" ; -- status=guess status=guess status=guess -lin where_Adv = mkAdv "där" ; -- status=guess lin where_IAdv = S.where_IAdv ; lin where_Subj = lin Subj {s = "där"} ; lin where_as_Prep = variants {} ; -- status=guess @@ -64040,7 +64037,6 @@ lin worshipful_A = variants {} ; -- status=guess lin worshipper_N = mkN "troende" ; -- status=guess lin worst_A = mkA "värst" ; -- status=guess lin worst_Adv = variants {} ; -- status=guess -lin worst_N = mkN "värsta"; -- src=google lin worst_V2 = variants {} ; -- status=guess lin worsted_N = mkN "kamgarn" neutrum ; -- status=guess lin wort_N = mkN "vört" ; -- status=guess diff --git a/lib/src/translator/DictionaryTha.gf b/lib/src/translator/DictionaryTha.gf index 4464f505f..61af6b00d 100644 --- a/lib/src/translator/DictionaryTha.gf +++ b/lib/src/translator/DictionaryTha.gf @@ -42296,7 +42296,6 @@ lin when_IAdv = ss (thword "เมื่อไร") ; lin when_Subj = ss "ที" ; lin whence_Adv = mkAdv "จากที่ไหน" | mkAdv "จากสาเหตุใด" | mkAdv "จากแหล่งไหน" ; -- src=panlex lin whenever_Adv = mkAdv "เมื่อไรก็ตาม" ; -- src=panlex -lin where_Adv = mkAdv "ณ ที่นั้น" | mkAdv "จุดไหน" | mkAdv "ตรงไหน" | mkAdv "ที่ไหน" | mkAdv "ไปที่นั้น" | mkAdv "อยู่ที่นั้น" | mkAdv "สถานที่เกิดเหตุ" ; -- src=panlex lin where_IAdv = ss (thword "ที่" "ไหน") ; lin whereat_Adv = mkAdv "ที่มา" | mkAdv "ที่ซึ่ง" | mkAdv "แหล่งซึ่ง" ; -- src=panlex lin whereby_Adv = mkAdv "โดยทาง" | mkAdv "อย่างไร" | mkAdv "อาศัยอะไร" | mkAdv "เพราะอะไร" | mkAdv "ด้วยวิธีที่" ; -- src=panlex @@ -42823,7 +42822,6 @@ lin worshipful_A = mkA "ศรัทธา" | mkA "น่าบูชา" | mkA lin worshipper_N = mkN "ผู้บูชา" | mkN "คนที่นับถือ" | mkN "ผู้มีศรัทธา" | mkN "ผู้มีความเชื่อ" | mkN "ผู้สักการะบูชา" ; -- src=panlex lin worst_A = mkA "ที่แย่ที่สุด" | mkA "เลวที่สุด" | mkA "แย่ที่สุด" | mkA "ชั่วที่สุด" | mkA "ระยําที่สุด" | mkA "ผิดพลาดที่สุด" | mkA "อัปลักษณ์ที่สุด" | mkA "ไม่น่าพอใจที่สุด" | mkA "ซึ่งไม่น่าพอใจที่สุด" ; -- src=panlex lin worst_Adv = mkAdv "แย่ที่สุด" | mkAdv "เลวที่สุด" | mkAdv "แย่ที่สุด" | mkAdv "ชั่วที่สุด" | mkAdv "ระยําที่สุด" | mkAdv "ผิดพลาดที่สุด" | mkAdv "อัปลักษณ์ที่สุด" | mkAdv "ไม่น่าพอใจที่สุด" ; -- src=panlex -lin worst_N = mkN "ผลแย่ที่สุด" | mkN "การทำแย่ที่สุด" | mkN "เลวที่สุด" | mkN "แย่ที่สุด" | mkN "ชั่วที่สุด" | mkN "ระยําที่สุด" | mkN "ผิดพลาดที่สุด" | mkN "อัปลักษณ์ที่สุด" | mkN "สิ่งที่เลวที่สุด" | mkN "สิ่งที่แย่ที่สุด" | mkN "ไม่น่าพอใจที่สุด" ; -- src=panlex lin worsted_N = mkN "ผ้าขนสัตว์แบบนุ่ม" | mkN "ด้ายขนสัตว์แบบนุ่ม" ; -- src=panlex lin wort_N = mkN "พืช" | mkN "พืชสมุนไพร" | mkN "เบียร์ที่ต้มแล้วแต่ยังไม่ได้หมักฟู" ; -- src=panlex lin worth_A = mkA "ซึ่งมีค่า" | mkA "ซึ่งคุ้มค่า" ; -- src=panlex @@ -42835,7 +42833,6 @@ lin worthwhile_A = mkA "ซึ่งคุ้มค่ากับเวลา lin worthwhileness_N = mkN "ความคุ้มค่า" | mkN "ความคุ้มค่า" ; -- src=panlex lin worthy_A = mkA "ที่มีคุณค่า" | mkA "คุ้มค่า" | mkA "ซึ่งน่าเคารพ" | mkA "มีค่าเพียงพอ" | mkA "ซึ่งน่ายกย่อง" ; -- src=panlex lin worthy_N = mkN "ผู้มีเกียรติ" | mkN "ผู้น่าสรรเสริญ" | mkN "ผู้ที่น่ายกย่อง" ; -- src=panlex -lin would_N = mkN "คํากริยาที่ใช้สําหรับการขอร้องอย่างสุภาพ" ; -- src=panlex lin wound_N = mkN "บาดแผล" | mkN "แผล" | mkN "บาดแผล" | mkN "ทําอันตราย" | mkN "ทําให้บาดเจ็บ" | mkN "การทําให้บาดเจ็บ" ; -- src=panlex lin wounded_N = mkN "คนเจ็บ" | mkN "ผู้บาดเจ็บ" | mkN "กลุ่มผู้บาดเจ็บ" | mkN "ผู้ได้รับบาดเจ็บ" | mkN "กลุ่มผู้ได้รับบาดเจ็บ" ; -- src=panlex lin woven_A = mkA "ทอ" | mkA "ที่ถูกถักทอ" ; -- src=panlex diff --git a/lib/src/translator/ExtensionsGer.gf b/lib/src/translator/ExtensionsGer.gf index 080a2d87c..62708685b 100644 --- a/lib/src/translator/ExtensionsGer.gf +++ b/lib/src/translator/ExtensionsGer.gf @@ -64,12 +64,8 @@ lin PredVPovs = G.PredVP; CompoundN noun cn = { - s = \\n,c => glue noun.co (cn.uncap.s ! n ! c) ; - co = glue noun.co (cn.uncap.co) ; - uncap = { - s = \\n,c => glue noun.uncap.co (cn.uncap.s ! n ! c) ; - co = glue noun.uncap.co (cn.uncap.co) - } ; + s = \\n,c => glue noun.co (cn.s ! n ! c) ; + co = glue noun.co (cn.co) ; g = cn.g } ; diff --git a/lib/src/translator/translate.probs b/lib/src/translator/translate.probs index b015e68a4..88515fd66 100644 --- a/lib/src/translator/translate.probs +++ b/lib/src/translator/translate.probs @@ -64509,7 +64509,6 @@ worshipful_A 1.0773191989054437e-5 worshipper_N 3.729715012475897e-6 worst_A 1.0773191989054437e-5 worst_Adv 8.668966832532898e-6 -worst_N 3.729715012475897e-6 worst_V2 1.609865254278217e-5 worsted_N 3.729715012475897e-6 wort_N 3.729715012475897e-6