From d81b05df04e4eb68aa1ec8d40f15940f9d8fe28b Mon Sep 17 00:00:00 2001 From: aarne Date: Tue, 2 Dec 2014 13:17:12 +0000 Subject: [PATCH] some fixes in DictionaryFin,Fre,Swe --- lib/src/translator/DictionaryFin.gf | 36 ++++++++++++++--------------- lib/src/translator/DictionaryFre.gf | 4 ++-- lib/src/translator/DictionarySwe.gf | 4 ++-- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index e80ab5a61..6e96639c8 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -1,4 +1,4 @@ ---# -path=.:src/finnish/stemmed:src/finnish:src/abstract:src/common:src/finnish/kotus:src/api +--# -path=.:../finnish/stemmed:../finnish:../abstract:../common:../finnish/kotus:../api ---- checked by AR till beginning_N in the BNC order concrete DictionaryFin of Dictionary = CatFin ** open ParadigmsFin, (S = StructuralFin), @@ -11443,13 +11443,13 @@ lin consentaneous_A = mkWA (compoundA "yks" (k38 "imielinen")) ; --UNCHK lin consequence_N = mkN "seuraus" ; lin consequent_A = mkA "johdonmukainen" ; lin consequential_A = mkWA (k10 "muistettava") ; --UNCHK -lin consequently_Adv = adjAdv consequent_A ; -- -- derived +lin consequently_Adv = mkAdv "sen seurauksena" ; lin conservancy_N = mkWN (compoundN "luonnon" (k2 "suojelu")) ; --UNCHK lin conservation_N = mkWN (compoundN "ympäristön" (k2 "suojelu")) ; --UNCHK lin conservatism_N = mkWN (k40 "vanhoillisuus") ; --UNCHK lin conservative_A = mkWA (k38 "konservatiivinen") ; --f85 -lin conservative_1_N = mkN "konservatiivinen" ; --UNCHK -lin conservative_2_N = mkN "konservatiivinen" ; --UNCHK +lin conservative_1_N = mkN "konservatiivi" ; +lin conservative_2_N = mkN "säilöntäaine" ; lin conservatoire_N = mkWN (k3 "konservatorio") ; --UNCHK lin conservator_N = mkWN (compoundN "edun" (k10 "valvoja")) ; --UNCHK lin conservatory_N = mkWN "talvipuutarha" ; --UNCHK @@ -11468,8 +11468,8 @@ lin considerably_Adv = adjAdv considerable_A ; -- -- derived lin considerate_A = mkWA (k38 "huomaavainen") ; --UNCHK lin considerateness_N = mkWN (k40 "ystävällisyys") ; --UNCHK lin consideration_N = mkWN (k40 "huomaavaisuus") ; -lin considering_Prep = variants {} ; -- -lin considering_Subj = variants {} ; -- +lin considering_Prep = mkPrep "huomioonottaen" ; +lin considering_Subj = mkSubj "huomioonottaen" ; lin consign_V2 = mkWV2 (k52 "uskoa") "haltuun" ; --UNCHK lin consignee_N = mkWN (k10 "saaja") ; --UNCHK lin consigner_N = mkWN (k10 "lähettäjä") ; --UNCHK @@ -11512,7 +11512,7 @@ lin constable_N = mkWN (k6 "konstaapeli") ; --UNCHK lin constabulary_N = mkWN (k6 "poliisi") ; --UNCHK lin constancy_N = mkWN (k40 "muuttumattomuus") ; --UNCHK lin constant_A = mkA "jatkuva" ; -lin constant_N = mkN "vakio" ; --UNCHK +lin constant_N = mkN "vakio" "vakioita" ; lin constantly_Adv = adjAdv constant_A ; -- -- derived lin constellation_N = mkWN (k10 "asetelma") ; --UNCHK lin consternation_N = mkWN (k39 "tyrmistys") ; --UNCHK @@ -11522,24 +11522,24 @@ lin constituency_N = mkWN (compoundN "valitsija" (k10A "kunta")) ; --UNCHK lin constituent_A = mkWA (k10 "osa") "olennainen" ; --UNCHK lin constituent_N = mkWN (k5A "komponentti") ; --UNCHK lin constitute_V2 = mkV2 "muodostaa" ; -lin constitution_N = mkN "perustus" (mkN "laki") ; ---ARB --mkWN (compoundN "koko" (k38 "aminen")) ; +lin constitution_N = mkN "perustus" (mkN "laki") | mkN "koostumus" ; ---- split lin constitutional_A = mkWA (compoundA "perustus" (k38 "laillinen")) ; lin constitutional_N = mkWN (compoundN "kävely" (k5A "lenkki")) ; --UNCHK lin constitutionalism_N = mkWN (compoundN "perustus" (k40 "laillisuus")) ; --UNCHK lin constitutionalist_N = mkWN (k10 "kannattaja") "perustuslaillisuuden" ; --UNCHK lin constitutionalize_V2 = mkWV2 (k53A "ottaa") "perustuslakiin" ; --UNCHK -lin constitutive_A = mkWA (k10 "osa") "olennainen" ; --UNCHK -lin constrain_V2 = mkWV2 (k53 "kiristää") ; --UNCHK +lin constitutive_A = mkA "perustava" ; +lin constrain_V2 = mkV2 "rajoittaa" ; lin constrainedly_Adv = mkWAdv (k99 "väkinäisesti") ; --UNCHK -lin constraint_N = mkWN (compoundN "pakko" (k1 "keino")) ; +lin constraint_N = mkN "rajoite" ; lin constrict_V2 = mkWV2 (k52A "kaventua") ; --UNCHK lin constriction_N = mkWN "kokoon" "vetäminen" ; --UNCHK lin constrictor_N = mkWN (compoundN "kuristaja" (k48 "käärme")) ; --UNCHK lin construal_N = mkWN (k39 "selitys") ; --UNCHK lin construct_V2 = mkWV2 (k54A "jäljentää") ; --UNCHK lin construction_N = mkN "konstruktio" "konstruktioita" ; -lin constructive_A = mkWA (k10 "rakentava") ; -lin constructiveness_N = mkWN (k40 "positiivisuus") ; --UNCHK +lin constructive_A = mkWA (k10 "rakentava") | mkA "konstruktiivinen" ; +lin constructiveness_N = mkN "rakentavuus" ; lin constructivism_N = mkWN (k5 "konstruktivismi") ; --UNCHK lin constructivist_N = mkWN (compoundN "konstrukti" (k5 "visti")) ; --UNCHK lin constructor_N = mkWN (k10 "rakentaja") ; --UNCHK @@ -11553,22 +11553,22 @@ lin consul_N = mkWN (k6 "konsuli") ; --UNCHK lin consular_A = mkWA "konsuli-" ; --UNCHK lin consulate_N = mkWN (k5A "konsulaatti") ; --UNCHK lin consulship_N = mkWN (k10 "asema") "konsulin" ; --UNCHK -lin consult_V = mkV (mkV "pyytää") "neuvoa" ; --f56 +lin consult_V = mkV (mkV "pyytää") "neuvoa" ; lin consult_V2 = mkV2 "konsultoida" partitive ; --WV2 (k61 "toimia") "neuvonantajana" ; lin consultancy_N = mkWN (k5A "konsultointi") ; --UNCHK -lin consultant_N = mkWN (k5A "konsultti") ; --f133 +lin consultant_N = mkWN (k5A "konsultti") ; lin consultation_N = mkWN (k5A "konsultointi") ; --UNCHK lin consultative_A = mkWA (k10 "neuvoa-antava") ; --UNCHK lin consumable_A = mkWA "kuluva" ; --UNCHK lin consume_V = mkWV (k53A "kuluttaa") ; --UNCHK lin consume_V2 = mkWV2 (k53A "kuluttaa") ; --UNCHK -lin consumer_N = mkWN (k10 "kuluttaja") ; --f319 +lin consumer_N = mkWN (k10 "kuluttaja") ; lin consumerism_N = mkWN (k10 "kuluttajansuoja") ; --UNCHK lin consummate_A = mkWA (k10 "syvä") ; --UNCHK lin consummate_V2 = mkWV2 (k56A "saattaa") "täydelliseksi" ; --UNCHK lin consummation_N = mkWN (compoundN "täydellis" (k38 "täminen")) ; --UNCHK lin consumption_N = mkWN (k39 "kulutus") ; -lin consumptive_A = mkWA "kulutus-" ; --UNCHK +lin consumptive_A = mkA "kuluttava" ; lin consumptive_N = mkWN (k38 "ihminen") "tuberkuloottinen" ; --UNCHK lin contact_N = mkN "kontakti" | mkWN (k40 "yhteys") ; lin contact_V2 = mkWV2 (k53A "ottaa") "yhteyttä" ; --UNCHK @@ -11577,7 +11577,7 @@ lin contagion_N = mkWN (k9A "tartunta") ; --UNCHK lin contagious_A = mkA "tarttuva" ; --WA (compoundA "tartunta" (k38 "vaarallinen")) ; lin contain_V2 = mkV2 "sisältää" | mkV2 "pidätellä" ; ---- split lin container_N = mkWN (k3 "säiliö") ; --UNCHK -lin containerful_N = mkWN "kontillinen" ; --UNCHK +lin containerful_N = mkN "säiliöllinen" | mkWN "kontillinen" ; lin containment_N = mkWN "tukahduttaminen" ; --UNCHK lin contaminant_N = mkWN (k48 "saaste") ; --UNCHK lin contaminate_V2 = mkWV2 (k53A "saastuttaa") ; --UNCHK diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index e5e6dcee3..e2d46ea3d 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -6812,8 +6812,8 @@ lin drifter_N = mkN "vagabond" masculine ; -- tocheck lin drill_N = mkN "coutil" masculine | mkN "chignole" feminine | mkN "exercice" masculine | mkN "drill" masculine | mkN "foreuse" feminine ; -- tocheck lin drill_V = variants {} ; -- mkV2 (mkV "forer") | mkV2 (mkV "entraîner") | mkV2 (mkV "approfondir") | mkV2 (mkV "rabâcher") | mkV2 (reflV (mkV "entraîner")) ; -- tocheck lin drill_V2 = mkV2 (mkV "forer") | mkV2 (mkV "entraîner") | mkV2 (mkV "approfondir") | mkV2 (mkV "rabâcher") | mkV2 (reflV (mkV "entraîner")) ; -- tocheck -lin drink_N = mkN "boire" | mkN "verre" masculine | mkN "boisson" feminine ; -- tocheck -lin drink_V = variants {} ; -- L.drink_V2 ; +lin drink_N = mkN "boisson" feminine | mkN "verre" masculine ; +lin drink_V = mkV L.drink_V2 ; lin drink_V2 = L.drink_V2 ; lin drinkable_A = mkA "buvable" | mkA "potable" ; -- tocheck lin drinker_N = mkN "buveur" masculine ; -- tocheck diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 3f98d1310..96ed6d184 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -12550,8 +12550,8 @@ lin conservancy_N = mkN "naturvård" ; -- comment=3 lin conservation_N = mkN "bevarande" ; -- SaldoWN lin conservatism_N = mkN "konservatism" "konservatismer" ; -- SaldoWN lin conservative_A = mkA "konservativ" ; -- SaldoWN -lin conservative_1_N = mkN "moderat" utrum; -lin conservative_2_N = mkN "konserveringsmedel" neutrum; +lin conservative_1_N = mkN "konservativ" "konservativer" ; +lin conservative_2_N = mkN "konserveringsmedel" neutrum ; lin conservatoire_N = mkN "konservatorium" "konservatoriet" "konservatorier" "konservatorierna" ; -- comment=2 lin conservator_N = variants {} ; -- status=guess lin conservatory_N = mkN "drivhus" neutrum ; -- comment=5