GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-20 10:19:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merry Christmas and other Dict updates

Browse Source
This commit is contained in:
aarne
2014-01-17 14:42:22 +00:00
parent 29d1b58ff5
commit 681020b371
11 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/src/bulgarian/DictEngBul.gf
View File

@@ -33527,6 +33527,7 @@ lin meronymy_N = variants {};
lin merozoite_N = variants {};
lin merriment_N = mkN072 "веселие"; ----
lin merry_A = mkA076 "весел"; ----
lin merry_christmas_Interj = ss "Весела Коледа" ;
lin merry_go_round_N = variants {};
lin merrymaker_N = variants {};
lin merrymaking_N = variants {mkN007 "джумбуш"; mkN072 "увеселение"}; ----

1
lib/src/chinese/DictEngChi.gf
View File

@@ -17077,5 +17077,6 @@ advert_N = mkN "广告"; -- 1
across_Adv = mkAdv "横过"; -- 1
absolve_V2 = mkV2 "免除"; -- 1
merry_christmas_Interj = mkInterj "圣诞节快乐" ;
}

2
lib/src/chinese/ParseChi.gf
View File

@@ -36,7 +36,7 @@ flags
lin
CompAP = G.CompAP | E.CompBareAP ; -- he is good | he good
AdvVP vp adv = G.AdvVP vp adv | E.TopicAdvVP vp adv ; -- he *today* here sleeps | *today* he here sleeps
AdvVP vp adv = E.TopicAdvVP vp adv | G.AdvVP vp adv ; -- he *today* here sleeps | *today* he here sleeps
QuestCl cl = G.QuestCl cl | E.QuestRepV cl ; -- he comes 'ma' | he come not come

1
lib/src/english/DictEng.gf
View File

@@ -33544,6 +33544,7 @@ lin meronymy_N = mkN "meronymy" ;
lin merozoite_N = mkN "merozoite" ;
lin merriment_N = mkN "merriment" ;
lin merry_A = mkA "merry" "merrier";
lin merry_christmas_Interj = mkInterj "Merry Christmas" ;
lin merry_go_round_N = mkN "merry-go-round" "merry-go-rounds";
lin merrymaker_N = mkN "merrymaker" "merrymakers";
lin merrymaking_N = mkN "merrymaking" ;

1
lib/src/english/DictEngAbs.gf
View File

@@ -33486,6 +33486,7 @@ fun meronymy_N : N;
fun merozoite_N : N;
fun merriment_N : N;
fun merry_A : A;
fun merry_christmas_Interj : Interj ;
fun merry_go_round_N : N;
fun merrymaker_N : N;
fun merrymaking_N : N;

1
lib/src/finnish/DictEngFin.gf
View File

@@ -27783,6 +27783,7 @@ meronymy_N = mkWN (compoundN "osakäsitte" (k40 "isyys")) "merkityksen" ; --UNCH
merozoite_N = mkWN "merotsoiitti" ; --UNCHK
merriment_N = mkWN (k40 "hauskuus") ; --UNCHK
merry_A = mkWA (k15 "nopea") ; --UNCHK
merry_christmas_Interj = mkInterj "hyvää joulua" ;
merrymaker_N = mkWN (k12 "juhlija") ; --UNCHK
mesa_N = mkWN "Mesa" ; --UNCHK
mesalliance_N = mkWN (compoundN "avio" (k1A "liitto")) "epäsäätyinen" ; --UNCHK

1
lib/src/french/DictEngFre.gf
View File

@@ -11139,6 +11139,7 @@ meritocracy_N = mkN "méritocratie" feminine;
mermaid_N = mkN "sirène" feminine;
meronym_N = mkN "méronyme" masculine;
merry_A = mkA "joyeux";
merry_christmas_Interj = mkInterj "joyeux noël" ;
merry_go_round_N = mkN "carrousel" masculine;
mesentery_N = mkN "mésentère";
mesh_N = mkN "engrenage" masculine | mkN "maillage" masculine | mkN "maille" feminine;

1
lib/src/german/DictEngGer.gf
View File

@@ -22932,6 +22932,7 @@ lin merman_N = variants {};
lin merrily_Adv = variants {};
lin merriment_N = variants {};
lin merry_A = mk3A "fröhlich" "fröhlicher" "fröhlichste";
lin merry_christmas_Interj = mkInterj "fröhliche Weihnachten" ;
lin merry_go_round_N = variants {};
lin merrymaker_N = variants {};
lin merrymaking_N = variants {};

1
lib/src/hindi/DictEngHin.gf
View File

@@ -16450,6 +16450,7 @@ lin meritorious_A = mkA "सराहनीय" ; -- old -- old
lin mermaid_N = mkN "जलपरी" ; -- old -- old
lin merriment_N = mkN "आनन्ध" ; -- old -- old
lin merry_A = mkA "जिं़दादिल" ; -- old -- old
lin merry_christmas_Interj = mkInterj "मेरी क्रिसमस" ;
lin merrymaker_N = mkN "गुलछर्रे उड़ाने वाला" ; -- old -- old
lin merrymaking_N = mkN "मस्ती" ; -- old -- old
lin mesa_N = mkN "चपटे शिखर वाली पहाड़ी" ; -- old

4
lib/src/swedish/ConstructionSwe.gf
View File

@@ -9,10 +9,10 @@ lin
thirsty_VP = mkVP (mkA "törstig") ;
has_age_VP card = mkVP (lin AP (mkAP (lin AdA (mkUtt (mkNP <lin Card card : Card> L.year_N))) L.old_A)) ;
have_name_Cl x y = mkCl (lin NP x) (mkV2 (mkV "heter" "hette" "hetat")) (lin NP y) ;
have_name_Cl x y = mkCl (lin NP x) (mkV2 (mkV "heta" "hette" "hetat")) (lin NP y) ;
married_Cl x y = mkCl (lin NP x) L.married_A2 (lin NP y) | mkCl (mkNP and_Conj (lin NP x) (lin NP y)) (mkA "gift") ;
what_name_QCl x = mkQCl whatSg_IP (lin NP x) (mkV2 (mkV "heter")) ;
what_name_QCl x = mkQCl whatSg_IP (lin NP x) (mkV2 (mkV "heta" "hette" "hetat")) ;
how_old_QCl x = mkQCl (E.ICompAP (mkAP L.old_A)) (lin NP x) ;
how_far_QCl x = mkQCl (E.IAdvAdv L.far_Adv) (mkCl (mkVP (SyntaxSwe.mkAdv to_Prep (lin NP x)))) ;

39
lib/src/swedish/DictEngSwe.gf
View File

@@ -1358,7 +1358,7 @@ lin aim_VV = mkVV (mkV "siktar"); -- status=guess, src=wikt
lin aim_at_V2 = dirV2 (partV (mkV "riktar")"till"); -- comment=2
lin aimless_A = mkA "planlös";
lin aioli_N = mkN "aioli"; -- status=guess
lin air_N = mkN "torka"; -- comment=12
lin air_N = mkN "luft" "lufter" ;
lin air_V = mkV "vädrar"; -- comment=6
lin air_V2 = dirV2 (partV (mkV "torkar")"ut"); -- comment=4
lin air_bladder_N = variants {};
@@ -5754,7 +5754,7 @@ lin bespoke_A = mkA "måttbeställd" "måttbeställt";
lin besprent_A = variants {};
lin bess_PN = variants {};
lin bessie_PN = variants {};
lin best_A = mkA "bra" "bra" "bra" "bättre" "bäst";
lin best_A = mkA "bäst" ;
lin best_Adv = mkAdv "bäst"; -- status=guess
lin best_N = mkN "bästa"; -- status=guess
lin best_V2 = mkV2 (mkV "besegrar"); -- status=guess, src=wikt
@@ -19801,10 +19801,10 @@ lin evasiveness_N = variants {};
lin eve_N = mkN "helgdagsafton" "helgdagsaftonen" "helgdagsaftnar" "helgdagsaftnarna"; -- comment=2
lin eve_PN = variants {};
lin evelyn_PN = variants {};
lin even_A = mkA "kvitt"; -- comment=3
lin even_AdA = variants {};
lin even_AdV = variants {};
lin even_Adv = mkAdv "ännu"; -- comment=4
lin even_A = mkA "jämn" ; --- mkA "kvitt"; -- comment=3
lin even_AdA = mkAdA "till och med" ;
lin even_AdV = mkAdV "till och med" ;
lin even_Adv = mkAdv "till och med" ;
lin even_N = mkN "kväll"; -- comment=3
lin even_V2 = mkV2 (mkV "jämna") | mkV2 (mkV (mkV "jämna") "ut") | mkV2 (mkV (mkV "plana") "ut") | mkV2 (mkV (mkV "platta") "till"); -- status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt status=guess, src=wikt
lin even_handed_A = variants {};
@@ -30539,20 +30539,20 @@ lin jury_box_N = variants {};
lin jury_mast_N = variants {};
lin jury_rigge_V2 = variants {};
lin juryman_N = variants {};
lin just_A = compoundA (regA "välgrundad"); -- comment=22
lin just_AdV = variants {};
lin just_Adv = mkAdv "rätt"; -- comment=13
lin just_Predet = variants {};
lin just_A = mkA "rättvis" ;
lin just_AdV = mkAdV "bara" ;
lin just_Adv = mkAdv "precis";
lin just_Predet = M.mkPredet "bara" "bara" "bara" ;
lin justice_N = mkN "domare" utrum; -- comment=10
lin justiciar_N = variants {};
lin justiciary_N = variants {};
lin justifiable_A = compoundA (regA "berättigad");
lin justification_N = mkN "berättigande";
lin justificative_A = variants {};
lin justify_V2 = variants {};
lin justify_VV = variants {};
lin justify_V2 = mkV2 "berättiga" ;
lin justify_VV = mkVV (mkV "berättiga") ;
lin justin_PN = variants {};
lin justness_N = variants {};
lin justness_N = mkN "rättfärdighet" "rättfärdigheter" ;
lin jut_V = variants {};
lin jute_N = variants {};
lin juvenescence_N = variants {};
@@ -34955,6 +34955,7 @@ lin meronymy_N = mkN "meronymi" "meronymier"; -- status=guess
lin merozoite_N = variants {};
lin merriment_N = variants {};
lin merry_A = mkA "uppsluppen" "uppsluppet"; -- comment=5
lin merry_christmas_Interj = mkInterj "god jul" ;
lin merry_go_round_N = variants {};
lin merrymaker_N = variants {};
lin merrymaking_N = variants {};
@@ -55608,7 +55609,7 @@ lin succulent_N = variants {};
lin succumb_V = mkV "dö" "dog" "dött";
lin succussion_N = variants {};
lin such_Adv = mkAdv "verkligen";
lin such_Predet = M.mkPredet "sådan" "sådant" "spdana"; --
lin such_Predet = M.mkPredet "sådan" "sådant" "sådana"; --
lin such_as_Prep = variants {};
lin suchlike_A = variants {};
lin suchow_PN = variants {};
@@ -64143,12 +64144,12 @@ lin wisecrack_V = variants {};
lin wisent_N = (mkN "visent" "visenter") | mkN "europeisk bison"; -- status=guess status=guess
lin wish_N = mkN "önskning";
lin wish_V = mkV "önskar"; -- comment=3
lin wish_V2 = mkV2 (mkV "tillönska"); -- status=guess, src=wikt
lin wish_V2V = mkV2V (mkV "tillönska"); -- status=guess, src=wikt
lin wish_VS = mkVS (mkV "tillönska"); -- status=guess, src=wikt
lin wish_VV = mkVV (mkV "tillönska"); -- status=guess, src=wikt
lin wish_V2 = mkV2 (mkV "önska");
lin wish_V2V = mkV2V (mkV "önska");
lin wish_VS = mkVS (mkV "önska");
lin wish_VV = mkVV (mkV "önska");
lin wishbone_N = variants {};
lin wishful_A = mkA "längtansfull"; -- comment=3
lin wishful_A = mkA "önskefull";
lin wishfulness_N = variants {};
lin wishing_cap_N = variants {};
lin wishy_washy_A = variants {};