From 80f3146ed55be22fd2e28e51e67cfa8c54343d05 Mon Sep 17 00:00:00 2001 From: inari Date: Fri, 25 Apr 2014 11:38:41 +0000 Subject: [PATCH] fix watch_*_V2 and stage_N in DictionaryFin and TopDictionaryFin --- lib/src/translator/DictionaryFin.gf | 6 +++--- lib/src/translator/todo/TopDictionaryFin.gf | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 9ddc4e021..c6bee9b45 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -48229,7 +48229,7 @@ lin staff_V2 = mkWV2 (k53A "miehittää") ; --UNCHK lin staff_office_N = mkWN (compoundN "henkilöstö" (k2 "osasto")) ; --UNCHK lin stag_N = mkWN (compoundN "uros" (k7 "hirvi")) ; --UNCHK lin stag_V = variants{} ; -- -lin stage_N = mkWN (k5A "etappi") ; --f57 +lin stage_N = mkN "vaihe" | mkWN (k5A "etappi") ; --- split näyttämö lin stage_V = mkWV (k71 "tehdä") ; --UNCHK lin stage_V2 = mkWV2 (k71 "tehdä") ; --UNCHK lin stage_whisper_N = mkWN (compoundN "teatteri" (k39 "kuiskaus")) ; --UNCHK @@ -56317,8 +56317,8 @@ lin wasteful_A = mkWA (compoundA "tuh" (k9 "laava")) ; --UNCHK lin wasteland_N = mkWN (k18 "maa") "hedelmätön" ; --UNCHK lin waster_N = mkWN (k10 "hävittäjä") ; --UNCHK lin wastrel_N = mkWN (k6 "tuhlari") ; --UNCHK -lin watch_1_V2 = mkV2 "vartioida" partitive ; -lin watch_2_V2 = mkV2 "katsella" partitive ; +lin watch_1_V2 = mkV2 "katsella" partitive | mkV2 "katsoa" partitive; +lin watch_2_V2 = mkV2 "vartioida" partitive ; lin watch_N = mkWN (k5A "vahti") ; --UNCHK lin watch_V = mkV "katsella" ; lin watch_V2 = L.watch_V2 ; diff --git a/lib/src/translator/todo/TopDictionaryFin.gf b/lib/src/translator/todo/TopDictionaryFin.gf index 2678bc5e6..353c86ec1 100644 --- a/lib/src/translator/todo/TopDictionaryFin.gf +++ b/lib/src/translator/todo/TopDictionaryFin.gf @@ -620,7 +620,7 @@ lin offer_V3 = mkV3 (mkV "tarjota") ; lin offer_V2V = mkV2V (mkV "tarjota") ; ---- subcat lin offer_V2 = mkV2 (mkV "tarjota") ; --f358 lin offer_V = mkV "tarjota" ; --f141 -lin late_A = mkA "myöhäinen" ; +lin late_A = mkA "myöhäinen" ; --- split edesmennyt lin voice_N = mkN "ääni" ; --f52 lin both_Adv = mkAdv "molemmat" ; ---- cat lin once_Adv = mkAdv "kerran" ; @@ -854,7 +854,7 @@ lin report_V = mkV "raportoida" ; lin pass_V2 = mkWV2 (mkV (mkV "päästää") "läpi") ; --- split ohittaa ; ojentaa ; viettää lin pass_V = mkV (mkV "päästä") "läpi" ; --- split mennä läpi ; vaipua lin black_A = L.black_A ; -lin stage_N = mkN "näyttämö" ; --- split mkWN (k5A "etappi") ; --f57 +lin stage_N = mkN "vaihe" ; --- split mkN "näyttämö" ; mkWN (k5A "etappi") ; --f57 lin meeting_N = mkN "kokous" ; lin sometimes_Adv = mkAdv "joskus" | mkWAdv (k99 "ajoittain") ; --f89 lin thus_Adv = mkAdv "siten" ; @@ -880,8 +880,8 @@ lin trade_N = mkN "kauppa" ; lin watch_VS = mkVS "katsoa" | mkVS "seurata" ; lin watch_V2V = mkV2V (mkV "katsoa") (mkPrep genitive) infPresPart | mkV2V (mkV "katsella") (mkPrep partitive) infIness ; lin watch_V2 = L.watch_V2 ; -lin watch_1_V2 = mkV2 "vartioida" partitive ; -lin watch_2_V2 = mkV2 "katsella" partitive ; +lin watch_1_V2 = mkV2 "katsella" partitive | mkV2 "katsoa" partitive; +lin watch_2_V2 = mkV2 "vartioida" partitive ; lin watch_V = mkV "katsella" ; lin white_A = L.white_A ; lin situation_N = mkN (lin NK {s = d48A "tilanne"}) ;