diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 25e42cab1..e2b6e99f4 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -10197,8 +10197,6 @@ fun chebab_N : N ; fun check_N : N ; fun check_V : V ; fun check_V2 : V2 ; -fun check_1_V2 : V2 ; -fun check_2_V2 : V2 ; fun check_back_V : V ; fun check_by_V2 : V2 ; fun check_for_V2 : V2 ; @@ -21708,7 +21706,6 @@ fun finnan_haddock_N : N ; fun finnish_A : A ; fun finnishMasc_N : N ; fun finnishFem_N : N ; -fun finnish_N : N ; fun fiona_PN : PN ; fun fiord_N : N ; fun fipple_N : N ; @@ -21849,8 +21846,6 @@ fun fit_A : A ; fun fit_N : N ; fun fit_V : V ; fun fit_V2 : V2 ; -fun fit_1_V2 : V2 ; -fun fit_2_V2 : V2 ; fun fit_in_V : V ; fun fit_in_V2 : V2 ; fun fit_in_with_V2 : V2 ; @@ -24612,9 +24607,6 @@ fun go_without_V2 : V2 ; fun goad_N : N ; fun goad_V2 : V2 ; fun goal_N : N ; -fun goal_1_N : N ; -fun goal_2_N : N ; -fun goal_3_N : N ; fun goal_kick_N : N ; fun goal_line_N : N ; fun goalie_N : N ; @@ -27002,8 +26994,6 @@ fun hinder_V2 : V2 ; fun hindfoot_N : N ; fun hindgut_N : N ; fun hindi_A : A ; -fun hindiMasc_N : N ; -fun hindiFem_N : N ; fun hindmost_A : A ; fun hindquarter_N : N ; fun hindquarters_N : N ; @@ -29111,8 +29101,8 @@ fun india_rubber_N : N ; fun indiaman_N : N ; fun indian_A : A ; fun indian_N : N ; -- indian of America +fun indianMasc_N : N ; -- national of India fun indianFem_N : N ; -- national of India -fun indian_Masc : N ; fun indiana_PN : PN ; fun indianapolis_PN : PN ; --subcat fun indicate_V : V ; @@ -36335,9 +36325,6 @@ fun misrule_N : N ; fun miss_N : N ; fun miss_V : V ; fun miss_V2 : V2 ; -fun miss_1_V2 : V2 ; -fun miss_2_V2 : V2 ; -fun miss_3_V2 : V2 ; fun miss_out_V : V ; fun miss_out_V2 : V2 ; fun miss_out_on_V2 : V2 ; @@ -44752,8 +44739,6 @@ fun preseason_N : N ; fun presence_N : N ; fun present_A : A ; fun present_N : N ; -fun present_1_N : N ; -fun present_2_N : N ; fun present_V2 : V2 ; fun present_day_A : A ; fun presentable_A : A ; @@ -51889,8 +51874,6 @@ fun shard_N : N ; fun share_N : N ; fun share_V : V ; fun share_V2 : V2 ; -fun share_1_V2 : V2 ; -fun share_2_V2 : V2 ; fun share_out_N : N ; fun share_out_V : V ; fun sharecropper_N : N ; @@ -52567,8 +52550,6 @@ fun sigmoidectomy_N : N ; fun sigmoidoscope_N : N ; fun sigmoidoscopy_N : N ; fun sign_N : N ; -fun sign_1_N : N ; -fun sign_2_N : N ; fun sign_V : V ; fun sign_V2 : V2 ; --subcat fun sign_V2V : V2V ; diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 7627d1841..356c2cd02 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -20621,7 +20621,8 @@ lin finnan_N = mkN007 "финан"; lin finnan_haddie_N = variants {}; lin finnan_haddock_N = variants {}; lin finnish_A = mkA078 "фински" ; -lin finnish_N = mkN008a "финландец"; +lin finnishMasc_N = mkN008a "финландец"; +lin finnishFem_N = mkN041 "финланка"; lin fiona_PN = mkPN "Фйона" Masc; lin fiord_N = mkN007 "фиорд"; ---- lin fipple_N = variants {}; diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 14b538f01..e16312cc1 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -18229,9 +18229,8 @@ lin dustmop_N = mkN "dustmop" ; lin dustpan_N = mkN "dustpan" "dustpans"; lin dusty_A = mkA "dusty" "dustier"; lin dutch_A = compoundA (mkA "Dutch"); -lin dutchMasc_N = mkN "Dutch" "Dutch"; +lin dutchMasc_N = variants {mkN "Dutch" "Dutch"; mkN masculine (mkN "Dutchman" "Dutchmen")}; lin dutchFem_N = mkN "Dutch" "Dutch"; -lin dutchman_N = mkN masculine (mkN "dutchman" "dutchmen"); lin duteous_A = compoundA (mkA "duteous"); lin dutiable_A = compoundA (mkA "dutiable"); lin dutiful_A = compoundA (mkA "dutiful"); @@ -19322,8 +19321,6 @@ lin england_PN = mkPN "England"; lin english_A = compoundA (mkA "English"); lin englishMasc_N = mkN "Englishman" "Englishmen" ; lin englishFem_N = mkN "Englishwoman" "Englishwomen" ; -lin englishman_N = mkN masculine (mkN "englishman" "englishmen"); -lin englishwoman_N = mkN feminine (mkN "englishwoman" "englishwomen"); lin engorgement_N = mkN "engorgement" ; lin engraft_V2 = mkV2 (mkV "engraft" "engrafts" "engrafted" "engrafted" "engrafting"); lin engram_N = mkN "engram" ; @@ -21701,7 +21698,6 @@ lin fink_N = mkN "fink" ; lin fink_on_V2 = prepV2 (mkV "fink") (mkPrep "on"); lin fink_out_V = partV (mkV "fink") "out"; lin finland_PN = mkPN "Finland"; -lin finn_N = mkN "Finn" "Finns"; lin finnan_N = mkN "finnan" ; lin finnan_haddie_N = mkN "finnan haddie" ; lin finnan_haddock_N = mkN "finnan haddock" ; @@ -22977,8 +22973,6 @@ lin freightliner_N = mkN "freightliner" "freightliners"; lin french_A = compoundA (mkA "French"); lin frenchMasc_N = mkN "Frenchman" "Frenchmen" ; lin frenchFem_N = mkN "Frenchwoman" "Frenchwomen" ; -lin frenchman_N = mkN masculine (mkN "frenchman" "frenchmen"); -lin frenchwoman_N = mkN feminine (mkN "frenchwoman" "frenchwomen"); lin frenetic_A = compoundA (mkA "frenetic"); lin frenzied_A = compoundA (mkA "frenzied"); lin frenzy_N = mkN "frenzy" ; @@ -26056,7 +26050,6 @@ lin hardihood_N = mkN "hardihood" ; lin hardiness_N = mkN "hardiness" ; lin hardinggrass_N = mkN "hardinggrass" ; lin hardliner_N = mkN "hardliner" "hardliners"; -lin hardly_Adv = mkAdv "hardly" ; lin hardness_N = mkN "hardness" ; lin hardscrabble_A = mkA "hardscrabble" ; lin hardship_N = mkN "hardship" "hardships"; @@ -38372,7 +38365,6 @@ lin ninja_N = mkN "ninja" ; lin ninjutsu_N = mkN "ninjutsu" ; lin ninny_N = mkN "ninny" "ninnies"; lin ninon_N = mkN "ninon" ; -lin ninth_A = mkA "ninth" ; lin ninth_N = mkN "ninth" ; lin niobe_PN = mkPN "Niobe"; lin niobite_N = mkN "niobite" ; @@ -43846,7 +43838,6 @@ lin polling_booth_N = mkN "polling-booth" "polling-booths"; lin polling_day_N = mkN "polling-day" "polling-days"; lin polling_station_N = mkN "polling-station" "polling-stations"; lin pollinium_N = mkN "pollinium" ; -lin polls_N = mkN "polls" ; lin pollster_N = mkN "pollster" "pollsters"; lin pollucite_N = mkN "pollucite" ; lin pollutant_N = mkN "pollutant" "pollutants"; @@ -52375,7 +52366,6 @@ lin shtik_N = mkN "shtik" ; lin shtikl_N = mkN "shtikl" ; lin shuck_N = mkN "shuck" "shucks"; lin shuck_V2 = mkV2 (mkV "shuck" "shucks" "shucked" "shucked" "shucking"); -lin shucks_N = mkN "shucks" ; lin shudder_N = mkN "shudder" "shudders"; lin shudder_V = mkV "shudder" "shudders" "shuddered" "shuddered" "shuddering"; lin shudderingly_Adv = mkAdv "shudderingly"; @@ -52555,7 +52545,6 @@ lin sigmoidoscopy_N = mkN "sigmoidoscopy" ; lin sign_N = mkN "sign" "signs"; lin sign_V = mkV "sign" "signs" "signed" "signed" "signing"; lin sign_V2 = mkV2 (mkV "sign" "signs" "signed" "signed" "signing"); ---subcat lin sign_V2V = mkV2V (mkV "sign" "signs" "signed" "signed" "signing") noPrep to_Prep ; lin sign_away_V2 = mkV2 (partV (mkV "sign") "away"); lin sign_for_V3 = mkV3 (mkV "sign") noPrep (mkPrep "for"); lin sign_in_V = partV (mkV "sign") "in"; @@ -57126,7 +57115,6 @@ lin sweatshop_N = mkN "sweatshop" "sweatshops"; lin sweaty_A = mkA "sweaty" "sweatier"; lin swedeFem_N = mkN feminine (mkN "Swede" "Swedes"); lin swedeMasc_N = mkN masculine (mkN "Swede" "Swedes"); -lin swede_A = compoundA (mkA "Swedish") ; --- swede is not and adjective lin sweden_PN = mkPN "Sweden"; lin swedish_A = compoundA (mkA "Swedish"); lin swedishMasc_N = mkN "Swede" ; @@ -64718,7 +64706,6 @@ lin whether_Subj = mkSubj "whether" ; lin whetstone_N = mkN "whetstone" "whetstones"; lin whey_N = mkN "whey" ; lin which_IQuant = {s = \\_ => "which"} ; -lin which_N = mkN "which" ; lin whichever_A = compoundA (mkA "whichever"); lin whichever_Quant = mkQuant "whichever" "whichever" ; lin whichsoever_A = compoundA (mkA "whichsoever"); diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index a200cf89c..8acb81149 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -10171,8 +10171,6 @@ lin cheat_V2 = mkV2 (mkV "betrügen" | prefixV "fremd" (irregV "gehen" "geht" "g lin cheat_on_V2 = variants {} ; lin cheat_out_of_V3 = variants {} ; lin chebab_N = variants {} ; -lin check_1_V2 = variants {} ; -lin check_2_V2 = variants {} ; lin check_N = mkN "Rechnung" ; -- status=guess lin check_V = mkV "checken" | fixprefixV "über" (mkV "prüfen") ; -- note: I checked - ich habe ES gecheckt/überprüft lin check_V2 = mkV2 (fixprefixV "über" (mkV "prüfen")) | mkV2 (mkV "prüfen") | mkV2 (mkV "checken") ; @@ -21749,8 +21747,6 @@ lin fistmele_N = variants {} ; lin fistula_N = mkN "Fistel" "Fisteln" feminine ; -- status=guess lin fistular_A = variants {} ; lin fistulous_A = variants {} ; -lin fit_1_V2 = variants {} ; -lin fit_2_V2 = variants {} ; lin fit_A = mk3A "sexy" "sexyer" "sexyste" | mk3A "scharf" "schärfer" "schärfste" | mkA "heiß" ; -- status=guess status=guess status=guess lin fit_N = mkN "Paßform" feminine ; -- status=guess lin fit_V = mkV "passen" ; @@ -24503,9 +24499,6 @@ lin go_with_V2 = variants {} ; lin go_without_V2 = variants {} ; lin goad_N = mkN "Stachelstock" masculine ; -- status=guess lin goad_V2 = mkV2 (mkV "anstacheln") ; -- status=guess, src=wikt -lin goal_1_N = variants {} ; -lin goal_2_N = variants {} ; -lin goal_3_N = variants {} ; lin goal_N = mkN "Tor" "Tore" neuter | mkN "Ziel" "Ziele" neuter ; -- split: football goal / goal in life lin goal_kick_N = variants {} ; lin goal_line_N = variants {} ; @@ -36163,9 +36156,6 @@ lin misrelated_A = variants {} ; lin misrepresent_V2 = variants {} ; lin misrepresentation_N = variants {} ; lin misrule_N = variants {} ; -lin miss_1_V2 = variants {} ; -lin miss_2_V2 = variants {} ; -lin miss_3_V2 = variants {} ; lin miss_N = mkN "Fräulein" neuter ; -- status=guess lin miss_V = prefixV "daneben" I.schießen_V | prefixV "daneben" I.schlagen_V ; lin miss_V2 = mkV2 (fixprefixV "ver" (mkV "passen")) | mkV2 (mkV "fehlen") ; -- miss a deadline / miss someone - NOTE: I miss you = du fehlst mir! @@ -44552,8 +44542,6 @@ lin prescriptive_A = variants {} ; lin prescriptivism_N = variants {} ; lin preseason_N = variants {} ; lin presence_N = mkN "Anwesenheit" feminine ; -- status=guess -lin present_1_N = variants {} ; -lin present_2_N = variants {} ; lin present_A = mkA "gegenwärtig" | mkA "anwesend" ; -- split: current | physically present lin present_N = mkN "Gegenwart" feminine | mkN "Geschenk" "Geschenke" neuter ; -- split: current time / gift lin present_V2 = mkV2 (mkV "präsentieren") ;