From 9002cfb8355e36245b7e849b12a5ced71b7dbdcf Mon Sep 17 00:00:00 2001 From: krasimir Date: Fri, 20 May 2016 20:51:44 +0000 Subject: [PATCH] merge analyse_V2 with analyze_V2 --- lib/src/translator/Dictionary.gf | 1 - lib/src/translator/DictionaryBul.gf | 1 - lib/src/translator/DictionaryCat.gf | 1 - lib/src/translator/DictionaryChi.gf | 1 - lib/src/translator/DictionaryDut.gf | 1 - lib/src/translator/DictionaryEng.gf | 4 ++-- lib/src/translator/DictionaryEst.gf | 1 - lib/src/translator/DictionaryFin.gf | 1 - lib/src/translator/DictionaryFre.gf | 1 - lib/src/translator/DictionaryGer.gf | 4 +--- lib/src/translator/DictionaryHin.gf | 1 - lib/src/translator/DictionaryIta.gf | 2 +- lib/src/translator/DictionaryJpn.gf | 1 - lib/src/translator/DictionarySpa.gf | 1 - lib/src/translator/DictionarySwe.gf | 1 - lib/src/translator/translate.probs | 1 - 16 files changed, 4 insertions(+), 19 deletions(-) diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 6e86367a6..e660b72f3 100644 --- a/lib/src/translator/Dictionary.gf +++ b/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 ; diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index f338fc65e..7fc47b29e 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/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 "аналитичен" ; diff --git a/lib/src/translator/DictionaryCat.gf b/lib/src/translator/DictionaryCat.gf index 6b20c6a84..a9fb52854 100644 --- a/lib/src/translator/DictionaryCat.gf +++ b/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 diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index 8f2e0bfc3..311796fcd 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/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 "分析" ; diff --git a/lib/src/translator/DictionaryDut.gf b/lib/src/translator/DictionaryDut.gf index 14224865f..0e54e910c 100644 --- a/lib/src/translator/DictionaryDut.gf +++ b/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 diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 260d69635..8e4fb1922 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/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" ; diff --git a/lib/src/translator/DictionaryEst.gf b/lib/src/translator/DictionaryEst.gf index e36d69640..4d5b178ab 100644 --- a/lib/src/translator/DictionaryEst.gf +++ b/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' ; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 188429c4d..12c704ad5 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/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 diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index 689c472c5..cd23750ee 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/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 diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index 0b0dbb2a5..f62359bfd 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/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 diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index efaa1ac0f..dd9d84a04 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/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 diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf index e399bdecd..e3f543989 100644 --- a/lib/src/translator/DictionaryIta.gf +++ b/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 diff --git a/lib/src/translator/DictionaryJpn.gf b/lib/src/translator/DictionaryJpn.gf index 28a1ca1fc..2ba808eb9 100644 --- a/lib/src/translator/DictionaryJpn.gf +++ b/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 "分析する" ; diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index 5425e5eb8..fe8f6cbce 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/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 diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 63b8d05e4..9a4f9dfd9 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/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 diff --git a/lib/src/translator/translate.probs b/lib/src/translator/translate.probs index 3710020cb..f8f0a7af1 100644 --- a/lib/src/translator/translate.probs +++ b/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