From bf0b487a4c1be49bec90ed2dfd286237b58ac2c2 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Thu, 7 Aug 2014 19:09:02 +0000 Subject: [PATCH] fix marquess_N, marquis_N in Eng,Bul,Fre --- lib/src/translator/DictionaryBul.gf | 8 ++++---- lib/src/translator/DictionaryEng.gf | 4 ++-- lib/src/translator/DictionaryFre.gf | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 199f12c37..7315f76d0 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -32837,9 +32837,9 @@ lin maroon_V2 = variants {}; lin marple_PN = mkPN "Марпъл" Masc; lin marque_N = variants {}; lin marquee_N = mkN041 "шатра"; ---- -lin marquess_N = mkN007a "маркиз"; ---- +lin marquess_N = mkN041 "маркиза"; lin marquetry_N = mkN041a "мозайка"; -lin marquis_N = mkN007a "маркиз"; ---- +lin marquis_N = mkN007a "маркиз"; lin marriage_N = mkN001 "брак" ; lin marriageability_N = variants {}; lin marriageable_A = variants {}; @@ -32853,7 +32853,7 @@ lin marsala_N = mkN041 "марсала"; lin marseillaise_N = mkN041 "марсилеза"; lin marseille_N = mkN008a "марсилец"; lin marseilles_PN = mkPN "Марсилия" Fem; -lin marsh_N = mkN054 "блато" ; ---- +lin marsh_N = mkN054 "блато"; lin marshal_N = mkN007a "маршал" ; lin marshal_V2 = dirV2 (dualV (mkV186 "въвеждам") (mkV145 "въведа")); ---- lin marshalling_yard_N = variants {}; @@ -32879,7 +32879,7 @@ lin martini_N = mkN041 "мартинка"; ---- lin martynia_N = variants {}; lin martyr_N = mkN014a "мъченик"; lin martyr_V2 = variants {}; -lin martyrdom_N = mkN054 "мъченичество"; ---- +lin martyrdom_N = mkN054 "мъченичество"; lin marumi_N = variants {}; lin marupa_N = variants {}; lin marvel_N = mkN060 "чудо"; diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 4cf92f16d..c869e9c84 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -34783,9 +34783,9 @@ lin maroon_V2 = mkV2 (mkV "maroon" "maroons" "marooned" "marooned" "marooning"); lin marple_PN = mkPN "Marple"; lin marque_N = mkN "marque" "marques"; lin marquee_N = mkN "marquee" "marquees"; -lin marquess_N = mkN "marquess" "marquesses"; +lin marquess_N = mkN feminine (mkN "marquess" "marquesses"); lin marquetry_N = mkN "marquetry" ; -lin marquis_N = mkN "marquis" "marquises"; +lin marquis_N = mkN masculine (mkN "marquis" "marquises"); lin marriage_N = mkN "marriage" "marriages"; lin marriageability_N = mkN "marriageability" ; lin marriageable_A = compoundA (mkA "marriageable"); diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index c1c4d3994..26869e16d 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -12058,7 +12058,8 @@ lin marmalade_N = mkN "confiture" feminine ; -- tocheck lin marmoreal_A = mkA "marmoréen" ; -- tocheck lin marmoset_N = mkN "ouistiti" masculine ; -- tocheck lin marmot_N = mkN "marmotte" feminine ; -- tocheck -lin marquess_N = mkN "marquis" masculine ; -- tocheck +lin marquess_N = mkN "marquise" feminine ; -- tocheck +lin marquis_N = mkN "marquis" masculine ; -- tocheck lin marriage_N = mkN "mariage" masculine ; -- tocheck lin married_A = variants{} ; -- lin married_A2 = L.married_A2 ;