Olga's etc corrections in Phrasebook

9 files changed, 20 insertions, 15 deletions

diff --git a/examples/phrasebook/DisambPhrasebookEng.gf b/examples/phrasebook/DisambPhrasebookEng.gf
index 45202924a..2292e41d9 100644
--- a/examples/phrasebook/DisambPhrasebookEng.gf
+++ b/examples/phrasebook/DisambPhrasebookEng.gf
@@ -1,7 +1,12 @@
 --# -path=.:present
 
 concrete DisambPhrasebookEng of Phrasebook = PhrasebookEng - 
-   [YouFam, YouPol, GExcuse, GExcusePol, GSorry, GSorryPol, GPleaseGive, GPleaseGivePol] 
+   [YouFam, YouPol, 
+    GExcuse, GExcusePol, 
+    GSorry, GSorryPol, 
+    GPleaseGive, GPleaseGivePol,
+    GWhatsYourName, GWhatsYourNamePol
+   ] 
   ** open SyntaxEng, ParadigmsEng, Prelude in {
 lin
   YouFam = mkNP (mkNP youSg_Pron) (ParadigmsEng.mkAdv "(familiar)") ;
@@ -13,6 +18,8 @@ lin
   GSorryPol = pol "sorry" ;
   GPleaseGive = fam "please" ;
   GPleaseGivePol = pol "please" ;
+  GWhatsYourName = ss "what's your name (familiar)" ;
+  GWhatsYourNamePol = ss "what's your name (polite)" ;
 
 oper
   fam : Str -> SS = \s -> postfixSS "(familiar)" (ss s) ;
diff --git a/examples/phrasebook/Greetings.gf b/examples/phrasebook/Greetings.gf
index 96e2c4e3c..c366f3b38 100644
--- a/examples/phrasebook/Greetings.gf
+++ b/examples/phrasebook/Greetings.gf
@@ -12,6 +12,7 @@ fun
   GSorry, GSorryPol : Greeting ;
   GGoodbye : Greeting ;
   GBye : Greeting ;
+  GWhatsYourName, GWhatsYourNamePol : Greeting ;
   GNiceToMeetYou : Greeting ;
   GSeeYouSoon : Greeting ;
   GHelp : Greeting ;
@@ -25,6 +26,4 @@ fun
   GYes : Greeting ;
   GNo : Greeting ;
 
-  GWhatsYourName : Greeting ; ---- move
-
 }
diff --git a/examples/phrasebook/GreetingsEng.gf b/examples/phrasebook/GreetingsEng.gf
index 9ca8ca68a..b4e9de896 100644
--- a/examples/phrasebook/GreetingsEng.gf
+++ b/examples/phrasebook/GreetingsEng.gf
@@ -12,7 +12,7 @@ lin
   GSorry, GSorryPol = ss "sorry" ;
   GGoodbye = ss "goodbye" ;
   GBye = ss "bye" ;
-  GWhatsYourName = ss "what's your name" ;
+  GWhatsYourName, GWhatsYourNamePol = ss "what's your name" ;
   GNiceToMeetYou = ss "nice to meet you" ;
   GSeeYouSoon = ss "see you soon" ;
   GHelp = ss "help" ;
diff --git a/examples/phrasebook/GreetingsFin.gf b/examples/phrasebook/GreetingsFin.gf
index d4c2417e3..e44b02c8e 100644
--- a/examples/phrasebook/GreetingsFin.gf
+++ b/examples/phrasebook/GreetingsFin.gf
@@ -16,6 +16,7 @@ lin
   GGoodbye = ss "näkemiin" ;
   GBye = ss "hei hei" ;
   GWhatsYourName = ss "mikä sinun nimesi on" ;
+  GWhatsYourNamePol = ss "mikä teidän nimenne on" ;
   GNiceToMeetYou = ss "hauska tutustua" ;
   GSeeYouSoon = ss "nähdään pian" ;
   GHelp = ss "apua" ;
diff --git a/examples/phrasebook/GreetingsFre.gf b/examples/phrasebook/GreetingsFre.gf
index 50d04b4bf..567e256da 100644
--- a/examples/phrasebook/GreetingsFre.gf
+++ b/examples/phrasebook/GreetingsFre.gf
@@ -16,7 +16,8 @@ lin
   GSorry, GSorryPol = ss "pardon" ;
   GGoodbye = ss "au revoir" ;
   GBye = ss "au revoir" ;
-  GWhatsYourName = ss "comment vous appelez-vous" ; ----
+  GWhatsYourName = ss "comment t'appelles-tu" ;
+  GWhatsYourNamePol = ss "comment vous appelez-vous" ;
   GNiceToMeetYou = ss "enchanté" ;
   GSeeYouSoon = ss "à bientôt" ;
   GHelp = ss "au secours" ;
diff --git a/examples/phrasebook/GreetingsIta.gf b/examples/phrasebook/GreetingsIta.gf
index 1758722a5..33ceb958d 100644
--- a/examples/phrasebook/GreetingsIta.gf
+++ b/examples/phrasebook/GreetingsIta.gf
@@ -14,7 +14,8 @@ lin
   GSorryPol = ss "scusimi" ; ----
   GGoodbye = ss "arrivederci" ;
   GBye = ss "ciao" ;
-  GWhatsYourName = ss "come si chiama" ;
+  GWhatsYourName = ss "come ti chiami" ;
+  GWhatsYourNamePol = ss "come si chiama" ;
 --  GNiceToMeetYou = ss "piacevole" ; ----
 --  GSeeYouSoon = ss "a poco tempo" ; ----
   GHelp = ss "aiuto" ;
@@ -23,14 +24,9 @@ lin
   GGoodDay = ss "buongiorno" ;
   GGoodEvening = ss "buona sera" ;
   GGoodNight = ss "buona notte" ;
-  GImHungry = ss "ho fame" ;
-  GImThirsty = ss "ho sete" ;
-  GImTired = ss "sono stanco" ; ----
-  GImScared = ss "ho paura" ;
-  GIdontUnderstand = ss "non capisco" ;
   GTheCheck = ss "il conto" ;
 
-  GYes = ss "sì" ; ---- si
+  GYes = ss "sì" ;
   GNo = ss "no" ;
 
 
diff --git a/examples/phrasebook/GreetingsSwe.gf b/examples/phrasebook/GreetingsSwe.gf
index 7319fdb58..9384c3955 100644
--- a/examples/phrasebook/GreetingsSwe.gf
+++ b/examples/phrasebook/GreetingsSwe.gf
@@ -22,6 +22,7 @@ lin
   GGoodNight = ss "god natt" ;
 
   GWhatsYourName = ss "vad heter du" ;
+  GWhatsYourNamePol = ss "vad heter ni" ;
 
   GTheCheck = ss "notan" ;
 
diff --git a/examples/phrasebook/WordsIta.gf b/examples/phrasebook/WordsIta.gf
index e9d21ae90..6413dbbae 100644
--- a/examples/phrasebook/WordsIta.gf
+++ b/examples/phrasebook/WordsIta.gf
@@ -41,9 +41,9 @@ Boring = mkAPA "noioso" ;
     ALove p q = mkCl p (mkV2 (mkV "amare")) q ;

 

     English = mkNP (mkPN "inglese") ;

-    Finnish = mkNP (mkPN "finnico") ;

+    Finnish = mkNP (mkPN "finlandese") ;

     French = mkNP (mkPN "francese") ; 

-    Romanian = mkNP (mkPN "romano") ;

+    Romanian = mkNP (mkPN "rumeno") ;

     Swedish = mkNP (mkPN "svedese") ;

 

     AHungry p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "fame" feminine))) ;

diff --git a/examples/phrasebook/missing.txt b/examples/phrasebook/missing.txt
index 13a0ceae9..575fdfac4 100644
--- a/examples/phrasebook/missing.txt
+++ b/examples/phrasebook/missing.txt
@@ -3,5 +3,5 @@ PhrasebookEng :
 PhrasebookFin :
 PhrasebookFre :
 PhrasebookIta : GNiceToMeetYou GSeeYouSoon Tea
-PhrasebookRon : AHungry AScared AThirsty ATired Coffee Finnish French GExcusePol GPleaseGivePol GSorryPol Swedish Tea
+PhrasebookRon : AHungry AScared AThirsty ATired Coffee Finnish French GExcusePol GPleaseGivePol GSorryPol GWhatsYourNamePol Swedish Tea
 PhrasebookSwe : GExcusePol GPleaseGivePol GSorryPol