From 1af0af63b9692516cd6c393f0363b78a7b7cb758 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Thu, 19 Jun 2014 10:07:12 +0000 Subject: [PATCH] remove some entries and split others in all dictionaries. The change are caused by the new inventory of names in Construction --- lib/src/translator/Dictionary.gf | 95 +++++++---------- lib/src/translator/DictionaryBul.gf | 151 +++++++++++----------------- lib/src/translator/DictionaryChi.gf | 42 +++----- lib/src/translator/DictionaryDut.gf | 23 +---- lib/src/translator/DictionaryEng.gf | 93 ++++++----------- lib/src/translator/DictionaryFin.gf | 90 ++++++----------- lib/src/translator/DictionaryFre.gf | 10 +- lib/src/translator/DictionaryGer.gf | 93 ++++++----------- lib/src/translator/DictionaryHin.gf | 68 ++++--------- lib/src/translator/DictionaryIta.gf | 7 +- lib/src/translator/DictionarySpa.gf | 7 +- lib/src/translator/DictionarySwe.gf | 93 ++++++----------- 12 files changed, 267 insertions(+), 505 deletions(-) diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 67f46f312..16f8b6940 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -1161,7 +1161,6 @@ fun africa_PN : PN ; fun africanFem_N : N ; fun africanMasc_N : N ; fun african_A : A ; -fun afrikaans_N : N ; fun afrikanerFem_N : N ; fun afrikanerMasc_N : N ; fun afrikaner_A : A ; @@ -2017,7 +2016,6 @@ fun amethystine_A : A ; fun ametria_N : N ; fun ametropia_N : N ; fun ametropic_A : A ; -fun amharic_N : N ; fun amiability_N : N ; fun amiable_A : A ; fun amicability_N : N ; @@ -3178,8 +3176,6 @@ fun apractic_A : A ; fun apraxia_N : N ; fun apres_ski_A : A ; fun apricot_N : N ; -fun april_N : N ; -fun april_PN : PN ; fun apron_N : N ; fun apropos_A : A ; fun apropos_Adv : Adv ; @@ -3220,7 +3216,6 @@ fun arabianFem_N : N ; fun arabianMasc_N : N ; fun arabian_A : A ; fun arabic_A : A ; -fun arabic_N : N ; fun arability_N : N ; fun arabist_N : N ; fun arable_A : A ; @@ -4168,8 +4163,6 @@ fun augur_V : V ; fun augur_V2 : V2 ; fun augury_N : N ; fun august_A : A ; -fun august_N : N ; -fun august_PN : PN ; fun augustan_A : A ; fun auk_N : N ; fun auklet_N : N ; @@ -9446,7 +9439,8 @@ fun catacorner_A : A ; fun catadromous_A : A ; fun catafalque_N : N ; fun catalan_A : A ; -fun catalan_N : N ; +fun catalanMasc : N ; +fun catalanFem : N ; fun catalase_N : N ; fun catalatic_A : A ; fun catalectic_A : A ; @@ -10457,7 +10451,8 @@ fun chinchow_PN : PN ; fun chine_N : N ; fun chinese_A : A ; fun chinese_A : A ; -fun chinese_N : N ; +fun chineseMasc : N ; +fun chineseFem : N ; fun chink_N : N ; fun chink_V : V ; fun chink_V2 : V2 ; @@ -14904,7 +14899,8 @@ fun dangleberry_N : N ; fun daniel_N : N ; fun daniel_PN : PN ; fun danish_A : A ; -fun danish_N : N ; +fun danishMasc : N ; +fun danishFem : N ; fun dank_A : A ; fun dankness_N : N ; fun danny_PN : PN ; @@ -15225,8 +15221,6 @@ fun deceivingly_Adv : Adv ; fun decelerate_V : V ; fun decelerate_V2 : V2 ; fun deceleration_N : N ; -fun december_N : N ; -fun december_PN : PN ; fun decency_N : N ; fun decent_A : A ; fun decentralization_N : N ; @@ -18237,7 +18231,8 @@ fun dustmop_N : N ; fun dustpan_N : N ; fun dusty_A : A ; fun dutch_A : A ; -fun dutch_N : N ; +fun dutchMasc : N ; +fun dutchFem : N ; fun dutchman_N : N ; fun duteous_A : A ; fun dutiable_A : A ; @@ -19326,7 +19321,8 @@ fun engineering_N : N ; fun enginery_N : N ; fun england_PN : PN ; fun english_A : A ; -fun english_N : N ; +fun englishMasc : N ; +fun englishFem : N ; fun englishman_N : N ; fun englishwoman_N : N ; fun engorgement_N : N ; @@ -21188,8 +21184,6 @@ fun feature_V2 : V2 ; fun featureless_A : A ; fun feb_PN : PN ; fun febrile_A : A ; -fun february_N : N ; -fun february_PN : PN ; fun feckless_A : A ; fun fecklessness_N : N ; fun fecula_N : N ; @@ -22985,7 +22979,8 @@ fun freight_train_N : N ; fun freighter_N : N ; fun freightliner_N : N ; fun french_A : A ; -fun french_N : N ; +fun frenchMasc : N ; +fun frenchFem : N ; fun frenchman_N : N ; fun frenchwoman_N : N ; fun frenetic_A : A ; @@ -23034,8 +23029,6 @@ fun fricative_N : N ; fun friction_N : N ; fun frictional_A : A ; fun frictionless_A : A ; -fun friday_N : N ; -fun friday_PN : PN ; fun fridge_N : N ; fun friedcake_N : N ; fun friend_N : N ; @@ -25093,7 +25086,8 @@ fun greed_N : N ; fun greediness_N : N ; fun greedy_A : A ; fun greek_A : A ; -fun greek_N : N ; +fun greekMasc : N ; +fun greekFem : N ; fun green_A : A ; fun green_N : N ; fun greenback_N : N ; @@ -26489,7 +26483,6 @@ fun hebephrenic_A : A ; fun hebetude_N : N ; fun hebraic_A : A ; fun hebrew_A : A ; -fun hebrew_N : N ; fun hecatomb_N : N ; fun heck_N : N ; fun heckelphone_N : N ; @@ -27011,7 +27004,8 @@ fun hinder_V2 : V2 ; fun hindfoot_N : N ; fun hindgut_N : N ; fun hindi_A : A ; -fun hindi_N : N ; +fun hindiMasc : N ; +fun hindiFem : N ; fun hindmost_A : A ; fun hindquarter_N : N ; fun hindquarters_N : N ; @@ -30464,7 +30458,8 @@ fun isthmian_A : A ; fun isthmus_N : N ; fun it_Pron : Pron ; fun italian_A : A ; -fun italian_N : N ; +fun italianMasc : N ; +fun italianFem : N ; fun italic_A : A ; fun italic_N : N ; fun italicize_V2 : V2 ; @@ -30603,8 +30598,6 @@ fun janice_PN : PN ; fun janie_PN : PN ; fun janissary_N : N ; fun janitor_N : N ; -fun january_N : N ; -fun january_PN : PN ; fun janus_PN : PN ; fun japan_N : N ; fun japan_PN : PN ; @@ -30992,7 +30985,6 @@ fun julian_PN : PN ; fun julie_PN : PN ; fun julienne_N : N ; fun juliet_PN : PN ; -fun july_PN : PN ; fun jumble_N : N ; fun jumble_V : V ; fun jumble_V2 : V2 ; @@ -31019,8 +31011,6 @@ fun jun_PN : PN ; fun junco_N : N ; fun junction_N : N ; fun juncture_N : N ; -fun june_N : N ; -fun june_PN : PN ; fun jungle_N : N ; fun jungly_A : A ; fun junior_A : A ; @@ -32172,7 +32162,6 @@ fun lathery_A : A ; fun lathi_N : N ; fun laticifer_N : N ; fun latin_A : A ; -fun latin_N : N ; fun latinate_A : A ; fun latinist_N : N ; fun latinize_V2 : V2 ; @@ -34444,7 +34433,8 @@ fun malta_PN : PN ; fun maltby_PN : PN ; fun malted_N : N ; fun maltese_A : A ; -fun maltese_N : N ; +fun malteseMasc : N ; +fun malteseFem : N ; fun maltha_N : N ; fun malthusian_A : A ; fun maltose_N : N ; @@ -34688,8 +34678,6 @@ fun marblewood_N : N ; fun marbling_N : N ; fun marc_N : N ; fun marcel_N : N ; -fun march_N : N ; -fun march_PN : PN ; fun march_V : V ; fun march_V2 : V2 ; fun marcher_N : N ; @@ -35104,8 +35092,6 @@ fun maxine_PN : PN ; fun maxwell_N : N ; fun may_1_VV : VV ; -- be possible fun may_2_VV : VV ; -- be allowed -fun may_N : N ; -fun may_PN : PN ; fun may_beetle_N : N ; fun may_bug_N : N ; fun mayapple_N : N ; @@ -36626,8 +36612,6 @@ fun monatomic_A : A ; fun monaural_A : A ; fun monazite_N : N ; fun monchengladbach_PN : PN ; -fun monday_N : N ; -fun monday_PN : PN ; fun monegasque_A : A ; fun monegasque_N : N ; fun moneran_A : A ; @@ -38050,7 +38034,8 @@ fun nepal_PN : PN ; fun nepalese_A : A ; fun nepalese_N : N ; fun nepali_A : A ; -fun nepali_N : N ; +fun nepaliMasc : N ; +fun nepaliFem : N ; fun nepheline_N : N ; fun nephelinite_N : N ; fun nephew_N : N ; @@ -38894,7 +38879,8 @@ fun norton_PN : PN ; fun nortriptyline_N : N ; fun norway_PN : PN ; fun norwegian_A : A ; -fun norwegian_N : N ; +fun norwegianMasc : N ; +fun norwegianFem : N ; fun norwich_PN : PN ; fun nose_N : N ; fun nose_V : V ; @@ -39001,8 +38987,6 @@ fun novelist_N : N ; fun novelization_N : N ; fun novella_N : N ; fun novelty_N : N ; -fun november_N : N ; -fun november_PN : PN ; fun novena_N : N ; fun novice_N : N ; fun noviciate_N : N ; @@ -39386,8 +39370,6 @@ fun octavo_N : N ; fun octet_N : N ; fun octette_N : N ; fun octillion_N : N ; -fun october_N : N ; -fun october_PN : PN ; fun octogenarian_A : A ; fun octogenarian_N : N ; fun octopod_N : N ; @@ -49189,7 +49171,8 @@ fun romance_V2 : V2 ; fun romanesque_N : N ; fun romania_PN : PN ; fun romanian_A : A ; -fun romanian_N : N ; +fun romanianMasc : N ; +fun romanianFem : N ; fun romantic_A : A ; fun romantic_N : N ; fun romantically_Adv : Adv ; @@ -49693,7 +49676,8 @@ fun russet_A : A ; fun russet_N : N ; fun russia_PN : PN ; fun russian_A : A ; -fun russian_N : N ; +fun russianMasc : N ; +fun russianFem : N ; fun rust_A : A ; fun rust_N : N ; fun rust_V : V ; @@ -50283,8 +50267,6 @@ fun satrap_N : N ; fun satsuma_N : N ; fun saturate_V2 : V2 ; fun saturation_N : N ; -fun saturday_N : N ; -fun saturday_PN : PN ; fun saturn_PN : PN ; fun saturnalia_N : N ; fun saturniid_N : N ; @@ -51568,8 +51550,6 @@ fun sept_PN : PN ; fun septal_A : A ; fun septation_N : N ; fun septectomy_N : N ; -fun september_N : N ; -fun september_PN : PN ; fun septet_N : N ; fun septic_A : A ; fun septicaemia_N : N ; @@ -56736,8 +56716,6 @@ fun sunburned_A : A ; fun sunburnt_A : A ; fun sunburst_N : N ; fun sundae_N : N ; -fun sunday_N : N ; -fun sunday_PN : PN ; fun sunder_N : N ; fun sunder_V2 : V2 ; fun sunderland_PN : PN ; @@ -57090,7 +57068,6 @@ fun swagger_N : N ; fun swagger_V : V ; fun swaggerer_N : N ; fun swagman_N : N ; -fun swahili_N : N ; fun swain_N : N ; fun swale_N : N ; fun swallow_N : N ; @@ -57169,7 +57146,8 @@ fun swedeMasc_N : N ; fun swede_A : A ; fun sweden_PN : PN ; fun swedish_A : A ; -fun swedish_N : N ; +fun swedishMasc : N ; +fun swedishFem : N ; fun sweep_N : N ; fun sweep_V : V ; fun sweep_V2 : V2 ; @@ -58549,7 +58527,8 @@ fun textual_A : A ; fun texture_N : N ; fun textured_A : A ; fun thai_A : A ; -fun thai_N : N ; +fun thaiMasc : N ; +fun thaiFem : N ; fun thailand_PN : PN ; fun thalamocortical_A : A ; fun thalamus_N : N ; @@ -59016,8 +58995,6 @@ fun thurifer_N : N ; fun thurmaston_PN : PN ; fun thurrock_PN : PN ; fun thurs_PN : PN ; -fun thursday_N : N ; -fun thursday_PN : PN ; fun thurso_PN : PN ; fun thus_Adv : Adv ; fun thwack_N : N ; @@ -60607,8 +60584,6 @@ fun tuck_up_V2 : V2 ; fun tucker_N : N ; fun tudung_N : N ; fun tues_PN : PN ; -fun tuesday_N : N ; -fun tuesday_PN : PN ; fun tufa_N : N ; fun tuff_N : N ; fun tuft_N : N ; @@ -60706,7 +60681,8 @@ fun turk_N : N ; fun turkey_N : N ; fun turkey_PN : PN ; fun turkish_A : A ; -fun turkish_N : N ; +fun turkishMasc : N ; +fun turkishFem : N ; fun turku_PN : PN ; fun turmeric_N : N ; fun turmoil_N : N ; @@ -62821,7 +62797,6 @@ fun urceolate_A : A ; fun urceole_N : N ; fun urchin_N : N ; fun urdu_A : A ; -fun urdu_N : N ; fun urea_N : N ; fun urease_N : N ; fun uremia_N : N ; @@ -64473,8 +64448,6 @@ fun wedge_V : V ; fun wedge_V2 : V2 ; fun wedgie_N : N ; fun wedlock_N : N ; -fun wednesday_N : N ; -fun wednesday_PN : PN ; fun wee_A : A ; fun wee_N : N ; fun wee_V : V ; diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 52a173fb0..026b4910b 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -1127,7 +1127,6 @@ lin africa_PN = mkPN "Африка" Fem; lin africanFem_N = mkN041 "африканка"; lin africanMasc_N = mkN008a "африканец"; lin african_A = mkA078 "африкански"; -lin afrikaans_N = mkN007 "африканс"; lin afrikaner_A = mkA078 "африкански"; lin afrikanerFem_N = mkN041 "африканка"; lin afrikanerMasc_N = mkN008a "африканец"; @@ -1962,7 +1961,6 @@ lin amethystine_A = mkA076 "аметистов"; ---- lin ametria_N = variants {}; lin ametropia_N = variants {}; lin ametropic_A = variants {}; -lin amharic_N = substantiveN (mkA078 "амхарски") (AMasc NonHuman); lin amiability_N = variants {mkN049 "любезност"; mkN049 "приветливост"}; ---- lin amiable_A = mkA076 "приветлив" ; ---- lin amicability_N = mkN072 "дружелюбие"; ---- @@ -3102,8 +3100,6 @@ lin apractic_A = variants {}; lin apraxia_N = mkN047 "апраксия"; lin apres_ski_A = variants {}; lin apricot_N = mkN047 "кайсия"; -lin april_N = mkN007 "април"; -lin april_PN = mkPN "Април" Masc; lin apron_N = mkN041 "престилка" ; ---- lin apropos_A = variants {}; lin apropos_Adv = variants {}; @@ -3140,7 +3136,6 @@ lin arabianFem_N = mkN041 "арабка"; lin arabianMasc_N = mkN018 "арабин"; lin arabian_A = mkA078 "арабски"; lin arabic_A = mkA078 "арабски"; -lin arabic_N = substantiveN (mkA078 "арабски") (AMasc NonHuman); lin arability_N = variants {}; lin arabist_N = mkN007a "арабист"; lin arable_A = mkA079 "орен" ; ---- @@ -4055,8 +4050,6 @@ lin augur_V = variants {}; lin augur_V2 = variants {}; lin augury_N = mkN072 "предчувствие" ; ---- lin august_A = mkA078 "августейши" ; ---- -lin august_N = mkN007 "август"; -lin august_PN = mkPN "Август" Masc; lin augustan_A = variants {}; lin auk_N = variants {}; lin auklet_N = variants {}; @@ -9029,7 +9022,8 @@ lin catacorner_A = variants {}; lin catadromous_A = variants {}; lin catafalque_N = mkN041 "катафалка"; lin catalan_A = mkA078 "каталонски"; -lin catalan_N = substantiveN (mkA078 "каталонски") (AMasc NonHuman); +lin catalanMasc_N = mkN008a "каталонец"; +lin catalanFem_N = mkN041 "каталонка"; lin catalase_N = mkN041 "каталаза"; lin catalatic_A = variants {}; lin catalectic_A = variants {}; @@ -9975,7 +9969,8 @@ lin chinchilla_N = mkN074 "чинчила"; lin chinchow_PN = mkPN "Чинчоу" Masc; lin chine_N = mkN014 "гръбнак" ; ---- lin chinese_A = mkA078 "китайски" ; -lin chinese_N = mkN013 "китаец"; +lin chineseMasc_N = dualN (mkN013 "китаец") (mkA078 "китайски"); +lin chineseFem_N = dualN (mkN041 "китайка") (mkA078 "китайски"); lin chink_N = variants {mkN071 "дрънкане"; mkN041 "междина"; mkN041 "пролука"; mkN007 "процеп"; mkN041 "пукнатина"; mkN041 "цепка"}; ---- lin chink_V = dualV (mkV186 "дрънкам") (mkV178 "дрънча"); ---- lin chink_V2 = variants {}; @@ -14162,7 +14157,8 @@ lin dangleberry_N = variants {}; lin daniel_N = mkN007 "даниел"; lin daniel_PN = mkPN "Даниел" Masc; lin danish_A = mkA078 "датски" ; -lin danish_N = mkN018 "датчанин"; +lin danishMasc_N = dualN (mkN018 "датчанин") (mkA078 "датчански"); +lin danishFem_N = dualN (mkN041 "датчанка") (mkA078 "датчански"); lin dank_A = mkA079 "влажен"; ---- lin dankness_N = variants {}; lin danny_PN = mkPN "Дани" Masc; @@ -14474,8 +14470,6 @@ lin deceivingly_Adv = variants {}; lin decelerate_V = dualV (mkV187 "забавям") (mkV173 "забавя") ; ---- lin decelerate_V2 = variants {}; lin deceleration_N = variants {mkN072 "намаление"; mkN071 "намаляване"}; ---- -lin december_N = mkN075 "декември"; -lin december_PN = mkPN "Декември" Masc; lin decency_N = variants {mkN072 "благоприличие"; mkN072 "приличие"; mkN049 "пристойност"}; ---- lin decent_A = mkA079 "приличен" ; ---- lin decentralization_N = mkN047 "децентрализация" ; @@ -17335,20 +17329,21 @@ lin dustlike_A = variants {}; lin dustman_N = mkN039 "боклукчия"; ---- lin dustmop_N = variants {}; lin dustpan_N = mkN041 "лопата" ; ---- -lin dusty_A = variants {mkA076 "боклучав"; mkA079 "прашен"}; ---- +lin dusty_A = mkA079 "прашен"; lin dutch_A = mkA078 "холандски" ; -lin dutch_N = mkN008a "холандец"; +lin dutchMasc_N = dualN (mkN008a "холандец") (mkA078 "холандски"); +lin dutchFem_N = dualN (mkN041 "холандка") (mkA078 "холандски"); lin dutchman_N = mkN008a "холандец"; lin duteous_A = mkA079 "покорен"; ---- -lin dutiable_A = mkA076 "облагаем"; ---- +lin dutiable_A = mkA076 "облагаем"; lin dutiful_A = variants {mkA079 "покорен"; mkA079 "послушен"}; ---- lin dutifulness_N = mkN049 "некоректност"; lin duty_N = mkN054 "дежурство" ; lin duty_free_A = mkA079 "безмитен"; lin duvet_N = variants {}; -lin dwarf_N = variants {mkN065 "джудже"; mkN014a "завързак"; mkN007 "лилипут"; mkN065 "човече"}; ---- +lin dwarf_N = variants {mkN065 "джудже"; mkN065 "човече"}; lin dwarf_V2 = variants {}; -lin dwarfish_A = variants {mkA078 "лилипутски"; mkA080 "недорасъл"}; ---- +lin dwarfish_A = mkA080 "недорасъл"; lin dwarfishness_N = variants {}; lin dwarfism_N = mkN011 "нанизъм"; lin dwell_V = singleV (mkV173 "мисля"); ---- @@ -18386,7 +18381,8 @@ lin engineering_N = mkN054 "инженерство" ; lin enginery_N = mkN039 "машинация"; lin england_PN = mkPN "Англия" Fem; lin english_A = mkA078 "английски" ; -lin english_N = variants {}; +lin englishMasc_N = dualN (mkN018 "англичанин") (mkA078 "английски"); +lin englishFem_N = dualN (mkN041 "англичанка") (mkA078 "английски"); lin englishman_N = mkN018 "англичанин"; lin englishwoman_N = mkN041 "англичанка"; lin engorgement_N = mkN071 "кръвонапълване"; @@ -20155,8 +20151,6 @@ lin feature_V2 = dirV2 (dualV (mkV186 "показвам") (mkV156 "покажа" lin featureless_A = variants {mkA079 "безинтересен"; mkA076 "безлик"; mkA079 "неизразителен"}; ---- lin feb_PN = mkPN "Феб" Masc; lin febrile_A = mkA079 "френетичен" ; ---- -lin february_N = variants {}; -lin february_PN = mkPN "Февруари" Masc; lin feckless_A = mkA079 "некадърен"; ---- lin fecklessness_N = mkN049 "некадърност"; ---- lin fecula_N = variants {}; @@ -21807,7 +21801,8 @@ lin freight_train_N = variants {}; lin freighter_N = variants {mkN031a "наемател"; mkN031a "товарител"}; ---- lin freightliner_N = variants {}; lin french_A = mkA078 "френски"; -lin french_N = substantiveN (mkA078 "френски") (AMasc NonHuman); +lin frenchMasc_N = dualN (mkN018 "французин") (mkA078 "френски"); +lin frenchFem_N = dualN (mkN041 "французойка") (mkA078 "френски"); lin frenchman_N = mkN018 "французин"; lin frenchwoman_N = mkN041 "французойка"; lin frenetic_A = mkA085 "буен"; ---- @@ -21852,8 +21847,6 @@ lin fricative_N = mkN041 "проходна"; lin friction_N = variants {mkN071 "триене"; mkN071 "търкане"; mkN047 "фрикция"}; ---- lin frictional_A = mkA079 "фрикционен"; ---- lin frictionless_A = variants {}; -lin friday_N = mkN014 "петък" ; -lin friday_PN = mkPN "Петък" Masc; lin fridge_N = dualN (mkN014 "хладилник") (mkA079 "хладилен"); lin friedcake_N = variants {}; lin friend_N = mkN031a "приятел" ; @@ -23670,26 +23663,27 @@ lin greaves_N = mkN041b "пръжка"; lin grebe_N = mkN008a "гмурец"; lin grecian_A = variants {}; lin greece_PN = mkPN "Гърция" Fem; -lin greed_N = mkN049 "алчност" ; -lin greediness_N = mkN049 "алчност" ; ---- +lin greed_N = mkN049 "алчност"; +lin greediness_N = mkN049 "алчност"; lin greedy_A = variants {mkA079 "алчен"; mkA079 "гладен"; mkA079 "жаден"; mkA076 "користолюбив"; mkA076 "лаком"; mkA079 "ненаситен"}; ---- -lin greek_A = mkA078 "гръцки" ; -lin greek_N = mkN012 "грък" ; +lin greek_A = mkA078 "гръцки"; +lin greekMasc_N = dualN (mkN012 "грък") (mkA078 "гръцки"); +lin greekFem_N = dualN (mkN047 "гъркиня") (mkA078 "гръцки"); lin green_A = mkA076 "зелен" ; -lin green_N = variants {mkN041 "зеленина"; mkN041 "морава"}; ---- +lin green_N = substantiveN (mkA076 "зелен") ANeut; lin greenback_N = mkN041 "банкнота"; lin greenbelt_N = variants {}; lin greenbottle_N = variants {}; -lin greenery_N = mkN041 "шума" ; ---- +lin greenery_N = mkN041 "зеленина"; lin greeneye_N = variants {}; lin greeneyed_A = variants {}; lin greenfly_N = variants {}; lin greengage_N = mkN007 "ренклод"; -lin greengrocer_N = mkN039 "зарзаватчия"; ---- -lin greengrocery_N = mkN041 "зарзаватчийница"; ---- +lin greengrocer_N = mkN039 "зарзаватчия"; +lin greengrocery_N = mkN041 "зарзаватчийница"; lin greenhorn_N = variants {mkN039 "аджамия"; mkN041 "ливада"; mkN014 "младок"; mkN007 "сополан"}; ---- -lin greenhouse_A = mkA076 "парников" ; ---- -lin greenhouse_N = mkN014 "разсадник" ; ---- +lin greenhouse_A = mkA076 "парников"; +lin greenhouse_N = dualN (mkN014 "парник") (mkA076 "парников"); lin greenish_A = variants {mkA076 "въззелен"; mkA076 "зеленикав"}; ---- lin greenishness_N = variants {}; lin greenling_N = variants {}; @@ -24977,7 +24971,6 @@ lin hebephrenic_A = variants {}; lin hebetude_N = variants {}; lin hebraic_A = variants {}; lin hebrew_A = mkA078 "еврейски" ; ---- -lin hebrew_N = mkN018 "евреин" ; ---- lin hecatomb_N = mkN041 "хекатомба"; ---- lin heck_N = mkN062 "чесало"; lin heckelphone_N = variants {}; @@ -25490,7 +25483,6 @@ lin hinder_V2 = dirV2 (variants {singleV (mkV176 "преча") ; singleV (mkV186 lin hindfoot_N = variants {}; lin hindgut_N = variants {}; lin hindi_A = variants {}; -lin hindi_N = mkN065 "хинди"; lin hindmost_A = variants {}; lin hindquarter_N = variants {}; lin hindquarters_N = variants {}; @@ -28806,7 +28798,8 @@ lin isthmian_A = variants {}; lin isthmus_N = mkN014 "провлак"; ---- lin it_Pron = mkPron "то" "него" "му" "негов" "неговия" "неговият" "негова" "неговата" "негово" "неговото" "негови" "неговите" (GSg Neut) P3 ; lin italian_A = mkA078 "италиански"; -lin italian_N = mkN008a "италианец"; +lin italianMasc_N = dualN (mkN008a "италианец") (mkA078 "италиански"); +lin italianFem_N = dualN (mkN041 "италианка") (mkA078 "италиански"); lin italic_A = mkA079 "курсивен"; lin italic_N = mkN007 "курсив"; lin italicize_V2 = variants {}; @@ -28938,8 +28931,6 @@ lin janice_PN = mkPN "Янис" Masc; lin janie_PN = mkPN "Яни" Masc; lin janissary_N = mkN018 "еничарин"; lin janitor_N = mkN031a "вратар"; -lin january_N = mkN065 "януари"; -lin january_PN = mkPN "Януари" Masc; lin janus_PN = mkPN "Янус" Masc; lin japan_N = mkN008a "японец"; lin japan_PN = mkPN "Япония" Fem; @@ -29312,7 +29303,6 @@ lin julian_PN = mkPN "Жулиян" Masc; lin julie_PN = mkPN "Джули" Masc; lin julienne_N = mkN041b "ивичка"; lin juliet_PN = mkPN "Джулиет" Masc; -lin july_PN = mkPN "Юли" Masc; lin jumble_N = variants {mkN041 "бърканица"; mkN047 "бъркотия"; mkN049 "забърканост"; mkN041 "каша"; mkN041 "неуредица"}; ---- lin jumble_V = medialV (dualV (mkV186 "размесвам") (mkV173 "размеся")) Acc; lin jumble_V2 = dirV2 (dualV (mkV186 "размесвам") (mkV173 "размеся")); @@ -29335,8 +29325,6 @@ lin jun_PN = mkPN "Жун" Masc; lin junco_N = variants {}; lin junction_N = mkN041 "връзка" ; ---- lin juncture_N = mkN072 "положение" ; -lin june_N = mkN065 "юни"; -lin june_PN = mkPN "Юни" Masc; lin jungle_N = variants {mkN041 "дебра"; mkN041 "джунгла"}; ---- lin jungly_A = variants {}; lin junior_A = mkA078 "младши"; @@ -30400,7 +30388,6 @@ lin lathery_A = mkA076 "пенлив"; ---- lin lathi_N = variants {}; lin laticifer_N = variants {}; lin latin_A = mkA078 "латински"; -lin latin_N = substantiveN (mkA078 "латински") (AMasc NonHuman); lin latinate_A = variants {}; lin latinist_N = variants {}; lin latinize_V2 = variants {}; @@ -31137,7 +31124,7 @@ lin lilangeni_N = variants {}; lin liliaceous_A = mkA076 "лилиев"; ---- lin lilian_PN = mkPN "Лилиян" Masc; lin lille_PN = mkPN "Лил" Masc; -lin lilliputian_A = variants {}; +lin lilliputian_A = mkA078 "лилипутски"; lin lilliputian_N = mkN007 "лилипут"; lin lilt_N = mkN009 "ритъм"; lin lilt_V = variants {}; @@ -32508,8 +32495,9 @@ lin malt_V2 = variants {}; lin malta_PN = mkPN "Малта" Fem; lin maltby_PN = mkPN "Малтби" Masc; lin malted_N = substantiveN (mkA076 "малцован") ANeut; -lin maltese_A = mkA078 "малтийски" ; ---- -lin maltese_N = mkN013 "малтиец"; +lin maltese_A = mkA078 "малтийски"; +lin malteseMasc_N = dualN (mkN013 "малтиец") (mkA078 "малтийски"); +lin malteseFem_N = dualN (mkN041 "малтийка") (mkA078 "малтийски"); lin maltha_N = mkN041 "малта"; lin malthusian_A = variants {}; lin maltose_N = mkN041 "малтоза"; @@ -32745,8 +32733,6 @@ lin marblewood_N = variants {}; lin marbling_N = mkN041b "жилка"; lin marc_N = variants {mkN041 "джибра"; mkN065 "кюспе"}; ---- lin marcel_N = mkN008 "марсел"; -lin march_N = mkN071 "маршируване" ; ---- -lin march_PN = mkPN "Марч" Masc; lin march_V = singleV (mkV186 "марширувам") ; ---- lin march_V2 = variants {}; lin marcher_N = variants {}; @@ -33140,8 +33126,6 @@ lin maximum_A = mkA079 "максимален" ; lin maximum_N = mkN007 "максимум"; ---- lin maxine_PN = mkPN "Максин" Masc; lin maxwell_N = mkN007 "максуел"; -lin may_N = mkN065 "май"; -lin may_PN = mkPN "Май" Masc; lin may_1_VV = mkVV (singleV (mkV166 "мога")); lin may_2_VV = mkVV (singleV (mkV166 "мога")); lin may_beetle_N = variants {}; @@ -34614,8 +34598,6 @@ lin monatomic_A = variants {}; lin monaural_A = variants {}; lin monazite_N = mkN007 "монацит"; lin monchengladbach_PN = mkPN "Монченгладбах" Masc; -lin monday_N = mkN014 "понеделник" ; -lin monday_PN = mkPN "Понеделник" Masc; lin monegasque_A = variants {}; lin monegasque_N = mkN054 "монако"; lin moneran_A = variants {}; @@ -35988,10 +35970,11 @@ lin neotenic_A = variants {}; lin neoteny_N = variants {}; lin neotony_N = variants {}; lin nepal_PN = mkPN "Непал" Masc; -lin nepalese_A = variants {}; +lin nepalese_A = mkA078 "непалски"; lin nepalese_N = mkN008a "непалец"; -lin nepali_A = variants {}; -lin nepali_N = mkN008a "непалец"; +lin nepali_A = mkA078 "непалски"; +lin nepaliMasc_N = dualN (mkN008a "непалец") (mkA078 "непалски"); +lin nepaliFem_N = dualN (mkN041 "непалка") (mkA078 "непалски"); lin nepheline_N = mkN007 "нефелин"; lin nephelinite_N = variants {}; lin nephew_N = mkN014a "племенник"; @@ -36823,7 +36806,7 @@ lin northwest_Adv = variants {}; lin northwest_N = mkN007 "северозапад"; lin northwester_N = variants {}; lin northwesterly_A = mkA079 "северозападен" ; ---- -lin northwestern_A = mkA079 "северозападен" ; ---- +lin northwestern_A = mkA079 "северозападен"; lin northwestward_A = variants {}; lin northwestward_Adv = variants {}; lin northwich_PN = mkPN "Нортуйч" Masc; @@ -36831,7 +36814,8 @@ lin norton_PN = mkPN "Нортън" Masc; lin nortriptyline_N = mkN007 "нортриптилин"; lin norway_PN = mkPN "Норвегия" Fem; lin norwegian_A = mkA078 "норвежки"; -lin norwegian_N = mkN008a "норвежец" ; ---- +lin norwegianMasc_N = dualN (mkN008a "норвежец") (mkA078 "норвежки"); +lin norwegianFem_N = dualN (mkN041 "норвежка") (mkA078 "норвежки"); lin norwich_PN = mkPN "Норич" Masc; lin nose_N = mkN001 "нос" ; lin nose_V = variants {}; @@ -36928,8 +36912,6 @@ lin novelette_N = mkN049 "повест"; ---- lin novelist_N = mkN031a "писател" ; lin novelization_N = variants {}; lin novelty_N = mkN041 "новина" ; -lin november_N = mkN075 "ноември"; -lin november_PN = mkPN "Ноември" Masc; lin novena_N = variants {}; lin novice_N = variants {mkN014 "послушник"; mkN041 "послушница"; mkN014 "новак"}; ---- lin noviciate_N = mkN054 "послушничество"; ---- @@ -37307,8 +37289,6 @@ lin octavo_N = variants {mkN041 "октава"; mkN041 "осмина"}; ---- lin octet_N = mkN041 "октава"; lin octette_N = mkN007 "октет"; lin octillion_N = variants {}; -lin october_N = mkN075 "октомври"; -lin october_PN = mkPN "Октомври" Masc; lin octogenarian_A = mkA079 "осемдесетгодишен"; ---- lin octogenarian_N = substantiveN (mkA079 "осемдесетгодишен") (AMasc Human); lin octopod_N = variants {}; @@ -46600,16 +46580,17 @@ lin romance_V = variants {}; lin romance_V2 = variants {}; lin romanesque_N = mkN041 "романска"; lin romania_PN = mkPN "Румъния" Fem; -lin romanian_A = variants {}; -lin romanian_N = substantiveN (mkA078 "румънски") (AMasc NonHuman); +lin romanian_A = mkA078 "румънски"; +lin romanianMasc_N = dualN (mkN008a "румънец") (mkA078 "румънски"); +lin romanianFem_N = dualN (mkN041 "румънка") (mkA078 "румънски"); lin romantic_A = mkA079 "романтичен" ; lin romantic_N = mkN014a "романтик"; -lin romantically_Adv = variants {}; +lin romantically_Adv = mkAdv "романтично"; lin romanticism_N = mkN011 "романтизъм"; -lin romanticist_N = mkN014a "романтик"; ---- +lin romanticist_N = mkN014a "романтик"; lin romanticize_V = variants {}; lin romanticize_V2 = variants {}; -lin romany_A = variants {}; +lin romany_A = mkA078 "ромски"; lin romany_N = mkN007 "ром"; lin rome_PN = mkPN "Рим" Masc; lin romish_A = variants {}; @@ -47038,11 +47019,12 @@ lin rusk_N = variants {mkN007 "пексимет"; mkN007 "сухар"}; ---- lin russet_A = variants {}; lin russet_N = mkN014 "шаяк"; lin russia_PN = mkPN "Русия" Fem; -lin russian_A = mkA078 "руски" ; -lin russian_N = mkN014a "рускнак"; +lin russian_A = mkA078 "руски"; +lin russianMasc_N = dualN (mkN014a "рускнак") (mkA078 "руски"); +lin russianFem_N = dualN (mkN047 "рускиня") (mkA078 "руски"); lin rust_A = variants {}; -lin rust_N = mkN041 "ръжда"; ---- -lin rust_V = singleV (mkV186 "ръждясвам"); ---- +lin rust_N = mkN041 "ръжда"; +lin rust_V = singleV (mkV186 "ръждясвам"); lin rust_V2 = variants {}; lin rustic_A = variants {mkA078 "селски"; mkA078 "селяндурски"; mkA078 "селяшки"}; ---- lin rustic_N = mkN007 "селяндур"; ---- @@ -47614,8 +47596,6 @@ lin satrap_N = mkN007 "сатрап"; lin satsuma_N = mkN041 "сацума"; lin saturate_V2 = dirV2 (dualV (mkV186 "насищам") (mkV173 "наситя")); lin saturation_N = mkN071 "насищане"; -lin saturday_N = mkN041 "събота" ; -lin saturday_PN = mkPN "Събота" Masc; lin saturn_PN = mkPN "Сатурн" Masc; lin saturnalia_N = mkN047 "оргия"; lin saturniid_N = variants {}; @@ -48836,8 +48816,6 @@ lin sept_PN = mkPN "Септ" Masc; lin septal_A = variants {}; lin septation_N = variants {}; lin septectomy_N = variants {}; -lin september_N = mkN075 "септември"; -lin september_PN = mkPN "Септември" Masc; lin septet_N = mkN007 "септет"; lin septic_A = variants {}; lin septicaemia_N = mkN039 "септицемия"; @@ -53589,8 +53567,6 @@ lin sunburned_A = variants {}; lin sunburnt_A = variants {mkA076 "бронзов"; mkA079 "черен"}; ---- lin sunburst_N = variants {}; lin sundae_N = mkN065 "сънди"; ---- -lin sunday_N = mkN047 "неделя" ; -lin sunday_PN = mkPN "Неделя" Masc; lin sunder_N = variants {}; lin sunder_V2 = variants {}; lin sunderland_PN = mkPN "Съндърланд" Masc; @@ -53928,7 +53904,6 @@ lin swagger_N = variants {mkN049 "напереност"; mkN071 "перчене" lin swagger_V = variants {dualV (mkV186 "връцкам") (mkV152 "връцна"); singleV (mkV176 "емча"); singleV (mkV173 "кипря")}; ---- lin swaggerer_N = mkN054 "самохвалко"; lin swagman_N = mkN014a "скитник"; -lin swahili_N = mkN065 "суахили"; lin swain_N = mkN019 "момък"; ---- lin swale_N = mkN071 "заблатяване"; lin swallow_N = mkN041a "лястовица"; @@ -53993,12 +53968,13 @@ lin sweater_N = variants {mkN007 "кожодер"; mkN007 "пуловер"; mkN0 lin sweatshirt_N = mkN007 "суитчър"; lin sweatshop_N = variants {}; lin sweaty_A = variants {mkA076 "изпотен"; mkA079 "потен"}; ---- -lin swedeFem_N = mkN041 "шведка"; -lin swedeMasc_N = mkN007 "швед"; +lin swedeMasc_N = dualN (mkN007a "швед") (mkA078 "шведски"); +lin swedeFem_N = dualN (mkN041 "шведка") (mkA078 "шведски"); lin swede_A = mkA078 "шведски"; lin sweden_PN = mkPN "Швеция" Fem; -lin swedish_A = mkA078 "шведски" ; -lin swedish_N = mkN007 "швед"; +lin swedish_A = mkA078 "шведски"; +lin swedishMasc_N = dualN (mkN007a "швед") (mkA078 "шведски"); +lin swedishFem_N = dualN (mkN041 "шведка") (mkA078 "шведски"); lin sweep_N = variants {mkN054 "геранило"; mkN056 "крило"; mkN040 "мърльо"; mkN049 "стремителност"}; ---- lin sweep_V = singleV (mkV145 "мета"); lin sweep_V2 = dirV2 (singleV (mkV145 "мета")); @@ -55279,7 +55255,8 @@ lin textual_A = mkA079 "текстуален"; ---- lin texture_N = variants {mkN047 "консистенция"; mkN041 "структура"; mkN049 "тъкан"; mkN041 "фактура"}; ---- lin textured_A = variants {}; lin thai_A = variants {}; -lin thai_N = mkN008a "тайландец"; +lin thaiMasc_N = dualN (mkN008a "тайландец") (mkA078 "тайландски"); +lin thaiFem_N = dualN (mkN041 "тайландка") (mkA078 "тайландски"); lin thailand_PN = mkPN "Тайланд" Masc; lin thalamocortical_A = variants {}; lin thalamus_N = mkN007 "таламус"; @@ -55719,8 +55696,6 @@ lin thurifer_N = variants {}; lin thurmaston_PN = mkPN "Турмастън" Masc; lin thurrock_PN = mkPN "Туррок" Masc; lin thurs_PN = mkPN "Турс" Masc; -lin thursday_N = mkN014 "четвъртък" ; -lin thursday_PN = mkPN "Вторник" Masc; lin thurso_PN = mkPN "Турсо" Masc; lin thus_Adv = variants {}; lin thwack_N = variants {}; @@ -57219,8 +57194,6 @@ lin tuck_shop_N = variants {}; lin tucker_N = mkN007 "тъкър"; lin tudung_N = variants {}; lin tues_PN = mkPN "Туес" Masc; -lin tuesday_N = mkN014 "вторник" ; -lin tuesday_PN = mkPN "вторник" Masc; lin tufa_N = mkN007 "бигор"; ---- lin tuff_N = mkN007 "туф"; lin tuft_N = variants {mkN041 "брадичка"; mkN041 "качулка"; mkN041 "китка"; mkN007 "кичур"; mkN065 "снопче"; mkN041 "туфа"}; ---- @@ -57313,8 +57286,9 @@ lin turin_PN = mkPN "Торино" Masc; lin turk_N = dualN (mkN021 "турчин") (mkA078 "турски"); lin turkey_N = mkN041 "пуйка"; lin turkey_PN = mkPN "Турция" Fem; -lin turkish_A = mkA078 "турски" ; -lin turkish_N = mkN021 "турчин"; +lin turkish_A = mkA078 "турски"; +lin turkishMasc_N = dualN (mkN021 "турчин") (mkA078 "турски"); +lin turkishFem_N = dualN (mkN047 "туркиня") (mkA078 "турски"); lin turku_PN = mkPN "Турку" Masc; lin turmeric_N = mkN041 "куркума"; lin turmoil_N = mkN041 "суматоха" ; @@ -59379,7 +59353,6 @@ lin urceolate_A = variants {}; lin urceole_N = variants {}; lin urchin_N = variants {mkN007 "ашлак"; mkN073 "джереме"; mkN007 "малчуган"; mkN014a "немирник"}; ---- lin urdu_A = variants {}; -lin urdu_N = mkN065 "урду"; lin urea_N = mkN047 "урея"; ---- lin urease_N = mkN041 "уреаза"; lin uremia_N = mkN047 "уремия"; ---- @@ -60926,8 +60899,6 @@ lin wedge_V = variants {dualV (mkV186 "загнездвам") (mkV174 "загн lin wedge_V2 = variants {}; lin wedgie_N = variants {}; lin wedlock_N = mkN001 "брак"; -lin wednesday_N = mkN043 "сряда" ; -lin wednesday_PN = mkPN "Сряда" Fem; lin wee_A = mkA080 "мъничък"; ---- lin wee_N = mkN014a "мъник"; lin wee_V = variants {}; diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index abf19b04e..47bd90d99 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -778,7 +778,6 @@ lin approved_A = variants{} ; -- lin approximate_A = mkA "大概" ; lin approximate_V2 = mkV2 "近似" ; lin approximately_Adv = variants{} ; -- -lin april_PN = mkPN "四月" ; lin apt_A = mkA "贴切" ; lin aquamarine_N = mkN "蓝绿色" ; lin aquarium_N = mkN "水族馆" "座" ; @@ -1059,7 +1058,6 @@ lin auditor_N = mkN "稽核员" ; lin augment_V = mkV "增大" ; lin augment_V2 = mkV2 "增加" ; lin august_A = mkA "八月" ; -lin august_PN = mkPN "八月" ; lin aunt_N = mkN "阿姨" ; lin aura_N = mkN "氛围" ; lin aural_A = mkA "听觉" ; @@ -2551,7 +2549,8 @@ lin chin_N = mkN "下巴" ; lin china_N = mkN "瓷器" ; lin china_PN = mkPN "中国" ; lin chinese_A = mkA "中国" ; -lin chinese_N = mkN "中国人" ; +lin chineseMasc_N = mkN "中国人" ; +lin chineseFem_N = mkN "中国人" ; lin chip_N = mkN "芯片" ; lin chip_V = mkV "切" ; lin chirpy_A = mkA "快活" ; @@ -3901,7 +3900,6 @@ lin decay_N = mkN "衰退" "次" ; lin decease_V = mkV "死" ; lin deceive_V2 = mkV2 "欺骗" ; lin decelerate_V = mkV "减速" ; -lin december_PN = mkPN "十二月" ; lin decency_N = mkN "体面" "" ; lin decent_A = mkA "像样" ; lin decentralization_N = mkN "下放" ; @@ -4864,7 +4862,8 @@ lin dust_V2 = mkV2 "拂尘" ; lin dustbin_N = mkN "垃圾桶" ; lin dusty_A = mkA "含糊" ; lin dutch_A = mkA "荷兰人" ; -lin dutch_N = mkN "荷兰人" ; +lin dutchMasc_N = mkN "荷兰人" ; +lin dutchFem_N = mkN "荷兰人" ; lin dutiful_A = mkA "忠实" ; lin duty_N = mkN "责任" ; lin duty_free_A = mkA "免税" ; @@ -5158,7 +5157,8 @@ lin engineer_V = mkV "设计" ; lin engineer_V2 = mkV2 "工程师" ; lin engineering_N = mkN "工程" ; lin english_A = mkA "英语" ; -lin english_N = mkN "英文" ; +lin englishMasc_N = mkN "英文" ; +lin englishFem_N = mkN "英文" ; lin engrave_V2 = mkV2 "铭记" ; lin engulf_V2 = mkV2 "吞噬" ; lin enhance_V2 = mkV2 "提高" ; @@ -5788,7 +5788,6 @@ lin feather_N = L.feather_N ; lin feature_N = mkN "特征" ; lin feature_V2 = mkV2 "放映" ; lin featureless_A = mkA "无特色" ; -lin february_PN = mkPN "二月" ; lin feckless_A = mkA "软弱" ; lin fed_N = mkN "喂" ; lin federal_A = mkA "联邦" ; @@ -6348,7 +6347,8 @@ lin freight_N = mkN "货物" ; lin freight_V2 = mkV2 "运送" ; lin freighter_N = mkN "货船" ; lin french_A = mkA "法国人" ; -lin french_N = mkN "法国人" ; +lin frenchMasc_N = mkN "法国人" ; +lin frenchFem_N = mkN "法国人" ; lin frenetic_A = mkA "狂热" ; lin frenzied_A = mkA "疯狂" ; lin frenzy_N = mkN "狂妄" ; @@ -6366,7 +6366,6 @@ lin fret_V = mkV "烦恼" ; lin fret_VS = mkVS "烦躁" ; lin friar_N = mkN "修士" ; lin friction_N = mkN "摩擦" "" ; -lin friday_PN = mkPN "星期五" ; lin fridge_N = L.fridge_N ; lin friend_N = L.friend_N ; lin friendliness_N = mkN "友好" "" ; @@ -6838,7 +6837,8 @@ lin greatness_N = mkN "伟大" ; lin greece_PN = mkPN "希腊" ; lin greed_N = mkN "贪心" ; lin greedy_A = mkA "贪婪" ; -lin greek_N = mkN "希腊人" ; +lin greekMasc_N = mkN "希腊人" ; +lin greekFem_N = mkN "希腊人" ; lin green_A = L.green_A ; lin green_N = mkN "绿色""股" ; lin greenback_N = mkN "美元" "张" ; @@ -8281,7 +8281,8 @@ lin issue_V2 = mkV2 "发布" ; lin isthmus_N = mkN "地铁" ; lin it_Pron = S.it_Pron ; lin italian_A = mkA "意大利" ; -lin italian_N = mkN "意大利人" ; +lin italianMasc_N = mkN "意大利人" ; +lin italianFem_N = mkN "意大利人" ; lin italy_PN = mkPN "意大利" ; lin item_N = mkN "项" ; lin itemize_V2 = mkV2 "逐条列记" ; @@ -8305,7 +8306,6 @@ lin jam_VS = mkVS "堵塞" ; lin jamaican_A = mkA "牙买加" ; lin jamboree_N = mkN "少年团体大会" ; lin janitor_N = mkN "清洁工 " ; -lin january_PN = mkPN "一月" ; lin japan_PN = mkPN "日本" ; lin japaneseMasc_N = mkN "日本" ; lin japanese_A = mkA "日本" ; @@ -8396,7 +8396,6 @@ lin juggle_V = mkV "耍" ; lin juggle_V2 = mkV2 "欺骗" ; lin juggler_N = mkN "变戏法者" ; lin juice_N = mkN "果汁" "杯" ; -lin july_PN = mkPN "七月" ; lin jumbo_A = mkA "巨大" ; lin jump_N = mkN "跳" ; lin jump_V = L.jump_V ; @@ -8407,7 +8406,6 @@ lin jumpiness_N = mkN "跳动" "" ; lin jumpy_A = mkA "神经质" ; lin junction_N = mkN "连接点" ; lin juncture_N = mkN "接合" ; -lin june_PN = mkPN "六月" ; lin jungle_N = mkN "丛林" ;--"密林" ; lin junior_A = mkA "年少" ; lin junior_N = mkN "年少者" ; @@ -9285,8 +9283,6 @@ lin map_V2 = mkV2 "映射" ; lin mar_V2 = mkV2 "损伤" ; lin marathon_N = mkN "马拉松" ; lin marble_N = mkN "大理石" ; -lin march_N = mkN "行军" "次" ; -lin march_PN = mkPN "行军" ; lin march_V = mkV "前进" ; lin march_V2 = mkV2 "行军" ; lin mare_N = mkN "母马" "头" ; @@ -9394,8 +9390,6 @@ lin maximum_A = mkA "最大" ; lin maximum_N = mkN "最大" ; lin may_1_VV = mkVV "可能" ; ---- be possible lin may_2_VV = mkVV "可能" ; ---- be allowed -lin may_N = mkN "山楂树""棵" ; -lin may_PN = mkPN "五月" ; lin maybe_Adv = mkAdv "也许" ; lin mayonnaise_N = mkN "蛋黄酱" "份" ; lin mayor_N = mkN "市长" ; @@ -9776,7 +9770,6 @@ lin momentum_N = mkN "势头" ; lin monarch_N = mkN "君主" "个" ; lin monarchy_N = mkN "君主政体" ; lin monastery_N = mkN "修道院" ; -lin monday_PN = mkPN "星期一" ; lin monetary_A = mkA "货币" ; lin money_N = mkN "钱" ; lin monitor_N = mkN "监控" ; @@ -10244,7 +10237,6 @@ lin novel_A = mkA "新奇" ; lin novel_N = mkN "小说" ; lin novelist_N = mkN "小说家" ; lin novelty_N = mkN "新奇" [] ; -lin november_PN = mkPN "十一月" ; lin novice_N = mkN "初学者" ;--"新手" ; lin novitiate_N = mkN "见习" ; lin now_AdV = mkAdV "现在" ; @@ -10361,7 +10353,6 @@ lin occurrence_N = mkN "发生" ; lin ocean_N = mkN "海洋" ; lin octane_N = mkN "辛烷" ; lin octave_N = mkN "八度" ; -lin october_PN = mkPN "十月" ; lin octogenarian_N = mkN "八旬老人" ; lin odd_A = mkA "奇怪" ; lin odd_N = variants{} ; -- @@ -13467,7 +13458,8 @@ lin rush_V2 = mkV2 "赶" ; lin rush_VV = mkVV "赶" ; lin russia_PN = mkPN "俄国" ; lin russian_A = mkA "俄国" ; -lin russian_N = mkN "俄" ; +lin russianMasc_N = mkN "俄" ; +lin russianFem_N = mkN "俄" ; lin rust_V = mkV "生锈" ; lin rust_V2 = mkV2 "生锈" ; lin rusticate_V2 = mkV2 "变得乡气" ; @@ -13577,7 +13569,6 @@ lin satisfied_A = variants{} ; -- --subcat lin satisfy_V = mkV "满足" ; lin satisfy_V2 = mkV2 "满足" ; lin saturate_V2 = mkV2 "浸透" ; -lin saturday_PN = mkPN "星期六" ; lin sauce_N = mkN "酱" ; lin saucer_N = mkN "茶托" ; lin saucy_A = mkA "俏丽" ;--"漂亮的" ;--"活泼的" ; @@ -13909,7 +13900,6 @@ lin separate_V2 = mkV2 "分开" ; lin separately_Adv = variants{} ; -- lin separation_N = mkN "分割" ; lin sepsis_N = mkN "败血症" ; -lin september_PN = mkPN "九月" ; lin septuagenarian_N = mkN "年逾古稀的人" ; lin sequel_N = mkN "续集" "部" ; lin sequence_N = mkN "序列" ; @@ -15402,7 +15392,6 @@ lin sun_N = L.sun_N ; lin sun_V2 = mkV2 "使+晒" ; lin sun_drenched_A = mkA "阳光普照" ; lin sunburn_N = mkN "晒斑" ; -lin sunday_PN = mkPN "星期天" ; lin sundry_A = mkA "各种各样" ; lin sunflower_N = mkN "向日葵" "朵" ; lin sunlight_N = mkN "日光" [] ; @@ -16014,7 +16003,6 @@ lin thump_N = mkN "重击" ; lin thunder_N = mkN "雷" ; lin thunder_V = mkV "打雷" ; lin thunderstorm_N = mkN "雷雨" ; -lin thursday_PN = mkPN "星期二" ; lin thus_Adv = mkAdv "从而" ; lin thwart_V2 = mkV2 "阻挠" ; lin tick_N = mkN "滴答" "" ; @@ -16427,7 +16415,6 @@ lin tube_N = mkN "管子" ; lin tubular_A = mkA "管状" ; lin tuck_V = mkV "掖着" ; lin tuck_V2 = mkV2 "卷起" ; -lin tuesday_PN = mkPN "星期二" ; lin tug_N = mkN "拖船" "艘" ; lin tug_V = mkV "拽" ; lin tug_V2 = mkV2 "拖船" ; @@ -17394,7 +17381,6 @@ lin wedding_N = mkN "婚礼" ; lin wedge_N = mkN "楔子" ; lin wedge_V = mkV "契入" ; lin wedge_V2 = mkV2 "挤入" ; -lin wednesday_PN = mkPN "星期三" ; lin wee_A = mkA "凌晨" ; lin weed_N = mkN "杂草" ; lin week_N = mkN "星期" ; diff --git a/lib/src/translator/DictionaryDut.gf b/lib/src/translator/DictionaryDut.gf index 3f7ca2747..15768f786 100644 --- a/lib/src/translator/DictionaryDut.gf +++ b/lib/src/translator/DictionaryDut.gf @@ -6806,7 +6806,8 @@ lin freeze_V = L.freeze_V ; lin freeze_V2 = mkV2 (mkV "verstijven") ; -- status=guess, src=wikt lin freezer_N = mkN "vriezer" masculine | mkN "diepvriezer" masculine | mkN "diepvries" masculine ; -- status=guess status=guess status=guess lin freight_N = mkN "vracht" masculine | mkN "cargo" masculine ; -- status=guess status=guess -lin french_N = mkN "frieten" | mkN "patat" ; -- status=guess status=guess +lin frenchMasc_N = mkN "frieten" | mkN "patat" ; -- status=guess status=guess +lin frenchFem_N = mkN "frieten" | mkN "patat" ; -- status=guess status=guess lin frenetic_A = mkA "frenetiek" | mkA "bezeten" ; -- status=guess status=guess lin frenzy_N = mkN "razernij" feminine ; -- status=guess lin frequency_N = mkN "frequentiemodulatie" ; -- status=guess @@ -10032,7 +10033,6 @@ lin marathon_N = mkN "marathon" masculine ; -- status=guess lin maraud_V = mkV "roven" ; -- status=guess, src=wikt lin marauder_N = mkN "stroper" masculine ; -- status=guess lin marble_N = mkN "marmer" neuter ; -- status=guess -lin march_N = mkN "mars" ; -- status=guess lin march_V = mkV "marcheren" ; -- status=guess, src=wikt lin march_V2 = mkV2 (mkV "marcheren") ; -- status=guess, src=wikt lin mare_N = mkN "merrie" feminine ; -- status=guess @@ -18628,7 +18628,6 @@ lin antwerp_PN = mkPN "Antwerp" ; -- src=geonames status=guess lin apeldoorn_PN = mkPN "Apeldoorn" ; -- src=geonames status=guess lin approx_PN = mkPN "Approx" ; -- src=eng status=guess lin apr_PN = mkPN "Apr" ; -- src=eng status=guess -lin april_PN = mkPN "April" ; -- src=eng status=guess lin aquarius_PN = mkPN "Aquarius" ; -- src=eng status=guess lin arbroath_PN = mkPN "Arbroath" ; -- src=geonames status=guess lin ardrossan_PN = mkPN "Ardrossan" ; -- src=geonames status=guess @@ -18670,7 +18669,6 @@ lin audley_PN = mkPN "Audley" ; -- src=geonames status=guess lin audrey_PN = mkPN "Audrey" ; -- src=eng status=guess lin aug_PN = mkPN "Aug" ; -- src=eng status=guess lin augsburg_PN = mkPN "Augsburg" ; -- src=geonames status=guess -lin august_PN = mkPN "August" ; -- src=geonames status=guess lin australia_PN = mkPN "Australië" ; -- src=geonames status=guess lin austria_PN = mkPN "Oostenrijk" ; -- src=geonames status=guess lin ave_PN = mkPN "Ave" ; -- src=eng status=guess @@ -19185,7 +19183,6 @@ lin debbie_PN = mkPN "Debbie" ; -- src=eng status=guess lin debby_PN = mkPN "Debby" ; -- src=eng status=guess lin deborah_PN = mkPN "Deborah" ; -- src=eng status=guess lin dec_PN = mkPN "Dec" ; -- src=eng status=guess -lin december_PN = mkPN "December" ; -- src=eng status=guess lin deirdre_PN = mkPN "Deirdre" ; -- src=eng status=guess lin delaware_PN = mkPN "Delaware" ; -- src=geonames status=guess lin delhi_PN = mkPN "Delhi" ; -- src=geonames status=guess @@ -19375,7 +19372,6 @@ lin fawley_PN = mkPN "Fawley" ; -- src=eng status=guess lin fbi_PN = mkPN "FBI" ; -- src=eng status=guess lin featherstone_PN = mkPN "Featherstone" ; -- src=geonames status=guess lin feb_PN = mkPN "Feb" ; -- src=eng status=guess -lin february_PN = mkPN "February" ; -- src=eng status=guess lin felicity_PN = mkPN "Felicity" ; -- src=eng status=guess lin felix_PN = mkPN "Felix" ; -- src=eng status=guess lin felixstowe_PN = mkPN "Felixstowe" ; -- src=geonames status=guess @@ -19429,7 +19425,6 @@ lin frederiksberg_PN = mkPN "Frederiksberg" ; -- src=geonames status=guess lin freiburg_PN = mkPN "Freiburg im Breisgau" ; -- src=geonames status=guess lin freshwater_PN = mkPN "Freshwater" ; -- src=geonames status=guess lin fri_PN = mkPN "Fri" ; -- src=eng status=guess -lin friday_PN = mkPN "Friday" ; -- src=eng status=guess lin frinton_PN = mkPN "Frinton" ; -- src=eng status=guess lin frodsham_PN = mkPN "Frodsham" ; -- src=geonames status=guess lin frome_PN = mkPN "Frome" ; -- src=geonames status=guess @@ -19755,7 +19750,6 @@ lin jane_PN = mkPN "Jane" ; -- src=eng status=guess lin janet_PN = mkPN "Janet" ; -- src=eng status=guess lin janice_PN = mkPN "Janice" ; -- src=eng status=guess lin janie_PN = mkPN "Janie" ; -- src=eng status=guess -lin january_PN = mkPN "January" ; -- src=eng status=guess lin janus_PN = mkPN "Janus" ; -- src=eng status=guess lin japan_PN = mkPN "Japan" ; -- src=geonames status=guess lin jarrow_PN = mkPN "Jarrow" ; -- src=geonames status=guess @@ -19814,9 +19808,7 @@ lin julia_PN = mkPN "Julia" ; -- src=eng status=guess lin julian_PN = mkPN "Julian" ; -- src=geonames status=guess lin julie_PN = mkPN "Julie" ; -- src=eng status=guess lin juliet_PN = mkPN "Juliet" ; -- src=eng status=guess -lin july_PN = mkPN "July" ; -- src=eng status=guess lin jun_PN = mkPN "Jun" ; -- src=geonames status=guess -lin june_PN = mkPN "June" ; -- src=eng status=guess lin jupiter_PN = mkPN "Jupiter" ; -- src=geonames status=guess lin justin_PN = mkPN "Justin" ; -- src=geonames status=guess lin kalgan_PN = mkPN "Kalgan" ; -- src=eng status=guess @@ -20099,7 +20091,6 @@ lin mannheim_PN = mkPN "Mannheim" ; -- src=geonames status=guess lin mansfield_PN = mkPN "Mansfield" ; -- src=geonames status=guess lin mar_PN = mkPN "Mar" ; -- src=eng status=guess lin maracaibo_PN = mkPN "Maracaibo" ; -- src=geonames status=guess -lin march_PN = mkPN "March" ; -- src=geonames status=guess lin margaret_PN = mkPN "Margaret" ; -- src=geonames status=guess lin margate_PN = mkPN "Margate" ; -- src=geonames status=guess lin marge_PN = mkPN "Marge" ; -- src=eng status=guess @@ -20142,7 +20133,6 @@ lin mauritius_PN = mkPN "Mauritius" ; -- src=geonames status=guess lin mavis_PN = mkPN "Mavis" ; -- src=eng status=guess lin max_PN = mkPN "Max" ; -- src=eng status=guess lin maxine_PN = mkPN "Maxine" ; -- src=eng status=guess -lin may_PN = mkPN "May" ; -- src=eng status=guess lin mayfair_PN = mkPN "Mayfair" ; -- src=eng status=guess lin mayfield_PN = mkPN "Mayfield" ; -- src=geonames status=guess lin mayo_PN = mkPN "Mayo" ; -- src=geonames status=guess @@ -20222,7 +20212,6 @@ lin mon_PN = mkPN "Mon" ; -- src=geonames status=guess lin monaco_PN = mkPN "Monaco" ; -- src=geonames status=guess lin monaghan_PN = mkPN "Monaghan" ; -- src=geonames status=guess lin monchengladbach_PN = mkPN "Monchengladbach" ; -- src=eng status=guess -lin monday_PN = mkPN "Monday" ; -- src=eng status=guess lin mongolia_PN = mkPN "Mongolië" ; -- src=geonames status=guess lin monica_PN = mkPN "Monica" ; -- src=eng status=guess lin monifieth_PN = mkPN "Monifieth" ; -- src=eng status=guess @@ -20362,7 +20351,6 @@ lin nottinghamshire_PN = mkPN "Nottinghamshire" ; -- src=eng status=guess lin nov_PN = mkPN "Nov" ; -- src=geonames status=guess lin nova_scotia_PN = mkPN "Nova scotia" ; -- src=eng status=guess lin novara_PN = mkPN "Novara" ; -- src=geonames status=guess -lin november_PN = mkPN "November" ; -- src=eng status=guess lin novokuznetsk_PN = mkPN "Novokoeznetsk" ; -- src=geonames status=guess lin novosibirsk_PN = mkPN "Novosibirsk" ; -- src=geonames status=guess lin nr_PN = mkPN "Nr" ; -- src=eng status=guess @@ -20376,7 +20364,6 @@ lin occident_PN = mkPN "Occident" ; -- src=eng status=guess lin ockbrook_PN = mkPN "Ockbrook" ; -- src=eng status=guess lin ockendon_PN = mkPN "Ockendon" ; -- src=eng status=guess lin oct_PN = mkPN "Oct" ; -- src=eng status=guess -lin october_PN = mkPN "October" ; -- src=eng status=guess lin odessa_PN = mkPN "Odessa" ; -- src=geonames status=guess lin oedipus_PN = mkPN "Oedipus" ; -- src=eng status=guess lin offaly_PN = mkPN "Offaly" ; -- src=eng status=guess @@ -20739,7 +20726,6 @@ lin sarisbury_PN = mkPN "Sarisbury" ; -- src=eng status=guess lin saskatchewan_PN = mkPN "Saskatchewan" ; -- src=eng status=guess lin sassari_PN = mkPN "Sassari" ; -- src=geonames status=guess lin sat_PN = mkPN "Sat" ; -- src=eng status=guess -lin saturday_PN = mkPN "Saturday" ; -- src=eng status=guess lin saturn_PN = mkPN "Saturn" ; -- src=eng status=guess lin sauchie_PN = mkPN "Sauchie" ; -- src=eng status=guess lin saudi_arabia_PN = mkPN "Saudi arabia" ; -- src=eng status=guess @@ -20766,7 +20752,6 @@ lin semarang_PN = mkPN "Semarang" ; -- src=geonames status=guess lin senegal_PN = mkPN "Senegal" ; -- src=geonames status=guess lin seoul_PN = mkPN "Seoel" ; -- src=geonames status=guess lin sept_PN = mkPN "Sept" ; -- src=eng status=guess -lin september_PN = mkPN "September" ; -- src=eng status=guess lin seven_sisters_PN = mkPN "Seven sisters" ; -- src=eng status=guess lin sevenoaks_PN = mkPN "Sevenoaks" ; -- src=geonames status=guess lin sevilla_PN = mkPN "Sevilla" ; -- src=geonames status=guess @@ -20915,7 +20900,6 @@ lin sudbury_PN = mkPN "Sudbury" ; -- src=geonames status=guess lin sue_PN = mkPN "Sue" ; -- src=eng status=guess lin suffolk_PN = mkPN "Suffolk" ; -- src=geonames status=guess lin sumatra_PN = mkPN "Sumatra" ; -- src=eng status=guess -lin sunday_PN = mkPN "Sunday" ; -- src=eng status=guess lin sunderland_PN = mkPN "Sunderland" ; -- src=geonames status=guess lin supt_PN = mkPN "Supt" ; -- src=eng status=guess lin surabaja_PN = mkPN "Surabaja" ; -- src=eng status=guess @@ -21003,7 +20987,6 @@ lin thurcroft_PN = mkPN "Thurcroft" ; -- src=eng status=guess lin thurmaston_PN = mkPN "Thurmaston" ; -- src=eng status=guess lin thurrock_PN = mkPN "Thurrock" ; -- src=eng status=guess lin thurs_PN = mkPN "Thurs" ; -- src=eng status=guess -lin thursday_PN = mkPN "Thursday" ; -- src=eng status=guess lin thurso_PN = mkPN "Thurso" ; -- src=geonames status=guess lin tibet_PN = mkPN "Tibet" ; -- src=eng status=guess lin tidworth_PN = mkPN "Tidworth" ; -- src=geonames status=guess @@ -21051,7 +21034,6 @@ lin tsinan_PN = mkPN "Tsinan" ; -- src=eng status=guess lin tsingtao_PN = mkPN "Tsingtao" ; -- src=eng status=guess lin tsitsihar_PN = mkPN "Tsitsihar" ; -- src=eng status=guess lin tues_PN = mkPN "Tues" ; -- src=eng status=guess -lin tuesday_PN = mkPN "Tuesday" ; -- src=eng status=guess lin tullibody_PN = mkPN "Tullibody" ; -- src=eng status=guess lin tunbridge_wells_PN = mkPN "Tunbridge wells" ; -- src=eng status=guess lin tunis_PN = mkPN "Tunis" ; -- src=geonames status=guess @@ -21162,7 +21144,6 @@ lin watford_PN = mkPN "Watford" ; -- src=geonames status=guess lin wayne_PN = mkPN "Wayne" ; -- src=geonames status=guess lin wear_PN = mkPN "Wear" ; -- src=eng status=guess lin wed_PN = mkPN "Wed" ; -- src=eng status=guess -lin wednesday_PN = mkPN "Wednesday" ; -- src=eng status=guess lin wellingborough_PN = mkPN "Wellingborough" ; -- src=geonames status=guess lin wellington_PN = mkPN "Wellington" ; -- src=geonames status=guess lin wells_PN = mkPN "Wells" ; -- src=geonames status=guess diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index 55c6eafef..d5d3d3cbd 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -1164,7 +1164,6 @@ lin africa_PN = mkPN "Africa"; lin africanFem_N = mkN feminine (mkN "African" "Africans"); lin africanMasc_N = mkN masculine (mkN "African" "Africans"); lin african_A = compoundA (mkA "African"); -lin afrikaans_N = mkN "Afrikaans" ; lin afrikanerFem_N = mkN feminine (mkN "Afrikaner" "Afrikaners"); lin afrikanerMasc_N = mkN masculine (mkN "Afrikaner" "Afrikaners"); lin afrikaner_A = compoundA (mkA "Afrikaner"); @@ -2020,7 +2019,6 @@ lin amethystine_A = mkA "amethystine" ; lin ametria_N = mkN "ametria" ; lin ametropia_N = mkN "ametropia" ; lin ametropic_A = mkA "ametropic" ; -lin amharic_N = mkN "amharic" ; lin amiability_N = mkN "amiability" ; lin amiable_A = compoundA (mkA "amiable"); lin amicability_N = mkN "amicability" ; @@ -3181,8 +3179,6 @@ lin apractic_A = mkA "apractic" ; lin apraxia_N = mkN "apraxia" ; lin apres_ski_A = compoundA (mkA "après-ski"); lin apricot_N = mkN "apricot" "apricots"; -lin april_N = mkN "April" "Aprils"; -lin april_PN = mkPN "April"; lin apron_N = mkN "apron" "aprons"; lin apropos_A = compoundA (mkA "apropos"); lin apropos_Adv = mkAdv "apropos"; @@ -3223,7 +3219,6 @@ lin arabianFem_N = mkN feminine (mkN "Arabian" "Arabians"); lin arabianMasc_N = mkN masculine (mkN "Arabian" "Arabians"); lin arabian_A = compoundA (mkA "Arabian"); lin arabic_A = compoundA (mkA "Arabic"); -lin arabic_N = mkN "Arabic" ; lin arability_N = mkN "arability" ; lin arabist_N = mkN "arabist" "arabists"; lin arable_A = compoundA (mkA "arable"); @@ -4171,8 +4166,6 @@ lin augur_V = mkV "augur" "augurs" "augured" "augured" "auguring"; lin augur_V2 = mkV2 (mkV "augur" "augurs" "augured" "augured" "auguring"); lin augury_N = mkN "augury" "auguries"; lin august_A = compoundA (mkA "august"); -lin august_N = mkN "August" "Augusts"; -lin august_PN = mkPN "August"; lin augustan_A = compoundA (mkA "augustan"); lin auk_N = mkN "auk" "auks"; lin auklet_N = mkN "auklet" ; @@ -9449,7 +9442,8 @@ lin catacorner_A = mkA "catacorner" ; lin catadromous_A = mkA "catadromous" ; lin catafalque_N = mkN "catafalque" "catafalques"; lin catalan_A = compoundA (mkA "catalan"); -lin catalan_N = mkN "catalan" ; +lin catalanMasc_N = mkN "catalan" ; +lin catalanFem_N = mkN "catalan" ; lin catalase_N = mkN "catalase" ; lin catalatic_A = mkA "catalatic" ; lin catalectic_A = mkA "catalectic" ; @@ -10457,7 +10451,8 @@ lin chinchilla_N = mkN "chinchilla" "chinchillas"; lin chinchow_PN = mkPN "Chinchow"; lin chine_N = mkN "chine" "chines"; lin chinese_A = compoundA (mkA "Chinese"); -lin chinese_N = mkN "Chinese" "Chinese"; +lin chineseMasc_N = mkN "Chinese" "Chinese"; +lin chineseFem_N = mkN "Chinese" "Chinese"; lin chink_N = mkN "chink" "chinks"; lin chink_V = mkV "chink" "chinks" "chinked" "chinked" "chinking"; lin chink_V2 = mkV2 (mkV "chink" "chinks" "chinked" "chinked" "chinking"); @@ -14903,7 +14898,8 @@ lin dangleberry_N = mkN "dangleberry" ; lin daniel_N = mkN "daniel" "daniels"; lin daniel_PN = mkPN "Daniel"; lin danish_A = compoundA (mkA "Danish"); -lin danish_N = mkN "Danish" ; +lin danishMasc_N = mkN "Danish" ; +lin danishFem_N = mkN "Danish" ; lin dank_A = mkA "dank" "danker"; lin dankness_N = mkN "dankness" ; lin danny_PN = mkPN "Danny"; @@ -15223,8 +15219,6 @@ lin deceivingly_Adv = mkAdv "deceivingly"; lin decelerate_V = mkV "decelerate" "decelerates" "decelerated" "decelerated" "decelerating"; lin decelerate_V2 = mkV2 (mkV "decelerate" "decelerates" "decelerated" "decelerated" "decelerating"); lin deceleration_N = mkN "deceleration" ; -lin december_N = mkN "December" "Decembers"; -lin december_PN = mkPN "December"; lin decency_N = mkN "decency" "decencies"; lin decent_A = compoundA (mkA "decent"); lin decentralization_N = mkN (variants {"decentralization"; "decentralisation"}) ; @@ -18235,7 +18229,8 @@ lin dustmop_N = mkN "dustmop" ; lin dustpan_N = mkN "dustpan" "dustpans"; lin dusty_A = mkA "dusty" "dustier"; lin dutch_A = compoundA (mkA "Dutch"); -lin dutch_N = mkN "Dutch" "Dutch"; +lin dutchMasc_N = mkN "Dutch" "Dutch"; +lin dutchFem_N = mkN "Dutch" "Dutch"; lin dutchman_N = mkN masculine (mkN "dutchman" "dutchmen"); lin duteous_A = compoundA (mkA "duteous"); lin dutiable_A = compoundA (mkA "dutiable"); @@ -19325,7 +19320,8 @@ lin engineering_N = mkN "engineering"; lin enginery_N = mkN "enginery" ; lin england_PN = mkPN "England"; lin english_A = compoundA (mkA "English"); -lin english_N = mkN "English" ; +lin englishMasc_N = mkN "English" ; +lin englishFem_N = mkN "English" ; lin englishman_N = mkN masculine (mkN "englishman" "englishmen"); lin englishwoman_N = mkN feminine (mkN "englishwoman" "englishwomen"); lin engorgement_N = mkN "engorgement" ; @@ -21187,8 +21183,6 @@ lin feature_V2 = mkV2 (mkV "feature" "features" "featured" "featured" "featuring lin featureless_A = compoundA (mkA "featureless"); lin feb_PN = mkPN "Feb"; lin febrile_A = compoundA (mkA "febrile"); -lin february_N = mkN "February" "Februaries"; -lin february_PN = mkPN "February"; lin feckless_A = compoundA (mkA "feckless"); lin fecklessness_N = mkN "fecklessness" ; lin fecula_N = mkN "fecula" ; @@ -22981,7 +22975,8 @@ lin freight_train_N = mkN "freight-train" "freight-trains"; lin freighter_N = mkN "freighter" "freighters"; lin freightliner_N = mkN "freightliner" "freightliners"; lin french_A = compoundA (mkA "French"); -lin french_N = mkN "french" ; +lin frenchMasc_N = mkN "french" ; +lin frenchFem_N = mkN "french" ; lin frenchman_N = mkN masculine (mkN "frenchman" "frenchmen"); lin frenchwoman_N = mkN feminine (mkN "frenchwoman" "frenchwomen"); lin frenetic_A = compoundA (mkA "frenetic"); @@ -23030,8 +23025,6 @@ lin fricative_N = mkN "fricative" "fricatives"; lin friction_N = mkN "friction" "frictions"; lin frictional_A = mkA "frictional" ; lin frictionless_A = mkA "frictionless" ; -lin friday_N = mkN "Friday" "Fridays"; -lin friday_PN = mkPN "Friday"; lin fridge_N = mkN "fridge" "fridges"; lin friedcake_N = mkN "friedcake" ; lin friend_N = mkN "friend" "friends"; @@ -25086,7 +25079,8 @@ lin greed_N = mkN "greed" ; lin greediness_N = mkN "greediness" ; lin greedy_A = mkA "greedy" "greedier"; lin greek_A = compoundA (mkA "Greek"); -lin greek_N = mkN "Greek" "Greeks"; +lin greekMasc_N = mkN "Greek" "Greeks"; +lin greekFem_N = mkN "Greek" "Greeks"; lin green_A = mkA "green" "greener"; lin green_N = mkN "green" "greens"; lin greenback_N = mkN "greenback" "greenbacks"; @@ -26483,7 +26477,6 @@ lin hebephrenic_A = mkA "hebephrenic" ; lin hebetude_N = mkN "hebetude" ; lin hebraic_A = compoundA (mkA "hebraic"); lin hebrew_A = compoundA (mkA "hebrew"); -lin hebrew_N = mkN "hebrew" "hebrews"; lin hecatomb_N = mkN "hecatomb" "hecatombs"; lin heck_N = mkN "heck" "hecks"; lin heckelphone_N = mkN "heckelphone" ; @@ -27005,7 +26998,6 @@ lin hinder_V2 = mkV2 (mkV "hinder" "hinders" "hindered" "hindered" "hindering"); lin hindfoot_N = mkN "hindfoot" ; lin hindgut_N = mkN "hindgut" ; lin hindi_A = compoundA (mkA "hindi"); -lin hindi_N = mkN "hindi" ; lin hindmost_A = compoundA (mkA "hindmost"); lin hindquarter_N = mkN "hindquarter" ; lin hindquarters_N = mkN "hindquarters" ; @@ -30456,7 +30448,8 @@ lin isthmian_A = mkA "isthmian" ; lin isthmus_N = mkN "isthmus" "isthmuses"; lin it_Pron = mkPron "it" "it" "its" "its" singular P3 nonhuman; lin italian_A = compoundA (mkA "Italian"); -lin italian_N = mkN "Italian" "Italians"; +lin italianMasc_N = mkN "Italian" "Italians"; +lin italianFem_N = mkN "Italian" "Italians"; lin italic_A = compoundA (mkA "italic"); lin italic_N = mkN "italic" ; lin italicize_V2 = mkV2 (mkV "italicize" "italicizes" "italicized" "italicized" "italicizing"); @@ -30595,8 +30588,6 @@ lin janice_PN = mkPN "Janice"; lin janie_PN = mkPN "Janie"; lin janissary_N = mkN "janissary" ; lin janitor_N = mkN "janitor" "janitors"; -lin january_N = mkN "January" "Januaries"; -lin january_PN = mkPN "January"; lin janus_PN = mkPN "Janus"; lin japan_N = mkN "japan" ; lin japan_PN = mkPN "Japan"; @@ -30984,7 +30975,6 @@ lin julian_PN = mkPN "Julian"; lin julie_PN = mkPN "Julie"; lin julienne_N = mkN "julienne" ; lin juliet_PN = mkPN "Juliet"; -lin july_PN = mkPN "July"; lin jumble_N = mkN "jumble" "jumbles"; lin jumble_V = mkV "jumble" "jumbles" "jumbled" "jumbled" "jumbling"; lin jumble_V2 = mkV2 (mkV "jumble" "jumbles" "jumbled" "jumbled" "jumbling"); @@ -31011,8 +31001,6 @@ lin jun_PN = mkPN "Jun"; lin junco_N = mkN "junco" ; lin junction_N = mkN "junction" "junctions"; lin juncture_N = mkN "juncture" "junctures"; -lin june_N = mkN "June" "Junes"; -lin june_PN = mkPN "June"; lin jungle_N = mkN "jungle" "jungles"; lin jungly_A = mkA "jungly" "junglier"; lin junior_A = compoundA (mkA "junior"); @@ -32164,7 +32152,6 @@ lin lathery_A = mkA "lathery" ; lin lathi_N = mkN "lathi" "lathis"; lin laticifer_N = mkN "laticifer" ; lin latin_A = compoundA (mkA "latin"); -lin latin_N = mkN "latin" "latins"; lin latinate_A = mkA "latinate" ; lin latinist_N = mkN "latinist" "latinists"; lin latinize_V2 = mkV2 (mkV "latinize" "latinizes" "latinized" "latinized" "latinizing"); @@ -34435,7 +34422,8 @@ lin malta_PN = mkPN "Malta"; lin maltby_PN = mkPN "Maltby"; lin malted_N = mkN "malted" ; lin maltese_A = compoundA (mkA "maltese"); -lin maltese_N = mkN "maltese" "maltese"; +lin malteseMasc_N = mkN "maltese" "maltese"; +lin malteseFem_N = mkN "maltese" "maltese"; lin maltha_N = mkN "maltha" ; lin malthusian_A = compoundA (mkA "malthusian"); lin maltose_N = mkN "maltose" ; @@ -34679,8 +34667,6 @@ lin marblewood_N = mkN "marblewood" ; lin marbling_N = mkN "marbling" ; lin marc_N = mkN "marc" ; lin marcel_N = mkN "marcel" ; -lin march_N = mkN "March" "Marches"; -lin march_PN = mkPN "March"; lin march_V = mkV "march" "marches" "marched" "marched" "marching"; lin march_V2 = mkV2 (mkV "march" "marches" "marched" "marched" "marching"); lin marcher_N = mkN "marcher" "marchers"; @@ -35095,8 +35081,6 @@ lin maxine_PN = mkPN "Maxine"; lin maxwell_N = mkN "maxwell" ; lin may_1_VV = E.may_VV ; lin may_2_VV = E.may_VV ; -lin may_N = mkN "May" "Mays"; -lin may_PN = mkPN "May"; lin may_beetle_N = mkN "may-beetle" "may-beetles"; lin may_bug_N = mkN "may-bug" "may-bugs"; lin mayapple_N = mkN "mayapple" ; @@ -36613,8 +36597,6 @@ lin monatomic_A = mkA "monatomic" ; lin monaural_A = compoundA (mkA "monaural"); lin monazite_N = mkN "monazite" ; lin monchengladbach_PN = mkPN "Monchengladbach"; -lin monday_N = mkN "Monday" "Mondays"; -lin monday_PN = mkPN "Monday"; lin monegasque_A = compoundA (mkA "monegasque"); lin monegasque_N = mkN "monegasque" "monegasques"; lin moneran_A = mkA "moneran" ; @@ -38037,7 +38019,8 @@ lin nepal_PN = mkPN "Nepal"; lin nepalese_A = compoundA (mkA "nepalese"); lin nepalese_N = mkN "nepalese" "nepalese"; lin nepali_A = compoundA (mkA "nepali"); -lin nepali_N = mkN "nepali" "nepalis"; +lin nepaliMasc_N = mkN "nepali" "nepalis"; +lin nepaliFem_N = mkN "nepali" "nepalis"; lin nepheline_N = mkN "nepheline" ; lin nephelinite_N = mkN "nephelinite" ; lin nephew_N = mkN human (mkN "nephew" "nephews"); @@ -38881,7 +38864,8 @@ lin norton_PN = mkPN "Norton"; lin nortriptyline_N = mkN "nortriptyline" ; lin norway_PN = mkPN "Norway"; lin norwegian_A = compoundA (mkA "norwegian"); -lin norwegian_N = mkN "norwegian" "norwegians"; +lin norwegianMasc_N = mkN "norwegian" "norwegians"; +lin norwegianFem_N = mkN "norwegian" "norwegians"; lin norwich_PN = mkPN "Norwich"; lin nose_N = mkN "nose" "noses"; lin nose_V = mkV "nose" "noses" "nosed" "nosed" "nosing"; @@ -38988,8 +38972,6 @@ lin novelist_N = mkN "novelist" "novelists"; lin novelization_N = mkN "novelization" ; lin novella_N = mkN "novella" ; lin novelty_N = mkN "novelty" "novelties"; -lin november_N = mkN "November" "Novembers"; -lin november_PN = mkPN "November"; lin novena_N = mkN "novena" ; lin novice_N = mkN "novice" "novices"; lin noviciate_N = mkN "noviciate" "noviciates"; @@ -39373,8 +39355,6 @@ lin octavo_N = mkN "octavo" "octavos"; lin octet_N = mkN "octet" "octets"; lin octette_N = mkN "octette" "octettes"; lin octillion_N = mkN "octillion" ; -lin october_N = mkN "October" "Octobers"; -lin october_PN = mkPN "October"; lin octogenarian_A = compoundA (mkA "octogenarian"); lin octogenarian_N = mkN "octogenarian" "octogenarians"; lin octopod_N = mkN "octopod" ; @@ -49175,7 +49155,8 @@ lin romance_V2 = mkV2 (mkV "romance" "romances" "romanced" "romanced" "romancing lin romanesque_N = mkN "romanesque" ; lin romania_PN = mkPN "Romania"; lin romanian_A = compoundA (mkA "Romanian"); -lin romanian_N = mkN "Romanian" "Romanians"; +lin romanianMasc_N = mkN "Romanian" "Romanians"; +lin romanianFem_N = mkN "Romanian" "Romanians"; lin romantic_A = compoundA (mkA "romantic"); lin romantic_N = mkN "romantic" "romantics"; lin romantically_Adv = mkAdv "romantically"; @@ -49679,7 +49660,8 @@ lin russet_A = compoundA (mkA "russet"); lin russet_N = mkN "russet" "russets"; lin russia_PN = mkPN "Russia"; lin russian_A = compoundA (mkA "Russian"); -lin russian_N = mkN "Russian" "Russians"; +lin russianMasc_N = mkN "Russian" "Russians"; +lin russianFem_N = mkN "Russian" "Russians"; lin rust_A = mkA "rust" ; lin rust_N = mkN "rust" ; lin rust_V = mkV "rust" "rusts" "rusted" "rusted" "rusting"; @@ -50269,8 +50251,6 @@ lin satrap_N = mkN "satrap" "satraps"; lin satsuma_N = mkN "satsuma" "satsumas"; lin saturate_V2 = mkV2 (mkV "saturate" "saturates" "saturated" "saturated" "saturating"); lin saturation_N = mkN "saturation" ; -lin saturday_N = mkN "Saturday" "Saturdays"; -lin saturday_PN = mkPN "Saturday"; lin saturn_PN = mkPN "Saturn"; lin saturnalia_N = mkN "saturnalia" "saturnalias"; lin saturniid_N = mkN "saturniid" ; @@ -51553,8 +51533,6 @@ lin sept_PN = mkPN "Sept"; lin septal_A = mkA "septal" ; lin septation_N = mkN "septation" ; lin septectomy_N = mkN "septectomy" ; -lin september_N = mkN "September" "Septembers"; -lin september_PN = mkPN "September"; lin septet_N = mkN "septet" "septets"; lin septic_A = compoundA (mkA "septic"); lin septicaemia_N = mkN "septicaemia" ; @@ -56720,8 +56698,6 @@ lin sunburned_A = compoundA (mkA "sunburned"); lin sunburnt_A = compoundA (mkA "sunburnt"); lin sunburst_N = mkN "sunburst" "sunbursts"; lin sundae_N = mkN "sundae" "sundaes"; -lin sunday_N = mkN "Sunday" "Sundays"; -lin sunday_PN = mkPN "Sunday"; lin sunder_N = mkN "sunder" ; lin sunder_V2 = mkV2 (mkV "sunder" "sunders" "sundered" "sundered" "sundering"); lin sunderland_PN = mkPN "Sunderland"; @@ -57074,7 +57050,6 @@ lin swagger_N = mkN "swagger" "swaggers"; lin swagger_V = mkV "swagger" "swaggers" "swaggered" "swaggered" "swaggering"; lin swaggerer_N = mkN "swaggerer" "swaggerers"; lin swagman_N = mkN "swagman" ; -lin swahili_N = mkN "swahili" ; lin swain_N = mkN "swain" "swains"; lin swale_N = mkN "swale" ; lin swallow_N = mkN "swallow" "swallows"; @@ -57153,7 +57128,8 @@ lin swedeMasc_N = mkN masculine (mkN "Swede" "Swedes"); lin swede_A = compoundA (mkA "Swedish") ; --- swede is not and adjective lin sweden_PN = mkPN "Sweden"; lin swedish_A = compoundA (mkA "Swedish"); -lin swedish_N = mkN "Swedish" ; -- | language +lin swedishMasc_N = mkN "Swedish" ; -- | language +lin swedishFem_N = mkN "Swedish" ; -- | language lin sweep_N = mkN "sweep" "sweeps"; lin sweep_V = IrregEng.sweep_V; lin sweep_V2 = mkV2 (IrregEng.sweep_V); @@ -58533,7 +58509,8 @@ lin textual_A = compoundA (mkA "textual"); lin texture_N = mkN "texture" "textures"; lin textured_A = compoundA (mkA "textured"); lin thai_A = compoundA (mkA "Thai"); -lin thai_N = mkN "thai" "thais"; +lin thaiMasc_N = mkN "thai" "thais"; +lin thaiFem_N = mkN "thai" "thais"; lin thailand_PN = mkPN "Thailand"; lin thalamocortical_A = mkA "thalamocortical" ; lin thalamus_N = mkN "thalamus" ; @@ -59000,8 +58977,6 @@ lin thurifer_N = mkN "thurifer" ; lin thurmaston_PN = mkPN "Thurmaston"; lin thurrock_PN = mkPN "Thurrock"; lin thurs_PN = mkPN "Thurs"; -lin thursday_N = mkN "Thursday" "Thursdays"; -lin thursday_PN = mkPN "Thursday"; lin thurso_PN = mkPN "Thurso"; lin thus_Adv = mkAdv "thus"; lin thwack_N = mkN "thwack" "thwacks"; @@ -60591,8 +60566,6 @@ lin tuck_up_V2 = mkV2 (partV (mkV "tuck") "up"); lin tucker_N = mkN "tucker" "tuckers"; lin tudung_N = mkN "tudung" ; lin tues_PN = mkPN "Tues"; -lin tuesday_N = mkN "Tuesday" "Tuesdays"; -lin tuesday_PN = mkPN "Tuesday"; lin tufa_N = mkN "tufa" ; lin tuff_N = mkN "tuff" ; lin tuft_N = mkN "tuft" "tufts"; @@ -60690,7 +60663,8 @@ lin turk_N = mkN "Turk" "Turks"; lin turkey_N = mkN "Turkey" "Turkeys"; lin turkey_PN = mkPN "Turkey"; lin turkish_A = compoundA (mkA "Turkish"); -lin turkish_N = mkN "Turkish" ; +lin turkishMasc_N = mkN "Turkish" ; +lin turkishFem_N = mkN "Turkish" ; lin turku_PN = mkPN "Turku"; lin turmeric_N = mkN "turmeric" ; lin turmoil_N = mkN "turmoil" "turmoils"; @@ -62805,7 +62779,6 @@ lin urceolate_A = mkA "urceolate" ; lin urceole_N = mkN "urceole" ; lin urchin_N = mkN "urchin" "urchins"; lin urdu_A = compoundA (mkA "urdu"); -lin urdu_N = mkN "urdu" ; lin urea_N = mkN "urea" ; lin urease_N = mkN "urease" ; lin uremia_N = mkN "uremia" ; @@ -64457,8 +64430,6 @@ lin wedge_V = mkV "wedge" "wedges" "wedged" "wedged" "wedging"; lin wedge_V2 = mkV2 (mkV "wedge" "wedges" "wedged" "wedged" "wedging"); lin wedgie_N = mkN "wedgie" ; lin wedlock_N = mkN "wedlock" ; -lin wednesday_N = mkN "Wednesday" "Wednesdays"; -lin wednesday_PN = mkPN "Wednesday"; lin wee_A = compoundA (mkA "wee"); lin wee_N = mkN "wee" "wees"; lin wee_V = mkV "wee" "wees" "weed" "weed" "weeing"; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 02385f4e9..46f7cc5b9 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -1094,7 +1094,6 @@ lin afresh_Adv = mkWAdv (k99 "uudelleen") ; --UNCHK lin africanFem_N = mkWN "Afrikka" ; --UNCHK lin africanMasc_N = mkWN "Afrikka" ; --UNCHK lin african_A = mkWA (k38 "afrikkalainen") ; --UNCHK -lin afrikaans_N = mkWN (k5 "afrikaans") ; --UNCHK lin afrikanerFem_N = mkWN (k5 "buuri") ; --UNCHK lin afrikanerMasc_N = mkWN (k5 "buuri") ; --UNCHK lin afrikaner_A = mkWA (compoundA "buuri" (k38 "lainen")) ; --UNCHK @@ -1840,7 +1839,6 @@ lin amethystine_A = mkWA (compoundA "ametisti" (k38 "mainen")) ; --UNCHK lin ametria_N = mkWN "ametria" ; --UNCHK lin ametropia_N = mkWN "ametropia" ; --UNCHK lin ametropic_A = mkWA (compoundA "ame" (k38 "trooppinen")) ; --UNCHK -lin amharic_N = mkWN (k26 "kieli") "Etiopian" ; --UNCHK lin amiability_N = mkWN (k40 "sydämellisyys") ; --UNCHK lin amiable_A = mkWA (k10 "mukava") ; --UNCHK lin amicability_N = mkWN (k40 "sovinnollisuus") ; --UNCHK @@ -2891,8 +2889,6 @@ lin appurtenance_N = mkWN (k48 "varuste") ; --UNCHK lin apractic_A = mkWA "apraksinen" ; --UNCHK lin apraxia_N = mkWN "haparoivuus" ; --UNCHK lin apricot_N = mkWN (k5 "aprikoosi") ; --UNCHK -lin april_N = mkWN (compoundN "huhti" (k18 "kuu")) ; --UNCHK -lin april_PN = mkPN (mkN "huhti" (mkN "kuu")) ; lin apron_N = mkWN (k1 "essu") ; --UNCHK lin apropos_A = mkWA (k99 "sopivasti") ; --UNCHK lin apropos_Adv = mkWAdv (k99 "muuten") ; --UNCHK @@ -2926,7 +2922,6 @@ lin arabianFem_N = mkWN (k38 "arabialainen") ; --UNCHK lin arabianMasc_N = mkWN (k38 "arabialainen") ; --UNCHK lin arabian_A = mkWA (k38 "arabialainen") ; --UNCHK lin arabic_A = mkWA (k38 "arabialainen") ; --UNCHK -lin arabic_N = mkWN (k26 "kieli") "arabian" ; --UNCHK lin arability_N = mkWN (compoundN "viljelys" (k40 "kelpoisuus")) ; --UNCHK lin arabist_N = mkWN (k5 "arabisti") ; --UNCHK lin arable_A = mkWA (compoundA "viljely" (k38 "kelpoinen")) ; --UNCHK @@ -3772,7 +3767,6 @@ lin augur_V = mkWV (k69 "merkitä") ; --UNCHK lin augur_V2 = mkWV2 (k69 "merkitä") ; --UNCHK lin augury_N = mkWN (k48A "enne") ; --UNCHK lin august_A = mkWA (compoundA "kunnian" (k10 "arvoisa")) ; --UNCHK -lin august_N = mkWN (compoundN "elo" (k18 "kuu")) ; --UNCHK --geo lin august_PN = mkPN (mkN "elo" (mkN "kuu")) ; lin auk_N = mkWN (k5A "ruokki") ; --UNCHK lin auklet_N = mkWN (compoundN "pikku" (k5A "ruokki")) ; --UNCHK @@ -8288,7 +8282,8 @@ lin catacorner_A = mkWA (k99 "viistosti") ; --UNCHK lin catadromous_A = mkWA "katadrominen" ; --UNCHK lin catafalque_N = mkWN (k5A "katafalkki") ; --UNCHK lin catalan_A = mkWA (compoundA "katalonia" (k38 "lainen")) ; --UNCHK -lin catalan_N = mkWN (k5 "katalaani") ; --UNCHK +lin catalanMasc_N = mkWN (k5 "katalaani") ; --UNCHK +lin catalanFem_N = mkWN (k5 "katalaani") ; --UNCHK lin catalase_N = mkWN (compoundN "katal" (k5 "aasi")) ; --UNCHK lin catalatic_A = mkWA "katalaasi-" ; --UNCHK lin catalectic_A = mkWA "katalektinen" ; --UNCHK @@ -9175,7 +9170,8 @@ lin chincherinchee_N = mkWN (compoundN "afrikan" (k9 "lilja")) ; --UNCHK lin chinchilla_N = mkWN (k9 "sinsilla") ; --UNCHK lin chine_N = mkWN (compoundN "selkä" (k9A "ranka")) ; --UNCHK lin chinese_A = mkWA (k38 "kiinalainen") ; -lin chinese_N = mkWN (k9 "kiina") ; --UNCHK +lin chineseMasc_N = mkWN (k9 "kiina") ; --UNCHK +lin chineseFem_N = mkWN (k9 "kiina") ; --UNCHK lin chink_N = mkWN (k39 "kilahdus") ; --UNCHK lin chink_V = mkWV (k53A "aiheuttaa") "halkeama" ; --UNCHK lin chink_V2 = mkWV2 (k53A "aiheuttaa") "halkeama" ; --UNCHK @@ -13042,7 +13038,8 @@ lin dangle_V2 = mkWV2 (k53 "ripustaa") ; --UNCHK lin dangleberry_N = mkWN (compoundN "frond" (k10 "osa")) "Gaylussacia" ; --UNCHK lin daniel_N = mkWN (k9 "kirja") "profeetta" "Danielin" ; --UNCHK lin danish_A = mkWA (k38 "tanskalainen") ; -lin danish_N = mkWN (k26 "kieli") "tanskan" ; --UNCHK +lin danishMasc_N = mkWN (k26 "kieli") "tanskan" ; --UNCHK +lin danishFem_N = mkWN (k26 "kieli") "tanskan" ; --UNCHK lin dank_A = mkWA (k15 "kostea") ; --UNCHK lin dankness_N = mkWN (k40 "nihkeys") ; --UNCHK lin danse_macabre_N = mkWN (compoundN "kuoleman" (k5 "tanssi")) ; --UNCHK @@ -13309,8 +13306,6 @@ lin deceivingly_Adv = mkWAdv (k99 "valheellisesti") ; --UNCHK lin decelerate_V = mkWV (k53 "hidastaa") ; --UNCHK lin decelerate_V2 = mkWV2 (k53 "hidastaa") ; --UNCHK lin deceleration_N = mkWN (compoundN "hidas" (k38 "taminen")) ; --UNCHK -lin december_N = mkWN (compoundN "joulu" (k18 "kuu")) ; --UNCHK -lin december_PN = mkPN (mkN "joulu" (mkN "kuu")) ; lin decency_N = mkWN (k40 "säädyllisyys") ; --UNCHK lin decent_A = mkWA (k38 "säädyllinen") ; --UNCHK lin decentralization_N = mkWN (compoundN "haja" (k38 "uttaminen")) ; --UNCHK @@ -15992,7 +15987,8 @@ lin dustmop_N = mkWN (compoundN "pöly" (k5A "moppi")) ; --UNCHK lin dustpan_N = mkWN (k6 "kihveli") ; --UNCHK lin dusty_A = mkWA (k10 "koinsyömä") ; --UNCHK lin dutch_A = mkWA (k38 "hollantilainen") ; --UNCHK -lin dutch_N = mkWN (k5A "hollanti") ; --UNCHK +lin dutchMasc_N = mkWN (k5A "hollanti") ; --UNCHK +lin dutchFem_N = mkWN (k5A "hollanti") ; --UNCHK lin dutchman_N = mkWN (k38 "hollantilainen") ; --UNCHK lin duteous_A = mkWA (k38 "kuuliainen") ; --UNCHK lin dutiable_A = mkWA (compoundA "tullin" (k38 "alainen")) ; --UNCHK @@ -18648,8 +18644,6 @@ lin feature_N = mkN "piirre" | mkWN (compoundN "erikois" (k6 "artikkeli")) ; --- lin feature_V2 = mkV2 "esittää" ; lin featureless_A = mkWA (k38 "yksitoikkoinen") ; --UNCHK lin febrile_A = mkWA "kuume-" ; --UNCHK -lin february_N = mkWN (compoundN "helmi" (k18 "kuu")) ; --UNCHK -lin february_PN = mkPN (mkN "helmi" (mkN "kuu")) ; lin feckless_A = mkWA (k34A "avuton") ; --UNCHK lin fecklessness_N = mkWN (k40 "avuttomuus") ; --UNCHK lin fecula_N = mkWN (k48 "uloste") ; --UNCHK @@ -20212,7 +20206,8 @@ lin freight_V2 = mkWV2 (k73A "rahdata") ; --UNCHK lin freight_train_N = mkWN (compoundN "tavara" (k10 "juna")) ; --UNCHK lin freighter_N = mkWN (compoundN "kauppa-" (k39 "alus")) ; --UNCHK lin french_A = mkWA (k38 "gallialainen") ; --UNCHK -lin french_N = mkWN (k9 "ranska") ; --UNCHK +lin frenchMasc_N = mkWN (k9 "ranska") ; --UNCHK +lin frenchFem_N = mkWN (k9 "ranska") ; --UNCHK lin frenchman_N = mkWN (k38 "ranskalainen") ; --UNCHK lin frenchwoman_N = mkWN (k38 "ranskalainen") ; --UNCHK lin frenetic_A = mkWA (k10 "raivoisa") ; --UNCHK @@ -20256,8 +20251,6 @@ lin fricative_N = mkWN (k5A "konsonantti") "frikatiivinen" ; --UNCHK lin friction_N = mkWN (k39 "hankaus") ; --UNCHK lin frictional_A = mkWA "kitka-" ; --UNCHK lin frictionless_A = mkWA (k34A "kitkaton") ; --UNCHK -lin friday_N = mkWN (k18 "perjantai") ; --UNCHK -lin friday_PN = mkPN "perjantai" ; lin fridge_N = L.fridge_N ; lin friedcake_N = mkWN (k38 "leivonnainen") "rasvassa" "keitetty" ; --UNCHK lin friend_N = L.friend_N ; @@ -21945,7 +21938,8 @@ lin greed_N = mkWN (k40 "kyltymättömyys") ; --UNCHK lin greediness_N = mkWN (k40 "kyltymättömyys") ; --UNCHK lin greedy_A = mkWA (k48 "ahne") ; lin greek_A = mkWA (k38 "helleeninen") ; --UNCHK -lin greek_N = mkWN (k26 "kieli") "helleeninen" ; --UNCHK +lin greekMasc_N = mkWN (k26 "kieli") "helleeninen" ; --UNCHK +lin greekFem_N = mkWN (k26 "kieli") "helleeninen" ; --UNCHK lin green_A = L.green_A ; lin green_N = mkN "vihreä" ; --mkWN "super" "C" ; lin greenback_N = mkWN (k6 "seteli") "dollarin" ; --UNCHK @@ -23077,7 +23071,6 @@ lin hebephrenic_A = mkWA "hebefreninen" ; --UNCHK lin hebetude_N = mkWN (compoundN "tylsämiel" (k40 "isyys")) ; --UNCHK lin hebraic_A = mkWA (k38 "heprealainen") ; --UNCHK lin hebrew_A = mkWA (k38 "heprealainen") ; --UNCHK -lin hebrew_N = mkWN (k12 "heprea") ; --UNCHK lin hecatomb_N = mkWN "hekatombi" ; --UNCHK lin heck_N = mkN "hitto" ; lin heckelphone_N = mkWN (compoundN "baritoni" (k3 "oboe")) ; --UNCHK @@ -23520,7 +23513,6 @@ lin hinder_V2 = mkWV2 (k73A "haitata") ; --UNCHK lin hindfoot_N = mkWN (compoundN "taka" (k10 "osa")) "jalkaterän" ; --UNCHK lin hindgut_N = mkWN (compoundN "taka" (k26 "suoli")) ; --UNCHK lin hindi_A = mkWA (k38 "hindulainen") ; --UNCHK -lin hindi_N = mkWN (k5 "hindi") ; --UNCHK lin hindmost_A = mkWA (k38 "viimeinen") ; --UNCHK lin hindquarter_N = mkWN (k48 "viipale") ; --UNCHK lin hindquarters_N = mkWN (k10 "perä") ; --UNCHK @@ -26609,7 +26601,8 @@ lin isthmian_A = mkWA "kannaksen" "muodostava" ; --UNCHK lin isthmus_N = mkWN (k10 "sola") ; --UNCHK lin it_Pron = S.it_Pron ; lin italian_A = mkWA (k38 "italialainen") ; --UNCHK -lin italian_N = mkWN (k12 "italia") ; --UNCHK +lin italianMasc_N = mkWN (k12 "italia") ; --UNCHK +lin italianFem_N = mkWN (k12 "italia") ; --UNCHK lin italic_A = mkWA (compoundA "ita" (k38 "alinen")) ; --UNCHK lin italic_N = mkWN (k5 "kursiivi") ; --UNCHK lin italicize_V2 = mkWV2 (k62 "kursivoida") ; --UNCHK @@ -26709,8 +26702,6 @@ lin jangle_N = mkWN (kH1 "kolina") ; --UNCHK lin jangle_V = mkWV (k66 "kalista") ; --UNCHK lin jangle_V2 = mkWV2 (k66 "kalista") ; --UNCHK lin janitor_N = mkWN (k10 "siivooja") ; --UNCHK -lin january_N = mkWN (compoundN "tammi" (k18 "kuu")) ; --UNCHK -lin january_PN = mkPN (mkN "tammi" (mkN "kuu")) ; lin japan_N = mkWN (kH1 "lakka") "japanilainen" ; --UNCHK --geo lin japan_PN = mkPN "Japani" ; lin japaneseMasc_N = mkN "japanilainen" ; @@ -27003,8 +26994,6 @@ lin jukebox_N = mkWN (k5 "jukeboksi") ; --UNCHK lin julep_N = mkWN (k5 "grogi") ; --UNCHK lin julian_A = mkWA "Juliaaninen" ; --UNCHK lin julienne_N = mkWN (compoundN "juli" (k48A "enne")) ; --UNCHK -lin july_N = mkWN (compoundN "heinä" (k18 "kuu")) ; --UNCHK -lin july_PN = mkPN (mkN "heinä" (mkN "kuu")) ; lin jumble_N = mkWN (k1 "sotku") ; --UNCHK lin jumble_V = mkWV (k53A "sekoittaa") ; --UNCHK lin jumble_V2 = mkWV2 (k53A "sekoittaa") ; --UNCHK @@ -27022,8 +27011,6 @@ lin jumpy_A = mkWA (k38 "kuoppainen") ; --UNCHK lin junco_N = mkWN "junco" ; --UNCHK lin junction_N = mkWN (k39 "liitos") ; --UNCHK lin juncture_N = mkWN (k39 "tapaus") ; --UNCHK -lin june_N = mkWN (compoundN "kesä" (k18 "kuu")) ; --UNCHK -lin june_PN = mkPN (mkN "kesä" (mkN "kuu")) ; lin jungle_N = mkWN (k4A "viidakko") ; --UNCHK lin jungly_A = mkWA (compoundA "viidakko" (k38 "mainen")) ; --UNCHK lin junior_A = mkWA (k16A "alempi") ; --UNCHK @@ -27942,7 +27929,6 @@ lin lather_V2 = mkWV2 (k53A "vaahdottaa") ; --UNCHK lin lathery_A = mkWA "vaahtoava" ; --UNCHK lin lathi_N = mkWN "lathi" ; --UNCHK lin latin_A = mkWA (k38 "latinalainen") ; --UNCHK -lin latin_N = mkWN (k12 "latina") ; --UNCHK lin latinate_A = mkWA (compoundA "lati" (k38 "nalaisperäinen")) ; --UNCHK lin latinist_N = mkWN (k5 "latinisti") ; --UNCHK lin latinize_V2 = mkWV2 (k53A "käännyttää") ; --UNCHK @@ -29817,7 +29803,8 @@ lin malt_V2 = mkWV2 (k53 "mallastaa") ; --UNCHK --geo lin malta_PN = mkPN "Malta" ; lin malted_N = mkWN (k1A "maito") "mallastettu" ; --UNCHK lin maltese_A = mkWA (compoundA "malt" (k38 "alainen")) ; --UNCHK -lin maltese_N = mkWN (compoundN "maltan" (k10 "koira")) ; --UNCHK +lin malteseMasc_N = mkWN (compoundN "maltan" (k10 "koira")) ; --UNCHK +lin malteseFem_N = mkWN (compoundN "maltan" (k10 "koira")) ; --UNCHK lin maltha_N = mkWN (compoundN "luonnon" (k6 "bitumi")) ; --UNCHK lin malthusian_A = mkWA (compoundA "malthusi" (k38 "lainen")) ; --UNCHK lin maltose_N = mkWN (k5 "maltoosi") ; --UNCHK @@ -30033,7 +30020,6 @@ lin marblewood_N = mkWN "Diospyros" "kurzii" ; --UNCHK lin marbling_N = mkWN (k5A "marmorointi") ; --UNCHK lin marc_N = mkWN (compoundN "marc-" (k1 "brandy")) ; --UNCHK lin marcel_N = mkWN "marcel" ; --UNCHK -lin march_N = mkN "marssi" ; --WN (k39 "kehitys") ; --geo lin march_PN = mkPN (mkN "maalis" (mkN "kuu")) ; lin march_V = mkWV (k52A "liittyä") "päittäin" ; --UNCHK lin march_V2 = mkWV2 (k52A "liittyä") "päittäin" ; --UNCHK @@ -30379,8 +30365,6 @@ lin maximum_A = mkWA (k38 "maksimaalinen") ; --UNCHK lin maximum_N = mkWN (k1 "taso") "paras" ; --UNCHK lin may_1_VV = mkVV (mkV "saattaa") ; lin may_2_VV = mkVV (mkV "saada") ; -lin may_N = mkWN (compoundN "ora" (k10 "pihlaja")) ; --UNCHK -lin may_PN = mkPN (mkN "touko" (mkN "kuu")) ; lin may_beetle_N = mkWN (k50 "kovakuoriainen") ; --UNCHK lin may_bug_N = mkWN (k50 "kovakuoriainen") ; --UNCHK lin mayapple_N = mkWN (compoundN "happo" (k9 "marja")) ; --UNCHK @@ -31726,8 +31710,6 @@ lin monasticism_N = mkWN (compoundN "luostari" (k39 "laitos")) ; --UNCHK lin monatomic_A = mkWA (compoundA "yks" (k38 "iatominen")) ; --UNCHK lin monaural_A = mkWA (compoundA "monaura" (k38 "alinen")) ; --UNCHK lin monazite_N = mkWN "monatsiitti" ; --UNCHK -lin monday_N = mkWN (k99 "ma") ; --UNCHK -lin monday_PN = mkPN "maanantai" ; lin monegasque_A = mkWA (compoundA "monaco" (k38 "lainen")) ; --UNCHK lin monegasque_N = mkWN (compoundN "monaco" (k38 "lainen")) ; --UNCHK lin moneran_A = mkWA "moneraaninen" ; --UNCHK @@ -32989,7 +32971,8 @@ lin neotony_N = mkWN "neotenia" ; --UNCHK lin nepalese_A = mkWA (compoundA "nepali" (k38 "lainen")) ; --UNCHK lin nepalese_N = mkWN (compoundN "nepali" (k38 "lainen")) ; --UNCHK lin nepali_A = mkWA (compoundA "nepali" (k38 "lainen")) ; --UNCHK -lin nepali_N = mkWN "nepal" ; --UNCHK +lin nepaliMasc_N = mkWN "nepal" ; --UNCHK +lin nepaliFem_N = mkWN "nepal" ; --UNCHK lin nepheline_N = mkWN (compoundN "nef" (k5A "eliitti")) ; --UNCHK lin nephelinite_N = mkWN (compoundN "nef" (k5A "eliitti")) ; --UNCHK lin nephew_N = mkWN (compoundN "veljen" (k10A "poika")) ; --UNCHK @@ -33697,7 +33680,8 @@ lin northwestward_Adv = mkWAdv "luoteeseen" ; --UNCHK lin nortriptyline_N = mkWN "Pamelor" ; --UNCHK --geo lin norway_PN = mkPN "Norja" ; lin norwegian_A = mkWA (k38 "norjalainen") ; --UNCHK -lin norwegian_N = mkWN (kH1 "norja") ; --UNCHK +lin norwegianMasc_N = mkWN (kH1 "norja") ; --UNCHK +lin norwegianFem_N = mkWN (kH1 "norja") ; --UNCHK lin nose_N = L.nose_N ; lin nose_V = mkWV (k53A "voittaa") "täpärästi" ; --UNCHK lin nose_V2 = mkWV2 (k53A "voittaa") "täpärästi" ; --UNCHK @@ -33785,8 +33769,6 @@ lin novelette_N = mkWN (k5 "novelli") ; --UNCHK lin novelist_N = mkN "romaanikirjailija" ; lin novelization_N = mkWN (compoundN "kirjo" (k38 "ittaminen")) "romaaniksi" ; --UNCHK lin novelty_N = mkWN (k1 "koru") ; --UNCHK -lin november_N = mkWN (compoundN "marras" (k18 "kuu")) ; --UNCHK -lin november_PN = mkPN (mkN "marras" (mkN "kuu")) ; lin novena_N = mkWN "novena" ; --UNCHK lin novice_N = mkWN (k10 "aloittaja") ; --UNCHK lin noviciate_N = mkWN (k9A "noviisiaika") ; --UNCHK @@ -34136,8 +34118,6 @@ lin octave_N = mkWN (k2 "säkeistö") "kahdeksan" "säkeen" ; --UNCHK lin octet_N = mkWN (k1A "oktetto") ; --UNCHK lin octette_N = mkWN (k1A "oktetto") ; --UNCHK lin octillion_N = mkWN "oktiljoona" ; --UNCHK -lin october_N = mkWN (compoundN "loka" (k18 "kuu")) ; --UNCHK -lin october_PN = mkPN (mkN "loka" (mkN "kuu")) ; lin octogenarian_A = mkWA "kahdeksankymmenvuotias" ; --UNCHK lin octogenarian_N = mkWN (compoundN "kahdeksan" (k38 "kymppinen")) ; --UNCHK lin octopod_N = mkWN (compoundN "kahdeksan" (k38 "lonkeroinen")) ; --UNCHK @@ -42859,7 +42839,8 @@ lin romance_V2 = mkWV2 (k62 "romantisoida") ; --UNCHK lin romanesque_N = mkWN (k5 "arkkitehtuuri") "romaaninen" ; --UNCHK --geo lin romania_PN = mkPN "Romania" ; lin romanian_A = mkWA (k38 "romanialainen") ; --UNCHK -lin romanian_N = mkWN (k12 "romania") ; --UNCHK +lin romanianMasc_N = mkWN (k12 "romania") ; --UNCHK +lin romanianFem_N = mkWN (k12 "romania") ; --UNCHK lin romantic_A = mkWA (k38 "romanttinen") ; lin romantic_N = mkWN (k1A "romantikko") ; --UNCHK lin romantically_Adv = mkWAdv (k99 "romanttisesti") ; --UNCHK @@ -43258,7 +43239,8 @@ lin russet_A = mkWA (compoundA "puna" (k15 "ruskea")) ; --UNCHK lin russet_N = mkWN (kH1 "kangas") "kotikutoinen" ; --UNCHK --geo lin russia_PN = mkPN "Venäjä" ; lin russian_A = mkWA (k38 "venäläinen") ; --UNCHK -lin russian_N = mkWN (k10 "venäjä") ; --UNCHK +lin russianMasc_N = mkWN (k10 "venäjä") ; --UNCHK +lin russianFem_N = mkWN (k10 "venäjä") ; --UNCHK lin rust_A = mkWA (compoundA "ruosteen" (k38 "värinen")) ; --UNCHK lin rust_N = mkWN (compoundN "ruoste" (k26 "sieni")) ; --UNCHK lin rust_V = mkWV (k52 "ruostua") ; --UNCHK @@ -43760,8 +43742,6 @@ lin satrap_N = mkWN (k5A "satraappi") ; --UNCHK lin satsuma_N = mkWN (k10 "satsuma") ; --UNCHK lin saturate_V2 = mkWV2 (k53 "kyllästää") ; --UNCHK lin saturation_N = mkWN (compoundN "kyllä" (k38 "stäminen")) ; --UNCHK -lin saturday_N = mkWN (k5A "sapatti") ; --UNCHK -lin saturday_PN = mkPN "lauantai" ; lin saturniid_N = mkWN (compoundN "riikinkukko" (k10 "kehrääjä")) ; --UNCHK lin saturnine_A = mkWA (k15 "äreä") ; --UNCHK lin satyr_N = mkWN (k10 "jumala") "metsän" ; --UNCHK @@ -44864,8 +44844,6 @@ lin sepsis_N = mkWN (k39 "sepsis") ; --UNCHK lin septal_A = mkWA (compoundA "septa" (k38 "alinen")) ; --UNCHK lin septation_N = mkWN (compoundN "väli" (k10 "seinä")) ; --UNCHK lin septectomy_N = mkWN (k1 "poisto") "väliseinän" ; --UNCHK -lin september_N = mkWN (compoundN "syys" (k18 "kuu")) ; --UNCHK -lin september_PN = mkPN (mkN "syys" (mkN "kuu")) ; lin septet_N = mkWN (k1A "septetto") ; --UNCHK lin septic_A = mkWA (k38 "septinen") ; --UNCHK lin septicaemia_N = mkWN (compoundN "veren" (k39 "myrkytys")) ; --UNCHK @@ -49325,7 +49303,6 @@ lin sunburned_A = mkWA (k10 "polttama") "auringon" ; --UNCHK lin sunburnt_A = mkWA (k10 "polttama") "auringon" ; --UNCHK lin sunburst_N = mkWN (compoundN "säde" (k1A "kimppu")) ; --UNCHK lin sundae_N = mkWN (k2 "jäätelö") "kuorrutettu" ; --UNCHK -lin sunday_PN = mkPN "sunnuntai" ; lin sunder_V2 = mkWV2 (k53A "irrottaa") ; --UNCHK lin sundew_N = mkWN (k5A "kihokki") ; --UNCHK lin sundial_N = mkWN (compoundN "aurinko" (k1 "kello")) ; --UNCHK @@ -49641,7 +49618,6 @@ lin swagger_N = mkWN (k2 "rehvastelu") ; --UNCHK lin swagger_V = mkWV (k67 "ylvästellä") ; --UNCHK lin swaggerer_N = mkWN (k12 "rehvastelija") ; --UNCHK lin swagman_N = mkWN (k6 "kulkuri") ; --UNCHK -lin swahili_N = mkWN "swahili" ; --UNCHK lin swain_N = mkWN (k4A "nuorikko") ; --UNCHK lin swale_N = mkWN (k10 "notkelma") ; --UNCHK lin swallow_N = mkWN (k39 "nielaus") ; --UNCHK @@ -49703,7 +49679,8 @@ lin sweatshirt_N = mkWN (compoundN "college" (k2 "pusero")) ; --UNCHK lin sweatshop_N = mkWN (compoundN "hiki" (k9 "paja")) ; --UNCHK lin sweaty_A = mkA "hiostava" ; lin swedish_A = mkWA (k38 "ruotsalainen") ; --UNCHK -lin swedish_N = mkWN (k5 "ruotsi") ; --UNCHK +lin swedishMasc_N = mkWN (k5 "ruotsi") ; --UNCHK +lin swedishFem_N = mkWN (k5 "ruotsi") ; --UNCHK lin sweep_N = mkN "pyyhkäisy" ; lin sweep_V = mkWV (k53A "voittaa") "ylivoimaisesti" ; --UNCHK lin sweep_V2 = mkV2 "raivata" ; @@ -50921,7 +50898,8 @@ lin textual_A = mkWA (compoundA "tekstua" (k38 "alinen")) ; --UNCHK lin texture_N = mkWN (k48A "rakenne") ; --UNCHK lin textured_A = mkWA (compoundA "karkea" (k38 "rakenteinen")) ; --UNCHK lin thai_A = mkWA (k38 "siamilainen") ; --UNCHK -lin thai_N = mkWN (k26 "kieli") "thain" ; --UNCHK +lin thaiMasc_N = mkWN (k26 "kieli") "thain" ; --UNCHK +lin thaiFem_N = mkWN (k26 "kieli") "thain" ; --UNCHK --geo lin thailand_PN = mkPN "Thaimaa" ; lin thalamocortical_A = mkWA (compoundA "talamokortika" (k38 "alinen")) ; --UNCHK lin thalamus_N = mkWN (k39 "talamus") ; --UNCHK @@ -51322,8 +51300,6 @@ lin thundery_A = mkWA (compoundA "jyris" (k10 "evä")) ; --UNCHK lin thunk_N = mkWN (k39 "tömähdys") ; --UNCHK lin thurible_N = mkWN (compoundN "suitsutus" (k12 "astia")) ; --UNCHK lin thurifer_N = mkWN "suitsuttaja" ; --UNCHK -lin thursday_N = mkWN (k18 "torstai") ; --UNCHK -lin thursday_PN = mkPN "torstai" ; lin thus_Adv = mkAdv "siten" ; lin thwack_N = mkWN "kolautus" ; --UNCHK lin thwack_V2 = mkWV2 (k53A "läimäyttää") ; --UNCHK @@ -52723,8 +52699,6 @@ lin tuck_in_V2 = mkWV2 (k61 "ahmia") ; --UNCHK lin tuck_shop_N = mkWN (compoundN "karkki" (k9A "kauppa")) ; --UNCHK lin tucker_N = mkWN (k2 "röyhelö") ; --UNCHK lin tudung_N = mkWN "tudung" ; --UNCHK -lin tuesday_N = mkWN (k18 "tiistai") ; --UNCHK -lin tuesday_PN = mkPN "tiistai" ; lin tuft_N = mkWN (k1A "töyhtö") ; --UNCHK lin tufted_A = mkWA "tupsu-" ; --UNCHK lin tug_N = mkWN (k2 "nykäisy") ; --UNCHK @@ -52809,7 +52783,8 @@ lin turk_N = mkWN (k38 "turkkilainen") ; --UNCHK lin turkey_N = mkWN (k12 "kalkkuna") ; --UNCHK --geo lin turkey_PN = mkPN "Turkki" ; lin turkish_A = mkWA (k38 "turkkilainen") ; --UNCHK -lin turkish_N = mkWN (kH1 "turkki") ; --UNCHK +lin turkishMasc_N = mkWN (kH1 "turkki") ; --UNCHK +lin turkishFem_N = mkWN (kH1 "turkki") ; --UNCHK lin turmeric_N = mkWN (k10 "kurkuma") ; --UNCHK lin turmoil_N = mkN "levottomuus" ; lin turn_N = mkN "käänne" | mkN "vuoro" ; ---- split @@ -54761,7 +54736,6 @@ lin urbanize_V2 = mkWV2 (k53 "kaupunkimaistaa") ; --UNCHK lin urceolate_A = mkWA (compoundA "uurnan" (k38 "muotoinen")) ; --UNCHK lin urceole_N = mkWN (k1A "ruukku") ; --UNCHK lin urchin_N = mkWN (k3 "heittiö") ; --UNCHK -lin urdu_N = mkWN "urdu" ; --UNCHK lin urea_N = mkWN (k12 "urea") ; --UNCHK lin urease_N = mkWN (compoundN "ure" (k5 "aasi")) ; --UNCHK lin uremia_N = mkWN (compoundN "virtsa" (k39 "myrkytys")) ; --UNCHK @@ -56178,8 +56152,6 @@ lin wedge_V = mkWV (k52A "työntyä") ; --UNCHK lin wedge_V2 = mkWV2 (k52A "työntyä") ; --UNCHK lin wedgie_N = mkWN (compoundN "kiilakorko" (k10A "kenkä")) ; --UNCHK lin wedlock_N = mkWN (k48A "suhde") "aviollinen" ; --UNCHK -lin wednesday_N = mkWN (compoundN "keski" (k1A "viikko")) ; --UNCHK -lin wednesday_PN = mkPN "keskiviikko" ; lin wee_A = mkWA (k38 "aikainen") ; --UNCHK lin wee_N = mkWN (k7 "hetki") ; --UNCHK lin wee_V = mkWV (k53A "heittää") "vettä" ; --UNCHK @@ -57495,7 +57467,6 @@ lin atlantic_PN = foreignPN "Atlantic" ; lin auckland_PN = foreignPN "Auckland" ; lin audley_PN = foreignPN "Audley" ; lin augsburg_PN = foreignPN "Augsburg" ; -lin august_PN = foreignPN "August" ; lin australia_PN = foreignPN "Australia" ; lin austria_PN = mkPN "Itävalta" ; lin aveley_PN = foreignPN "Aveley" ; @@ -58325,7 +58296,6 @@ lin manila_PN = foreignPN "Manila" ; lin mannheim_PN = foreignPN "Mannheim" ; lin mansfield_PN = foreignPN "Mansfield" ; lin maracaibo_PN = foreignPN "Maracaibo" ; -lin march_PN = foreignPN "March" ; lin margaret_PN = foreignPN "Margaret" ; lin margate_PN = foreignPN "Margate" ; lin maria_PN = foreignPN "Maria" ; diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index 3dce04fb1..04cb949d1 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -5134,7 +5134,8 @@ lin danger_N = mkN "danger" masculine ; -- tocheck lin dangerous_A = mkA "dangereux" ; -- tocheck lin dangerousness_N = mkN "dangerosité" feminine ; -- tocheck lin dangle_V2 = mkV2 (mkV I.pendre_V2) ; -- tocheck -lin danish_N = mkN "feuilleté" masculine ; -- tocheck +lin danishMasc_N = mkN "feuilleté" masculine ; -- tocheck +lin danishFem_N = mkN "feuilletée" feminine ; -- tocheck lin dank_A = mkA "fort" ; -- tocheck lin dare_N = mkN "défi" masculine ; -- tocheck lin dare_V2 = mkV2 (mkV "oser") | mkV2 (mkV "affronter") | mkV2 (mkV "défier") ; -- tocheck @@ -6826,7 +6827,8 @@ lin engender_V2 = mkV2 (mkV "engendrer") ; -- tocheck lin engine_N = mkN "moteur" masculine | mkN "locomotive" feminine ; -- tocheck lin engineer_N = mkN "ingénieur" | mkN "machiniste" masculine ; -- tocheck lin engineering_N = mkN "ingénierie" feminine ; -- tocheck -lin english_N = mkN "anglais" ; -- tocheck +lin englishMasc_N = mkN "anglais" ; -- tocheck +lin englishFem_N = mkN "anglais" ; -- tocheck lin engrave_V2 = mkV2 (mkV "graver") ; -- tocheck lin engraving_N = mkN "gravure" feminine ; -- tocheck lin engross_V2 = mkV2 (mkV "accaparer") | mkV2 (mkV "captiver") | mkV2 (mkV "engraisser") ; -- tocheck @@ -12018,7 +12020,6 @@ lin maraud_V = mkV (mkV "marauder") | mkV (mkV "piller") ; -- tocheck lin marauder_N = mkN "maraudeur" masculine ; -- tocheck lin marble_N = mkN "marbre" masculine | mkN "bille" feminine ; -- tocheck lin marbles_N = mkN "billes" ; -- tocheck -lin march_N = mkN "marche" feminine | mkN "défilé" masculine ; -- tocheck lin march_V = variants{}; -- mkV2 (mkV "marcher") ; -- tocheck lin march_V2 = mkV2 (mkV "marcher") ; -- tocheck lin marchioness_N = mkN "marquise" ; -- tocheck @@ -12165,7 +12166,6 @@ lin maximum_A = mkA "maximum" ; -- tocheck lin maximum_N = mkN "maximum" masculine ; -- tocheck lin may_1_VV = S.can_VV ; lin may_2_VV = S.can_VV ; -lin may_N = mkN "aubépine" feminine ; -- tocheck lin maybe_Adv = mkAdv "peut-être" ; -- tocheck lin mayday_N = mkN "mayday" ; -- tocheck lin mayhem_N = mkN "grabuge" masculine | mkN "mutilation" feminine ; -- tocheck @@ -22220,7 +22220,6 @@ lin atlantic_PN = mkPN "Atlantic" ; -- status=guess src=geonames lin auckland_PN = mkPN "Auckland" ; -- status=guess src=geonames lin audley_PN = mkPN "Audley" ; -- status=guess src=geonames lin augsburg_PN = mkPN "Augsbourg" ; -- status=guess src=geonames -lin august_PN = mkPN "August" ; -- status=guess src=geonames lin australia_PN = mkPN "Australie" ; -- status=guess src=geonames lin austria_PN = mkPN "Autriche" ; -- status=guess src=geonames lin aveley_PN = mkPN "Aveley" ; -- status=guess src=geonames @@ -23051,7 +23050,6 @@ lin manila_PN = mkPN "Manille" ; -- status=guess src=geonames lin mannheim_PN = mkPN "Mannheim" ; -- status=guess src=geonames lin mansfield_PN = mkPN "Mansfield" ; -- status=guess src=geonames lin maracaibo_PN = mkPN "Maracaibo" ; -- status=guess src=geonames -lin march_PN = mkPN "March" ; -- status=guess src=geonames lin margaret_PN = mkPN "Margaret" ; -- status=guess src=geonames lin margate_PN = mkPN "Margate" ; -- status=guess src=geonames lin maria_PN = mkPN "Maria" ; -- status=guess src=geonames diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index 8f8e679fd..f843ba10d 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -1168,7 +1168,6 @@ lin africa_PN = mkPN "Africa"; -- src=eng status=guess lin africanFem_N = variants {}; lin africanMasc_N = variants {}; lin african_A = variants {}; -lin afrikaans_N = variants {}; lin afrikanerFem_N = reg2N "Afrikanerin" "Afrikanerinnen" feminine; lin afrikanerMasc_N = reg2N "Afrikaner" "Afrikaner" masculine; lin afrikaner_A = variants {}; @@ -2019,7 +2018,6 @@ lin amethystine_A = variants {}; lin ametria_N = variants {}; lin ametropia_N = variants {}; lin ametropic_A = variants {}; -lin amharic_N = variants {}; lin amiability_N = variants {}; lin amiable_A = mkA "liebenswürdig" ; -- status=guess lin amicability_N = variants {}; @@ -3177,8 +3175,6 @@ lin apractic_A = variants {}; lin apraxia_N = mkN "Apraxie" feminine | mkN "Bewegungsstörung" feminine ; -- status=guess status=guess lin apres_ski_A = variants {}; lin apricot_N = mkN "Aprikose" "Aprikosen" feminine | mkN "Marille" "Marillen" feminine ; -- status=guess status=guess -lin april_N = variants {}; -lin april_PN = mkPN "April"; -- src=eng status=guess lin apron_N = mkN "Schürze" feminine ; -- status=guess lin apropos_A = variants {}; lin apropos_Adv = mkAdv "apropos" ; -- status=guess @@ -3219,7 +3215,6 @@ lin arabianFem_N = variants {}; lin arabianMasc_N = variants {}; lin arabian_A = variants {}; lin arabic_A = variants {}; -lin arabic_N = variants {}; lin arability_N = variants {}; lin arabist_N = variants {}; lin arable_A = mkA "bebaubar" ; -- status=guess @@ -4162,8 +4157,6 @@ lin augur_V = junkV (mkV "die") "Zukunft vorhersagen" | mkV "wahrsagen" | mkV "h lin augur_V2 = mkV2 (junkV (mkV "die") "Zukunft vorhersagen") | mkV2 (mkV "wahrsagen") | mkV2 (mkV "hellsehen") ; -- status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt lin augury_N = variants {}; lin august_A = variants {}; -lin august_N = variants {}; -lin august_PN = mkPN "August"; -- src=geonames status=guess lin augustan_A = variants {}; lin auk_N = mkN "Alk" masculine ; -- status=guess lin auklet_N = variants {}; @@ -9431,7 +9424,8 @@ lin catacorner_A = variants {}; lin catadromous_A = variants {}; lin catafalque_N = mkN "Katafalk" "Katafalke" masculine ; -- status=guess lin catalan_A = variants {}; -lin catalan_N = variants {}; +lin catalanMasc_N = variants {}; +lin catalanFem_N = variants {}; lin catalase_N = variants {}; lin catalatic_A = variants {}; lin catalectic_A = variants {}; @@ -10436,7 +10430,8 @@ lin chinchow_PN = mkPN "Chinchow"; -- src=eng status=guess lin chine_N = mkN "Kimm" feminine ; -- status=guess lin chinese_A = variants {}; lin chinese_A = variants {}; -lin chinese_N = variants {}; +lin chineseMasc_N = variants {}; +lin chineseFem_N = variants {}; lin chink_N = variants {}; lin chink_V = variants {}; lin chink_V2 = variants {}; @@ -14853,7 +14848,8 @@ lin daniel_N = variants {}; lin daniel_PN = mkPN "Daniel"; -- src=eng status=guess lin danish_A = variants {}; lin danish_A = variants {}; -lin danish_N = mkN "Plunderteig" masculine ; -- status=guess +lin danishMasc_N = mkN "Plunderteig" masculine ; -- status=guess +lin danishFem_N = mkN "Plunderteig" masculine ; -- status=guess lin dank_A = mk3A "feucht" "feuchter" "feuchteste" | mkA "nasskalt" ; -- status=guess status=guess lin dankness_N = variants {}; lin danny_PN = mkPN "Danny"; -- src=eng status=guess @@ -15172,8 +15168,6 @@ lin deceivingly_Adv = variants {}; lin decelerate_V = variants {}; lin decelerate_V2 = variants {}; lin deceleration_N = mkN "Verlangsamung" feminine ; -- status=guess -lin december_N = variants {}; -lin december_PN = mkPN "December"; -- src=eng status=guess lin decency_N = mkN "Anstand" "Anstände" masculine ; -- status=guess lin decent_A = regA "ganz" | mkA "anständig" ; -- status=guess status=guess lin decentralization_N = mkN "Dezentralisierung" feminine ; -- status=guess @@ -18170,7 +18164,8 @@ lin dustpan_N = mkN "Kehrblech" neuter | mkN "Kehrschaufel" feminine | mkN "Kutt lin dusty_A = mk3A "staubig" "staubiger" "staubigste" ; -- status=guess lin dutch_A = variants {}; lin dutch_A = variants {}; -lin dutch_N = variants {}; +lin dutchMasc_N = variants {}; +lin dutchFem_N = variants {}; lin dutchman_N = variants {}; lin duteous_A = variants {}; lin dutiable_A = variants {}; @@ -19254,7 +19249,8 @@ lin engineering_N = mkN "Ingenieurwissenschaft" "Ingenieurwissenschaften" femini lin enginery_N = variants {}; lin england_PN = mkPN "England"; -- src=geonames status=guess lin english_A = variants {}; -lin english_N = variants {}; +lin englishMasc_N = variants {}; +lin englishFem_N = variants {}; lin englishman_N = variants {}; lin englishwoman_N = variants {}; lin engorgement_N = variants {}; @@ -21106,8 +21102,6 @@ lin feature_V2 = mkV2 (irregV "bieten" "bietet" "bot" "böte" "geboten" | prefix lin featureless_A = variants {}; lin feb_PN = mkPN "Feb"; -- src=eng status=guess lin febrile_A = variants {}; -lin february_N = variants {}; -lin february_PN = mkPN "February"; -- src=eng status=guess lin feckless_A = variants {}; lin fecklessness_N = variants {}; lin fecula_N = variants {}; @@ -22891,7 +22885,8 @@ lin freight_train_N = variants {}; lin freighter_N = variants {}; lin freightliner_N = variants {}; lin french_A = variants {}; -lin french_N = mkN "Französe" masculine ; +lin frenchMasc_N = mkN "Französe" masculine ; +lin frenchFem_N = mkN "Französe" masculine ; lin frenchman_N = variants {}; lin frenchwoman_N = variants {}; lin frenetic_A = mk3A "frenetisch" "frenetischer" "frenetischste" | mkA "phrenetisch" ; -- status=guess status=guess @@ -22940,8 +22935,6 @@ lin fricative_N = mkN "Frikativ" "Frikative" masculine | mkN "Reibelaut" "Reibel lin friction_N = mkN "Reibung" ; -- status=guess lin frictional_A = variants {}; lin frictionless_A = variants {}; -lin friday_N = variants {}; -lin friday_PN = mkPN "Friday"; -- src=eng status=guess lin fridge_N = L.fridge_N ; lin friedcake_N = variants {}; lin friend_N = L.friend_N ; @@ -24993,7 +24986,8 @@ lin greed_N = mkN "Gier" feminine | mkN "Habsucht" "Habsüchte" feminine ; -- st lin greediness_N = variants {}; lin greedy_A = mkA "gierig" | mkA "habgierig" | mkA "habsüchtig" ; -- status=guess status=guess status=guess lin greek_A = variants {}; -lin greek_N = variants {}; +lin greekMasc_N = variants {}; +lin greekFem_N = variants {}; lin green_A = L.green_A ; lin green_N = mkN "Chile-Kolibri" masculine ; -- status=guess lin greenback_N = variants {}; @@ -26382,7 +26376,6 @@ lin hebetude_N = variants {}; lin hebraic_A = variants {}; lin hebrew_A = variants {}; lin hebrew_A = variants {}; -lin hebrew_N = variants {}; lin hecatomb_N = variants {}; lin heck_N = variants {}; lin heckelphone_N = variants {}; @@ -26902,7 +26895,6 @@ lin hinder_V2 = mkV2 (regV "hindern" | regV "behindern" | irregV "erschweren" "e lin hindfoot_N = variants {}; lin hindgut_N = variants {}; lin hindi_A = variants {}; -lin hindi_N = variants {}; lin hindmost_A = variants {}; lin hindquarter_N = variants {}; lin hindquarters_N = variants {}; @@ -30341,7 +30333,8 @@ lin isthmian_A = variants {}; lin isthmus_N = mkN "Isthmus" "Isthmen" masculine | mkN "Landenge" feminine | mkN "Landbrücke" feminine ; -- status=guess status=guess status=guess lin it_Pron = S.it_Pron | let s = Predef.BIND ++ "'s" in M.mkPronPers s s "ihm" "seiner" "sein" R.Neutr R.Sg R.P3 ; lin italian_A = variants {}; -lin italian_N = variants {}; +lin italianMasc_N = variants {}; +lin italianFem_N = variants {}; lin italic_A = regA "kursiv" ; -- status=guess lin italic_N = mkN "Kursivdruck" masculine ; -- status=guess lin italicize_V2 = variants {}; @@ -30480,8 +30473,6 @@ lin janice_PN = mkPN "Janice"; -- src=eng status=guess lin janie_PN = mkPN "Janie"; -- src=eng status=guess lin janissary_N = mkN "Janitschar" masculine ; -- status=guess lin janitor_N = mkN "Hausmeister" "Hausmeister" masculine | mkN "Hausmeisterin" feminine | mkN "Hauswartin" feminine | mkN "Hauswart" masculine ; -- status=guess status=guess status=guess status=guess -lin january_N = variants {}; -lin january_PN = mkPN "January"; -- src=eng status=guess lin janus_PN = mkPN "Janus"; -- src=eng status=guess lin japan_N = variants {}; lin japan_PN = mkPN "Japan"; -- src=geonames status=guess @@ -30867,7 +30858,6 @@ lin julian_PN = mkPN "Julian"; -- src=geonames status=guess lin julie_PN = mkPN "Julie"; -- src=eng status=guess lin julienne_N = mkN "Julienne" feminine ; -- status=guess lin juliet_PN = mkPN "Juliet"; -- src=eng status=guess -lin july_PN = mkPN "July"; -- src=eng status=guess lin jumble_N = mkN "Durcheinander" "Durcheinander" neuter | mkN "Mischmasch" "Mischmasche" masculine | mkN "Wirrwarr" neuter ; -- status=guess status=guess status=guess lin jumble_V = mkV "durcheinanderbringen" | mkV "durcheinanderwerfen" ; -- status=guess, src=wikt status=guess, src=wikt lin jumble_V2 = mkV2 (mkV "durcheinanderbringen") | mkV2 (mkV "durcheinanderwerfen") ; -- status=guess, src=wikt status=guess, src=wikt @@ -30892,8 +30882,6 @@ lin jun_PN = mkPN "Jun"; -- src=geonames status=guess lin junco_N = variants {}; lin junction_N = mkN "Kreuzung" | mkN "Knotenpunkt" "Knotenpunkte" masculine ; -- status=guess status=guess lin juncture_N = variants {}; -lin june_N = variants {}; -lin june_PN = mkPN "June"; -- src=eng status=guess lin jungle_N = mkN "Urwald" "Urwälder" masculine | mkN "Dschungel" feminine neuter ; -- status=guess status=guess lin jungly_A = variants {}; lin junior_A = mkA "jünger" ; -- status=guess @@ -32039,7 +32027,6 @@ lin lathery_A = variants {}; lin lathi_N = variants {}; lin laticifer_N = variants {}; lin latin_A = variants{} ; -- -lin latin_N = variants {}; lin latinate_A = variants {}; lin latinist_N = variants {}; lin latinize_V2 = variants {}; @@ -34293,7 +34280,8 @@ lin malta_PN = mkPN "Malta"; -- src=geonames status=guess lin maltby_PN = mkPN "Maltby"; -- src=geonames status=guess lin malted_N = variants {}; lin maltese_A = variants {}; -lin maltese_N = variants {}; +lin malteseMasc_N = variants {}; +lin malteseFem_N = variants {}; lin maltha_N = variants {}; lin malthusian_A = variants {}; lin maltose_N = mkN "Maltose" feminine | mkN "Malzzucker" masculine ; -- status=guess status=guess @@ -34537,8 +34525,6 @@ lin marblewood_N = variants {}; lin marbling_N = variants {}; lin marc_N = variants {}; lin marcel_N = variants {}; -lin march_N = mkN "Marsch" "Marschen" feminine ; -- status=guess -lin march_PN = mkPN "March"; -- src=geonames status=guess lin march_V = junkV (mkV "in") "den Krieg ziehen" ; -- status=guess, src=wikt lin march_V2 = mkV2 (junkV (mkV "in") "den Krieg ziehen") ; -- status=guess, src=wikt lin marcher_N = variants {}; @@ -34952,8 +34938,6 @@ lin maxine_PN = mkPN "Maxine"; -- src=eng status=guess lin maxwell_N = variants {}; lin may_1_VV = mkVV I.können_V ; -- comment= no direct translation; e.g. I MAY be able to help you = ich kann dir VIELLEICHT helfen lin may_2_VV = mkVV I.dürfen_V ; -lin may_N = mkN "Weißdornblüte" feminine ; -- status=guess -lin may_PN = mkPN "May"; -- src=eng status=guess lin may_beetle_N = variants {}; lin may_bug_N = variants {}; lin mayapple_N = variants {}; @@ -36470,8 +36454,6 @@ lin monatomic_A = variants {}; lin monaural_A = variants {}; lin monazite_N = variants {}; lin monchengladbach_PN = mkPN "Monchengladbach"; -- src=eng status=guess -lin monday_N = variants {}; -lin monday_PN = mkPN "Monday"; -- src=eng status=guess lin monegasque_A = variants {}; lin monegasque_N = variants {}; lin moneran_A = variants {}; @@ -37887,7 +37869,8 @@ lin nepal_PN = mkPN "Nepal"; -- src=geonames status=guess lin nepalese_A = variants {}; lin nepalese_N = variants {}; lin nepali_A = variants {}; -lin nepali_N = variants {}; +lin nepaliMasc_N = variants {}; +lin nepaliFem_N = variants {}; lin nepheline_N = variants {}; lin nephelinite_N = variants {}; lin nephew_N = mkN "Neffe" "Neffen" masculine ; -- status=guess @@ -38730,7 +38713,8 @@ lin norton_PN = mkPN "Norton"; -- src=geonames status=guess lin nortriptyline_N = variants {}; lin norway_PN = mkPN "Norwegen"; -- src=geonames status=guess lin norwegian_A = variants {}; -lin norwegian_N = variants {}; +lin norwegianMasc_N = variants {}; +lin norwegianFem_N = variants {}; lin norwich_PN = mkPN "Norwich"; -- src=geonames status=guess lin nose_N = L.nose_N ; lin nose_V = mkV "schnüffeln" ; -- status=guess, src=wikt @@ -38836,8 +38820,6 @@ lin novelist_N = mkN "Novellist" masculine | mkN "Romancier" masculine ; -- stat lin novelization_N = variants {}; lin novella_N = mkN "Novelle" "Novellen" feminine ; -- status=guess lin novelty_N = mkN "Neuheit" "Neuheiten" feminine ; -- status=guess -lin november_N = variants {}; -lin november_PN = mkPN "November"; -- src=eng status=guess lin novena_N = variants {}; lin novice_N = mkN "Neuling" "Neulinge" masculine | mkN "Anfänger" masculine ; -- status=guess status=guess lin noviciate_N = variants {}; @@ -39219,8 +39201,6 @@ lin octavo_N = variants {}; lin octet_N = mkN "Oktett" "Oktette" neuter ; -- status=guess lin octette_N = variants {}; lin octillion_N = variants {}; -lin october_N = variants {}; -lin october_PN = mkPN "October"; -- src=eng status=guess lin octogenarian_A = variants {}; lin octogenarian_N = variants {}; lin octopod_N = variants {}; @@ -48963,7 +48943,8 @@ lin romance_V2 = variants {}; lin romanesque_N = variants {}; lin romania_PN = mkPN "Rumänien"; -- src=geonames status=guess lin romanian_A = variants {}; -lin romanian_N = variants {}; +lin romanianMasc_N = variants {}; +lin romanianFem_N = variants {}; lin romantic_A = mk3A "romantisch" "romantischer" "romantischste" ; -- status=guess lin romantic_N = mkN "Romantiker" masculine | mkN "Romantikerin" feminine ; -- status=guess status=guess lin romantically_Adv = variants {}; @@ -49465,7 +49446,8 @@ lin russet_A = variants {}; lin russet_N = variants {}; lin russia_PN = mkPN "Russland"; -- src=geonames status=guess lin russian_A = variants {}; -lin russian_N = variants {}; +lin russianMasc_N = variants {}; +lin russianFem_N = variants {}; lin rust_A = variants {}; lin rust_N = mkN "Rostbraun" neuter ; -- status=guess lin rust_V = mkV "verrosten" | irregV "rosten" "rostet" "rostete" "rostete" "gerostet" ; -- status=guess, src=wikt status=guess, src=wikt @@ -50053,8 +50035,6 @@ lin satrap_N = mkN "Satrap" "Satrapen" masculine ; -- status=guess lin satsuma_N = variants {}; lin saturate_V2 = mkV2 (mkV "sättigen") ; -- status=guess, src=wikt lin saturation_N = mkN "Sättigung" feminine ; -- status=guess -lin saturday_N = variants {}; -lin saturday_PN = mkPN "Saturday"; -- src=eng status=guess lin saturn_PN = mkPN "Saturn"; -- src=eng status=guess lin saturnalia_N = variants {}; lin saturniid_N = variants {}; @@ -51326,8 +51306,6 @@ lin sept_PN = mkPN "Sept"; -- src=eng status=guess lin septal_A = variants {}; lin septation_N = variants {}; lin septectomy_N = variants {}; -lin september_N = variants {}; -lin september_PN = mkPN "September"; -- src=eng status=guess lin septet_N = variants {}; lin septic_A = regA "septisch" ; -- status=guess lin septicaemia_N = variants {}; @@ -56465,8 +56443,6 @@ lin sunburned_A = variants {}; lin sunburnt_A = mkA "sonnenverbrannt" ; -- status=guess lin sunburst_N = variants {}; lin sundae_N = variants {}; -lin sunday_N = variants {}; -lin sunday_PN = mkPN "Sunday"; -- src=eng status=guess lin sunder_N = variants {}; lin sunder_V2 = variants {}; lin sunderland_PN = mkPN "Sunderland"; -- src=geonames status=guess @@ -56817,7 +56793,6 @@ lin swagger_N = variants {}; lin swagger_V = variants {}; lin swaggerer_N = variants {}; lin swagman_N = variants {}; -lin swahili_N = variants {}; lin swain_N = variants {}; lin swale_N = variants {}; lin swallow_N = mkN "Schwalbe" "Schwalben" feminine ; -- status=guess @@ -56895,7 +56870,8 @@ lin swedeMasc_N = variants {}; lin swede_A = variants {}; lin sweden_PN = mkPN "Schweden"; -- src=geonames status=guess lin swedish_A = variants {}; -lin swedish_N = variants {}; +lin swedishMasc_N = variants {}; +lin swedishFem_N = variants {}; lin sweep_N = variants {}; lin sweep_V = regV "fegen" | regV "kehren" ; -- status=guess, src=wikt status=guess, src=wikt lin sweep_V2 = mkV2 (regV "fegen" | regV "kehren") ; -- status=guess, src=wikt status=guess, src=wikt @@ -58268,7 +58244,8 @@ lin textual_A = regA "textuell" ; -- status=guess lin texture_N = mkN "Textur" "Texturen" feminine ; -- status=guess lin textured_A = variants {}; lin thai_A = variants {}; -lin thai_N = variants {}; +lin thaiMasc_N = variants {}; +lin thaiFem_N = variants {}; lin thailand_PN = mkPN "Thailand"; -- src=geonames status=guess lin thalamocortical_A = variants {}; lin thalamus_N = mkN "Thalamus" masculine ; -- status=guess @@ -58734,8 +58711,6 @@ lin thurifer_N = variants {}; lin thurmaston_PN = mkPN "Thurmaston"; -- src=eng status=guess lin thurrock_PN = mkPN "Thurrock"; -- src=eng status=guess lin thurs_PN = mkPN "Thurs"; -- src=eng status=guess -lin thursday_N = variants {}; -lin thursday_PN = mkPN "Thursday"; -- src=eng status=guess lin thurso_PN = mkPN "Thurso"; -- src=geonames status=guess lin thus_Adv = mkAdv "also" | mkAdv "demnach" ; lin thwack_N = variants {}; @@ -60319,8 +60294,6 @@ lin tuck_up_V2 = variants {}; lin tucker_N = variants {}; lin tudung_N = variants {}; lin tues_PN = mkPN "Tues"; -- src=eng status=guess -lin tuesday_N = variants {}; -lin tuesday_PN = mkPN "Tuesday"; -- src=eng status=guess lin tufa_N = variants {}; lin tuff_N = mkN "Tuff" "Tuffe" masculine | mkN "Tuffstein" masculine ; -- status=guess status=guess lin tuft_N = variants {}; @@ -60419,7 +60392,8 @@ lin turkey_N = mkN "Truthahn" "Truthähne" masculine | mkN "Truthenne" feminine lin turkey_PN = mkPN "Türkei"; -- src=geonames status=guess lin turkish_A = variants {}; lin turkish_A = variants {}; -lin turkish_N = variants {}; +lin turkishMasc_N = variants {}; +lin turkishFem_N = variants {}; lin turku_PN = mkPN "Turku"; -- src=geonames status=guess lin turmeric_N = mkN "Gelbwurz" feminine | mkN "Kurkuma" feminine | mkN "Kurkume" feminine ; -- status=guess status=guess status=guess lin turmoil_N = mkN "Aufruhr" "Aufruhre" masculine | mkN "Tumult" masculine | mkN "Unruhe" "Unruhen" feminine | mkN "Unordnung" feminine ; -- status=guess status=guess status=guess status=guess @@ -62531,7 +62505,6 @@ lin urceolate_A = mkA "krugförmig" ; -- status=guess lin urceole_N = variants {}; lin urchin_N = mkN "Igel" "Igel" masculine ; -- status=guess lin urdu_A = variants {}; -lin urdu_N = variants {}; lin urea_N = variants {}; lin urease_N = variants {}; lin uremia_N = variants {}; @@ -64177,8 +64150,6 @@ lin wedge_V = mkV "einkeilen" ; -- status=guess, src=wikt lin wedge_V2 = mkV2 (mkV "einkeilen") ; -- status=guess, src=wikt lin wedgie_N = variants {}; lin wedlock_N = variants {}; -lin wednesday_N = variants {}; -lin wednesday_PN = mkPN "Wednesday"; -- src=eng status=guess lin wee_A = mk3A "winzig" "winziger" "winzigste" | mk3A "klein" "kleiner" "kleinste" ; -- status=guess status=guess lin wee_N = mkN "Pipi" neuter ; -- status=guess lin wee_V = regV "pinkeln" | regV "pissen" | junkV (mkV "Pipi") "machen" ; -- status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index d58cf5ae1..a067164d8 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -1527,7 +1527,6 @@ lin approximate_V2 = mkV2 (compoundV "लगभग अनुमान" (mkV "ल lin approximation_N = mkN "सादृश्य" ; -- tocheck lin appurtenance_N = mkN "साज-सामान" ; -- tocheck lin apricot_N = mkN "खुबानी" ; -- tocheck -lin april_PN = mkPN "अप्रैल" ; -- tocheck lin apron_N = mkN "पेटबन्द" ; -- tocheck lin apropos_A = mkA "प्रसंगानुकूल" ; -- tocheck lin apropos_Adv = mkAdv "सही समय पर" ; -- tocheck @@ -1549,7 +1548,6 @@ lin arab_N = mkN "अरबी" ; -- tocheck lin arabesque_N = mkN "अरबस्क" ; -- tocheck lin arabian_A = mkA "अरबी" ; -- tocheck lin arabic_A = mkA "अरबी" ; -- tocheck -lin arabic_N = mkN "अरबी" ; -- tocheck lin arable_A = mkA "कृष्य" ; -- tocheck lin arachnoid_A = mkA "मकड़ी जैसा" ; -- tocheck lin arbiter_N = mkN "विवाचक" ; -- tocheck @@ -1987,7 +1985,6 @@ lin augur_V = compoundV "पूर्वसूचना" (mkV "देना") ; lin augur_V2 = mkV2 (compoundV "पूर्वसूचना" (mkV "देना")) ; -- tocheck lin augury_N = mkN "शकुन" ; -- tocheck lin august_A = mkA "गरिमापूर्ण" ; -- tocheck -lin august_PN = mkPN "अगस्त" ; -- tocheck lin auk_N = mkN "ऑक पक्षी" ; -- tocheck lin auld_lang_syne_N = mkN "आउल्ड लैण्ग सायन" ; -- tocheck lin aunt_N = mkN "चाची" ; -- tocheck @@ -4737,7 +4734,8 @@ lin china_PN = mkPN "चीन" ; -- tocheck lin chinaware_N = mkN "चीनी मिट्टी के बर्तन" ; -- tocheck lin chincherinchee_N = mkN "चिंचरिंची" ; -- tocheck lin chinese_A = mkA "चीनी" ; -- tocheck -lin chinese_N = mkN "चीनी" ; -- tocheck +lin chineseMasc_N = mkN "चीनी" ; -- tocheck +lin chineseFem_N = mkN "चीनी" ; -- tocheck lin chink_N = mkN "खनक" ; -- tocheck lin chink_V = mkV "खनकना" ; -- tocheck lin chink_V2 = mkV2 (mkV "खनकना") ; -- tocheck @@ -6685,7 +6683,8 @@ lin dangerous_A = mkA "खतरनाक" ; -- tocheck lin dangle_V = mkV "झुलाना" ; -- tocheck lin dangle_V2 = mkV2 (mkV "झुलाना") ; -- tocheck lin danish_A = mkA "डेन्मार्क क्" ; -- tocheck -lin danish_N = mkN "डेनिश पेस्ट्री" ; -- tocheck +lin danishMasc_N = mkN "डेनिश पेस्ट्री" ; -- tocheck +lin danishFem_N = mkN "डेनिश पेस्ट्री" ; -- tocheck lin dapper_A = mkA "साफ़-सुथरा" ; -- tocheck lin dare_N = mkN "ललकार" ; -- tocheck --subcat lin dare_V = compoundV "हिम्मत" (mkV "करना") ; -- tocheck @@ -6822,7 +6821,6 @@ lin deceiver_N = mkN "धोखेबाज़" ; -- tocheck lin decelerate_V = compoundV "धीमा" (mkV "होना") ; -- tocheck lin decelerate_V2 = mkV2 (compoundV "धीमा" (mkV "होना")) ; -- tocheck lin deceleration_N = mkN "गति में कमी" ; -- tocheck -lin december_PN = mkPN "दिसम्बर" ; -- tocheck lin decency_N = mkN "शालीनता" ; -- tocheck lin decent_A = mkA "आच्छा" ; -- tocheck lin decentralization_N = mkN "विकेंद्रीकरण" ; -- tocheck @@ -8325,7 +8323,8 @@ lin dustman_N = mkN "सफ़ाई कर्मी" ; -- tocheck lin dustpan_N = mkN "कूड़े का तसला" ; -- tocheck lin dusty_A = mkA "गंदा" ; -- tocheck lin dutch_A = mkA "हालैंड का" ; -- tocheck -lin dutch_N = mkN "डच भाषा" ; -- tocheck +lin dutchMasc_N = mkN "डच भाषा" ; -- tocheck +lin dutchFem_N = mkN "डच भाषा" ; -- tocheck lin dutiful_A = mkA "कर्त्तव्यनिष्ठ" ; -- tocheck lin duty_N = mkN "कर" ; -- tocheck lin dwarf_N = mkN "बौना" ; -- tocheck @@ -8839,7 +8838,8 @@ lin engineer_V2 = mkV2 (compoundV "योजना" (mkV "बनाना")) ; - lin engineering_N = mkN "अभियान्त्रिकी" ; -- tocheck lin england_PN = mkPN "इंग्लैंड" ; -- tocheck lin english_A = mkA "अंग्रेज का" ; -- tocheck -lin english_N = mkN "अंग्रेजीअ" ; -- tocheck +lin englishMasc_N = mkN "अंग्रेजीअ" ; -- tocheck +lin englishFem_N = mkN "अंग्रेजीअ" ; -- tocheck lin englishman_N = mkN "अंगरेज़" ; -- tocheck lin englishwoman_N = mkN "अंगरेज़ महिला" ; -- tocheck lin engrave_V2 = mkV2 (compoundV "उत्कीर्ण" (mkV "करना")) ; -- tocheck @@ -9809,7 +9809,6 @@ lin feature_N = mkN "वैशिष्ट्य" ; -- tocheck lin feature_V2 = mkV2 (compoundV "प्रधानता" (mkV "देना")) ; -- tocheck lin featureless_A = mkA "साधारण" ; -- tocheck lin febrile_A = mkA "ज्वरजन्य" ; -- tocheck -lin february_PN = mkPN "फ़रवरी" ; -- tocheck lin feckless_A = mkA "लापरवाह" ; -- tocheck lin fecklessness_N = mkN "लापरवाही" ; -- tocheck lin fecund_A = mkA "बहुप्रज" ; -- tocheck @@ -10723,7 +10722,8 @@ lin freight_train_N = mkN "माल गाड़ी" ; -- tocheck lin freighter_N = mkN "फ्रेटर" ; -- tocheck lin freightliner_N = mkN "जलद माल गाड़ी" ; -- tocheck lin french_A = mkA "फ़्रांसीसी" ; -- tocheck -lin french_N = mkN "फ़्रांसीसी भाषा" ; -- tocheck +lin frenchMasc_N = mkN "फ़्रांसीसी भाषा" ; -- tocheck +lin frenchFem_N = mkN "फ़्रांसीसी भाषा" ; -- tocheck lin frenchman_N = mkN "फ्रांसीसी व्यक्ति" ; -- tocheck lin frenetic_A = mkA "अत्यधिक उत्तेजित" ; -- tocheck lin frenzied_A = mkA "उन्मत्त" ; -- tocheck @@ -10757,8 +10757,6 @@ lin friary_N = mkN "मठ" ; -- tocheck lin fricative_A = mkA "संघर्षी" ; -- tocheck lin fricative_N = mkN "संघर्षी" ; -- tocheck lin friction_N = mkN "वैमनस्य" ; -- tocheck -lin friday_N = mkN "शुक्रवार" ; -- tocheck -lin friday_PN = mkPN "शुक्रवार" ; -- tocheck lin fridge_N = mkN "फ्रिज" ; -- tocheck lin friend_N = mkN "सोसाइटी ऑफ़ फ़्रेन्ड्ज़ का सदस्य" ; -- tocheck lin friendless_A = mkA "मित्रहीन" ; -- tocheck @@ -11701,7 +11699,8 @@ lin greece_PN = mkPN "यूनान" ; -- tocheck lin greed_N = mkN "लालच" ; -- tocheck lin greedy_A = mkA "लोभी" ; -- tocheck lin greek_A = mkA "यूनान संबंधी" ; -- tocheck -lin greek_N = mkN "यूनानी भाषा" ; -- tocheck +lin greekMasc_N = mkN "यूनानी भाषा" ; -- tocheck +lin greekFem_N = mkN "यूनानी भाषा" ; -- tocheck lin green_A = mkA "हराभरा" ; -- tocheck lin green_N = mkN "हरियाली" ; -- tocheck lin greenback_N = mkN "संयुक्त राज्य अमरीका का नोट" ; -- tocheck @@ -14354,7 +14353,8 @@ lin issue_V2 = mkV2 (compoundV "वितरण" (mkV "करना")) ; -- toch lin isthmus_N = mkN "स्थलडमरूमध्य" ; -- tocheck lin it_Pronlin = personalPN "यह" "इस" "यह" "इस का" "इस की" "उस के" "उस की" Sg Masc Pers3_Near; lin italian_A = mkA "इटली संबंधी" ; -- tocheck -lin italian_N = mkN "इतालवी भाषा" ; -- tocheck +lin italianMasc_N = mkN "इतालवी भाषा" ; -- tocheck +lin italianFem_N = mkN "इतालवी भाषा" ; -- tocheck lin italic_A = mkA "इटली शैली" ; -- tocheck lin itch_V = compoundV "के लिये बेचैन" (mkV "होना") ; -- tocheck lin itchy_A = mkA "खुजलाहटदार" ; -- tocheck @@ -14405,8 +14405,6 @@ lin jam_VS = mkVS (compoundV "ठसाठस" (mkV "भरना")) ; -- tochec lin jam_on_V2 = mkV2 (mkV "दबाना") ; -- tocheck lin jampack_V2 = mkV2 (compoundV "ठसाठस" (mkV "भरना")) ; -- tocheck lin jane_PN = mkPN "जेन" ; -- tocheck -lin january_N = mkN "जनवरी" ; -- tocheck -lin january_PN = mkPN "जनवरी" ; -- tocheck lin japan_PN = mkPN "जापान" ; -- tocheck lin japaneseMasc_N= mkN "जापानी"; lin japanese_A = mkA "जापानी" ; -- tocheck @@ -14600,8 +14598,6 @@ lin jumpiness_N = mkN "तनाव" ; -- tocheck lin jumpy_A = mkA "आशंकित" ; -- tocheck lin junction_N = mkN "जंक्शन" ; -- tocheck lin juncture_N = mkN "मोड़" ; -- tocheck -lin june_N = mkN "जून" ; -- tocheck -lin june_PN = mkPN "जून" ; -- tocheck lin jungle_N = mkN "जंगल" ; -- tocheck lin junior_A = mkA "क्निष्ठ" ; -- tocheck lin juniper_N = mkN "जूनिपर" ; -- tocheck @@ -15043,7 +15039,6 @@ lin lather_N = mkN "झाग" ; -- tocheck lin lather_V = compoundV "कोड़ा" (mkV "मारना") ; -- tocheck lin lather_V2 = mkV2 (compoundV "का झाग" (mkV "उठना")) ; -- tocheck lin latin_A = mkA "लैटिन संबंधी" ; -- tocheck -lin latin_N = mkN "लैटिनअ" ; -- tocheck lin latitude_N = mkN "अक्षांश" ; -- tocheck lin latrine_N = mkN "शौचालय" ; -- tocheck lin latter_A = mkA "दूसरा" ; -- tocheck @@ -16148,8 +16143,6 @@ lin marble_N = mkN "संगमरमर" ; -- tocheck lin marbled_A = mkA "संगमरमर की तरह" ; -- tocheck lin marbles_N = mkN "विवेक" ; -- tocheck lin marbling_N = mkN "संगमरमर जैसा रेखांकन" ; -- tocheck -lin march_N = mkN "प्रगति" ; -- tocheck -lin march_PN = mkPN "मार्च" ; -- tocheck lin march_V = mkV "चलना" ; -- tocheck lin march_V2 = mkV2 (mkV "चलना") ; -- tocheck lin marchioness_N = mkN "मार्शनेस" ; -- tocheck @@ -16347,8 +16340,6 @@ lin maximize_V2 = mkV2 (compoundV "उच्चतम सीमा तक" (mkV lin maximum_A = mkA "अधिकतम" ; -- tocheck lin may_1_VV= mkV "लेना" ** { isAux = True} ; ---- check these AR lin may_2_VV= mkV "लेना" ** { isAux = True} ; -lin may_N = mkN "मईई" ; -- tocheck -lin may_PN = mkPN "मई" ; -- tocheck lin mayapple_N = mkN "जंगली विषाखमूल" ; -- tocheck lin maybe_Adv = mkAdv "शायद" ; -- tocheck lin mayday_N = mkN "विपत्ति-संकेत" ; -- tocheck @@ -17056,7 +17047,6 @@ lin monarchy_N = mkN "राजटंट्र" ; -- tocheck lin monastery_N = mkN "मठ" ; -- tocheck lin monastic_A = mkA "तपस्वी के समान" ; -- tocheck lin monasticism_N = mkN "मठवाद" ; -- tocheck -lin monday_N = mkN "सोमवारअ" ; -- tocheck lin monetarism_N = mkN "अर्थवाद" ; -- tocheck lin monetarist_N = mkN "अर्थवादी" ; -- tocheck lin monetary_A = mkA "आर्थिक" ; -- tocheck @@ -18000,8 +17990,6 @@ lin novel_N = mkN "उपन्यास" ; -- tocheck lin novelette_N = mkN "लघु उपन्यास" ; -- tocheck lin novelist_N = mkN "उपन्यासकार" ; -- tocheck lin novelty_N = mkN "विलक्षणता" ; -- tocheck -lin november_N = mkN "नवंबरअ" ; -- tocheck -lin november_PN = mkPN "नवम्बर" ; -- tocheck lin novice_N = mkN "नया घोड़ा" ; -- tocheck lin noviciate_N = mkN "नवदीक्षा काल" ; -- tocheck lin novitiate_N = mkN "नवदीक्षा काल" ; -- tocheck @@ -18218,7 +18206,6 @@ lin octagonal_A = mkA "अष्टभुजाकार" ; -- tocheck lin octane_N = mkN "ऑक्टेन" ; -- tocheck lin octangular_A = mkA "अष्टभुजाकार" ; -- tocheck lin octave_N = mkN "अष्टाह" ; -- tocheck -lin october_N = mkN "अक्तुबर" ; -- tocheck lin octogenarian_N = mkN "अस्सीतिवर्षीय व्यक्ति" ; -- tocheck lin octopus_N = mkN "ऑक्टोपस" ; -- tocheck lin ocular_A = mkA "दृष्टि संबंधी" ; -- tocheck @@ -23543,7 +23530,8 @@ lin russet_A = mkA "गेरुआ" ; -- tocheck lin russet_N = mkN "गेरुआ कपड़ा" ; -- tocheck lin russia_PN = mkPN "रूस" ; -- tocheck lin russian_A = mkA "रूस संबंधी" ; -- tocheck -lin russian_N = mkN "रूसी" ; -- tocheck +lin russianMasc_N = mkN "रूसी" ; -- tocheck +lin russianFem_N = mkN "रूसी" ; -- tocheck lin rust_N = mkN "ज़ंग" ; -- tocheck lin rust_V = compoundV "ज़ंग" (mkV "लगना") ; -- tocheck lin rust_V2 = mkV2 (compoundV "ज़ंग" (mkV "लगना")) ; -- tocheck @@ -23806,7 +23794,6 @@ lin satisfactory_A = mkA "संतोषप्रद" ; -- tocheck --subcat lin satisfy_V = compoundV "आपूर्ति" (mkV "करना") ; -- tocheck lin satisfy_V2 = mkV2 (compoundV "आपूर्ति" (mkV "करना")) ; -- tocheck lin saturation_N = mkN "संतृप्तीकरण" ; -- tocheck -lin saturday_N = mkN "शनिवार" ; -- tocheck lin saturn_PN = mkPN "शनि देव" ; -- tocheck lin saturnine_A = mkA "शनि के प्रभाव से ग्रस्त" ; -- tocheck lin satyr_N = mkN "सैटर" ; -- tocheck @@ -24480,7 +24467,6 @@ lin separatism_N = mkN "पृथकतावाद" ; -- tocheck lin separatist_N = mkN "पृथकतावादी" ; -- tocheck lin separative_A = mkA "विभाजक" ; -- tocheck lin sepia_N = mkN "लाल-भूरा रंग" ; -- tocheck -lin september_PN = mkPN "सितम्बर" ; -- tocheck lin septet_N = mkN "सप्त" ; -- tocheck lin septic_A = mkA "सड़नदार" ; -- tocheck lin septicaemia_N = mkN "रक्तविषण्णता" ; -- tocheck @@ -27495,7 +27481,6 @@ lin sunburn_N = mkN "धूप-दाह" ; -- tocheck lin sunburned_A = mkA "धूप-ताम्र" ; -- tocheck lin sunburnt_A = mkA "धूप से झुलसा" ; -- tocheck lin sundae_N = mkN "फलमिश्रित आइसक्रीम" ; -- tocheck -lin sunday_N = mkN "रविवार" ; -- tocheck lin sundial_N = mkN "धूप-घड़ी" ; -- tocheck lin sundown_N = mkN "सूर्यास्त" ; -- tocheck lin sundowner_N = mkN "संध्याकालीन मदिरापान" ; -- tocheck @@ -27743,7 +27728,8 @@ lin sweatshop_N = mkN "शोषण करने वाली श्रमिक lin sweaty_A = mkA "पसीने से तर" ; -- tocheck lin sweden_PN = mkPN "स्वीडन" ; -- tocheck lin swedish_A = mkA "स्वीडन का" ; -- tocheck -lin swedish_N = mkN "स्वीडनवास्" ; -- tocheck +lin swedishMasc_N = mkN "स्वीडनवास्" ; -- tocheck +lin swedishFem_N = mkN "स्वीडनवास्" ; -- tocheck lin sweep_N = mkN "चक्कर" ; -- tocheck lin sweep_V = mkV "फैलना" ; -- tocheck lin sweep_V2 = mkV2 (mkV "फैलना") ; -- tocheck @@ -28499,7 +28485,8 @@ lin textile_N = mkN "कपड़ा-उद्योग" ; -- tocheck lin texture_N = mkN "प्रकृति" ; -- tocheck lin textured_A = mkA "बुनावटदार" ; -- tocheck lin thai_A = mkA "थाई" ; -- tocheck -lin thai_N = mkN "थाई" ; -- tocheck +lin thaiMasc_N = mkN "थाई" ; -- tocheck +lin thaiFem_N = mkN "थाई" ; -- tocheck lin thalidomide_N = mkN "थैलिडोमाइड" ; -- tocheck lin thank_V2 = mkV2 (compoundV "आभार प्रदर्शित" (mkV "करना")) ; -- tocheck lin thankful_A = mkA "आभारी" ; -- tocheck @@ -28740,7 +28727,6 @@ lin thunderclap_N = mkN "मेघ गर्जन" ; -- tocheck lin thunderous_A = mkA "कानफोड़ू" ; -- tocheck lin thunderstorm_N = mkN "तड़ित् झंझा" ; -- tocheck lin thunderstruck_A = mkA "भौंचक्का" ; -- tocheck -lin thursday_N = mkN "बृहस्पतिवार" ; -- tocheck lin thus_Adv = mkAdv "इस प्रकार" ; -- tocheck lin thwack_V2 = mkV2 (compoundV "थप्पड़" (mkV "मारना")) ; -- tocheck lin thwart_N = mkN "आड़ा तख्ता" ; -- tocheck @@ -29629,7 +29615,6 @@ lin tuck_in_V = compoundV "डट" (mkV "कर खाना") ; -- tocheck lin tuck_in_V2 = mkV2 (compoundV "डट कर" (mkV "खाना")) ; -- tocheck lin tuck_shop_N = mkN "मिठाई की दुकान" ; -- tocheck lin tucker_N = mkN "टांका लगाने वाला" ; -- tocheck -lin tuesday_N = mkN "मंगलवार" ; -- tocheck lin tuft_N = mkN "कलगी" ; -- tocheck lin tufted_A = mkA "कलगीदार" ; -- tocheck lin tug_N = mkN "खींचाव" ; -- tocheck @@ -29696,7 +29681,8 @@ lin turgid_A = mkA "फूला हुआ" ; -- tocheck lin turkey_N = mkN "फ्लप" ; -- tocheck lin turkey_PN = mkPN "टर्की" ; -- tocheck lin turkish_A = mkA "तुर्की" ; -- tocheck -lin turkish_N = mkN "तुर्की भाषा" ; -- tocheck +lin turkishMasc_N = mkN "तुर्की भाषा" ; -- tocheck +lin turkishFem_N = mkN "तुर्की भाषा" ; -- tocheck lin turmeric_N = mkN "हल्दी" ; -- tocheck lin turmoil_N = mkN "खलबली" ; -- tocheck lin turn_N = mkN "पंक्ति" ; -- tocheck @@ -31441,7 +31427,6 @@ lin urbanization_N = mkN "शहरीकरण" ; -- tocheck lin urbanize_V2 = mkV2 (compoundV "शहरीकरण" (mkV "करना")) ; -- tocheck lin urchin_N = mkN "लावारिस शरारती बच्चा" ; -- tocheck lin urdu_A = mkA "उर्दू का" ; -- tocheck -lin urdu_N = mkN "उर्दू" ; -- tocheck lin urea_N = mkN "यूरिया" ; -- tocheck lin uremia_N = mkN "यूरीमिया" ; -- tocheck lin urethra_N = mkN "मूत्रमार्ग" ; -- tocheck @@ -32696,7 +32681,6 @@ lin wedge_N = mkN "वैज" ; -- tocheck lin wedge_V = compoundV "अटका" (mkV "देना") ; -- tocheck lin wedge_V2 = mkV2 (compoundV "अटका" (mkV "देना")) ; -- tocheck lin wedlock_N = mkN "विवाह" ; -- tocheck -lin wednesday_N = mkN "बुधवार" ; -- tocheck lin wee_A = mkA "बहुत छोटा" ; -- tocheck lin wee_N = mkN "अल्पकाल" ; -- tocheck lin wee_V = compoundV "पेशाब" (mkV "करना") ; -- tocheck @@ -35003,7 +34987,6 @@ lin julia_PN = mkPN "Julia" ; -- src=eng status=guess lin julian_PN = mkPN "Julian" ; -- src=geonames status=guess lin julie_PN = mkPN "Julie" ; -- src=eng status=guess lin juliet_PN = mkPN "Juliet" ; -- src=eng status=guess -lin july_PN = mkPN "July" ; -- src=eng status=guess lin jun_PN = mkPN "Jun" ; -- src=geonames status=guess lin justin_PN = mkPN "Justin" ; -- src=geonames status=guess lin kalgan_PN = mkPN "Kalgan" ; -- src=eng status=guess @@ -35383,7 +35366,6 @@ lin mon_PN = mkPN "Mon" ; -- src=geonames status=guess lin monaco_PN = mkPN "मोनैको" ; -- src=geonames status=guess lin monaghan_PN = mkPN "Monaghan" ; -- src=geonames status=guess lin monchengladbach_PN = mkPN "Monchengladbach" ; -- src=eng status=guess -lin monday_PN = mkPN "Monday" ; -- src=eng status=guess lin mongolia_PN = mkPN "मंगोलिया" ; -- src=geonames status=guess lin monica_PN = mkPN "Monica" ; -- src=eng status=guess lin monifieth_PN = mkPN "Monifieth" ; -- src=eng status=guess @@ -35526,7 +35508,6 @@ lin occident_PN = mkPN "Occident" ; -- src=eng status=guess lin ockbrook_PN = mkPN "Ockbrook" ; -- src=eng status=guess lin ockendon_PN = mkPN "Ockendon" ; -- src=eng status=guess lin oct_PN = mkPN "Oct" ; -- src=eng status=guess -lin october_PN = mkPN "October" ; -- src=eng status=guess lin odessa_PN = mkPN "Odessa" ; -- src=geonames status=guess lin oedipus_PN = mkPN "Oedipus" ; -- src=eng status=guess lin offaly_PN = mkPN "Offaly" ; -- src=eng status=guess @@ -35873,7 +35854,6 @@ lin sarisbury_PN = mkPN "Sarisbury" ; -- src=eng status=guess lin saskatchewan_PN = mkPN "Saskatchewan" ; -- src=eng status=guess lin sassari_PN = mkPN "Sassari" ; -- src=geonames status=guess lin sat_PN = mkPN "Sat" ; -- src=eng status=guess -lin saturday_PN = mkPN "Saturday" ; -- src=eng status=guess lin sauchie_PN = mkPN "Sauchie" ; -- src=eng status=guess lin saudi_arabia_PN = mkPN "Saudi arabia" ; -- src=eng status=guess lin sawbridgeworth_PN = mkPN "Sawbridgeworth" ; -- src=geonames status=guess @@ -36040,7 +36020,6 @@ lin sudbury_PN = mkPN "Sudbury" ; -- src=geonames status=guess lin sue_PN = mkPN "Sue" ; -- src=eng status=guess lin suffolk_PN = mkPN "Suffolk" ; -- src=geonames status=guess lin sumatra_PN = mkPN "Sumatra" ; -- src=eng status=guess -lin sunday_PN = mkPN "Sunday" ; -- src=eng status=guess lin sunderland_PN = mkPN "Sunderland" ; -- src=geonames status=guess lin supt_PN = mkPN "Supt" ; -- src=eng status=guess lin surabaja_PN = mkPN "Surabaja" ; -- src=eng status=guess @@ -36120,7 +36099,6 @@ lin thurcroft_PN = mkPN "Thurcroft" ; -- src=eng status=guess lin thurmaston_PN = mkPN "Thurmaston" ; -- src=eng status=guess lin thurrock_PN = mkPN "Thurrock" ; -- src=eng status=guess lin thurs_PN = mkPN "Thurs" ; -- src=eng status=guess -lin thursday_PN = mkPN "Thursday" ; -- src=eng status=guess lin thurso_PN = mkPN "Thurso" ; -- src=geonames status=guess lin tibet_PN = mkPN "Tibet" ; -- src=eng status=guess lin tidworth_PN = mkPN "Tidworth" ; -- src=geonames status=guess @@ -36167,7 +36145,6 @@ lin tsinan_PN = mkPN "Tsinan" ; -- src=eng status=guess lin tsingtao_PN = mkPN "Tsingtao" ; -- src=eng status=guess lin tsitsihar_PN = mkPN "Tsitsihar" ; -- src=eng status=guess lin tues_PN = mkPN "Tues" ; -- src=eng status=guess -lin tuesday_PN = mkPN "Tuesday" ; -- src=eng status=guess lin tullibody_PN = mkPN "Tullibody" ; -- src=eng status=guess lin tunbridge_wells_PN = mkPN "Tunbridge wells" ; -- src=eng status=guess lin tunis_PN = mkPN "ट्यूनिस" ; -- src=geonames status=guess @@ -36258,7 +36235,6 @@ lin watford_PN = mkPN "Watford" ; -- src=geonames status=guess lin wayne_PN = mkPN "Wayne" ; -- src=geonames status=guess lin wear_PN = mkPN "Wear" ; -- src=eng status=guess lin wed_PN = mkPN "Wed" ; -- src=eng status=guess -lin wednesday_PN = mkPN "Wednesday" ; -- src=eng status=guess lin wellingborough_PN = mkPN "Wellingborough" ; -- src=geonames status=guess lin wellington_PN = mkPN "वेलिंग्टन" ; -- src=geonames status=guess lin welshpool_PN = mkPN "Welshpool" ; -- src=geonames status=guess diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf index 8b2db69ad..14bbdb338 100644 --- a/lib/src/translator/DictionaryIta.gf +++ b/lib/src/translator/DictionaryIta.gf @@ -7097,7 +7097,8 @@ lin freeze_V = L.freeze_V ; lin freeze_V2 = mkV2 (mkV "congelare") ; -- status=guess, src=wikt lin freezer_N = mkN "congelatore" masculine ; -- status=guess lin freight_N = variants{} ; -- -lin french_N = mkN "patate fritte" | mkN "patatine fritte" ; -- status=guess status=guess +lin frenchMasc_N = mkN "patate fritte" | mkN "patatine fritte" ; -- status=guess status=guess +lin frenchFem_N = mkN "patate fritte" | mkN "patatine fritte" ; -- status=guess status=guess lin frenetic_A = mkA "frenetico" ; -- status=guess lin frenzy_N = mkN "frenesia" ; -- status=guess lin frequency_N = mkN "modulazione di frequenza" ; -- status=guess @@ -10380,7 +10381,6 @@ lin marathon_N = mkN "maratona" ; -- status=guess lin marathoner_N = mkN "maratoneta" masculine ; -- status=guess lin marauder_N = mkN "predone" masculine ; -- status=guess lin marble_N = mkN "marmo" ; -- status=guess -lin march_N = mkN "marcia" ; -- status=guess lin march_V = mkV "marciare" ; -- status=guess, src=wikt lin march_V2 = mkV2 (mkV "marciare") ; -- status=guess, src=wikt lin mare_N = mkN "cavalla" ; -- status=guess @@ -10510,7 +10510,6 @@ lin maximum_A = mkA "massimo" ; -- status=guess lin maximum_N = mkN "massimo" ; -- status=guess lin may_1_VV = mkVV potere_V ; lin may_2_VV = mkVV potere_V ; -lin may_N = mkN "biancospino" ; -- status=guess lin maybe_Adv = mkAdv "forse" ; lin mayhem_N = mkN "caos" masculine ; -- status=guess lin mayonnaise_N = mkN "maionese" feminine ; -- status=guess @@ -19061,7 +19060,6 @@ lin atlantic_PN = mkPN "Atlantic" ; -- status=guess src=geonames lin auckland_PN = mkPN "Auckland" ; -- status=guess src=geonames lin audley_PN = mkPN "Audley" ; -- status=guess src=geonames lin augsburg_PN = mkPN "Augusta" ; -- status=guess src=geonames -lin august_PN = mkPN "August" ; -- status=guess src=geonames lin australia_PN = mkPN "Australia" ; -- status=guess src=geonames lin austria_PN = mkPN "Austria" ; -- status=guess src=geonames lin aveley_PN = mkPN "Aveley" ; -- status=guess src=geonames @@ -19892,7 +19890,6 @@ lin manila_PN = mkPN "Manila" ; -- status=guess src=geonames lin mannheim_PN = mkPN "Mannheim" ; -- status=guess src=geonames lin mansfield_PN = mkPN "Mansfield" ; -- status=guess src=geonames lin maracaibo_PN = mkPN "Maracaibo" ; -- status=guess src=geonames -lin march_PN = mkPN "March" ; -- status=guess src=geonames lin margaret_PN = mkPN "Margaret" ; -- status=guess src=geonames lin margate_PN = mkPN "Margate" ; -- status=guess src=geonames lin maria_PN = mkPN "Maria" ; -- status=guess src=geonames diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index 9a8cede11..a294eef1c 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -8494,7 +8494,8 @@ lin freeze_V = L.freeze_V ; lin freeze_V2 = mkV2 (helar_V) ; -- status=guess lin freezer_N = mkN "congelador" masculine ; -- status=guess lin freight_N = mkN "flete" masculine ; -- status=guess -lin french_N = mkN "patatas fritas" | mkN " papas fritas" | mkN "[Nicaragua] papitas fritas" ; -- status=guess status=guess status=guess +lin frenchMasc_N = mkN "patatas fritas" | mkN " papas fritas" | mkN "[Nicaragua] papitas fritas" ; -- status=guess status=guess status=guess +lin frenchFem_N = mkN "patatas fritas" | mkN " papas fritas" | mkN "[Nicaragua] papitas fritas" ; -- status=guess status=guess status=guess lin frenetic_A = mkA "frenético" ; -- status=guess lin frenzy_N = mkN "frenesí" masculine | mkN "manía" ; -- status=guess status=guess lin frequency_N = mkN "modulación de la frecuencia" ; -- status=guess @@ -12429,7 +12430,6 @@ lin marasmus_N = mkN "marasmo" ; -- status=guess lin marathon_N = mkN "m-f" ; -- status=guess lin maraud_V = mkV "merodear" ; -- status=guess, src=wikt lin marble_N = mkN "mármol" masculine ; -- status=guess -lin march_N = mkN "marcha" ; -- status=guess lin march_V = mkV "marchar" ; -- status=guess lin march_V2 = mkV2 (mkV "marchar") ; -- status=guess lin marchioness_N = mkN "marquesa" ; -- status=guess @@ -12585,7 +12585,6 @@ lin maximum_A = mkA "máximo" ; -- status=guess lin maximum_N = mkN "máximo" ; -- status=guess lin may_1_VV = mkVV (mkV "poder" "puedo") ; lin may_2_VV = mkVV (mkV "poder" "puedo") ; -lin may_N = mkN "espino" | mkN "marzoleto" ; -- status=guess status=guess lin maybe_Adv = mkAdv "quizás" | mkAdv "quizá" ; lin mayfly_N = mkN "efímera" ; -- status=guess lin mayhem_N = mkN "alboroto" ; -- status=guess @@ -22688,7 +22687,6 @@ lin atlantic_PN = mkPN "Atlantic" ; -- status=guess src=geonames lin auckland_PN = mkPN "Auckland" ; -- status=guess src=geonames lin audley_PN = mkPN "Audley" ; -- status=guess src=geonames lin augsburg_PN = mkPN "Augsburgo" ; -- status=guess src=geonames -lin august_PN = mkPN "August" ; -- status=guess src=geonames lin australia_PN = mkPN "Australia" ; -- status=guess src=geonames lin austria_PN = mkPN "Austria" ; -- status=guess src=geonames lin aveley_PN = mkPN "Aveley" ; -- status=guess src=geonames @@ -23519,7 +23517,6 @@ lin manila_PN = mkPN "Manila" ; -- status=guess src=geonames lin mannheim_PN = mkPN "Mannheim" ; -- status=guess src=geonames lin mansfield_PN = mkPN "Mansfield" ; -- status=guess src=geonames lin maracaibo_PN = mkPN "Maracaibo" ; -- status=guess src=geonames -lin march_PN = mkPN "March" ; -- status=guess src=geonames lin margaret_PN = mkPN "Margaret" ; -- status=guess src=geonames lin margate_PN = mkPN "Margate" ; -- status=guess src=geonames lin maria_PN = mkPN "Maria" ; -- status=guess src=geonames diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 3e438f98b..599954960 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -1148,7 +1148,6 @@ lin africa_PN = mkPN "Afrika" neutrum; lin africanFem_N = mkN "afrikan" "afrikaner" ; -- comment=2 lin africanMasc_N = mkN "afrikan" "afrikaner" ; -- comment=2 lin african_A = mkA "afrikansk" ; -- status=guess -lin afrikaans_N = variants {} ; -- status=guess lin afrikanerFem_N = variants {} ; -- status=guess lin afrikanerMasc_N = variants {} ; -- status=guess lin afrikaner_A = variants {} ; -- status=guess @@ -1992,7 +1991,6 @@ lin amethystine_A = variants {} ; -- status=guess lin ametria_N = variants {} ; -- status=guess lin ametropia_N = variants {} ; -- status=guess lin ametropic_A = variants {} ; -- status=guess -lin amharic_N = variants {} ; -- status=guess lin amiability_N = variants {} ; -- status=guess lin amiable_A = mkA "älskvärd" "älskvärt" ; -- comment=3 lin amicability_N = variants {} ; -- status=guess @@ -3145,8 +3143,6 @@ lin apractic_A = variants {} ; -- status=guess lin apraxia_N = variants {} ; -- status=guess lin apres_ski_A = variants {} ; -- status=guess lin apricot_N = mkN "aprikos" "aprikoser" ; -- status=guess -lin april_N = mkN "april" ; -- status=guess -lin april_PN = mkPN "April"; -- src=eng status=guess lin apron_N = mkN "förkläde" ; -- status=guess lin apropos_A = mkA "passande" ; -- comment=4 lin apropos_Adv = mkAdv "apropå" ; -- status=guess @@ -3185,7 +3181,6 @@ lin arabianFem_N = variants {} ; -- status=guess lin arabianMasc_N = variants {} ; -- status=guess lin arabian_A = variants {} ; -- status=guess lin arabic_A = variants {} ; -- status=guess -lin arabic_N = variants {} ; -- status=guess lin arability_N = variants {} ; -- status=guess lin arabist_N = variants {} ; -- status=guess lin arable_A = mkA "odlingsbar" ; -- status=guess @@ -4120,8 +4115,6 @@ lin augur_V = mkV "förespår" ; -- comment=6 lin augur_V2 = mkV2 (mkV "bådar"); -- status=guess, src=wikt lin augury_N = mkN "järtecken" "järtecknet" "järtecken" "järtecknen" ; -- comment=2 lin august_A = mkA "upphöjd" "upphöjt" ; -- comment=4 -lin august_N = mkN "augusti" ; -- status=guess -lin august_PN = mkPN "August" neutrum; -- src=geonames status=guess lin augustan_A = variants {} ; -- status=guess lin auk_N = mkN "alka" ; -- status=guess lin auklet_N = variants {} ; -- status=guess @@ -9367,7 +9360,8 @@ lin catacorner_A = variants {} ; -- status=guess lin catadromous_A = variants {} ; -- status=guess lin catafalque_N = variants {} ; -- status=guess lin catalan_A = variants {} ; -- status=guess -lin catalan_N = variants {} ; -- status=guess +lin catalanMasc_N = variants {} ; -- status=guess +lin catalanFem_N = variants {} ; -- status=guess lin catalase_N = variants {} ; -- status=guess lin catalatic_A = variants {} ; -- status=guess lin catalectic_A = variants {} ; -- status=guess @@ -10365,7 +10359,8 @@ lin chinchilla_N = mkN "chinchilla" ; -- status=guess lin chinchow_PN = mkPN "Chinchow"; -- src=eng status=guess lin chine_N = mkN "ryggrad" "ryggrader" ; -- comment=5 lin chinese_A = mkA "kinesisk" ; -- status=guess -lin chinese_N = mkN "kinesiska" ; -- comment=3 +lin chineseMasc_N = mkN "kinesiska" ; -- comment=3 +lin chineseFem_N = mkN "kinesiska" ; -- comment=3 lin chink_N = mkN "springa" ; -- comment=5 lin chink_V = mkV "springa" "sprang" "sprungit" ; -- comment=4 lin chink_V2 = variants {} ; -- status=guess @@ -14753,7 +14748,8 @@ lin dangleberry_N = variants {} ; -- status=guess lin daniel_N = variants {} ; -- status=guess lin daniel_PN = mkPN "Daniel"; -- src=eng status=guess lin danish_A = mkA "dansk" ; -- status=guess -lin danish_N = mkN "wienerbröd" neutrum; -- comment=4 +lin danishMasc_N = mkN "wienerbröd" neutrum; -- comment=4 +lin danishFem_N = mkN "wienerbröd" neutrum; -- comment=4 lin dank_A = mkA "rå" "rått" ; -- comment=3 lin dankness_N = variants {} ; -- status=guess lin danny_PN = mkPN "Danny"; -- src=eng status=guess @@ -15072,8 +15068,6 @@ lin deceivingly_Adv = variants {} ; -- status=guess lin decelerate_V = variants {} ; -- status=guess lin decelerate_V2 = variants {} ; -- status=guess lin deceleration_N = mkN "fartminskning" ; -- status=guess -lin december_N = mkN "december" ; -- status=guess -lin december_PN = mkPN "December"; -- src=eng status=guess lin decency_N = mkN "hygglighet" "hyggligheter" ; -- comment=2 lin decent_A = mkA "anständig" ; -- comment=13 lin decentralization_N = mkN "decentralisering" ; -- status=guess @@ -18051,7 +18045,8 @@ lin dustmop_N = variants {} ; -- status=guess lin dustpan_N = mkN "sopskyffel" ; -- status=guess lin dusty_A = mkA "dammig" ; -- comment=4 lin dutch_A = mkA "nederländsk" ; -- status=guess -lin dutch_N = mkN "holländska" ; -- comment=5 +lin dutchMasc_N = mkN "holländska" ; -- comment=5 +lin dutchFem_N = mkN "holländska" ; -- comment=5 lin dutchman_N = mkN "nederländare" utrum; -- status=guess lin duteous_A = mkA "underdånig" | (mkA "plikttrogen" "plikttroget"); -- status=guess status=guess lin dutiable_A = variants {} ; -- status=guess @@ -19125,7 +19120,8 @@ lin engineering_N = mkN "teknik" "tekniker" ; -- status=guess lin enginery_N = variants {} ; -- status=guess lin england_PN = mkPN "England" neutrum; -- src=geonames status=guess lin english_A = mkA "engelsk" ; -- status=guess -lin english_N = mkN "engelska" ; -- comment=2 +lin englishMasc_N = mkN "engelska" ; -- comment=2 +lin englishFem_N = mkN "engelska" ; -- comment=2 lin englishman_N = variants {} ; -- status=guess lin englishwoman_N = variants {} ; -- status=guess lin engorgement_N = variants {} ; -- status=guess @@ -20954,8 +20950,6 @@ lin feature_V2 = dirV2 (partV (mkV "visar")"in"); -- status=guess lin featureless_A = mkA "formlös" ; -- status=guess lin feb_PN = mkPN "Feb"; -- src=eng status=guess lin febrile_A = mkA "febril" ; -- SaldoWN -lin february_N = mkN "februari" ; -- status=guess -lin february_PN = mkPN "February"; -- src=eng status=guess lin feckless_A = mkA "svag" ; -- comment=2 lin fecklessness_N = variants {} ; -- status=guess lin fecula_N = variants {} ; -- status=guess @@ -22730,7 +22724,8 @@ lin freight_train_N = variants {} ; -- status=guess lin freighter_N = variants {} ; -- status=guess lin freightliner_N = variants {} ; -- status=guess lin french_A = mkA "fransk" ; -- status=guess -lin french_N = mkN "franska" ; -- status=guess status=guess +lin frenchMasc_N = mkN "franska" ; -- status=guess status=guess +lin frenchFem_N = mkN "franska" ; -- status=guess status=guess lin frenchman_N = mkN "fransman" "fransmän" ; -- status=guess lin frenchwoman_N = mkN "fransyska" ; -- status=guess lin frenetic_A = mkA "frenetisk" ; -- status=guess @@ -22778,8 +22773,6 @@ lin fricative_N = mkN "frikativa" ; -- status=guess lin friction_N = mkN "friktion" "friktioner" ; -- status=guess lin frictional_A = variants {} ; -- status=guess lin frictionless_A = mkA "friktionsfri" "friktionsfritt" ; -- status=guess -lin friday_N = mkN "fredag" ; -- status=guess -lin friday_PN = mkPN "Friday"; -- src=eng status=guess lin fridge_N = L.fridge_N ; lin friedcake_N = variants {} ; -- status=guess lin friend_N = L.friend_N ; @@ -24816,7 +24809,8 @@ lin greed_N = mkN "glupskhet" ; -- comment=3 lin greediness_N = variants {} ; -- status=guess lin greedy_A = mkA "lysten" "lystet" ; -- comment=5 lin greek_A = mkA "grekisk" ; -- status=guess -lin greek_N = mkN "grekiska" ; -- comment=4 +lin greekMasc_N = mkN "grekiska" ; -- comment=4 +lin greekFem_N = mkN "grekiska" ; -- comment=4 lin green_A = L.green_A ; lin green_N = mkN "grönska" | mkN "bana" ; -- SaldoWN -- comment=2 lin greenback_N = variants {} ; -- status=guess @@ -26195,7 +26189,6 @@ lin hebephrenic_A = variants {} ; -- status=guess lin hebetude_N = variants {} ; -- status=guess lin hebraic_A = variants {} ; -- status=guess lin hebrew_A = variants {} ; -- status=guess -lin hebrew_N = variants {} ; -- status=guess lin hecatomb_N = variants {} ; -- status=guess lin heck_N = variants {} ; -- status=guess lin heckelphone_N = variants {} ; -- status=guess @@ -26714,7 +26707,6 @@ lin hinder_V2 = mkV2 (mkV "hindrar") | mkV2 (mkV "fördröja"); -- status=guess, lin hindfoot_N = variants {} ; -- status=guess lin hindgut_N = variants {} ; -- status=guess lin hindi_A = variants {} ; -- status=guess -lin hindi_N = variants {} ; -- status=guess lin hindmost_A = variants {} ; -- status=guess lin hindquarter_N = mkN "bakfjärding" | mkN "bakbog" ; -- status=guess status=guess lin hindquarters_N = variants {} ; -- status=guess @@ -30116,7 +30108,8 @@ lin isthmian_A = variants {} ; -- status=guess lin isthmus_N = mkN "näs" neutrum; -- comment=2 lin it_Pron = S.it_Pron; lin italian_A = mkA "italiensk" ; -- status=guess -lin italian_N = mkN "italienska" ; -- comment=3 +lin italianMasc_N = mkN "italienska" ; -- comment=3 +lin italianFem_N = mkN "italienska" ; -- comment=3 lin italic_A = mkA "kursiv" ; -- status=guess lin italic_N = mkN "kursiv" "kursiver" ; -- status=guess lin italicize_V2 = variants {} ; -- status=guess @@ -30254,8 +30247,6 @@ lin janice_PN = mkPN "Janice"; -- src=eng status=guess lin janie_PN = mkPN "Janie"; -- src=eng status=guess lin janissary_N = mkN "janitsjar" "janitsjarer" ; -- status=guess lin janitor_N = mkN "vaktmästare" utrum | mkN "fastighetsskötare" utrum ; -- SaldoWN -- comment=3 -lin january_N = mkN "januari" ; -- status=guess -lin january_PN = mkPN "Januari"; lin janus_PN = mkPN "Janus"; -- src=eng status=guess lin japan_N = variants {} ; -- status=guess lin japan_PN = mkPN "Japan" neutrum; @@ -30638,7 +30629,6 @@ lin julian_PN = mkPN "Julian" neutrum; -- src=geonames status=guess lin julie_PN = mkPN "Julie"; -- src=eng status=guess lin julienne_N = variants {} ; -- status=guess lin juliet_PN = mkPN "Juliet"; -- src=eng status=guess -lin july_PN = mkPN "July"; -- src=eng status=guess lin jumble_N = mkN "röra" ; -- comment=5 lin jumble_V = mkV "röra" "rörde" "rört" ; -- status=guess lin jumble_V2 = variants {} ; -- status=guess @@ -30663,8 +30653,6 @@ lin jun_PN = mkPN "Jun" neutrum; -- src=geonames status=guess lin junco_N = variants {} ; -- status=guess lin junction_N = mkN "järnvägsknut" | mkN "knutpunkt" "knutpunkter" ; -- SaldoWN -- comment=2 lin juncture_N = variants {} ; -- status=guess -lin june_N = mkN "juni" ; -- status=guess -lin june_PN = mkPN "June"; -- src=eng status=guess lin jungle_N = mkN "djungel" "djungeln" "djungler" "djunglerna" ; -- SaldoWN lin jungly_A = variants {} ; -- status=guess lin junior_A = mkA "junior" | compoundA (regA "underordnad") ; -- SaldoWN -- comment=3 @@ -31808,7 +31796,6 @@ lin lathery_A = variants {} ; -- status=guess lin lathi_N = variants {} ; -- status=guess lin laticifer_N = variants {} ; -- status=guess lin latin_A = mkA "latinsk" ; -- status=guess -lin latin_N = mkN "latin" neutrum; -- status=guess lin latinate_A = variants {} ; -- status=guess lin latinist_N = variants {} ; -- status=guess lin latinize_V2 = variants {} ; -- status=guess @@ -34049,7 +34036,8 @@ lin malta_PN = mkPN "Malta" neutrum; lin maltby_PN = mkPN "Maltby" neutrum; -- src=geonames status=guess lin malted_N = variants {} ; -- status=guess lin maltese_A = variants {} ; -- status=guess -lin maltese_N = variants {} ; -- status=guess +lin malteseMasc_N = variants {} ; -- status=guess +lin malteseFem_N = variants {} ; -- status=guess lin maltha_N = variants {} ; -- status=guess lin malthusian_A = variants {} ; -- status=guess lin maltose_N = (mkN "maltos") | (mkN "maltsocker" neutrum); -- status=guess status=guess @@ -34291,8 +34279,6 @@ lin marblewood_N = variants {} ; -- status=guess lin marbling_N = variants {} ; -- status=guess lin marc_N = variants {} ; -- status=guess lin marcel_N = variants {} ; -- status=guess -lin march_N = mkN "marsch" "marscher" | mkN "mars" ; -- SaldoWN -lin march_PN = mkPN "March" neutrum; -- src=geonames status=guess lin march_V = mkV "marscherar" ; -- comment=6 lin march_V2 = dirV2 (partV (mkV "marscherar")"ut"); -- comment=7 lin marcher_N = variants {} ; -- status=guess @@ -34705,8 +34691,6 @@ lin maxine_PN = mkPN "Maxine"; -- src=eng status=guess lin maxwell_N = variants {} ; -- status=guess lin may_1_VV = S.can_VV ; lin may_2_VV = auxVV (mkV "få" "fick" "fått") ; -lin may_N = mkN "maj" ; -- comment=2 -lin may_PN = mkPN "May"; -- src=eng status=guess lin may_beetle_N = variants {} ; -- status=guess lin may_bug_N = variants {} ; -- status=guess lin mayapple_N = variants {} ; -- status=guess @@ -36209,8 +36193,6 @@ lin monatomic_A = variants {} ; -- status=guess lin monaural_A = variants {} ; -- status=guess lin monazite_N = variants {} ; -- status=guess lin monchengladbach_PN = mkPN "Monchengladbach"; -- src=eng status=guess -lin monday_N = mkN "måndag" ; -- status=guess -lin monday_PN = mkPN "Monday"; -- src=eng status=guess lin monegasque_A = variants {} ; -- status=guess lin monegasque_N = variants {} ; -- status=guess lin moneran_A = variants {} ; -- status=guess @@ -37613,7 +37595,8 @@ lin nepal_PN = mkPN "Nepal" neutrum; -- src=geonames status=guess lin nepalese_A = variants {} ; -- status=guess lin nepalese_N = variants {} ; -- status=guess lin nepali_A = variants {} ; -- status=guess -lin nepali_N = variants {} ; -- status=guess +lin nepaliMasc_N = variants {} ; -- status=guess +lin nepaliFem_N = variants {} ; -- status=guess lin nepheline_N = variants {} ; -- status=guess lin nephelinite_N = variants {} ; -- status=guess lin nephew_N = mkN "brorson" "brorsöner" ; -- SaldoWN @@ -38452,7 +38435,8 @@ lin norton_PN = mkPN "Norton" neutrum; -- src=geonames status=guess lin nortriptyline_N = variants {} ; -- status=guess lin norway_PN = mkPN "Norge" neutrum; lin norwegian_A = mkA "norsk" ; -- status=guess -lin norwegian_N = variants {} ; -- status=guess +lin norwegianMasc_N = variants {} ; -- status=guess +lin norwegianFem_N = variants {} ; -- status=guess lin norwich_PN = mkPN "Norwich" neutrum; -- src=geonames status=guess lin nose_N = L.nose_N ; lin nose_V = mkV "smyga" "smög" "smugit" ; -- status=guess, src=wikt @@ -38555,8 +38539,6 @@ lin novelette_N = variants {} ; -- status=guess lin novelist_N = variants{} ; -- lin novelization_N = variants {} ; -- status=guess lin novelty_N = mkN "nyhet" "nyheter" ; -- comment=3 -lin november_N = mkN "november" ; -- status=guess -lin november_PN = mkPN "November"; -- src=eng status=guess lin novena_N = variants {} ; -- status=guess lin novice_N = mkN "novis" "noviser" ; -- comment=5 lin noviciate_N = variants {} ; -- status=guess @@ -38938,8 +38920,6 @@ lin octavo_N = variants {} ; -- status=guess lin octet_N = mkN "oktett" "oktetter" ; -- status=guess lin octette_N = variants {} ; -- status=guess lin octillion_N = variants {} ; -- status=guess -lin october_N = mkN "oktober" ; -- status=guess -lin october_PN = mkPN "October"; -- src=eng status=guess lin octogenarian_A = variants {} ; -- status=guess lin octogenarian_N = variants {} ; -- status=guess lin octopod_N = variants {} ; -- status=guess @@ -48623,7 +48603,8 @@ lin romance_V2 = variants {} ; -- status=guess lin romanesque_N = variants {} ; -- status=guess lin romania_PN = mkPN "Rumänien" neutrum; -- src=geonames status=guess lin romanian_A = mkA "rumänsk" ; -- status=guess -lin romanian_N = mkN "rumänska" ; -- comment=3 +lin romanianMasc_N = mkN "rumänska" ; -- comment=3 +lin romanianFem_N = mkN "rumänska" ; -- comment=3 lin romantic_A = mkA "romantisk" ; -- SaldoWN lin romantic_N = mkN "romantiker" "romantikern" "romantiker" "romantikerna" ; -- status=guess lin romantically_Adv = variants {} ; -- status=guess @@ -49121,7 +49102,8 @@ lin russet_A = mkA "rödbrun" ; -- status=guess lin russet_N = mkN "vadmal" ; -- status=guess lin russia_PN = mkPN "Ryssland" neutrum; -- src=geonames status=guess lin russian_A = mkA "rysk" ; -- status=guess -lin russian_N = mkN "ryss" ; -- comment=3 +lin russianMasc_N = mkN "ryss" ; -- comment=3 +lin russianFem_N = mkN "ryss" ; -- comment=3 lin rust_A = variants {} ; -- status=guess lin rust_N = mkN "rost" ; -- comment=2 lin rust_V = mkV "rostar" ; -- comment=2 @@ -49709,8 +49691,6 @@ lin satrap_N = variants {} ; -- status=guess lin satsuma_N = variants {} ; -- status=guess lin saturate_V2 = variants {} ; -- status=guess lin saturation_N = mkN "mättnad" "mättnader" ; -- comment=2 -lin saturday_N = mkN "lördag" ; -- status=guess -lin saturday_PN = mkPN "Saturday"; -- src=eng status=guess lin saturn_PN = mkPN "Saturn"; -- src=eng status=guess lin saturnalia_N = variants {} ; -- status=guess lin saturniid_N = variants {} ; -- status=guess @@ -50978,8 +50958,6 @@ lin sept_PN = mkPN "Sept"; -- src=eng status=guess lin septal_A = variants {} ; -- status=guess lin septation_N = variants {} ; -- status=guess lin septectomy_N = variants {} ; -- status=guess -lin september_N = mkN "september" ; -- status=guess -lin september_PN = mkPN "September"; -- src=eng status=guess lin septet_N = variants {} ; -- status=guess lin septic_A = variants {} ; -- status=guess lin septicaemia_N = variants {} ; -- status=guess @@ -56090,8 +56068,6 @@ lin sunburned_A = mkA "solbränd" ; -- status=guess lin sunburnt_A = mkA "solbränd" ; -- status=guess lin sunburst_N = variants {} ; -- status=guess lin sundae_N = variants {} ; -- status=guess -lin sunday_N = mkN "söndag" ; -- status=guess -lin sunday_PN = mkPN "Sunday"; -- src=eng status=guess lin sunder_N = variants {} ; -- status=guess lin sunder_V2 = variants {} ; -- status=guess lin sunderland_PN = mkPN "Sunderland" neutrum; -- src=geonames status=guess @@ -56436,7 +56412,6 @@ lin swagger_N = variants {} ; -- status=guess lin swagger_V = variants {} ; -- status=guess lin swaggerer_N = variants {} ; -- status=guess lin swagman_N = variants {} ; -- status=guess -lin swahili_N = variants {} ; -- status=guess lin swain_N = variants {} ; -- status=guess lin swale_N = variants {} ; -- status=guess lin swallow_N = mkN "svala" ; -- status=guess @@ -56514,7 +56489,8 @@ lin swedeMasc_N = mkN "svensk" ; -- status=guess lin swede_A = mkA "svensk" ; -- status=guess lin sweden_PN = mkPN "Sverige" neutrum; lin swedish_A = mkA "svensk" ; -- status=guess -lin swedish_N = mkN "svenska" ; -- comment=3 +lin swedishMasc_N = mkN "svenska" ; -- comment=3 +lin swedishFem_N = mkN "svenska" ; -- comment=3 lin sweep_N = mkN "sopa" | mkN "fara" ; -- SaldoWN -- comment=11 lin sweep_V = mkV "susar" ; -- comment=9 lin sweep_V2 = dirV2 (partV (mkV "sopar")"ut"); -- comment=3 @@ -57879,7 +57855,8 @@ lin textual_A = variants {} ; -- status=guess lin texture_N = mkN "struktur" "strukturer" ; -- SaldoWN lin textured_A = variants {} ; -- status=guess lin thai_A = mkA "thailändsk" ; -- status=guess -lin thai_N = variants {} ; -- status=guess +lin thaiMasc_N = variants {} ; -- status=guess +lin thaiFem_N = variants {} ; -- status=guess lin thailand_PN = mkPN "Thailand" neutrum; -- src=geonames status=guess lin thalamocortical_A = variants {} ; -- status=guess lin thalamus_N = variants {} ; -- status=guess @@ -58341,8 +58318,6 @@ lin thurifer_N = variants {} ; -- status=guess lin thurmaston_PN = mkPN "Thurmaston"; -- src=eng status=guess lin thurrock_PN = mkPN "Thurrock"; -- src=eng status=guess lin thurs_PN = mkPN "Thurs"; -- src=eng status=guess -lin thursday_N = mkN "torsdag" ; -- status=guess -lin thursday_PN = mkPN "Thursday"; -- src=eng status=guess lin thurso_PN = mkPN "Thurso" neutrum; -- src=geonames status=guess lin thus_Adv = mkAdv "därför" | mkAdv "alltså" ; lin thwack_N = variants {} ; -- status=guess @@ -59926,8 +59901,6 @@ lin tuck_up_V2 = variants {} ; -- status=guess lin tucker_N = variants {} ; -- status=guess lin tudung_N = variants {} ; -- status=guess lin tues_PN = mkPN "Tues"; -- src=eng status=guess -lin tuesday_N = mkN "tisdag" ; -- status=guess -lin tuesday_PN = mkPN "Tuesday"; -- src=eng status=guess lin tufa_N = variants {} ; -- status=guess lin tuff_N = mkN "tuff" "tuffer" ; -- status=guess lin tuft_N = mkN "tuva" ; -- comment=6 @@ -60025,7 +59998,8 @@ lin turk_N = mkN "turk" ; -- status=guess lin turkey_N = mkN "kalkon" "kalkoner" ; -- SaldoWN lin turkey_PN = mkPN "Turkiet" neutrum; -- src=geonames status=guess lin turkish_A = mkA "turkisk" ; -- status=guess -lin turkish_N = mkN "turkiska" ; -- comment=2 +lin turkishMasc_N = mkN "turkiska" ; -- comment=2 +lin turkishFem_N = mkN "turkiska" ; -- comment=2 lin turku_PN = mkPN "Åbo" neutrum; -- src=geonames status=guess lin turmeric_N = mkN "gurkmeja" ; -- status=guess lin turmoil_N = mkN "tumult" neutrum; -- status=guess @@ -62121,7 +62095,6 @@ lin urceolate_A = variants {} ; -- status=guess lin urceole_N = variants {} ; -- status=guess lin urchin_N = mkN "gatubarn" neutrum; -- comment=2 lin urdu_A = variants {} ; -- status=guess -lin urdu_N = variants {} ; -- status=guess lin urea_N = mkN "urea" ; -- comment=2 lin urease_N = variants {} ; -- status=guess lin uremia_N = mkN "uremi" ; -- status=guess @@ -63754,8 +63727,6 @@ lin wedge_V = mkV "klyva" "klöv" "kluvit" ; -- comment=3 lin wedge_V2 = dirV2 (partV (mkV "kilar")"in"); -- comment=2 lin wedgie_N = mkN "kalsongryck" ; -- status=guess lin wedlock_N = variants {} ; -- status=guess -lin wednesday_N = mkN "onsdag" ; -- status=guess -lin wednesday_PN = mkPN "Wednesday"; -- src=eng status=guess lin wee_A = mkA "liten" "litet" "lilla" "små" "mindre" "minst" "minsta" ; -- status=guess lin wee_N = (mkN "kiss" neutrum) | (mkN "pink" neutrum) | (mkN "piss" neutrum) | (mkN "urin"); -- status=guess status=guess status=guess status=guess lin wee_V = (mkV "pinkar") | (mkV "pissar") | (mkV "kissar"); -- status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt