GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-09 04:59:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix the confusion between canon_N and cannon_N

Browse Source
This commit is contained in:
krasimir
2015-07-01 16:56:25 +00:00
parent 612e324470
commit dc38eec14b
16 changed files with 41 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/src/translator/Dictionary.gf
View File

@@ -8822,7 +8822,8 @@ fun cannibalistic_A : A ;
fun cannibalize_V2 : V2 ;
fun cannikin_N : N ;
fun cannock_PN : PN ;
fun cannon_N : N ;
fun cannon_1_N : N ;
fun cannon_2_N : N ;
fun cannon_fodder_N : N ;
fun cannonade_N : N ;
fun cannonball_N : N ;
@@ -8832,8 +8833,7 @@ fun canny_A : A ;
fun canoe_N : N ;
fun canoe_V2 : V2 ;
fun canoeist_N : N ;
fun canon_1_N : N ;
fun canon_2_N : N ;
fun canon_N : N ;
fun canonic_A : A ;
fun canonical_A : A ;
fun canonist_A : A ;

6
lib/src/translator/DictionaryBul.gf
View File

@@ -8825,7 +8825,8 @@ lin cannibalistic_A = mkA078 "канибалски" ;
lin cannibalize_V2 = variants {} ;
lin cannikin_N = variants {} ;
lin cannock_PN = mkPN "Канък" Masc ;
lin cannon_N = mkN007 "карамбол" ; ----
lin cannon_1_N = mkN001 "топ";
lin cannon_2_N = mkN007 "карамбол";
lin cannon_fodder_N = variants {} ;
lin cannonade_N = mkN041 "канонада" ; ----
lin cannonball_N = mkN008 "изстрел" ;
@@ -8835,8 +8836,7 @@ lin canny_A = mkA078 "сметкаджийски" ; ----
lin canoe_N = mkN065 "кану" ;
lin canoe_V2 = variants {} ;
lin canoeist_N = mkN007a "кануист" ;
lin canon_1_N = mkN001 "топ" ;
lin canon_2_N = mkN007 "канон" ;
lin canon_N = mkN007 "канон";
lin canonic_A = mkA079 "каноничен" ;
lin canonical_A = mkA078 "канонически" ; ----
lin canonist_A = mkA078 "канонистски" ;

6
lib/src/translator/DictionaryCat.gf
View File

@@ -2478,11 +2478,11 @@ lin canine_A = mkA "caní" ; --auto
lin canister_N = mkN "granada" feminine ; --auto
lin cannibal_N = mkN "caníbal" ; --auto
lin cannibalism_N = mkN "canibalisme" masculine ; --auto
lin cannon_N = mkN "canó" masculine ; --auto
lin cannon_1_N = mkN "canó" masculine ;
lin cannon_2_N = mkN "carambola" ;
lin cannula_N = mkN "cànula" feminine ; --auto
lin canoeist_N = mkN "piragüista" ; --auto
lin canon_1_N = variants {} ; ---- sense to be split
lin canon_2_N = variants {} ; ---- sense to be split
lin canon_N = variants {} ;
lin canonical_A = mkA "canònic" ; --auto
lin cantata_N = mkN "cantata" feminine ; --auto
lin canteen_N = mkN "menjador" masculine ; --auto

6
lib/src/translator/DictionaryChi.gf
View File

@@ -5760,14 +5760,14 @@ lin cannibalism_N = mkN "同類相食" | mkN "同类相食" | mkN "食人" | {-m
lin cannibalistic_A = mkA "吃人肉" | mkA "食人肉" ; -- open-multilingual-wordnet
lin cannikin_N = mkN "小罐" ; -- open-multilingual-wordnet
lin cannock_PN = foreignPN "Cannock" ; -- comment=src=geonames status=guess
lin cannon_N = mkN "大炮" ;
lin cannon_1_N = mkN "大炮" ;
lin cannon_2_N = mkN "大炮" ;
lin cannonade_N = mkN "砲擊" | mkN "炮击" ; -- status=guess -- status=guess
lin cannonball_N = mkN "炮彈" | mkN "炮弹" ; -- status=guess -- status=guess -- open-multilingual-wordnet
lin cannula_N = mkN "套管" | mkN "插管" ; -- open-multilingual-wordnet
lin canny_A = mkA "精明" ;
lin canoe_N = mkN "獨木舟" | mkN "独木舟" ; -- status=guess -- status=guess -- open-multilingual-wordnet
lin canon_1_N = variants {} ; ---- sense to be split
lin canon_2_N = variants {} ; ---- sense to be split
lin canon_N = variants {} ;
lin canopy_N = mkN "盖" | {-mwn-} mkN "伞盖" | mkN "伞衣" ; -- open-multilingual-wordnet
lin cant_N = mkN "斜面" ;
lin cantab_PN = foreignPN "Cantab" ; -- comment=src=eng status=guess

5
lib/src/translator/DictionaryDut.gf
View File

@@ -3107,12 +3107,11 @@ lin cannes_PN = mkPN "Cannes" ; -- src=geonames status=guess
lin cannibal_N = mkN "kannibaal" ; -- status=guess
lin cannibalism_N = mkN "kannibalisme" neuter ; -- status=guess
lin cannock_PN = mkPN "Cannock" ; -- src=geonames status=guess
lin cannon_N = mkN "kanon" neuter ; -- status=guess
lin cannon_1_N = mkN "kanon" neuter ; -- status=guess
lin cannon_2_N = mkN "kanon" neuter ; -- status=guess
lin cannonball_N = mkN "kanonskogel" masculine | mkN "bommetje" neuter ; -- status=guess status=guess
lin canny_A = mkA "heel" ; -- status=guess
lin canoe_N = mkN "kano" masculine ; -- status=guess
lin canon_1_N = mkN "canon" masculine ; -- status=guess ---- sense to be split
lin canon_2_N = mkN "canon" masculine ; -- status=guess ---- sense to be split
lin canon_N = mkN "canon" masculine ; -- status=guess
lin cant_N = mkN "helling" feminine ; -- status=guess
lin cant_V = mkV "neigen" ; -- status=guess, src=wikt

6
lib/src/translator/DictionaryEng.gf
View File

@@ -8851,7 +8851,8 @@ lin cannibalistic_A = compoundA (mkA "cannibalistic");
lin cannibalize_V2 = mkV2 (mkV "cannibalize" "cannibalizes" "cannibalized" "cannibalized" "cannibalizing");
lin cannikin_N = mkN "cannikin" ;
lin cannock_PN = mkPN "Cannock";
lin cannon_N = mkN "cannon" "cannons";
lin cannon_1_N = mkN "cannon" "cannons";
lin cannon_2_N = mkN "cannon" "cannons";
lin cannon_fodder_N = mkN "cannon-fodder" ;
lin cannonade_N = mkN "cannonade" "cannonades";
lin cannonball_N = mkN "cannonball" ;
@@ -8861,8 +8862,7 @@ lin canny_A = mkA "canny" "cannier";
lin canoe_N = mkN "canoe" "canoes";
lin canoe_V2 = mkV2 (mkV "canoe" "canoes" "canoed" "canoed" "canoeing");
lin canoeist_N = mkN "canoeist" "canoeists";
lin canon_1_N = mkN "canon" "canons";
lin canon_2_N = mkN "cañon" "cañons";
lin canon_N = variants {mkN "canon" "canons"; mkN "cañon" "cañons"};
lin canonic_A = mkA "canonic" ;
lin canonical_A = compoundA (mkA "canonical");
lin canonist_A = mkA "canonist" ;

3
lib/src/translator/DictionaryEst.gf
View File

@@ -3206,7 +3206,8 @@ lin cannikin_N = mkN "konservitoos" | mkN "raand" | mkN "toop" ;
lin cannonade_N = mkN "kanonaad" | mkN "kogupauk" | mkN "pommitama" ;
lin cannonball_N = mkN "mürsuna tormama" | mkN "suurtükikuul" ;
lin fodder_N = mkN "loomasööt" | mkN "toitma" ;
lin cannon_N = mkN "kahur" | mkN "karambool" | mkN "pöid" | mkN "suurtükk" ;
lin cannon_1_N = mkN "kahur" | mkN "pöid" | mkN "suurtükk" ;
lin cannon_2_N = mkN "karambool" ;
lin cannula_N = mkN "kanüül" ;
lin canoeist_N = mkN "kanuusõitja" ;
lin canoe_N = mkN "kanuu" | mkN "kanuuga sõitma" | mkN "süst" ;

5
lib/src/translator/DictionaryFin.gf
View File

@@ -8157,7 +8157,8 @@ lin cannibalistic_A = mkWA "kannibalistinen" ; --UNCHK
lin cannibalize_V2 = mkWV2 (k53A "purkaa") "varaosiksi" ; --UNCHK
lin cannikin_N = mkWN (k5A "purkki") ; --UNCHK
lin cannock_PN = foreignPN "Cannock" ;
lin cannon_N = mkWN (k9 "kara") ; --UNCHK
lin cannon_1_N = mkWN (k9 "kanuuna") ; --UNCHK
lin cannon_2_N = mkWN (k9 "karamboli") ; --UNCHK
lin cannon_fodder_N = mkWN (compoundN "tykin" (k10A "ruoka")) ; --UNCHK
lin cannonade_N = mkWN (compoundN "tykistö" (k23 "tuli")) ; --UNCHK
lin cannonball_N = mkWN (k10 "kuula") ; --UNCHK
@@ -8167,8 +8168,6 @@ lin canny_A = mkWA (k10 "ovela") ; --UNCHK
lin canoe_N = mkWN (k5A "kanootti") ; --UNCHK
lin canoe_V2 = mkWV2 (k52 "meloa") ; --UNCHK
lin canoeist_N = mkWN (k10 "meloja") ; --UNCHK
lin canon_1_N = mkWN (k6 "kaanon") ; --UNCHK ---- sense to be split
lin canon_2_N = mkWN (k6 "kaanon") ; --UNCHK ---- sense to be split
lin canon_N = mkWN (k6 "kaanon") ; --UNCHK
lin canonic_A = mkWA (k38 "kanoninen") ; --UNCHK
lin canonical_A = mkWA (k38 "kanoninen") ; --UNCHK

5
lib/src/translator/DictionaryFre.gf
View File

@@ -4628,7 +4628,8 @@ lin cannibal_N = mkN "cannibale" ; -- tocheck
lin cannibalism_N = mkN "cannibalisme" masculine ; -- tocheck
lin cannibalistic_A = mkA "cannibale" ; -- tocheck
lin cannock_PN = mkPN "Cannock" ; -- status=guess src=geonames
lin cannon_N = mkN "canon" masculine ; -- tocheck
lin cannon_1_N = mkN "canon" masculine ; -- tocheck
lin cannon_2_N = mkN "canon" masculine ; -- tocheck
lin cannonade_N = mkN "canonnade" feminine ; -- tocheck
lin cannonball_N = mkN "boulet" | mkN "boulet_de_canon" ; -- UWN
lin cannula_N = mkN "cannula" | mkN "canule" ; -- UWN
@@ -4636,8 +4637,6 @@ lin cannulation_N = mkN "intubation" | mkN "intubation_trachéale" ; -- UWN
lin canny_A = mkA "prudent" ; -- tocheck
lin canoe_N = mkN "canoë" masculine ; -- tocheck
lin canoeist_N = mkN "canoéiste" ; -- tocheck
lin canon_1_N = mkN "canon" masculine | mkN "chanoine" masculine ; -- tocheck ---- sense to be split
lin canon_2_N = mkN "canon" masculine | mkN "chanoine" masculine ; -- tocheck ---- sense to be split
lin canon_N = mkN "canon" masculine | mkN "chanoine" masculine ; -- tocheck
lin canonization_N = mkN "canonisation" feminine ; -- tocheck
lin canopy_N = mkN "canopée" feminine | mkN "dais" masculine | mkN "marquise" feminine ; -- tocheck

6
lib/src/translator/DictionaryGer.gf
View File

@@ -8832,7 +8832,8 @@ lin cannibalistic_A = variants {} ;
lin cannibalize_V2 = variants {} ;
lin cannikin_N = variants {} ;
lin cannock_PN = mkPN "Cannock" ; -- src=geonames status=guess
lin cannon_N = mkN "Kanone" "Kanonen" feminine ; -- status=guess
lin cannon_1_N = mkN "Kanone" "Kanonen" feminine ; -- status=guess
lin cannon_2_N = mkN "Kanone" "Kanonen" feminine ; -- status=guess
lin cannon_fodder_N = variants {} ;
lin cannonade_N = mkN "Kanonade" feminine ; -- status=guess
lin cannonball_N = mkN "Kanonenkugel" "Kanonenkugeln" feminine ; -- status=guess
@@ -8842,8 +8843,7 @@ lin canny_A = variants {} ;
lin canoe_N = mkN "Kanu" "Kanus" neuter ; -- status=guess
lin canoe_V2 = mkV2 (regV "paddeln") ; -- status=guess, src=wikt
lin canoeist_N = mkN "Kanufahrer" "Kanufahrer" masculine | mkN "Kanute" masculine ; -- status=guess status=guess
lin canon_1_N = variants {} ;
lin canon_2_N = variants {} ;
lin canon_N = variants {} ;
lin canonic_A = variants {} ;
lin canonical_A = variants {} ;
lin canonist_A = variants {} ;

3
lib/src/translator/DictionaryHin.gf
View File

@@ -4086,7 +4086,8 @@ lin cankerous_A = mkA "व्रणीय" ; -- tocheck
lin cannabis_N = mkN "भाँग" ; -- tocheck
lin cannibal_N = mkN "स्वजातिभक्षक पशु" ; -- tocheck
lin cannibalism_N = mkN "स्वजातिभक्रण" ; -- tocheck
lin cannon_N = mkN "गोला" ; -- tocheck
lin cannon_1_N = mkN "गोला" ; -- tocheck
lin cannon_2_N = mkN "गोला" ; -- tocheck
lin canny_A = mkA "चतुर" ; -- tocheck
lin canoe_N = mkN "डोंगी" ; -- tocheck
lin canoe_V2 = mkV2 (compoundV "डोंगी से" (mkV "जाना")) ; -- tocheck

5
lib/src/translator/DictionaryIta.gf
View File

@@ -4126,15 +4126,14 @@ lin cannibal_N = mkN "cannibale" masculine | mkN "antropofago" ; -- status=guess
lin cannibalism_N = mkN "cannibalismo" ; -- status=guess
lin cannibalistic_A = mkA "cannibalesco" | mkA "cannibalistico" ; -- status=guess status=guess
lin cannock_PN = mkPN "Cannock" ; -- status=guess src=geonames
lin cannon_N = mkN "cannone" masculine ; -- status=guess
lin cannon_1_N = mkN "cannone" masculine ; -- status=guess
lin cannon_2_N = mkN "cannone" masculine ; -- status=guess
lin cannonade_N = mkN "cannoneggiamento" ; -- status=guess
lin cannonball_N = mkN "palla_di_cannone" ; -- UWN
lin cannula_N = mkN "cannula" ; -- UWN
lin canoe_N = mkN "canoa" ; -- status=guess
lin canoe_V2 = mkV2 (mkV (andare_V) "in canoa") ; -- status=guess, src=wikt
lin canoeist_N = mkN "canoista" masculine ; -- status=guess
lin canon_1_N = mkN "canone" masculine ; -- status=guess ---- sense to be split
lin canon_2_N = mkN "canone" masculine ; -- status=guess ---- sense to be split
lin canon_N = mkN "canone" masculine ; -- status=guess
lin canonist_N = mkN "canonista" masculine ; -- status=guess
lin canonize_V2 = mkV2 (mkV "santificare") | mkV2 (mkV "canonizzare") ; -- status=guess, src=wikt status=guess, src=wikt

6
lib/src/translator/DictionaryJpn.gf
View File

@@ -2202,12 +2202,12 @@ lin cane_N = mkN "杖" ;
lin canine_N = mkN "犬歯" ;
lin cannabis_N = mkN "大麻" | mkN "インド大麻" ;
lin cannibalism_N = mkN "カニバリズム" ;
lin cannon_N = mkN "大砲" | mkN "キャノン" | mkN "カノン砲" ;
lin cannon_1_N = mkN "大砲" | mkN "キャノン" | mkN "カノン砲" ;
lin cannon_2_N = mkN "大砲" | mkN "キャノン" | mkN "カノン砲" ;
lin cannonade_N = mkN "砲撃" ;
lin cannonball_N = mkN "砲弾" ;
lin canoe_N = mkN "カヌー" ;
lin canon_1_N = variants {} ; ---- sense to be split
lin canon_2_N = variants {} ; ---- sense to be split
lin canon_N = variants {} ; ---- sense to be split
lin canonize_V2 = mkV2 "列聖する" ;
lin cant_N = mkN "斜面" | mkN "傾斜" ;
lin cantaloupe_N = mkN "メロン" ;

6
lib/src/translator/DictionarySpa.gf
View File

@@ -4778,12 +4778,12 @@ lin cannes_PN = mkPN "Cannes" ; -- status=guess src=geonames
lin cannibalism_N = mkN "antropofagia" | mkN "canibalismo" ; -- status=guess status=guess
lin cannibalistic_A = mkA "caníbal" | mkA "antropófago" ; -- status=guess status=guess
lin cannock_PN = mkPN "Cannock" ; -- status=guess src=geonames
lin cannon_N = mkN "cañón" masculine ; -- status=guess
lin cannon_1_N = mkN "cañón" masculine ; -- status=guess
lin cannon_2_N = mkN "carambola" ; -- status=guess
lin canny_A = mkA "cauteloso" ; -- status=guess
lin canoe_N = mkN "canoa" ; -- status=guess
lin canoeist_N = mkN "canoísta" | mkN "remero" ; --UWN
lin canon_1_N = variants {} ; ---- sense to be split
lin canon_2_N = variants {} ; ---- sense to be split
lin canon_N = variants {} ;
lin canonist_N = mkN "canonista" ; --UWN
lin canopy_N = mkN "dosel" | mkN "palio" | mkN "toldo" ; -- status=guess status=guess status=guess
lin cant_N = mkN "argot" masculine | mkN "jerga" ; -- status=guess status=guess

5
lib/src/translator/DictionarySwe.gf
View File

@@ -8760,7 +8760,8 @@ lin cannibalistic_A = mkA "kannibalistisk" ; -- status=guess
lin cannibalize_V2 = dirV2 (partV (mkV "slaktar")"ut") ; -- status=guess
lin cannikin_N = variants {} ; -- status=guess
lin cannock_PN = mkPN "Cannock" neutrum ; -- src=geonames status=guess
lin cannon_N = mkN "kanon" "kanoner" ; -- comment=2
lin cannon_1_N = mkN "kanon" "kanoner" ; -- comment=2
lin cannon_2_N = mkN "kanon" "kanoner" ; -- comment=2
lin cannon_fodder_N = mkN "kanonmat" ;
lin cannonade_N = variants {} ; -- status=guess
lin cannonball_N = mkN "kanonkula" ;
@@ -8770,8 +8771,6 @@ lin canny_A = mkA "trevlig" ; -- comment=5
lin canoe_N = mkN "kanot" "kanoter" ; -- comment=2
lin canoe_V2 = variants {} ; -- status=guess
lin canoeist_N = variants {} ; -- status=guess
lin canon_1_N = mkN "kanon" "kanoner" ; -- comment=6
lin canon_2_N = variants {} ; -- status=guess
lin canon_N = mkN "kanon" "kanoner" ; -- comment=6
lin canonic_A = variants {} ; -- status=guess
lin canonical_A = variants {} ; -- status=guess

6
lib/src/translator/DictionaryTha.gf
View File

@@ -5987,7 +5987,8 @@ lin cannery_N = mkN "โรงงานอาหารกระป๋อง" | m
lin cannibal_N = mkN "มนุษย์กินคน" | mkN "มนุษย์กินคน" | mkN "คนกินเนื้อคน" | mkN "ผู้ที่กินเนื้อคนสดๆ" | mkN "สัตว์ที่กินสัตว์จําพวกเดียวกัน" ; -- src=panlex
lin cannibalism_N = mkN "การกินเนื้อพวกเดียวกัน" ; -- src=panlex
lin cannikin_N = mkN "ถังไม้" | mkN "กระป๋องเล็ก" ; -- src=panlex
lin cannon_N = mkN "แคนนอน" | mkN "ปืนใหญ่" | mkN "ปืนรถถัง" | mkN "ปืนแคนนอน" | mkN "ปืนบนรถถัง" | mkN "ปืนใหญ่" ; -- src=panlex
lin cannon_1_N = mkN "แคนนอน" | mkN "ปืนใหญ่" | mkN "ปืนรถถัง" | mkN "ปืนแคนนอน" | mkN "ปืนบนรถถัง" ; -- src=panlex
lin cannon_2_N = mkN "แคนนอน" | mkN "ปืนใหญ่" | mkN "ปืนรถถัง" | mkN "ปืนแคนนอน" | mkN "ปืนบนรถถัง" ; -- src=panlex
lin cannonade_N = mkN "การระดมยิงปืนใหญ่" | mkN "การยิงต่อเนื่องของปืนใหญ่" ; -- src=panlex
lin cannonball_N = mkN "กระสุนปืนใหญ่" | mkN "ลูกกระสุนเหล็กขนาดใหญ่" ; -- src=panlex
lin cannula_N = mkN "สายยาง" | mkN "ท่อกลวงสําหรับสอดเข้าไปในโพรงร่างกาย" ; -- src=panlex
@@ -5995,8 +5996,7 @@ lin cannulation_N = mkN "การสอดสายยาง" ; -- src=panlex
lin canny_A = mkA "ฉลาด" | mkA "สบาย" | mkA "น่ารัก" | mkA "สวยงาม" | mkA "ประหยัด" | mkA "อ่อนโยน" | mkA "มัธยัสถ์" | mkA "สงบเงียบ" | mkA "หลักแหลม" | mkA "คล่องแคล่ว" | mkA "ระมัดระวัง" | mkA "มีไหวพริบดี" | mkA "ฉลาดหลักแหลม" ; -- src=panlex
lin canoe_N = mkN "เรือแคนู" | mkN "แคนู" | mkN "เรือชนิดหนึ่งทรงเรียวแหลม" ; -- src=panlex
lin canoeist_N = mkN "คนพายเรือแคนู" ; -- src=panlex
lin canon_1_N = variants {} ; ---- sense to be split
lin canon_2_N = variants {} ; ---- sense to be split
lin canon_N = variants {} ; ---- sense to be split
lin canonic_A = mkA "แท้จริง" | mkA "เป็นที่ยอมรับ" | mkA "ซึ่งเป็นที่ยอมรับ" | mkA "เกี่ยวกับวินัยศาสนา" | mkA "ที่เกี่ยวกับหลักทางศาสนา" | mkA "เกี่ยวกับแบบที่ง่ายที่สุดหรือได้มาตรฐาน" ; -- src=panlex
lin canonical_A = mkA "แท้จริง" | mkA "เป็นที่ยอมรับ" | mkA "ซึ่งเป็นที่ยอมรับ" | mkA "เกี่ยวกับวินัยศาสนา" | mkA "ที่เกี่ยวกับหลักทางศาสนา" | mkA "เกี่ยวกับแบบที่ง่ายที่สุดหรือได้มาตรฐาน" ; -- src=panlex
lin canonist_N = mkN "นักกฎหมายของพระศาสนจักร" ; -- src=panlex