merge analyse_V2 with analyze_V2

lib/src/translator/Dictionary.gf

@@ -2164,7 +2164,6 @@ fun analogy_N : N ;
 fun analphabet_N : N ;             -- 09790047	an illiterate person who does not know the alphabet
 fun analphabetic_A : A ;
 fun analysand_N : N ;              -- 09790188	a person undergoing psychoanalysis
-fun analyse_V2 : V2 ;
 fun analysis_N : N ;
 fun analyst_N : N ;
 fun analytic_A : A ;

lib/src/translator/DictionaryBul.gf

@@ -2171,7 +2171,6 @@ lin analogy_N = mkN047 "аналогия" ;
 lin analphabet_N = variants {} ;
 lin analphabetic_A = mkA079 "грамотен" ;
 lin analysand_N = variants {} ;
-lin analyse_V2 = dirV2 (singleV (mkV186 "анализирам")) ;
 lin analysis_N = mkN007 "анализ" ;
 lin analyst_N = mkN014a "аналитик" ;
 lin analytic_A = mkA079 "аналитичен" ;

lib/src/translator/DictionaryCat.gf

@@ -754,7 +754,6 @@ lin analgesia_N = mkN "analgèsia" feminine ; --auto
 lin analgesic_A = mkA "analgèsic" ; --auto
 lin analgesic_N = mkN "analgèsic" masculine ; --auto
 lin analogous_A = mkA "anàleg" ; --auto
-lin analyse_V2 = mkV2 "analitzar" ; --auto
 lin analysis_N = mkN "anàlisi" feminine ;
 lin analyst_N = mkN "analista" ; --auto
 lin analytic_A = mkA "analític" ; --auto

lib/src/translator/DictionaryChi.gf

@@ -1610,7 +1610,6 @@ lin analogous_A = mkA "类似" ;
 lin analogy_N = mkN "比喻" ;
 lin analphabet_N = mkN "文盲" | mkN "目不识丁者" ; -- open-multilingual-wordnet
 lin analysand_N = mkN "接受精神分析的人" ; -- open-multilingual-wordnet
-lin analyse_V2 = mkV2 "分析" ;
 lin analysis_N = mkN "分析" | {-HSK-} mkN "分析" "個" ;
 lin analyst_N = mkN "分析人士" ;
 lin analytic_A = mkA "分析" ;

lib/src/translator/DictionaryDut.gf

@@ -796,7 +796,6 @@ lin anagram_N = mkN "anagram" | mkN "letterkeer" ; -- status=guess status=guess
 lin analgesic_N = mkN "pijnstiller" masculine ; -- status=guess
 lin analogous_A = mkA "analoog" | mkA "analoge" ; -- status=guess status=guess
 lin analogy_N = mkN "analogie" feminine ; -- status=guess
-lin analyse_V2 = variants {} ; --
 lin analysis_N = mkN "analyse" feminine ;
 lin analyst_N = mkN "analist" masculine | mkN "analiste" feminine ; -- status=guess status=guess
 lin analyze_V2 = mkV2 (mkV "analyseren") ; -- status=guess, src=wikt

lib/src/translator/DictionaryEng.gf

@@ -2176,14 +2176,14 @@ lin analogy_N = mkN "analogy" "analogies";
 lin analphabet_N = variants {mkN "analphabet"; mkN "analphabetic"};
 lin analphabetic_A = mkA "analphabetic" ;
 lin analysand_N = mkN "analysand" ;
-lin analyse_V2 = mkV2 (mkV "analyse" "analyses" "analysed" "analysed" "analysing");
 lin analysis_N = mkN "analysis" "analyses";
 lin analyst_N = mkN human (mkN "analyst" "analysts");
 lin analytic_A = compoundA (mkA "analytic");
 lin analytical_A = compoundA (mkA "analytical");
 lin analyticity_N = mkN "analyticity" ;
 lin analyzable_A = mkA "analyzable" ;
-lin analyze_V2 = mkV2 (mkV "analyze" "analyzes" "analyzed" "analyzed" "analyzing");
+lin analyze_V2 = variants {mkV2 (mkV "analyze" "analyzes" "analyzed" "analyzed" "analyzing");
+                           mkV2 (mkV "analyse" "analyses" "analysed" "analysed" "analysing")};
 lin analyzer_N = variants {mkN "analyzer"; mkN "analyser"};
 lin anamnestic_A = mkA "anamnestic" ;
 lin anamorphic_A = mkA "anamorphic" ;

lib/src/translator/DictionaryEst.gf

@@ -1129,7 +1129,6 @@ lin analogue_N = D.analoog_N ;
 lin analogy_N = D.analoogia_N ;
 lin analphabet_N = D.kirjaoskamatu_N ;
 lin analphabetic_A = D.kirjaoskamatu_A ;
-lin analyse_V2 = mkV2 "analüüsima" ;
 lin analysis_N = D.'analüüs_N' ;
 lin analyst_N = D.'analüütik_N' ;
 lin analytic_A = D.'analüütiline_A' ;

lib/src/translator/DictionaryFin.gf

@@ -2071,7 +2071,6 @@ lin analogy_N = mkWN (k40 "vastaavuus") ; --UNCHK
 lin analphabet_N = mkWN (k5A "analfabeetti") ; --UNCHK
 lin analphabetic_A = mkWA (compoundA "luku" (k34A "taidoton")) ; --UNCHK
 lin analysand_N = mkWN (k2 "henkilö") "psykoanalyysiä" "saava" ; --UNCHK
-lin analyse_V2 = mkWV2 (k62 "analysoida") ; --UNCHK
 lin analysis_N = mkN "analyysi" | mkWN (k2 "tarkastelu") ;
 lin analyst_N = mkN (lin NK {s = d04A "analyytikko"}) ;
 lin analytic_A = mkWA (k38 "analyyttinen") ; --UNCHK

lib/src/translator/DictionaryFre.gf

@@ -1226,7 +1226,6 @@ lin analogical_A = mkA "analogique" ; -- tocheck
 lin analogous_A = mkA "analogue" ; -- tocheck
 lin analogue_A = mkA "analogique" | mkA "analogue" | mkA "linéaire" ; -- UWN
 lin analogy_N = mkN "analogie" feminine ; -- tocheck
-lin analyse_V2 = variants {} ; --
 lin analysis_N = mkN "analyse" feminine ; -- tocheck
 lin analyst_N = mkN "analyste" masculine ; -- tocheck
 lin analytic_A = mkA "analytique" ; -- tocheck

lib/src/translator/DictionaryGer.gf

@@ -2036,7 +2036,6 @@ lin amniotic_A = variants {} ;
 lin amobarbital_N = variants {} ;
 lin amoeba_N = mkN "Amöbe" feminine ; -- status=guess
 lin amoebic_A = variants {} ;
-lin amok_Adv = mkAdv "Amok" ; -- status=guess
 lin among_Prep = mkPrep "unter" accusative ;
 lin amongst_Prep = variants {} ; --
 lin amora_N = variants {} ;
@@ -2107,7 +2106,7 @@ lin amputee_N = mkN "Amputierte" masculine ; -- status=guess
 lin amrinone_N = variants {} ;
 lin amsterdam_PN = mkPN "Amsterdam" ; -- src=geonames status=guess
 lin amuck_A = variants {} ;
-lin amuck_Adv = variants {} ;
+lin amuck_Adv = mkAdv "Amok" ; -- status=guess
 lin amulet_N = mkN "Amulett" "Amulette" neuter ; -- status=guess
 lin amuse_V2 = mkV2 (regV "belustigen" | mkV "erheitern") ; -- status=guess, src=wikt status=guess, src=wikt
 lin amusement_N = mkN "Amüsement" neuter | mkN "Entertainment" neuter | mkN "Unterhaltung" | mkN "Vergnügen" neuter ; -- status=guess status=guess status=guess status=guess
@@ -2180,7 +2179,6 @@ lin analogy_N = mkN "Analogie" "Analogien" feminine ; -- status=guess
 lin analphabet_N = variants {} ;
 lin analphabetic_A = variants {} ;
 lin analysand_N = variants {} ;
-lin analyse_V2 = variants {} ; --
 lin analysis_N = mkN "Analyse" ;
 lin analyst_N = mkN "Analytiker" "Analytiker" masculine ; -- status=guess
 lin analytic_A = mk3A "analytisch" "analytischer" "analytischste" ; -- status=guess

lib/src/translator/DictionaryHin.gf

@@ -1188,7 +1188,6 @@ lin analog_N = mkN "समधर्मी" ; -- tocheck
 lin analogous_A = mkA "अनुरूप" ; -- tocheck              
 lin analogue_A = mkA "रेखीय" ; -- tocheck       
 lin analogue_N = mkN "समधर्मी" ; -- tocheck              
-lin analyse_V2 = mkV2 (compoundV "मनोविश्लेषण" (mkV "करना")) ; -- tocheck
 lin analysis_N = mkN "विश्लेषण" ; -- tocheck              
 lin analyst_N = mkN "विश्लेषक" ; -- tocheck              
 lin analytic_A = mkA "विश्लेषणात्मक" ; -- tocheck              

lib/src/translator/DictionaryIta.gf

@@ -1087,7 +1087,7 @@ lin analgesic_N = mkN "analgesico" ; -- status=guess
 lin analogical_A = mkA "analogico" ; -- status=guess
 lin analogue_A = mkA "analogico" ; -- UWN
 lin analogy_N = mkN "analogia" ; -- status=guess
-lin analyse_V2 = variants {} ; --
+lin analyze_V2 = variants {} ; --
 lin analysis_N = mkN "analisi" feminine ; -- status=guess
 lin analyst_N = mkN "analista" ; -- status=guess
 lin analytic_A = mkA "analitico" ; -- status=guess

lib/src/translator/DictionaryJpn.gf

@@ -597,7 +597,6 @@ lin anagram_N = mkN "アナグラム" ;
 lin anal_A = mkA "尻" ;
 lin analgesic_N = mkN "鎮痛剤" ;
 lin analogy_N = mkN "類推" | mkN "アナロジー" | mkN "類似" | mkN "類比" ;
-lin analyse_V2 = variants {} ; --
 lin analysis_N = mkN "分析" ;
 lin analyst_N = mkN "アナリスト" ;
 lin analyze_V2 = mkV2 "分析する" ;

lib/src/translator/DictionarySpa.gf

@@ -1305,7 +1305,6 @@ lin analogical_A = mkA "analógico" ; -- status=guess
 lin analogist_N = mkN "analogista" ; --UWN
 lin analogous_A = mkA "análogo" ; -- status=guess
 lin analogy_N = mkN "analogía" ; -- status=guess
-lin analyse_V2 = variants {} ; --
 lin analysis_N = mkN "análisis" masculine ;
 lin analyst_N = mkN "analista" masculine ; -- status=guess
 lin analytic_A = mkA "analítico" ; -- status=guess

lib/src/translator/DictionarySwe.gf

@@ -2167,7 +2167,6 @@ lin analogy_N = mkN "analogi" "analogier" ; -- SaldoWN
 lin analphabet_N = mkN "analfabet" "analfabeter" ; -- status=guess
 lin analphabetic_A = variants {} ; -- status=guess
 lin analysand_N = variants {} ; -- status=guess
-lin analyse_V2 = mkV2 "analysera" ;
 lin analysis_N = mkN "analys" "analyser" ;
 lin analyst_N = mkN "psykoanalytiker" "psykoanalytikern" "psykoanalytiker" "psykoanalytikerna" | mkN "analytiker" "analytikern" "analytiker" "analytikerna" ; -- SaldoWN
 lin analytic_A = mkA "analytisk" ; -- status=guess

lib/src/translator/translate.probs

@@ -2377,7 +2377,6 @@ analogy_N	1.118914503742769e-5
 analphabet_N	3.729715012475897e-6
 analphabetic_A	1.0773191989054437e-5
 analysand_N	3.729715012475897e-6
-analyse_V2	1.609865254278217e-5
 analysis_N	1.3799945546160818e-4
 analyst_N	3.725985297463421e-3
 analytic_A	2.1546383978108874e-5