From 8e3dce6728166972262e4abbc57a7d1c0055a750 Mon Sep 17 00:00:00 2001 From: krasimir Date: Fri, 20 May 2016 20:33:19 +0000 Subject: [PATCH] merge ambiance_N with ambience_N --- lib/src/translator/Dictionary.gf | 1 - lib/src/translator/DictionaryBul.gf | 1 - lib/src/translator/DictionaryChi.gf | 3 +-- lib/src/translator/DictionaryEng.gf | 3 +-- lib/src/translator/DictionaryFin.gf | 1 - lib/src/translator/DictionaryFre.gf | 1 - lib/src/translator/DictionaryGer.gf | 3 +-- lib/src/translator/DictionaryHin.gf | 1 - lib/src/translator/DictionarySpa.gf | 1 - lib/src/translator/DictionarySwe.gf | 1 - lib/src/translator/DictionaryTha.gf | 1 - lib/src/translator/translate.probs | 1 - 12 files changed, 3 insertions(+), 15 deletions(-) diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index f4a39d9cd..45b749b41 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -1896,7 +1896,6 @@ fun amber_A : A ; -- 00369504 of a medium to dark brownish yell fun amber_N : N ; fun ambergris_N : N ; -- 14700985 waxy substance secreted by the sperm whale and found floating at sea or washed ashore; used in perfume fun amberjack_N : N ; -- 02578771 any of several amber to coppery fork-tailed warm-water carangid fishes -fun ambiance_N : N ; fun ambidexterity_N : N ; -- 05067199 the property of being equally skillful with each hand fun ambidextrous_A : A ; fun ambience_N : N ; diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 45b925702..f277f4f58 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -1903,7 +1903,6 @@ lin amber_A = mkA079 "кехлибарен" ; lin amber_N = mkN007 "кехлибар" ; lin ambergris_N = mkN041 "амбра" ; lin amberjack_N = variants {} ; -lin ambiance_N = mkN041 "атмосфера" ; lin ambidexterity_N = variants {} ; lin ambidextrous_A = mkA079 "двуличен" ; lin ambience_N = mkN041 "атмосфера" ; diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index ff9318244..924178c61 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -1411,9 +1411,8 @@ lin amber_A = mkA "棕黄色" | mkA "琥珀色" | mkA "褐黄色" | mkA "黄褐 lin amber_N = mkN "琥珀色" | mkN "淡黃色" ; -- status=guess -- status=guess lin ambergris_N = mkN "龍涎香" | mkN "龙涎香" ; -- status=guess -- status=guess -- open-multilingual-wordnet lin amberjack_N = mkN "大頭魚" | mkN "大头鱼" | {-mwn-} mkN "鰤" ; -- status=guess -- status=guess -- open-multilingual-wordnet -lin ambiance_N = mkN "氣氛" | mkN "气氛" | {-mwn-} mkN "格调" | mkN "环境" ; -- status=guess -- status=guess -- open-multilingual-wordnet lin ambidextrous_A = mkA "雙手靈巧" | {-mwn-} mkA "双手灵巧" ; -- status=guess -- open-multilingual-wordnet -lin ambience_N = mkN "格调" | mkN "气氛" | mkN "环境" ; -- open-multilingual-wordnet +lin ambience_N = mkN "格调" | mkN "环境" | mkN "氣氛" ; -- open-multilingual-wordnet lin ambient_A = mkA "环境" | {-mwn-} mkA "四周" | mkA "环抱" ; -- open-multilingual-wordnet lin ambiguity_N = mkN "双关" ; lin ambiguous_A = mkA "模糊不清" | {-HSK-} mkA "暧昧" ; diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 28ebafebe..88a9ff047 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -1908,10 +1908,9 @@ lin amber_A = mkA "amber" ; lin amber_N = mkN "amber" ; lin ambergris_N = mkN "ambergris" ; lin amberjack_N = mkN "amberjack" ; -lin ambiance_N = mkN "ambiance" ; lin ambidexterity_N = mkN "ambidexterity" ; lin ambidextrous_A = compoundA (mkA "ambidextrous"); -lin ambience_N = mkN "ambience"; +lin ambience_N = variants {mkN "ambience"; mkN "ambiance"} ; lin ambient_A = compoundA (mkA "ambient"); lin ambiguity_N = mkN "ambiguity" "ambiguities"; lin ambiguous_A = compoundA (mkA "ambiguous"); diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index b1137e803..8abefe370 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -1813,7 +1813,6 @@ lin amber_A = mkWA (compoundA "ruskean" (k38 "keltainen")) ; --UNCHK lin amber_N = mkWN (k38 "keltainen") ; --UNCHK lin ambergris_N = mkWN (k9 "ambra") "harmaa" ; --UNCHK lin amberjack_N = mkWN "amberfish" ; --UNCHK -lin ambiance_N = mkWN (k1 "ympäristö") ; --UNCHK lin ambidexterity_N = mkWN (compoundN "molempi" (k40 "kätisyys")) ; --UNCHK lin ambidextrous_A = mkWA "molempikätinen" ; --UNCHK lin ambience_N = mkWN (k1 "ympäristö") ; --UNCHK diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index cf359049e..689c472c5 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -1093,7 +1093,6 @@ lin amber_A = mkA "ambré" ; -- tocheck lin amber_N = mkN "ambre" masculine ; -- tocheck lin ambergris_N = mkN "ambre" | mkN "ambre_gris" ; -- UWN lin amberjack_N = mkN "seriola" | mkN "sériole" ; -- UWN -lin ambiance_N = mkN "environnement" | mkN "milieu" ; -- UWN lin ambidexterity_N = mkN "ambidextrie" feminine ; -- tocheck lin ambidextrous_A = mkA "ambidextre" ; -- tocheck lin ambience_N = mkN "environnement" | mkN "milieu" ; -- UWN diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index 804f8adc5..0b0dbb2a5 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -1910,10 +1910,9 @@ lin amber_A = variants {} ; lin amber_N = mkN "Bernsteingelb" neuter ; -- status=guess lin ambergris_N = mkN "Ambra" "Ambras" feminine | mkN "Amber" masculine ; -- status=guess status=guess lin amberjack_N = mkN "Gelbschwanzmakrele" feminine ; -- status=guess -lin ambiance_N = mkN "Ambiente" neuter ; -- status=guess lin ambidexterity_N = variants {} ; lin ambidextrous_A = variants {} ; -lin ambience_N = variants {} ; +lin ambience_N = mkN "Ambiente" neuter ; -- status=guess lin ambient_A = variants {} ; lin ambiguity_N = mkN "Ambiguität" feminine | mkN "Mehrdeutigkeit" "Mehrdeutigkeiten" feminine | mkN "Doppeldeutigkeit" feminine ; -- status=guess status=guess status=guess lin ambiguous_A = regA "mehrdeutig" | mkA "doppeldeutig" ; -- status=guess status=guess diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index 5c36b3437..efaa1ac0f 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -1098,7 +1098,6 @@ lin amazon_N = mkN "रणचंडी" ; -- tocheck lin ambassador_N = mkN "राजदूत" ; -- tocheck lin ambassadorial_A = mkA "राजदूत संबंधी" ; -- tocheck lin amber_N = mkN "तृणमणि रंग" ; -- tocheck -lin ambiance_N = mkN "माहौल" ; -- tocheck lin ambidextrous_A = mkA "सव्यसाची" ; -- tocheck lin ambience_N = mkN "माहौल" ; -- tocheck lin ambient_A = mkA "परिवेशी" ; -- tocheck diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index 8183fd835..7b3a6b14d 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -1171,7 +1171,6 @@ lin ambassadorship_N = mkN "embajada" ; --UWN lin amber_A = mkA "ambarino" | mkA "de color ámbar" ; -- status=guess status=guess lin amber_N = mkN "ámbar" masculine ; -- status=guess lin ambergris_N = mkN "ámbar gris" ; -- status=guess -lin ambiance_N = mkN "ambiente" | mkN "atmósfera" ; -- status=guess status=guess lin ambidexterity_N = mkN "ambidiestro" ; --UWN lin ambidextrous_A = mkA "ambidextro" ; -- status=guess lin ambience_N = mkN "ambiente" | mkN "atmósfera" ; --UWN diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index fb70654c4..fa2b583d4 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -1898,7 +1898,6 @@ lin amber_A = mkA "bärnstensgul" ; lin amber_N = mkN "bärnsten" ; lin ambergris_N = mkN "ambra" ; -- status=guess lin amberjack_N = mkN "seriola" ; -- src=google -lin ambiance_N = mkN "atmosfär" | mkN "stämning" | mkN "känsla" ; -- status=guess status=guess status=guess lin ambidexterity_N = variants {} ; -- status=guess lin ambidextrous_A = mkA "ambidexter" ; -- comment=4 lin ambience_N = mkN "atmosfär" "atmosfärer" ; diff --git a/lib/src/translator/DictionaryTha.gf b/lib/src/translator/DictionaryTha.gf index c8ef6eaed..12acbfd32 100644 --- a/lib/src/translator/DictionaryTha.gf +++ b/lib/src/translator/DictionaryTha.gf @@ -1342,7 +1342,6 @@ lin amber_A = mkA "น้ำตาลอมเหลือง" | mkA "อํา lin amber_N = mkN "ทอง" | mkN "สีทอง" | mkN "อำพัน" | mkN "สีเหลืองทอง" | mkN "อําพัน" | mkN "สีอําพัน" | mkN "สีเหลืองอําพัน" | mkN "สีน้ําตาลเหลือง" ; -- src=panlex lin ambergris_N = mkN "ขี้ปลาวาฬ" | mkN "ไขจากลําไส้ปลาวาฬนํามาใช้ทําเครื่องสําอาง" ; -- src=panlex lin amberjack_N = mkN "ปลาแอมเบอร์แจ็ก" ; -- src=panlex -lin ambiance_N = mkN "บรรยากาศ" | mkN "สภาพแวดล้อม" | mkN "สภาพแวดล้อม" ; -- src=panlex lin ambidexterity_N = mkN "ความหลอกลวง" | mkN "ความชํานาญมาก" | mkN "ความคล่องแคล่ว" | mkN "ความถนัดทั้งสองมือ" | mkN "ความฉลาดอย่างผิดปกติ" | mkN "ความชํานาญในการใช้มือทั้งของข้างได้ดีเท่ากัน" ; -- src=panlex lin ambidextrous_A = mkA "ถนัดทั้งซ้ายและขวา" | mkA "ชํานาญมาก" | mkA "ตีสองหน้า" | mkA "คล่องแคล่ว" | mkA "ซึ่งถนัดทั้งสองมือ" | mkA "ซึ่งมีทักษะหลายด้าน" | mkA "ใช้มือได้ดีทั้งสองข้าง" ; -- src=panlex lin ambience_N = mkN "บรรยากาศ" | mkN "สภาพแวดล้อม" | mkN "สภาพแวดล้อม" ; -- src=panlex diff --git a/lib/src/translator/translate.probs b/lib/src/translator/translate.probs index 1d3a1dcac..0e87b959f 100644 --- a/lib/src/translator/translate.probs +++ b/lib/src/translator/translate.probs @@ -2106,7 +2106,6 @@ amber_A 1.0773191989054437e-5 amber_N 3.729715012475897e-6 ambergris_N 3.729715012475897e-6 amberjack_N 3.729715012475897e-6 -ambiance_N 3.729715012475897e-6 ambidexterity_N 3.729715012475897e-6 ambidextrous_A 1.0773191989054437e-5 ambience_N 3.729715012475897e-6