~1700 new nouns in DictionaryBul. A few words in the English dictionary are merged.

This commit is contained in:
kr.angelov
2014-05-03 11:55:00 +00:00
parent bd3c31fcf6
commit 500a874fd2
10 changed files with 1809 additions and 1859 deletions

View File

@@ -31801,7 +31801,7 @@ lin
pi_ja__V = stateV (mkV163 "пия") ;
pi_ja_vica_N = mkN041 "пиявица" ;
pi_ja_n_A = mkA076 "пиян" ;
pi_ja_nica_N = mkN041 "пияница" ;
pi_ja_nica_N = mkN038 "пияница" ;
pi_ja_nski_A = mkA078 "пиянски" ;
pi_ja_nstvam_V = stateV (mkV186 "пиянствам") ;
pi_ja_nstvane_N = mkN071 "пиянстване" ;

View File

@@ -229,7 +229,6 @@ fun absent_A : A ;
fun absent_Prep : Prep ;
fun absent_V2 : V2 ;
fun absent_minded_A : A ;
fun absent_mindedness_N : N ;
fun absentee_N : N ;
fun absenteeism_N : N ;
fun absentmindedness_N : N ;
@@ -2128,7 +2127,6 @@ fun amphipod_N : N ;
fun amphiprostylar_A : A ;
fun amphisbaena_N : N ;
fun amphistylar_A : A ;
fun amphitheater_N : N ;
fun amphitheatre_N : N ;
fun amphitheatric_A : A ;
fun amphitropous_A : A ;
@@ -5593,8 +5591,6 @@ fun behave_V : V ;
fun behaved_A : A ;
fun behavior_N : N ;
fun behavioral_A : A ;
fun behaviorism_N : N ;
fun behaviorist_N : N ;
fun behavioristic_A : A ;
fun behaviour_N : N ;
fun behaviourism_N : N ;
@@ -9095,7 +9091,6 @@ fun carapace_N : N ;
fun carat_N : N ;
fun caravan_N : N ;
fun caravanning_N : N ;
fun caravansary_N : N ;
fun caravanserai_N : N ;
fun caraway_N : N ;
fun carbamate_N : N ;
@@ -13510,7 +13505,6 @@ fun counsel_N : N ;
fun counsel_V2 : V2 ;
fun counselling_N : N ;
fun counsellor_N : N ;
fun counselor_N : N ;
fun counselorship_N : N ;
fun count_N : N ;
fun count_V : V ;
@@ -18165,7 +18159,6 @@ fun due_to_Prep : Prep ;
fun duel_N : N ;
fun duel_V : V ;
fun dueler_N : N ;
fun duelist_N : N ;
fun duellist_N : N ;
fun duenna_N : N ;
fun duet_N : N ;
@@ -41224,7 +41217,6 @@ fun pantomime_N : N ;
fun pantropical_A : A ;
fun pantry_N : N ;
fun pantryman_N : N ;
fun panty_hose_N : N ;
fun pantyhose_N : N ;
fun panzer_A : A ;
fun panzer_N : N ;
@@ -42589,7 +42581,6 @@ fun petrifaction_N : N ;
fun petrify_V : V ;
fun petrify_V2 : V2 ;
fun petrissage_N : N ;
fun petro_chemical_N : N ;
fun petrochemical_N : N ;
fun petroglyph_N : N ;
fun petrol_N : N ;
@@ -42932,7 +42923,6 @@ fun piano_Adv : Adv ;
fun piano_N : N ;
fun pianoforte_N : N ;
fun pianola_N : N ;
fun piaster_N : N ;
fun piastre_N : N ;
fun piazza_N : N ;
fun pibroch_N : N ;

File diff suppressed because it is too large Load Diff

View File

@@ -232,10 +232,9 @@ lin absent_A = compoundA (mkA "absent");
lin absent_Prep = mkPrep "absent";
lin absent_V2 = mkV2 (mkV "absent" "absents" "absented" "absented" "absenting");
lin absent_minded_A = compoundA (mkA "absent-minded");
lin absent_mindedness_N = mkN "absent-mindedness" ;
lin absentee_N = mkN "absentee" "absentees";
lin absenteeism_N = mkN "absenteeism" ;
lin absentmindedness_N = mkN "absentmindedness" ;
lin absentmindedness_N = variants {mkN "absent-mindedness"; mkN "absentmindedness"};
lin absinth_N = mkN "absinth" ;
lin absinthe_N = mkN "absinthe" ;
lin absolute_A = compoundA (mkA "absolute");
@@ -2131,8 +2130,7 @@ lin amphipod_N = mkN "amphipod" ;
lin amphiprostylar_A = mkA "amphiprostylar" ;
lin amphisbaena_N = mkN "amphisbaena" ;
lin amphistylar_A = mkA "amphistylar" ;
lin amphitheater_N = mkN "amphitheater" ;
lin amphitheatre_N = mkN "amphitheatre" "amphitheatres";
lin amphitheatre_N = mkN (variants {"amphitheatre"; "amphitheater"});
lin amphitheatric_A = mkA "amphitheatric" ;
lin amphitropous_A = mkA "amphitropous" ;
lin amphiuma_N = mkN "amphiuma" ;
@@ -5595,12 +5593,10 @@ lin behave_V = mkV "behave" "behaves" "behaved" "behaved" "behaving";
lin behaved_A = compoundA (mkA "behaved");
lin behavior_N = mkN "behavior" ;
lin behavioral_A = mkA "behavioral" ;
lin behaviorism_N = mkN "behaviorism" ;
lin behaviorist_N = mkN "behaviorist" ;
lin behavioristic_A = mkA "behavioristic" ;
lin behaviour_N = mkN "behaviour" ;
lin behaviourism_N = mkN "behaviourism" ;
lin behaviourist_N = mkN "behaviourist" "behaviourists";
lin behaviourism_N = mkN (variants {"behaviourism"; "behaviorism"});
lin behaviourist_N = mkN (variants {"behaviourist"; "behaviorist"});
lin behead_V2 = mkV2 (mkV "behead" "beheads" "beheaded" "beheaded" "beheading");
lin behest_N = mkN "behest" "behests";
lin behind_Adv = mkAdv "behind";
@@ -9097,8 +9093,7 @@ lin carapace_N = mkN "carapace" "carapaces";
lin carat_N = mkN "carat" "carats";
lin caravan_N = mkN "caravan" "caravans";
lin caravanning_N = mkN "caravanning" ;
lin caravansary_N = mkN "caravansary" "caravansaries";
lin caravanserai_N = mkN "caravanserai" "caravanserais";
lin caravanserai_N = variants {mkN "caravanserai" "caravanserais"; mkN "caravansary" "caravansaries"};
lin caraway_N = mkN "caraway" "caraways";
lin carbamate_N = mkN "carbamate" ;
lin carbide_N = mkN "carbide" "carbides";
@@ -13511,8 +13506,7 @@ lin councilwoman_N = mkN feminine (mkN "councilwoman" "councilwomen");
lin counsel_N = mkN "counsel" ;
lin counsel_V2 = mkV2 (mkV "counsel" "counsels" "counselled" "counselled" "counselling");
lin counselling_N = mkN "counselling" ;
lin counsellor_N = mkN "counsellor" "counsellors";
lin counselor_N = mkN "counselor" ;
lin counsellor_N = mkN (variants {"counsellor"; "counselor"});
lin counselorship_N = mkN "counselorship" ;
lin count_N = mkN "count" "counts";
lin count_V = mkV "count" "counts" "counted" "counted" "counting";
@@ -18165,8 +18159,7 @@ lin due_to_Prep = mkPrep "due to";
lin duel_N = mkN "duel" "duels";
lin duel_V = mkV "duel" "duels" "duelled" "duelled" "duelling";
lin dueler_N = mkN "dueler" ;
lin duelist_N = mkN "duelist" "duelists";
lin duellist_N = mkN "duellist" "duellists";
lin duellist_N = variants {mkN "duellist" "duellists"; mkN "duelist" "duelists"};
lin duenna_N = mkN "duenna" "duennas";
lin duet_N = mkN "duet" "duets";
lin duff_N = mkN "duff" ;
@@ -41223,8 +41216,7 @@ lin pantomime_N = mkN "pantomime" "pantomimes";
lin pantropical_A = mkA "pantropical" ;
lin pantry_N = mkN "pantry" "pantries";
lin pantryman_N = mkN masculine (mkN "pantryman" "pantrymen");
lin panty_hose_N = mkN "panty-hose" ;
lin pantyhose_N = mkN "pantyhose" ;
lin pantyhose_N = mkN (variants {"panty-hose"; "pantyhose"});
lin panzer_A = compoundA (mkA "panzer");
lin panzer_N = mkN "panzer" ;
lin paotow_PN = mkPN "Paotow";
@@ -42588,8 +42580,7 @@ lin petrifaction_N = mkN "petrifaction" "petrifactions";
lin petrify_V = mkV "petrify" "petrifies" "petrified" "petrified" "petrifying";
lin petrify_V2 = mkV2 (mkV "petrify" "petrifies" "petrified" "petrified" "petrifying");
lin petrissage_N = mkN "petrissage" ;
lin petro_chemical_N = mkN "petro-chemical" "petro-chemicals";
lin petrochemical_N = mkN "petrochemical" ;
lin petrochemical_N = mkN (variants {"petrochemical"; "petro-chemical"}) ;
lin petroglyph_N = mkN "petroglyph" ;
lin petrol_N = mkN "petrol" ;
lin petrolatum_N = mkN "petrolatum" ;
@@ -42931,8 +42922,7 @@ lin piano_Adv = mkAdv "piano";
lin piano_N = mkN "piano" "pianos";
lin pianoforte_N = mkN "pianoforte" "pianofortes";
lin pianola_N = mkN "pianola" "pianolas";
lin piaster_N = mkN "piaster" ;
lin piastre_N = mkN "piastre" "piastres";
lin piastre_N = mkN (variants {"piastre"; "piaster"});
lin piazza_N = mkN "piazza" "piazzas";
lin pibroch_N = mkN "pibroch" "pibrochs";
lin pica_N = mkN "pica" "pica";

View File

@@ -1952,7 +1952,6 @@ lin amphipod_N = mkWN "amfipodi" ; --UNCHK
lin amphiprostylar_A = mkWA (compoundA "amfipros" (k38 "tyylinen")) ; --UNCHK
lin amphisbaena_N = mkWN "suku" "Amphisbaenia" ; --UNCHK
lin amphistylar_A = mkWA (compoundA "amfipros" (k38 "tyylinen")) ; --UNCHK
lin amphitheater_N = mkWN (compoundN "amfi" (k6 "teatteri")) ; --UNCHK
lin amphitheatre_N = mkWN (compoundN "amfi" (k6 "teatteri")) ; --UNCHK
lin amphitheatric_A = mkWA (compoundA "amfiteatteri" (k38 "mainen")) ; --UNCHK
lin amphitropous_A = mkWA (compoundA "amfi" (k38 "trooppinen")) ; --UNCHK
@@ -8000,7 +7999,6 @@ lin caranday_N = mkWN (k9 "alba") "Copernicia" ; --UNCHK
lin carat_N = mkWN (k5A "karaatti") ; --UNCHK
lin caravan_N = mkWN (compoundN "matkailu" (k1 "vaunu")) ; --UNCHK
lin caravanning_N = mkWN (compoundN "asuntovaunu" (k2 "matkailu")) ; --UNCHK
lin caravansary_N = mkWN (compoundN "maja" (k1 "talo")) ; --UNCHK
lin caravanserai_N = mkWN (compoundN "maja" (k1 "talo")) ; --UNCHK
lin caraway_N = mkWN (kH1 "kumina") ; --UNCHK
lin carbamate_N = mkWN "karbamaatti" ; --UNCHK
@@ -11892,7 +11890,6 @@ lin counsel_N = mkWN (k39 "ohjaus") ;
lin counsel_V2 = mkWV2 (k73 "ohjata") ; --UNCHK
lin counselling_N = variants{} ; --
lin counsellor_N = mkWN (compoundN "oikeus" (k10 "avustaja")) ; --UNCHK
lin counselor_N = mkWN (compoundN "oikeus" (k10 "avustaja")) ; --UNCHK
lin counselorship_N = mkWN (k25 "toimi") "asianajajan" ; --UNCHK
lin count_N = mkWN (k38 "lukeminen") "numeroiden" ; --UNCHK
lin count_V = mkWV (k53A "ottaa") "lukuun" ;
@@ -15995,7 +15992,6 @@ lin due_N = mkN "oikeus" ; ---ARB --mkN "maksu" ; --mkWN (k10 "osa") ;
lin duel_N = mkWN (compoundN "kaksin" (k2 "kamppailu")) ; --UNCHK
lin duel_V = mkWV (k67 "olla") "kaksintaistelussa" ; --UNCHK
lin dueler_N = mkWN (compoundN "kaksin" (k12 "taistelija")) ; --UNCHK
lin duelist_N = mkWN (compoundN "kaksin" (k12 "taistelija")) ; --UNCHK
lin duellist_N = mkWN (compoundN "kaksin" (k12 "taistelija")) ; --UNCHK
lin duenna_N = mkWN (compoundN "seura" (k38 "nainen")) ; --UNCHK
lin duet_N = mkWN (compoundN "kaksin" (k5 "tanssi")) ; --UNCHK

View File

@@ -4743,8 +4743,7 @@ lin councillor_N = variants{} ; --
lin counsel_N = mkN "conseil" ; -- tocheck
lin counsel_V2 = mkV2 (mkV "conseiller") ; -- tocheck
lin counselling_N = variants{} ; --
lin counsellor_N = variants{} ; --
lin counselor_N = mkN "conseiller" masculine ; -- tocheck
lin counsellor_N = mkN "conseiller" masculine;
lin count_N = mkN "compte" masculine | mkN "comte" masculine ; -- tocheck
lin count_V = variants{}; -- L.count_V2 ;
lin count_V2 = L.count_V2 ;

View File

@@ -147,7 +147,6 @@ lin absence_N = reg2N "Abwesenheit" "Abwesenheiten" feminine;
lin absent_A = regA "abwesend";
lin absent_V2 = variants {};
lin absent_minded_A = variants {};
lin absent_mindedness_N = variants {};
lin absentee_N = variants {};
lin absenteeism_N = variants {};
lin absinth_N = variants {};
@@ -5376,7 +5375,6 @@ lin carapace_N = variants {};
lin carat_N = reg2N "Karat" "Karate" neuter;
lin caravan_N = reg2N "Karawane" "Karawanen" feminine;
lin caravanning_N = variants {};
lin caravansary_N = variants {};
lin caravanserai_N = reg2N "Karawanserei" "Karawansereien" feminine;
lin caraway_N = reg2N "Kümmel" "Kümmel" masculine;
lin carbide_N = variants {};
@@ -11526,7 +11524,6 @@ lin due_Adv = mkAdv "zurückzuführende" ; -- 0.5714286 ---?
lin due_N = variants {};
lin duel_N = reg2N "Duell" "Duelle" neuter;
lin duel_V = variants {};
lin duelist_N = variants {};
lin duellist_N = variants {};
lin duenna_N = variants {};
lin duet_N = reg2N "Duett" "Duette" neuter;
@@ -26747,7 +26744,7 @@ lin pantograph_N = variants {};
lin pantomime_N = reg2N "Pantomime" "Pantomimen" feminine;
lin pantry_N = reg2N "Speisekammer" "Speisekammern" feminine;
lin pantryman_N = variants {};
lin panty_hose_N = variants {};
lin pantyhose_N = variants {};
lin panzer_A = variants {};
lin paotow_PN = variants {};
lin pap_N = reg2N "Brei" "Breie" masculine;
@@ -27679,7 +27676,7 @@ lin petrel_N = variants {};
lin petrifaction_N = mkN "Versteinerung";
lin petrify_V = irregV "erstarren" "erstarrt" "erstarrte" "erstarrte" "erstarrt";
lin petrify_V2 = dirV2 (irregV "erstarren" "erstarrt" "erstarrte" "erstarrte" "erstarrt");
lin petro_chemical_N = variants {};
lin petrochemical_N = variants {};
lin petrol_N = reg2N "Benzin" "Benzine" neuter;
lin petroleum_N = variants {};
lin petrology_N = variants {};

View File

@@ -1167,9 +1167,8 @@ lin ampere_N = mkN "ऐम्पियर" ; -- tocheck
lin ampersand_N = mkN "ऐंपरसैंड" ; -- tocheck
lin amphetamine_N = mkN "ऐंफ़ेटमीन" ; -- tocheck
lin amphibian_N = mkN "जलथली" ; -- tocheck
lin amphibious_A = mkA "जलस्थलीय" ; -- tocheck
lin amphitheater_N = mkN "रंगभूमि" ; -- tocheck
lin amphitheatre_N = mkN "" ; -- tocheck
lin amphibious_A = mkA "जलस्थलीय" ; -- tocheck
lin amphitheatre_N = mkN "रंगभूमि"; -- tocheck
lin ample_A = mkA "प्रचुर" ; -- tocheck
lin amplification_N = mkN "विस्तारण" ; -- tocheck
lin amplifier_N = mkN "प्रवर्धक" ; -- tocheck
@@ -6128,8 +6127,7 @@ lin council_N = mkN "परिषद्" ; -- tocheck
lin councillor_N = mkN "पार्षद्" ; -- tocheck
lin counsel_N = mkN "वकील" ; -- tocheck
lin counsel_V2 = mkV2 (compoundV "सलाह" (mkV "देना")) ; -- tocheck
lin counsellor_N = mkN "ग्रीष्म-शिविर संचालक" ; -- tocheck
lin counselor_N = mkN "वकील" ; -- tocheck
lin counsellor_N = mkN "ग्रीष्म-शिविर संचालक" | mkN "वकील" ; -- tocheck
lin count_N = mkN "पूर्ण गिनतीई" ; -- tocheck
lin count_V = compoundV "गिनती" (mkV "करना") ; -- tocheck
lin count_V2 = mkV2 (compoundV "गिनती" (mkV "करना")) ; -- tocheck
@@ -33806,4 +33804,4 @@ lin zymology_N = mkN "कैण्विकी" ; -- tocheck
lin zymosis_N = mkN "ज़ाइमोसिस" ; -- tocheck
lin zymotic_A = mkA "किण्विक" ; -- tocheck
}
}

View File

@@ -926,7 +926,7 @@ lin amphetamine_N = mkN "anfetamina" ; -- status=guess
lin amphibian_N = mkN "anfibio" ; -- status=guess
lin amphibious_A = mkA "anfibio" ; -- status=guess
lin amphibole_N = mkN "anfíbol" masculine ; -- status=guess
lin amphitheater_N = mkN "anfiteatro" ; -- status=guess
lin amphitheatre_N = mkN "anfiteatro" ; -- status=guess
lin amphora_N = mkN "cántaro" ; -- status=guess
lin ample_A = mkA "abundante" | mkA "generoso" ;
lin amplification_N = mkN "amplificación" feminine ; -- status=guess

View File

@@ -233,7 +233,6 @@ lin absent_A = mkA "frånvarande" | mkA "tankspridd" ; -- SaldoWN -- comment=3
lin absent_Prep = variants {} ;
lin absent_V2 = variants {} ;
lin absent_minded_A = variants {} ;
lin absent_mindedness_N = variants {} ;
lin absentee_N = variants {} ;
lin absenteeism_N = mkN "frånvaro" ;
lin absentmindedness_N = variants {} ;
@@ -2111,7 +2110,6 @@ lin amphipod_N = variants {} ;
lin amphiprostylar_A = variants {} ;
lin amphisbaena_N = variants {} ;
lin amphistylar_A = variants {} ;
lin amphitheater_N = variants {} ;
lin amphitheatre_N = mkN "amfiteater" ; -- comment=3
lin amphitheatric_A = variants {} ;
lin amphitropous_A = variants {} ;
@@ -5549,11 +5547,9 @@ lin behave_V = mkV "uppträda" "uppträdde" "uppträtt" | mkV "handlar" ; -- Sal
lin behaved_A = variants {} ;
lin behavior_N = mkN "beteende" ; -- comment=5
lin behavioral_A = variants {} ;
lin behaviorism_N = mkN "behaviorism" "behaviorismer" ; -- comment=2
lin behaviorist_N = variants {} ;
lin behavioristic_A = variants {} ;
lin behaviour_N = mkN "beteende" | mkN "uppförande" ;
lin behaviourism_N = mkN "behaviorism" "behaviorismer" ; -- SaldoWN
lin behaviourism_N = mkN "behaviorism" "behaviorismer";
lin behaviourist_N = variants {} ;
lin behead_V2 = mkV2 "halshugga" "halshögg" "halshuggit" ; -- SaldoWN -- status=guess, src=wikt
lin behest_N = (mkN "order") | (mkN "befallning"); -- status=guess status=guess
@@ -9031,7 +9027,6 @@ lin carapace_N = variants {} ;
lin carat_N = mkN "karat" neutrum;
lin caravan_N = mkN "karavan" "karavaner" ; -- comment=2
lin caravanning_N = variants {} ;
lin caravansary_N = variants {} ;
lin caravanserai_N = variants {} ;
lin caraway_N = mkN "kummin" ;
lin carbamate_N = variants {} ;
@@ -13406,7 +13401,6 @@ lin counsel_N = mkN "överläggning" ; -- comment=10
lin counsel_V2 = variants {} ;
lin counselling_N = variants{} ; --
lin counsellor_N = mkN "konsulent" "konsulenter" ; -- comment=3
lin counselor_N = variants {} ;
lin counselorship_N = variants {} ;
lin count_N = mkN "räkning" ; -- comment=4
lin count_V = mkV "skattar" ; -- comment=7
@@ -18029,7 +18023,6 @@ lin due_to_Prep = mkPrep "på grund av" ;
lin duel_N = mkN "duell" "dueller" ; -- comment=4
lin duel_V = mkV "duellerar" ;
lin dueler_N = variants {} ;
lin duelist_N = variants {} ;
lin duellist_N = variants {} ;
lin duenna_N = variants {} ;
lin duet_N = mkN "duett" "duetter" ; -- comment=2
@@ -40878,7 +40871,6 @@ lin pantomime_N = mkN "pantomim" "pantomimer" ; -- SaldoWN
lin pantropical_A = variants {} ;
lin pantry_N = mkN "skafferi" "skafferit" "skafferier" "skafferierna" ; -- comment=2
lin pantryman_N = variants {} ;
lin panty_hose_N = variants {} ;
lin pantyhose_N = mkN "strumpbyxa" ;
lin panzer_A = variants {} ;
lin panzer_N = variants {} ;
@@ -42238,7 +42230,6 @@ lin petrifaction_N = variants {} ;
lin petrify_V = mkV "petrifierar" ; -- comment=2
lin petrify_V2 = mkV2 (mkV "förstena"); -- status=guess, src=wikt
lin petrissage_N = variants {} ;
lin petro_chemical_N = variants {} ;
lin petrochemical_N = variants {} ;
lin petroglyph_N = mkN "hällristning" ; -- SaldoWN
lin petrol_N = mkN "bensin" ; -- SaldoWN
@@ -42579,7 +42570,6 @@ lin piano_Adv = mkAdv "piano" ;
lin piano_N = mkN "piano" "pianot" "pianon" "pianona" ;
lin pianoforte_N = variants {} ;
lin pianola_N = variants {} ;
lin piaster_N = variants {} ;
lin piastre_N = variants {} ;
lin piazza_N = variants {} ;
lin pibroch_N = variants {} ;