GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-20 10:19:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge savory_A/unsavory_A with savoury_A/unsavoury_A

Browse Source
This commit is contained in:
kr.angelov
2014-12-04 11:10:41 +00:00
parent 7d598ed6fc
commit e23692de81
14 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50061,7 +50061,6 @@ fun savior_N : N ;
fun saviour_N : N ;
fun savoir_faire_N : N ;
fun savore_V2 : V2 ;
fun savory_A : A ;
fun savour_N : N ;
fun savour_V : V ;
fun savour_V2 : V2 ;
@@ -62016,7 +62015,6 @@ fun unsatisfiable_A : A ;
fun unsatisfied_A : A ;
fun unsatisfying_A : A ;
fun unsaturated_A : A ;
fun unsavory_A : A ;
fun unsavoury_A : A ;
fun unsay_V2 : V2 ;
fun unscalable_A : A ;

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

@@ -50105,11 +50105,10 @@ lin savior_N = mkN031a "спасител";
lin saviour_N = mkN031a "избавител"; ----
lin savoir_faire_N = mkN007 "такт";
lin savore_V2 = variants {};
lin savory_A = mkA079 "вкусен" ;
lin savour_N = variants {mkN007 "аромат"; mkN001 "вкус"; mkN001 "дъх"; mkN001 "лъх"; mkN049 "пикантност"}; ----
lin savour_V = singleV (mkV186 "лъхам"); ----
lin savour_V2 = variants {};
lin savoury_A = variants {mkA079 "апетитен"; mkA079 "вкусен"}; ----
lin savoury_A = variants {mkA079 "апетитен"; mkA079 "вкусен"};
lin savoury_N = mkN041a "чубрица";
lin savoy_N = variants {};
lin savvy_N = mkN071 "разбиране";
@@ -62068,8 +62067,7 @@ lin unsatisfiable_A = mkA076 "неутолим" ;
lin unsatisfied_A = variants {mkA076 "незадоволен"; mkA076 "неудовлетворен"}; ----
lin unsatisfying_A = mkA079 "неудовлетворителен"; ----
lin unsaturated_A = mkA079 "ненаситен";
lin unsavory_A = mkA079 "неприятен" ;
lin unsavoury_A = variants {mkA079 "безвкусен"; mkA076 "блудкав"; mkA079 "невкусен"; mkA079 "неприятен"; mkA079 "противен"}; ----
lin unsavoury_A = variants {mkA079 "безвкусен"; mkA076 "блудкав"; mkA079 "невкусен"};
lin unsay_V2 = variants {};
lin unscalable_A = mkA079 "недостъпен"; ----
lin unscathed_A = variants {mkA076 "невредим"; mkA076 "незасегнат"}; ----

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

@@ -27944,8 +27944,8 @@ lin saver_N = mkN "救助者" "名" ;
lin saving_N = mkN "节省" | {-HSK-} mkN "节约" ;
lin savings_N = mkN "儲蓄" | mkN "储蓄" | {-mwn-} mkN "储备金" | mkN "储金" ; -- status=guess -- status=guess -- open-multilingual-wordnet
lin savore_V2 = mkV2 "FOO" ;
lin savory_A = mkA "可口" ;
lin savour_N = mkN "味道" | mkN "气味" | mkN "滋味" ; -- open-multilingual-wordnet
lin savoury_A = mkA "可口" ;
lin savoury_N = mkN "开胃菜" ;
lin savvy_N = mkN "悟性" "种" ;
lin saw_N = mkN "锯子" "把" ;
@@ -33658,7 +33658,7 @@ lin unsated_A = mkA "不满意" ; -- open-multilingual-wordnet
lin unsatisfactory_A = mkA "不能令人满意" | mkA "令人不满意" ; -- open-multilingual-wordnet
lin unsatisfiable_A = mkA "不可以满足" ; -- open-multilingual-wordnet
lin unsaturated_A = mkA "不飽和" | mkA "不饱和" | {-mwn-} mkA "不饱和" | mkA "未饱和" | mkA "没有饱和" ; -- status=guess -- status=guess -- open-multilingual-wordnet
lin unsavory_A = mkA "难吃" ;
lin unsavoury_A = mkA "难吃" ;
lin unscalable_A = mkA "不可攀登" | mkA "不能攀登" ; -- open-multilingual-wordnet
lin unscathed_A = mkA "没有受伤" ;
lin unscheduled_A = mkA "非预定" | mkA "预定" ; -- open-multilingual-wordnet

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

@@ -20180,7 +20180,7 @@ lin unrest_N = mkN "onrust" utrum ; -- status=guess
lin unrestrained_A = mkA "ongebreideld" | mkA "ongebreidelde" ; -- status=guess status=guess
lin unsafe_A = mkA "onveilig" ; -- status=guess
lin unsaturated_A = mkA "onverzadigd" ; -- status=guess
lin unsavory_A = mkA "twijfelachtig" | mkA "onsmakelijk" ; -- status=guess status=guess
lin unsavoury_A = mkA "twijfelachtig" | mkA "onsmakelijk" ; -- status=guess status=guess
lin unscientific_A = mkA "onwetenschappelijk" ; -- status=guess
lin unseen_A = mkA "ongezien" ; -- status=guess
lin unselfish_A = mkA "onbaatzuchtig" | mkA "onzelfzuchtig" ; -- status=guess status=guess

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

@@ -50300,11 +50300,10 @@ lin savior_N = mkN "savior" ;
lin saviour_N = mkN "saviour" "saviours";
lin savoir_faire_N = mkN "savoir-faire" ;
lin savore_V2 = mkV2 (mkV "savore");
lin savory_A = mkA "savory" ;
lin savour_N = mkN "savour" "savours";
lin savour_V = mkV "savour" "savours" "savoured" "savoured" "savouring";
lin savour_V2 = mkV2 (mkV "savour" "savours" "savoured" "savoured" "savouring");
lin savoury_A = compoundA (mkA "savoury");
lin savoury_A = compoundA (variants {mkA "savoury"; mkA "savory"});
lin savoury_N = variants {mkN "savoury" "savouries"; mkN "savory" "savories"};
lin savoy_N = mkN "savoy" "savoys";
lin savvy_N = mkN "savvy" ;
@@ -62316,8 +62315,7 @@ lin unsatisfiable_A = mkA "unsatisfiable" ;
lin unsatisfied_A = compoundA (mkA "unsatisfied");
lin unsatisfying_A = compoundA (mkA "unsatisfying");
lin unsaturated_A = compoundA (mkA "unsaturated");
lin unsavory_A = mkA "unsavory" ;
lin unsavoury_A = compoundA (mkA "unsavoury");
lin unsavoury_A = compoundA (variants {mkA "unsavoury"; mkA "unsavory"});
lin unsay_V2 = mkV2 (mkV "un" IrregEng.say_V);
lin unscalable_A = mkA "unscalable" ;
lin unscathed_A = compoundA (mkA "unscathed");

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

@@ -29444,7 +29444,7 @@ lin saturnine_A = mkA "külm" | mkA "sarkastiline" | mkA "sünge" ;
lin saucy_A = mkA "mahlakas" | mkA "nipsakas" ;
lin saute_A = mkA "pruunistama" | mkA "pruunistatud" ;
lin savage_A = mkA "jõhkard" | mkA "metsik" | mkA "metslane" | mkA "toores" ;
lin savory_A = mkA "hõrk" ;
lin savoury_A = mkA "hõrk" ;
lin scabby_A = mkA "kärnane" | mkA "kärnas" ;
lin scabrous_A = mkA "keeruline" | mkA "krobeline" | mkA "nilbe" | mkA "sõlmine" ;
lin scalable_A = mkA "skaleeritav" ;
@@ -30717,7 +30717,7 @@ lin unsatisfactory_A = mkA "mitterahuldav" ;
lin unsatisfied_A = mkA "rahuldamata" | mkA "rahulolematu" ;
lin unsatisfying_A = mkA "mitterahuldav" ;
lin unsaturated_A = mkA "küllastamata" ;
lin unsavory_A = mkA "ebameeldiv" | mkA "vastik" ;
lin unsavoury_A = mkA "ebameeldiv" | mkA "vastik" ;
lin unscathed_A = mkA "vigastamatult" ;
lin unscientific_A = mkA "ebateaduslik" ;
lin unscrupulous_A = mkA "põhimõttelage" | mkA "südametunnistuseta" ;

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

@@ -45116,7 +45116,6 @@ lin savings_bank_N = mkWN (compoundN "säästö" (k41A "lipas")) ; --UNCHK
lin savior_N = mkWN (k10 "pelastaja") ; --UNCHK
lin saviour_N = mkWN (k10 "pelastaja") ; --UNCHK
lin savore_V2 = mkV2 (mkV "nauttia") (casePrep elative) ; ---ARB
lin savory_A = mkWA (k34A "turmeltumaton") ; --UNCHK
lin savour_N = mkWN (k1A "maku") "vahva" ; --UNCHK
lin savour_V = mkWV (k61A "nauttia") ; --UNCHK
lin savour_V2 = mkWV2 (k61A "nauttia") ; --UNCHK
@@ -55828,7 +55827,6 @@ lin unsatisfiable_A = mkWA (k34A "tyydyttämätön") ; --UNCHK
lin unsatisfied_A = mkWA (k34A "levoton") ; --UNCHK
lin unsatisfying_A = mkWA (k10 "tuottava") "pettymyksen" ; --UNCHK
lin unsaturated_A = mkWA (k15 "himmeä") ; --UNCHK
lin unsavory_A = mkWA (k34A "mauton") ; --UNCHK
lin unsavoury_A = mkWA (k34A "mauton") ; --UNCHK
lin unsay_V2 = mkWV2 (k52 "perua") "sanansa" ; --UNCHK
lin unscalable_A = mkWA (compoundA "vai" (k38 "keakulkuinen")) ; --UNCHK

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

@@ -18713,7 +18713,7 @@ lin save_V2 = mkV2 (mkV "épargner") | mkV2 (mkV "économiser") | mkV2 (mkV "sau
lin saving_N = variants {} ; --
lin savings_N = mkN "économies" ; -- tocheck
lin savior_N = mkN "sauveur" masculine ; -- tocheck
lin savory_A = mkA "salé" | mkA "savoureux" ; -- tocheck
lin savoury_A = mkA "salé" | mkA "savoureux" ; -- tocheck
lin savoury_N = mkN "sarriette" feminine ; -- tocheck
lin saw_N = mkN "proverbe" masculine | mkN "scie" feminine ; -- tocheck
lin saw_V2 = mkV2 (mkV "scier") ; -- tocheck

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

@@ -50064,7 +50064,6 @@ lin savior_N = mkN "Retter" "Retter" masculine ; -- status=guess
lin saviour_N = variants {} ;
lin savoir_faire_N = variants {} ;
lin savore_V2 = variants {} ;
lin savory_A = variants {} ;
lin savour_N = variants {} ;
lin savour_V = variants {} ;
lin savour_V2 = variants {} ;
@@ -62022,7 +62021,6 @@ lin unsatisfiable_A = variants {} ;
lin unsatisfied_A = variants {} ;
lin unsatisfying_A = mkA "unbefriedigend" ; -- status=guess
lin unsaturated_A = mkA "ungesättigt" ; -- status=guess
lin unsavory_A = variants {} ;
lin unsavoury_A = variants {} ;
lin unsay_V2 = variants {} ;
lin unscalable_A = variants {} ;

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

@@ -23821,11 +23821,10 @@ lin savings_N = mkN "बचत" ; -- tocheck
lin savings_bank_N = mkN "बचत बैंक" ; -- tocheck
lin savior_N = mkN "मुक्तिदाता" ; -- tocheck
lin saviour_N = mkN "उद्धारकर्ता" ; -- tocheck
lin savory_A = mkA "नैतिक दृष्टि से उचित" ; -- tocheck
lin savour_N = mkN "मज़ा" ; -- tocheck
lin savour_V = compoundV "आनंद" (mkV "लेना") ; -- tocheck
lin savour_V2 = mkV2 (compoundV "आनंद" (mkV "लेना")) ; -- tocheck
lin savoury_A = mkA "चटपटा" ; -- tocheck
lin savoury_A = variants {mkA "चटपटा"; mkA "नैतिक दृष्टि से उचित"} ; -- tocheck
lin savoury_N = mkN "सुगंधित पौधा" ; -- tocheck
lin savoy_N = mkN "मुड़ी-तुड़ी पत्तियों वाली पत्तागोभी" ; -- tocheck
lin saw_N = mkN "आरा" ; -- tocheck
@@ -31041,7 +31040,6 @@ lin unsatisfiable_A = mkA "असंतुष्य" ; -- tocheck
lin unsatisfied_A = mkA "अपरितृप्त" ; -- tocheck
lin unsatisfying_A = mkA "असंतोषजनक" ; -- tocheck
lin unsaturated_A = mkA "असंतृप्त" ; -- tocheck
lin unsavory_A = mkA "घृणित" ; -- tocheck
lin unsavoury_A = mkA "घृणित" ; -- tocheck
lin unsay_V2 = mkV2 (compoundV "वापस" (mkV "लेना")) ; -- tocheck
lin unscalable_A = mkA "अनारोहणीय" ; -- tocheck

2
lib/src/translator/DictionaryIta.gf
View File

@@ -16009,7 +16009,7 @@ lin save_V2 = mkV2 (mkV "risparmiare") ; -- status=guess, src=wikt
lin saving_N = variants {} ; --
lin savings_N = mkN "conto di risparmio" ; -- status=guess
lin savior_N = mkN "redentore" masculine | mkN "salvatore" masculine ; -- status=guess status=guess
lin savory_A = mkA "salato" ; -- status=guess
lin savoury_A = mkA "salato" ; -- status=guess
lin savoury_N = mkN "santoreggia" ; -- status=guess
lin saw_N = mkN "adagio" ; -- status=guess
lin saw_V = mkV "segare" ; -- status=guess, src=wikt

2
lib/src/translator/DictionarySpa.gf
View File

@@ -19019,7 +19019,7 @@ lin saving_N = variants {} ; --
lin savings_N = mkN "ahorros" feminine ; -- status=guess
lin savior_N = mkN "salvador" masculine ; -- status=guess
lin saviour_N = mkN "bebé medicamento" ; -- status=guess
lin savory_A = mkA "sabroso" | mkA "apetitoso" ; -- status=guess status=guess
lin savoury_A = mkA "sabroso" | mkA "apetitoso" ; -- status=guess status=guess
lin savoury_N = mkN "ajedrea" ; -- status=guess
lin saw_N = mkN "proverbio" ; -- status=guess
lin saw_V = serrar_V ; -- status=guess, src=wikt

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

@@ -49877,12 +49877,11 @@ lin savior_N = mkN "frälsare" utrum ; -- status=guess
lin saviour_N = mkN "frälsare" utrum ; -- status=guess
lin savoir_faire_N = variants {} ; -- status=guess
lin savore_V2 = variants {} ; -- status=guess
lin savory_A = mkA "salt" "salt" ; -- status=guess
lin savour_N = mkN "smak" "smaker" ; -- comment=5
lin savour_V = variants {} ; -- status=guess
lin savour_V2 = variants {} ; -- status=guess
lin savoury_A = variants {} ; -- status=guess
lin savoury_N = mkN "kyndel"; -- status=guess
lin savoury_A = mkA "smakfull";
lin savoury_N = mkN "kyndel";
lin savoy_N = variants {} ; -- status=guess
lin savvy_N = mkN "förstånd" neutrum ; -- comment=2
lin savvy_V = mkV "vetta" "vette" "vettat" ; -- status=guess
@@ -61795,7 +61794,6 @@ lin unsatisfiable_A = variants {} ; -- status=guess
lin unsatisfied_A = mkA "missnöjd" "missnöjt" ; -- status=guess
lin unsatisfying_A = variants {} ; -- status=guess
lin unsaturated_A = compoundA (regA "omättad") ; -- status=guess
lin unsavory_A = variants {} ; -- status=guess
lin unsavoury_A = variants {} ; -- status=guess
lin unsay_V2 = variants {} ; -- status=guess
lin unscalable_A = variants {} ; -- status=guess

4
lib/src/translator/translate.probs
View File

@@ -49648,7 +49648,6 @@ savior_N 3.729715012475897e-6
saviour_N 3.729715012475897e-6
savoir_faire_N 3.729715012475897e-6
savore_V2 4.8295957628346505e-5
savory_A 1.0773191989054437e-5
savour_N 3.729715012475897e-6
savour_V 2.2678822515534993e-5
savour_V2 1.609865254278217e-5
@@ -61498,8 +61497,7 @@ unsatisfiable_A 1.0773191989054437e-5
unsatisfied_A 1.0773191989054437e-5
unsatisfying_A 1.0773191989054437e-5
unsaturated_A 1.0773191989054437e-5
unsavory_A 2.1546383978108874e-5
unsavoury_A 1.0773191989054437e-5
unsavoury_A 2.1546383978108874e-5
unsay_V2 1.609865254278217e-5
unscalable_A 1.0773191989054437e-5
unscathed_A 6.463915193432663e-5