merge savory_N and savoury_N

lib/src/translator/Dictionary.gf

@@ -50062,7 +50062,6 @@ fun saviour_N : N ;
 fun savoir_faire_N : N ;
 fun savore_V2 : V2 ;
 fun savory_A : A ;
-fun savory_N : N ;
 fun savour_N : N ;
 fun savour_V : V ;
 fun savour_V2 : V2 ;

lib/src/translator/DictionaryBul.gf

@@ -50106,7 +50106,6 @@ lin saviour_N = mkN031a "избавител"; ----
 lin savoir_faire_N = mkN007 "такт";
 lin savore_V2 = variants {};
 lin savory_A = mkA079 "вкусен" ;
-lin savory_N = mkN041 "чубрица"; ----
 lin savour_N = variants {mkN007 "аромат"; mkN001 "вкус"; mkN001 "дъх"; mkN001 "лъх"; mkN049 "пикантност"}; ----
 lin savour_V = singleV (mkV186 "лъхам"); ----
 lin savour_V2 = variants {};

lib/src/translator/DictionaryChi.gf

@@ -27945,8 +27945,8 @@ 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 savory_N = mkN "开胃菜" ;
 lin savour_N = mkN "味道" | mkN "气味" | mkN "滋味" ; -- open-multilingual-wordnet
+lin savoury_N = mkN "开胃菜" ;
 lin savvy_N = mkN "悟性" "种" ;
 lin saw_N = mkN "锯子" "把" ;
 lin saw_V = mkV "鋸" | mkV "锯" ; -- status=guess, src=wikt -- status=guess, src=wikt

lib/src/translator/DictionaryEng.gf

@@ -50301,12 +50301,11 @@ 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 savory_N = mkN "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_N = mkN "savoury" "savouries";
+lin savoury_N = variants {mkN "savoury" "savouries"; mkN "savory" "savories"};
 lin savoy_N = mkN "savoy" "savoys";
 lin savvy_N = mkN "savvy" ;
 lin savvy_V = mkV "savvy" "IRREG" "IRREG" "IRREG" "IRREG";

lib/src/translator/DictionaryEst.gf

@@ -17209,8 +17209,8 @@ lin bank_N = mkN "hoiustama" | mkN "kallas" | mkN "kuhjama" | mkN "madalik" | mk
 lin savings_N = mkN "hoiu-" | mkN "hoius" | mkN "säästud" ;
 lin savior_N = mkN "päästja" ;
 lin saviour_N = mkN "päästja" ;
-lin savory_N = mkN "hõrk" ;
 lin savour_N = mkN "hõng" | mkN "maitse" | mkN "maitsestama" | mkN "nautima" ;
+lin savoury_N = mkN "hõrk" ;
 lin savvy_N = mkN "_omadussona_ oskaja" | mkN "mõistma" | mkN "taip" | mkN "taipama" ;
 lin sawdust_N = mkN "saepuru" ;
 lin sawfish_N = mkN "saagkala" ;

lib/src/translator/DictionaryFin.gf

@@ -45117,7 +45117,6 @@ 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 savory_N = mkWN (compoundN "suola" (k9 "pala")) ; --UNCHK
 lin savour_N = mkWN (k1A "maku") "vahva" ; --UNCHK
 lin savour_V = mkWV (k61A "nauttia") ; --UNCHK
 lin savour_V2 = mkWV2 (k61A "nauttia") ; --UNCHK

lib/src/translator/DictionaryFre.gf

@@ -18714,7 +18714,7 @@ 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 savory_N = mkN "sarriette" feminine ; -- 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
 lin sawbridgeworth_PN = mkPN "Sawbridgeworth" ; -- status=guess src=geonames

lib/src/translator/DictionaryGer.gf

@@ -50065,12 +50065,11 @@ lin saviour_N = variants {} ;
 lin savoir_faire_N = variants {} ;
 lin savore_V2 = variants {} ;
 lin savory_A = variants {} ;
-lin savory_N = mkN "Bohnenkraut" "Bohnenkräuter" neuter ; -- status=guess
 lin savour_N = variants {} ;
 lin savour_V = variants {} ;
 lin savour_V2 = variants {} ;
 lin savoury_A = variants {} ;
-lin savoury_N = variants {} ;
+lin savoury_N = mkN "Bohnenkraut" "Bohnenkräuter" neuter ; -- status=guess
 lin savoy_N = variants {} ;
 lin savvy_N = variants {} ;
 lin savvy_V = irregV "kapieren" "kapiert" "kapierte" "kapierte" "kapiert" | mkV "schnallen" | irregV "verstehen" "versteht" "verstand" "verstände" "verstanden" ; -- status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt

lib/src/translator/DictionaryHin.gf

@@ -23822,12 +23822,11 @@ lin savings_bank_N = mkN "बचत बैंक" ; -- tocheck
 lin savior_N = mkN "मुक्तिदाता" ; -- tocheck       
 lin saviour_N = mkN "उद्धारकर्ता" ; -- tocheck              
 lin savory_A = mkA "नैतिक दृष्टि से उचित" ; -- tocheck       
-lin savory_N = mkN "सुगंधित पौधा" ; -- 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_N = mkN "सुगंधित पौधा" ; -- tocheck              
+lin savoury_A = mkA "चटपटा"  ; -- tocheck              
+lin savoury_N = mkN "सुगंधित पौधा"  ; -- tocheck
 lin savoy_N = mkN "मुड़ी-तुड़ी पत्तियों वाली पत्तागोभी" ; -- tocheck              
 lin saw_N = mkN "आरा" ; -- tocheck              
 lin saw_V = mkV "चलाना" ; -- tocheck              

lib/src/translator/DictionaryIta.gf

@@ -16010,7 +16010,7 @@ 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 savory_N = mkN "santoreggia" ; -- 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
 lin saw_V2 = mkV2 (mkV "segare") ; -- status=guess, src=wikt

lib/src/translator/DictionarySpa.gf

@@ -19020,7 +19020,7 @@ 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 savory_N = mkN "ajedrea" ; -- 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
 lin saw_V2 = mkV2 (serrar_V) ; -- status=guess, src=wikt

lib/src/translator/DictionarySwe.gf

@@ -49878,12 +49878,11 @@ 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 savory_N = mkN "kyndel" ; -- 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 = variants {} ; -- status=guess
+lin savoury_N = mkN "kyndel"; -- status=guess
 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

lib/src/translator/translate.probs

@@ -49649,7 +49649,6 @@ saviour_N	3.729715012475897e-6
 savoir_faire_N	3.729715012475897e-6
 savore_V2	4.8295957628346505e-5
 savory_A	1.0773191989054437e-5
-savory_N	3.729715012475897e-6
 savour_N	3.729715012475897e-6
 savour_V	2.2678822515534993e-5
 savour_V2	1.609865254278217e-5