merge apanage_N with appanage_N

lib/src/translator/Dictionary.gf

@@ -2830,7 +2830,6 @@ fun aoudad_N : N ;                 -- 02416104	wild sheep of northern Africa
 fun apace_Adv : Adv ;              -- 00085811	with rapid movements
 fun apache_N : N ;                 -- 09607208	a Parisian gangster
 fun apadana_N : N ;                -- 02726210	the great hall in ancient Persian palaces
-fun apanage_N : N ;
 fun apar_N : N ;                   -- 02455135	South American armadillo with three bands of bony plates
 fun apart_Adv : Adv ;
 fun apart_from_Prep : Prep ;

lib/src/translator/DictionaryBul.gf

@@ -2837,7 +2837,6 @@ lin aoudad_N = variants {} ;
 lin apace_Adv = variants {} ;
 lin apache_N = mkN007 "апаш" ; ----
 lin apadana_N = variants {} ;
-lin apanage_N = mkN007 "апанаж" ;
 lin apar_N = variants {} ;
 lin apart_Adv = variants {} ;
 lin apart_from_Prep = mkPrep "независимо от" Acc ;
@@ -2972,7 +2971,8 @@ lin apotropaic_A = variants {} ;
 lin appal_V2 = dirV2 (dualV (mkV186 "ужасявам") (mkV174 "ужася")) ; ----
 lin appalling_A = mkA076 "груб" ; ----
 lin appalling_N = variants {} ;
-lin appanage_N = mkN007 "апаннаж" ;
+lin appanage_N = variants {mkN007 "апаннаж"; mkN007 "апанаж"} ;
+
 lin apparatchik_N = mkN014a "апаратчик" ;
 lin apparatus_N = mkN007 "апарат" ;
 lin apparel_N = mkN054 "облекло" ; ----

lib/src/translator/DictionaryChi.gf

@@ -2113,7 +2113,6 @@ lin aoristic_A = mkA "不定过去时" ; -- open-multilingual-wordnet
 lin aorta_N = mkN "大動脈" | mkN "大动脉" ; -- status=guess -- status=guess
 lin aortal_A = mkA "主动脉" | mkA "大动脉" ; -- open-multilingual-wordnet
 lin aortitis_N = mkN "主动脉动脉炎" ; -- open-multilingual-wordnet
-lin apanage_N = mkN "俸禄" | mkN "封禄" ; -- open-multilingual-wordnet
 lin apart_Adv = mkAdv "隔开" ;
 lin apart_from_Prep = mkPrep "除了" ;
 lin apartheid_N = mkN "种族隔离" [] ;

lib/src/translator/DictionaryEng.gf

@@ -2843,7 +2843,6 @@ lin aoudad_N = variants {mkN "aoudad"; mkN "audad"};
 lin apace_Adv = mkAdv "apace";
 lin apache_N = mkN "apache" "apaches";
 lin apadana_N = mkN "apadana" ;
-lin apanage_N = mkN "apanage" ;
 lin apar_N = mkN "apar" ;
 lin apart_Adv = mkAdv "apart";
 lin apart_from_Prep = mkPrep "apart from";
@@ -2978,7 +2977,7 @@ lin apotropaic_A = mkA "apotropaic" ;
 lin appal_V2 = variants {mkV2 (mkV "appal"); mkV2 (mkV "appall")};
 lin appalling_A = compoundA (mkA "appalling");
 lin appalling_N = mkN "appalling" ;
-lin appanage_N = mkN "appanage" ;
+lin appanage_N = variants {mkN "appanage"; mkN "apanage"} ;
 lin apparatchik_N = mkN "apparatchik" ;
 lin apparatus_N = mkN "apparatus" "apparatuses";
 lin apparel_N = mkN "apparel" ;

lib/src/translator/DictionaryFin.gf

@@ -2688,7 +2688,6 @@ lin aoudad_N = mkWN (compoundN "harja" (k41A "lammas")) ; --UNCHK
 lin apace_Adv = mkWAdv (k99 "joutuin") ; --UNCHK
 lin apache_N = mkWN (k5 "apassi") ; --UNCHK
 lin apadana_N = mkWN "apadana" ; --UNCHK
-lin apanage_N = mkWN (compoundN "apan" (k5 "aasi")) ; --UNCHK
 lin apar_N = mkWN (compoundN "pallo" (k38 "vyötiäinen")) ; --UNCHK
 lin apart_Adv = mkAdv "erillään" | mkAdv "erikseen" | mkAdv "syrjässä" | mkAdv "syrjään" ; ---- split
 lin apart_from_Prep = mkPrep "lisäksi" ;

lib/src/translator/DictionaryFre.gf

@@ -1566,7 +1566,6 @@ lin aortal_A = mkA "aortique" ; -- tocheck
 lin apace_Adv = mkAdv "rapidement" ; -- tocheck
 lin apache_N = mkN "apache" | mkN "apaches" ; -- UWN
 lin apadana_N = mkN "apadana" ; -- UWN
-lin apanage_N = mkN "apanage" masculine ; -- tocheck
 lin apart_Adv = mkAdv "séparé" ; -- tocheck
 lin apartheid_N = mkN "apartheid" masculine ; -- tocheck
 lin apartment_N = L.apartment_N ;
@@ -1634,7 +1633,7 @@ lin apothecium_N = mkN "apothécie" ; -- UWN
 lin apothegm_N = mkN "apophthegme" masculine ; -- tocheck
 lin apotheosis_N = mkN "apothéose" feminine ; -- tocheck
 lin appalling_A = mkA "affreux" ; -- UWN
-lin appanage_N = mkN "apanage" ; -- UWN
+lin appanage_N = mkN "apanage" masculine ; -- tocheck
 lin apparatchik_N = mkN "apparatchik" masculine ; -- tocheck
 lin apparatus_N = mkN "appareil" masculine ; -- tocheck
 lin apparel_N = mkN "vêtement" | mkN "vêtements" ; -- UWN

lib/src/translator/DictionaryGer.gf

@@ -2845,7 +2845,6 @@ lin aoudad_N = variants {} ;
 lin apace_Adv = variants {} ;
 lin apache_N = variants {} ;
 lin apadana_N = variants {} ;
-lin apanage_N = variants {} ;
 lin apar_N = variants {} ;
 lin apart_Adv = mkAdv "auseinander" ;
 lin apart_from_Prep = variants {} ;

lib/src/translator/DictionaryIta.gf

@@ -1374,7 +1374,6 @@ lin aorist_N = mkN "aoristo" ; -- UWN
 lin aorta_N = mkN "aorta" ; -- status=guess
 lin aortal_A = mkA "aortico" ; -- status=guess
 lin apace_Adv = mkAdv "celermente" | mkAdv "lestamente" | mkAdv "lesto" | mkAdv "presto" | mkAdv "prontamente" | mkAdv "rapidamente" | mkAdv "ratto" | mkAdv "sollecitamente" | mkAdv "speditamente" | mkAdv "spedito" | mkAdv "sveltamente" | mkAdv "veloce" | mkAdv "velocemente" ; -- UWN
-lin apanage_N = mkN "appannaggio" ; -- UWN
 lin apart_Adv = variants {} ; --
 lin apartheid_N = mkN "apartheid" masculine ; -- status=guess
 lin apartment_N = L.apartment_N ;

lib/src/translator/DictionarySwe.gf

@@ -2833,7 +2833,6 @@ lin aoudad_N = variants {} ; -- status=guess
 lin apace_Adv = variants {} ; -- status=guess
 lin apache_N = mkN "apache" "apacher" ;
 lin apadana_N = variants {} ; -- status=guess
-lin apanage_N = mkN "apanage" "apanaget" "apanage" "apanagen" ;
 lin apar_N = variants {} ; -- status=guess
 lin apart_Adv = mkAdv "avsides" | mkAdv "separat" ;
 lin apart_from_Prep = mkPrep "bortsett från" ;
@@ -2970,7 +2969,7 @@ lin apotropaic_A = variants {} ; -- status=guess
 lin appal_V2 = variants {} ; -- status=guess
 lin appalling_A = mkA "skrämmande" ; -- comment=4
 lin appalling_N = mkN "skrämmande" ; -- status=guess
-lin appanage_N = mkN "tillbehör" neutrum ; -- comment=3
+lin appanage_N = mkN "tillbehör" neutrum | mkN "apanage" "apanaget" "apanage" "apanagen" ;
 lin apparatchik_N = mkN "partifunktionär" ; -- status=guess
 lin apparatus_N = mkN "apparat" "apparater" ; -- SaldoWN
 lin apparel_N = mkN "dräkt" "dräkter" ; -- comment=2

lib/src/translator/translate.probs

@@ -3039,7 +3039,6 @@ aoudad_N	3.729715012475897e-6
 apace_Adv	8.668966832532898e-6
 apache_N	3.729715012475897e-6
 apadana_N	3.729715012475897e-6
-apanage_N	3.729715012475897e-6
 apar_N	3.729715012475897e-6
 apart_Adv	2.2539313764585535e-4
 apart_from_Prep	4.9892730629147335e-5