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

merge armor_N/armory_N with armour_N/armoury_N

Browse Source
This commit is contained in:
krasimir
2016-05-20 21:16:22 +00:00
parent ef99a3cd12
commit 1f76dd0d3b
17 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3368,10 +3368,8 @@ fun armless_A : A ; -- 00146786 having no arms; "the armless Venu
fun armlet_N : N ; -- 02739427 a band worn around the arm for decoration
fun armlike_A : A ; -- 00146430 resembling an arm
fun armoire_N : N ; -- 02739550 a large wardrobe or cabinet; originally used for storing weapons
fun armor_N : N ;
fun armored_A : A ;
fun armorial_A : A ; -- 03045059 of or relating to heraldry or heraldic arms; "armorial bearing"
fun armory_N : N ;
fun armour_N : N ;
fun armour_plate_N : N ; -- 02740764 specially hardened steel plate used to protect fortifications or vehicles from enemy fire
fun armoured_A : A ;

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

@@ -3374,11 +3374,9 @@ lin armless_A = mkA076 "безрък" ; ----
lin armlet_N = mkN041 "гривна" ; ----
lin armlike_A = variants {} ;
lin armoire_N = mkN001 "шкаф" ;
lin armor_N = mkN047 "броня" ;
lin armored_A = mkA076 "брониран" ;
lin armorial_A = mkA076 "гербов" ;
lin armory_N = mkN041a "оръжейница" ;
lin armour_N = variants {mkN001 "бром"; mkN041 "доспеха"} ; ----
lin armour_N = variants {mkN047 "броня"; mkN041 "доспеха"} ;
lin armour_plate_N = mkN047 "броня" ;
lin armoured_A = variants {mkA078 "броневи"; mkA079 "броненосен"; mkA076 "брониран"} ; ----
lin armourer_N = mkN014a "оръжейник" ;

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

@@ -1100,8 +1100,8 @@ lin armchair_N = mkN "butaca" feminine ; --auto
lin armed_A = mkA "armat" ; --auto
lin armistice_N = mkN "armistici" masculine ; --auto
lin armored_A = mkA "blindat" ; --auto
lin armory_N = mkN "blasó" masculine ; --auto
lin armour_N = mkN "armadura" feminine ; --auto
lin armoury_N = mkN "blasó" masculine ; --auto
lin armpit_N = mkN "aixella" feminine ; --auto
lin army_N = mkN "exèrcit" masculine ;
lin arnica_N = mkN "àrnica" feminine ; --auto

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

@@ -2539,9 +2539,8 @@ lin armillary_A = mkA "手镯" ; -- open-multilingual-wordnet
lin armistice_N = mkN "停戰協定" | mkN "停战协定" | {-mwn-} mkN "缓和" ; -- status=guess -- status=guess -- open-multilingual-wordnet
lin armlet_N = mkN "臂环" | mkN "臂章" | mkN "袖章" ; -- open-multilingual-wordnet
lin armoire_N = mkN "大型衣橱" ; -- open-multilingual-wordnet
lin armor_N = mkN "鎧甲" | mkN "铠甲" ; -- status=guess -- status=guess
lin armour_N = mkN "鎧甲" | mkN "铠甲" ; -- status=guess -- status=guess
lin armorial_A = mkA "纹章学" | mkA "纹章盾徽" ; -- open-multilingual-wordnet
lin armory_N = mkN "兵工厂" | mkN "军械厂" | mkN "军械库" | mkN "军火库" ; -- open-multilingual-wordnet
lin armourer_N = mkN "武器制造者" ; -- open-multilingual-wordnet
lin armoury_N = mkN "兵工厂" | mkN "军械厂" | mkN "军械库" | mkN "军火库" ; -- open-multilingual-wordnet
lin armpit_N = mkN "腋窝" ;

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

@@ -1154,7 +1154,7 @@ lin armband_N = mkN "rouwbandje" neuter | mkN "protestbandje" neuter ; -- status
lin armchair_N = mkN "fauteuil" masculine ; -- status=guess
lin armed_A = mkA "gewapend" ; -- status=guess
lin armistice_N = mkN "wapenstilstand" masculine | mkN "staakt-het-vuren" neuter ; -- status=guess status=guess
lin armor_N = mkN "pantser" neuter | mkN "harnas" neuter ; -- status=guess status=guess
lin armour_N = mkN "pantser" neuter | mkN "harnas" neuter ; -- status=guess status=guess
lin armpit_N = mkN "oksel" masculine ; -- status=guess
lin armrest_N = mkN "armleuning" ; -- status=guess
lin army_N = mkN "leger" neuter | mkN "horde" | mkN "menigte" ;

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

@@ -3385,15 +3385,13 @@ lin armless_A = mkA "armless" ;
lin armlet_N = mkN "armlet" "armlets";
lin armlike_A = mkA "armlike" ;
lin armoire_N = mkN "armoire" "armoires";
lin armor_N = mkN "armor" ;
lin armored_A = mkA "armored" ;
lin armorial_A = compoundA (mkA "armorial");
lin armory_N = mkN "armory" ;
lin armour_N = mkN "armour" ;
lin armour_plate_N = variants {mkN "armour-plate" "armour-plates"; mkN "armour plate" "armour plates"};
lin armoured_A = compoundA (mkA "armoured");
lin armourer_N = variants {mkN "armourer" "armourers"; mkN "armorer"} ;
lin armoury_N = mkN "armoury" "armouries";
lin armoury_N = variants {mkN "armoury" "armouries"; mkN "armory"} ;
lin armpit_N = mkN "armpit" "armpits";
lin armrest_N = mkN "armrest" ;
lin arms_race_N = variants {mkN "arms-race"; mkN "arms race"};

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

@@ -1741,9 +1741,7 @@ lin armistice_N = D.relvarahu_N ;
lin armless_A = mkA "käetugedeta" ;
lin armlet_N = D.'käevõru_N' ;
lin armoire_N = mkN "relvapalat" ;
lin armor_N = D.'soomusrüü_N' ;
lin armored_A = D.relvastatud_A ;
lin armory_N = mkN "kogurelvastus" ;
lin armour_N = D.'raudrüü_N' ;
lin armour_plate_N = mkN "soomusplaat" ;
lin armourer_N = mkN "relvaülem" ;

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

@@ -3209,10 +3209,8 @@ lin armless_A = mkWA (k34A "kädetön") ; --UNCHK
lin armlet_N = mkWN (compoundN "käsivarsi" (k9 "nauha")) ; --UNCHK
lin armlike_A = mkWA (compoundA "käsivarsi" (k38 "mainen")) ; --UNCHK
lin armoire_N = mkWN "liinavaatekaappi" ; --UNCHK
lin armor_N = mkWN (k6 "panssari") ; --UNCHK
lin armored_A = mkWA (compoundA "panssaro" (k1A "itu")) ; --UNCHK
lin armorial_A = mkWA "vaakuna-" ; --UNCHK
lin armory_N = mkWN (compoundN "ase" (k9 "paja")) ; --UNCHK
lin armour_N = mkWN (k6 "panssari") ; --UNCHK
lin armour_plate_N = mkWN (k13 "haarniska") ; --UNCHK
lin armoured_A = mkWA (compoundA "panssaro" (k1A "itu")) ; --UNCHK

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

@@ -1875,8 +1875,7 @@ lin armful_N = mkN "brassée" feminine ; -- tocheck
lin arm_hole_N = mkN "emmanchure" feminine ; -- tocheck
lin armistice_N = mkN "armistice" masculine ; -- tocheck
lin armoire_N = mkN "armoire" ; -- UWN
lin armor_N = mkN "armure" feminine | mkN "cuirasse" feminine ; -- tocheck
lin armory_N = mkN "armurier" | mkN "arsenal" ; -- UWN
lin armour_N = mkN "armure" feminine | mkN "cuirasse" feminine ; -- tocheck
lin armoury_N = mkN "armoiries" | mkN "armurerie" feminine ; -- tocheck
lin armpit_N = mkN "aisselle" feminine ; -- tocheck
lin armrest_N = mkN "accoudoir" masculine ; -- tocheck

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

@@ -3382,11 +3382,9 @@ lin armless_A = mkA "armlos" ; -- status=guess
lin armlet_N = variants {} ;
lin armlike_A = variants {} ;
lin armoire_N = variants {} ;
lin armor_N = mkN "Panzerung" feminine ; -- status=guess
lin armored_A = mkA "gepanzert" ; -- status=guess
lin armorial_A = variants {} ;
lin armory_N = variants {} ;
lin armour_N = variants {} ;
lin armour_N = mkN "Panzerung" feminine ; -- status=guess
lin armour_plate_N = variants {} ;
lin armoured_A = variants {} ;
lin armourer_N = variants {} ;

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

@@ -1620,7 +1620,6 @@ lin arm_hole_N = mkN "बाँह" ; -- tocheck
lin armistice_N = mkN "युद्ध-विराम" ; -- tocheck
lin armlet_N = mkN "बाजूबंद" ; -- tocheck
lin armored_A = mkA "बख्तरबंद" ; -- tocheck
lin armory_N = mkN "शस्त्रागार" ; -- tocheck
lin armour_N = mkN "कवच" ; -- tocheck
lin armoured_A = mkA "बख्तरबंद" ; -- tocheck
lin armourer_N = mkN "शस्त्रसाज़" ; -- tocheck

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

@@ -1640,8 +1640,7 @@ lin arm_hole_N = mkN "giro manica" ; -- UWN
lin armillary_A = mkA "armillare" ; -- UWN
lin armistice_N = mkN "armistizio" ; -- status=guess
lin armlet_N = mkN "bracciale" ; -- UWN
lin armor_N = mkN "armatura" ; -- status=guess
lin armory_N = mkN "fabbrica_d'armi" ; -- UWN
lin armour_N = mkN "armatura" ; -- status=guess
lin armourer_N = mkN "armaiolo" ; -- UWN
lin armoury_N = mkN "armeria" ; -- status=guess
lin armpit_N = mkN "ascella" ; -- status=guess

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

@@ -892,7 +892,7 @@ lin armament_N = mkN "武装" | mkN "軍備" ;
lin armchair_N = mkN "アームチェア" | mkN "肘掛け椅子" ;
lin armed_A = variants {} ; --
lin armistice_N = mkN "停戦" | mkN "休戦" ;
lin armor_N = mkN "鎧" | mkN "装甲" ;
lin armour_N = mkN "鎧" | mkN "装甲" ;
lin armored_A = mkA "装甲の" ;
lin armpit_N = mkN "脇の下" | mkN "腋下" | mkN "腋窩" ;
lin armrest_N = mkN "肘掛け" ;

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

@@ -1986,7 +1986,7 @@ lin arm_hole_N = mkN "sisa" ; -- status=guess
lin armiger_N = mkN "armígero" ; -- status=guess
lin armillary_A = mkA "armilar" ; --UWN
lin armistice_N = mkN "armisticio" ; -- status=guess
lin armor_N = mkN "coraza" ; -- status=guess
lin armour_N = mkN "coraza" ; -- status=guess
lin armored_A = mkA "blindado" | mkA "acorazado" ; -- status=guess status=guess
lin armourer_N = mkN "armero" | mkN "armerol" ; --UWN
lin armoury_N = mkN "armería" ; -- status=guess

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

@@ -3375,10 +3375,8 @@ lin armless_A = variants {} ; -- status=guess
lin armlet_N = mkN "armbindel" ;
lin armlike_A = variants {} ; -- status=guess
lin armoire_N = variants {} ; -- status=guess
lin armor_N = mkN "rustning" ; -- status=guess
lin armored_A = variants {} ; -- status=guess
lin armorial_A = variants {} ; -- status=guess
lin armory_N = mkN "vapenförråd" ; -- src=google
lin armour_N = mkN "pansar" neutrum ; -- comment=3
lin armour_plate_N = mkN "pansarplåt" ;
lin armoured_A = variants {} ; -- status=guess

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

@@ -2393,9 +2393,7 @@ lin armless_A = mkA "ไม่มีแขน" | mkA "ซึ่งไร้แ
lin armlet_N = mkN "ปลอกแขน" | mkN "ปลอกแขน" | mkN "แขนเล็ก ๆ" | mkN "กําไลแขน" ; -- src=panlex
lin armlike_A = mkA "คล้ายแขน" ; -- src=panlex
lin armoire_N = mkN "ตู้อาร์มวาร์" | mkN "ตู้ใหญ่ที่มีประตูและหิ้ง" ; -- src=panlex
lin armor_N = mkN "เสื้อเกราะ" | mkN "เกราะป้องกัน" | mkN "หน่วยยานเกราะ" | mkN "หนัง" | mkN "อาวุธ" | mkN "เปลือก" | mkN "ชุดอาวุธ" | mkN "เสื้อเกราะ" | mkN "สิ่งป้องกัน" | mkN "สิ่งห่อหุ้ม" | mkN "เกราะป้องกัน" | mkN "กองทัพติดอาวุธ" | mkN "อวัยวะป้องกันภัยของสัตว์" ; -- src=panlex
lin armored_A = mkA "ซึ่งมีเปลือก" | mkA "ซึ่งหุ้มเกราะป้องกัน" ; -- src=panlex
lin armory_N = mkN "คลัง" | mkN "คลังแสง" | mkN "กรมช่างแสง" | mkN "คลังแสงสรรพาวุธ" | mkN "อาวุธยุทโธปกรณ์" | mkN "โรงงานผลิตอาวุธ" | mkN "คลังแสง" | mkN "ที่เก็บอาวุธ" | mkN "สถานที่สําหรับเก็บอาวุธ" ; -- src=panlex
lin armour_N = mkN "เสื้อเกราะ" | mkN "เกราะป้องกัน" | mkN "หน่วยยานเกราะ" | mkN "หนัง" | mkN "อาวุธ" | mkN "เกราะ" | mkN "เปลือก" | mkN "ชุดอาวุธ" | mkN "เสื้อเกราะ" | mkN "สิ่งป้องกัน" | mkN "สิ่งห่อหุ้ม" | mkN "เกราะป้องกัน" | mkN "กองทัพติดอาวุธ" | mkN "อวัยวะป้องกันภัยของสัตว์" ; -- src=panlex
lin armoured_A = mkA "ซึ่งมีเปลือก" | mkA "ซึ่งหุ้มเกราะป้องกัน" | mkA "ติดอาวุธ" | mkA "หุ้มเกราะ" ; -- src=panlex
lin armourer_N = mkN "ช่างทำอาวุธ" | mkN "ทหารซ่อมบำรุงอาวุธยุทโธปกรณ์" | mkN "ผู้ผลิตอาวุธ" | mkN "ทหารฝ่ายสรรพาวุธ" | mkN "ผู้สร้างและซ่อมแซมอาวุธ" ; -- src=panlex

2
lib/src/translator/translate.probs
View File

@@ -3577,10 +3577,8 @@ armless_A 1.0773191989054437e-5
armlet_N 3.729715012475897e-6
armlike_A 1.0773191989054437e-5
armoire_N 3.729715012475897e-6
armor_N 3.729715012475897e-6
armored_A 1.0773191989054437e-5
armorial_A 1.0773191989054437e-5
armory_N 3.729715012475897e-6
armour_N 3.729715012475897e-6
armour_plate_N 3.729715012475897e-6
armoured_A 1.0773191989054437e-5