diff --git a/lib/src/bulgarian/DictEngBul.gf b/lib/src/bulgarian/DictEngBul.gf index 027f0998a..549b5ce92 100644 --- a/lib/src/bulgarian/DictEngBul.gf +++ b/lib/src/bulgarian/DictEngBul.gf @@ -9352,7 +9352,6 @@ lin centesis_N = variants {}; lin centigrade_A = variants {}; lin centiliter_N = variants {}; lin centime_N = variants {}; -lin centimeter_N = variants {}; lin centimetre_N = mkN010 "сантиметър"; lin centimo_N = variants {}; lin centipede_N = mkN041 "стоножка" ; ---- @@ -29630,26 +29629,24 @@ lin killingly_Adv = variants {}; lin killjoy_N = variants {}; lin kilmarnock_PN = variants {}; lin kiln_N = variants {}; -lin kilo_N = mkN007 "килограм" ; -lin kilobit_N = variants {}; -lin kilobyte_N = variants {}; +lin kilo_N = mkN054 "кило"; +lin kilobit_N = mkN001 "килобит"; +lin kilobyte_N = mkN001 "килобайт"; lin kilocycle_N = variants {}; lin kilogram_N = mkN007 "килограм" ; -lin kilohertz_N = variants {}; -lin kiloliter_N = variants {}; -lin kilolitre_N = variants {}; -lin kilometer_N = variants {}; +lin kilohertz_N = mkN007 "килохерц"; +lin kilolitre_N = mkN010 "килолитър"; lin kilometre_N = mkN010 "километър" ; -lin kiloton_N = variants {}; -lin kilovolt_N = variants {}; -lin kilowatt_N = variants {}; +lin kiloton_N = mkN001 "килотон"; +lin kilovolt_N = mkN001 "киловолт"; +lin kilowatt_N = mkN001 "киловат"; lin kilsyth_PN = variants {}; lin kilt_N = variants {}; lin kilter_N = variants {}; lin kilwinning_PN = variants {}; lin kimberley_PN = variants {}; lin kimberlite_N = variants {}; -lin kimono_N = mkN054 "кимоно" ; ---- +lin kimono_N = mkN054 "кимоно"; lin kin_N = variants {}; lin kina_N = variants {}; lin kinanesthesia_N = variants {}; @@ -31200,12 +31197,12 @@ lin lingam_N = variants {}; lin lingcod_N = variants {}; lin linger_V = variants {}; lin lingerer_N = variants {}; -lin lingerie_N = variants {}; +lin lingerie_N = mkN065 "бельо"; lin lingeringly_Adv = variants {}; -lin lingo_N = variants {}; +lin lingo_N = mkN007 "жаргон"; lin lingonberry_N = variants {}; lin lingua_franca_N = variants {}; -lin lingual_A = variants {}; +lin lingual_A = mkA076 "езиков"; lin lingual_N = variants {}; lin linguica_N = variants {}; lin linguine_N = variants {}; @@ -31214,9 +31211,9 @@ lin linguistic_A = mkA079 "лингвистичен"; lin linguistically_Adv = mkAdv "лингвистически"; lin linguistics_N = mkN041 "лингвистика"; lin lingulate_A = variants {}; -lin liniment_N = variants {}; +lin liniment_N = mkN007 "мехлем"; lin linin_N = variants {}; -lin lining_N = variants {}; +lin lining_N = mkN041 "подплата"; lin link_N = mkN041 "връзка" ; lin link_V = variants {}; lin link_V2 = dirV2 (actionV (mkV186 "свързвам") (mkV156 "свържа")); @@ -31226,16 +31223,16 @@ lin linkboy_N = variants {}; lin linkman_N = variants {}; lin links_N = variants {}; lin linlithgow_PN = variants {}; -lin linnet_N = variants {}; -lin lino_N = variants {}; -lin linocut_N = variants {}; -lin linoleum_N = variants {}; -lin linotype_N = variants {}; +lin linnet_N = mkN065 "конопарче"; +lin lino_N = mkN007 "линолеум"; +lin linocut_N = mkN041 "гравюра"; +lin linoleum_N = mkN007 "линолеум"; +lin linotype_N = dualN (mkN007 "линотип") (mkA079 "линотипен"); lin linseed_N = variants {}; lin linsey_woolsey_N = variants {}; lin linstock_N = variants {}; lin lint_N = variants {}; -lin lintel_N = variants {}; +lin lintel_N = mkN007 "трегер"; lin linuron_N = variants {}; lin linwood_PN = variants {}; lin linz_PN = variants {}; @@ -31255,7 +31252,7 @@ lin liparis_N = variants {}; lin lipase_N = variants {}; lin lipectomy_N = variants {}; lin lipemia_N = variants {}; -lin lipid_N = variants {}; +lin lipid_N = mkN007 "липид"; lin lipidosis_N = variants {}; lin lipless_A = variants {}; lin lipogram_N = variants {}; @@ -31274,18 +31271,18 @@ lin liquefiable_A = variants {}; lin liquefy_V = variants {}; lin liquefy_V2 = variants {}; lin liquescent_A = variants {}; -lin liqueur_N = mkN007 "ликьор" ; ---- -lin liquid_A = variants {}; -lin liquid_N = mkN049 "течност" ; +lin liqueur_N = mkN007 "ликьор"; +lin liquid_A = mkA079 "течен"; +lin liquid_N = mkN049 "течност"; lin liquidambar_N = variants {}; -lin liquidate_V = dualV (mkV186 "угасвам") (mkV174 "угася") ; ---- -lin liquidate_V2 = variants {}; +lin liquidate_V = singleV (mkV186 "ликвидирам"); +lin liquidate_V2 = dirV2 (singleV (mkV186 "ликвидирам")); lin liquidation_N = mkN047 "ликвидация" ; -lin liquidator_N = variants {}; +lin liquidator_N = mkN007 "ликвидатор"; lin liquidity_N = mkN049 "ликвидност" ; lin liquidize_V2 = variants {}; lin liquidizer_N = variants {}; -lin liquor_N = variants {}; +lin liquor_N = dualN (mkN007 "ликьор") (mkA076 "ликьорен"); lin liquorice_N = variants {}; lin lira_N = variants {}; lin lisa_PN = variants {}; @@ -31323,15 +31320,14 @@ lin litany_N = variants {}; lin litas_N = variants {}; lin litchee_N = variants {}; lin litchi_N = variants {}; -lin liter_N = variants {}; lin literacy_N = mkN049 "писменост" ; -lin literal_A = variants {}; -lin literal_N = variants {}; +lin literal_A = mkA079 "буквален"; +lin literal_N = dualN (mkN007 "литерал") (mkA079 "литерален"); lin literalism_N = variants {}; lin literalness_N = variants {}; lin literary_A = variants {}; -lin literate_A = variants {}; -lin literate_N = variants {}; +lin literate_A = mkA079 "книжовен"; +lin literate_N = dualN (mkN014a "книжовник") (mkA078 "книжовнически"); lin literati_N = variants {}; lin literatim_Adv = variants {}; lin literature_N = mkN041 "литература" ; @@ -31339,20 +31335,20 @@ lin lithe_A = variants {}; lin lithiasis_N = variants {}; lin lithic_A = variants {}; lin lithium_N = variants {}; -lin lithograph_N = variants {}; -lin lithograph_V = variants {}; -lin lithograph_V2 = variants {}; -lin lithographer_N = variants {}; -lin lithographic_A = variants {}; -lin lithography_N = mkN047 "литография" ; ---- +lin lithograph_N = dualN (mkN007 "литограф") (mkA078 "литографски"); +lin lithograph_V = stateV (mkV186 "литографирам"); +lin lithograph_V2 = dirV2 (stateV (mkV186 "литографирам")); +lin lithographer_N = dualN (mkN007a "литограф") (mkA078 "литографически"); +lin lithographic_A = mkA079 "литографичен"; +lin lithography_N = dualN (mkN047 "литография") (mkA078 "литографски"); lin lithomancer_N = variants {}; lin lithomancy_N = variants {}; lin lithomantic_A = variants {}; lin lithophyte_N = variants {}; lin lithophytic_A = variants {}; lin lithops_N = variants {}; -lin lithosphere_N = variants {}; -lin lithotomy_N = variants {}; +lin lithosphere_N = mkN041 "литосфера"; +lin lithotomy_N = mkN047 "литотомия"; lin lithuresis_N = variants {}; lin litigant_N = variants {}; lin litigate_V = variants {}; @@ -31363,8 +31359,8 @@ lin litigiousness_N = variants {}; lin litmus_N = variants {}; lin litmus_paper_N = variants {}; lin litotes_N = variants {}; -lin litre_N = variants {}; -lin litter_N = mkN014 "отпадък" ; ---- +lin litre_N = mkN010 "литър"; +lin litter_N = mkN014 "отпадък"; lin litter_V = dualV (mkV186 "раждам") (mkV174 "родя") ; ---- lin litter_V2 = variants {}; lin litter_basket_N = variants {}; diff --git a/lib/src/english/DictEng.gf b/lib/src/english/DictEng.gf index afc79294b..9f485dd60 100644 --- a/lib/src/english/DictEng.gf +++ b/lib/src/english/DictEng.gf @@ -9363,8 +9363,7 @@ lin centesis_N = mkN "centesis" ; lin centigrade_A = compoundA (mkA "centigrade"); lin centiliter_N = mkN "centiliter" ; lin centime_N = mkN "centime" "centimes"; -lin centimeter_N = mkN "centimeter" ; -lin centimetre_N = mkN "centimetre" "centimetres"; +lin centimetre_N = variants {mkN "centimetre" "centimetres"; mkN "centimeter" "centimeters"}; lin centimo_N = mkN "centimo" ; lin centipede_N = mkN "centipede" "centipedes"; lin centner_N = mkN "centner" ; @@ -29627,10 +29626,8 @@ lin kilobyte_N = mkN "kilobyte" ; lin kilocycle_N = mkN "kilocycle" "kilocycles"; lin kilogram_N = mkN (variants {"kilogram"; "kilogramme"}); lin kilohertz_N = mkN "kilohertz" ; -lin kiloliter_N = mkN "kiloliter" ; -lin kilolitre_N = mkN "kilolitre" "kilolitres"; -lin kilometer_N = mkN "kilometer" ; -lin kilometre_N = mkN "kilometre" "kilometres"; +lin kilolitre_N = variants {mkN "kilolitre" "kilolitres"; mkN "kiloliter" "kiloliters"}; +lin kilometre_N = variants {mkN "kilometre" "kilometres"; mkN "kilometer" "kilometers"}; lin kiloton_N = mkN "kiloton" ; lin kilovolt_N = mkN "kilovolt" ; lin kilowatt_N = mkN "kilowatt" "kilowatts"; @@ -31274,7 +31271,7 @@ lin liquidambar_N = mkN "liquidambar" ; lin liquidate_V = mkV "liquidate" "liquidates" "liquidated" "liquidated" "liquidating"; lin liquidate_V2 = mkV2 (mkV "liquidate" "liquidates" "liquidated" "liquidated" "liquidating"); lin liquidation_N = mkN "liquidation" ; -lin liquidator_N = mkN "liquidator" "liquidators"; +lin liquidator_N = mkN human (mkN "liquidator" "liquidators"); lin liquidity_N = mkN "liquidity" ; lin liquidize_V2 = mkV2 (mkV "liquidize" "liquidizes" "liquidized" "liquidized" "liquidizing"); lin liquidizer_N = mkN "liquidizer" "liquidizers"; @@ -31316,7 +31313,6 @@ lin litany_N = mkN "litany" "litanies"; lin litas_N = mkN "litas" ; lin litchee_N = mkN "litchee" "litchees"; lin litchi_N = mkN "litchi" "litchis"; -lin liter_N = mkN "liter" ; lin literacy_N = mkN "literacy" ; lin literal_A = compoundA (mkA "literal"); lin literal_N = mkN "literal" "literals"; @@ -31324,7 +31320,7 @@ lin literalism_N = mkN "literalism" ; lin literalness_N = mkN "literalness" ; lin literary_A = compoundA (mkA "literary"); lin literate_A = compoundA (mkA "literate"); -lin literate_N = mkN "literate" "literates"; +lin literate_N = mkN human (mkN "literate" "literates"); lin literati_N = mkN "literati" ; lin literatim_Adv = mkAdv "literatim" ; lin literature_N = mkN "literature" ; @@ -31335,7 +31331,7 @@ lin lithium_N = mkN "lithium" ; lin lithograph_N = mkN "lithograph" "lithographs"; lin lithograph_V = mkV "lithograph" "lithographs" "lithographed" "lithographed" "lithographing"; lin lithograph_V2 = mkV2 (mkV "lithograph" "lithographs" "lithographed" "lithographed" "lithographing"); -lin lithographer_N = mkN "lithographer" ; +lin lithographer_N = mkN human (mkN "lithographer"); lin lithographic_A = compoundA (mkA "lithographic"); lin lithography_N = mkN "lithography" ; lin lithomancer_N = mkN "lithomancer" ; @@ -34009,8 +34005,7 @@ lin milligram_N = mkN "milligram" "milligrams"; lin millihenry_N = mkN "millihenry" ; lin milliliter_N = mkN "milliliter" ; lin millime_N = mkN "millime" ; -lin millimeter_N = mkN "millimeter" ; -lin millimetre_N = mkN "millimetre" "millimetres"; +lin millimetre_N = variants {mkN "millimetre" "millimetres"; mkN "millimeter" "millimeters"}; lin milline_N = mkN "milline" ; lin milliner_N = mkN "milliner" "milliners"; lin millinery_N = mkN "millinery" ; diff --git a/lib/src/english/DictEngAbs.gf b/lib/src/english/DictEngAbs.gf index 0086b4c88..de09a86ca 100644 --- a/lib/src/english/DictEngAbs.gf +++ b/lib/src/english/DictEngAbs.gf @@ -9344,7 +9344,6 @@ fun centesis_N : N; fun centigrade_A : A; fun centiliter_N : N; fun centime_N : N; -fun centimeter_N : N; fun centimetre_N : N; fun centimo_N : N; fun centipede_N : N; @@ -29600,9 +29599,7 @@ fun kilobyte_N : N; fun kilocycle_N : N; fun kilogram_N : N; fun kilohertz_N : N; -fun kiloliter_N : N; fun kilolitre_N : N; -fun kilometer_N : N; fun kilometre_N : N; fun kiloton_N : N; fun kilovolt_N : N; @@ -31287,7 +31284,6 @@ fun litany_N : N; fun litas_N : N; fun litchee_N : N; fun litchi_N : N; -fun liter_N : N; fun literacy_N : N; fun literal_A : A; fun literal_N : N; @@ -33963,7 +33959,6 @@ fun milligram_N : N; fun millihenry_N : N; fun milliliter_N : N; fun millime_N : N; -fun millimeter_N : N; fun millimetre_N : N; fun milline_N : N; fun milliner_N : N; diff --git a/lib/src/finnish/DictEngFin.gf b/lib/src/finnish/DictEngFin.gf index 0416d73aa..ba500fa2f 100644 --- a/lib/src/finnish/DictEngFin.gf +++ b/lib/src/finnish/DictEngFin.gf @@ -7819,7 +7819,6 @@ centesis_N = mkWN (compoundN "imu" (k1 "pisto")) ; --UNCHK centigrade_A = mkWA "celsiusastetta" ; --UNCHK centiliter_N = mkWN (compoundN "sentti" (k9 "litra")) ; --UNCHK centime_N = mkWN (k5A "sentti") ; --UNCHK -centimeter_N = mkWN (k5A "sentti") ; --UNCHK centimetre_N = mkWN (k5A "sentti") ; --UNCHK centimo_N = mkWN "centimo" ; --UNCHK centipede_N = mkWN (compoundN "juoksu" (k38 "jalkainen")) ; --UNCHK @@ -24673,9 +24672,7 @@ kilobyte_N = mkWN (compoundN "kilo" (k5A "bitti")) ; --UNCHK kilocycle_N = mkWN (compoundN "kilo" (k5 "hertsi")) ; --UNCHK kilogram_N = mkWN (kH1 "kilo") ; --UNCHK kilohertz_N = mkWN (compoundN "kilo" (k5 "hertsi")) ; --UNCHK -kiloliter_N = mkWN (compoundN "kuutio" (k5 "metri")) ; --UNCHK kilolitre_N = mkWN (compoundN "kuutio" (k5 "metri")) ; --UNCHK -kilometer_N = mkWN (compoundN "kilo" (k5 "metri")) ; --UNCHK kilometre_N = mkWN (compoundN "kilo" (k5 "metri")) ; --UNCHK kiloton_N = mkWN (compoundN "kilo" (k5 "tonni")) ; --UNCHK kilovolt_N = mkWN (k5A "kilovoltti") ; --UNCHK @@ -28188,7 +28185,6 @@ milligram_N = mkWN (compoundN "milli" (k9 "gramma")) ; --UNCHK millihenry_N = mkWN (compoundN "milli" (k1 "henry")) ; --UNCHK milliliter_N = mkWN (compoundN "kuutiosentti" (k5 "metri")) ; --UNCHK millime_N = mkWN (compoundN "mil" (k8 "lime")) ; --UNCHK -millimeter_N = mkWN (k5 "milli") ; --UNCHK millimetre_N = mkWN (k5 "milli") ; --UNCHK milline_N = mkWN "milliini" ; --UNCHK milliner_N = mkWN (k5 "modisti") ; --UNCHK diff --git a/lib/src/hindi/DictEngHin.gf b/lib/src/hindi/DictEngHin.gf index a28677333..466587f7c 100644 --- a/lib/src/hindi/DictEngHin.gf +++ b/lib/src/hindi/DictEngHin.gf @@ -16618,7 +16618,6 @@ lin miller_N = mkN "चक्की पर काम करने वाला" lin millet_N = mkN "बाजरा" ; -- old -- old lin milligram_N = mkN "मिलीग्राम" ; -- old -- old lin milliliter_N = mkN "मिलीलीटर" ; -- old -lin millimeter_N = mkN "मिलीमीटर" ; -- old lin millimetre_N = mkN "मिलिमीटर" ; -- old -- old lin milliner_N = mkN "नारी टोपी विक्रेता" ; -- old -- old lin millinery_N = mkN "नारी टोपी" ; -- old -- old diff --git a/lib/src/swedish/DictEngSwe.gf b/lib/src/swedish/DictEngSwe.gf index abfc71f99..5a9dcf7bb 100644 --- a/lib/src/swedish/DictEngSwe.gf +++ b/lib/src/swedish/DictEngSwe.gf @@ -9670,7 +9670,6 @@ lin centesis_N = variants {}; lin centigrade_A = variants {}; lin centiliter_N = mkN "centiliter" "centilitern" "centiliter" "centiliterna"; lin centime_N = variants {}; -lin centimeter_N = mkN "centimeter"; lin centimetre_N = mkN "centimeter"; lin centimo_N = variants {}; lin centipede_N = mkN "tusenfoting"; @@ -29295,7 +29294,8 @@ lin intellect_N = mkN "intellekt" neutrum; lin intellectual_A = mkA "intellektuell"; -- comment=3 lin intellectual_N = mkN "djup" neutrum; lin intellectualization_N = variants {}; -lin intelligence_N = mkN "underrättelse" "underrättelser"; -- comment=3 +lin intelligence_1_N = mkN "förstånd" neutrum; +lin intelligence_2_N = mkN "underrättelse" "underrättelser"; lin intelligent_A = mkA "intelligent" "intelligent"; lin intelligentsia_N = mkN "intelligentia"; -- status=guess lin intelligibility_N = variants {}; @@ -30873,9 +30873,7 @@ lin kilobyte_N = mkN "kilobyte" "kilobyten" "kilobyte" "kilobytena"; lin kilocycle_N = variants {}; lin kilogram_N = mkN "kilogram" "kilogrammet" "kilogram" "kilogrammen"; lin kilohertz_N = variants {}; -lin kiloliter_N = variants {}; lin kilolitre_N = variants {}; -lin kilometer_N = mkN "kilometer"; lin kilometre_N = mkN "kilometer"; lin kiloton_N = variants {}; lin kilovolt_N = variants {}; @@ -32651,7 +32649,6 @@ lin litany_N = variants {}; lin litas_N = variants {}; lin litchee_N = variants {}; lin litchi_N = variants {}; -lin liter_N = variants {}; lin literacy_N = mkN "skrivkunnighet"; lin literal_A = mkA "fantasilös"; -- comment=8 lin literal_N = variants {}; @@ -32691,7 +32688,7 @@ lin litigiousness_N = variants {}; lin litmus_N = mkN "lackmus"; -- status=guess lin litmus_paper_N = variants {}; lin litotes_N = variants {}; -lin litre_N = mkN "liter"; -- comment=2 +lin litre_N = mkN "liter"; lin litter_N = mkN "strö" neutrum; -- comment=10 lin litter_V = mkV "strör"; -- comment=5 lin litter_V2 = mkV2 (mkV (mkV "skräpa") "ner"); -- status=guess, src=wikt @@ -35445,7 +35442,6 @@ lin milligram_N = mkN "milligram" "milligrammet" "milligram" "milligrammen"; -- lin millihenry_N = variants {}; lin milliliter_N = variants {}; lin millime_N = variants {}; -lin millimeter_N = variants {}; lin millimetre_N = mkN "millimeter"; lin milline_N = variants {}; lin milliner_N = variants {}; diff --git a/lib/src/swedish/ParseSwe.gf b/lib/src/swedish/ParseSwe.gf index 2b06f41cb..d02276c7c 100644 --- a/lib/src/swedish/ParseSwe.gf +++ b/lib/src/swedish/ParseSwe.gf @@ -122,9 +122,6 @@ lin UttAdV adv = adv; -lin - UncNeg = {s = [] ; p = Neg} ; - lincat Feat = Str; lin FeatN2, FeatN = \n ->