From c90f3181f4deba44a82fdc8a433553ed7239d397 Mon Sep 17 00:00:00 2001 From: "ramona.enache" Date: Fri, 14 May 2010 19:40:27 +0000 Subject: [PATCH] added more greetings to Phrasebook --- examples/phrasebook/Greetings.gf | 5 ++++- examples/phrasebook/GreetingsDan.gf | 17 ++++++++++------- examples/phrasebook/GreetingsDut.gf | 4 +++- examples/phrasebook/GreetingsEng.gf | 4 +++- examples/phrasebook/GreetingsFin.gf | 3 +++ examples/phrasebook/GreetingsFre.gf | 3 +++ examples/phrasebook/GreetingsGer.gf | 3 +++ examples/phrasebook/GreetingsIta.gf | 3 +++ examples/phrasebook/GreetingsNor.gf | 4 +++- examples/phrasebook/GreetingsRon.gf | 9 +++++++-- examples/phrasebook/GreetingsSwe.gf | 3 +++ examples/phrasebook/WordsRon.gf | 6 +++--- 12 files changed, 48 insertions(+), 16 deletions(-) diff --git a/examples/phrasebook/Greetings.gf b/examples/phrasebook/Greetings.gf index ba3499f2a..15b650f42 100644 --- a/examples/phrasebook/Greetings.gf +++ b/examples/phrasebook/Greetings.gf @@ -22,6 +22,9 @@ fun GSeeYouSoon : Greeting ; GSorry, GSorryPol : Greeting ; GThanks : Greeting ; - GTheCheck : Greeting ; + GTheCheck : Greeting ; + GCongratulations : Greeting ; + GHappyBirthday : Greeting ; + GGoodLuck : Greeting ; } diff --git a/examples/phrasebook/GreetingsDan.gf b/examples/phrasebook/GreetingsDan.gf index 9d2c0d166..531750f29 100644 --- a/examples/phrasebook/GreetingsDan.gf +++ b/examples/phrasebook/GreetingsDan.gf @@ -5,8 +5,8 @@ lincat lin GBye = ss "hej hej" ; -- not google translate - GCheers = ss "farvel" ; --- GDamn = ss "fan" ; + GCheers = ss "skål" ; + GDamn = ss "satans" ; -- X GExcuse, GExcusePol = ss "undskyld mig" ; GGoodDay = ss "god dag" ; GGoodEvening = ss "god aften" ; @@ -16,13 +16,16 @@ lin GHello = ss "hej" ; GHelp = ss "hjælp" ; GHowAreYou = ss "hvordan har du det" ; - GLookOut = ss "se ud" ; - GNiceToMeetYou, GNiceToMeetYouPol = ss "rart at møde dig" ; - GPleaseGive, GPleaseGivePol = ss "behage" ; - GSeeYouSoon = ss "se dig snart" ; + GLookOut = ss "pas på" ; + GNiceToMeetYou, GNiceToMeetYouPol = ss "hyggeligt at møde dig" ; -- more common than rart (google translate) + GPleaseGive = ss "vær så sød" ; -- can also have flink instead of sod + GPleaseGivePol = ss "venligst" ; -- X not behage + GSeeYouSoon = ss "vi ses snart" ; -- X se dig snart GSorry, GSorryPol = ss "undskyld" ; GThanks = ss "tak" ; GTheCheck = ss "regningen" ; + GCongratulations = ss "tillykke"; + GHappyBirthday = ss "tillykke med fødselsdagen" ; + GGoodLuck = ss "held og lykke" ; ---} } diff --git a/examples/phrasebook/GreetingsDut.gf b/examples/phrasebook/GreetingsDut.gf index 4c547c144..c7fb0a6ca 100644 --- a/examples/phrasebook/GreetingsDut.gf +++ b/examples/phrasebook/GreetingsDut.gf @@ -25,5 +25,7 @@ lin GSorryPol = ss "mijn verontschuldiging" ; GThanks = ss "dank je wel" ; GTheCheck = ss "rekening" ; - + GCongratulations = ss "gefeliciteerd"; + GHappyBirthday = ss "gelukkige verjaardag" ; + GGoodLuck = ss "veel geluk" ; } diff --git a/examples/phrasebook/GreetingsEng.gf b/examples/phrasebook/GreetingsEng.gf index e69410b51..bf1540779 100644 --- a/examples/phrasebook/GreetingsEng.gf +++ b/examples/phrasebook/GreetingsEng.gf @@ -23,5 +23,7 @@ lin GSorry, GSorryPol = ss "sorry" ; GThanks = ss "thank you" ; GTheCheck = ss "the bill" ; - + GCongratulations = ss "congratulations"; + GHappyBirthday = ss "happy birthday" ; + GGoodLuck = ss "good luck" ; } diff --git a/examples/phrasebook/GreetingsFin.gf b/examples/phrasebook/GreetingsFin.gf index 9a30bb5d7..5900ee899 100644 --- a/examples/phrasebook/GreetingsFin.gf +++ b/examples/phrasebook/GreetingsFin.gf @@ -24,4 +24,7 @@ lin GSorry, GSorryPol = ss "anteeksi" ; GThanks = ss "kiitos" ; GTheCheck = ss "lasku" ; + GCongratulations = ss "onnittelut"; + GHappyBirthday = ss "hyvää syntymäpäivää" ; + GGoodLuck = ss "onnea" ; } diff --git a/examples/phrasebook/GreetingsFre.gf b/examples/phrasebook/GreetingsFre.gf index 76656b62c..f6efdbeb3 100644 --- a/examples/phrasebook/GreetingsFre.gf +++ b/examples/phrasebook/GreetingsFre.gf @@ -25,5 +25,8 @@ lin GSorry, GSorryPol = ss "pardon" ; GThanks = ss "merci" ; GTheCheck = ss "l'addition" ; + GCongratulations = ss "félicitations"; + GHappyBirthday = ss "joyeux anniversaire" ; + GGoodLuck = ss "bonne chance" ; } diff --git a/examples/phrasebook/GreetingsGer.gf b/examples/phrasebook/GreetingsGer.gf index 82fdbc32b..9394a0eff 100644 --- a/examples/phrasebook/GreetingsGer.gf +++ b/examples/phrasebook/GreetingsGer.gf @@ -24,6 +24,9 @@ lin GSorry, GSorryPol = ss "Entschuldigung" ; GThanks = ss "Danke" ; GTheCheck = ss "die Rechnung" ; + GCongratulations = ss "herzlichen Glückwunsch"; + GHappyBirthday = ss "alles Gute zum Geburtstag" ; + GGoodLuck = ss "viel Glück" ; } diff --git a/examples/phrasebook/GreetingsIta.gf b/examples/phrasebook/GreetingsIta.gf index a77d5e6ea..b8d281eef 100644 --- a/examples/phrasebook/GreetingsIta.gf +++ b/examples/phrasebook/GreetingsIta.gf @@ -26,5 +26,8 @@ lin GSorryPol = ss "scusimi" ; ---- GThanks = ss "grazie" ; GTheCheck = ss "il conto" ; + GCongratulations = ss "congratulazioni"; + GHappyBirthday = ss "buon compleanno" ; + GGoodLuck = ss "buona fortuna" ; } diff --git a/examples/phrasebook/GreetingsNor.gf b/examples/phrasebook/GreetingsNor.gf index 35f6cf9af..23f5aa953 100644 --- a/examples/phrasebook/GreetingsNor.gf +++ b/examples/phrasebook/GreetingsNor.gf @@ -23,6 +23,8 @@ lin GSorry, GSorryPol = ss "beklager" ; GThanks = ss "takk" ; GTheCheck = ss "regningen" ; - + GCongratulations = ss "gratulerer"; + GHappyBirthday = ss "gratulerer med dagen" ; + GGoodLuck = ss "lykke til" ; } diff --git a/examples/phrasebook/GreetingsRon.gf b/examples/phrasebook/GreetingsRon.gf index b568a6e49..9451fbce1 100644 --- a/examples/phrasebook/GreetingsRon.gf +++ b/examples/phrasebook/GreetingsRon.gf @@ -10,6 +10,7 @@ lin GCheers = ss "noroc" ; GDamn = ss "ptiu" ; GExcuse = ss "pardon" ; + GExcusePol = ss "mă scuzaÈ›i" ; GGoodDay = ss "bună ziua" ; GGoodEvening = ss "bună seara" ; GGoodMorning = ss "bună dimineaÅ£a" ; @@ -20,10 +21,14 @@ lin GHowAreYou = ss "ce faci" ; GLookOut = ss "atenÅ£ie" ; GNiceToMeetYou = ss "încântat" ; - GPleaseGive = ss "vă rog" ; + GPleaseGive = ss "te rog" ; + GPleaseGivePol = ss "vă rog" ; GSeeYouSoon = ss "pe curând" ; - GSorry = ss "îmi pare rău" ; + GSorry, GSorryPol = ss "îmi pare rău" ; GThanks = ss "mulÅ£umesc" ; GTheCheck = ss "nota de plată" ; + GCongratulations = ss "felicitări"; + GHappyBirthday = ss "la mulÈ›i ani" ; + GGoodLuck = ss "baftă" ; } diff --git a/examples/phrasebook/GreetingsSwe.gf b/examples/phrasebook/GreetingsSwe.gf index b0846bbeb..7f6764f09 100644 --- a/examples/phrasebook/GreetingsSwe.gf +++ b/examples/phrasebook/GreetingsSwe.gf @@ -23,5 +23,8 @@ lin GSorry, GSorryPol = ss "förlåt" ; GThanks = ss "tack" ; GTheCheck = ss "notan" ; + GCongratulations = ss "grattis"; + GHappyBirthday = ss "grattis på födelsedagen" ; + GGoodLuck = ss "lycka till" ; } diff --git a/examples/phrasebook/WordsRon.gf b/examples/phrasebook/WordsRon.gf index 2188b70e9..5dc64d47c 100644 --- a/examples/phrasebook/WordsRon.gf +++ b/examples/phrasebook/WordsRon.gf @@ -160,12 +160,12 @@ concrete WordsRon of Words = SentencesRon ** open AThirsty p = DatSubjCl p.name (mkVP (mkNP (P.mkN "sete"))) ; ATired p = mkCl p.name (P.mkA "obosit") ; AUnderstand p = mkCl p.name (v_besch83 "înÅ£elege") ; - AWant p obj = mkCl p.name (P.dirV2 (v_besch74 "vrea")) obj ; + AWant p obj = mkCl p.name (P.mmkV2 (v_besch74 "vrea") (P.noPrep P.Nom)) obj ; AWantGo p place = mkCl p.name want_VV (mkVP (mkVP L.go_V) place.to) ; -- miscellaneous - QWhatName p = mkQS (mkQCl how_IAdv (mkCl p.name (mkRVAcc (v_besch29 "chema")))) ; + QWhatName p = mkQS (mkQCl how_IAdv (AccSubjCl p.name (mkVP (v_besch29 "chema")))) ; QWhatAge p = mkQS (mkQCl (mkIP how8many_IDet L.year_N) p.name have_V2) ; PropOpen p = mkCl p.name open_A ; @@ -176,7 +176,7 @@ concrete WordsRon of Words = SentencesRon ** open PropClosedDay p d = mkCl p.name (mkVP (mkVP closed_A) d.habitual) ; HowMuchCost item = mkQS (mkQCl how8much_IAdv (mkCl item (v_besch18 "costa"))) ; - ItCost item price = mkCl item (P.dirV2 (v_besch18 "costa")) price ; + ItCost item price = mkCl item (P.mmkV2 (v_besch18 "costa") (P.noPrep P.Nom)) price ; -- Building phrases from strings is complicated: the solution is to use -- mkText : Text -> Text -> Text ;