GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-11 13:59:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge favor* with favour* in the dictionaries

Browse Source
This commit is contained in:
kr.angelov
2014-11-06 10:41:04 +00:00
parent 72d3c7b376
commit fa80d14de1
11 changed files with 38 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/src/translator/Dictionary.gf
View File

@@ -21024,18 +21024,13 @@ fun fauvism_N : N ;
fun faux_pas_N : N ;
fun faversham_PN : PN ;
fun favism_N : N ;
fun favor_N : N ;
fun favorable_A : A ;
fun favorableness_N : N ;
fun favored_A : A ;
fun favorite_A : A ;
fun favorite_N : N ;
fun favoritism_N : N ;
fun favour_N : N ;
fun favour_V : V ;
fun favour_V2 : V2 ;
fun favour_VS : VS ;
fun favourable_A : A ;
fun favourableness_N : N ;
fun favoured_A : A ;
fun favouriteFem_N : N ;
fun favouriteMasc_N : N ;
fun favourite_A : A ;

11
lib/src/translator/DictionaryBul.gf
View File

@@ -21027,18 +21027,13 @@ lin fauvism_N = variants {};
lin faux_pas_N = mkN001 "гаф";
lin faversham_PN = mkPN "Фаверсхам" Masc;
lin favism_N = variants {};
lin favor_N = variants {};
lin favorable_A = mkA079 "благоприятен" ;
lin favorableness_N = mkN072 "предпочитание";
lin favored_A = mkA076 "облагодетелстван";
lin favorite_A = mkA076 "любим" ;
lin favorite_N = variants {};
lin favoritism_N = mkN071 "фаворизиране";
lin favour_N = mkN041 "услуга" ;
lin favour_V = variants {singleV (mkV186 "благоприятствувам"); singleV (mkV174 "крепя"); singleV (mkV186 "облагодетелствувам"); singleV (mkV186 "привилегировам"); singleV (mkV186 "протежирам"); singleV (mkV186 "фаворизирам")}; ----
lin favour_V2 = dirV2 (dualV (mkV186 "предпочитам") (mkV145 "предпочета"));
lin favour_VS = variants {};
lin favourable_A = mkA076 "предпочитан";
lin favourable_A = variants {mkA076 "предпочитан"; mkA079 "благоприятен"};
lin favourableness_N = mkN072 "предпочитание";
lin favoured_A = mkA076 "облагодетелстван";
lin favouriteFem_N = mkN041 "любимка" ;
lin favouriteMasc_N = mkN008a "любимец" ;
lin favourite_A = mkA076 "любим";

19
lib/src/translator/DictionaryChi.gf
View File

@@ -12472,21 +12472,14 @@ lin fauvism_N = mkN "野獸派" | mkN "野兽派" ; -- status=guess -- status=gu
lin faux_pas_N = mkN "出丑" | mkN "失态" | mkN "失礼" ; -- open-multilingual-wordnet
lin faversham_PN = foreignPN "Faversham" ; -- comment=src=geonames status=guess
lin favism_N = mkN "蚕豆病" | mkN "豆类中毒" ; -- open-multilingual-wordnet
lin favor_N = mkN "恩惠" | mkN "好意" | mkN "幫忙" | mkN "帮忙" ; -- status=guess -- status=guess -- status=guess -- status=guess
lin favor_V = mkV "支持" ;
lin favor_V2 = mkV2 "促成" ;
lin favor_VS = mkVS "赞成" ;
lin favorable_A = mkA "优惠" | mkA "有利" | mkA "良好" ;
lin favorite_A = mkA "最喜愛" | mkA "最喜爱" ; -- status=guess -- status=guess
lin favoritism_N = mkN "偏爱" | mkN "偏袒" | mkN "徇私" | mkN "歧视" ; -- open-multilingual-wordnet
lin favour_N = mkN "赞成" ;
lin favour_V = variants {} ; -- comment=mkV2 "青睐" ;
lin favour_V2 = mkV2 "青睐" ;
lin favour_VS = variants {} ; -- comment=mkV2 "青睐" ;
lin favourable_A = mkA "有利" ;
lin favour_N = mkN "赞成" | mkN "恩惠" | mkN "好意" | mkN "幫忙" | mkN "帮忙" ; -- status=guess -- status=guess -- status=guess -- status=guess
lin favour_V = mkV "支持"; -- comment=mkV2 "青睐" ;
lin favour_V2 = mkV2 "青睐" | mkV2 "促成";
lin favour_VS = mkVS "赞成" ;
lin favourable_A = mkA "有利" | mkA "优惠" | mkA "良好" ;
lin favouriteFem_N = mkN "最爱" [] ;
lin favouriteMasc_N = mkN "最爱" [] ;
lin favourite_A = mkA "特别喜爱" ;
lin favourite_A = mkA "特别喜爱" | mkA "最喜愛" | mkA "最喜爱" ; -- status=guess -- status=guess
lin favouritism_N = mkN "偏爱" | mkN "偏袒" | mkN "徇私" | mkN "歧视" ; -- open-multilingual-wordnet
lin favus_N = mkN "头部鳞癣" | mkN "毛囊癣" | mkN "瘌痢" | mkN "黄癣" ; -- open-multilingual-wordnet
lin fawley_PN = foreignPN "Fawley" ; -- comment=src=eng status=guess

6
lib/src/translator/DictionaryDut.gf
View File

@@ -7150,15 +7150,13 @@ lin faulty_A = mkA "kapot" | mkA "gebrekkig" ; -- status=guess status=guess
lin faun_N = mkN "faun" ; -- status=guess
lin fauna_N = mkN "fauna" masculine feminine ; -- status=guess
lin faversham_PN = mkPN "Faversham" ; -- src=geonames status=guess
lin favor_N = mkN "dienst" | mkN "gunst" ; -- status=guess status=guess
lin favorite_A = mkA "favoriet" | mkA "lievelings-" | mkA "geliefkoost" ; -- status=guess status=guess status=guess
lin favour_N = mkN "gunst" ;
lin favour_N = mkN "dienst" | mkN "gunst" ; -- status=guess status=guess
lin favour_V = variants {} ; --
lin favour_V2 = variants {} ; --
lin favour_VS = variants {} ; --
lin favourable_A = variants {} ; --
lin favouriteMasc_N = variants {} ; --
lin favourite_A = variants {} ; --
lin favourite_A = mkA "favoriet" | mkA "lievelings-" | mkA "geliefkoost" ; -- status=guess status=guess status=guess
lin fawley_PN = mkPN "Fawley" ; -- src=eng status=guess
lin fawn_N = mkN "reebruin" neuter ; -- status=guess
lin fawn_V = mkV "vleien" ; -- status=guess, src=wikt

11
lib/src/translator/DictionaryEng.gf
View File

@@ -21119,22 +21119,17 @@ lin fauvism_N = mkN "fauvism" ;
lin faux_pas_N = mkN "faux pas" "faux pas";
lin faversham_PN = mkPN "Faversham";
lin favism_N = mkN "favism" ;
lin favor_N = mkN "favor" ;
lin favorable_A = mkA "favorable" ;
lin favorableness_N = mkN "favorableness" ;
lin favored_A = mkA "favored" ;
lin favorite_A = mkA "favorite" ;
lin favorite_N = mkN "favorite" ;
lin favoritism_N = mkN "favoritism" ;
lin favour_N = mkN (variants {"favour"; "favor"});
lin favour_V = variants {mkV "favour"; mkV "favor"};
lin favour_V2 = mkV2 (variants {mkV "favour"; mkV "favor"});
lin favour_VS = mkVS (variants {mkV "favour"; mkV "favor"});
lin favourable_A = mkA (variants {"favourable"; "favorable"}) ;
lin favourableness_N = mkN (variants {"favourableness"; "favorableness"});
lin favoured_A = mkA (variants {"favoured"; "favored"});
lin favouriteFem_N = mkN feminine (mkN (variants {"favourite"; "favorite"}));
lin favouriteMasc_N = mkN masculine (mkN (variants {"favourite"; "favorite"}));
lin favourite_A = compoundA (mkA (variants {"favourite"; "favorite"}));
lin favouritism_N = mkN "favouritism" ;
lin favouritism_N = mkN (variants {"favouritism"; "favoritism"});
lin favus_N = mkN "favus" ;
lin fawley_PN = mkPN "Fawley";
lin fawn_N = mkN "fawn" "fawns";

13
lib/src/translator/DictionaryEst.gf
View File

@@ -8029,8 +8029,7 @@ lin faun_N = mkN "faun" ;
lin fauteuil_N = mkN "tugitool" ;
lin pas_N = mkN "paa" | mkN "samm" ;
lin favism_N = mkN "favism" ;
lin favorableness_N = mkN "soodsus" ;
lin favoritism_N = mkN "onupojapoliitika" ;
lin favourableness_N = mkN "soodsus" ;
lin favouritism_N = mkN "onupojapoliitika" ;
lin favour_N = mkN "austama" | mkN "heategu" | mkN "kasu" | mkN "soosima" | mkN "soosing" | mkN "teene" ;
lin fawn_N = mkN "helepruun" | mkN "hirvevasikas" | mkN "lipitsema" | mkN "lömitama" ;
@@ -22144,8 +22143,8 @@ lin fan_belt_N = mkN "ventilaatoririhm" ;
lin fatback_N = mkN "seapekk" ;
lin fatigue_party_N = mkN "toimkond" ;
lin faux_pas_N = mkN "faux pas" | mkN "fopaa" ;
lin favor_N = mkN "austama" | mkN "heategu" | mkN "kink" | mkN "soosima" | mkN "soosing" | mkN "teene" ;
lin favorite_N = mkN "favoriit" | mkN "lemmik" | mkN "lemmik-" | mkN "meelis-" ;
lin favouriteMasc_N = mkN "favoriit" | mkN "lemmik" | mkN "lemmik-" | mkN "meelis-" ;
lin favouriteFem_N = mkN "favoriit" | mkN "lemmik" | mkN "lemmik-" | mkN "meelis-" ;
lin feasting_N = mkN "pidusööming" | mkN "pidutsemine" ;
lin feather_boa_N = mkN "boa" | mkN "sulgboa" ;
lin fedayeen_N = mkN "fedajeed" | mkN "fedajeen" ;
@@ -26409,8 +26408,7 @@ lin fatuous_A = mkA "illusoorne" | mkA "kohtlane" | mkA "naeruväärne" | mkA "p
lin faucal_A = mkA "neelu-" ;
lin faultless_A = mkA "laitmatu" | mkA "veatu" ;
lin faulty_A = mkA "defektne" | mkA "vigane" ;
lin favorable_A = mkA "heakskiitev" | mkA "pooldav" | mkA "soodus" ;
lin favourable_A = mkA "õnnetoov" | mkA "pooldav" | mkA "soodus" ;
lin favourable_A = mkA "heakskiitev" | mkA "õnnetoov" | mkA "pooldav" | mkA "soodus" ;
lin favourite_A = mkA "favoriit" | mkA "lemmik" | mkA "lemmik-" | mkA "meelis-" ;
lin fearful_A = mkA "arglik" | mkA "heidutav" | mkA "hirmuäratav" | mkA "hirmunud" | mkA "pelglik" ;
lin fearless_A = mkA "kartmatu" ;
@@ -34063,9 +34061,6 @@ lin fatigue_V2 = mkV2 "kurnama" | mkV2 "väsima" ;
lin fatten_V = mkV "nuumama" ;
lin fatten_V2 = mkV2 "nuumama" ;
lin fatten_up_V2 = mkV2 "nuumama" | mkV2 "paksuks söötma" ;
lin favor_V = mkV "austama" | mkV "soosima" ;
lin favor_V2 = mkV2 "austama" | mkV2 "soosima" ;
lin favor_VS = mkVS "austama" | mkVS "soosima" ;
lin favour_V = mkV "austama" | mkV "soosima" ;
lin favour_V2 = mkV2 "austama" | mkV2 "soosima" ;
lin favour_VS = mkVS "austama" | mkVS "soosima" ;

13
lib/src/translator/DictionaryFin.gf
View File

@@ -19157,17 +19157,12 @@ lin fauvism_N = mkWN (compoundN "fauv" (k5 "ismi")) ; --UNCHK
lin faux_pas_N = mkWN (k40 "karkeus") ; --UNCHK
lin faversham_PN = foreignPN "Faversham" ;
lin favism_N = mkWN (compoundN "fav" (k5 "ismi")) ; --UNCHK
lin favor_V = mkWV (k61 "suosia") ; --UNCHK
lin favor_V2 = mkWV2 (k61 "suosia") partitive ;
lin favor_VS = mkWVS (k61 "suosia") ; --UNCHK
lin favorable_A = mkWA (k10 "suotuisa") ; --UNCHK
lin favorableness_N = mkWN (k40 "kannattavuus") ; --UNCHK
lin favoritism_N = mkWN (k9A "syrjintä") ; --UNCHK
lin favour_N = mkN "palvelus" ;
lin favour_V = variants {} ; -- mkWV2 (k61 "suosia") ; --UNCHK
lin favour_V2 = mkWV2 (k61 "suosia") ; --UNCHK
lin favour_VS = variants {} ; -- mkWV2 (k61 "suosia") ; --UNCHK
lin favour_V = mkWV (k61 "suosia"); --UNCHK
lin favour_V2 = mkWV2 (k61 "suosia") | mkWV2 (k61 "suosia") partitive; --UNCHK
lin favour_VS = mkWVS (k61 "suosia"); --UNCHK
lin favourable_A = mkWA (k10 "suotuisa") ; --UNCHK
lin favourableness_N = mkWN (k40 "kannattavuus") ; --UNCHK
lin favouriteFem_N = mkWN (k5A "suosikki") ; --UNCHK
lin favouriteMasc_N = variants {} ; --
lin favourite_A = mkWA "mieli-" ; --UNCHK

3
lib/src/translator/DictionaryFre.gf
View File

@@ -8186,10 +8186,9 @@ lin faun_N = mkN "faune" masculine ; -- tocheck
lin fauna_N = mkN "faune" feminine ; -- tocheck
lin fauvism_N = mkN "fauvisme" masculine ; -- tocheck
lin faversham_PN = mkPN "Faversham" ; -- status=guess src=geonames
lin favor_V2 = mkV2 (mkV "favoriser") ; -- tocheck
lin favour_N = variants {} ; --
lin favour_V = variants {} ; --
lin favour_V2 = variants {} ; --
lin favour_V2 = mkV2 (mkV "favoriser"); --
lin favour_VS = variants {} ; --
lin favourable_A = mkA "favorable" ; -- tocheck
lin favouriteFem_N = mkN "favorite" feminine ; -- tocheck

17
lib/src/translator/DictionaryGer.gf
View File

@@ -21032,21 +21032,16 @@ lin fauvism_N = mkN "Fauvismus" masculine ; -- status=guess
lin faux_pas_N = variants {} ;
lin faversham_PN = mkPN "Faversham" ; -- src=geonames status=guess
lin favism_N = variants {} ;
lin favor_N = mkN "Gefallen" "Gefallen" masculine | mkN "Gefälligkeit" feminine ; -- status=guess status=guess
lin favorable_A = variants {} ;
lin favorableness_N = variants {} ;
lin favored_A = variants {} ;
lin favorite_A = mkA "Lieblings-" | mkA "liebster" ; -- status=guess status=guess
lin favorite_N = mkN "Favorit" "Favoriten" masculine ; -- status=guess
lin favoritism_N = variants {} ;
lin favour_N = variants {} ; --
lin favour_N = mkN "Gefallen" "Gefallen" masculine | mkN "Gefälligkeit" feminine ; -- status=guess status=guess
lin favour_V = variants {} ; --
lin favour_V2 = variants {} ; --
lin favour_VS = variants {} ; --
lin favourable_A = mkA "günstig" ; -- status=guess
lin favouriteFem_N = variants {} ;
lin favouriteMasc_N = mkN "Liebling" "Lieblinge" masculine ; -- status=guess
lin favourite_A = variants {} ; --
lin favourableness_N = variants {} ;
lin favoured_A = variants {} ;
lin favouriteFem_N = mkN "Favoritin" "Favoritinen" feminine;
lin favouriteMasc_N = mkN "Favorit" "Favoriten" masculine;
lin favourite_A = mkA "Lieblings-" | mkA "liebster" ; -- status=guess status=guess
lin favouritism_N = mkN "Günstlingswirtschaft" feminine | mkN "Vetternwirtschaft" feminine ; -- status=guess status=guess
lin favus_N = variants {} ;
lin fawley_PN = mkPN "Fawley" ; -- src=eng status=guess

13
lib/src/translator/DictionaryHin.gf
View File

@@ -9774,17 +9774,14 @@ lin fault_V2 = mkV2 (compoundV "टेनिस में गलत गेंद
lin faultless_A = mkA "दोषरहित" ; -- tocheck
lin faulty_A = mkA "गलत" ; -- tocheck
lin faux_pas_N = mkN "अशिष्टता" ; -- tocheck
lin favor_V = compoundV "पक्षपात" (mkV "करना") ; -- tocheck
lin favor_V2 = mkV2 (compoundV "पक्षपात" (mkV "करना")) ; -- tocheck
lin favor_VS = mkVS (compoundV "पक्षपात" (mkV "करना")) ; -- tocheck
lin favorable_A = mkA "अनुकूल" ; -- tocheck
lin favoritism_N = mkN "पक्षपात" ; -- tocheck
lin favour_V2 = mkV2 (compoundV "कृपादृष्टि" (mkV "रखना")) ; -- tocheck
lin favourable_A = mkA "अनुकूल" ; -- tocheck
lin favour_V = compoundV "पक्षपात" (mkV "करना") ; -- tocheck
lin favour_V2 = mkV2 (compoundV "कृपादृष्टि" (mkV ("रखना" | "करना"))) ; -- tocheck
lin favour_VS = mkVS (compoundV "पक्षपात" (mkV "करना")) ; -- tocheck
lin favourable_A = mkA "अनुकूल" ; -- tocheck
lin favouriteFem_N = mkN "प्रिय व्यक्ति" ; -- tocheck
lin favouriteMasc_N = mkN "प्रिय व्यक्ति" ; -- tocheck
lin favourite_A = mkA "प्रिय" ; -- tocheck
lin favouritism_N = mkN "पक्षपात" ; -- tocheck
lin favouritism_N = mkN "पक्षपात" ; -- tocheck
lin fear_N = mkN "डर" ; -- tocheck
lin fear_V = compoundV "शंका" (mkV "होना") ; -- tocheck
lin fear_V2 = mkV2 (compoundV "शंका" (mkV "होना")) ; -- tocheck

5
lib/src/translator/DictionarySwe.gf
View File

@@ -20952,15 +20952,14 @@ lin fauvism_N = variants {} ; -- status=guess
lin faux_pas_N = mkN "fadäs" "fadäser" ; -- status=guess
lin faversham_PN = mkPN "Faversham" neutrum ; -- src=geonames status=guess
lin favism_N = variants {} ; -- status=guess
lin favorableness_N = variants {} ; -- status=guess
lin favoritism_N = variants {} ; -- status=guess
lin favour_N = mkN "tjänst" "tjänster" | mkN "ynnest" ; -- SaldoWN = mkN "tjänst" "tjänster" ; -- comment=15
lin favour_V = variants {} ; -- mkV2 "gynna" ;
lin favour_V2 = mkV2 "gynna" ;
lin favour_VS = variants {} ; -- mkV2 "gynna" ;
lin favourable_A = mkA "välvillig" ; -- comment=4
lin favourableness_N = variants {} ; -- status=guess
lin favouriteFem_N = mkN "favorit" "favoriter" ; -- comment=3
lin favouriteMasc_N = variants {} ; --
lin favouriteMasc_N = mkN "favorit" "favoriter" ; --
lin favourite_A = variants {} ; --
lin favouritism_N = variants {} ; -- status=guess
lin favus_N = variants {} ; -- status=guess