From efab215846e230b4d4f5f13e4bb380e036a3ad45 Mon Sep 17 00:00:00 2001 From: krasimir Date: Fri, 20 May 2016 20:44:41 +0000 Subject: [PATCH] merge amok_Adv with amuck_Adv --- lib/src/translator/Dictionary.gf | 1 - lib/src/translator/DictionaryBul.gf | 1 - lib/src/translator/DictionaryChi.gf | 2 +- lib/src/translator/DictionaryEng.gf | 3 +-- lib/src/translator/DictionaryEst.gf | 1 - lib/src/translator/DictionaryFin.gf | 1 - lib/src/translator/DictionarySpa.gf | 3 +-- lib/src/translator/DictionarySwe.gf | 1 - lib/src/translator/DictionaryTha.gf | 1 - lib/src/translator/translate.probs | 1 - 10 files changed, 3 insertions(+), 12 deletions(-) diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 45b749b41..6e86367a6 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -2022,7 +2022,6 @@ fun amniotic_A : A ; -- 02618108 of or related to the amnion or ch fun amobarbital_N : N ; -- 02703499 a barbiturate with sedative and hypnotic effects; used to relieve insomnia and as an anticonvulsant fun amoeba_N : N ; -- 01392380 naked freshwater or marine or parasitic protozoa that form temporary pseudopods for feeding and locomotion fun amoebic_A : A ; -- 03040974 pertaining to or resembling amoebae; "amoebic dysentery" -fun amok_Adv : Adv ; fun among_Prep : Prep ; fun amongst_Prep : Prep ; fun amora_N : N ; -- 09788761 one of a group of rabbis (active AD 250-500) who discussed the Mishnaic law in the law schools of Palestine and Mesopotamia where they explained and applied earlier teachings and whose discussions are recorded in the Talmud; they emphasized the study of Torah and the importance of personal action and the fulfillment of the commandments diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index f277f4f58..f338fc65e 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -2029,7 +2029,6 @@ lin amniotic_A = mkA079 "амниотичен" ; lin amobarbital_N = mkN007 "амобарбитал" ; lin amoeba_N = mkN041 "амеба" ; lin amoebic_A = mkA079 "амебен" ; -lin amok_Adv = variants {} ; lin among_Prep = mkPrep "измежду" Acc ; lin amongst_Prep = mkPrep "между" Acc ; lin amora_N = variants {} ; diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index 924178c61..8f2e0bfc3 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -1505,7 +1505,7 @@ lin amniote_N = mkN "羊膜动物" | mkN "羊膜的" | mkN "脊椎动物" ; -- o lin amniotic_A = mkA "有羊膜" | mkA "羊膜" ; -- open-multilingual-wordnet lin amoeba_N = mkN "變形蟲" | mkN "变形虫" | mkN "阿米巴" ; -- status=guess -- status=guess -- status=guess -- open-multilingual-wordnet lin amoebic_A = mkA "阿米巴" | mkA "阿米巴性" ; -- open-multilingual-wordnet -lin amok_Adv = mkAdv "疯狂地" ; +lin amuck_Adv = mkAdv "疯狂地" ; lin among_Prep = mkPrep "在" "其中" ; lin amongst_Prep = mkPrep "在之中" ; lin amoralism_N = mkN "非道德论" ; -- open-multilingual-wordnet diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 88a9ff047..260d69635 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -2034,7 +2034,6 @@ lin amniotic_A = variants {mkA "amniotic"; mkA "amnionic"}; lin amobarbital_N = mkN "amobarbital" ; lin amoeba_N = variants {mkN "amoeba" "amoebas"; mkN "ameba" "amebas"} ; lin amoebic_A = variants {compoundA (mkA "amoebic"); compoundA (mkA "amoeban"); compoundA (mkA "amebic")}; -lin amok_Adv = mkAdv "amok"; lin among_Prep = mkPrep "among"; lin amongst_Prep = mkPrep "amongst"; lin amora_N = mkN "amora" ; @@ -2104,7 +2103,7 @@ lin amputator_N = mkN "amputator" ; lin amputee_N = mkN "amputee" ; lin amrinone_N = mkN "amrinone" ; lin amsterdam_PN = mkPN "Amsterdam"; -lin amuck_A = variants {mkA "amuck"; mkA "amok"}; +lin amuck_A = variants {irregAdv (mkA "amuck") "amuck"; irregAdv (mkA "amok") "amok"}; lin amuck_Adv = mkAdv "amuck"; lin amulet_N = mkN "amulet" "amulets"; lin amuse_V2 = mkV2 (mkV "amuse" "amuses" "amused" "amused" "amusing"); diff --git a/lib/src/translator/DictionaryEst.gf b/lib/src/translator/DictionaryEst.gf index a023ed61d..e36d69640 100644 --- a/lib/src/translator/DictionaryEst.gf +++ b/lib/src/translator/DictionaryEst.gf @@ -1048,7 +1048,6 @@ lin ammunition_N = D.laskemoon_N ; lin amnesia_N = D.amneesia_N ; lin amnesty_N = D.amnestia_N ; lin amoeba_N = D.'amööb_N' ; -lin amok_Adv = ParadigmsEst.mkAdv "amok" ; lin amoralism_N = mkN "amoralism" ; lin amoralist_N = mkN "amoralist" ; lin amorpha_N = mkN "amorfa" ; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 8abefe370..188429c4d 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -1936,7 +1936,6 @@ lin amniote_N = mkWN (compoundN "vesi" (k38 "kalvollinen")) ; --UNCHK lin amniotic_A = mkWA "sikiökalvo-" ; --UNCHK lin amoeba_N = mkWN (k9 "ameba") ; --UNCHK lin amoebic_A = mkWA (compoundA "ameba" (k38 "mainen")) ; --UNCHK -lin amok_Adv = mkWAdv (k99 "murhaavasti") ; --UNCHK lin among_Prep = postPrep genitive "joukossa" ; lin amongst_Prep = postPrep genitive "joukossa" ; lin amora_N = mkWN "amora" ; --UNCHK diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index 7b3a6b14d..5425e5eb8 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -1234,7 +1234,6 @@ lin amniote_N = mkN "amniota" ; --UWN lin amniotic_A = mkA "amniótico" ; -- status=guess lin amoeba_N = mkN "ameba" ; -- status=guess lin amoebic_A = mkA "amebiano" ; -- status=guess -lin amok_Adv = mkAdv "de_forma_asesina" | mkAdv "enloquecido" | mkAdv "frenéticamente" ; --UWN lin among_Prep = mkPrep "entre" ; lin amongst_Prep = variants {} ; -- lin amora_N = mkN "amoraim" ; --UWN @@ -1275,7 +1274,7 @@ lin ampullar_A = mkA "ampollar" ; --UWN lin amputate_V2 = mkV2 (mkV "amputar") ; -- status=guess, src=wikt lin amputation_N = mkN "amputación" feminine ; -- status=guess lin amsterdam_PN = mkPN "Ámsterdam" ; -- status=guess src=geonames -lin amuck_Adv = mkAdv "de_forma_asesina" | mkAdv "enloquecido" | mkAdv "frenéticamente" ; --UWN +lin amuck_Adv = mkAdv "de forma asesina" | mkAdv "enloquecido" | mkAdv "frenéticamente" ; --UWN lin amulet_N = mkN "amuleto" | mkN "talismán" masculine ; -- status=guess status=guess lin amuse_V2 = mkV2 (divertir_V) ; -- status=guess lin amusement_N = mkN "diversión" feminine ; -- status=guess diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index fa2b583d4..63b8d05e4 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -2024,7 +2024,6 @@ lin amniotic_A = variants {} ; -- status=guess lin amobarbital_N = variants {} ; -- status=guess lin amoeba_N = mkN "amöba" ; -- status=guess lin amoebic_A = variants {} ; -- status=guess -lin amok_Adv = mkAdv "amok" ; -- status=guess lin among_Prep = mkPrep "bland" ; lin amongst_Prep = mkPrep "bland" ; -- status=guess lin amora_N = variants {} ; -- status=guess diff --git a/lib/src/translator/DictionaryTha.gf b/lib/src/translator/DictionaryTha.gf index 12acbfd32..4f449d8de 100644 --- a/lib/src/translator/DictionaryTha.gf +++ b/lib/src/translator/DictionaryTha.gf @@ -1439,7 +1439,6 @@ lin amniotic_A = mkA "แอมนิค" | mkA "เกี่ยวกับม lin amobarbital_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 lin amongst_Prep = mkPrep "ในพวก" | mkPrep "ในหมู่" | mkPrep "ท่ามกลาง" | mkPrep "ในจํานวน" | mkPrep "ในระหว่าง" ; -- src=panlex lin amora_N = mkN "อะโมรา" ; -- src=panlex diff --git a/lib/src/translator/translate.probs b/lib/src/translator/translate.probs index 0e87b959f..3710020cb 100644 --- a/lib/src/translator/translate.probs +++ b/lib/src/translator/translate.probs @@ -2233,7 +2233,6 @@ amniotic_A 1.0773191989054437e-5 amobarbital_N 3.729715012475897e-6 amoeba_N 3.729715012475897e-6 amoebic_A 1.0773191989054437e-5 -amok_Adv 2.6006900497598697e-5 among_Prep 5.22875816993464e-3 amongst_Prep 1.9957092251658934e-5 amora_N 3.729715012475897e-6