diff --git a/lib/src/catalan/ConstructionCat.gf b/lib/src/catalan/ConstructionCat.gf index d76d3fb81..7d8560f65 100644 --- a/lib/src/catalan/ConstructionCat.gf +++ b/lib/src/catalan/ConstructionCat.gf @@ -8,42 +8,44 @@ flags coding=utf8 ; lin - hungry_VP = E.ComplCN have_V2 (mkCN (mkN "hambre" feminine)) ; - thirsty_VP = E.ComplCN have_V2 (mkCN (mkN "sed" feminine)) ; + hungry_VP = E.ComplCN have_V2 (mkCN (mkN "gana" feminine)) ; -- "fam" (val) + thirsty_VP = E.ComplCN have_V2 (mkCN (mkN "set" feminine)) ; + has_age_VP card = mkVP have_V2 (mkNP L.year_N) ; - have_name_Cl x y = mkCl x (mkV2 (reflV (mkV "llamar"))) 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 "casado") ; + have_name_Cl x y = mkCl x (mkV2 (reflV (mkV "dir"))) 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 "casat") ; what_name_QCl x = mkQCl how_IAdv (mkCl (lin NP x) (reflV (mkV "dir"))) ; how_old_QCl x = mkQCl (mkIP how8many_IDet L.year_N) x have_V2 ; ----- how_far_QCl x = mkQCl (lin IAdv (ss "a qué distancia")) (mkCl x I.estar_V) ; +---- how_far_QCl x = mkQCl (lin IAdv (ss "a quina distància")) (mkCl x I.estar_V) ; -- some more things ----- weather_adjCl ap = mkCl (mkVP (mkVA I.hacer_V) (lin AP ap)) ; - - is_right_VP = E.ComplCN have_V2 (mkCN (mkN "razón")) ; ----- is_wrong_VP = mkVP (mkVA I.estar_V) (mkAP (mkA "equivocado")) ; +---- weather_adjCl ap = mkCl (mkVP (mkVA I.fer_V) (lin AP ap)) ; + + is_right_VP = E.ComplCN have_V2 (mkCN (mkN "raó")) ; +---- is_wrong_VP = mkVP (mkVA I.estar_V) (mkAP (mkA "equivocat")) ; n_units_AP card cn a = mkAP (lin AdA (mkUtt (mkNP (lin CN cn)))) (lin A a) ; - bottle_of_CN np = mkCN (lin N2 (mkN2 (mkN "botella" feminine) part_Prep)) np ; - cup_of_CN np = mkCN (lin N2 (mkN2 (mkN "taza") part_Prep)) np ; - glass_of_CN np = mkCN (lin N2 (mkN2 (mkN "copa") part_Prep)) np ; + bottle_of_CN np = mkCN (lin N2 (mkN2 (mkN "ampolla" feminine) part_Prep)) np ; -- "botella" (val) + cup_of_CN np = mkCN (lin N2 (mkN2 (mkN "tassa") part_Prep)) np ; + glass_of_CN np = mkCN (lin N2 (mkN2 (mkN "got") part_Prep)) np ; {- -- spatial deixis and motion verbs where_go_QCl np = mkQCl where_IAdv (mkCl np (mkVP L.go_V)) ; - where_come_from_QCl np = mkQCl (lin IAdv (ss "d'où")) (mkCl np (mkVP L.go_V)) ; - + + where_come_from_QCl np = mkQCl (lin IAdv (ss "d'on")) (mkCl np (mkVP L.go_V)) ; + go_here_VP = mkVP (mkVP L.go_V) here_Adv ; come_here_VP = mkVP (mkVP L.come_V) here_Adv ; come_from_here_VP = mkVP (mkVP L.come_V) (mkAdv "d'aquí") ; go_there_VP = mkVP (mkVP L.go_V) there_Adv ; come_there_VP = mkVP (mkVP L.come_V) there_Adv ; - come_from_there_VP = mkVP (mkVP L.come_V) (mkAdv "de là") ; + come_from_there_VP = mkVP (mkVP L.come_V) (mkAdv "d'allà") ; -} lincat @@ -57,8 +59,8 @@ oper lin weekdayPunctualAdv w = lin Adv {s = w.s ! C.Sg} ; -- lundi weekdayHabitualAdv w = SyntaxCat.mkAdv noPrep (mkNP the_Det w) ; -- il lunedí ---- - weekdayLastAdv w = SyntaxCat.mkAdv noPrep (mkNP the_Det (mkCN (mkA "pasado") w)) ; -- il lunedí scorso - weekdayNextAdv w = SyntaxCat.mkAdv noPrep (mkNP the_Det (mkCN (mkA "próximo") w)) ; -- il lunedí prossimo + weekdayLastAdv w = SyntaxCat.mkAdv noPrep (mkNP the_Det (mkCN (mkA "passat") w)) ; -- il lunedí scorso + weekdayNextAdv w = SyntaxCat.mkAdv noPrep (mkNP the_Det (mkCN (mkA "proper") w)) ; -- il lunedí prossimo monthAdv m = lin Adv {s = "en" ++ m.s ! C.Sg} ; -- in mggio yearAdv y = SyntaxCat.mkAdv (mkPrep "el") y ; ---- @@ -95,9 +97,9 @@ lin friday_Weekday = mkN "divendres" ; lin saturday_Weekday = mkN "dissabte" ; lin sunday_Weekday = mkN "diumenge" ; -lin january_Month = mkN "enero" ; -lin february_Month = mkN "febrero" ; -lin march_Month = mkN "marzo" ; +lin january_Month = mkN "gener" ; +lin february_Month = mkN "febrer" ; +lin march_Month = mkN "març" ; lin april_Month = mkN "abril" ; lin may_Month = mkN "maig" ; lin june_Month = mkN "juny" ; @@ -108,40 +110,40 @@ lin october_Month = mkN "octubre" ; lin november_Month = mkN "novembre" ; lin december_Month = mkN "desembre" ; -lin afrikaans_Language = mkLanguage "afrikáans" ; -lin amharic_Language = mkLanguage "amárico" ; -lin arabic_Language = mkLanguage "árabe" ; -lin bulgarian_Language = mkLanguage "búlgaro" ; -lin catalan_Language = mkLanguage "catalán" ; -lin chinese_Language = mkLanguage "chino" ; -lin danish_Language = mkLanguage "danés" ; -lin dutch_Language = mkLanguage "neerlandés" ; -lin english_Language = mkLanguage "inglés" ; -lin estonian_Language = mkLanguage "estone" ; -lin finnish_Language = mkLanguage "finés" ; -lin french_Language = mkLanguage "francés" ; -lin german_Language = mkLanguage "alemán" ; -lin greek_Language = mkLanguage "griego" ; -lin hebrew_Language = mkLanguage "ebreo" ; +lin afrikaans_Language = mkLanguage "afrikáans" ; +lin amharic_Language = mkLanguage "amàric" ; +lin arabic_Language = mkLanguage "àrabe" ; +lin bulgarian_Language = mkLanguage "búlgar" ; +lin catalan_Language = mkLanguage "català" ; +lin chinese_Language = mkLanguage "xinès" ; +lin danish_Language = mkLanguage "danès" ; +lin dutch_Language = mkLanguage "neerlandès" ; +lin english_Language = mkLanguage "anglès" ; +lin estonian_Language = mkLanguage "estonià" ; +lin finnish_Language = mkLanguage "finès" ; +lin french_Language = mkLanguage "francès" ; +lin german_Language = mkLanguage "alemany" ; +lin greek_Language = mkLanguage "grec" ; +lin hebrew_Language = mkLanguage "hebreu" ; lin hindi_Language = mkLanguage "hindi" ; -lin japanese_Language = mkLanguage "japonés" ; -lin italian_Language = mkLanguage "italiano" ; -lin latin_Language = mkLanguage "latín" ; -lin latvian_Language = mkLanguage "letón" ; -lin maltese_Language = mkLanguage "maltés" ; -lin nepali_Language = mkLanguage "nepalí" ; -lin norwegian_Language = mkLanguage "noruego" ; +lin japanese_Language = mkLanguage "japonès" ; +lin italian_Language = mkLanguage "italià" ; +lin latin_Language = mkLanguage "llatí" ; +lin latvian_Language = mkLanguage "letó" ; +lin maltese_Language = mkLanguage "maltès" ; +lin nepali_Language = mkLanguage "nepalès" ; +lin norwegian_Language = mkLanguage "noruec" ; lin persian_Language = mkLanguage "persa" ; -lin polish_Language = mkLanguage "polaco" ; -lin punjabi_Language = mkLanguage "punjabi" ; -lin romanian_Language = mkLanguage "rumano" ; -lin russian_Language = mkLanguage "ruso" ; +lin polish_Language = mkLanguage "polonès" ; +lin punjabi_Language = mkLanguage "panjabi" ; +lin romanian_Language = mkLanguage "romanès" ; +lin russian_Language = mkLanguage "rus" ; lin sindhi_Language = mkLanguage "sindhi" ; -lin spanish_Language = mkLanguage "español" ; +lin spanish_Language = mkLanguage "castellà" ; -- espanyol lin swahili_Language = mkLanguage "swahili" ; -lin swedish_Language = mkLanguage "sueco" ; -lin thai_Language = mkLanguage "tailandés" ; -lin turkish_Language = mkLanguage "turco" ; +lin swedish_Language = mkLanguage "suec" ; +lin thai_Language = mkLanguage "tailandès" ; +lin turkish_Language = mkLanguage "turc" ; lin urdu_Language = mkLanguage "urdu" ; } diff --git a/lib/src/catalan/TerminologyCat.gf b/lib/src/catalan/TerminologyCat.gf index 3cd2262c5..088651bd5 100644 --- a/lib/src/catalan/TerminologyCat.gf +++ b/lib/src/catalan/TerminologyCat.gf @@ -35,31 +35,35 @@ lin feminine_Parameter = mkN "femení" ; neuter_Parameter = mkN "neutre" ; - nominative_Parameter = mkN "nominativo" ; - genitive_Parameter = mkN "genitivo" ; - dative_Parameter = mkN "dativo" ; - accusative_Parameter = mkN "accusativo" ; + nominative_Parameter = mkN "nominatiu" ; + genitive_Parameter = mkN "genitiu" ; + dative_Parameter = mkN "datiu" ; + accusative_Parameter = mkN "accusatiu" ; - imperative_Parameter = mkN "imperativo" ; - indicative_Parameter = mkN "indicativo" ; - conjunctive_Parameter = mkN "subjuntivo" ; - infinitive_Parameter = mkN "infinitivo" ; + imperative_Parameter = mkN "imperatiu" ; + indicative_Parameter = mkN "indicatiu" ; + conjunctive_Parameter = mkN "subjuntiu" ; + infinitive_Parameter = mkN "infinitiu" ; + + present_Parameter = mkN "present" ; + past_Parameter = mkN "passat" ; +---- past_Parameter = mkN "pretèrit" ; + future_Parameter = mkN "futur" ; + future_Parameter = mkN "futur" ; - present_Parameter = mkN "presente" ; - past_Parameter = mkN "pretérito" ; - future_Parameter = mkN "futuro" ; conditional_Parameter = mkN "condicional" ; - perfect_Parameter = mkN "perfecto compuesto" ; ---- - imperfect_Parameter = mkN "imperfecto" ; - simple_past_Parameter = mkN "perfecto simple" ; ---- + + perfect_Parameter = mkN "perfecte compost" ; ---- + imperfect_Parameter = mkN "imperfecte" ; + simple_past_Parameter = mkN "perfecte simple" ; ---- participle_Parameter = mkN "participi" ; aux_verb_Parameter = mkN "auxiliar" ; ---- - positive_Parameter = mkN "positivo" ; - comparative_Parameter = mkN "comparativo" ; - superlative_Parameter = mkN "superlativo" ; - predicative_Parameter = mkN "predicativo" ; + positive_Parameter = mkN "positiu" ; + comparative_Parameter = mkN "comparatiu" ; + superlative_Parameter = mkN "superlatiu" ; + predicative_Parameter = mkN "predicatiu" ; nounHeading n = ss (n.s ! Sg) ;