From 8fbe2178f5fb8a718a4457dd2316bf95bb43c072 Mon Sep 17 00:00:00 2001 From: krasimir Date: Mon, 18 May 2015 11:31:46 +0000 Subject: [PATCH] split torch_N into three senses --- lib/src/translator/Dictionary.gf | 4 +++- lib/src/translator/DictionaryBul.gf | 4 +++- lib/src/translator/DictionaryCat.gf | 4 +++- lib/src/translator/DictionaryChi.gf | 4 +++- lib/src/translator/DictionaryDut.gf | 4 +++- lib/src/translator/DictionaryEng.gf | 4 +++- lib/src/translator/DictionaryEst.gf | 4 +++- lib/src/translator/DictionaryFin.gf | 4 +++- lib/src/translator/DictionaryFre.gf | 4 +++- lib/src/translator/DictionaryGer.gf | 4 +++- lib/src/translator/DictionaryHin.gf | 4 +++- lib/src/translator/DictionaryIta.gf | 4 +++- lib/src/translator/DictionaryJpn.gf | 4 +++- lib/src/translator/DictionarySpa.gf | 4 +++- lib/src/translator/DictionarySwe.gf | 6 ++++-- lib/src/translator/DictionaryTha.gf | 4 +++- lib/src/translator/translate.probs | 4 +++- 17 files changed, 52 insertions(+), 18 deletions(-) diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 2dbfd5b8d..b5e9f3d19 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -58859,7 +58859,9 @@ fun topsy_turvydom_N : N ; fun toque_N : N ; fun tor_N : N ; fun torbay_PN : PN ; -fun torch_N : N ; +fun torch_1_N : N ; -- | a light usually carried in the hand; consists of some flammable substance +fun torch_2_N : N ; -- | a small portable battery-powered electric lamp +fun torch_3_N : N ; -- | a burner that mixes air and gas to produce a very hot flame fun torch_V2 : V2 ; fun torch_race_N : N ; fun torch_singer_N : N ; diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 985e24c01..d5d1851b4 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -58904,7 +58904,9 @@ lin topsy_turvydom_N = mkN007 "хаос" ; lin toque_N = mkN065 "токче" ; lin tor_N = mkN072 "задание" ; lin torbay_PN = mkPN "Торби" Masc ; -lin torch_N = variants {mkN041 "горелка"; mkN008c "факел"; mkN065 "фенерче"} ; ---- +lin torch_1_N = variants {mkN008c "факел"; mkN041 "факла"}; +lin torch_2_N = mkN065 "фенерче"; +lin torch_3_N = mkN041 "горелка"; lin torch_V2 = variants {} ; lin torch_race_N = variants {} ; lin torch_singer_N = variants {} ; diff --git a/lib/src/translator/DictionaryCat.gf b/lib/src/translator/DictionaryCat.gf index 1a63adae2..4d8939dbf 100644 --- a/lib/src/translator/DictionaryCat.gf +++ b/lib/src/translator/DictionaryCat.gf @@ -16471,7 +16471,9 @@ lin topological_A = mkA "topològic" ; --auto lin topology_N = mkN "topologia" feminine ; --auto lin toponymy_N = mkN "toponímia" feminine ; --auto lin topping_N = mkN "escapça" feminine ; --auto -lin torch_N = mkN "llanterna" feminine ; --auto +lin torch_1_N = variants {} ; --auto +lin torch_2_N = mkN "llanterna" feminine ; --auto +lin torch_3_N = variants {} ; --auto lin torment_N = mkN "turment" masculine ; --auto lin tornado_N = mkN "tornado" masculine ; --auto lin toroid_N = mkN "toroide" feminine ; --auto diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index d6d6f717f..32b555b82 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -33247,7 +33247,9 @@ lin topple_V2 = mkV2 "倾覆" ; lin topsoil_N = mkN "上层土" | mkN "表土" ; -- open-multilingual-wordnet lin topsy_turvy_Adv = mkAdv "颠三倒四" ; lin torbay_PN = foreignPN "Torbay" ; -- comment=src=geonames status=guess -lin torch_N = mkN "火炬" ; +lin torch_1_N = mkN "火炬" ; +lin torch_2_N = mkN "火炬" ; +lin torch_3_N = mkN "火炬" ; lin torch_V2 = mkV2 "火炬" ; lin torino_PN = foreignPN "Torino" ; -- comment=src=eng status=guess lin torment_N = mkN "苦痛" ; -- status=guess diff --git a/lib/src/translator/DictionaryDut.gf b/lib/src/translator/DictionaryDut.gf index f047e2f99..cd6590e01 100644 --- a/lib/src/translator/DictionaryDut.gf +++ b/lib/src/translator/DictionaryDut.gf @@ -20693,7 +20693,9 @@ lin topos_N = mkN "topos " neuter ; -- status=guess lin topsail_N = mkN "bovenzeil" neuter ; -- status=guess lin toque_N = mkN "muts" ; -- status=guess lin torbay_PN = mkPN "Torbay" ; -- src=geonames status=guess -lin torch_N = mkN "zaklamp" ; -- status=guess +lin torch_1_N = mkN "zaklamp" ; -- status=guess +lin torch_2_N = mkN "zaklamp" ; -- status=guess +lin torch_3_N = mkN "zaklamp" ; -- status=guess lin torino_PN = mkPN "Torino" ; -- src=eng status=guess lin torment_N = mkN "kwelling" ; -- status=guess lin torment_V2 = mkV2 (mkV "kwellen") ; -- status=guess, src=wikt diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 6164cfc0b..b69e21386 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -59149,7 +59149,9 @@ lin topsy_turvydom_N = mkN "topsy-turvydom" "topsy-turvydoms"; lin toque_N = mkN "toque" "toques"; lin tor_N = mkN "tor" "tors"; lin torbay_PN = mkPN "Torbay"; -lin torch_N = mkN "torch" "torches"; +lin torch_1_N = mkN "torch" "torches"; +lin torch_2_N = mkN "torch" "torches"; +lin torch_3_N = mkN "torch" "torches"; lin torch_V2 = mkV2 (mkV "torch"); lin torch_race_N = mkN "torch-race" "torch-races"; lin torch_singer_N = mkN "torch-singer" "torch-singers"; diff --git a/lib/src/translator/DictionaryEst.gf b/lib/src/translator/DictionaryEst.gf index c3c907ac3..0be13d8e8 100644 --- a/lib/src/translator/DictionaryEst.gf +++ b/lib/src/translator/DictionaryEst.gf @@ -19825,7 +19825,9 @@ lin topside_N = mkN "veepealne osa" | mkN "ülaparras" ; lin topsoil_N = mkN "huumushorisont" | mkN "pinnas" ; lin torchbearer_N = mkN "tõrvikukandja" ; lin torchlight_N = mkN "taskulambivalgus" | mkN "tõrvikuvalgus" ; -lin torch_N = mkN "põletama" | mkN "põleti" | mkN "taskulamp" | mkN "tõrvik" ; +lin torch_1_N = mkN "põletama" | mkN "põleti" | mkN "taskulamp" | mkN "tõrvik" ; +lin torch_2_N = mkN "põletama" | mkN "põleti" | mkN "taskulamp" | mkN "tõrvik" ; +lin torch_3_N = mkN "põletama" | mkN "põleti" | mkN "taskulamp" | mkN "tõrvik" ; lin toreador_N = mkN "toreadoor" ; lin torment_N = mkN "piin" | mkN "piinamine" ; lin tormentor_N = mkN "piinaja" ; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 30027015c..d85812c77 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -53696,7 +53696,9 @@ lin topsy_turvy_Adv = mkAdv "sikin sokin" ; lin toque_N = mkWN (compoundN "pilleri" (k12 "rasia")) ; --UNCHK lin tor_N = mkWN (k3 "kallio") ; --UNCHK lin torbay_PN = foreignPN "Torbay" ; -lin torch_N = mkWN (compoundN "puhallus" (k1A "lamppu")) ; --UNCHK +lin torch_1_N = mkWN (compoundN "puhallus" (k1A "lamppu")) ; --UNCHK +lin torch_2_N = mkWN (compoundN "puhallus" (k1A "lamppu")) ; --UNCHK +lin torch_3_N = mkWN (compoundN "puhallus" (k1A "lamppu")) ; --UNCHK lin torch_V2 = mkWV2 (k53A "sytyttää") "tuleen" ; --UNCHK lin torch_race_N = mkWN (compoundN "soihdun" (k39 "kuljetus")) ; --UNCHK lin torch_singer_N = mkWN (k10 "laulaja") ; --UNCHK diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index 678e6767b..74f29a77f 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -30609,7 +30609,9 @@ lin topsail_N = mkN "hunier" masculine ; -- tocheck lin topspin_N = mkN "Topspin" | mkN "topspin" ; -- UWN lin toque_N = mkN "toque" feminine | mkN "tuque" feminine ; -- tocheck lin torbay_PN = mkPN "Torbay" ; -- status=guess src=geonames -lin torch_N = mkN "torche" feminine ; -- tocheck +lin torch_1_N = mkN "torche" feminine ; -- tocheck +lin torch_2_N = mkN "torche" feminine ; -- tocheck +lin torch_3_N = mkN "torche" feminine ; -- tocheck lin toreador_N = mkN "toréador" masculine ; -- tocheck lin torero_N = mkN "toréro" ; -- UWN lin torment_N = mkN "tourment" masculine ; -- tocheck diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index b1ebfdcfe..8481a7112 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -58855,7 +58855,9 @@ lin topsy_turvydom_N = variants {} ; lin toque_N = variants {} ; lin tor_N = variants {} ; lin torbay_PN = mkPN "Torbay" ; -- src=geonames status=guess -lin torch_N = mkN "Taschenlampe" "Taschenlampen" feminine ; -- status=guess +lin torch_1_N = mkN "Taschenlampe" "Taschenlampen" feminine ; -- status=guess +lin torch_2_N = mkN "Taschenlampe" "Taschenlampen" feminine ; -- status=guess +lin torch_3_N = mkN "Taschenlampe" "Taschenlampen" feminine ; -- status=guess lin torch_V2 = mkV2 (mkV "anzünden") ; -- status=guess, src=wikt lin torch_race_N = variants {} ; lin torch_singer_N = variants {} ; diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index 35b3dfe36..76dd7eff7 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -28974,7 +28974,9 @@ lin topple_V = compoundV "लुढ़क" (mkV "जाना") ; -- tocheck lin topple_V2 = mkV2 (compoundV "लुढ़क" (mkV "जाना")) ; -- tocheck lin topside_N = mkN "जहाज के पेटे का पानी से ऊपर रहने वाला हिस्सा" ; -- tocheck lin topsoil_N = mkN "ऊपरी मिट्टी" ; -- tocheck -lin torch_N = mkN "धमनदीप" ; -- tocheck +lin torch_1_N = mkN "धमनदीप" ; -- tocheck +lin torch_2_N = mkN "धमनदीप" ; -- tocheck +lin torch_3_N = mkN "धमनदीप" ; -- tocheck lin torch_V2 = mkV2 (compoundV "जला" (mkV "देना")) ; -- tocheck lin torch_race_N = mkN "मशाल-दौड़" ; -- tocheck lin torchbearer_N = mkN "मशालची" ; -- tocheck diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf index ddb3bb1e1..c960e35b8 100644 --- a/lib/src/translator/DictionaryIta.gf +++ b/lib/src/translator/DictionaryIta.gf @@ -27197,7 +27197,9 @@ lin topsail_N = mkN "gabbia" ; -- UWN lin topsy_turvy_Adv = mkAdv "rinfusa" ; -- UWN lin toque_N = mkN "turbante" ; -- UWN lin torbay_PN = mkPN "Torbay" ; -- status=guess src=geonames -lin torch_N = mkN "torcia" ; -- status=guess +lin torch_1_N = mkN "torcia" ; -- status=guess +lin torch_2_N = mkN "torcia" ; -- status=guess +lin torch_3_N = mkN "torcia" ; -- status=guess lin torch_V2 = mkV2 (mkV "incendiare") ; -- status=guess, src=wikt lin toreador_N = mkN "torero" ; -- status=guess lin torment_N = mkN "cruccio" | mkN "tormento" ; -- status=guess status=guess diff --git a/lib/src/translator/DictionaryJpn.gf b/lib/src/translator/DictionaryJpn.gf index 6650657f9..0316c9f7e 100644 --- a/lib/src/translator/DictionaryJpn.gf +++ b/lib/src/translator/DictionaryJpn.gf @@ -14763,7 +14763,9 @@ lin topic_N = mkN "話題" | mkN "テーマ" | mkN "トピック" | mkN "主題" lin topless_A = mkA "トップレス" ; lin topology_N = mkN "トポロジー" ; lin topos_N = mkN "トポス" ; -lin torch_N = mkN "懐中電燈" ; +lin torch_1_N = mkN "懐中電燈" ; +lin torch_2_N = mkN "懐中電燈" ; +lin torch_3_N = mkN "懐中電燈" ; lin torment_N = mkN "苦痛" ; lin tornado_N = mkN "竜巻" | mkN "トルネード" ; lin torpedo_N = mkN "魚雷" ; diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index 96455c25f..dcd7136be 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -29969,7 +29969,9 @@ lin topple_V = mkV "derribar" ; -- status=guess, src=wikt lin topple_V2 = mkV2 (mkV "derribar") ; -- status=guess, src=wikt lin topsail_N = mkN "gavia" ; -- status=guess lin torbay_PN = mkPN "Torbay" ; -- status=guess src=geonames -lin torch_N = mkN "lámpara" | mkN "linterna" ; -- status=guess +lin torch_1_N = mkN "lámpara"; -- status=guess +lin torch_2_N = mkN "linterna"; -- status=guess +lin torch_3_N = mkN "lámpara"; -- status=guess lin toreador_N = mkN "torero" ; -- status=guess lin torero_N = mkN "torero" ; --UWN lin torment_N = mkN "tormento" ; -- status=guess diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 170c6b229..8a4d966f6 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -21539,7 +21539,7 @@ lin flasher_N = mkN "blottare" utrum ; -- comment=3 lin flashgun_N = variants {} ; -- status=guess lin flashiness_N = variants {} ; -- status=guess lin flashing_N = mkN "blinkande" ; -lin flashlight_N = mkN "ficklampa" ; -- comment=3 +lin flashlight_N = mkN "ficklampa"; lin flashover_N = mkN "överslag" neutrum ; lin flashpoint_N = mkN "flampunkt" "flampunkter" ; -- comment=2 lin flashy_A = mkA "prålig" ; -- comment=3 @@ -58261,7 +58261,9 @@ lin topsy_turvydom_N = variants {} ; -- status=guess lin toque_N = mkN "toque" "toquer" ; lin tor_N = variants {} ; -- status=guess lin torbay_PN = mkPN "Torbay" neutrum ; -- src=geonames status=guess -lin torch_N = mkN "fackla" | mkN "bloss" neutrum ; -- SaldoWN -- comment=3 +lin torch_1_N = mkN "fackla"; +lin torch_2_N = mkN "ficklampa"; +lin torch_3_N = mkN "bloss" neutrum; lin torch_V2 = variants {} ; -- status=guess lin torch_race_N = mkN "fackla-race"; -- src=google lin torch_singer_N = mkN "fackla-sångare"; diff --git a/lib/src/translator/DictionaryTha.gf b/lib/src/translator/DictionaryTha.gf index 527428875..4464f505f 100644 --- a/lib/src/translator/DictionaryTha.gf +++ b/lib/src/translator/DictionaryTha.gf @@ -39117,7 +39117,9 @@ lin topsoil_N = mkN "หน้าดิน" | mkN "ด้านบนของ lin topspin_N = mkN "การหมุนไปข้างหน้า" ; -- src=panlex lin toque_N = mkN "หมวกเชฟ" | mkN "หมวกพ่อครัว" | mkN "หมวกทรงตั้งไร้ปีก" | mkN "หมวกผู้หญิงชนิดไม่มีขอบ" ; -- src=panlex lin tor_N = mkN "หินบนยอดเขา" | mkN "ยอดหินของภูเขา" ; -- src=panlex -lin torch_N = mkN "คบไฟ" | mkN "ไฟฉาย" | mkN "คบเพลิง" | mkN "เครื่องพ่นไฟ" | mkN "ตะเกียงเตาฟู่" | mkN "ต้นมัลเลนธรรมดา" | mkN "โคม" | mkN "ไต้" | mkN "คบไฟ" | mkN "ไฟฉาย" | mkN "คบเพลิง" | mkN "ตะเกียง" | mkN "สิ่งที่ทําให้เกิดเปลวไฟ" ; -- src=panlex +lin torch_1_N = mkN "คบไฟ" | mkN "คบเพลิง" ; -- src=wordnet +lin torch_2_N = mkN "ไฟฉาย" ; -- src=wordnet +lin torch_3_N = mkN "เครื่องพ่นไฟ" | mkN "ตะเกียงเตาฟู่" ; -- src=panlex lin torchbearer_N = mkN "ผู้นำการต่อสู้" | mkN "ผู้นำการรณรงค์" | mkN "ผู้นำการเคลื่อนไหว" | mkN "ผู้นํา" | mkN "ผู้ถือคบไฟ" | mkN "ผู้ถือไฟฉาย" | mkN "ผู้ถือคบเพลิง" | mkN "ผู้ให้ความสว่าง" ; -- src=panlex lin torchlight_N = mkN "แสงคบไฟ" | mkN "แสงคบเพลิง" ; -- src=panlex lin toreador_N = mkN "นักสู้วัว" | mkN "นักสู้วัวกระทิง" | mkN "คนสู้วัว" | mkN "มาทาดอร์" | mkN "นักสู้วัวในประเทศสเปน" ; -- src=panlex diff --git a/lib/src/translator/translate.probs b/lib/src/translator/translate.probs index 209941eb6..b015e68a4 100644 --- a/lib/src/translator/translate.probs +++ b/lib/src/translator/translate.probs @@ -58710,7 +58710,9 @@ topsy_turvydom_N 3.729715012475897e-6 toque_N 3.729715012475897e-6 tor_N 3.729715012475897e-6 torbay_PN 1.865462821325971e-5 -torch_N 7.459430024951794e-6 +torch_1_N 2.4864766749839314e-6 +torch_2_N 2.4864766749839314e-6 +torch_3_N 2.4864766749839314e-6 torch_V2 4.8295957628346505e-5 torch_race_N 3.729715012475897e-6 torch_singer_N 3.729715012475897e-6