From 76c6d28e7330a600ecec295d48e59398842c8dcf Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Fri, 30 Jan 2015 09:26:35 +0000 Subject: [PATCH] merge absinth_N with absinthe_N --- lib/src/translator/Dictionary.gf | 1 - lib/src/translator/DictionaryBul.gf | 1 - lib/src/translator/DictionaryChi.gf | 1 - lib/src/translator/DictionaryEng.gf | 3 +-- lib/src/translator/DictionaryEst.gf | 1 - lib/src/translator/DictionaryFin.gf | 1 - lib/src/translator/DictionaryFre.gf | 1 - lib/src/translator/DictionaryGer.gf | 1 - lib/src/translator/DictionaryHin.gf | 3 +-- lib/src/translator/DictionaryIta.gf | 1 - lib/src/translator/DictionarySwe.gf | 1 - lib/src/translator/translate.probs | 1 - 12 files changed, 2 insertions(+), 14 deletions(-) diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 386a447ca..308ede998 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -228,7 +228,6 @@ fun absent_minded_A : A ; fun absentee_N : N ; fun absenteeism_N : N ; fun absentmindedness_N : N ; -fun absinth_N : N ; fun absinthe_N : N ; fun absolute_A : A ; fun absolute_N : N ; diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index d08fce25a..9a8c27da8 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -235,7 +235,6 @@ lin absent_minded_A = mkA076 "разсеян" ; lin absentee_N = substantiveN (mkA076 "отсъстващ") (AMasc NonHuman) ; lin absenteeism_N = mkN071 "отлъчване" ; ---- lin absentmindedness_N = mkN049 "разсеяност" ; -lin absinth_N = mkN007 "абсент" ; lin absinthe_N = mkN007 "абсент" ; lin absolute_A = mkA079 "абсолютен" ; lin absolute_N = mkN007 "абсолют" ; diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index 988f7c6fb..068cbdb64 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -170,7 +170,6 @@ lin absent_A = mkA "缺席" ; lin absent_Prep = mkPrep "缺席" ; lin absentee_N = mkN "不在者" | mkN "缺席者" ; -- open-multilingual-wordnet lin absenteeism_N = mkN "旷课" "次" ; -lin absinth_N = mkN "苦艾酒" ; -- open-multilingual-wordnet lin absinthe_N = mkN "苦艾" | {-mwn-} mkN "苦艾酒" ; -- status=guess -- open-multilingual-wordnet lin absolute_A = mkA "绝对" ; lin absolute_N = mkN "君主專制" | mkN "君主专制" | mkN "絕對君主制" | mkN "绝对君主制" | {-HSK-} mkN "绝对" | {-mwn-} mkN "绝对事物" ; -- status=guess -- status=guess -- status=guess -- status=guess -- open-multilingual-wordnet diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 2571b6a98..13152fd89 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -231,8 +231,7 @@ lin absent_minded_A = compoundA (mkA "absent-minded"); lin absentee_N = mkN "absentee" "absentees"; lin absenteeism_N = mkN "absenteeism" ; lin absentmindedness_N = variants {mkN "absent-mindedness"; mkN "absentmindedness"}; -lin absinth_N = mkN "absinth" ; -lin absinthe_N = mkN "absinthe" ; +lin absinthe_N = variants {mkN "absinthe"; mkN "absinth"}; lin absolute_A = compoundA (mkA "absolute"); lin absolute_N = mkN "absolute" ; lin absoluteness_N = mkN "absoluteness" ; diff --git a/lib/src/translator/DictionaryEst.gf b/lib/src/translator/DictionaryEst.gf index c89a1a5d3..ef09df4c9 100644 --- a/lib/src/translator/DictionaryEst.gf +++ b/lib/src/translator/DictionaryEst.gf @@ -99,7 +99,6 @@ lin absenteeism_N = mkN "korduv põhjuseta puudumine" ; lin absentee_N = mkN "eemalviibija" | mkN "puuduja" ; lin absentmindedness_N = mkN "hajameelsus" | mkN "töössesüvenemine" ; lin absinthe_N = mkN "absint" ; -lin absinth_N = mkN "absint" ; lin absolute_N = mkN "absoluut" | mkN "absoluutne" | mkN "täielik" | mkN "ümberlükkamatu" ; lin absoluteness_N = mkN "absoluutsus" | mkN "lõplikkus" ; lin absolution_N = mkN "pattude andeksandmine" ; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 929d5c4fb..4b74b4253 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -245,7 +245,6 @@ lin absent_V2 = mkWV2 (k60A "lähteä") ; --UNCHK lin absentee_N = mkWN (compoundN "poissa" (k12 "olija")) ; --UNCHK lin absenteeism_N = mkWN (compoundN "poissa" (k1 "olo")) "toistuva" ; --UNCHK lin absentmindedness_N = mkWN (compoundN "hajamiel" (k40 "isyys")) ; --UNCHK -lin absinth_N = mkWN (k5A "absintti") ; --UNCHK lin absinthe_N = mkWN (k5A "absintti") ; --UNCHK lin absolute_A = mkA "ehdoton" | mkA "absoluuttinen" ; lin absolute_N = mkWN (k5A "absoluutti") ; --UNCHK diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index 294799baa..05ae59bb8 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -157,7 +157,6 @@ lin absent_V2 = mkV2 (reflV (mkV "absenter")) P.genitive ; -- tocheck lin absent_minded_A = mkA "distrait" ; -- tocheck lin absentee_N = mkN "absent" masculine ; -- tocheck lin absenteeism_N = mkN "absentéisme" ; -- UWN -lin absinth_N = mkN "absinthe" ; -- UWN lin absinthe_N = mkN "absinthe" masculine ; -- tocheck lin absolute_A = mkA "absolu" ; -- tocheck lin absolute_N = mkN "absolu" masculine ; -- tocheck diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index 8c3222aa5..5c92a828b 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -242,7 +242,6 @@ lin absent_minded_A = variants {} ; lin absentee_N = variants {} ; lin absenteeism_N = variants {} ; lin absentmindedness_N = variants {} ; -lin absinth_N = variants {} ; lin absinthe_N = mkN "Wermut" "Wermuts" masculine ; -- status=guess lin absolute_A = regA "absolut" ; -- status=guess lin absolute_N = mkN "absolute Superlativ" "absoluten Superlative" masculine ; -- status=guess diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index 268cc1852..e2f8605a4 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -197,8 +197,7 @@ lin absent_A = mkA "ग़ैरहाज़िर" ; -- tocheck lin absentee_N = mkN "अनुपस्थित" ; -- tocheck lin absenteeism_N = mkN "अनुपस्थितता" ; -- tocheck lin absentmindedness_N = mkN "अन्यमनस्कता" ; -- tocheck -lin absinth_N = mkN "चिरायता" ; -- tocheck -lin absinthe_N = mkN "अफ़संतीन" ; -- tocheck +lin absinthe_N = variants {mkN "अफ़संतीन"; mkN "चिरायता"} ; -- tocheck lin absolute_A = mkA "पूर्ण" ; -- tocheck lin absolute_N = mkN "परम तत्त्व" ; -- tocheck lin absoluteness_N = mkN "सुनिश्चितता" ; -- tocheck diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf index 677d040dd..c0cf1c1b9 100644 --- a/lib/src/translator/DictionaryIta.gf +++ b/lib/src/translator/DictionaryIta.gf @@ -134,7 +134,6 @@ lin absence_N = mkN "assenza" ; -- status=guess lin absent_A = mkA "assente" ; -- status=guess lin absentee_N = mkN "assente" ; -- status=guess lin absenteeism_N = mkN "assenteismo" ; -- UWN -lin absinth_N = mkN "assenzio" ; -- UWN lin absinthe_N = mkN "assenzio" ; -- status=guess lin absolute_A = mkA "assoluto" ; -- status=guess lin absolute_N = mkN "alcol assoluto" ; -- status=guess diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 0bd3df597..f7f0a6860 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -240,7 +240,6 @@ lin absent_minded_A = variants {} ; -- status=guess lin absentee_N = variants {} ; -- status=guess lin absenteeism_N = mkN "frånvaro" ; -- status=guess lin absentmindedness_N = variants {} ; -- status=guess -lin absinth_N = variants {} ; -- status=guess lin absinthe_N = mkN "malört" ; -- status=guess lin absolute_A = mkA "absolut" "absolut" ; -- SaldoWN lin absolute_N = (mkN "absolutbelopp" neutrum) | (mkN "belopp" neutrum) | mkN "modulus" ; -- status=guess status=guess status=guess diff --git a/lib/src/translator/translate.probs b/lib/src/translator/translate.probs index fd35d67e3..b8dff7384 100644 --- a/lib/src/translator/translate.probs +++ b/lib/src/translator/translate.probs @@ -459,7 +459,6 @@ absent_mindedness_N 3.729715012475897e-6 absentee_N 3.729715012475897e-6 absenteeism_N 1.4918860049903587e-5 absentmindedness_N 3.729715012475897e-6 -absinth_N 3.729715012475897e-6 absinthe_N 3.729715012475897e-6 absolute_A 3.6628852762785085e-4 absolute_N 3.729715012475897e-6