merge ameba_N with amoeba_N

lib/src/translator/Dictionary.gf

@@ -1945,7 +1945,6 @@ fun ambush_N : N ;
 fun ambush_V2 : V2 ;
 fun ambusher_N : N ;
 fun ambystomid_N : N ;
-fun ameba_N : N ;
 fun amebiasis_N : N ;
 fun ameboid_A : A ;
 fun ameer_N : N ;

lib/src/translator/DictionaryBul.gf

@@ -1952,7 +1952,6 @@ lin ambush_N = mkN041 "засада" ; ----
 lin ambush_V2 = variants {} ;
 lin ambusher_N = variants {} ;
 lin ambystomid_N = variants {} ;
-lin ameba_N = mkN041 "амеба" ; ----
 lin amebiasis_N = mkN041 "амебиаза" ;
 lin ameboid_A = variants {} ;
 lin ameer_N = mkN007a "емир" ;
@@ -2043,7 +2042,7 @@ lin amnion_N = mkN007 "амнион" ;
 lin amniote_N = variants {} ;
 lin amniotic_A = mkA079 "амниотичен" ;
 lin amobarbital_N = mkN007 "амобарбитал" ;
-lin amoeba_N = mkN041 "амеба" ; ----
+lin amoeba_N = mkN041 "амеба" ;
 lin amoebic_A = mkA079 "амебен" ;
 lin amok_Adv = variants {} ;
 lin among_Prep = mkPrep "измежду" Acc ;

lib/src/translator/DictionaryChi.gf

@@ -1421,7 +1421,6 @@ lin ambush_N = mkN "埋伏" | mkN "伏擊" | mkN "伏击" ; -- status=guess -- s
 lin ambush_V2 = mkV2 "埋伏" ;
 lin ambusher_N = mkN "伏兵" ; -- open-multilingual-wordnet
 lin ambystomid_N = mkN "钝口螈属" ; -- open-multilingual-wordnet
-lin ameba_N = mkN "变形虫" | mkN "阿米巴" ; -- open-multilingual-wordnet
 lin amebiasis_N = mkN "阿米巴病" ; -- open-multilingual-wordnet
 lin ameboid_A = mkA "似变形虫" ; -- open-multilingual-wordnet
 lin amelia_N = mkN "无肢" | mkN "缺肢" ; -- open-multilingual-wordnet

lib/src/translator/DictionaryEng.gf

@@ -1957,7 +1957,6 @@ lin ambush_N = mkN "ambush" "ambushes";
 lin ambush_V2 = mkV2 (mkV "ambush" "ambushes" "ambushed" "ambushed" "ambushing");
 lin ambusher_N = mkN "ambusher" ;
 lin ambystomid_N = mkN "ambystomid" ;
-lin ameba_N = mkN "ameba" "amebas";
 lin amebiasis_N = mkN "amebiasis" ;
 lin ameboid_A = mkA "ameboid" ;
 lin ameer_N = mkN "ameer" "ameers";
@@ -2048,7 +2047,7 @@ lin amnion_N = mkN "amnion" ;
 lin amniote_N = mkN "amniote" ;
 lin amniotic_A = mkA "amniotic" ;
 lin amobarbital_N = mkN "amobarbital" ;
-lin amoeba_N = mkN "amoeba" "amoebas";
+lin amoeba_N = variants {mkN "amoeba" "amoebas"; mkN "ameba" "amebas"} ;
 lin amoebic_A = compoundA (mkA "amoebic");
 lin amok_Adv = mkAdv "amok";
 lin among_Prep = mkPrep "among";

lib/src/translator/DictionaryEst.gf

@@ -630,7 +630,6 @@ lin ambulance_N = mkN "kiirabi" | mkN "kiirabiauto" | mkN "preeriavanker" ;
 lin ambulatory_N = mkN "edasikanduv" | mkN "liikuv" ;
 lin ambuscade_N = mkN "varitsus" | mkN "varitsusest ründama" ;
 lin ambush_N = mkN "varitsema" | mkN "varitsus" ;
-lin ameba_N = mkN "amööb" ;
 lin amelioration_N = mkN "maaparandus" | mkN "melioratsioon" | mkN "paranemine" ;
 lin amenability_N = mkN "alistuvus" | mkN "järeleandlikkus" ;
 lin amendment_N = mkN "parandamine" | mkN "parandus" | mkN "täiendamine" | mkN "õiendus" ;

lib/src/translator/DictionaryFin.gf

@@ -1847,7 +1847,6 @@ lin ambush_N = mkWN (k9 "ansa") ; --UNCHK
 lin ambush_V2 = mkWV2 (k53A "odottaa") "makuulla" ; --UNCHK
 lin ambusher_N = mkWN "väijyjä" ; --UNCHK
 lin ambystomid_N = mkWN "aksolotli" ; --UNCHK
-lin ameba_N = mkWN (k9 "ameba") ; --UNCHK
 lin amebiasis_N = mkWN (k5A "tauti") "ameban" "aiheuttama" ; --UNCHK
 lin ameboid_A = mkWA (compoundA "ameba" (k38 "mainen")) ; --UNCHK
 lin ameer_N = mkWN (k6 "emiiri") ; --UNCHK

lib/src/translator/DictionaryFre.gf

@@ -1102,7 +1102,6 @@ lin ambulatory_N = mkN "déambulatoire" ; -- tocheck
 lin ambuscade_N = mkN "embuscade" feminine ; -- tocheck
 lin ambuscade_V2 = mkV2 (mkV "embusquer") ; -- tocheck
 lin ambush_N = mkN "embuscade" feminine ; -- tocheck
-lin ameba_N = mkN "amibe" | mkN "amibes" | mkN "amoeba" ; -- UWN
 lin amebiasis_N = mkN "Amabiase" | mkN "amabiase" | mkN "amibiase" ; -- UWN
 lin ameer_N = mkN "émir" ; -- UWN
 lin amelia_N = mkN "amélie" ; -- UWN
@@ -1145,7 +1144,7 @@ lin amniocentesis_N = mkN "amniocentèse" feminine ; -- tocheck
 lin amnion_N = mkN "amnios" | mkN "sac_amniotique" ; -- UWN
 lin amniote_N = mkN "amniota" | mkN "amniotes" ; -- UWN
 lin amniotic_A = mkA "amniotique" ; -- UWN
-lin amoeba_N = mkN "amibe" feminine ; -- tocheck
+lin amoeba_N = mkN "amibe" feminine | mkN "amibes" | mkN "amoeba" ; -- UWN
 lin amoebic_A = mkA "amibien" ; -- UWN
 lin among_Prep = mkPrep "parmi" ;
 lin amongst_Prep = variants {} ; --

lib/src/translator/DictionaryGer.gf

@@ -1959,7 +1959,6 @@ lin ambush_N = mkN "Hinterhalt" "Hinterhalte" masculine ; -- status=guess
 lin ambush_V2 = mkV2 (compoundV "aus dem Hinterhalt" (prefixV "an" I.greifen_V)) ;
 lin ambusher_N = variants {} ;
 lin ambystomid_N = variants {} ;
-lin ameba_N = variants {} ;
 lin amebiasis_N = variants {} ;
 lin ameboid_A = variants {} ;
 lin ameer_N = variants {} ;

lib/src/translator/DictionaryIta.gf

@@ -964,7 +964,6 @@ lin ambulance_N = mkN "ambulanza" ; -- status=guess
 lin ambulatory_N = mkN "deambulatorio" | mkN "ambulacro" ; -- status=guess status=guess
 lin ambuscade_N = mkN "agguato" | mkN "appostamento" | mkN "imboscata" ; -- UWN
 lin ambush_N = mkN "imboscata" ; -- status=guess
-lin ameba_N = mkN "ameba" ; -- UWN
 lin amebiasis_N = mkN "amebiasi" ; -- UWN
 lin ameboid_A = mkA "ameboide" ; -- UWN
 lin ameer_N = mkN "emiro" ; -- UWN
@@ -1004,7 +1003,7 @@ lin amnesty_N = mkN "amnistia" ; -- status=guess
 lin amniocentesis_N = mkN "amniocentesi" ; -- UWN
 lin amnion_N = mkN "amnio" ; -- status=guess
 lin amniotic_A = mkA "amniotico" ; -- status=guess
-lin amoeba_N = mkN "amoeba" ; -- status=guess
+lin amoeba_N = mkN "amoeba" | mkN "ameba" ; -- UWN
 lin amoebic_A = mkA "amebico" ; -- status=guess
 lin among_Prep = variants {} ; --
 lin amongst_Prep = variants {} ; --

lib/src/translator/DictionarySwe.gf

@@ -1946,7 +1946,6 @@ lin ambush_N = mkN "försåt" neutrum ; -- status=guess
 lin ambush_V2 = variants {} ; -- status=guess
 lin ambusher_N = variants {} ; -- status=guess
 lin ambystomid_N = variants {} ; -- status=guess
-lin ameba_N = variants {} ; -- status=guess
 lin amebiasis_N = mkN "amöbainfektion"; -- src=google
 lin ameboid_A = variants {} ; -- status=guess
 lin ameer_N = variants {} ; -- status=guess

lib/src/translator/DictionaryTha.gf

@@ -1329,7 +1329,6 @@ lin ambulatory_N = mkN "สถานที่ที่ทําไว้สํ
 lin ambuscade_N = mkN "การซุ่มโจมตี" | mkN "การซุ่มโจมตี" ; -- src=panlex
 lin ambush_N = mkN "การซุ่มโจมตี" | mkN "การซุ่มโจมตี" | mkN "การดักลอบทําร้าย" | mkN "ผู้ที่ดักลอบทําร้าย" | mkN "การโจมตีที่ไม่ได้คาดคิด" ; -- src=panlex
 lin ambystomid_N = mkN "แอมไบสโตมิด" ; -- src=panlex
-lin ameba_N = mkN "อะมีบา" | mkN "อะมีบา" | mkN "ตัวอะมีบา" ; -- src=panlex
 lin amebiasis_N = mkN "บิดมีตัว" | mkN "บิดอะมีบา" ; -- src=panlex
 lin ameboid_A = mkA "เหมือนอะมีบา" | mkA "คล้ายหรือเกี่ยวกับอะมีบา" ; -- src=panlex
 lin ameer_N = mkN "อีเมียร์" ; -- src=panlex
@@ -1401,7 +1400,7 @@ lin amnion_N = mkN "ถุงน้ำคร่ำ" | mkN "ถุงน้ํา
 lin amniote_N = mkN "สัตว์ที่มีถุงน้ำคร่ำ" ; -- src=panlex
 lin amniotic_A = mkA "แอมนิค" | mkA "เกี่ยวกับมีถุงน้ําคร่ํา" ; -- src=panlex
 lin amobarbital_N = mkN "แอมโมบาร์บิทอล" | mkN "ยาแอมโมบาร์บิทอล" ; -- src=panlex
-lin amoeba_N = mkN "อะมีบา" | mkN "อะมีบา" ; -- src=panlex
+lin amoeba_N = mkN "อะมีบา" | mkN "อะมีบา" | mkN "ตัวอะมีบา" ; -- src=panlex
 lin amoebic_A = mkA "อะมีบา" | mkA "ซึ่งมีอะมีบาอยู่" | mkA "เกี่ยวกับหรือคล้ายตัวอะมีบา" ; -- src=panlex
 lin amok_Adv = mkAdv "ที่อาละวาด" | mkAdv "อย่างบ้าคลั่ง" ; -- src=panlex
 lin among_Prep = mkPrep "ในพวก" | mkPrep "ในหมู่" | mkPrep "ระหว่าง" | mkPrep "ท่ามกลาง" | mkPrep "ในจํานวน" | mkPrep "ในจําพวก" | mkPrep "ในระหว่าง" ; -- src=panlex

lib/src/translator/translate.probs

@@ -2154,7 +2154,6 @@ ambush_N	3.729715012475897e-6
 ambush_V2	4.8295957628346505e-5
 ambusher_N	3.729715012475897e-6
 ambystomid_N	3.729715012475897e-6
-ameba_N	3.729715012475897e-6
 amebiasis_N	3.729715012475897e-6
 ameboid_A	1.0773191989054437e-5
 ameer_N	3.729715012475897e-6