From 8920268aec26db270999ba019470b054916f37e1 Mon Sep 17 00:00:00 2001 From: aarne Date: Wed, 9 Dec 2015 15:25:43 +0000 Subject: [PATCH] grandparents in Chi,Fin,Swe --- lib/src/translator/DictionaryChi.gf | 15 ++++++++------- lib/src/translator/DictionaryFin.gf | 4 ++-- lib/src/translator/DictionarySwe.gf | 8 ++++---- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index 21344cc9f..a9b8f7af1 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -14941,9 +14941,9 @@ lin granddad_N = mkN "外公" | mkN "外祖父" | mkN "爷爷" | mkN "祖父" ; lin granddaughter_N = mkN "孫女" | mkN "孙女" | mkN "外孫女" | mkN "外孙女" ; -- status=guess -- status=guess -- status=guess -- status=guess lin grandee_N = mkN "贵族" ; lin grandeur_N = mkN "庄严" ; -lin grandfather_N = mkN "祖父" "位" ; +lin grandfather_N = mkN "爷爷" | mkN "祖父" "位" ; lin grandiose_A = mkA "雄伟" ; -lin grandmother_N = mkN "祖母" ; +lin grandmother_N = mkN "爷爷" | mkN "祖母" ; lin grandpa_N = mkN "外公" | mkN "外祖父" | mkN "爷爷" | mkN "祖父" ; -- open-multilingual-wordnet lin grandparent_N = mkN "祖父母" ; lin grandson_N = mkN "孙子" ; @@ -32124,11 +32124,12 @@ lin sweat_V2 = mkV2 (mkV "流汗") | mkV2 (mkV "發汗") | mkV2 (mkV "发汗") | lin sweater_N = mkN "毛衣" "件" ; lin sweatshirt_N = mkN "運動衫" | mkN "运动衫" ; -- status=guess -- status=guess lin sweaty_A = mkA "吃力" ; -lin swedeFem_N = variants {} ; ---- sense to be split -lin swedeMasc_N = variants {} ; ---- sense to be split -lin sweden_PN = mkPN "瑞典" ; -lin swedishFem_N = variants {} ; ---- sense to be split -lin swedishMasc_N = variants {} ; ---- sense to be split +lin swedeFem_N = mkN "瑞典" ; +lin swedeMasc_N = mkN "瑞典人" ; +lin sweden_PN = mkPN "瑞典人" ; +lin swedish_A = mkA "瑞典" ; +lin swedishFem_N = mkN "瑞典人" ; +lin swedishMasc_N = mkN "瑞典人" ; lin sweep_N = mkN "范围" ; lin sweep_V = mkV "打扫" ; lin sweep_V2 = mkV2 "打扫" | {-HSK-} mkV2 "扫" ; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 0d83bdf69..15de5e041 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -22567,14 +22567,14 @@ lin granddad_N = mkWN (kH1 "vaari") ; --UNCHK lin granddaughter_N = mkWN (compoundN "tyttären" (k32A "tytär")) ; --UNCHK lin grandee_N = mkWN (compoundN "ylhäis" (k38 "aatelinen")) "portugalilainen" ; --UNCHK lin grandeur_N = mkWN (k40 "suuruus") ; --UNCHK -lin grandfather_N = mkWN (kH1 "vaari") ; --UNCHK +lin grandfather_N = mkN "iso" (mkN "isä") | mkWN (kH1 "vaari") ; lin grandiloquence_N = mkWN (k40 "pateettisuus") ; --UNCHK lin grandiloquent_A = mkWA (k38 "suurellinen") ; --UNCHK lin grandiose_A = mkA "suureellinen" ; --WA (k38 "suurellinen") ; lin grandiosity_N = mkWN (k40 "pateettisuus") ; --UNCHK lin grandma_N = mkWN (k5 "mummi") ; --UNCHK lin grandmaster_N = mkWN (compoundN "suur" (k6 "mestari")) ; --UNCHK -lin grandmother_N = mkWN (k5 "mummi") ; --UNCHK +lin grandmother_N = mkN "iso" (mkN "äiti") | mkWN (k5 "mummi") ; lin grandnephew_N = mkWN (k10A "poika") "veljentyttären" ; --UNCHK lin grandniece_N = mkWN (k32A "tytär") "veljentyttären" ; --UNCHK lin grandpa_N = mkWN (kH1 "vaari") ; --UNCHK diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index bc63db0e5..fafe9635c 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -4089,7 +4089,7 @@ lin auk_N = mkN "alka" ; -- status=guess lin auklet_N = variants {} ; -- status=guess lin auld_A = variants {} ; -- status=guess lin auld_lang_syne_N = variants {} ; -- status=guess -lin aunt_N = mkN "faster" | mkN "tant" "tanter" ; -- SaldoWN -- comment=3 +lin aunt_N = mkN "faster" | mkN "moster" | mkN "tant" "tanter" ; ---- split lin auntie_N = mkN "faster" ; lin aunty_N = mkN "faster" ; lin aura_N = mkN "aura" ; @@ -24281,14 +24281,14 @@ lin granddad_N = variants {} ; -- status=guess lin granddaughter_N = mkN "sondotter" "sondottern" "sondöttrar" "sondöttrarna" ; -- SaldoWN lin grandee_N = variants {} ; -- status=guess lin grandeur_N = mkN "storslagenhet" ; -- comment=5 -lin grandfather_N = mkN "morfar" "morfadern" "morfäder" "morfäderna" ; -- SaldoWN +lin grandfather_N = mkN "farfar" "farfadern" "farfäder" "farfäderna" | mkN "morfar" "morfadern" "morfäder" "morfäderna" ; ---- split lin grandiloquence_N = mkN "svulstighet" "svulstigheter" ; lin grandiloquent_A = variants {} ; -- status=guess lin grandiose_A = compoundA (regA "storstilad") ; -- comment=4 lin grandiosity_N = mkN "storslagenhet" ; -- status=guess lin grandma_N = mkN "farmoder" "farmodern" "farmödrar" "farmödrarna" | mkN "mormoder" "mormodern" "mormödrar" "mormödrarna" ; -- status=guess lin grandmaster_N = mkN "mästare" utrum ; -lin grandmother_N = mkN "mormoder" "mormodern" "mormödrar" "mormödrarna" ; -- status=guess +lin grandmother_N = mkN "mormor" "mormodern" "mormödrar" "mormödrarna" | mkN "farmor" "farmodern" "farmödrar" "farmödrarna" ; ---- split lin grandnephew_N = variants {} ; -- status=guess lin grandniece_N = variants {} ; -- status=guess lin grandpa_N = mkN "morfar" "morfadern" "morfäder" "morfäderna" ; -- comment=2 @@ -59615,7 +59615,7 @@ lin uncivilized_A = compoundA (regA "ociviliserad") ; -- status=guess lin unclaimed_A = variants {} ; -- status=guess lin unclassifiable_A = variants {} ; -- status=guess lin unclassified_A = compoundA (regA "oklassificerad") ; -- comment=2 -lin uncle_N = mkN "morbror" "morbröder" | mkN "farbror" "farbröder" ; -- SaldoWN -- comment=2 +lin uncle_N = mkN "morbror" "morbröder" | mkN "farbror" "farbröder" ; ---- split lin unclean_A = mkA "oren" ; -- status=guess lin uncleanliness_N = mkN "orenlighet" "orenligheter" ; lin uncleanly_A = variants {} ; -- status=guess