From 75a2d4b56f671454c86a44e8dde9825c185e2811 Mon Sep 17 00:00:00 2001 From: krasimir Date: Fri, 20 May 2016 20:07:56 +0000 Subject: [PATCH] merge acknowledgment_N and acknowledgement_N --- lib/src/translator/Dictionary.gf | 1 - lib/src/translator/DictionaryBul.gf | 1 - lib/src/translator/DictionaryChi.gf | 3 +-- lib/src/translator/DictionaryDut.gf | 1 - lib/src/translator/DictionaryEng.gf | 3 +-- lib/src/translator/DictionaryEst.gf | 5 ++--- lib/src/translator/DictionaryFin.gf | 1 - lib/src/translator/DictionaryFre.gf | 3 +-- lib/src/translator/DictionaryGer.gf | 3 +-- lib/src/translator/DictionaryHin.gf | 3 +-- lib/src/translator/DictionaryIta.gf | 1 - lib/src/translator/DictionaryJpn.gf | 2 +- lib/src/translator/DictionarySpa.gf | 1 - lib/src/translator/DictionarySwe.gf | 3 +-- lib/src/translator/DictionaryTha.gf | 3 +-- lib/src/translator/translate.probs | 1 - 16 files changed, 10 insertions(+), 25 deletions(-) diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 739f89c48..f4a39d9cd 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -535,7 +535,6 @@ fun acknowledge_V2 : V2 ; fun acknowledge_VS : VS ; fun acknowledgeable_A : A ; -- 01272609 capable of being acknowledged fun acknowledgement_N : N ; -fun acknowledgment_N : N ; fun acme_N : N ; fun acne_N : N ; -- 14222112 an inflammatory disease involving the sebaceous glands of the skin; characterized by papules or pustules or comedones fun acned_A : A ; -- 00246175 (of complexion) blemished by imperfections of the skin diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 058042bf1..45b925702 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -542,7 +542,6 @@ lin acknowledge_V2 = dirV2 (dualV (mkV186 "признавам") (mkV161 "при lin acknowledge_VS = variants {} ; lin acknowledgeable_A = variants {} ; lin acknowledgement_N = mkN072 "признание" ; -lin acknowledgment_N = mkN072 "признание" ; lin acme_N = mkN032 "апогей" ; lin acne_N = mkN065 "акне" ; lin acned_A = variants {} ; diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index ae6cb0115..ff9318244 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -395,8 +395,7 @@ lin ackee_N = mkN "西非荔枝果" | mkN "阿开木果" ; -- open-multilingual- lin acknowledge_V2 = mkV2 "承认" ; lin acknowledge_VS = mkVS "确认" ; lin acknowledgeable_A = mkA "有知识" ; -- open-multilingual-wordnet -lin acknowledgement_N = mkN "承认" ; -lin acknowledgment_N = mkN "感谢" | mkN "致謝" ; -- open-multilingual-wordnet +lin acknowledgement_N = mkN "承认" | mkN "感谢" | mkN "致謝" ; -- open-multilingual-wordnet lin acne_N = mkN "痤疮" ; lin acneiform_A = mkA "痤疮样" ; -- open-multilingual-wordnet lin acold_A = mkA "寒冷" ; -- open-multilingual-wordnet diff --git a/lib/src/translator/DictionaryDut.gf b/lib/src/translator/DictionaryDut.gf index 0b1c037ad..14224865f 100644 --- a/lib/src/translator/DictionaryDut.gf +++ b/lib/src/translator/DictionaryDut.gf @@ -244,7 +244,6 @@ lin acidotic_A = mkA "acidotisch" ; -- status=guess lin acknowledge_V2 = mkV2 (mkV "erkennen") ; -- status=guess, src=wikt lin acknowledge_VS = mkVS (mkV "erkennen") ; -- status=guess, src=wikt lin acknowledgement_N = mkN "erkenning" feminine ; -- status=guess -lin acknowledgment_N = mkN "erkenning" ; -- status=guess lin acme_N = mkN "hoogtepunt" neuter ; -- status=guess lin acne_N = mkN "acne " masculine ; -- status=guess lin aconite_N = mkN "monnikskap" ; -- status=guess diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 884d459a3..28ebafebe 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -538,8 +538,7 @@ lin ackee_N = variants {mkN "ackee"; mkN "akee"} ; lin acknowledge_V2 = mkV2 (mkV "acknowledge" "acknowledges" "acknowledged" "acknowledged" "acknowledging"); lin acknowledge_VS = mkVS (mkV "acknowledge"); lin acknowledgeable_A = mkA "acknowledgeable" ; -lin acknowledgement_N = mkN "acknowledgement" "acknowledgements"; -lin acknowledgment_N = mkN "acknowledgment" ; +lin acknowledgement_N = variants {mkN "acknowledgement" "acknowledgements"; mkN "acknowledgment"} ; lin acme_N = mkN "acme" ; lin acne_N = mkN "acne" ; lin acned_A = mkA "acned" ; diff --git a/lib/src/translator/DictionaryEst.gf b/lib/src/translator/DictionaryEst.gf index a06e78d7e..a023ed61d 100644 --- a/lib/src/translator/DictionaryEst.gf +++ b/lib/src/translator/DictionaryEst.gf @@ -301,8 +301,7 @@ lin acinar_A = mkA "üks" ; lin acknowledge_V2 = D.kinnitama_V2 ; lin acknowledge_VS = mkVS "kinnitama" ; lin acknowledgeable_A = mkA "tunnustatav" ; -lin acknowledgement_N = D.kinnitus_N ; -lin acknowledgment_N = D.kinnitamine_N ; +lin acknowledgement_N = variants {D.kinnitus_N; D.kinnitamine_N} ; lin acme_N = D.haripunkt_N ; lin acne_N = D.akne_N ; lin acned_A = mkA "vistrikuline" ; @@ -32417,4 +32416,4 @@ lin zygotene_N = mkN "sügoteen" ; lin zymase_N = mkN "kääritusaine" ; lin zymology_N = mkN "kääritusteooria" ; lin zymosis_N = mkN "fermentatsioon" ; -} \ No newline at end of file +} diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 5fb187dbc..b1137e803 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -539,7 +539,6 @@ lin acknowledge_V2 = mkWV2 (k54A "myöntää") ; --UNCHK lin acknowledge_VS = mkWVS (k54A "myöntää") ; lin acknowledgeable_A = mkWA (k10 "oleva") "tunnustettavissa" ; --UNCHK lin acknowledgement_N = mkWN (k5A "merkki") "tunnistamisen" ; --UNCHK -lin acknowledgment_N = mkWN (k5A "merkki") "tunnistamisen" ; --UNCHK lin acme_N = mkWN (k1A "huippu") ; --UNCHK lin acne_N = mkWN (k8 "akne") ; --UNCHK lin acned_A = mkWA (k38 "näppyläinen") ; --UNCHK diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index 8fa784b2f..cf359049e 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -344,8 +344,7 @@ lin acidulous_A = mkA "acidulé" ; -- tocheck lin ackee_N = mkN "aki" masculine | mkN "akée" ; -- UWN lin acknowledge_V2 = mkV2 (mkV I.reconnaître_V2) | mkV2 (mkV "certifier") ; -- tocheck lin acknowledge_VS = variants {} ; -- mkV2 (mkV I.reconnaître_V2) | mkV2 (mkV "certifier") ; -- tocheck -lin acknowledgement_N = mkN "reconnaissance" feminine | mkN "récompense" feminine | mkN "remerciement" masculine ; -- tocheck -lin acknowledgment_N = mkN "aveu" masculine ; -- tocheck +lin acknowledgement_N = mkN "reconnaissance" feminine | mkN "récompense" feminine | mkN "remerciement" masculine | mkN "aveu" masculine ; -- tocheck lin acne_N = mkN "acné" feminine ; -- tocheck lin acolyte_N = mkN "acolyte" ; -- tocheck lin aconite_N = mkN "aconit" masculine ; -- tocheck diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index 98924476e..804f8adc5 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -548,8 +548,7 @@ lin ackee_N = variants {} ; lin acknowledge_V2 = mkV2 (prefixV "an" (irregV "erkennen" "erkennt" "erkannte" "erkannte" "erkannt")) ; -- status=guess, src=wikt lin acknowledge_VS = mkVS (prefixV "an" (irregV "erkennen" "erkennt" "erkannte" "erkannte" "erkannt")) ; -- status=guess, src=wikt lin acknowledgeable_A = variants {} ; -lin acknowledgement_N = mkN "Anerkennung" ; -- status=guess -lin acknowledgment_N = mkN "Quittung" ; -- status=guess +lin acknowledgement_N = mkN "Anerkennung" | mkN "Quittung" ; -- status=guess lin acme_N = variants {} ; lin acne_N = mkN "Akne" "Aknen" feminine ; -- status=guess lin acned_A = variants {} ; diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index 138fcc778..5c36b3437 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -458,8 +458,7 @@ lin acidulous_A = mkA "अम्लीय" ; -- tocheck --subcat lin acknowledge_V = compoundV "प्राप्ति सूचना" (mkV "देना") ; -- tocheck lin acknowledge_V2 = mkV2 (compoundV "प्राप्ति सूचना" (mkV "देना")) ; -- tocheck lin acknowledge_VS = mkVS (compoundV "प्राप्ति सूचना" (mkV "देना")) ; -- tocheck -lin acknowledgement_N = mkN "अभिस्वीकृति" ; -- tocheck -lin acknowledgment_N = mkN "आभारोक्ति" ; -- tocheck +lin acknowledgement_N = variants {mkN "अभिस्वीकृति" ; mkN "आभारोक्ति"} ; -- tocheck lin acme_N = mkN "सर्वोच्च शिखर" ; -- tocheck lin acne_N = mkN "मुँहासा" ; -- tocheck lin acolyte_N = mkN "पादरी-सेवक" ; -- tocheck diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf index 6f019b3b4..e399bdecd 100644 --- a/lib/src/translator/DictionaryIta.gf +++ b/lib/src/translator/DictionaryIta.gf @@ -302,7 +302,6 @@ lin acidosis_N = mkN "acidosi" ; -- status=guess lin acknowledge_V2 = mkV2 (riconoscere_V) | mkV2 (ammettere_V) ; -- status=guess, src=wikt status=guess, src=wikt lin acknowledge_VS = mkVS (riconoscere_V) | mkVS (ammettere_V) ; -- status=guess, src=wikt status=guess, src=wikt lin acknowledgement_N = mkN "riconoscimento" ; -- status=guess -lin acknowledgment_N = mkN "riconoscimento" ; -- status=guess lin acne_N = mkN "acne" feminine ; -- status=guess lin acolyte_N = mkN "accolito" ; -- UWN lin aconite_N = mkN "aconito" ; -- status=guess diff --git a/lib/src/translator/DictionaryJpn.gf b/lib/src/translator/DictionaryJpn.gf index c35dbc4c7..28a1ca1fc 100644 --- a/lib/src/translator/DictionaryJpn.gf +++ b/lib/src/translator/DictionaryJpn.gf @@ -159,7 +159,7 @@ lin acidosis_N = mkN "アシドーシス" | mkN "酸血症" ; lin acinus_N = mkN "腺房" ; lin acknowledge_V2 = mkV2 "承認する" | mkV2 "認める" ; lin acknowledge_VS = mkVS "承認する" | mkVS "認める" ; -lin acknowledgment_N = mkN "承認" | mkN "承知" ; +lin acknowledgement_N = mkN "承認" | mkN "承知" ; lin acne_N = mkN "にきび" ; lin aconite_N = mkN "トリカブト" ; lin acorn_N = mkN "どんぐり" | mkN "団栗" ; diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index 0c557bdc5..8183fd835 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -357,7 +357,6 @@ lin acidosis_N = mkN "acidosis" feminine ; -- status=guess lin acknowledge_V2 = variants {} ; -- lin acknowledge_VS = variants {} ; -- lin acknowledgement_N = mkN "reconocimiento" ; -- status=guess -lin acknowledgment_N = mkN "reconocimiento" ; -- status=guess lin acme_N = mkN "colmo" | mkN "apogeo" | mkN "cúspide" feminine ; -- status=guess status=guess status=guess lin acne_N = mkN "acné" masculine ; -- status=guess lin acneiform_A = mkA "acneiforme" ; --UWN diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 2a86a47ff..fb70654c4 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -543,8 +543,7 @@ lin ackee_N = variants {} ; -- status=guess lin acknowledge_V2 = mkV2 (mkV "erkänna" "erkände" "erkänt") ; -- comment=5 lin acknowledge_VS = mkVS (mkV "erkänna" "erkände" "erkänt") ; -- comment=5 lin acknowledgeable_A = variants {} ; -- status=guess -lin acknowledgement_N = mkN "tacksägelse" "tacksägelser" ; -- comment=5 -lin acknowledgment_N = mkN "bekräftelse" "bekräftelser" ; +lin acknowledgement_N = mkN "tacksägelse" "tacksägelser" | mkN "bekräftelse" "bekräftelser" ; lin acme_N = mkN "kulm" ; -- status=guess lin acne_N = mkN "akne" utrum | mkN "acne" utrum ; -- SaldoWN -- comment=3 lin acned_A = variants {} ; -- status=guess diff --git a/lib/src/translator/DictionaryTha.gf b/lib/src/translator/DictionaryTha.gf index 1b70f91a2..c8ef6eaed 100644 --- a/lib/src/translator/DictionaryTha.gf +++ b/lib/src/translator/DictionaryTha.gf @@ -382,8 +382,7 @@ lin acidotic_A = mkA "ที่มีสภาวะกรด" ; -- src=panlex lin acidulous_A = mkA "ที่มีรสเหมือนกรด" | mkA "ที่เปรี้ยวเหมือนกรด" | mkA "ทารุณ" | mkA "รุนแรง" | mkA "ค่อนข้างเปรี้ยว" ; -- src=panlex lin acinus_N = mkN "กระเปาะ" | mkN "อะซินัส" ; -- src=panlex lin ackee_N = mkN "แอคกี" | mkN "ลูกแอคกี" | mkN "ต้นอะคี" ; -- src=panlex -lin acknowledgement_N = mkN "ใบตอบรับ" | mkN "การยอมรับ" | mkN "การรับรู้" | mkN "การแสดงว่าได้รับ" | mkN "การแสดงความขอบคุณ" | mkN "ข้อความแสดงว่าได้รับ" ; -- src=panlex -lin acknowledgment_N = mkN "เชิงอรรถ" | mkN "การอ้างอิง" | mkN "ใบตอบรับ" | mkN "การยอมรับ" | mkN "การรับรู้" | mkN "การแสดงว่าได้รับ" | mkN "การแสดงความขอบคุณ" | mkN "ข้อความแสดงว่าได้รับ" ; -- src=panlex +lin acknowledgement_N = mkN "ใบตอบรับ" | mkN "การยอมรับ" | mkN "การรับรู้" | mkN "การแสดงว่าได้รับ" | mkN "การแสดงความขอบคุณ" | mkN "ข้อความแสดงว่าได้รับ" | mkN "เชิงอรรถ" | mkN "การอ้างอิง" ; lin acme_N = mkN "จุดยอด" | mkN "จุดสูงสุด" | mkN "ระดับสูงสุด" | mkN "จุดสูงสุด" ; -- src=panlex lin acne_N = mkN "สิว" | mkN "สิว" ; -- src=panlex lin acneiform_A = mkA "ที่คล้ายสิว" ; -- src=panlex diff --git a/lib/src/translator/translate.probs b/lib/src/translator/translate.probs index d9fdd317f..1d3a1dcac 100644 --- a/lib/src/translator/translate.probs +++ b/lib/src/translator/translate.probs @@ -762,7 +762,6 @@ acknowledge_V2 2.092824830561682e-4 acknowledge_VS 2.8880032345636225e-3 acknowledgeable_A 1.0773191989054437e-5 acknowledgement_N 7.459430024951794e-6 -acknowledgment_N 3.729715012475897e-6 acme_N 3.729715012475897e-6 acne_N 1.4918860049903587e-5 acned_A 1.0773191989054437e-5