diff --git a/lib/src/bulgarian/ParadigmsBul.gf b/lib/src/bulgarian/ParadigmsBul.gf index 3e842ed6a..1062f0aef 100644 --- a/lib/src/bulgarian/ParadigmsBul.gf +++ b/lib/src/bulgarian/ParadigmsBul.gf @@ -1223,6 +1223,18 @@ oper g = g ; lock_N = <> }; + mkN077 : Str -> N ; + mkN077 base = let v0 = base; + g = AFem + in {s = mkNoun (v0) + nonExist + nonExist + (v0) + g ; + rel = \\_ => base ; + g = g ; + lock_N = <> + }; mkA076 : Str -> A ; mkA076 base = let v0 = base in mkAdjective (v0) diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 4f2a7a9ce..c4efe893c 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -30391,7 +30391,8 @@ fun laundryman_N : N; fun laundrywoman_N : N; fun laura_PN : PN; fun laureate_A : A; -fun laureate_N : N; +fun laureateMasc_N : N; +fun laureateFem_N : N; fun laurel_N : N; fun laureled_A : A; fun laurelled_A : A; diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index c09c125bd..774008341 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -18061,12 +18061,12 @@ lin embody_V2 = dirV2 (variants {singleV (mkV186 "представлявам") ; lin embolden_V2 = variants {}; lin embolectomy_N = variants {}; lin embolic_A = variants {}; -lin embolism_N = mkN047 "емболия"; ---- +lin embolism_N = mkN047 "емболия"; lin embolus_N = variants {}; lin embonpoint_A = variants {}; lin embonpoint_N = variants {}; lin emboss_V2 = variants {}; -lin embrace_N = variants {mkN041 "ласка"; mkN041 "прегръдка"}; ---- +lin embrace_N = mkN041 "прегръдка"; lin embrace_V = variants {dualV (mkV186 "влизам") (mkV147 "вляза"); dualV (mkV186 "преграбчвам") (mkV176 "преграбча"); dualV (mkV186 "притискам") (mkV152 "притисна")}; ---- lin embrace_V2 = dirV2 (variants {dualV (mkV186 "обхващам") (mkV152 "обхвана") ; dualV (mkV186 "възприемам") (mkV171 "възприема")}); ---- lin embrasure_N = variants {mkN041 "амбразура"; mkN041 "бойвица"}; ---- @@ -30271,7 +30271,7 @@ lin larboard_N = variants {}; lin larcenist_N = variants {}; lin larceny_N = mkN071 "ограбване" ; ---- lin larch_N = mkN041 "лиственица" ; ---- -lin lard_N = variants {}; +lin lard_N = mkN077 "мас"; lin lard_V2 = variants {}; lin larder_N = mkN007 "килер"; ---- lin large_A = mkA081 "голям"; @@ -30426,8 +30426,9 @@ lin laundry_N = mkN065 "пране"; lin laundryman_N = mkN007 "перач"; lin laundrywoman_N = mkN041 "перачка"; lin laura_PN = variants {}; -lin laureate_A = variants {}; -lin laureate_N = variants {mkN008a "лавроносец"; mkN007 "лауреат"}; ---- +lin laureate_A = mkA078 "лауреатски"; +lin laureateMasc_N = dualN (mkN007 "лауреат") (mkA078 "лауреатски"); +lin laureateFem_N = dualN (mkN041 "лауреатка") (mkA078 "лауреатски"); lin laurel_N = variants {mkN041 "дафина"; mkN041 "лавра"}; ---- lin laureled_A = variants {}; lin laurelled_A = variants {}; diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index 8e67add0f..0fb37040d 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -10316,7 +10316,8 @@ meditation_N = mkN "冥想" ; -- 2 managerial_A = mkA "管理" ; -- 2 lookout_N = mkN "监视" ; -- 2 lick_V2 = mkV2 "舔" ; -- 2 -laureate_N = mkN "得奖者" ; -- 2 +laureateMasc_N = mkN "得奖者" ; -- 2 +laureateFem_N = mkN "得奖者" ; -- 2 keyless_A = mkA "无键" ; -- 2 jam_V2 = mkV2 "使+堵塞" ; -- 2 intertwine_V2 = mkV2 "纠缠" ; -- 2 diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index afec886d5..79794e1ce 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -30420,7 +30420,8 @@ lin laundryman_N = mkN masculine (mkN "laundryman" "laundrymen"); lin laundrywoman_N = mkN feminine (mkN "laundrywoman" "laundrywomen"); lin laura_PN = mkPN "Laura"; lin laureate_A = compoundA (mkA "laureate"); -lin laureate_N = mkN "laureate" "laureates"; +lin laureateMasc_N = mkN masculine (mkN "laureate" "laureates"); +lin laureateFem_N = mkN feminine (mkN "laureate" "laureates"); lin laurel_N = mkN "laurel" "laurels"; lin laureled_A = mkA "laureled" ; lin laurelled_A = compoundA (mkA "laurelled"); @@ -62140,11 +62141,11 @@ lin ytterbium_N = mkN "ytterbium" ; lin yttrium_N = mkN "yttrium" ; lin yuan_N = mkN "yuan" ; lin yucca_N = mkN "yucca" ; -lin yugoslav_A = compoundA (mkA "yugoslav"); -lin yugoslav_N = mkN "yugoslav" "yugoslavs"; +lin yugoslav_A = compoundA (mkA "Yugoslav"); +lin yugoslav_N = mkN "Yugoslav" "Yugoslavs"; lin yugoslavia_PN = mkPN "Yugoslavia"; -lin yugoslavian_A = compoundA (mkA "yugoslavian"); -lin yugoslavian_N = mkN "yugoslavian" "yugoslavians"; +lin yugoslavian_A = compoundA (mkA "Yugoslavian"); +lin yugoslavian_N = mkN "Yugoslavian" "Yugoslavians"; lin yukon_PN = mkPN "Yukon"; lin yule_N = mkN "yule" ; lin yule_log_N = mkN "yule-log" "yule-logs"; @@ -62157,12 +62158,12 @@ lin zabaglione_N = mkN "zabaglione" ; lin zagreb_PN = mkPN "Zagreb"; lin zaire_N = mkN "zaire" ; lin zaire_PN = mkPN "Zaire"; -lin zairean_A = compoundA (mkA "zairean"); -lin zairean_N = mkN "zairean" "zaireans"; +lin zairean_A = compoundA (mkA "Zairean"); +lin zairean_N = mkN "Zairean" "Zaireans"; lin zakat_N = mkN "zakat" ; lin zambia_PN = mkPN "Zambia"; -lin zambian_A = compoundA (mkA "zambian"); -lin zambian_N = mkN "zambian" "zambians"; +lin zambian_A = compoundA (mkA "Zambian"); +lin zambian_N = mkN "Zambian" "Zambians"; lin zamia_N = mkN "zamia" ; lin zany_A = mkA "zany" "zanier"; lin zany_N = mkN "zany" "zanies"; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index f680f0f90..ca26ebc20 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -25305,7 +25305,8 @@ laundry_N = mkWN (k12 "pesula") ; --UNCHK laundryman_N = mkWN (kH1 "pesijä") ; --UNCHK laundrywoman_N = mkWN (k12 "pyykinpesijä") ; --UNCHK laureate_A = mkWA "palkinnon" "saava" ; --UNCHK -laureate_N = mkWN (k10 "saaja") "palkinnon" ; --UNCHK +laureateMasc_N = mkWN (k10 "saaja") "palkinnon" ; --UNCHK +laureateFem_N = mkWN (k10 "saaja") "palkinnon" ; --UNCHK laurel_N = mkWN (compoundN "laakeri" (k49 "seppele")) ; --UNCHK laureled_A = mkWA (compoundA "kruuna" (k1 "ttu")) "seppeleellä" ; --UNCHK laurelled_A = mkWA (compoundA "kruuna" (k1 "ttu")) "seppeleellä" ; --UNCHK diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index e29ba0b6b..1693db6ca 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -10211,7 +10211,8 @@ launder_V2 = mkV2 (mkV "blanchir"); launderette_N = mkN "lavomatique" masculine; laundress_N = mkN "blanchisseuse" feminine; laundry_N = mkN "blanchisserie" feminine | mkN "laverie" feminine | mkN "lessive" feminine; -laureate_N = mkN "lauréat" masculine; +laureateMasc_N = mkN "lauréat" masculine; +laureateFem_N = mkN "lauréat" masculine; laurel_N = mkN "lauriers" | mkN "laurier" masculine; lava_N = mkN "lave" feminine; lavender_A = mkA "lavande"; diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index cbccfe722..70e69e784 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -20560,7 +20560,8 @@ lin laundryman_N = variants {}; lin laundrywoman_N = variants {}; lin laura_PN = variants {}; lin laureate_A = variants {}; -lin laureate_N = variants {}; +lin laureateMasc_N = variants {}; +lin laureateFem_N = variants {}; lin laurel_N = reg2N "Lorbeer" "Lorbeeren" masculine; lin laurelled_A = variants {}; lin laurence_PN = variants {}; diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index 956d7360e..8a10d2d9f 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -14982,7 +14982,8 @@ lin laundress_N = mkN "धोबिन" ; -- old -- old lin laundry_N = mkN "धुले कपड़े" ; -- old -- old lin laundryman_N = mkN "धोबी" ; -- old -- old lin laundrywoman_N = mkN "धोबिन" ; -- old -- old -lin laureate_N = mkN "पुरस्कृत व्यक्ति" ; -- old -- old +lin laureateMasc_N = mkN "पुरस्कृत व्यक्ति" ; -- old -- old +lin laureateFem_N = mkN "पुरस्कृत व्यक्ति" ; -- old -- old lin laurel_N = mkN "लरेल" ; -- old -- old lin lava_N = mkN "लावा" ; -- old -- old lin lavatory_N = mkN "शौचालय" ; -- old -- old diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index 740594147..b26a3ca9a 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -10979,7 +10979,8 @@ lin launder_V2 = mkV2 (mkV "lavar") ; -- status=guess, src=wikt lin launderette_N = mkN "lavandería" ; -- status=guess lin laundry_N = mkN "colada" ; -- status=guess lin laureate_A = mkA "laureado" | mkA "galardonado" ; -- status=guess status=guess -lin laureate_N = mkN "laureado" | mkN "galardonado" ; -- status=guess status=guess +lin laureateMasc_N = mkN "laureado" | mkN "galardonado" ; -- status=guess status=guess +lin laureateFem_N = mkN "laureado" | mkN "galardonado" ; -- status=guess status=guess lin laurel_N = mkN "corona de laurel" ; -- status=guess lin lav_N = mkN "retrete" ; -- status=guess lin lava_N = mkN "lava" ; -- status=guess diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index edd3b1081..6f59a7f78 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -31704,7 +31704,8 @@ lin laundryman_N = variants {} ; lin laundrywoman_N = variants {} ; lin laura_PN = variants {} ; lin laureate_A = variants {} ; -lin laureate_N = variants {} ; +lin laureateMasc_N = mkN "laureate"; +lin laureateFem_N = mkN "laureate"; lin laurel_N = mkN "lager" ; -- comment=3 lin laureled_A = variants {} ; lin laurelled_A = variants {} ;