Merge branch 'master' of https://github.com/GrammaticalFramework/GF

Conflicts:
	examples/phrasebook/SentencesBul.gf
	examples/phrasebook/WordsBul.gf

1 files changed, 0 insertions, 31 deletions

diff --git a/examples/phrasebook/GreetingsCat.gf b/examples/phrasebook/GreetingsCat.gf
deleted file mode 100644
index db8992e22..000000000
--- a/examples/phrasebook/GreetingsCat.gf
+++ /dev/null
@@ -1,31 +0,0 @@
---# -coding=latin1
-concrete GreetingsCat of Greetings = SentencesCat [Greeting,mkGreeting] ** open Prelude in {
-
-lin 
-  GBye = mkGreeting "adéu" ;
-  GCheers = mkGreeting "salut" ;
-  GDamn = mkGreeting "merda" ;
-  GExcuse = mkGreeting "perdona" ;
-  GExcusePol = mkGreeting ("perdoni" | "disculpi") ;
-  GCongratulations = mkGreeting "felicitats" ;
-  GHappyBirthday = mkGreeting "feliç aniversari" ;
-  GGoodLuck = mkGreeting "sort" ;
-  GGoodDay = mkGreeting "bon dia" ;
-  GGoodEvening = mkGreeting "bona tarda" ;
-  GGoodMorning = mkGreeting "bon dia" ;
-  GGoodNight = mkGreeting "bona nit" ;
-  GGoodbye = mkGreeting "a reveure" ;
-  GHello = mkGreeting "hola" ;
-  GHelp = mkGreeting "socors" ;
-  GHowAreYou = mkGreeting "quč tal" ;
-  GLookOut = mkGreeting "compte" ;
-  GNiceToMeetYou = mkGreeting "encantat de cončixer-lo" ; -- make distinction Masc/Fem
-  GPleaseGive = mkGreeting "si et plau" ;
-  GPleaseGivePol = mkGreeting "si us plau" ;
-  GSeeYouSoon = mkGreeting "fins aviat" ; 
-  GSorry = mkGreeting "perdoni" ;
-  GSorryPol = mkGreeting "em sap greu" ; 
-  GThanks = mkGreeting "grŕcies" ;
-  GTheCheck = mkGreeting "el compte" ;
-
-}