From 85c9d11bd10a0a38744171dc1dc67c4cac40a460 Mon Sep 17 00:00:00 2001 From: krasimir Date: Fri, 17 Jun 2016 14:11:45 +0000 Subject: [PATCH] added several interjections from the phrasebook to the dictionaries --- lib/src/translator/Dictionary.gf | 20 +++++++++---------- lib/src/translator/DictionaryBul.gf | 4 ++-- lib/src/translator/DictionaryCat.gf | 17 ++++++++++++++-- lib/src/translator/DictionaryChi.gf | 15 +++++++-------- lib/src/translator/DictionaryDut.gf | 23 ++++++++++++++-------- lib/src/translator/DictionaryEng.gf | 4 ++-- lib/src/translator/DictionaryEst.gf | 17 ++++++++++++++-- lib/src/translator/DictionaryFin.gf | 17 ++++++++-------- lib/src/translator/DictionaryFre.gf | 18 ++++++++++++----- lib/src/translator/DictionaryGer.gf | 30 ++++++++++++++--------------- lib/src/translator/DictionaryHin.gf | 9 +++++---- lib/src/translator/DictionaryIta.gf | 18 +++++++++++------ lib/src/translator/DictionaryJpn.gf | 22 +++++++++++++-------- lib/src/translator/DictionaryRus.gf | 28 +++++++++++++-------------- lib/src/translator/DictionarySpa.gf | 16 ++++++++++----- lib/src/translator/DictionarySwe.gf | 29 ++++++++++++++-------------- lib/src/translator/DictionaryTha.gf | 22 ++++++++++++++------- 17 files changed, 188 insertions(+), 121 deletions(-) diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 2da1e5559..f743d7efb 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -8272,7 +8272,7 @@ fun by_and_large_Adv : Adv ; -- 00155621 usually; as a rule; "by and large fun by_election_N : N ; -- 00183240 a special election between regular elections fun by_means_of_Prep : Prep ; fun by_virtue_of_Prep : Prep ; -fun bye_Interj : Interj ; +fun bye_Interj : Interj ; -- 06629610 a farewell remark fun bye_N : N ; -- 07176499 you advance to the next round in a tournament without playing an opponent; "he had a bye in the first round" fun bye_bye_Interj : Interj ; fun bye_law_N : N ; @@ -24269,8 +24269,7 @@ fun good_neighbourliness_N : N ; -- 04656051 a disposition to be friendly and fun good_night_Interj : Interj ; fun good_tempered_A : A ; -- 01134486 not easily irritated fun good_time_A : A ; -- 02258002 occupied with or fond of the pleasures of good company; "he was a real good-time Charlie" -fun goodbye_Interj : Interj ; -fun goodbye_N : N ; -- 06629610 a farewell remark; "they said their good-byes" +fun goodbye_Interj : Interj ; -- 06629610 a farewell remark fun goodish_A : A ; -- 01124342 moderately good of its kind; "a goodish wine" fun goodly_A : A ; -- 00624576 large in amount or extent or degree; "a goodly amount" fun goodness_N : N ; -- 05142180 that which is pleasing or valuable or useful @@ -26054,7 +26053,7 @@ fun hellgrammiate_N : N ; -- 02266269 large brown aquatic larva of the fun hellhound_N : N ; -- 10169607 a very evil man fun hellion_N : N ; -- 10169419 a rowdy or mischievous person (usually a young man); "he chased the young hellions out of his yard" fun hellish_A : A ; -- 01802774 very unpleasant; "hellish weather" -fun hello_Interj : Interj ; +fun hello_Interj : Interj ; -- 06632511 an expression of greeting fun helm_N : N ; -- 03512911 steering mechanism for a vessel; a mechanical device by which a vessel is steered fun helmet_N : N ; -- 03513376 armor plate that protects the head fun helmeted_A : A ; -- 01094767 equipped with or wearing a helmet @@ -37693,7 +37692,7 @@ fun nitwit_N : N ; -- 10013114 a stupid incompetent person fun nitwitted_A : A ; -- 00441365 (of especially persons) lacking sense or understanding or judgment fun nix_N : N ; -- 13740168 a quantity of no importance fun nix_V2 : V2 ; -- 00795863 command against; "Dad nixed our plans" -fun no_Interj : Interj ; +fun no_Interj : Interj ; -- 07205104 a negative fun no_Quant : Quant ; fun no_ball_N : N ; -- 00477268 unlawfully delivered ball in cricket; "the umpire called it a no ball" fun no_fewer_than_AdN : AdN ; @@ -42647,10 +42646,11 @@ fun pleasant_A : A ; -- 01800349 affording pleasure; being in harm fun pleasantness_N : N ; -- 07492170 the feeling caused by agreeable stimuli; one pole of a continuum of states of feeling fun pleasantry_N : N ; -- 00515297 an agreeable or amusing remark; "they exchange pleasantries" fun please_Adv : Adv ; -- 00009966 used in polite request; "please pay attention" -fun please_V : V ; -- 01815628 give pleasure to or be pleasing to; "These colors please the senses"; "a pleasing sensation" +fun please_V : V ; -- 01816054 give satisfaction; "The waiters around her aim to please" fun please_V2 : V2 ; -- 01815628 give pleasure to or be pleasing to; "These colors please the senses"; "a pleasing sensation" -fun please_V2V : V2V ; -- 01815628 give pleasure to or be pleasing to; "These colors please the senses"; "a pleasing sensation" -fun please_VV : VV ; -- 01815628 give pleasure to or be pleasing to; "These colors please the senses"; "a pleasing sensation" +fun please_V2V : V2V ; -- 01824958 be the will of or have the will (to) +fun please_VV : VV ; -- 01824958 be the will of or have the will (to); "he could do many things if he pleased" +fun please_Voc : Voc ; -- 00009966 used in polite request; "coffee please" fun pleased_A : A ; -- 01805157 experiencing or manifesting pleasure fun pleaser_N : N ; -- 10441124 a pleasing entertainer; "he is quite the crowd pleaser" fun pleasing_N : N ; -- 01073556 the act of one who pleases @@ -64481,9 +64481,9 @@ fun yenta_N : N ; -- 10803463 a vulgar shrew; a shallow coarse fun yeoman_N : N ; -- 10803691 officer in the (ceremonial) bodyguard of the British monarch fun yeomanry_N : N ; -- 08246502 class of small freeholders who cultivated their own land fun yeovil_PN : PN ; -fun yep_Interj : Interj ; +fun yep_Interj : Interj ; -- 07203900 an affirmative fun yerevan_PN : PN ; -- 09018030 capital of Armenia -fun yes_Interj : Interj ; +fun yes_Interj : Interj ; -- 07203900 an affirmative fun yeshiva_N : N ; -- 08278032 an academy for the advanced study of Jewish texts (primarily the Talmud) fun yesterday_Adv : Adv ; -- 00507716 on the day preceding today; "yesterday the weather was beautiful" fun yesterday_N : N ; -- 15156187 the day immediately before today; "it was in yesterday's newspapers" diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 4fde277b4..75b1441e8 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -24277,7 +24277,6 @@ lin good_night_Interj = ss "лека нощ" ; lin good_tempered_A = variants {} ; lin good_time_A = variants {} ; lin goodbye_Interj = ss "довиждане" ; -lin goodbye_N = variants {} ; lin goodish_A = variants {} ; lin goodly_A = variants {mkA080 "големичък"; mkA076 "засукан"} ; ---- lin goodness_N = variants {mkN072 "беззлобие"; mkN049 "благост"; mkN041 "добрина"; mkN041 "доброта"} ; ---- @@ -42689,11 +42688,12 @@ lin pleasance_N = mkN041 "наслада" ; lin pleasant_A = variants {mkA079 "благовиден"; mkA079 "симпатичен"} ; ---- lin pleasantness_N = variants {mkN049 "приветливост"; mkN049 "приятност"} ; ---- lin pleasantry_N = mkN041 "глума" ; ---- -lin please_Adv = variants {} ; +lin please_Adv = mkAdv "моля" ; lin please_V = variants {singleV (mkV173 "галя"); singleV (mkV186 "зарадвам"); singleV (mkV173 "моля"); singleV (mkV173 "нравя"); singleV (mkV186 "порадвам"); singleV (mkV186 "радвам"); singleV (mkV186 "чакам")} ; ---- lin please_V2 = dirV2 (singleV (mkV186 "радвам")) ; ---- lin please_V2V = mkV2V (singleV (mkV186 "радвам")) noPrep noPrep ; ---- lin please_VV = mkVV (singleV (mkV186 "радвам")) ; ---- +lin please_Voc = S.please_Voc ; lin pleased_A = mkA079 "доволен" ; lin pleaser_N = mkN014a "угодник" ; lin pleasing_N = mkN071 "удовлетворяване" ; diff --git a/lib/src/translator/DictionaryCat.gf b/lib/src/translator/DictionaryCat.gf index babffecba..84250cedd 100644 --- a/lib/src/translator/DictionaryCat.gf +++ b/lib/src/translator/DictionaryCat.gf @@ -2360,6 +2360,7 @@ lin buzz_V2 = mkV2 "brunzir" ; --auto lin buzzer_N = mkN "brunzidor" masculine ; --auto lin by_Prep = S.by8agent_Prep | S.by8means_Prep ; lin by_means_of_Prep = mkPrep "mitjançant" | mkPrep "per mitjà de" ; --auto +lin bye_Interj = mkInterj "adéu" ; lin byproduct_N = mkN "subproducte" masculine ; --auto lin byte_N = mkN "byte" masculine ; --auto lin byzantine_A = mkA "bizantí" ; --auto @@ -2860,6 +2861,7 @@ lin cheek_N = mkN "galta" feminine ; --auto lin cheekbone_N = mkN "pòmul" masculine ; --auto lin cheer_V = mkV "aclamar" | mkV "alegrar" ; --auto lin cheer_V2 = mkV2 "aclamar" | mkV2 "alegrar" ; --auto +lin cheers_Interj = mkInterj "salut" ; lin cheerful_A = mkA "alegre" ; --auto lin cheese_N = L.cheese_N ; lin chelate_N = mkN "quelat" masculine ; --auto @@ -4254,6 +4256,7 @@ lin damage_V2 = mkV2 "avariar" ; --auto lin damascene_N = mkN "damasquí" feminine | mkN "damasquí" masculine ; --auto lin damascene_V2 = mkV2 "damasquinar" ; --auto lin damask_N = mkN "domàs" masculine ; --auto +lin damn_Interj = mkInterj "merda" ; lin damp_A = mkA "humit" ; --auto lin dampen_V = mkV "humitejar" ; --auto lin dampen_V2 = mkV2 "humitejar" ; --auto @@ -6003,6 +6006,7 @@ lin exculpatory_A = mkA "exculpatori" ; --auto lin excursion_N = mkN "excursió" feminine ; --auto lin excuse_N = mkN "excusa" feminine ; --auto lin excuse_V2 = mkV2 "disculpar" ; --auto +lin excuse_me_Interj = mkInterj "perdona" ; lin execute_V2 = mkV2 "executar" ; --auto lin execution_N = mkN "execució" feminine ; --auto lin executive_A = mkA "executiu" ; --auto @@ -7369,7 +7373,12 @@ lin gonion_N = mkN "goni" masculine ; --auto lin gonioscopy_N = mkN "gonioscòpia" feminine ; --auto lin good_A = L.good_A ; lin good_N = mkN "bé" masculine ; -lin goodbye_N = mkN "adéu" masculine ; --auto +lin good_afternoon_Interj = mkInterj "bon dia" ; +lin good_evening_Interj = mkInterj "bona tarda" ; +lin good_luck_Interj = mkInterj "sort" ; +lin good_morning_Interj = mkInterj "bon dia" ; +lin good_night_Interj = mkInterj "bona nit" ; +lin goodbye_Interj = mkInterj "adéu" | mkInterj "a reveure" ; lin goodness_N = mkN "bondat" feminine ; --auto lin goose_N = mkN "oca" feminine ; --auto lin gordian_A = mkA "gordià" ; --auto @@ -7819,6 +7828,7 @@ lin heliozoan_N = mkN "heliozou" masculine ; --auto lin heliport_N = mkN "heliport" masculine ; --auto lin helium_N = mkN "heli" masculine ; --auto lin hell_N = mkN "infern" masculine ; --auto +lin hello_Interj = mkInterj "hola" ; lin hellenic_A = mkA "hel·lènic" ; --auto lin helmet_N = mkN "casc" masculine ; --auto lin helminth_N = mkN "helmint" masculine ; --auto @@ -12482,9 +12492,10 @@ lin playground_N = mkN "pati" masculine ; --auto lin play_off_N = mkN "play-off" masculine ; --auto lin plea_N = mkN "descàrrec" masculine ; --auto lin pleasant_A = mkA "agradable" ; --auto -lin please_Adv = mkAdv "siusplau" ; +lin please_Adv = mkAdv "si et plau" ; lin please_V = mkV "complaure" ; --auto lin please_V2 = mkV2 "complaure" ; --auto +lin please_Voc = S.please_Voc ; lin pleasure_N = mkN "plaer" masculine ; --auto lin plebeian_N = mkN "plebeu" feminine | mkN "plebeu" masculine ; --auto lin plebiscite_N = mkN "plebiscit" masculine ; --auto @@ -15429,6 +15440,7 @@ lin sore_N = mkN "nafra" feminine ; --auto lin sorption_N = mkN "sorció" feminine ; --auto lin sorrel_N = mkN "agrella" feminine ; --auto lin sorry_A = mkA "patètic" ; +lin sorry_Interj = mkInterj "perdoni" ; lin sort_N = mkN "tipus" "tipus" masculine ; --split mkN "classificació" lin sort_V = mkV "ordenar" ; --auto lin sort_V2 = mkV2 "ordenar" ; --auto @@ -16643,6 +16655,7 @@ lin thanatology_N = mkN "tanatologia" feminine ; --auto lin thank_V2 = mkV2 (mkV (servir_101 "agrair")) ; lin thankless_A = mkA "ingrat" ; --auto lin thanks_to_Prep = mkPrep "gràcies a" ; --auto +lin thanks_Interj = mkInterj "gràcies" ; lin that_Quant = S.that_Quant ; lin that_Subj = S.that_Subj ; lin thaw_N = mkN "desglaç" masculine ; --auto diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index c296b205f..6c6a61372 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -12245,7 +12245,7 @@ lin excretory_A = mkA "分泌" | mkA "排泄" ; -- open-multilingual-wordnet lin excursion_N = mkN "偏移" ; lin excuse_N = mkN "借" | {-HSK-} mkN "借口" ; lin excuse_V2 = mkV2 "原谅" ; -lin excuse_me_Interj = mkInterj "劳驾" | mkInterj "对不起" | {-HSK-} mkInterj "原谅我" ; +lin excuse_me_Interj = mkInterj "原谅我" ; lin execute_V2 = mkV2 "执行" | {-HSK-} mkV2 "进行" ; lin execution_N = mkN "执行" ; lin executive_A = mkA "执行" ; @@ -14845,9 +14845,9 @@ lin gong_N = mkN "鑼" | mkN "锣" | {-mwn-} mkN "钟" | mkN "钟琴" ; -- statu lin gonorrhea_N = mkN "淋病" ; -- status=guess -- open-multilingual-wordnet lin gonorrhoea_N = mkN "淋病" ; -- open-multilingual-wordnet lin goo_N = mkN "感伤""" ; -lin good_A = mkA "好" ; ---- | mkA "商品" | mkA "硬" | mkA "良好" ; +lin good_A = mkA "好" ; lin good_N = mkN "商品" "個" | mkN "好" | mkN "硬" | mkN "良好" ; -lin good_afternoon_Interj = mkInterj "下午好" ; +lin good_afternoon_Interj = mkInterj "你好" ; lin good_evening_Interj = mkInterj "下午好" ; lin good_looking_A = mkA "好看" ; lin good_luck_Interj = mkInterj "祝你好运" ; @@ -14855,7 +14855,6 @@ lin good_morning_Interj = mkInterj "早上好" ; lin good_natured_A = mkA "和蔼" ; lin good_night_Interj = mkInterj "晚安" ; lin goodbye_Interj = mkInterj "再见" ; -lin goodbye_N = mkN "再见" | {-HSK-} mkN "走好" | mkN "走好" ; -- status=guess -- status=guess lin goodness_N = mkN "天哪" ; lin goods_N = mkN "产品" "個" | {-HSK-} mkN "產品" | mkN "产品" | mkN "貨物" | mkN "货物" | mkN "製品" | mkN "制品" ; -- status=guess -- status=guess -- status=guess -- status=guess -- status=guess -- status=guess lin goodwill_N = mkN "友好" [] ; @@ -15868,7 +15867,7 @@ lin hell_Interj = mkInterj "见鬼去吧" ; lin hell_N = mkN "地狱" [] ; lin hellfire_N = mkN "地獄之火" | mkN "地狱之火" ; -- status=guess -- status=guess lin hellgrammiate_N = mkN "水虿" ; -- open-multilingual-wordnet -lin hello_Interj = mkInterj "喂" ; +lin hello_Interj = mkInterj "你好" ; lin helm_N = mkN "舵" ; lin helmet_N = variants {} ; lin helmeted_A = mkA "佩戴头盔" ; @@ -25036,7 +25035,7 @@ lin please_V = mkV "请" ; lin please_V2 = mkV2 "请" ; lin please_V2V = mkV2V "请" ; lin please_VV = mkVV "使+喜欢" ; -lin please_Voc = S.please_Voc ; +lin please_Voc = ss "请上" ; lin pleased_A = {-HSK-} mkA "快" | mkA "满意" ; lin pleasing_N = mkN "愉快" ; lin pleasingly_Adv = mkAdv "喜欢地" | mkAdv "高兴地" ; -- open-multilingual-wordnet @@ -30531,7 +30530,7 @@ lin sorrel_N = mkN "酸模" | {-mwn-} mkN "栗色马" ; -- status=guess -- open- lin sorrow_N = mkN "悲哀" ; lin sorrowful_A = mkA "悲哀" | mkA "悲痛" | mkA "悲傷" | mkA "悲伤" | mkA "哀愁" ; -- status=guess -- status=guess -- status=guess -- status=guess -- status=guess lin sorry_A = mkA "对不起" | mkA "抱歉" | mkA "遗憾" ; -lin sorry_Interj = mkInterj "对不起" | mkInterj "抱歉" | mkInterj "遗憾" ; +lin sorry_Interj = mkInterj "对不起" ; lin sort_N = mkN "分类" ; lin sort_V = mkV "分类" ; lin sort_V2 = mkV2 "分类" ; @@ -32901,7 +32900,7 @@ lin thanatophobia_N = mkN "死亡恐惧" ; -- open-multilingual-wordnet lin thank_V2 = mkV2 "感谢" | {-HSK-} mkV2 "谢谢" ; lin thankful_A = mkA "感激" | {-HSK-} mkA "感谢" ; lin thankless_A = mkA "不表示感谢" ; -lin thanks_Interj = mkInterj "感谢" | mkInterj "谢谢" ; +lin thanks_Interj = mkInterj "谢谢" ; lin thanks_N = {-HSK-} mkN "感谢" | mkN "谢谢" ; lin thanks_to_Prep = mkPrep "由于" ; lin that_AdA = variants {} ; diff --git a/lib/src/translator/DictionaryDut.gf b/lib/src/translator/DictionaryDut.gf index 60fdaa9b2..1d4dcd662 100644 --- a/lib/src/translator/DictionaryDut.gf +++ b/lib/src/translator/DictionaryDut.gf @@ -2954,7 +2954,7 @@ lin by8agent_Prep = S.by8agent_Prep ; lin by8means_Prep = S.by8means_Prep ; lin by_Adv = mkAdv "langs" ; -- status=guess lin by_Prep = mkPrep "bij" ; --- split mkPrep "tegen" by 6 o'clock, --- split mkPrep "door" decision by -lin bye_Interj = mkInterj "dag" | mkInterj "doei" | mkInterj "tot ziens" | mkInterj "hoie" | mkInterj "houdoe" | mkInterj "doeg" ; -- status=guess status=guess status=guess status=guess status=guess status=guess +lin bye_Interj = mkInterj "dag" | mkInterj "doei" | mkInterj "hoie" | mkInterj "houdoe" | mkInterj "doeg" ; -- status=guess status=guess status=guess status=guess status=guess status=guess lin bye_N = mkN "doei doei" | mkN "dag" ; -- status=guess status=guess lin bygone_A = mkA "vervlogen" ; -- status=guess lin bygone_N = mkN "het verleden" | mkN "de dingen die voorbij zijn" ; -- status=guess status=guess @@ -3586,7 +3586,7 @@ lin cheekbone_N = mkN "jukbeen" neuter ; -- status=guess lin cheer_V = variants {} ; -- lin cheer_V2 = variants {} ; -- lin cheerful_A = variants {} ; -- -lin cheers_Interj = mkInterj "tot ziens" | mkInterj "tot later" | mkInterj "ciao" | mkInterj "hoi" | mkInterj "doei" | mkInterj "doeg" | mkInterj "ik zie je" | mkInterj "later" | mkInterj "salu" ; -- status=guess status=guess status=guess status=guess status=guess status=guess status=guess status=guess status=guess +lin cheers_Interj = mkInterj "proost" ; lin cheese_N = L.cheese_N ; lin cheeseburger_N = mkN "kaasburger" masculine feminine ; -- status=guess lin cheesecake_N = mkN "kwarktaart" masculine feminine ; -- status=guess @@ -5229,6 +5229,7 @@ lin damage_V2 = mkV2 (mkV "beschadigen") ; -- status=guess, src=wikt lin damaging_A = variants {} ; -- lin damascus_PN = mkPN "Damascus" ; -- src=geonames status=guess lin dammit_Interj = mkInterj "verdomme" ; -- status=guess +lin damn_Interj = mkInterj "verdomme" ; -- status=guess lin damn_V2 = variants {} ; -- lin damocles_PN = mkPN "Damocles" ; -- src=eng status=guess lin damp_A = mkA "klam" ; -- status=guess @@ -7230,6 +7231,7 @@ lin excrete_V2 = mkV2 (mkV "afscheiden") ; -- status=guess, src=wikt lin excursion_N = mkN "excursie" ; -- status=guess lin excuse_N = mkN "uitvlucht" masculine feminine | mkN "excuus" neuter ; -- status=guess status=guess lin excuse_V2 = mkV2 (mkV "verontschuldigen") | mkV2 (mkV "excuseren") ; -- status=guess, src=wikt status=guess, src=wikt +lin excuse_me_Interj = mkInterj "pardon" ; lin execrable_A = mkA "verfoeilijk" ; -- status=guess lin execute_V2 = mkV2 (mkV "uitvoeren") ; -- status=guess, src=wikt lin execution_N = mkN "uitvoering" feminine ; -- status=guess @@ -8949,7 +8951,12 @@ lin gonorrhea_N = mkN "gonorroe" ; -- status=guess lin goo_N = mkN "stroperigheid" ; -- status=guess lin good_A = L.good_A ; lin good_N = mkN "goed" | mkN "goede" ; -lin goodbye_Interj = mkInterj "tot ziens" | mkInterj "doei" | mkInterj "dag" | mkInterj "houdoe" ; -- status=guess status=guess status=guess status=guess +lin good_afternoon_Interj = mkInterj "goedendag" ; +lin good_evening_Interj = mkInterj "goedenavond" ; +lin good_luck_Interj = mkInterj "veel geluk" ; +lin good_morning_Interj = mkInterj "goedemorgen" ; +lin good_night_Interj = mkInterj "goedenacht" ; +lin goodbye_Interj = mkInterj "tot ziens" ; lin goodness_N = mkN "goedheid" feminine ; -- status=guess lin goods_N = mkN "goederen {p}" | mkN "waar" feminine ; -- status=guess status=guess lin gooey_A = mkA "papperig" | mkA "slijmachtig" ; -- status=guess status=guess @@ -9662,7 +9669,7 @@ lin helium_N = mkN "helium" neuter | mkN "helium" ; -- status=guess status=guess lin hell_N = mkN "hel" ; -- status=guess lin hellfire_N = mkN "hellevuur" neuter ; -- status=guess lin hellish_A = mkA "hels" ; -- status=guess -lin hello_Interj = mkInterj "hallo!" ; -- status=guess +lin hello_Interj = mkInterj "hallo" ; lin helm_N = mkN "stuurman" masculine | mkN "roerganger" masculine ; -- status=guess status=guess lin helmet_N = mkN "helm" masculine ; -- status=guess lin helmeted_A = mkA "gehelmd" ; -- status=guess @@ -15468,7 +15475,7 @@ lin plead_V = mkV "pleiten" | mkV "bepleiten" ; -- status=guess, src=wikt status lin plead_V2 = mkV2 (mkV "pleiten") | mkV2 (mkV "bepleiten") ; -- status=guess, src=wikt status=guess, src=wikt lin plead_VS = mkVS (mkV "pleiten") | mkVS (mkV "bepleiten") ; -- status=guess, src=wikt status=guess, src=wikt lin pleasant_A = mkA "aangenaam" | mkA "behaagelijk" | mkA "plezierig" | mkA "fijn" ; -- status=guess status=guess status=guess status=guess -lin please_Adv = mkAdv "alsjeblieft" | mkAdv "alstublieft" | mkAdv "gelieve" ; ---- the last one is quite formal and only occurs as first word in a sentence +lin please_Adv = mkAdv "alsjeblieft" ; lin please_V = mkV "bevallen" | mkV "behagen" ; -- status=guess, src=wikt status=guess, src=wikt lin please_V2 = mkV2 (mkV "bevallen") | mkV2 (mkV "behagen") ; -- status=guess, src=wikt status=guess, src=wikt lin please_V2V = mkV2V (mkV "bevallen") | mkV2V (mkV "behagen") ; -- status=guess, src=wikt status=guess, src=wikt @@ -19137,7 +19144,7 @@ lin sorority_N = mkN "zusterlijkheid" ; -- status=guess lin sorrel_N = mkN "zurkel" | mkN "veldzuring" feminine ; -- status=guess status=guess lin sorrow_N = mkN "smart" | mkN "rouw" ; -- status=guess status=guess lin sorry_A = mkA "armzalig" | mkA "treurig" ; ---- improper translations ; I am sorry -> het spijt me (it regrets me) -lin sorry_Interj = mkInterj "sorry" | mkInterj "het spijt me" | mkInterj "pardon" | mkInterj "excuseer" ; -- status=guess status=guess status=guess status=guess +lin sorry_Interj = mkInterj "sorry" ; -- status=guess status=guess status=guess status=guess lin sort_N = mkN "soort" neuter ; lin sort_V = mkV "rangschikken" ; -- status=guess, src=wikt lin sort_V2 = mkV2 (mkV "rangschikken") ; -- status=guess, src=wikt @@ -20708,7 +20715,7 @@ lin thallium_N = mkN "thallium" neuter ; -- status=guess lin thame_PN = mkPN "Thame" ; -- src=geonames status=guess lin than_Subj = mkSubj "dan" ; lin thank_V2 = mkV2 (mkV "bedanken") | mkV2 (mkV "danken") ; -lin thanks_Interj = mkInterj "bedankt" | mkInterj "dank je" | mkInterj "dank u" ; -- status=guess status=guess status=guess +lin thanks_Interj = mkInterj "bedankt" | mkInterj "dank je" | mkInterj "dank u" ; lin thanks_N = mkN "bedankt" ; -- status=guess lin thanksgiving_N = mkN "dankzegging" feminine ; -- status=guess lin that_AdA = variants {} ; -- @@ -22389,7 +22396,7 @@ lin wave_down_V2 = prepV2 OP_wave_V OP_down_Prep ; -- guess-p-verb lin wave_off_V2 = prepV2 OP_wave_V OP_off_Prep ; -- guess-p-verb lin wave_on_V2 = prepV2 OP_wave_V OP_on_Prep ; -- guess-p-verb lin wavelength_N = mkN "golflengte" ; -- status=guess -lin waver_N = mkN "translated by nominalizing the verb" ; -- status=guess +lin waver_N = variants {} ; lin waver_V = mkV "twijfelen" | mkV "weifelen" ; -- status=guess, src=wikt status=guess, src=wikt lin wax_N = mkN "was" masculine ; -- status=guess lin wax_V = wassen_V | mkV (mkV "was") "aanbrengen" | mkV (mkV "met") "was insmeren" ; -- status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index ee3b67627..d5806c4f9 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -24377,8 +24377,7 @@ lin good_neighbourliness_N = mkN "good-neighbourliness" ; lin good_night_Interj = ss "good night"; lin good_tempered_A = compoundA (mkA "good-tempered"); lin good_time_A = compoundA (mkA "good-time"); -lin goodbye_Interj = ss (variants {"goodbye"; "good-bye"}); -lin goodbye_N = variants {mkN "goodbye"; mkN "good-bye"; mkN "goodby"; mkN "good-by"}; +lin goodbye_Interj = ss (variants {"goodbye"; "good-bye"; "goodby"; "good-by"}); lin goodish_A = compoundA (mkA "goodish"); lin goodly_A = mkA "goodly" "goodlier"; lin goodness_N = mkN "goodness" ; @@ -42828,6 +42827,7 @@ lin please_V = mkV "please" "pleases" "pleased" "pleased" "pleasing"; lin please_V2 = mkV2 (mkV "please" "pleases" "pleased" "pleased" "pleasing"); lin please_V2V = mkV2V (mkV "please" "pleases" "pleased" "pleased" "pleasing") noPrep to_Prep; lin please_VV = {s = (mkVV (mkV "please" "pleases" "pleased" "pleased" "pleasing")).s; p=[]; typ = VVAux}; +lin please_Voc = S.please_Voc ; lin pleased_A = mkA "pleased" ; lin pleaser_N = mkN "pleaser" ; lin pleasing_N = mkN "pleasing" ; diff --git a/lib/src/translator/DictionaryEst.gf b/lib/src/translator/DictionaryEst.gf index 50dcefaa3..1a9b2a52a 100644 --- a/lib/src/translator/DictionaryEst.gf +++ b/lib/src/translator/DictionaryEst.gf @@ -4472,6 +4472,7 @@ lin buzzword_N = D.'sõnakõlks_N' ; lin by_Adv = ParadigmsEst.mkAdv "ääres" ; lin by_Prep = S.by8means_Prep ; ---- split? lin by_election_N = mkN "abivalimised" ; +lin bye_Interj = ss "head aega" ; lin bygone_A = mkA "ammumöödunud" ; lin bygone_N = mkN "ammumöödunud" ; lin bypath_N = D.'kõrvaltee_N' ; @@ -5501,6 +5502,7 @@ lin cheerfulness_N = D.'rõõmsameelsus_N' ; lin cheering_N = D.'hõiskamine_N' ; lin cheerless_A = D.morn_A ; lin cheerlessness_N = mkN "rõõmutus" ; +lin cheers_Interj = ss "terviseks" ; lin cheery_A = D.reibas_A ; lin cheese_N = L.cheese_N ; lin cheeseboard_N = mkN "juustuvalik" ; @@ -8115,6 +8117,7 @@ lin damask_N = D.damast_N ; lin dame_N = D.daam_N ; lin damn_A = mkA "needma" ; lin damn_Adv = ParadigmsEst.mkAdv "needma" ; +lin damn_Interj = ss "neetud" ; lin damn_N = mkN "needma" ; lin damn_V2 = mkV2 "needma" ; lin damnable_A = mkA "kuradima" ; @@ -11460,6 +11463,7 @@ lin excruciating_A = mkA "piinav" ; lin excursion_N = D.ekskursioon_N ; lin excursionist_N = mkN "ekskursant" ; lin excusable_A = D.vabandatav_A ; +lin excuse_me_Interj = ss "vabandust" ; lin execrable_A = mkA "äraneetud" ; lin execrate_V2 = D.'jälestama_V2' ; lin execration_N = mkN "jälestus" ; @@ -14120,6 +14124,12 @@ lin gonorrhoea_N = D.'gonorröa_N' ; lin goo_N = mkN "möga" ; lin good_A = L.good_A ; lin good_N = mkN "hea" ; +lin good_afternoon_Interj = ss "tere päevast" ; +lin good_evening_Interj = ss "tere õhtust" ; +lin good_luck_Interj = ss "palju edu" ; +lin good_morning_Interj = ss "tere hommikust" ; +lin good_night_Interj = ss "head ööd" ; +lin goodbye_Interj = ss "head aega" ; lin goodish_A = mkA "kopsakas" ; lin goodly_A = mkA "kopsakas" ; lin goodness_N = D.headus_N ; @@ -15242,7 +15252,7 @@ lin hellfire_N = mkN "põrguleegid" ; lin hellhound_N = mkN "põrgukoer" ; lin hellion_N = D.'mürgeldaja_N' ; lin hellish_A = D.'põrgulik_A' ; -lin hello_N = mkN "halloo" ; +lin hello_Interj = ss "tere" ; lin helm_N = mkN "roolipinn" ; lin helmet_N = D.kaska_N ; lin helminth_N = mkN "sooleparasiit" ; @@ -22582,7 +22592,8 @@ lin plead_VS = mkVS "anuma" ; lin pleasant_A = D.meeldiv_A ; lin pleasantness_N = D.meeldivus_N ; lin pleasantry_N = mkN "lustakus" ; -lin please_Adv = lin Adv S.please_Voc ; ---- to check +lin please_Adv = ss "palun" ; +lin please_Voc = ss "palun" ; lin pleased_A = D.rahul_A ; lin pleasing_N = mkN "nauditav" ; lin pleasingly_Adv = ParadigmsEst.mkAdv "nautitavalt" ; @@ -27236,6 +27247,7 @@ lin sorrel_A = mkA "jänesekapsas" ; lin sorrel_N = D.'jänesekapsas_N' ; lin sorrow_N = mkN "kahetsusvalu" ; lin sorry_A = mkA "andeks" ; +lin sorry_Interj = ss "vabandust" ; lin sort_N = mkN "järjestama" ; lin sort_V = mkV "järjestama" ; lin sort_V2 = D.'järjestama_V2' ; @@ -29271,6 +29283,7 @@ lin thank_V2 = D.'tänama_V2' ; lin thankful_A = D.'tänulik_A' ; lin thankless_A = D.'tänamatu_A' ; lin thanks_N = D.'aitäh_N' ; +lin thanks_Interj = ss "suur tänu" ; lin thanksgiving_N = mkN "tänupüha" ; lin that_Quant = S.that_Quant ; lin that_Subj = S.that_Subj ; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index e9b2ed212..d66d3d96f 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -7685,7 +7685,7 @@ lin by_Prep = postPrep genitive "kautta" ; lin by_means_of_Prep = mkPrep "avulla" ; lin by_virtue_of_Prep = mkPrep "takia" ; lin bye_Interj = mkInterj "hei sitten" ; -lin bye_bye_Interj = mkInterj "heippa" ; +lin bye_bye_Interj = mkInterj "hei hei" ; lin bygone_A = mkWA (k38 "entinen") ; --UNCHK lin bylaw_N = mkWN (compoundN "ohje" (k1A "sääntö")) ; --UNCHK lin bypass_N = mkWN (compoundN "ohikulku" (k19 "tie")) ; --UNCHK @@ -9356,7 +9356,7 @@ lin cheerfulness_N = mkWN (k40 "hilpeys") ; --UNCHK lin cheerleader_N = mkWN (k5 "cheerleader") ; --UNCHK lin cheerless_A = mkWA (k34A "iloton") ; --UNCHK lin cheerlessness_N = mkWN (k40 "lohduttomuus") ; --UNCHK -lin cheers_Interj = mkInterj "kippis" ; +lin cheers_Interj = mkInterj "terveydeksi" ; lin cheery_A = mkWA (k38 "aurinkoinen") ; --UNCHK lin cheese_N = L.cheese_N ; lin cheeseboard_N = mkWN (compoundN "juusto" (k33A "tarjotin")) ; --UNCHK @@ -13459,7 +13459,7 @@ lin dame_N = mkWN (k9 "kissa") ; --UNCHK lin dammar_N = mkWN (compoundN "dammar" (k5 "hartsi")) ; --UNCHK lin damn_A = mkWA (k38 "pirunmoinen") ; --UNCHK lin damn_Adv = mkWAdv (compoundAdv "pahuk" (k99 "sen")) ; --UNCHK -lin damn_Interj = mkInterj "pahus" ; +lin damn_Interj = mkInterj "hitto" ; lin damn_V2 = mkWV2 (k74 "kirota") ; --UNCHK lin damnable_A = mkWA (k10 "katala") ; --UNCHK lin damnation_N = mkWN (compoundN "kiro" (k38 "aminen")) ; --UNCHK @@ -22418,9 +22418,9 @@ lin gonorrhoea_N = mkWN (k6 "tippuri") ; --UNCHK lin goo_N = mkWN (k1A "törky") ; --UNCHK lin good_A = L.good_A ; lin good_N = mkN "hyvä" ; -lin good_afternoon_Interj = mkInterj "hyvää iltapäivää" ; +lin good_afternoon_Interj = mkInterj "hyvää päivää" ; lin good_evening_Interj = mkInterj "hyvää iltaa" ; -lin good_luck_Interj = mkInterj "onnea matkaan" ; +lin good_luck_Interj = mkInterj "onnea" ; lin good_morning_Interj = mkInterj "hyvää huomenta" ; lin good_natured_A = mkA "hyväluontoinen" ; lin good_night_Interj = mkInterj "hyvää yötä" ; @@ -24034,8 +24034,7 @@ lin hellgrammiate_N = mkWN "Corydalinae" ; --UNCHK lin hellhound_N = mkWN "Kerberos" ; --UNCHK lin hellion_N = mkWN (k38 "paholainen") ; --UNCHK lin hellish_A = mkWA (k34A "jumalaton") ; --UNCHK -lin hello_Interj = mkInterj "terve" | mkInterj "hei" | mkInterj "moro" | mkInterj "moi" ; -lin hello_N = mkWN (k48 "terve") ; --UNCHK +lin hello_Interj = mkInterj "terve" | mkInterj "moro" ; lin helm_N = mkWN (k33 "peräsin") ; --UNCHK lin helmet_N = mkWN (k10 "kypärä") ; --UNCHK lin helmeted_A = mkWA (compoundA "kypärä" (k38 "päinen")) ; --UNCHK @@ -39381,12 +39380,12 @@ lin pleasance_N = mkWN (k1A "nautinto") ; --UNCHK lin pleasant_A = mkWA (k10 "mukava") ; --UNCHK lin pleasantness_N = mkWN (k40 "herttaisuus") ; --UNCHK lin pleasantry_N = mkWN (k40 "kohteliaisuus") ; --UNCHK -lin please_Adv = mkAdv "ole hyvä" | mkAdv "mielellään" ; ---- cat +lin please_Adv = mkAdv "ole hyvä" ; lin please_V = mkWV (k53A "riemastuttaa") ; --UNCHK lin please_V2 = mkV2 "miellyttää" partitive ; lin please_V2V = mkWV2V (k53A "riemastuttaa") ; --UNCHK lin please_VV = mkWVV (k53A "riemastuttaa") ; --UNCHK -lin please_Voc = S.please_Voc ; +lin please_Voc = ss "kiitos" ; lin pleased_A = variants {} ; -- lin pleaser_N = mkWN "hauskuuttaja" ; --UNCHK lin pleasing_N = mkWN "miellyttäminen" ; --UNCHK diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index eeec4bc42..7ff3a93e7 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -4371,7 +4371,7 @@ lin by8agent_Prep = S.by8agent_Prep ; lin by8means_Prep = S.by8means_Prep ; lin by_Adv = mkAdv "loin" ; -- UWN lin by_Prep = mkPrep "par" ; -lin bye_Interj = mkInterj "salut" ; -- tocheck +lin bye_Interj = mkInterj "au revoir" ; lin bypass_N = mkN "contournement" masculine | mkN "pontage" masculine | mkN "déviation" feminine ; -- tocheck lin bypass_V2 = mkV2 (mkV "contourner") ; -- tocheck lin byproduct_N = mkN "sous-produit" masculine ; -- tocheck @@ -5322,7 +5322,7 @@ lin cheep_V = mkV (mkV "piailler") ; -- tocheck lin cheer_V = variants {} ; -- mkV2 (mkV "applaudir") ; -- tocheck lin cheer_V2 = mkV2 (mkV "applaudir") ; -- tocheck lin cheerful_A = mkA "joyeux" ; -- tocheck -lin cheers_Interj = mkInterj "merci" | mkInterj "santé" ; -- tocheck +lin cheers_Interj = mkInterj "santé" ; lin cheery_A = mkA "ensoleillé" | mkA "gai" ; -- UWN lin cheese_N = L.cheese_N ; lin cheeseburger_N = mkN "cheeseburger" masculine ; -- tocheck @@ -7773,6 +7773,7 @@ lin damascus_PN = mkPN "Damas" ; -- status=guess src=geonames lin damask_A = mkA "lie-de-vin" ; -- tocheck lin damask_N = mkN "lie-de-vin" | mkN "damas" ; -- tocheck lin damn_A = mkA "foutu" ; -- tocheck +lin damn_Interj = mkInterj "maudit" ; lin damn_N = mkN "merde" ; -- tocheck lin damn_V2 = mkV2 (mkV "damner") ; -- tocheck lin damnable_A = mkA "exécrable" ; -- UWN @@ -10807,6 +10808,7 @@ lin excretory_A = mkA "excrétoire" ; -- tocheck lin excursion_N = mkN "excursion" feminine ; -- tocheck lin excuse_N = mkN "prétexte" masculine ; -- tocheck lin excuse_V2 = mkV2 (mkV "excuser") ; -- tocheck +lin excuse_me_Interj = mkInterj "excuse-moi" ; lin execrable_A = mkA "exécrable" ; -- tocheck lin execration_N = mkN "exécration" feminine ; -- tocheck lin execute_V2 = mkV2 (mkV "exécuter") ; -- tocheck @@ -13204,7 +13206,13 @@ lin gonorrhoea_N = mkN "blennorragie" | mkN "chaude-pisse" | mkN "gonorrhée" ; lin goo_N = mkN "boue" | mkN "lie" ; -- UWN lin good_A = L.good_A ; lin good_N = mkN "bien" masculine | mkN "bon" masculine ; -- tocheck +lin good_afternoon_Interj = mkInterj "bonjour" ; +lin good_evening_Interj = mkInterj "bon soir" ; lin good_looking_A = mkA "beau" ; -- tocheck +lin good_luck_Interj = mkInterj "bonne chance" ; +lin good_morning_Interj = mkInterj "bonjour" ; +lin good_night_Interj = mkInterj "bonne nuit" ; +lin goodbye_Interj = mkInterj "au revoir" ; lin goodness_N = mkN "bonté" | mkN "bonté" feminine ; -- tocheck lin goody_N = mkN "friandise" ; -- UWN lin goof_N = mkN "gaffe" ; -- tocheck @@ -14169,7 +14177,7 @@ lin hellebore_N = mkN "hellébore" masculine ; -- tocheck lin helleborine_N = mkN "céphalanthère" ; -- tocheck lin hellion_N = mkN "Diable" | mkN "Satan" ; -- UWN lin hellish_A = mkA "infernal" ; -- tocheck -lin hello_Interj = mkInterj "allô" ; -- tocheck +lin hello_Interj = mkInterj "allô" ; lin helm_N = mkN "barre" feminine ; -- tocheck lin helmet_N = mkN "casque" masculine ; -- tocheck lin helminth_N = mkN "Ver_parasite" | mkN "ver_parasite" | mkN "vers_parasites" ; -- UWN @@ -22623,7 +22631,7 @@ lin plead_VS = variants {} ; -- mkV2 (mkV "plaider") ; -- tocheck lin pleasance_N = mkN "plaisir" ; -- UWN lin pleasant_A = mkA "agréable" ; -- tocheck lin pleasantness_N = mkN "agrément" | mkN "douceur" ; -- UWN -lin please_Adv = mkAdv "allez" ; -- tocheck +lin please_Adv = mkAdv "s'il te plaît" ; lin please_V = I.plaire_V2 ; lin please_V2 = mkV2 (mkV I.plaire_V2) P.dative ; lin please_V2V = mkV2V (mkV I.plaire_V2) ; -- tocheck @@ -27934,7 +27942,7 @@ lin sorrel_N = mkN "oseille" feminine ; -- tocheck lin sorrow_N = mkN "peine" feminine ; -- tocheck lin sorrowful_A = mkA "triste" ; -- tocheck lin sorry_A = mkA "désolé" ; -- tocheck -lin sorry_Interj = mkInterj "désolé" ; -- tocheck +lin sorry_Interj = mkInterj "pardon" ; lin sort_N = mkN "sorte" | mkN "type" masculine | mkN "triage" masculine | mkN "tri" masculine ; lin sort_V = variants {} ; -- mkV2 (mkV "trier") ; -- tocheck lin sort_V2 = mkV2 (mkV "trier") ; -- tocheck diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index 0f2ea3653..64a2ec6cc 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -8279,7 +8279,7 @@ lin by_Prep = mkPrep "durch" accusative ; lin by_election_N = variants {} ; lin by_means_of_Prep = variants {} ; lin by_virtue_of_Prep = variants {} ; -lin bye_Interj = mkInterj "tschüss" ; -- status=guess +lin bye_Interj = mkInterj "tschüss" | mkInterj "tschau" ; lin bye_N = mkN "Heia" ; -- status=guess lin bye_bye_Interj = variants {} ; lin bye_law_N = variants {} ; @@ -10071,7 +10071,7 @@ lin cheering_N = variants {} ; lin cheerleader_N = mkN "Cheerleader" "Cheerleader" masculine ; -- status=guess lin cheerless_A = variants {} ; lin cheerlessness_N = variants {} ; -lin cheers_Interj = mkInterj "tschüss" ; -- status=guess +lin cheers_Interj = mkInterj "zum Wohl" ; lin cheery_A = variants {} ; lin cheese_N = L.cheese_N ; lin cheeseboard_N = variants {} ; @@ -14548,10 +14548,10 @@ lin damask_A = variants {} ; lin damask_N = variants {} ; lin dame_N = variants {} ; lin dammar_N = variants {} ; -lin dammit_Interj = mkInterj "verdammt" | mkInterj "verdammt noch mal" ; -- status=guess status=guess +lin dammit_Interj = mkInterj "verdammt noch mal" ; -- status=guess status=guess lin damn_A = variants {} ; -lin damn_Interj = variants {} ; -lin damn_N = mkN "verdammt" | mkN "Mist!" | mkN "Scheiße!" ; -- status=guess status=guess status=guess +lin damn_Interj = mkInterj "verdammt" ; +lin damn_N = mkN "verdammt" ; -- status=guess status=guess status=guess lin damn_V2 = mkV2 (mkV "verdammen") ; -- status=guess, src=wikt lin damnable_A = mkA "verdammenswert" | mkA "verdammungswürdig" ; -- status=guess status=guess lin damnation_N = mkN "Verdammnis" feminine ; -- status=guess @@ -19878,7 +19878,7 @@ lin excursionist_N = variants {} ; lin excusable_A = variants {} ; lin excuse_N = mkN "Ausrede" "Ausreden" feminine ; -- status=guess lin excuse_V2 = mkV2 (mkReflV "entschuldigen") ; -- status=guess, src=wikt -lin excuse_me_Interj = variants {} ; +lin excuse_me_Interj = mkInterj "Entschuldigung" ; lin execrable_A = variants {} ; lin execrate_V2 = variants {} ; lin execration_N = mkN "Abscheu" masculine | mkN "Fluch" "Flüche" masculine | mkN "Verwünschung" feminine ; -- status=guess status=guess status=guess @@ -24253,8 +24253,8 @@ lin gonorrhoea_N = variants {} ; lin goo_N = mkN "Schmalz" "Schmalze" neuter | mkN "übertriebene Sentimentalität" feminine ; -- status=guess status=guess lin good_A = mk3A "gut" "besser" "beste" ; lin good_N = mkN "Gute" neuter ; -lin good_afternoon_Interj = variants {} ; -lin good_evening_Interj = variants {} ; +lin good_afternoon_Interj = mkInterj "guten Tag" ; +lin good_evening_Interj = mkInterj "guten Abend" ; lin good_fellowship_N = variants {} ; lin good_for_naught_A = variants {} ; lin good_for_naught_N = variants {} ; @@ -24262,15 +24262,14 @@ lin good_for_nothing_A = variants {} ; lin good_for_nothing_N = variants {} ; lin good_humoured_A = variants {} ; lin good_looking_A = variants {} ; -lin good_luck_Interj = variants {} ; -lin good_morning_Interj = variants {} ; +lin good_luck_Interj = mkInterj "viel Glück" ; +lin good_morning_Interj = mkInterj "guten Morgen" ; lin good_natured_A = variants {} ; lin good_neighbourliness_N = variants {} ; -lin good_night_Interj = variants {} ; +lin good_night_Interj = mkInterj "gute Nacht" ; lin good_tempered_A = variants {} ; lin good_time_A = variants {} ; -lin goodbye_Interj = mkInterj "auf Wiedersehen" | mkInterj "auf Wiederschauen" | mkInterj "auf Wiederhören" | mkInterj "tschüss" | mkInterj "tschau" | mkInterj "bis später" | mkInterj "bis bald" ; -- status=guess status=guess status=guess status=guess status=guess status=guess status=guess -lin goodbye_N = variants {} ; +lin goodbye_Interj = mkInterj "auf Wiedersehen" | mkInterj "auf Wiederschauen" | mkInterj "auf Wiederhören" | mkInterj "bis später" | mkInterj "bis bald" ; -- status=guess status=guess status=guess status=guess status=guess status=guess status=guess lin goodish_A = variants {} ; lin goodly_A = variants {} ; lin goodness_N = mkN "Güte" feminine | mkN "Gütigkeit" feminine | mkN "Herzensgüte" feminine | mkN "Tugend" "Tugenden" feminine | mkN "Integrität" feminine ; -- status=guess status=guess status=guess status=guess status=guess @@ -42629,6 +42628,7 @@ lin please_V = irregV "gefallen" "gefallt" "gefiel" "gefiele" "gefallen" | mkV " lin please_V2 = mkV2 (irregV "gefallen" "gefallt" "gefiel" "gefiele" "gefallen" | mkV "rechtmachen") ; -- status=guess, src=wikt status=guess, src=wikt lin please_V2V = mkV2V (irregV "gefallen" "gefallt" "gefiel" "gefiele" "gefallen" | mkV "rechtmachen") ; -- status=guess, src=wikt status=guess, src=wikt lin please_VV = mkVV (irregV "gefallen" "gefallt" "gefiel" "gefiele" "gefallen" | mkV "rechtmachen") ; -- status=guess, src=wikt status=guess, src=wikt +lin please_Voc = S.please_Voc ; lin pleased_A = mk3A "froh" "froher" "frohsten, froheste" | mk3A "zufrieden" "zufriedener" "zufriedenste" ; -- status=guess status=guess lin pleaser_N = variants {} ; lin pleasing_N = variants {} ; @@ -53009,7 +53009,7 @@ lin sorrow_N = mkN "Kummer" masculine | mkN "Traurigkeit" feminine | mkN "Trauer lin sorrow_V = variants {} ; lin sorrowful_A = mkA "betrübt" | mkA "kummervoll" | mkA "sorgenvoll" | mk3A "traurig" "trauriger" "traurigste" ; -- status=guess status=guess status=guess status=guess lin sorry_A = mkA "traurig" | mkA "armselig" ; -- note: I am sorry = es tut mir Leid. -lin sorry_Interj = mkInterj "entschuldigen Sie bitte" | mkInterj "verzeihen Sie bitte" | mkInterj "es tut mir Leid" | mkInterj "ich bitte um Entschuldigung" | mkInterj "Verzeihung" | mkInterj "Verzeihung" | mkInterj "Entschuldigung" | mkInterj "sorry" ; -- status=guess status=guess status=guess status=guess status=guess status=guess status=guess status=guess +lin sorry_Interj = mkInterj "Entschuldigung" ; lin sort_N = mkN "Sorte" ; lin sort_V = regV "sortieren" ; -- status=guess, src=wikt lin sort_V2 = mkV2 (regV "sortieren") ; -- status=guess, src=wikt @@ -57387,7 +57387,7 @@ lin thank_offering_N = variants {} ; lin thankful_A = mk3A "dankbar" "dankbarer" "dankbarste" ; -- status=guess lin thankfulness_N = variants {} ; lin thankless_A = variants {} ; -lin thanks_Interj = mkInterj "danke" ; -- status=guess +lin thanks_Interj = mkInterj "danke" ; lin thanks_N = mkN "Dank" masculine | mkN "Danksagung" feminine ; -- status=guess status=guess lin thanks_to_Prep = variants {} ; lin thanksgiving_N = variants {} ; diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf index 2db97ffd7..de2b078a3 100644 --- a/lib/src/translator/DictionaryHin.gf +++ b/lib/src/translator/DictionaryHin.gf @@ -3898,9 +3898,9 @@ lin by8agent_Prep = mkPrep "से" "से" ; lin by8means_Prep = mkPrep "पर" "पर" ; lin by_Adv = mkAdv "से होकर" ; -- tocheck lin by_Prep = mkPrep "से" "से" ; -lin bye_Interj = mkInterj "hei sitten" ; +lin bye_Interj = mkInterj "नमस्कार" ; lin bye_N = mkN "बाई" ; -- tocheck -lin bye_bye_Interj = mkInterj "heippa" ; +lin bye_bye_Interj = mkInterj "नमस्कार" ; lin bygone_A = mkA "विगत" ; -- tocheck lin bypass_N = mkN "विद्युत् उपमार्ग" ; -- tocheck lin bypass_V2 = mkV2 (compoundV "बाहर-बाहर" (mkV "निकलना")) ; -- tocheck @@ -4627,6 +4627,7 @@ lin cheer_V = compoundV "बढावा" (mkV "देना") ; -- tocheck lin cheer_V2 = mkV2 (compoundV "बढावा" (mkV "देना")) ; -- tocheck lin cheer_up_V = compoundV "प्रसन्न" (mkV "होना") ; -- tocheck lin cheer_up_V2 = mkV2 (compoundV "प्रसन्न" (mkV "होना")) ; -- tocheck +lin cheers_Interj = mkInterj "चियर्ज़" ; lin cheerful_A = mkA "आनंदध्यक" ; -- tocheck lin cheerfulness_N = mkN "प्रसन्नता" ; -- tocheck lin cheering_N = mkN "जय-जयकार्" ; -- tocheck @@ -11462,11 +11463,10 @@ lin good_A = mkA "अच्छा" ; -- tocheck lin good_N = mkN "हित" ; -- tocheck lin good_afternoon_Interj = mkInterj "नमस्कार" ; lin good_evening_Interj = mkInterj "नमस्कार" ; -lin good_luck_Interj = mkInterj "onnea matkaan" ; +lin good_luck_Interj = mkInterj "शुभकामनाएँ" ; lin good_morning_Interj = mkInterj "नमस्कार" ; lin good_night_Interj = mkInterj "नमस्कार" ; lin goodbye_Interj = mkInterj "हम आपसे विदा लेते हैं" ; -lin goodbye_N = mkN "अलविदा" ; -- tocheck lin goodish_A = mkA "काफ़ी" ; -- tocheck lin goodly_A = mkA "बढ़िया" ; -- tocheck lin goodness_N = mkN "भगवान" ; -- tocheck @@ -20043,6 +20043,7 @@ lin pleadingly_Adv = mkAdv "प्रार्थना करते हुए" lin pleasant_A = mkA "लुभावना" ; -- tocheck lin pleasantness_N = mkN "सुखदता" ; -- tocheck lin pleasantry_N = mkN "हँसी-मज़ाक" ; -- tocheck +lin please_Adv = mkAdv "कृपया" ; lin please_V = mkV "चाहना" ; -- tocheck lin please_V2 = mkV2 (mkV "चाहना") ; -- tocheck lin please_Voc = ss "कृपया" ; diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf index db84df6ea..45aad4d05 100644 --- a/lib/src/translator/DictionaryIta.gf +++ b/lib/src/translator/DictionaryIta.gf @@ -3880,7 +3880,7 @@ lin by8agent_Prep = S.by8agent_Prep ; -- comment=CHECKED lin by8means_Prep = S.by8means_Prep ; -- comment=CHECKED lin by_Adv = mkAdv "a proposito" ; -- status=guess lin by_Prep = mkPrep "per" ; -lin bye_Interj = mkInterj "ciao" ; -- status=guess +lin bye_Interj = mkInterj "ciao" ; lin bypass_N = mkN "circonvallazione" | mkN "tangenziale" ; -- UWN lin bypath_N = mkN "strada_secondaria" ; -- UWN lin byplay_N = mkN "controscena" ; -- status=guess @@ -4744,7 +4744,7 @@ lin cheer_V = variants {} ; -- lin cheer_V2 = variants {} ; -- lin cheer_up_V = mkV "consolarsi" | mkV "rallegrarsi" | mkV "rasserenarsi" | mkV "rincuorarsi" ; -- UWN lin cheerful_A = mkA "allegro" ; -- status=guess -lin cheers_Interj = mkInterj "ci vediamo" ; -- status=guess +lin cheers_Interj = mkInterj "cincin" ; lin cheery_A = mkA "vivace" ; -- UWN lin cheese_N = L.cheese_N ; lin cheeseburger_N = mkN "cheeseburger" masculine ; -- status=guess @@ -6992,7 +6992,7 @@ lin damaging_A = variants {} ; -- lin damascus_PN = mkPN "Damasco" ; -- status=guess src=geonames lin damask_N = mkN "damasco" ; -- status=guess lin dammit_Interj = mkInterj "merda" | mkInterj "cazzo" | mkInterj "dannazione" | mkInterj "cavolo" | mkInterj "cribbio" ; -- status=guess status=guess status=guess status=guess status=guess -lin damn_Interj = mkInterj "accidenti" | mkInterj "dannazione" | mkInterj "cribbio" | mkInterj "cavolo" ; -- status=guess status=guess status=guess status=guess +lin damn_Interj = mkInterj "maledizione" ; lin damn_N = mkN "maledire" ; ---- lin damn_V2 = mkV2 (mkV "dannare") ; -- status=guess, src=wikt lin damnation_N = mkN "dannazione" feminine ; -- status=guess @@ -9600,6 +9600,7 @@ lin excursion_N = mkN "gita" | mkN "escursione" feminine ; -- status=guess statu lin excursionist_N = mkN "gitante" ; -- UWN lin excuse_N = mkN "scusa" | mkN "pretesto" ; -- status=guess status=guess lin excuse_V2 = mkV2 (mkV "scusare") ; -- status=guess, src=wikt +lin excuse_me_Interj = mkInterj "scusa" ; lin execute_V2 = variants {} ; -- lin execution_N = mkN "esecuzione" feminine ; -- status=guess lin executioner_N = mkN "boia" | mkN "carnefice" masculine ; -- status=guess status=guess @@ -11745,7 +11746,12 @@ lin gonorrhoea_N = mkN "blenorragia" | mkN "blenorrea" | mkN "gonorrea" ; -- UWN lin goo_N = mkN "belletta" | mkN "fanghiglia" | mkN "limo" | mkN "melma" | mkN "mota" ; -- UWN lin good_A = L.good_A ; lin good_N = mkN "bene" masculine ; -- status=guess -lin goodbye_Interj = mkInterj "arrivederci" | mkInterj "arrivederla" | mkInterj "ciao" ; -- status=guess status=guess status=guess +lin good_afternoon_Interj = mkInterj "buongiorno" ; +lin good_evening_Interj = mkInterj "buona sera" ; +lin good_luck_Interj = mkInterj "buona fortuna" ; +lin good_morning_Interj = mkInterj "buongiorno" ; +lin good_night_Interj = mkInterj "buona notte" ; +lin goodbye_Interj = mkInterj "arrivederci" | mkInterj "arrivederla" | mkInterj "ciao" ; lin goodness_N = mkN "bontà" feminine ; -- status=guess lin goodwill_N = mkN "buona volontà" ; -- status=guess lin goody_N = mkN "bocconcino" | mkN "boccone" | mkN "ghiottoneria" | mkN "golosità" | mkN "leccornia" | mkN "mangiarino" | mkN "manicaretto" | mkN "manna" | mkN "squisitezza" ; -- UWN @@ -12622,7 +12628,7 @@ lin hell_N = mkN "inferno" ; -- status=guess lin hellcat_N = mkN "arpia" | mkN "megera" | mkN "strega" ; -- UWN lin hellebore_N = mkN "elleboro" ; -- status=guess lin hellion_N = mkN "casinaro" | mkN "casinista" | mkN "piantagrane" | mkN "satanasso" ; -- UWN -lin hello_Interj = mkInterj "ciao" | mkInterj "salve" | mkInterj "buongiorno" ; -- status=guess status=guess status=guess +lin hello_Interj = mkInterj "ciao" ; lin helm_N = mkN "timone" masculine ; -- status=guess lin helmet_N = mkN "casco" ; -- status=guess lin helminth_N = mkN "elminto" ; -- UWN @@ -24882,7 +24888,7 @@ lin sorority_N = mkN "sororità" ; -- status=guess lin sorrel_N = mkN "sauro" ; -- status=guess lin sorrow_N = mkN "tristezza" | mkN "dolore" masculine | mkN "pena" | mkN "afflizione" feminine | mkN "infelicità" feminine ; -- status=guess status=guess status=guess status=guess status=guess lin sorry_A = mkA "scusa" ; -- status=guess -lin sorry_Interj = mkInterj "scusi" | mkInterj "scusa" | mkInterj "mi scusi" | mkInterj "mi scuso" ; -- status=guess status=guess status=guess status=guess +lin sorry_Interj = mkInterj "scusami" ; lin sort_N = mkN "tipo" ; -- status=guess lin sort_V = mkV (mettere_V) "in ordine" ; -- status=guess, src=wikt lin sort_V2 = mkV2 (mkV (mettere_V) "in ordine") ; -- status=guess, src=wikt diff --git a/lib/src/translator/DictionaryJpn.gf b/lib/src/translator/DictionaryJpn.gf index 57f5067c3..a81d2c8c9 100644 --- a/lib/src/translator/DictionaryJpn.gf +++ b/lib/src/translator/DictionaryJpn.gf @@ -2104,7 +2104,7 @@ lin by8agent_Prep = S.by8agent_Prep ; lin by8means_Prep = S.by8means_Prep ; lin by_Adv = ParadigmsJpn.mkAdv "道に沿って" ; lin by_Prep = S.by8means_Prep | S.by8agent_Prep ; -lin bye_Interj = mkInterj "では" | mkInterj "またね" | mkInterj "じゃ、また" | mkInterj "バイバイ" | mkInterj "バイ" ; +lin bye_Interj = mkInterj "バイ" ; lin bye_N = mkN "おねんね" ; lin byproduct_N = mkN "副産物" ; lin byte_N = mkN "バイト" ; @@ -2531,7 +2531,7 @@ lin cheer_V = mkV "喝采する" | mkV "声援する" | mkV "励ます" ; lin cheer_V2 = mkV2 "喝采する" | mkV2 "声援する" | mkV2 "励ます" ; lin cheerful_A = mkA "楽しげな" | mkA "陽気な" ; lin cheerleader_N = mkN "チアリーダー" ; -lin cheers_Interj = mkInterj "乾杯" ; +lin cheers_Interj = mkInterj "かんぱい" ; lin cheese_N = L.cheese_N ; lin cheeseburger_N = mkN "チーズバーガー" ; lin cheesecake_N = mkN "チーズケーキ" ; @@ -3793,7 +3793,7 @@ lin damask_N = mkN "ばら色" ; lin dammit_Interj = mkInterj "しまった" | mkInterj "くそ" ; lin damn_A = mkA "糞" ; lin damn_Adv = mkAdv "糞" ; -lin damn_Interj = mkInterj "しまった! ! 糞" | mkInterj "くそ" | mkInterj "畜生！" | mkInterj "チェ！ !" ; +lin damn_Interj = mkInterj "くそ" ; lin damn_N = mkN "しまった" | mkN "糞" | mkN "くそ" | mkN "最低の" ; lin damn_V2 = mkV2 "地獄に落とす" ; lin damp_A = mkA "湿っぽい" | mkA "湿った" ; @@ -5287,6 +5287,7 @@ lin excrete_V2 = mkV2 "排泄する" ; lin excursion_N = mkN "遠足" ; lin excuse_N = mkN "言い訳" | mkN "口実" | mkN "弁解" ; lin excuse_V2 = mkV2 "言い訳をする" ; +lin excuse_me_Interj = mkInterj "すみません" ; lin execute_V2 = mkV2 "実行する" ; lin execution_N = mkN "実行" ; lin executive_A = variants {} ; -- @@ -6435,7 +6436,12 @@ lin gonorrhea_N = mkN "淋病" ; lin goo_N = mkN "ネバネバしたもの" ; lin good_A = L.good_A | mkA "良い" | mkA "いい" | mkA "善意の" ; lin good_N = mkN "善" ; -lin goodbye_Interj = mkInterj "さようなら" | mkInterj "失礼します" | mkInterj "それでは" | mkInterj "では" | mkInterj "じゃあ" ; +lin good_afternoon_Interj = mkInterj "こんにちは" ; +lin good_evening_Interj = mkInterj "こんばんは" ; +lin good_luck_Interj = mkInterj "がんばってください" ; +lin good_morning_Interj = mkInterj "おはようございます" ; +lin good_night_Interj = mkInterj "おやすみなさい" ; +lin goodbye_Interj = mkInterj "さようなら" ; lin goodness_N = variants {} ; -- lin goods_N = mkN "品物" | mkN "商品" | mkN "物品" | mkN "品" ; lin goodwill_N = mkN "善意" ; @@ -6887,7 +6893,7 @@ lin helium_N = mkN "ヘリウム" ; lin helix_N = mkN "螺旋" ; lin hell_N = mkN "地獄" ; lin hellfire_N = mkN "業火" ; -lin hello_Interj = mkInterj "本当？" | mkInterj "冗談だろ？" | mkInterj "大丈夫？" | mkInterj "大丈夫かよ？" | mkInterj "マジ？" | mkInterj "マジかよ" ; +lin hello_Interj = mkInterj "こんにちは" ; lin helmet_N = mkN "ヘルメット" | mkN "兜" ; lin helmsman_N = mkN "舵手" ; lin help_N = mkN "助け" | mkN "手助け" | mkN "手伝い" | mkN "ヘルプ" ; @@ -10992,7 +10998,7 @@ lin plead_V = mkV "嘆願する" ; lin plead_V2 = mkV2 "嘆願する" ; lin plead_VS = mkVS "嘆願する" ; lin pleasant_A = mkA "愉快な" ; -lin please_Adv = ParadigmsJpn.mkAdv "...ください" | ParadigmsJpn.mkAdv "どうぞ" | ParadigmsJpn.mkAdv "お願いします" | ParadigmsJpn.mkAdv "をください" ; +lin please_Adv = ParadigmsJpn.mkAdv "ください" ; lin please_V = mkV "喜ばす" ; lin please_V2 = mkV2 "喜ばす" ; lin please_V2V = mkV2V "喜ばす" ; @@ -13732,7 +13738,7 @@ lin sorrel_N = mkN "薄赤褐色" ; lin sorrow_N = mkN "悲しみ" ; lin sorrowful_A = mkA "痛ましい" | mkA "悲しい" ; lin sorry_A = mkA "気の毒" | mkA "かわいそう" | mkA "残念" | mkA "遺憾" ; -lin sorry_Interj = mkInterj "すみません" | mkInterj "ごめんなさい" | mkInterj "失礼しました" | mkInterj "申し訳ありません" ; +lin sorry_Interj = mkInterj "ごめんなさい" ; lin sort_N = mkN "並べ替え" | mkN "ソート" ; lin sort_V = mkV "整列する" | mkV "ソートする" ; lin sort_V2 = mkV2 "整列する" | mkV2 "ソートする" ; @@ -14916,7 +14922,7 @@ lin thallium_N = mkN "タリウム" ; lin than_Subj = variants {} ; -- lin thank_V2 = mkV2 "感謝する" ; lin thankful_A = mkA "有難い" ; -lin thanks_Interj = mkInterj "ありがとう" | mkInterj "どうも" | mkInterj "サンキュー" ; +lin thanks_Interj = mkInterj "ありがとう" ; lin thanks_N = variants {} ; -- lin that_AdA = variants {} ; -- lin that_Quant = S.that_Quant ; diff --git a/lib/src/translator/DictionaryRus.gf b/lib/src/translator/DictionaryRus.gf index e9c5c2ec0..62ed6494b 100644 --- a/lib/src/translator/DictionaryRus.gf +++ b/lib/src/translator/DictionaryRus.gf @@ -8277,7 +8277,7 @@ lin by_and_large_Adv = variants {} ; lin by_election_N = variants {} ; lin by_means_of_Prep = variants {} ; lin by_virtue_of_Prep = variants {} ; -lin bye_Interj = variants {} ; +lin bye_Interj = ss "до свидания" ; lin bye_N = variants {} ; lin bye_bye_Interj = variants {} ; lin bye_law_N = variants {} ; @@ -10069,7 +10069,7 @@ lin cheering_N = variants {} ; lin cheerleader_N = variants {} ; lin cheerless_A = variants {} ; lin cheerlessness_N = variants {} ; -lin cheers_Interj = variants {} ; +lin cheers_Interj = ss "на здоровье" ; lin cheery_A = variants {} ; lin cheese_N = L.cheese_N ; lin cheeseboard_N = variants {} ; @@ -14549,7 +14549,7 @@ lin dame_N = variants {} ; lin dammar_N = variants {} ; lin dammit_Interj = variants {} ; lin damn_A = variants {} ; -lin damn_Interj = variants {} ; +lin damn_Interj = ss "чёрт" ; lin damn_N = variants {} ; lin damn_V2 = variants {} ; lin damnable_A = variants {} ; @@ -19879,7 +19879,7 @@ lin excursionist_N = variants {} ; lin excusable_A = variants {} ; lin excuse_N = mkN "отговорка" "отговорки" "отговорке" "отговорку" "отговоркою" "отговорке" "отговорками" "отговорки" "отговорок" "отговоркам" "отговорки" "отговорками" "отговорках" Fem Inanimate ; lin excuse_V2 = mkV2 (mkV Imperfective "извиняют" "извиняют" "извиняют" "извиняют" "извиняют" "извиняют" "извиняют" "извиняйте" "извинить") "" accusative ; -lin excuse_me_Interj = variants {} ; +lin excuse_me_Interj = ss "извините" ; lin execrable_A = variants {} ; lin execrate_V2 = mkV2 (mkV Imperfective "ненавижу" "ненавидишь" "ненавидит" "ненавидим" "ненавидите" "ненавидят" "ненавидим" "ненавидимых" "ненавидеть") "" accusative ; lin execration_N = variants {} ; @@ -24256,8 +24256,8 @@ lin gonorrhoea_N = mkN "гонорея" "гонореи" "гонорее" "го lin goo_N = mkN "ил" "ила" "илу" "ил" "илом" "иле" "илами" "илы" "илов" "илам" "илы" "илами" "илах" Masc Inanimate ; lin good_A = L.good_A ; lin good_N = mkN "толк" "толка" "толку" "толк" "толком" "толке" "толками" "толки" "толков" "толкам" "толки" "толками" "толках" Masc Inanimate | mkN "прок" "прока" "проку" "прок" "проком" "проке" "проком" "проком" "проком" "проком" "проком" "проком" "проком" Masc Inanimate ; -lin good_afternoon_Interj = variants {} ; -lin good_evening_Interj = variants {} ; +lin good_afternoon_Interj = ss "добрый день" ; +lin good_evening_Interj = ss "добрый вечер" ; lin good_fellowship_N = variants {} ; lin good_for_naught_A = variants {} ; lin good_for_naught_N = variants {} ; @@ -24265,15 +24265,14 @@ lin good_for_nothing_A = variants {} ; lin good_for_nothing_N = variants {} ; lin good_humoured_A = variants {} ; lin good_looking_A = mkA "красивый" ; -lin good_luck_Interj = variants {} ; -lin good_morning_Interj = variants {} ; +lin good_luck_Interj = ss "желаю удачи" ; +lin good_morning_Interj = ss "доброе утро" ; lin good_natured_A = variants {} ; lin good_neighbourliness_N = variants {} ; -lin good_night_Interj = variants {} ; +lin good_night_Interj = ss "спокойной ночи" ; lin good_tempered_A = variants {} ; lin good_time_A = variants {} ; -lin goodbye_Interj = variants {} ; -lin goodbye_N = variants {} ; +lin goodbye_Interj = ss "до свидания" ; lin goodish_A = variants {} ; lin goodly_A = variants {} ; lin goodness_N = variants {} ; @@ -26057,7 +26056,7 @@ lin hellgrammiate_N = variants {} ; lin hellhound_N = variants {} ; lin hellion_N = variants {} ; lin hellish_A = variants {} ; -lin hello_Interj = variants {} ; +lin hello_Interj = ss "привет" ; lin helm_N = mkN "штурвал" "штурвала" "штурвалу" "штурвал" "штурвалом" "штурвале" "штурвалом" "штурвалы" "штурвалов" "штурвалам" "штурвалы" "штурвалом" "штурвалах" Masc Inanimate ; lin helmet_N = variants {} ; lin helmeted_A = variants {} ; @@ -42652,6 +42651,7 @@ lin please_V = variants {} ; lin please_V2 = variants {} ; lin please_V2V = variants {} ; lin please_VV = variants {} ; +lin please_Voc = S.please_Voc ; lin pleased_A = variants {} ; lin pleaser_N = variants {} ; lin pleasing_N = variants {} ; @@ -53038,7 +53038,7 @@ lin sorrow_N = variants {} ; lin sorrow_V = variants {} ; lin sorrowful_A = variants {} ; lin sorry_A = variants {} ; -lin sorry_Interj = variants {} ; +lin sorry_Interj = ss "мне жаль" ; lin sort_N = variants {} ; lin sort_V = variants {} ; lin sort_V2 = variants {} ; @@ -57417,7 +57417,7 @@ lin thank_offering_N = variants {} ; lin thankful_A = mkA "признательный" ; lin thankfulness_N = variants {} ; lin thankless_A = variants {} ; -lin thanks_Interj = variants {} ; +lin thanks_Interj = ss "спасибо" ; lin thanks_N = mkN "благодарность" "благодарности" "благодарности" "благодарность" "благодарностью" "благодарности" "благодарностями" "благодарности" "благодарностей" "благодарностям" "благодарности" "благодарностями" "благодарностях" Fem Inanimate ; lin thanks_to_Prep = variants {} ; lin thanksgiving_N = variants {} ; diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index a629bed9a..5fd03905b 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -5465,7 +5465,7 @@ lin cheer_V2 = mkV2 (mkV "animarse") ; -- status=guess lin cheerer_N = mkN "aclamador" | mkN "alentador" | mkN "ovacionador" ; --UWN lin cheerful_A = mkA "animado" ; -- status=guess lin cheerleader_N = mkN "porrista" ; -- status=guess -lin cheers_Interj = mkInterj "nos vemos" ; -- status=guess +lin cheers_Interj = mkInterj "salud" ; -- status=guess lin cheery_A = mkA "agradable" | mkA "alegre" ; --UWN lin cheese_N = L.cheese_N ; lin cheeseburger_N = mkN "hamburguesa con queso" ; -- status=guess @@ -7862,7 +7862,7 @@ lin damascus_PN = mkPN "Damasco" ; -- status=guess src=geonames lin damask_N = mkN "damasco" ; -- status=guess lin dammit_Interj = mkInterj "mierda" | mkInterj "joder" | mkInterj "maldita sea" ; -- status=guess status=guess status=guess lin damn_A = mkA "maldito" | mkA "puto" ; -- status=guess status=guess -lin damn_Interj = mkInterj "maldición" | mkInterj "maldita sea" | mkInterj "diablos" ; -- status=guess status=guess status=guess +lin damn_Interj = mkInterj "joder" ; lin damn_N = mkN "maldito" ; -- status=guess lin damn_V2 = mkV2 (mkV "maldecir") | mkV2 (mkV "condenar") ; -- status=guess lin damnation_N = mkN "maldito" ; -- status=guess @@ -10733,6 +10733,7 @@ lin exculpatory_A = mkA "exculpatorio" ; --UWN lin excursion_N = mkN "excursión" feminine ; -- status=guess lin excuse_N = mkN "excusa" ; -- status=guess lin excuse_V2 = mkV2 (mkV "excusar") | mkV2 (mkV "perdonar") ; -- status=guess +lin excuse_me_Interj = mkInterj "perdón" ; lin executant_N = mkN "ejecutor" ; --UWN lin execute_V2 = mkV2 (mkV "ejecutar") ; -- status=guess lin execution_N = mkN "ejecución" feminine ; -- status=guess @@ -13051,7 +13052,12 @@ lin gonorrhea_N = mkN "gonorrea" ; -- status=guess lin goo_N = mkN "légamo" ; --UWN lin good_A = L.good_A ; lin good_N = mkN "bien" masculine ; -lin goodbye_Interj = mkInterj "adiós" | mkInterj "hasta luego" | mkInterj "hasta la vista" | mkInterj "hasta pronto" | mkInterj "nos vemos" ; -- status=guess status=guess status=guess status=guess status=guess +lin good_afternoon_Interj = mkInterj "buenos días" ; +lin good_evening_Interj = mkInterj "buenas tardes" ; +lin good_luck_Interj = mkInterj "buena suerte" ; +lin good_morning_Interj = mkInterj "buenos días" ; +lin good_night_Interj = mkInterj "buenas noches" ; +lin goodbye_Interj = mkInterj "hasta luego" | mkInterj "hasta la vista" | mkInterj "hasta pronto" | mkInterj "nos vemos" ; lin goodness_N = mkN "bondad" feminine ; -- status=guess lin goodwill_N = mkN "buena voluntad" ; -- status=guess lin goofy_A = mkA "tonto" ; -- status=guess @@ -14019,7 +14025,7 @@ lin helix_N = mkN "hélice" feminine ; -- status=guess lin hell_N = mkN "infierno" ; -- status=guess lin hellebore_N = mkN "helleborus" ; --UWN lin hellish_A = mkA "infernal" ; -- status=guess -lin hello_Interj = mkInterj "hola" | mkInterj "buenos días" | mkInterj "qué tal" ; -- status=guess +lin hello_Interj = mkInterj "hola" ; lin helm_N = mkN "timón" masculine ; -- status=guess lin helmet_N = mkN "casco" | mkN "yelmo" ; -- status=guess lin helminth_N = mkN "helminto" ; -- status=guess @@ -27490,7 +27496,7 @@ lin sorority_N = mkN "sororidad" feminine ; -- status=guess lin sorrow_N = mkN "tristeza" | mkN "aflicción" | mkN "infelicidad" | mkN "pesar" | mkN "dolor" masculine ; -- status=guess status=guess status=guess status=guess status=guess lin sorrowful_A = mkA "triste" ; -- status=guess lin sorry_A = mkA "lamentable" | mkA "pobre" ; -lin sorry_Interj = mkInterj "discúlpame" | mkInterj "perdóname" | mkInterj "lo siento" ; -- status=guess status=guess status=guess +lin sorry_Interj = mkInterj "disculpa" ; lin sort_N = mkN "ordenar" ; lin sort_V = mkV "ordenar" ; -- status=guess lin sort_V2 = mkV2 (mkV "ordenar") ; -- status=guess diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 84ea4bf09..c5a23068a 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -14468,7 +14468,7 @@ lin dame_N = variants {} ; -- status=guess lin dammar_N = mkN "damm" ; lin dammit_Interj = mkInterj "fan" ; -- status=guess lin damn_A = compoundA (regA "förbannad") ; -- comment=3 -lin damn_Interj = mkInterj "fan" ; -- status=guess +lin damn_Interj = mkInterj "fan" ; lin damn_N = mkN "jäkel" ; -- comment=5 lin damn_V2 = dirV2 (partV (mkV "dömer")"ut") ; -- status=guess lin damnable_A = variants {} ; -- status=guess @@ -24111,8 +24111,8 @@ lin gonorrhoea_N = mkN "gonorré" "gonorréer" ; -- SaldoWN lin goo_N = mkN "sentimentalitet" "sentimentaliteter" ; -- comment=4 lin good_A = mkA "god" "gott" "goda" "goda" "bättre" "bäst" "bästa" | mkA "bra" "bra" "bra" "goda" "bättre" "bäst" "bästa" ; lin good_N = mkN "nytta" ; -lin good_afternoon_Interj = mkInterj "god eftermiddag" ; -- status=guess -lin good_evening_Interj = mkInterj "god afron" ; -- status=guess +lin good_afternoon_Interj = mkInterj "god dag" | mkInterj "god eftermiddag" ; +lin good_evening_Interj = mkInterj "god afton" ; lin good_fellowship_N = mkN "god-gemenskap" ; -- src=google lin good_for_naught_A = variants {} ; -- status=guess lin good_for_naught_N = mkN "bra-för-inte" ; @@ -24120,14 +24120,14 @@ lin good_for_nothing_A = variants {} ; -- status=guess lin good_for_nothing_N = mkN "odugling" ; lin good_humoured_A = variants {} ; -- status=guess lin good_looking_A = variants {} ; -- status=guess -lin good_luck_Interj = mkInterj "lycka till" ; -- status=guess -lin good_morning_Interj = mkInterj "god morgon" ; -- status=guess +lin good_luck_Interj = mkInterj "lycka till" ; +lin good_morning_Interj = mkInterj "god morgon" ; lin good_natured_A = variants {} ; -- status=guess lin good_neighbourliness_N = variants {} ; -- status=guess -lin good_night_Interj = mkInterj "god natt" ; -- status=guess +lin good_night_Interj = mkInterj "god natt" ; lin good_tempered_A = variants {} ; -- status=guess lin good_time_A = variants {} ; -- status=guess -lin goodbye_Interj = mkInterj "adjö" | mkInterj "hej då" | mkInterj "farväl" ; -- status=guess +lin goodbye_Interj = mkInterj "hej då" ; lin goodish_A = variants {} ; -- status=guess lin goodly_A = mkA "behaglig" ; -- comment=2 lin goodness_N = mkN "vänlighet" ; -- comment=6 @@ -25888,7 +25888,7 @@ lin hellgrammiate_N = variants {} ; -- status=guess lin hellhound_N = variants {} ; -- status=guess lin hellion_N = mkN "buse" utrum ; -- comment=2 lin hellish_A = variants {} ; -- status=guess -lin hello_Interj = mkInterj "hej" | mkInterj "hallå" ; -- status=guess +lin hello_Interj = mkInterj "hallå" ; -- status=guess lin helm_N = mkN "roder" neutrum ; -- comment=2 lin helmet_N = mkN "hjälm" ; -- SaldoWN lin helmeted_A = variants {} ; -- status=guess @@ -26169,13 +26169,13 @@ lin hexangular_A = variants {} ; -- status=guess lin hexapod_N = mkN "sexbening" ; -- status=guess lin hexed_A = variants {} ; -- status=guess lin hexestrol_N = variants {} ; -- status=guess -lin hexham_PN = mkPN "Hexham" neutrum ; -- src=geonames status=guess +lin hexham_PN = mkPN "Hexham" neutrum ; lin hexose_N = mkN "hexos" ; -- src=google -lin hey_Interj = mkInterj "hej" | mkInterj "hallå" ; -- status=guess +lin hey_Interj = mkInterj "hejsan" ; lin heyday_N = mkN "storhetstid" "storhetstider" ; -- status=guess lin heysham_PN = mkPN "Heysham" ; -- src=eng status=guess -lin heywood_PN = mkPN "Heywood" neutrum ; -- src=geonames status=guess -lin hi_Interj = mkInterj "hallå" | mkInterj "hej" | mkInterj "hejsan" ; -- status=guess status=guess status=guess +lin heywood_PN = mkPN "Heywood" neutrum ; +lin hi_Interj = mkInterj "hej" ; lin hi_fi_A = variants {} ; -- status=guess lin hi_fi_N = variants {} ; -- status=guess lin hiatus_N = mkN "uppehåll" neutrum ; -- comment=5 @@ -42395,11 +42395,12 @@ lin pleasance_N = variants {} ; -- status=guess lin pleasant_A = mkA "angenäm" ; -- SaldoWN lin pleasantness_N = mkN "trivsamhet" "trivsamheter" ; -- status=guess lin pleasantry_N = variants {} ; -- status=guess -lin please_Adv = mkAdv "snälla" ; +lin please_Adv = mkAdv "var så god" ; lin please_V = mkV "behagar" ; -- comment=6 lin please_V2 = mkV2 (mkV "behagar") | mkV2 (mkV "glädja" "gladde" "glatt") | mkV2 (mkV "tillfredsställer") ; -- status=guess lin please_V2V = mkV2V (mkV "behagar") | mkV2V (mkV "glädja" "gladde" "glatt") | mkV2V (mkV "tillfredsställer") ; -- status=guess lin please_VV = mkVV (mkV "behagar") | mkVV (mkV "glädja" "gladde" "glatt") | mkVV (mkV "tillfredsställer") ; -- status=guess +lin please_Voc = S.please_Voc ; lin pleased_A = mkA "nöjd" "nöjt" ; -- status=guess lin pleaser_N = variants {} ; -- status=guess lin pleasing_N = mkN "förtjusande" ; -- comment=2 @@ -52673,7 +52674,7 @@ lin sorrow_N = mkN "sorg" "sorger" ; -- comment=2 lin sorrow_V = variants {} ; -- status=guess lin sorrowful_A = mkA "sorgsen" "sorgset" ; -- comment=2 lin sorry_A = mkA "ledsen" "ledset" ; -lin sorry_Interj = mkInterj "förlåt" ; -- status=guess +lin sorry_Interj = mkInterj "förlåt" ; lin sort_N = mkN "sort" "sorter" ; lin sort_V = mkV "sorterar" ; -- comment=2 lin sort_V2 = dirV2 (partV (mkV "ordnar")"om") ; -- status=guess diff --git a/lib/src/translator/DictionaryTha.gf b/lib/src/translator/DictionaryTha.gf index ef68ced14..2a5b4fa69 100644 --- a/lib/src/translator/DictionaryTha.gf +++ b/lib/src/translator/DictionaryTha.gf @@ -5675,7 +5675,7 @@ lin by8agent_Prep = ss [] ; lin by8means_Prep = ss "ผ่าน" ; lin by_Adv = mkAdv "ผ่าน" | mkAdv "สำรอง" | mkAdv "ก่อนเวลาที่กําหนด" ; -- src=panlex lin by_Prep = mkPrep "ของ" | mkPrep "จาก" | mkPrep "ตาม" | mkPrep "ต่อ" | mkPrep "ทาง" | mkPrep "ที่" | mkPrep "ทุก" | mkPrep "โดย" | mkPrep "ใช้" | mkPrep "ข้าง" | mkPrep "ช่วง" | mkPrep "ด้วย" | mkPrep "ทีละ" | mkPrep "ผ่าน" | mkPrep "ใกล้" | mkPrep "อาศัย" | mkPrep "ไปทาง" | mkPrep "ไปยัง" | mkPrep "ติดตัว" | mkPrep "ผ่านไป" | mkPrep "ระหว่าง" | mkPrep "ผ่านข้าง" | mkPrep "หันไปทาง" | mkPrep "อยู่ข้าง" | mkPrep "เป็นไปตาม" | mkPrep "โดยประมาณ" | mkPrep "เป็นผลเนื่องจาก" ; -- src=panlex -lin bye_Interj = mkInterj "บ๊ายบาย" | mkInterj "คําลาก่อน" | mkInterj "เสียงร้องอําลา" ; -- src=panlex +lin bye_Interj = mkInterj (thword "ลา" "ก่อน") ; lin bye_N = mkN "ตัวสํารอง" | mkN "สิ่งสํารอง" | mkN "สิ่งที่เป็นรอง" | mkN "การผ่านข้ามไปเล่นในรอบต่อไป" | mkN "การผ่านเข้าไปเล่นในรอบต่อไป" ; -- src=panlex lin bygone_A = mkA "อดีต" | mkA "แต่ก่อน" | mkA "ซึ่งผ่านไปแล้ว" | mkA "ซึ่งเกิดขึ้นนานมาแล้ว" ; -- src=panlex lin bygone_N = mkN "สิ่งที่ผ่านไป" | mkN "อดีต" | mkN "สิ่งที่ผ่านไปแล้ว" ; -- src=panlex @@ -6894,14 +6894,14 @@ lin cheep_N = mkN "เสียงจิ๊บๆ" | mkN "เสียงร้ lin cheep_V = mkV "ร้องจิ๊บๆ" | mkV "ร้องเสียงแหลมสั้นๆ" | mkV "ทําเสียงร้องแหลมสั้นๆ" ; -- src=panlex lin cheer_N = mkN "ความเบิกบาน" | mkN "เสียงเชียร์" | mkN "เสียงโห่ร้อง" | mkN "การส่งเสียงเชียร์" | mkN "ความสดชื่นรื่นเริง" ; -- src=panlex lin cheer_V = mkV "เชียร์" | mkV "โห่ร้อง" | mkV "ให้กำลังใจ" | mkV "ทำให้ใจกล้า" | mkV "ส่งเสียงเชียร์" | mkV "ส่งเสียงให้กำลังใจ" | mkV "เชียร์" | mkV "ให้กําลังใจ" | mkV "ทําให้สดชื่น" | mkV "รื่นเริงขึ้น" | mkV "ทําให้รื่นเริง" | mkV "มีกําลังใจขึ้น" | mkV "ทําให้มีกําลังใจ" | mkV "เปล่งเสียงแสดงความยินดี" ; -- src=panlex -lin cheer_V2 = mkV2 "เชียร์" ; ---- | mkV "โห่ร้อง" | mkV "ให้กำลังใจ" | mkV "ทำให้ใจกล้า" | mkV "ส่งเสียงเชียร์" | mkV "ส่งเสียงให้กำลังใจ" | mkV "เชียร์" | mkV "ให้กําลังใจ" | mkV "ทําให้สดชื่น" | mkV "รื่นเริงขึ้น" | mkV "ทําให้รื่นเริง" | mkV "มีกําลังใจขึ้น" | mkV "ทําให้มีกําลังใจ" | mkV "เปล่งเสียงแสดงความยินดี" ; -- src=panlex +lin cheer_V2 = mkV2 "เชียร์" ; lin cheerer_N = mkN "คนเชียร์" | mkN "กองเชียร์" ; -- src=panlex lin cheerful_A = mkA "สดใส" | mkA "สดชื่น" | mkA "ร่าเริง" | mkA "แช่มชื่น" | mkA "ที่ทําให้รู้สึกสดชื่น" | mkA "มีความสุขและมองโลกในแง่ดี" ; -- src=panlex lin cheerfulness_N = mkN "ความเบิกบาน" | mkN "ความสดชื่น" | mkN "ความแจ่มใส" ; -- src=panlex lin cheering_N = mkN "การส่งเสียงเชียร์" ; -- src=panlex lin cheerleader_N = mkN "ผู้นำเชียร์" | mkN "เชียร์ลีดเดอร์" | mkN "คนที่ส่งเสียงเชียร์" | mkN "ประธานเชียร์" | mkN "เชียร์ลีดเดอร์" | mkN "คนที่เป็นผู้นําเชียร์" ; -- src=panlex lin cheerless_A = mkA "หดหู่" | mkA "หดหู่ใจ" | mkA "เศร้าซึม" | mkA "ไม่แจ่มใส" | mkA "ไม่ร่าเริง" | mkA "ไม่รื่นเริง" | mkA "ไม่มีเสียงโห่ร้องสนับสนุน" ; -- src=panlex -lin cheers_Interj = mkInterj "โชคดี" | mkInterj "ขอบคุณ" | mkInterj "ลาก่อน" | mkInterj "คํากล่าวเมื่อชนแก้วกันหมายถึงขอให้มีสุขภาพดี" ; -- src=panlex +lin cheers_Interj = mkInterj (thword "ไช" "โย") ; lin cheery_A = mkA "สดชื่น" | mkA "แจ่มใส" | mkA "ร่าเริง" | mkA "เป็นสุข" | mkA "สนุกสนาน" | mkA "ที่มีความสุข" ; -- src=panlex lin cheese_N = mkN (thword "เนย" "แข็ง") "ก้อน" ; lin cheeseboard_N = mkN "ถาดชีส" ; -- src=panlex @@ -10064,7 +10064,7 @@ lin damask_N = mkN "ผ้าดามัสก์" ; -- src=panlex lin dame_N = mkN "น้องนาง" | mkN "สาวน้อย" | mkN "สุภาพสตรี" | mkN "คุณผู้หญิง" | mkN "นาง" | mkN "สตรี" | mkN "มาดาม" | mkN "คุณนาย" | mkN "คุณหญิง" | mkN "ผู้หญิง" | mkN "แม่บ้าน" | mkN "ผู้สูงศักดิ์" ; -- src=panlex lin dammar_N = mkN "ชันยาเรือ" | mkN "ชันยาเรือ" ; -- src=panlex lin damn_A = mkA "คําที่ใช้เน้นเพื่อแสดงความรู้สึกหงุดหงิดรําคาญ" ; -- src=panlex -lin damn_Interj = mkInterj "ยี้" | mkInterj "อี๊" | mkInterj "คําอุทานแสดงความรําคาญ" | mkInterj "คําสบถที่ใช้เวลาที่รู้สึกหงุดหงิดรําคาญ" ; -- src=panlex +lin damn_Interj = mkInterj (thword "ชิบ" "หาย") ; lin damn_N = mkN "สิ่งเล็กๆน้อยๆ" ; -- src=panlex lin damnable_A = mkA "อัปรีย์" | mkA "น่าสาปแช่ง" | mkA "น่ารังเกียจ" | mkA "น่าเบื่อหน่าย" ; -- src=panlex lin damnation_N = mkN "การสาป" | mkN "คําสบถ" | mkN "การสาปแช่ง" | mkN "คําสาปแช่ง" ; -- src=panlex @@ -13601,6 +13601,7 @@ lin excursion_N = mkN "การวนไปวนมา" | mkN "การท่ lin excursionist_N = mkN "ผู้เที่ยวชม" | mkN "ผู้เยี่ยมชม" ; -- src=panlex lin excusable_A = mkA "แก้ตัวได้" | mkA "ซึ่งพอให้อภัยได้" ; -- src=panlex lin excuse_N = mkN "ข้อแก้ตัว" | mkN "การหาข้อแก้ตัว" | mkN "ตัวอย่างที่แย่" | mkN "ตัวอย่างที่ไม่ดี" | mkN "ข้ออ้าง" | mkN "ข้อแก้ตัว" | mkN "คํากล่าวอ้าง" ; -- src=panlex +lin excuse_me_Interj = mkInterj (thword "ขอ" "โทษ") ; lin execrable_A = mkA "เลวมาก" | mkA "น่าชังที่สุด" | mkA "เลวทรามที่สุด" ; -- src=panlex lin execration_N = mkN "คำสาบแช่ง" | mkN "การสาปแช่ง" | mkN "ความชิงชัง" | mkN "ความรังเกียจ" | mkN "ความเกลียดชัง" | mkN "การแช่ง" | mkN "การสาปแช่ง" | mkN "การด่าว่าอย่างรุนแรง" ; -- src=panlex lin executant_N = mkN "ผู้แสดง" | mkN "ผู้กระทํา" | mkN "ผู้บริหาร" | mkN "ผู้ปฎิบัติ" | mkN "ผู้ดําเนินการ" ; -- src=panlex @@ -16672,7 +16673,12 @@ lin gonorrhoea_N = mkN "โรคหนองใน" ; -- src=panlex lin goo_N = mkN "สารเหนียวหนืด" | mkN "กาว" | mkN "สารที่หนา" | mkN "แป้งเปียก" | mkN "สารที่เหนี่ยว" | mkN "คําพูดที่ไพเราะ" ; -- src=panlex lin good_A = mkA "ดี" | {-pan-} 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 good_N = mkN "ความดี" | mkN "สินค้า" | mkN "สิ่งดี" | mkN "ข้าวของ" | mkN "ของซื้อขาย" | mkN "คุณประโยชน์" | mkN "ของซื้อของขาย" | mkN "ความดี" | mkN "คุณธรรม" | mkN "ความดีงาม" | mkN "ผลประโยชน์" ; -- src=panlex -lin goodbye_N = mkN "ลาก่อน" | mkN "คํากล่าวอําลา" ; -- src=panlex +lin good_afternoon_Interj = mkInterj (thword "สวัส" "ดี") ; +lin good_evening_Interj = mkInterj (thword "สวัส" "ดี") ; +lin good_luck_Interj = mkInterj (thword "โชค" "ดี" "นะ") ; +lin good_morning_Interj = mkInterj (thword "สวัส" "ดี") ; +lin good_night_Interj = mkInterj (thword "รา" "ตรี" "สวัส" "ดิ์") ; +lin goodbye_Interj = mkInterj (thword "ลา" "ก่อน") ; lin goodly_A = mkA "ดี" | mkA "มาก" | mkA "หล่อ" | mkA "ใหญ่" | mkA "มีขนาดใหญ่" | mkA "มีคุณภาพดี" | mkA "มีหน้าตาดี" | mkA "ซึ่งมีหน้าตาสวย" | mkA "มีเป็นจํานวนมาก" ; -- src=panlex lin goodness_N = mkN "ความดี" | mkN "สิ่งดี" | mkN "คุณประโยชน์" | mkN "ความดี" | mkN "ความดีงาม" | mkN "คุณงามความดี" | mkN "ความมีคุณธรรม" | mkN "ส่วนที่ดีที่สุด" ; -- src=panlex lin goods_N = mkN "สินค้า" | mkN "สิ่งของ" ; -- src=panlex @@ -17948,6 +17954,7 @@ lin hellfire_N = mkN "ไฟนรก" | mkN "ไฟนรก" | mkN "สิ่ lin hellhound_N = mkN "อสูรกาย" | mkN "เซอร์เบอรัส" | mkN "คนชั่งช้า" | mkN "ปีศาจร้าย" | mkN "สุนัขเฝ้าบ้าน" ; -- src=panlex lin hellion_N = mkN "เด็กนรก" | mkN "เด็กเปรต" | mkN "เด็กอันธพาล" | mkN "จอมยุ่ง" | mkN "คนอันธพาล" ; -- src=panlex lin hellish_A = mkA "ร้ายกาจ" | mkA "อัปรีย์" | mkA "ชั่วร้าย" | mkA "เหมือนนรก" | mkA "โหดเหี้ยม" | mkA "น่ารังเกียจ" ; -- src=panlex +lin hello_Interj = mkInterj (thword "สวัส" "ดี") ; lin helm_N = mkN "หางเสือ" | mkN "ตำแหน่งผู้นำ" | mkN "พวงมาลัยเรือ" | mkN "พวงมาลัยเรือ" | mkN "ตําแหน่งผู้นํา" | mkN "ตําแหน่งผู้ควบคุม" ; -- src=panlex lin helmet_N = mkN "หมวกเกราะ" | mkN "หมวกนิรภัย" | mkN "หมวก" | mkN "หมวกนิรภัย" | mkN "หมวกกันน็อก" ; -- src=panlex lin helmetflower_N = mkN "ต้นสกูลแคป" | mkN "ต้นเฮลเมตฟลาวเวอร์" ; -- src=panlex @@ -28900,7 +28907,7 @@ lin pleasance_N = mkN "ความสุข" ; -- src=panlex lin pleasant_A = mkA "ตลก" | mkA "พอใจ" | mkA "ถูกใจ" | mkA "น่าคบ" | mkA "สุภาพ" | mkA "สบายใจ" | mkA "น่าคบหา" | mkA "น่าพอใจ" | mkA "น่าสบาย" | mkA "น่าอยู่" | mkA "ร่าเริง" | mkA "น่ายินดี" | mkA "สนุกสนาน" | mkA "เป็นมิตร" | mkA "เรียบร้อย" | mkA "เพลิดเพลิน" | mkA "ให้ความพอใจ" | mkA "มีมิตรไมตรีจิต" | mkA "สุภาพเรียบร้อย" | mkA "ซึ่งให้ความพอใจ" | mkA "ซึ่งให้ความเพลิดเพลิน" ; -- src=panlex lin pleasantness_N = mkN "ความสบาย" | mkN "ความน่ารัก" | mkN "ความอภิรมย์" | mkN "ความรื่นรมย์" | mkN "ความอ่อนหวาน" ; -- src=panlex lin pleasantry_N = mkN "การตลก" | mkN "ความตลก" | mkN "คําพูดตลก" | mkN "การล้อเล่น" | mkN "การหยอกล้อ" | mkN "คําล้อเล่น" | mkN "คําพูดขบขัน" | mkN "คําพูดล้อเล่น" | mkN "พฤติกรรมที่ตลก" | mkN "พฤติกรรมที่มีอารมร์ ขัน" | mkN "พฤติกรรมที่มีอารมณ์ขัน" ; -- src=panlex -lin please_Adv = mkAdv "ได้โปรด" | mkAdv "โปรด" | mkAdv "กรุณา" ; -- src=panlex +lin please_Adv = mkAdv "นะ" ; lin please_V = mkV "พอใจ" | mkV "ทำให้พอใจ" | mkV "สร้างความพอใจ" | mkV "ให้ความพึงพอใจ" | mkV "ชอบ" | mkV "พอใจ" | mkV "ต้องการ" | mkV "ทําให้พอใจ" | mkV "พึงปรารถนา" | mkV "ทําให้ถูกใจ" | mkV "ให้ความพอใจ" | mkV "ให้ความเพลิดเพลิน" ; -- src=panlex lin please_V2 = mkV2 "พอใจ" ; ---- | mkV "ทำให้พอใจ" | mkV "สร้างความพอใจ" | mkV "ให้ความพึงพอใจ" | mkV "ชอบ" | mkV "พอใจ" | mkV "ต้องการ" | mkV "ทําให้พอใจ" | mkV "พึงปรารถนา" | mkV "ทําให้ถูกใจ" | mkV "ให้ความพอใจ" | mkV "ให้ความเพลิดเพลิน" ; -- src=panlex lin please_V2V = mmkV2V "พอใจ" ; ---- | mkV "ทำให้พอใจ" | mkV "สร้างความพอใจ" | mkV "ให้ความพึงพอใจ" | mkV "ชอบ" | mkV "พอใจ" | mkV "ต้องการ" | mkV "ทําให้พอใจ" | mkV "พึงปรารถนา" | mkV "ทําให้ถูกใจ" | mkV "ให้ความพอใจ" | mkV "ให้ความเพลิดเพลิน" ; -- src=panlex @@ -35975,7 +35982,7 @@ lin sorrow_N = mkN "ความเศร้า" | mkN "ความเศร้ lin sorrow_V = mkV "เศร้าโศก" | mkV "โศกเศร้า" | mkV "เศร้าโศกเสียใจ" | mkV "เสียใจ" | mkV "เศร้าใจ" ; -- src=panlex lin sorrowful_A = mkA "โศกเศร้า" | mkA "เสียใจ" | mkA "เศร้าใจ" | mkA "เศร้าโศก" | mkA "โศกเศร้า" | mkA "ระทมทุกข์" | mkA "เสียใจมาก" ; -- src=panlex lin sorry_A = mkA "แสดงความเสียใจ" | mkA "เสียใจ" | mkA "เศร้าใจ" | mkA "ที่ขอโทษ" | mkA "น่าสงสาร" | mkA "น่าสมเพช" | mkA "ที่รู้สึกผิด" ; -- src=panlex -lin sorry_Interj = mkInterj "ขอโทษ" ; -- src=panlex +lin sorry_Interj = mkInterj (thword "ขอ" "โทษ") ; lin sort_N = mkN "แบบ" | mkN "ชนิด" | mkN "ฟอร์ม" | mkN "ประเภท" | mkN "รูปแบบ" | mkN "แบบ" | mkN "ชนิด" | mkN "จําพวก" | mkN "ท่าทาง" | mkN "ประเภท" | mkN "ลักษณะ" | mkN "ผสมผสาน" | mkN "ตัวอย่าง" | mkN "เหมาะกับ" | mkN "ผูกมิตรกับ" | mkN "การแบ่งชนิด" | mkN "การจัดประเภท" ; -- src=panlex lin sort_V = mkV "จัด" | mkV "จำแนก" | mkV "สกรีน" | mkV "แยกประเภท" | mkV "จัดเข้าประเภท" ; -- src=panlex lin sort_V2 = mkV2 "จัด" ; ---- | mkV "จำแนก" | mkV "สกรีน" | mkV "แยกประเภท" | mkV "จัดเข้าประเภท" ; -- src=panlex @@ -38950,6 +38957,7 @@ lin thankful_A = mkA "ซึ่งสำนึกในบุญคุณ" | mkA lin thankfulness_N = mkN "ความสำนึกบุญคุณ" | mkN "ความรู้สึกขอบคุณ" ; -- src=panlex lin thankless_A = mkA "อกตัญญู" | mkA "ไม่ซาบซึ้งใจ" | mkA "อกตัญญู" | mkA "ไม่ขอบคุณ" | mkA "ไม่เห็นคุณค่า" | mkA "ที่ไม่น่าชื่นชม" | mkA "ที่ไม่รู้สึกขอบคุณ" ; -- src=panlex lin thanks_N = mkN "การแสดงความขอบคุณ" | mkN "การขอบคุณ" ; -- src=panlex +lin thanks_Interj = mkInterj (thword "ขอบ" "คุณ") ; lin thanksgiving_N = mkN "การสวดขอบคุณ" | mkN "การขอบคุณพระเจ้า" | mkN "การขอบใจ" | mkN "การขอบคุณ" | mkN "การแสดงความขอบคุณ" ; -- src=panlex lin that_Quant = demDet nan_s ; lin that_Subj = ss conjThat ;