From c0fd96061a2033b2d519e12c4c425ea3473223bc Mon Sep 17 00:00:00 2001 From: krasimir Date: Tue, 5 Jul 2016 06:22:06 +0000 Subject: [PATCH] added scared_VP & ill_VP. fixed scared_A and ill_A in the general dictionaries of some languages --- lib/src/abstract/Construction.gf | 2 ++ lib/src/bulgarian/ConstructionBul.gf | 2 ++ lib/src/catalan/ConstructionCat.gf | 2 ++ lib/src/chinese/ConstructionChi.gf | 2 ++ lib/src/dutch/ConstructionDut.gf | 2 ++ lib/src/english/ConstructionEng.gf | 2 ++ lib/src/estonian/ConstructionEst.gf | 2 ++ lib/src/finnish/ConstructionFin.gf | 2 ++ lib/src/french/ConstructionFre.gf | 2 ++ lib/src/german/ConstructionGer.gf | 2 ++ lib/src/hindi/ConstructionHin.gf | 4 ++++ lib/src/italian/ConstructionIta.gf | 2 ++ lib/src/japanese/ConstructionJpn.gf | 6 +++++- lib/src/russian/ConstructionRus.gf | 4 ++++ lib/src/spanish/ConstructionSpa.gf | 2 ++ lib/src/swedish/ConstructionSwe.gf | 2 ++ lib/src/thai/ConstructionTha.gf | 2 ++ lib/src/translator/DictionaryBul.gf | 4 ++-- lib/src/translator/DictionaryCat.gf | 2 +- lib/src/translator/DictionaryChi.gf | 2 +- lib/src/translator/DictionaryFre.gf | 2 +- lib/src/translator/DictionaryHin.gf | 5 +++-- lib/src/translator/DictionaryIta.gf | 2 +- lib/src/translator/DictionaryRus.gf | 2 +- lib/src/translator/DictionarySwe.gf | 4 ++-- lib/src/translator/DictionaryTha.gf | 5 +++-- 26 files changed, 56 insertions(+), 14 deletions(-) diff --git a/lib/src/abstract/Construction.gf b/lib/src/abstract/Construction.gf index 82abf8ab3..dbe29a202 100644 --- a/lib/src/abstract/Construction.gf +++ b/lib/src/abstract/Construction.gf @@ -18,6 +18,8 @@ fun hungry_VP : VP ; -- x is hungry / x a faim (Fre) thirsty_VP : VP ; -- x is thirsty / x a soif (Fre) tired_VP : VP ; -- x is tired / x estoy cansado (Spa) + scared_VP : VP ; -- x is scared + ill_VP : VP ; -- x is ill has_age_VP : Card -> VP ; -- x is y years old / x a y ans (Fre) have_name_Cl : NP -> NP -> Cl ; -- x's name is y / x s'appelle y (Fre) diff --git a/lib/src/bulgarian/ConstructionBul.gf b/lib/src/bulgarian/ConstructionBul.gf index 8e7325353..42b5cd358 100644 --- a/lib/src/bulgarian/ConstructionBul.gf +++ b/lib/src/bulgarian/ConstructionBul.gf @@ -15,6 +15,8 @@ lin hungry_VP = mkVP (mkA079 "гладен") ; thirsty_VP = mkVP (mkA079 "жаден") ; tired_VP = mkVP (mkA076 "уморен") ; + scared_VP = mkVP (mkA076 "уплашен") ; + ill_VP = mkVP (mkA079 "болен") ; has_age_VP card = mkVP (SyntaxBul.mkAdv (mkPrep "на" R.Acc) (mkNP (mkN041 "година"))) ; have_name_Cl x name = mkCl (dirV2 (medialV (actionV (mkV186 "казвам") (mkV156 "кажа")) R.Acc)) ; diff --git a/lib/src/catalan/ConstructionCat.gf b/lib/src/catalan/ConstructionCat.gf index df71c973e..7881c5322 100644 --- a/lib/src/catalan/ConstructionCat.gf +++ b/lib/src/catalan/ConstructionCat.gf @@ -11,6 +11,8 @@ lin hungry_VP = E.ComplCN have_V2 (mkCN (mkN "gana" feminine)) ; -- "fam" (val) thirsty_VP = E.ComplCN have_V2 (mkCN (mkN "set" feminine)) ; tired_VP = mkVP stateCopula (mkAP (mkA "cansat")) ; + scared_VP = E.ComplCN have_V2 (mkCN (mkN "por" feminine)) ; + ill_VP = mkVP stateCopula (mkAP (mkA "malalt")) ; has_age_VP card = mkVP have_V2 (mkNP L.year_N) ; diff --git a/lib/src/chinese/ConstructionChi.gf b/lib/src/chinese/ConstructionChi.gf index 9b3ec8eb3..0f5f23936 100644 --- a/lib/src/chinese/ConstructionChi.gf +++ b/lib/src/chinese/ConstructionChi.gf @@ -9,6 +9,8 @@ lin hungry_VP = mkVP (mkV "饿") ; thirsty_VP = mkVP (mkA "渴") ; tired_VP = mkVP (mkV "累了") ; + scared_VP = mkVP (mkA "惊慌") ; + ill_VP = mkVP (mkV "生病了") ; has_age_VP card = mkVP (lin AdV card) (mkVP (mkV "岁")) ; diff --git a/lib/src/dutch/ConstructionDut.gf b/lib/src/dutch/ConstructionDut.gf index e425dd515..0f9e657c0 100644 --- a/lib/src/dutch/ConstructionDut.gf +++ b/lib/src/dutch/ConstructionDut.gf @@ -9,6 +9,8 @@ lin hungry_VP = mkVP have_V2 (mkNP (mkN "honger")) ; thirsty_VP = mkVP have_V2 (mkNP (mkN "dorst")) ; tired_VP = mkVP (mkA "moe") ; + scared_VP = mkVP (mkA "bang") ; + ill_VP = mkVP (mkA "ziek") ; has_age_VP card = mkVP (mkNP L.year_N) ; diff --git a/lib/src/english/ConstructionEng.gf b/lib/src/english/ConstructionEng.gf index 03fbcb8df..73446873c 100644 --- a/lib/src/english/ConstructionEng.gf +++ b/lib/src/english/ConstructionEng.gf @@ -8,6 +8,8 @@ lin hungry_VP = mkVP (mkA "hungry") ; thirsty_VP = mkVP (mkA "thirsty") ; tired_VP = mkVP (mkA "tired") ; + scared_VP = mkVP (mkA "scared") ; + ill_VP = mkVP (mkA "ill") ; has_age_VP card = mkVP (mkAP (lin AdA (mkUtt (mkNP L.year_N))) L.old_A) ; diff --git a/lib/src/estonian/ConstructionEst.gf b/lib/src/estonian/ConstructionEst.gf index f5f129031..e23ab3d0c 100644 --- a/lib/src/estonian/ConstructionEst.gf +++ b/lib/src/estonian/ConstructionEst.gf @@ -8,6 +8,8 @@ lin hungry_VP = mkVP have_V2 (lin NP (mkNP (mkPN "kõht tühi"))) ; thirsty_VP = mkVP have_V2 (lin NP (mkNP (ParadigmsEst.mkN "janu"))) ; tired_VP = mkVP (ParadigmsEst.mkA "väsinud") ; + scared_VP = mkVP (caseV nominative (mkV "kartma")) ; + ill_VP = mkVP (mkA "haige") ; has_age_VP card = let n_years_AdA : AdA = lin AdA (mkUtt (lin NP (mkNP L.year_N))) diff --git a/lib/src/finnish/ConstructionFin.gf b/lib/src/finnish/ConstructionFin.gf index 8bc42ff5e..0900a530f 100644 --- a/lib/src/finnish/ConstructionFin.gf +++ b/lib/src/finnish/ConstructionFin.gf @@ -8,6 +8,8 @@ lin hungry_VP = mkVP have_V2 (lin NP (mkNP (ParadigmsFin.mkN "nälkä"))) ; thirsty_VP = mkVP have_V2 (lin NP (mkNP (ParadigmsFin.mkN "jano"))) ; tired_VP = mkVP (caseV partitive (mkV "väsyttää")) ; + scared_VP = mkVP (caseV partitive (mkV "pelottaa")) ; + ill_VP = mkVP (mkA "sairas") ; has_age_VP card = mkVP (mkAP (lin AdA (mkUtt (lin NP (mkNP L.year_N)))) L.old_A) ; diff --git a/lib/src/french/ConstructionFre.gf b/lib/src/french/ConstructionFre.gf index 65b8aee21..38242d326 100644 --- a/lib/src/french/ConstructionFre.gf +++ b/lib/src/french/ConstructionFre.gf @@ -11,6 +11,8 @@ lin hungry_VP = E.ComplCN have_V2 (mkCN (mkN "faim")) ; thirsty_VP = E.ComplCN have_V2 (mkCN (mkN "soif")) ; tired_VP = mkVP (mkA "fatigué") ; + scared_VP = E.ComplCN have_V2 (mkCN (mkN "peur" feminine)) ; + ill_VP = mkVP (mkA "malade") ; has_age_VP card = mkVP have_V2 (mkNP L.year_N) ; diff --git a/lib/src/german/ConstructionGer.gf b/lib/src/german/ConstructionGer.gf index 2e255fb6f..428b8b27e 100644 --- a/lib/src/german/ConstructionGer.gf +++ b/lib/src/german/ConstructionGer.gf @@ -10,6 +10,8 @@ lin hungry_VP = mkVP (mkA "hungrig") ; thirsty_VP = mkVP (mkA "durstig") ; tired_VP = mkVP (mkA "müde") ; + scared_VP = mkVP have_V2 (mkNP (mkN "Angst" "Angsten" feminine)) ; + ill_VP = mkVP (mkA "krank") ; has_age_VP card = mkVP (lin AP (mkAP (lin AdA (mkUtt (mkNP L.year_N))) L.old_A)) ; diff --git a/lib/src/hindi/ConstructionHin.gf b/lib/src/hindi/ConstructionHin.gf index 1ca6ca4ec..4930db23b 100644 --- a/lib/src/hindi/ConstructionHin.gf +++ b/lib/src/hindi/ConstructionHin.gf @@ -8,6 +8,10 @@ flags coding=utf8 ; lin hungry_VP = mkVP (mkA "भूखा") ; thirsty_VP = mkVP (mkA "प्यासा") ; +-- tired_VP = mkVP (mkCompoundA "थका" "हुआ") ; +-- scared_VP = mkVP (mkCompoundA "डरा" "हुआ") ; + ill_VP = mkVP (mkA "बीमार") ; + has_age_VP card = mkVP (mkNP (mkCN (mmodN L.year_N))) ; have_name_Cl x y = mkCl (mkNP (E.GenNP x) L.name_N) (lin NP y) ; diff --git a/lib/src/italian/ConstructionIta.gf b/lib/src/italian/ConstructionIta.gf index 775a95d07..c9d94ee87 100644 --- a/lib/src/italian/ConstructionIta.gf +++ b/lib/src/italian/ConstructionIta.gf @@ -11,6 +11,8 @@ lin hungry_VP = E.ComplCN have_V2 (mkCN (mkN "fame")) ; thirsty_VP = E.ComplCN have_V2 (mkCN (mkN "sete")) ; tired_VP = mkVP (mkA "stanco") ; + scared_VP = E.ComplCN have_V2 (mkCN (mkN "paura" feminine)) ; + ill_VP = mkVP (mkA "malato") ; has_age_VP card = mkVP have_V2 (mkNP L.year_N) ; diff --git a/lib/src/japanese/ConstructionJpn.gf b/lib/src/japanese/ConstructionJpn.gf index 8afaaa99d..fadb01f5c 100644 --- a/lib/src/japanese/ConstructionJpn.gf +++ b/lib/src/japanese/ConstructionJpn.gf @@ -1,7 +1,11 @@ concrete ConstructionJpn of Construction = CatJpn ** - open SyntaxJpn, ParadigmsJpn in { + open SyntaxJpn, ParadigmsJpn, ResJpn in { lin + hungry_VP = mkVP (mkV "お腹が空いている" Gr1) ; + thirsty_VP = mkVP (mkA "喉が乾いている" "渇した") ; tired_VP = mkVP (mkA "疲れている" "疲れた") ; + scared_VP = mkVP (mkA "怖い") ; + ill_VP = mkVP (mkA "病気の") ; } diff --git a/lib/src/russian/ConstructionRus.gf b/lib/src/russian/ConstructionRus.gf index 57713c2b4..851ae00d6 100644 --- a/lib/src/russian/ConstructionRus.gf +++ b/lib/src/russian/ConstructionRus.gf @@ -2,6 +2,10 @@ concrete ConstructionRus of Construction = CatRus ** open SyntaxRus, ParadigmsRus, ResRus in { lin + hungry_VP = mkVP (mkA "голодный") ; + thirsty_VP = mkVP want_VV (mkVP (regV imperfective firstE "пь" "ю" "пил" "пей" "пить")) ; tired_VP = mkVP (mkA "уставший" Rel) ; + scared_VP = mkVP (mkV imperfective "боюсь" "боишься" "боится" "боимся" "бойтесь" "боятся" "боялся" "бойся" "бояться") ; + ill_VP = mkVP (mkA "больной") ; } diff --git a/lib/src/spanish/ConstructionSpa.gf b/lib/src/spanish/ConstructionSpa.gf index 5c19a122f..6ec8a9bdc 100644 --- a/lib/src/spanish/ConstructionSpa.gf +++ b/lib/src/spanish/ConstructionSpa.gf @@ -11,6 +11,8 @@ lin hungry_VP = E.ComplCN have_V2 (mkCN (mkN "hambre" feminine)) ; thirsty_VP = E.ComplCN have_V2 (mkCN (mkN "sed" feminine)) ; tired_VP = mkVP stateCopula (mkAP (mkA "cansado")) ; + scared_VP = E.ComplCN have_V2 (mkCN (mkN "miedo")) ; + ill_VP = mkVP stateCopula (mkAP (mkA "enfermo")) ; has_age_VP card = mkVP have_V2 (mkNP L.year_N) ; diff --git a/lib/src/swedish/ConstructionSwe.gf b/lib/src/swedish/ConstructionSwe.gf index 5aaa0f423..1b6a363ad 100644 --- a/lib/src/swedish/ConstructionSwe.gf +++ b/lib/src/swedish/ConstructionSwe.gf @@ -9,6 +9,8 @@ lin hungry_VP = mkVP (mkA "hungrig") ; thirsty_VP = mkVP (mkA "törstig") ; tired_VP = mkVP (mkA "trött") ; + scared_VP = mkVP (mkA "rädd") ; + ill_VP = mkVP (mkA "sjuk") ; has_age_VP card = mkVP (lin AP (mkAP (lin AdA (mkUtt (mkNP L.year_N))) L.old_A)) ; diff --git a/lib/src/thai/ConstructionTha.gf b/lib/src/thai/ConstructionTha.gf index 9b925c686..662617033 100644 --- a/lib/src/thai/ConstructionTha.gf +++ b/lib/src/thai/ConstructionTha.gf @@ -9,6 +9,8 @@ lin hungry_VP = mkVP (mkA (R.thword "หิว" "ข้าว")) ; thirsty_VP = mkVP (mkA (R.thword "กระ" "หาย" "น้ำ")) ; tired_VP = mkVP (mkA "เหนื่อย") ; + scared_VP = mkVP (mkA "กลัว") ; + ill_VP = mkVP (mkA (R.thword "เจ็บ" "ปวย")) ; has_age_VP card = mkVP (mkNP (mkNP card L.year_N) (ParadigmsTha.mkAdv (R.thword "อา" "ยุ"))) ; diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 4ea95b582..b35432307 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -27838,7 +27838,7 @@ lin ilium_N = mkN007 "илион" ; lin ilk_N = mkN001 "род" ; ---- lin ilkeston_PN = mkPN "Илкестън" Masc ; lin ilkley_PN = mkPN "Илкли" Masc ; -lin ill_A = mkA076 "лош" ; +lin ill_A = mkA079 "болен" ; lin ill_Adv = variants {} ; lin ill_N = mkN041 "злина" ; ---- lin ill_advised_A = mkA076 "прибързан" ; @@ -49545,7 +49545,7 @@ lin scare_away_V2 = dirV2 (dualV (mkV186 "изплашвам") (mkV176 "изпл lin scare_off_V2 = dirV2 (dualV (mkV186 "изплашвам") (mkV176 "изплаша")) ; lin scarecrow_N = variants {mkN014 "грозник"; mkN041 "кикимора"; mkN041 "кукумявка"; mkN054 "плашило"; mkN041 "скица"; mkN054 "чучело"} ; ---- lin scarecrowish_A = variants {} ; -lin scared_A = mkA079 "изплашен" ; +lin scared_A = mkA076 "уплашен" ; lin scaremonger_N = variants {mkN039 "алармаджия"; mkN007 "паникьор"; mkN041 "паникьорка"} ; ---- lin scarf_N = mkN001 "шал" ; lin scarf_pin_N = variants {} ; diff --git a/lib/src/translator/DictionaryCat.gf b/lib/src/translator/DictionaryCat.gf index 6d06ca06e..9bc378636 100644 --- a/lib/src/translator/DictionaryCat.gf +++ b/lib/src/translator/DictionaryCat.gf @@ -8312,7 +8312,7 @@ lin ignorant_A = mkA "ignorant" ; --auto lin ignore_V = mkV "ignorar" ; lin ignore_V2 = mkV2 (mkV "ignorar") ; lin ileum_N = mkN "ili" masculine ; --auto -lin ill_A = mkA "malalt" ; --auto +lin ill_A = mkA "malalt" ; lin illegal_A = mkA "il·legal" ; --auto lin illegality_N = mkN "il·legalitat" feminine ; --auto lin illegitimacy_N = mkN "il·legitimitat" feminine ; --auto diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index fb39731f3..7134df00d 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -28798,7 +28798,7 @@ lin scare_N = mkN "惊吓" ; lin scare_V = mkV "吓" ; lin scare_V2 = mkV2 "吓" | {-HSK-} mkV2 "惊吓" ; lin scarecrow_N = mkN "稻草人" ; -- status=guess -lin scared_A = variants {} ; +lin scared_A = mkA "惊慌" ; lin scarf_N = mkN "围巾" "條" | {-HSK-} mkN "領巾" | mkN "领巾" | mkN "圍巾" | mkN "围巾" ; -- status=guess -- status=guess -- status=guess -- status=guess lin scarlet_A = mkA "红色" ; lin scarlet_N = mkN "深紅色" | mkN "深红色" | mkN "緋紅" | mkN "绯红" ; -- status=guess -- status=guess -- status=guess -- status=guess diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index 2a887bf0e..c7c6e579b 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -15080,7 +15080,7 @@ lin ilfracombe_PN = mkPN "Ilfracombe" ; -- status=guess src=geonames lin ilium_N = mkN "ilium" ; -- UWN lin ilkeston_PN = mkPN "Ilkeston" ; -- status=guess src=geonames lin ilkley_PN = mkPN "Ilkley" ; -- status=guess src=geonames -lin ill_A = mkA "mauvais" | mkA "écoeuré" | mkA "malade" ; -- tocheck +lin ill_A = mkA "malade" ; lin ill_Adv = mkAdv "mal" ; -- tocheck lin ill_N = mkN "infirmité" | mkN "mal" | mkN "maladie" | mkN "malaise" ; -- UWN lin ill_mannered_A = mkA "malappris" ; -- tocheck diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index f08d6bf54..dcc729169 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -13091,7 +13091,7 @@ lin ignore_V = mkV "अनदेखा" ; -- tocheck lin ignore_V2 = mkV2 (compoundV "अनसुनी" (mkV "करना")) ; -- tocheck lin iguana_N = mkN "गोह" ; -- tocheck lin ilk_N = mkN "किस्म" ; -- tocheck -lin ill_A = mkA "बीमार" ; -- tocheck +lin ill_A = mkA "बीमार" ; lin ill_Adv = mkAdv "निर्दयता से" ; -- tocheck lin ill_N = mkN "बीमारी" ; -- tocheck lin illegal_A = mkA "अवैध" ; -- tocheck @@ -23826,7 +23826,8 @@ lin scare_V = mkV "डराना" ; -- tocheck lin scare_V2 = mkV2 (mkV "डराना") ; -- tocheck lin scare_away_V2 = mkV2 (mkV "भगाना") ; -- tocheck lin scare_off_V2 = mkV2 (mkV "भगाना") ; -- tocheck -lin scarecrow_N = mkN "बिजूखा" ; -- tocheck +lin scarecrow_N = mkN "बिजूखा" ; -- tocheck +-- lin scared_A = mkCompoundA "डरा" "हुआ" ; lin scaremonger_N = mkN "आतंक फैलानेवाला" ; -- tocheck lin scarf_N = mkN "दुपट्टा" ; -- tocheck lin scarlet_A = mkA "गहरा लाल" ; -- tocheck diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf index 33933778b..e46c86f45 100644 --- a/lib/src/translator/DictionaryIta.gf +++ b/lib/src/translator/DictionaryIta.gf @@ -13459,7 +13459,7 @@ lin iliac_A = mkA "iliaco" ; -- UWN lin ilium_N = mkN "ileo" | mkN "ilio" ; -- UWN lin ilkeston_PN = mkPN "Ilkeston" ; -- status=guess src=geonames lin ilkley_PN = mkPN "Ilkley" ; -- status=guess src=geonames -lin ill_A = mkA "malato" ; -- status=guess +lin ill_A = mkA "malato" ; lin ill_Adv = variants {} ; -- lin ill_N = mkN "acciacco" | mkN "affezione" | mkN "disturbo" | mkN "magagna" | mkN "malanno" | mkN "malattia" ; -- UWN lin ill_advised_A = mkA "malconsigliato" ; -- UWN diff --git a/lib/src/translator/DictionaryRus.gf b/lib/src/translator/DictionaryRus.gf index 863d5b03e..fb6eee380 100644 --- a/lib/src/translator/DictionaryRus.gf +++ b/lib/src/translator/DictionaryRus.gf @@ -27819,7 +27819,7 @@ lin ilium_N = variants {} ; lin ilk_N = variants {} ; lin ilkeston_PN = variants {} ; lin ilkley_PN = variants {} ; -lin ill_A = variants {} ; +lin ill_A = mkA "больной" ; lin ill_Adv = variants {} ; lin ill_N = mkN "недуг" "недуга" "недугу" "недуг" "недугом" "недуге" "недугами" "недуги" "недугов" "недугам" "недуги" "недугами" "недугах" Masc Inanimate ; lin ill_advised_A = variants {} ; diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index c405ab40a..80f3d7d1d 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -27646,7 +27646,7 @@ lin ilium_N = variants {} ; -- status=guess lin ilk_N = mkN "like" ; lin ilkeston_PN = mkPN "Ilkeston" neutrum ; -- src=geonames status=guess lin ilkley_PN = mkPN "Ilkley" neutrum ; -- src=geonames status=guess -lin ill_A = mkA "sjuk" ; -- comment=5 +lin ill_A = mkA "sjuk" ; lin ill_Adv = mkAdv "illa" ; -- status=guess lin ill_N = mkN "ondska" ; -- status=guess lin ill_advised_A = variants {} ; -- status=guess @@ -49176,7 +49176,7 @@ lin scare_V = mkV "skrämmer" ; -- comment=2 lin scare_V2 = mkV2 (mkV "skrämma") ; -- status=guess, src=wikt lin scarecrow_N = mkN "fågelskrämma" ; -- status=guess lin scarecrowish_A = variants {} ; -- status=guess -lin scared_A = variants {} ; -- +lin scared_A = mkA "rädd" ; lin scaremonger_N = mkN "panikspridare" ; -- src=google lin scarf_N = mkN "skarf" ; -- comment=3 lin scarf_pin_N = variants {} ; -- status=guess diff --git a/lib/src/translator/DictionaryTha.gf b/lib/src/translator/DictionaryTha.gf index db187f915..a5d2a75f0 100644 --- a/lib/src/translator/DictionaryTha.gf +++ b/lib/src/translator/DictionaryTha.gf @@ -19069,7 +19069,7 @@ lin ileitis_N = mkN "ลำไส้เล็กส่วนปลายอั lin ileum_N = mkN "ลำไส้เล็กตอนปลาย" | mkN "ลําไส้เล็กท่อนปลาย" | mkN "ลําไส้เล็กส่วนปลายที่เปิดเข้าสู่ลําไส้ใหญ่" ; -- src=panlex lin ilium_N = mkN "เชิงกราน" | mkN "กระดูกเชิงกราน" | mkN "กระดูกแบนกว้าง หนึ่งในสามชิ้นของกระดูกสะโพก" ; -- src=panlex lin ilk_N = mkN "แบบ" | mkN "ชนิด" | mkN "จําพวก" | mkN "ประเภท" ; -- src=panlex -lin ill_A = mkA "ป่วย" | mkA "อาพาท" | mkA "ประชวร" | mkA "เจ็บป่วย" | mkA "เจ็บไข้ได้ป่วย" | mkA "เลว" | mkA "ไข้" | mkA "ชั่ว" | mkA "ป่วย" | mkA "ร้าย" | mkA "ผลร้าย" | mkA "โรคบาป" | mkA "ไม่ชอบ" | mkA "บาดเจ็บ" | mkA "ยุ่งยาก" | mkA "อันตราย" | mkA "เป็นโรค" | mkA "โชคร้าย" | mkA "ไม่สบาย" | mkA "ชั่วร้าย" | mkA "เจ็บป่วย" | mkA "เกลียดชัง" | mkA "ไม่ชํานาญ" | mkA "ไม่เหมาะสม" | mkA "น่ารังเกียจ" | mkA "ไม่เป็นมิตร" ; -- src=panlex +lin ill_A = mkA (thword "เจ็บ" "ปวย") ; lin ill_Adv = mkAdv "แย่มาก" | mkAdv "ด้วยความยากลำบาก" | mkAdv "เลว" | mkAdv "แย่" | mkAdv "ชั่ว" | mkAdv "ป่วย" | mkAdv "ไม่ดี" | mkAdv "ผลร้าย" | mkAdv "โรคบาป" | mkAdv "บาดเจ็บ" | mkAdv "ยุ่งยาก" | mkAdv "อันตราย" | mkAdv "เป็นโรค" | mkAdv "โชคร้าย" | mkAdv "ไม่สบาย" | mkAdv "ไม่ชํานาญ" | mkAdv "ไม่เหมาะสม" | mkAdv "น่ารังเกียจ" ; -- src=panlex lin ill_N = mkN "ความเจ็บป่วย" | mkN "โรคภัยไข้เจ็บ" | mkN "ปัญหา" | mkN "อาการป่วย" | mkN "ความยุ่งยาก" | mkN "ความเจ็บป่วย" | mkN "ความเจ็บไข้ได้ป่วย" | mkN "สิ่งที่เป็นอันตราย" ; -- src=panlex lin illegal_A = mkA "ผิดกฎหมาย" | mkA "ผิดกฎ" | mkA "ผิดกติกา" | mkA "นอกกฎหมาย" | mkA "ผิดกฎหมาย" ; -- src=panlex @@ -33590,7 +33590,8 @@ lin scarce_A = mkA "ขาดแคลน" | mkA "หายาก" | mkA "ขา lin scarcity_N = mkN "ความขาดแคลน" | mkN "การหายาก" | mkN "การมีน้อย" | mkN "ความขาดแคลน" | mkN "ความไม่เพียงพอ" ; -- src=panlex lin scare_N = mkN "ความตื่นตระหนก" | mkN "อาการวิตกกังวลฉับพลัน" | mkN "ความกลัว" | mkN "ความหวาดกลัว" | mkN "ความตื่นตระหนก" ; -- src=panlex lin scare_V = mkV "ทำให้กลัว" | mkV "ทำให้ตระหนก" | mkV "ทำให้ขลาดกลัว" | mkV "กลัว" | mkV "ตกใจ" | mkV "ทําให้กลัว" | mkV "ทําให้ตกใจ" ; -- src=panlex -lin scare_V2 = mkV2 "ทำให้กลัว" ; ---- | mkV "ทำให้ตระหนก" | mkV "ทำให้ขลาดกลัว" | mkV "กลัว" | mkV "ตกใจ" | mkV "ทําให้กลัว" | mkV "ทําให้ตกใจ" ; -- src=panlex +lin scare_V2 = mkV2 "ทำให้กลัว" ; +lin scared_A = mkA "กลัว" ; lin scarecrow_N = mkN "หุ่นไล่กา" | mkN "คนผอมมาก" | mkN "หุ่นไล่กา" | mkN "สิ่งที่ใช้ขู่" | mkN "สิ่งที่ใช้ขู่คน" | mkN "คนผอมที่สวมเสื้อขาดหลายแห่ง" ; -- src=panlex lin scarecrowish_A = mkA "ที่เหมือนหุ่นไล่กา" ; -- src=panlex lin scaremonger_N = mkN "คนยุแหย่" | mkN "คนปล่อยข่าว" | mkN "คนปล่อยข่าว" | mkN "ผู้ให้ข่าวลือ" | mkN "ผู้ปล่อยข่าวที่น่าตกใจ" | mkN "ผู้ปล่อยข่าวที่ทําให้คนตกอกตกใจ" ; -- src=panlex