merge brassiere_1_N/brassiere_2_N and aborigine_N/aboriginal_N

This commit is contained in:
krasimir
2015-07-01 11:14:48 +00:00
parent 2c9c72c88d
commit 9fc5907628
18 changed files with 18 additions and 47 deletions

View File

@@ -389,7 +389,6 @@ abominator_N 3.729715012475897e-6
aborad_Adv 8.668966832532898e-6
aboral_A 1.0773191989054437e-5
aboriginal_A 1.0773191989054437e-5
aboriginal_N 3.729715012475897e-6
aborigine_N 3.729715012475897e-6
abort_N 3.729715012475897e-6
abort_V 4.5357645031069986e-5

View File

@@ -160,7 +160,6 @@ fun abominator_N : N ;
fun aborad_Adv : Adv ;
fun aboral_A : A ;
fun aboriginal_A : A ;
fun aboriginal_N : N ;
fun aborigine_N : N ;
fun abort_N : N ;
fun abort_V : V ;
@@ -7373,8 +7372,7 @@ fun brassavola_N : N ;
fun brassbound_A : A ;
fun brasserie_N : N ;
fun brassie_N : N ;
fun brassiere_1_N : N ;
fun brassiere_2_N : N ;
fun brassiere_N : N ;
fun brassy_A : A ;
fun brat_N : N ;
fun bratislava_PN : PN ;

View File

@@ -167,7 +167,6 @@ lin abominator_N = variants {} ;
lin aborad_Adv = variants {} ;
lin aboral_A = mkA079 "аборален" ;
lin aboriginal_A = mkA078 "аборигенски";
lin aboriginal_N = mkN007a "абориген";
lin aborigine_N = mkN007a "абориген";
lin abort_N = mkN007 "аборт" ;
lin abort_V = singleV (mkV186 "абортирам") ;
@@ -7377,8 +7376,7 @@ lin brassavola_N = variants {} ;
lin brassbound_A = variants {} ;
lin brasserie_N = mkN047 "бирария" ;
lin brassie_N = variants {} ;
lin brassiere_1_N = variants {} ;
lin brassiere_2_N = mkN007 "сутиен" ;
lin brassiere_N = mkN007 "сутиен" ;
lin brassy_A = mkA076 "евтин" ;
lin brat_N = variants {mkN066 "детище"; mkN073 "джереме"; mkN007 "келеш"; mkN014a "немирник"; mkN040 "пикльо"} ; ----
lin bratislava_PN = mkPN "Братислава" Fem ;

View File

@@ -2115,8 +2115,7 @@ lin branch_N = mkN "branca" feminine ;
lin brand_N = mkN "marca" feminine ; --auto
lin brandish_V2 = mkV2 "brandir" ; --auto
lin brass_N = mkN "llautó" masculine ; --auto
lin brassiere_1_N = variants {} ; ---- sense to be split
lin brassiere_2_N = variants {} ; ---- sense to be split
lin brassiere_N = variants {} ;
lin brat_N = mkN "marrec" masculine ; --auto
lin brave_A = mkA "valent" ; --auto
lin brave_V2 = mkV2 "afrontar" ; --auto

View File

@@ -4908,8 +4908,7 @@ lin brasilia_PN = foreignPN "Brasilia" ; -- comment=src=eng status=guess
lin brass_N = mkN "黄铜" [] ;
lin brassard_N = mkN "臂章" | mkN "臂铠" ; -- open-multilingual-wordnet
lin brasserie_N = mkN "啤酒店" ; -- open-multilingual-wordnet
lin brassiere_1_N = mkN "奶罩" ;
lin brassiere_2_N = variants {} ; ---- sense to be split
lin brassiere_N = mkN "奶罩" ;
lin brassy_A = mkA "似黄铜" ; -- open-multilingual-wordnet
lin brat_N = mkN "小子" ;
lin bratislava_PN = mkPN "布拉迪斯拉发" ; -- comment=src=geonames status=guess

View File

@@ -2531,8 +2531,7 @@ lin branderburgh_PN = mkPN "Branderburgh" ; -- src=eng status=guess
lin brandy_N = mkN "brandewijn" ; -- status=guess
lin brasilia_PN = mkPN "Brasilia" ; -- src=eng status=guess
lin brass_N = mkN "messing" neuter | mkN "geelkoper" neuter ; -- status=guess status=guess
lin brassiere_1_N = variants {} ; ---- sense to be split
lin brassiere_2_N = variants {} ; ---- sense to be split
lin brassiere_N = variants {} ;
lin brat_N = mkN "nest" neuter ; -- status=guess
lin bratislava_PN = mkPN "Bratislava" ; -- src=geonames status=guess
lin bratwurst_N = mkN "braadworst" ; -- status=guess

View File

@@ -163,8 +163,7 @@ lin abominator_N = mkN "abominator" ;
lin aborad_Adv = mkAdv "aborad" ;
lin aboral_A = mkA "aboral" ;
lin aboriginal_A = compoundA (mkA "aboriginal");
lin aboriginal_N = mkN "aboriginal" "aboriginals";
lin aborigine_N = mkN "aborigine" "aborigines";
lin aborigine_N = variants {mkN "aborigine" "aborigines"; mkN "aboriginal" "aboriginals"};
lin abort_N = mkN "abort" ;
lin abort_V = mkV "abort" "aborts" "aborted" "aborted" "aborting";
lin abort_V2 = mkV2 (mkV "abort" "aborts" "aborted" "aborted" "aborting");
@@ -7399,8 +7398,7 @@ lin brassavola_N = mkN "brassavola" ;
lin brassbound_A = mkA "brassbound" ;
lin brasserie_N = mkN "brasserie" "brasseries";
lin brassie_N = mkN "brassie" ;
lin brassiere_1_N = mkN "brassiere" "brassieres";
lin brassiere_2_N = mkN "brassière" "brassières";
lin brassiere_N = variants {mkN "brassiere" "brassieres"; mkN "brassière" "brassières"};
lin brassy_A = mkA "brassy" "brassier";
lin brat_N = mkN "brat" "brats";
lin bratislava_PN = mkPN "Bratislava";

View File

@@ -75,7 +75,6 @@ lin abolitionist_N = mkN "abolitsionist" ;
lin abolition_N = mkN "kaotamine" | mkN "tühistamine" | mkN "ümber lükkamine" ;
lin abomination_N = mkN "jälestus" ;
lin abominator_N = mkN "vihkaja" ;
lin aboriginal_N = mkN "algupärane" | mkN "pärismaine" ;
lin aborigine_N = mkN "aborigeen" | mkN "pärismaalane" ;
lin abortifacient_N = mkN "aborti esile kutsuv" ;
lin abortion_N = mkN "abort" | mkN "nurjumine" | mkN "raseduse katkestamine" ;

View File

@@ -184,7 +184,6 @@ lin abominator_N = mkWN (k10 "vihaaja") ; --UNCHK
lin aborad_Adv = mkWAdv "aboradisesti" ; --UNCHK
lin aboral_A = mkWA (compoundA "abora" (k38 "alinen")) ; --UNCHK
lin aboriginal_A = mkWA (k5 "aboriginaali") ; --UNCHK
lin aboriginal_N = mkWN (compoundN "alku" (k41A "asukas")) ; --UNCHK
lin aborigine_N = mkWN (compoundN "alku" (k41A "asukas")) ; --UNCHK
lin abort_N = mkWN (k39 "keskeytys") ; --UNCHK
lin abort_V = mkWV (k71 "tehdä") "abortti" ; --UNCHK
@@ -6833,8 +6832,7 @@ lin brassavola_N = mkWN "brassavola" ; --UNCHK
lin brassbound_A = mkWA (k38 "messinkinen") ; --UNCHK
lin brasserie_N = mkWN (k12 "kuppila") ; --UNCHK
lin brassie_N = mkWN "brassie" ; --UNCHK
lin brassiere_1_N = variants {} ; ---- sense to be split
lin brassiere_2_N = variants {} ; ---- sense to be split
lin brassiere_N = variants {} ;
lin brassy_A = mkWA (k38 "metallinen") ; --UNCHK
lin brat_N = mkWN (k5 "braatvursti") ; --UNCHK
lin bratislava_PN = foreignPN "Bratislava" ;

View File

@@ -122,7 +122,6 @@ lin abominable_A = mkA "abominable" ; -- tocheck
lin abominate_V2 = mkV2 (mkV "détester") ; -- tocheck
lin abomination_N = mkN "abomination" feminine ; -- tocheck
lin aboriginal_A = mkA "indigène" ; -- tocheck
lin aboriginal_N = mkN "autochtone" | mkN "natif" ; -- UWN
lin aborigine_N = mkN "aborigène" ; -- tocheck
lin abort_N = mkN "avorton" masculine ; -- tocheck
lin abort_V2 = mkV2 (mkV I.interrompre_V2) | mkV2 (mkV "avorter") ; -- tocheck
@@ -3886,8 +3885,7 @@ lin brashness_N = mkN "toupet" masculine ; -- tocheck
lin brass_N = mkN "laiton" masculine | mkN "cuivres" | mkN "galonnés" | mkN "douille" feminine ; -- tocheck
lin brassavola_N = mkN "brassavola" ; -- UWN
lin brasserie_N = mkN "brasserie" ; -- UWN
lin brassiere_1_N = variants {} ; ---- sense to be split
lin brassiere_2_N = variants {} ; ---- sense to be split
lin brassiere_N = variants {} ;
lin brat_N = mkN "peste" feminine ; -- tocheck
lin bratislava_PN = mkPN "Bratislava" ; -- status=guess src=geonames
lin braunschweig_PN = mkPN "Brunswick" ; -- status=guess src=geonames

View File

@@ -174,7 +174,6 @@ lin abominator_N = variants {} ;
lin aborad_Adv = variants {} ;
lin aboral_A = variants {} ;
lin aboriginal_A = mkA "eingeboren" | regA "einheimisch" ; -- status=guess status=guess
lin aboriginal_N = mkN "einheimisch" ; -- status=guess
lin aborigine_N = mkN "Aborigine" masculine | mkN "Urbewohner" masculine ; -- status=guess status=guess
lin abort_N = mkN "Abbruch" "Abbrüche" masculine ; -- status=guess
lin abort_V = prefixV "ab" (irregV "brechen" "brecht" "brach" "bräche" "gebrochen") ; -- status=guess, src=wikt
@@ -7384,8 +7383,7 @@ lin brassavola_N = variants {} ;
lin brassbound_A = variants {} ;
lin brasserie_N = variants {} ;
lin brassie_N = variants {} ;
lin brassiere_1_N = variants {} ;
lin brassiere_2_N = variants {} ;
lin brassiere_N = variants {} ;
lin brassy_A = variants {} ;
lin brat_N = mkN "Balg" "Bälge" masculine | mkN "Göre" feminine | mkN "Gör" neuter ; -- status=guess status=guess status=guess
lin bratislava_PN = mkPN "Preßburg" ; -- src=geonames status=guess

View File

@@ -140,7 +140,6 @@ lin abomination_N = mkN "जुगुप्साजनक कार्य" ; --
lin abominator_N = mkN "जुगुप्सक" ; -- tocheck
lin aboral_A = mkA "अपमुखी" ; -- tocheck
lin aboriginal_A = mkA "ऑस्ट्रेलियाई आदिवासियों का" ; -- tocheck
lin aboriginal_N = mkN "ऑस्ट्रेलियाई आदिवासी" ; -- tocheck
lin aborigine_N = mkN "ऑस्ट्रेलियाई आदिवासी" ; -- tocheck
lin abort_N = mkN "समापन" ; -- tocheck
lin abort_V = compoundV "गर्भ" (mkV "गिराना") ; -- tocheck

View File

@@ -102,7 +102,6 @@ lin abomasum_N = mkN "abomaso" ; -- UWN
lin abominable_A = mkA "abominabile" ; -- status=guess
lin abominate_V2 = mkV2 (mkV "abominare") ; -- status=guess, src=wikt
lin aboriginal_A = mkA "aborigeno" ; -- status=guess
lin aboriginal_N = mkN "aborigeno" | mkN "aborigeno_d'Australia" | mkN "autoctono" | mkN "autoctono" | mkN "indigeno" | mkN "indigeno" | mkN "nativo" ; -- UWN
lin aborigine_N = mkN "aborigeno" ; -- status=guess
lin abort_V = interrompere_V | mkV "fermare" ; -- status=guess, src=wikt status=guess, src=wikt
lin abort_V2 = mkV2 (interrompere_V) | mkV2 (mkV "fermare") ; -- status=guess, src=wikt status=guess, src=wikt
@@ -3430,8 +3429,7 @@ lin branchy_A = mkA "ramificato" | mkA "ramoluto" | mkA "ramoruto" | mkA "ramoso
lin brand_N = mkN "marca" ; -- UWN
lin brandy_N = mkN "acquavite" | mkN "brandy" ; -- UWN
lin brass_N = mkN "ottone" masculine ; -- status=guess
lin brassiere_1_N = variants {} ; ---- sense to be split
lin brassiere_2_N = variants {} ; ---- sense to be split
lin brassiere_N = variants {} ;
lin brat_N = mkN "monello" ; -- status=guess
lin bratislava_PN = mkPN "Bratislava" ; -- status=guess src=geonames
lin braunschweig_PN = mkPN "Braunschweig" ; -- status=guess src=geonames

View File

@@ -1879,8 +1879,7 @@ lin brand_N = mkN "ブランド" ;
lin brandish_V2 = mkV2 "振り回す" | mkV2 "閃かす" ;
lin brandy_N = mkN "ブランデー" | mkN "コニャック" ;
lin brass_N = mkN "黄銅" | mkN "真鍮" ;
lin brassiere_1_N = variants {} ; ---- sense to be split
lin brassiere_2_N = variants {} ; ---- sense to be split
lin brassiere_N = variants {} ;
lin brat_N = mkN "餓鬼" | mkN "ちび" ;
lin bratwurst_N = mkN "ブラートヴルスト" ;
lin brave_A = mkA "勇敢な" | mkA "勇気ある" | mkA "勇猛な" ;

View File

@@ -117,9 +117,8 @@ lin abominable_A = mkA "abominable" | mkA "aborrecible" ; -- status=guess status
lin abominate_V2 = mkV2 (mkV "abominar") | mkV2 (mkV "detestar") ; -- status=guess, src=wikt status=guess, src=wikt
lin abomination_N = mkN "abominación" | mkN "maldad" feminine ; -- status=guess status=guess
lin abominator_N = mkN "abominador" | mkN "aborrecedor" ; --UWN
lin aboriginal_A = mkA "aborigen" | mkA "indígena" ; -- status=guess status=guess
lin aboriginal_N = mkN "aborigen" ; --UWN
lin aborigine_N = mkN "aborigen" masculine | mkN "indígena" masculine ; -- status=guess status=guess
lin aboriginal_A = mkA "aborigen" ;
lin aborigine_N = mkN "aborigen" masculine ;
lin abort_N = mkN "aborto" ; -- status=guess
lin abort_V = mkV "abortar" ; -- status=guess, src=wikt
lin abort_V2 = mkV2 (mkV "abortar") ; -- status=guess, src=wikt
@@ -4039,8 +4038,7 @@ lin brant_N = mkN "barnacla" ; -- status=guess
lin brash_A = mkA "irreflexivo" | mkA "precipitado" ; -- status=guess status=guess
lin brass_N = mkN "latón" masculine ; -- status=guess
lin brasserie_N = mkN "brasserie" ; --UWN
lin brassiere_1_N = variants {} ; ---- sense to be split
lin brassiere_2_N = variants {} ; ---- sense to be split
lin brassiere_N = variants {} ;
lin brat_N = mkN "mimado chiflado" ; -- status=guess
lin bratislava_PN = mkPN "Bratislava" ; -- status=guess src=geonames
lin bratwurst_N = mkN "bratwurst" ; -- status=guess

View File

@@ -172,7 +172,6 @@ lin abominator_N = variants {} ; -- status=guess
lin aborad_Adv = variants {} ; -- status=guess
lin aboral_A = variants {} ; -- status=guess
lin aboriginal_A = variants {} ; -- status=guess
lin aboriginal_N = variants {} ; -- status=guess
lin aborigine_N = mkN "aborigin" "aboriginer" ; -- status=guess
lin abort_N = (mkN "abort" "aborter") | (mkN "missfall" neutrum) ; -- status=guess status=guess
lin abort_V = mkV "abortera" | mkV "avbryta" "avbröt" "avbrutit" ; -- status=guess
@@ -7330,9 +7329,7 @@ lin brassavola_N = variants {} ; -- status=guess
lin brassbound_A = variants {} ; -- status=guess
lin brasserie_N = mkN "restaurang" "restauranger" ; -- status=guess
lin brassie_N = variants {} ; -- status=guess
lin brassiere_1_N = mkN "behå" ; -- comment=2
lin brassiere_2_N = mkN "bysthållare" utrum ;
lin brassiere_N = mkN "behå" ; -- comment=2
lin brassiere_N = mkN "bysthållare" utrum ;
lin brassy_A = variants {} ; -- status=guess
lin brat_N = mkN "snorunge" utrum ; -- status=guess
lin bratislava_PN = mkPN "Bratislava" neutrum ; -- src=geonames status=guess

View File

@@ -111,8 +111,7 @@ lin abominable_A = mkA "น่าชัง" | mkA "น่ารําคาญ"
lin abomination_N = mkN "ความชิงชัง" | mkN "ความรังเกียจ" | mkN "ความเกลียดชัง" | mkN "การกระทำที่ชั่วร้าย" | mkN "บุคคลที่น่ารังเกียจ" | mkN "ความชัง" | mkN "ความชิงชัง" | mkN "สิ่งที่เลวทราม" | mkN "สิ่งที่น่าเกลียดชัง" ; -- src=panlex
lin aboral_A = mkA "ว่งตรงข้ามหรือไปจากปาก" ; -- src=panlex
lin aboriginal_A = mkA "พื้นเมือง" | mkA "ที่อยู่มาดั้งเดิม" | mkA "ที่อยู่มาตั้งแต่แรก" ; -- src=panlex
lin aboriginal_N = mkN "คนพื้นเมือง" | mkN "ชนพื้นเมือง" | mkN "ชนพื้นเมืองดั้งเดิม" ; -- src=panlex
lin aborigine_N = mkN "คนพื้นเมือง" | mkN "ชนพื้นเมือง" | mkN "ชนพื้นเมืองดั้งเดิม" | mkN "คนพื้นเมือง" | mkN "ชนพื้นเมือง" ; -- src=panlex
lin aborigine_N = mkN "คนพื้นเมือง" | mkN "ชนพื้นเมืองดั้งเดิม" ; -- src=panlex
lin abort_V = mkV "แท้ง" | mkV "ทำแท้ง" | mkV "ยกเลิก" | mkV "รีดลูก" | mkV "รีดเด็ก" | mkV "เอาเด็กออก" | mkV "แท้ง" | mkV "แท้งลูก" | mkV "แท้งบุตร" | mkV "ไม่เป็นผล" | mkV "ทําให้ล้มเหลว" ; -- src=panlex
lin abort_V2 = mkV2 "แท้ง" ; ---- | mkV "ทำแท้ง" | mkV "ยกเลิก" | mkV "รีดลูก" | mkV "รีดเด็ก" | mkV "เอาเด็กออก" | mkV "แท้ง" | mkV "แท้งลูก" | mkV "แท้งบุตร" | mkV "ไม่เป็นผล" | mkV "ทําให้ล้มเหลว" ; -- src=panlex
lin aborticide_N = mkN "ยาทำแท้ง" | mkN "ยาขับทารก" | mkN "ยาแท้งบุตร" | mkN "การทำลายทารกในครรภ์" | mkN "การทําแท้ง" | mkN "สารที่ทําให้เกิดการแท้ง" ; -- src=panlex
@@ -5013,8 +5012,7 @@ lin brash_A = mkA "เปราะ" | mkA "ทะลึ่ง" | mkA "ก๋า
lin brass_N = mkN "ความกล้า" | mkN "ทองเหลือง" | mkN "ผู้ก่อตั้ง" | mkN "แผ่นสลักภาพ" | mkN "เครื่องทองเหลือง" | mkN "เครื่องลมทองเหลือง" | mkN "เครื่องเป่าทองเหลือง" | mkN "ความกล้า" | mkN "ทองเหลือง" | mkN "ความทะลึ่ง" | mkN "ความใจกล้า" | mkN "ความหน้าด้าน" | mkN "กลุ่มคนใหญ่คนโต" | mkN "ผลิตภัณฑ์ทองเหลือง" | mkN "ข้าราชการชั้นผู้ใหญ่" | mkN "เครื่องเป่าทองเหลือง" | mkN "แผ่นทองเหลืองที่จารึกนามหน้าประตู" ; -- src=panlex
lin brassard_N = mkN "เกราะป้องกันแขน" ; -- src=panlex
lin brasserie_N = mkN "ยกทรง" ; -- src=panlex
lin brassiere_1_N = variants {} ; ---- sense to be split
lin brassiere_2_N = variants {} ; ---- sense to be split
lin brassiere_N = variants {} ;
lin brassy_A = mkA "ดังและแหบ" ; -- src=panlex
lin brat_N = mkN "เด็กเลว" | mkN "เด็กสารเลว" | mkN "ไส้กรอกอันเล็ก" | mkN "คนเลว" | mkN "เด็กสารเลว" | mkN "เด็กเหลือขอ" ; -- src=panlex
lin bratwurst_N = mkN "ไส้กรอกอันเล็ก" ; -- src=panlex

View File

@@ -391,7 +391,6 @@ abominator_N 3.729715012475897e-6
aborad_Adv 8.668966832532898e-6
aboral_A 1.0773191989054437e-5
aboriginal_A 1.0773191989054437e-5
aboriginal_N 3.729715012475897e-6
aborigine_N 3.729715012475897e-6
abort_N 3.729715012475897e-6
abort_V 4.5357645031069986e-5