merge armorer_N with armourer_N

2016-05-20 21:08:27 +00:00
parent 547a963584
commit ef99a3cd12
13 changed files with 1 additions and 15 deletions
--- a/lib/src/translator/Dictionary.gf
+++ b/lib/src/translator/Dictionary.gf
@@ -3370,7 +3370,6 @@ 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 armorer_N : N ;
 fun armorial_A : A ;               -- 03045059	of or relating to heraldry or heraldic arms; "armorial bearing"
 fun armory_N : N ;
 fun armour_N : N ;
--- a/lib/src/translator/DictionaryBul.gf
+++ b/lib/src/translator/DictionaryBul.gf
@@ -2972,7 +2972,6 @@ lin appal_V2 = dirV2 (dualV (mkV186 "ужасявам") (mkV174 "ужася")) ;
 lin appalling_A = mkA076 "груб" ; ----
 lin appalling_N = variants {} ;
 lin appanage_N = variants {mkN007 "апаннаж"; mkN007 "апанаж"} ;
-
 lin apparatchik_N = mkN014a "апаратчик" ;
 lin apparatus_N = mkN007 "апарат" ;
 lin apparel_N = mkN054 "облекло" ; ----
@@ -3377,7 +3376,6 @@ lin armlike_A = variants {} ;
 lin armoire_N = mkN001 "шкаф" ;
 lin armor_N = mkN047 "броня" ;
 lin armored_A = mkA076 "брониран" ;
-lin armorer_N = mkN014a "оръжейник" ;
 lin armorial_A = mkA076 "гербов" ;
 lin armory_N = mkN041a "оръжейница" ;
 lin armour_N = variants {mkN001 "бром"; mkN041 "доспеха"} ; ----
--- a/lib/src/translator/DictionaryChi.gf
+++ b/lib/src/translator/DictionaryChi.gf
@@ -2540,7 +2540,6 @@ lin armistice_N = mkN "停戰協定" | mkN "停战协定" | {-mwn-} mkN "缓和"
 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 armorer_N = mkN "武器制造者" ; -- open-multilingual-wordnet
 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
--- a/lib/src/translator/DictionaryEng.gf
+++ b/lib/src/translator/DictionaryEng.gf
@@ -3387,13 +3387,12 @@ lin armlike_A = mkA "armlike" ;
 lin armoire_N = mkN "armoire" "armoires";
 lin armor_N = mkN "armor" ;
 lin armored_A = mkA "armored" ;
-lin armorer_N = mkN "armorer" ;
 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 = mkN "armourer" "armourers";
+lin armourer_N = variants {mkN "armourer" "armourers"; mkN "armorer"} ;
 lin armoury_N = mkN "armoury" "armouries";
 lin armpit_N = mkN "armpit" "armpits";
 lin armrest_N = mkN "armrest" ;
--- a/lib/src/translator/DictionaryEst.gf
+++ b/lib/src/translator/DictionaryEst.gf
@@ -1743,7 +1743,6 @@ 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 armorer_N = mkN "relvaülem" ;
 lin armory_N = mkN "kogurelvastus" ;
 lin armour_N = D.'raudrüü_N' ;
 lin armour_plate_N = mkN "soomusplaat" ;
--- a/lib/src/translator/DictionaryFin.gf
+++ b/lib/src/translator/DictionaryFin.gf
@@ -3211,7 +3211,6 @@ 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 armorer_N = mkWN (compoundN "ase" (k10 "valmistaja")) ; --UNCHK
 lin armorial_A = mkWA "vaakuna-" ; --UNCHK
 lin armory_N = mkWN (compoundN "ase" (k9 "paja")) ; --UNCHK
 lin armour_N = mkWN (k6 "panssari") ; --UNCHK
--- a/lib/src/translator/DictionaryGer.gf
+++ b/lib/src/translator/DictionaryGer.gf
@@ -3384,7 +3384,6 @@ lin armlike_A = variants {} ;
 lin armoire_N = variants {} ;
 lin armor_N = mkN "Panzerung" feminine ; -- status=guess
 lin armored_A = mkA "gepanzert" ; -- status=guess
-lin armorer_N = variants {} ;
 lin armorial_A = variants {} ;
 lin armory_N = variants {} ;
 lin armour_N = variants {} ;
--- a/lib/src/translator/DictionaryHin.gf
+++ b/lib/src/translator/DictionaryHin.gf
@@ -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 armorer_N = mkN "शस्त्रसाज़" ; -- tocheck       
 lin armory_N = mkN "शस्त्रागार" ; -- tocheck       
 lin armour_N = mkN "कवच" ; -- tocheck              
 lin armoured_A = mkA "बख्तरबंद" ; -- tocheck              
--- a/lib/src/translator/DictionaryIta.gf
+++ b/lib/src/translator/DictionaryIta.gf
@@ -1641,7 +1641,6 @@ 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 armorer_N = mkN "armaiolo" ; -- UWN
 lin armory_N = mkN "fabbrica_d'armi" ; -- UWN
 lin armourer_N = mkN "armaiolo" ; -- UWN
 lin armoury_N = mkN "armeria" ; -- status=guess
--- a/lib/src/translator/DictionarySpa.gf
+++ b/lib/src/translator/DictionarySpa.gf
@@ -1988,7 +1988,6 @@ lin armillary_A = mkA "armilar" ; --UWN
 lin armistice_N = mkN "armisticio" ; -- status=guess
 lin armor_N = mkN "coraza" ; -- status=guess
 lin armored_A = mkA "blindado" | mkA "acorazado" ; -- status=guess status=guess
-lin armorer_N = mkN "armero" | mkN "armerol" ; --UWN
 lin armourer_N = mkN "armero" | mkN "armerol" ; --UWN
 lin armoury_N = mkN "armería" ; -- status=guess
 lin armpit_N = mkN "axila" | mkN "sobaco" ; -- status=guess status=guess
--- a/lib/src/translator/DictionarySwe.gf
+++ b/lib/src/translator/DictionarySwe.gf
@@ -3377,7 +3377,6 @@ 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 armorer_N = 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
--- a/lib/src/translator/DictionaryTha.gf
+++ b/lib/src/translator/DictionaryTha.gf
@@ -2395,7 +2395,6 @@ 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 armorer_N = mkN "ช่างทำอาวุธ" | mkN "ทหารซ่อมบำรุงอาวุธยุทโธปกรณ์" | mkN "ผู้ผลิตอาวุธ" | mkN "ทหารฝ่ายสรรพาวุธ" | mkN "ผู้สร้างและซ่อมแซมอาวุธ" ; -- 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
--- a/lib/src/translator/translate.probs
+++ b/lib/src/translator/translate.probs
@@ -3579,7 +3579,6 @@ armlike_A	1.0773191989054437e-5
 armoire_N	3.729715012475897e-6
 armor_N	3.729715012475897e-6
 armored_A	1.0773191989054437e-5
-armorer_N	3.729715012475897e-6
 armorial_A	1.0773191989054437e-5
 armory_N	3.729715012475897e-6
 armour_N	3.729715012475897e-6