diff --git a/lib/src/abstract/Construction.gf b/lib/src/abstract/Construction.gf index dbe29a202..5db329810 100644 --- a/lib/src/abstract/Construction.gf +++ b/lib/src/abstract/Construction.gf @@ -20,6 +20,7 @@ fun tired_VP : VP ; -- x is tired / x estoy cansado (Spa) scared_VP : VP ; -- x is scared ill_VP : VP ; -- x is ill + ready_VP : VP ; -- x is ready 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 42b5cd358..c3e1f1700 100644 --- a/lib/src/bulgarian/ConstructionBul.gf +++ b/lib/src/bulgarian/ConstructionBul.gf @@ -17,6 +17,7 @@ lin tired_VP = mkVP (mkA076 "уморен") ; scared_VP = mkVP (mkA076 "уплашен") ; ill_VP = mkVP (mkA079 "болен") ; + ready_VP = mkVP (mkA076 "готов") ; 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 7881c5322..5b5816e83 100644 --- a/lib/src/catalan/ConstructionCat.gf +++ b/lib/src/catalan/ConstructionCat.gf @@ -13,6 +13,7 @@ lin tired_VP = mkVP stateCopula (mkAP (mkA "cansat")) ; scared_VP = E.ComplCN have_V2 (mkCN (mkN "por" feminine)) ; ill_VP = mkVP stateCopula (mkAP (mkA "malalt")) ; + ready_VP = mkVP stateCopula (mkAP (mkA "preparat")) ; 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 0f5f23936..0202f2b9c 100644 --- a/lib/src/chinese/ConstructionChi.gf +++ b/lib/src/chinese/ConstructionChi.gf @@ -11,6 +11,7 @@ lin tired_VP = mkVP (mkV "累了") ; scared_VP = mkVP (mkA "惊慌") ; ill_VP = mkVP (mkV "生病了") ; + ready_VP = mkVP L.ready_A ; 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 0f9e657c0..023476d39 100644 --- a/lib/src/dutch/ConstructionDut.gf +++ b/lib/src/dutch/ConstructionDut.gf @@ -11,6 +11,7 @@ lin tired_VP = mkVP (mkA "moe") ; scared_VP = mkVP (mkA "bang") ; ill_VP = mkVP (mkA "ziek") ; + ready_VP = mkVP (mkA "klaar") ; has_age_VP card = mkVP (mkNP L.year_N) ; diff --git a/lib/src/english/ConstructionEng.gf b/lib/src/english/ConstructionEng.gf index 73446873c..df342c8cf 100644 --- a/lib/src/english/ConstructionEng.gf +++ b/lib/src/english/ConstructionEng.gf @@ -10,6 +10,7 @@ lin tired_VP = mkVP (mkA "tired") ; scared_VP = mkVP (mkA "scared") ; ill_VP = mkVP (mkA "ill") ; + ready_VP = mkVP (mkA "ready") ; 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 e23ab3d0c..ff11e900f 100644 --- a/lib/src/estonian/ConstructionEst.gf +++ b/lib/src/estonian/ConstructionEst.gf @@ -10,6 +10,7 @@ lin tired_VP = mkVP (ParadigmsEst.mkA "väsinud") ; scared_VP = mkVP (caseV nominative (mkV "kartma")) ; ill_VP = mkVP (mkA "haige") ; + ready_VP = mkVP (ParadigmsEst.mkA "valmis") ; 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 0900a530f..5517401b5 100644 --- a/lib/src/finnish/ConstructionFin.gf +++ b/lib/src/finnish/ConstructionFin.gf @@ -10,6 +10,7 @@ lin tired_VP = mkVP (caseV partitive (mkV "väsyttää")) ; scared_VP = mkVP (caseV partitive (mkV "pelottaa")) ; ill_VP = mkVP (mkA "sairas") ; + ready_VP = mkVP (ParadigmsFin.mkA "valmis") ; 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 38242d326..b7e2a57ae 100644 --- a/lib/src/french/ConstructionFre.gf +++ b/lib/src/french/ConstructionFre.gf @@ -13,6 +13,7 @@ lin tired_VP = mkVP (mkA "fatigué") ; scared_VP = E.ComplCN have_V2 (mkCN (mkN "peur" feminine)) ; ill_VP = mkVP (mkA "malade") ; + ready_VP = mkVP (mkA "prêt") ; 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 428b8b27e..540edf58d 100644 --- a/lib/src/german/ConstructionGer.gf +++ b/lib/src/german/ConstructionGer.gf @@ -12,6 +12,7 @@ lin tired_VP = mkVP (mkA "müde") ; scared_VP = mkVP have_V2 (mkNP (mkN "Angst" "Angsten" feminine)) ; ill_VP = mkVP (mkA "krank") ; + ready_VP = mkVP (mkA "bereit") ; 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 4930db23b..316b63a86 100644 --- a/lib/src/hindi/ConstructionHin.gf +++ b/lib/src/hindi/ConstructionHin.gf @@ -11,6 +11,7 @@ lin -- tired_VP = mkVP (mkCompoundA "थका" "हुआ") ; -- scared_VP = mkVP (mkCompoundA "डरा" "हुआ") ; ill_VP = mkVP (mkA "बीमार") ; + ready_VP = mkVP (mkA "तैयार") ; has_age_VP card = mkVP (mkNP (mkCN (mmodN L.year_N))) ; diff --git a/lib/src/italian/ConstructionIta.gf b/lib/src/italian/ConstructionIta.gf index c9d94ee87..4b72ea33e 100644 --- a/lib/src/italian/ConstructionIta.gf +++ b/lib/src/italian/ConstructionIta.gf @@ -13,6 +13,7 @@ lin tired_VP = mkVP (mkA "stanco") ; scared_VP = E.ComplCN have_V2 (mkCN (mkN "paura" feminine)) ; ill_VP = mkVP (mkA "malato") ; + ready_VP = mkVP (mkA "pronto") ; 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 fadb01f5c..bb5d61762 100644 --- a/lib/src/japanese/ConstructionJpn.gf +++ b/lib/src/japanese/ConstructionJpn.gf @@ -1,5 +1,5 @@ concrete ConstructionJpn of Construction = CatJpn ** - open SyntaxJpn, ParadigmsJpn, ResJpn in { + open SyntaxJpn, ParadigmsJpn, ResJpn, (L = LexiconJpn) in { lin hungry_VP = mkVP (mkV "お腹が空いている" Gr1) ; @@ -7,5 +7,6 @@ lin tired_VP = mkVP (mkA "疲れている" "疲れた") ; scared_VP = mkVP (mkA "怖い") ; ill_VP = mkVP (mkA "病気の") ; + ready_VP = mkVP L.ready_A ; } diff --git a/lib/src/russian/ConstructionRus.gf b/lib/src/russian/ConstructionRus.gf index 851ae00d6..de7baba3f 100644 --- a/lib/src/russian/ConstructionRus.gf +++ b/lib/src/russian/ConstructionRus.gf @@ -7,5 +7,6 @@ lin tired_VP = mkVP (mkA "уставший" Rel) ; scared_VP = mkVP (mkV imperfective "боюсь" "боишься" "боится" "боимся" "бойтесь" "боятся" "боялся" "бойся" "бояться") ; ill_VP = mkVP (mkA "больной") ; + ready_VP = mkVP (mkA "готовый") ; } diff --git a/lib/src/spanish/ConstructionSpa.gf b/lib/src/spanish/ConstructionSpa.gf index 6ec8a9bdc..d6e0f66f9 100644 --- a/lib/src/spanish/ConstructionSpa.gf +++ b/lib/src/spanish/ConstructionSpa.gf @@ -13,6 +13,7 @@ lin tired_VP = mkVP stateCopula (mkAP (mkA "cansado")) ; scared_VP = E.ComplCN have_V2 (mkCN (mkN "miedo")) ; ill_VP = mkVP stateCopula (mkAP (mkA "enfermo")) ; + ready_VP = mkVP stateCopula (mkAP (mkA "listo")) ; 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 1b6a363ad..58ec9d691 100644 --- a/lib/src/swedish/ConstructionSwe.gf +++ b/lib/src/swedish/ConstructionSwe.gf @@ -11,6 +11,7 @@ lin tired_VP = mkVP (mkA "trött") ; scared_VP = mkVP (mkA "rädd") ; ill_VP = mkVP (mkA "sjuk") ; + ready_VP = mkVP (mkA "färdig") ; 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 662617033..15289d4da 100644 --- a/lib/src/thai/ConstructionTha.gf +++ b/lib/src/thai/ConstructionTha.gf @@ -11,6 +11,7 @@ lin tired_VP = mkVP (mkA "เหนื่อย") ; scared_VP = mkVP (mkA "กลัว") ; ill_VP = mkVP (mkA (R.thword "เจ็บ" "ปวย")) ; + ready_VP = mkVP L.ready_A ; 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 b35432307..51f72a384 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -46279,7 +46279,7 @@ lin readjustment_N = variants {mkN072 "изменение" ; mkN047 "корек lin readmission_N = variants {} ; lin readmit_V2 = variants {} ; lin readout_N = mkN007 "отчет" ; -lin ready_A = variants {mkA076 "готов"; mkA079 "охотен"; mkA076 "подготвен"; mkA076 "пъргав"} ; ---- +lin ready_A = mkA076 "готов"; lin ready_N = mkN007 "хазър" ; ---- lin ready_V2 = variants {} ; lin ready_made_A = mkA076 "готов" ; diff --git a/lib/src/translator/DictionaryCat.gf b/lib/src/translator/DictionaryCat.gf index 9bc378636..455a9c917 100644 --- a/lib/src/translator/DictionaryCat.gf +++ b/lib/src/translator/DictionaryCat.gf @@ -13541,7 +13541,7 @@ lin reader_N = mkN "lector" ; lin reading_N = mkN "lectura" feminine ; --auto lin readjust_V2 = mkV2 "reajustar" ; --auto lin readjustment_N = mkN "reajustament" masculine ; --auto -lin ready_A = mkA "llest" ; +lin ready_A = mkA "preparat" ; lin reagent_N = mkN "reactiu" masculine ; --auto lin real_A = mkA "real" ; lin realism_N = mkN "realisme" masculine ; --auto diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index 7134df00d..485cd9042 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -26920,7 +26920,7 @@ lin reading_N = mkN "阅读" ; lin reading_PN = mkPN "雷丁" ; -- comment=src=geonames status=guess lin readjustment_N = mkN "重新调整" ; lin readmit_V2 = mkV2 "重新接纳" ; -lin ready_A = mkA "准备" | {-HSK-} mkA "愿意" ; +lin ready_A = L.ready_A ; lin ready_N = mkN "愿意" | {-HSK-} mkN "现款""" ; lin ready_V2 = mkV2 "准备" ; lin reaffirm_V2 = mkV2 "重申" ; diff --git a/lib/src/translator/DictionaryDut.gf b/lib/src/translator/DictionaryDut.gf index f9fbc6ef0..a4507f850 100644 --- a/lib/src/translator/DictionaryDut.gf +++ b/lib/src/translator/DictionaryDut.gf @@ -16705,7 +16705,7 @@ lin readable_A = mkA "leesbaar" | mkA "lezenswaardig" ; -- status=guess status=g lin reader_N = mkN "lezer" masculine ; lin reading_N = mkN "lezing" feminine ; -- status=guess lin reading_PN = mkPN "Reading" ; -- src=geonames status=guess -lin ready_A = mkA "klaar" | mkA "gereed" ; +lin ready_A = mkA "klaar" ; lin reagent_N = mkN "reagens" neuter ; -- status=guess lin real_A = mkA "echt" | mkA "reëel" ; lin real_N = mkN "real" masculine ; -- status=guess diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index c7c6e579b..94370de32 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -24496,7 +24496,7 @@ lin reading_N = mkN "lecture" feminine ; -- tocheck lin reading_PN = mkPN "Reading" ; -- status=guess src=geonames lin readjust_V2 = mkV2 (mkV "rééquilibrer") ; -- tocheck lin readjustment_N = mkN "réajustement" masculine ; -- tocheck -lin ready_A = mkA "prêt" ; -- tocheck +lin ready_A = mkA "prêt" ; lin reagent_N = mkN "réactif" masculine ; -- tocheck lin real_A = mkA "vrai" | mkA "réel" ; lin real_N = mkN "réal" masculine ; -- tocheck diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index dcc729169..31a4733b0 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -21916,7 +21916,7 @@ lin readjust_V2 = mkV2 (compoundV "पुनर्व्यवस्थापि lin readjustment_N = mkN "पुनः समंजन" ; -- tocheck lin readmission_N = mkN "पुनर्प्रवेश" ; -- tocheck lin readmit_V2 = mkV2 (compoundV "पुनः भर्ती" (mkV "करना")) ; -- tocheck -lin ready_A = mkA "सज्जित" ; -- tocheck +lin ready_A = mkA "तैयार" ; lin ready_N = mkN "उपलब्ध धन" ; -- tocheck lin ready_V2 = mkV2 (compoundV "चालाकी से हरा" (mkV "देना")) ; -- tocheck lin reaffirm_V2 = mkV2 (compoundV "पुनः पुष्टि" (mkV "करना")) ; -- tocheck diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf index e46c86f45..78a835b17 100644 --- a/lib/src/translator/DictionaryIta.gf +++ b/lib/src/translator/DictionaryIta.gf @@ -21839,7 +21839,7 @@ lin reading_PN = mkPN "Reading" ; -- status=guess src=geonames lin readjust_V2 = mkV2 (mkV "riadattare") | mkV2 (mkV "riambientarsi") ; -- status=guess, src=wikt status=guess, src=wikt lin readjustment_N = mkN "riadattamento" ; -- UWN lin readmission_N = mkN "riammissione" masculine ; -- status=guess -lin ready_A = mkA "pronto" | mkA "preparato" ; -- status=guess status=guess +lin ready_A = mkA "pronto" ; lin ready_V2 = mkV2 (mkV "preparare") ; -- status=guess, src=wikt lin reagent_N = mkN "reagente" masculine ; -- status=guess lin real_A = mkA "vero" | mkA "vera" ; -- status=guess status=guess diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index 0419de70d..c56e29742 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -24136,7 +24136,7 @@ lin readiness_N = mkN "preparación" feminine ; -- status=guess lin reading_N = mkN "lectura" ; -- status=guess lin reading_PN = mkPN "Reading" ; -- status=guess src=geonames lin readjustment_N = mkN "reajuste" masculine ; -- status=guess -lin ready_A = mkA "preparado" | mkA "listo" ; +lin ready_A = mkA "listo" ; lin ready_V2 = mkV2 (mkV "preparar") | mkV2 (mkV "alistar") ; -- status=guess, src=wikt status=guess, src=wikt lin reaffiliation_N = mkN "reafiliación" ; --UWN lin reaffirm_V2 = mkV2 (mkV "reafirmar") ; -- status=guess, src=wikt diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 80f3d7d1d..7a7b7e35b 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -45940,8 +45940,8 @@ lin readjustment_N = mkN "justering" ; -- status=guess lin readmission_N = mkN "återtagande" ; lin readmit_V2 = variants {} ; -- status=guess lin readout_N = mkN "avläsning" ; -lin ready_A = mkA "färdig" | mkA "beredd" | mkA "rask" ; -lin ready_N = mkN "färdig" ; -- src=google +lin ready_A = mkA "färdig" ; +lin ready_N = mkN "färdighet" ; lin ready_V2 = variants {} ; -- status=guess lin ready_made_A = variants {} ; -- status=guess lin reaffiliation_N = variants {} ; -- status=guess diff --git a/lib/src/translator/DictionaryTha.gf b/lib/src/translator/DictionaryTha.gf index a5d2a75f0..060ebcfde 100644 --- a/lib/src/translator/DictionaryTha.gf +++ b/lib/src/translator/DictionaryTha.gf @@ -31386,7 +31386,7 @@ lin readiness_N = mkN "ความพร้อม" | mkN "สภาพควา lin reading_N = mkN "การอ่าน" | mkN "ค่ามาตรวัด" | mkN "ค่ามิเตอร์" | mkN "วัสดุที่ใช้อ่าน" | mkN "การแปล" | mkN "การอ่าน" | mkN "ความรู้" | mkN "การอ่านออกเสียง" | mkN "การพิจารณากฎหมายตามวิธีของรัฐสภา" | mkN "จํานวนตัวเลขที่อ่านได้จากอุปกรณ์" ; -- src=panlex lin readjustment_N = mkN "การปรับปรุง" ; -- src=panlex lin readout_N = mkN "การเรียกข้อมูลจากเครื่องคอมพิวเตอร์" ; -- src=panlex -lin ready_A = mkA "พร้อม" | {-pan-} mkA "หัวไว" | mkA "เตรียมพร้อม" | mkA "ที่มีไหวพริบ" | mkA "ที่มีเชาว์ปัญญา" | mkA "ที่มีไหวพริบปฏิภาณ" | mkA "ชอบ" | mkA "ง่าย" | mkA "ฉลาด" | mkA "คล่อง" | mkA "ทันที" | mkA "มักจะ" | mkA "สะดวก" | mkA "เสร็จ" | mkA "เต็มใจ" | mkA "ฉับพลัน" | mkA "รวดเร็ว" | mkA "พร้อมใช้" | mkA "โน้มน้าว" | mkA "เฉียบแหลม" | mkA "เตรียมพร้อม" | mkA "ใช้ได้ทันที" ; -- src=panlex +lin ready_A = mkA "พร้อม" ; lin ready_N = mkN "สภาพพร้อมใช้" | mkN "สภาพพร้อมใช้งาน" | mkN "ี่" | mkN "เงินสด" | mkN "ท่าเตรียมยิง" | mkN "สภาพเตรียมพร้อม" ; -- src=panlex lin reagent_N = mkN "ตัวสร้างปฏิกิริยา" | mkN "ตัวกระทํา" | mkN "สารที่ใช้เป็นตัวกระทําปฏิกิริยา" ; -- src=panlex lin real_A = mkA "จริง" | mkA "ที่แท้จริง" | mkA "ที่เป็นจริง" | mkA "ที่จับต้องได้" | mkA "แท้" | mkA "จริง" | mkA "จริงใจ" | mkA "โดยแท้" | mkA "มีตัวตน" | mkA "แท้จริง" | mkA "ไม่ปลอม" | mkA "ซื่อสัตย์" | mkA "เกี่ยวกับตัวเลขจริง" ; -- src=panlex diff --git a/lib/src/translator/translate.probs b/lib/src/translator/translate.probs index 4494aa699..2636781c2 100644 --- a/lib/src/translator/translate.probs +++ b/lib/src/translator/translate.probs @@ -27907,7 +27907,6 @@ ilk_N 7.459430024951794e-6 ilkeston_PN 1.865462821325971e-5 ilkley_PN 1.865462821325971e-5 ill_A 1.1850511187959881e-4 -ill_Adv 2.6006900497598697e-5 ill_N 1.118914503742769e-5 ill_advised_A 3.231957596716331e-5 ill_affected_A 1.0773191989054437e-5