Implemented some new words in swedish. Use english compound for police officer.

3 files changed, 11 insertions, 3 deletions

diff --git a/examples/peacekeeping/EXAMPLES b/examples/peacekeeping/EXAMPLES
index 86e5c2346..ad3b2c626 100644
--- a/examples/peacekeeping/EXAMPLES
+++ b/examples/peacekeeping/EXAMPLES
@@ -14,6 +14,7 @@ Where is the factory?
 
 The doctor sleeps.
 I see a small girl.
+Does your leg hurt?
 Soldiers don't eat corpses.
 Do you need medicine?
 We don't give weapons to dangerous soldiers.
@@ -29,7 +30,7 @@ Drink cold water!
 Give your weapon to the soldier!
 Show me the landmine!
 Give water to the boy!
-
+Drop your weapon!
 
 == Should work ==
 
diff --git a/examples/peacekeeping/english/PeaceLexExt_Eng.gf b/examples/peacekeeping/english/PeaceLexExt_Eng.gf
index 7b784fea7..d5e2154b7 100644
--- a/examples/peacekeeping/english/PeaceLexExt_Eng.gf
+++ b/examples/peacekeeping/english/PeaceLexExt_Eng.gf
@@ -28,7 +28,7 @@ concrete PeaceLexExt_Eng of PeaceLexExt =
     landmine_N = regN "landmine" ;
     map_N = regN "map" ;
     medicine_N = regN "medicine" ;
-    police8officer_N = mk2N "policeman" "policemen" ;
+    police8officer_N = compoundN "police" (regN "officer") ;
     skin_N = regN "skin" ;
     soldier_N = regN "soldier" ;
     weapon_N = regN "weapon";
diff --git a/examples/peacekeeping/swedish/PeaceLexExt_Swe.gf b/examples/peacekeeping/swedish/PeaceLexExt_Swe.gf
index 7db79e1b1..065e1e3c0 100644
--- a/examples/peacekeeping/swedish/PeaceLexExt_Swe.gf
+++ b/examples/peacekeeping/swedish/PeaceLexExt_Swe.gf
@@ -1,7 +1,7 @@
 --# -path=.:present:prelude
 
 concrete PeaceLexExt_Swe of PeaceLexExt = 
-  PeaceCat_Swe ** open LexiconSwe, ParadigmsSwe in {
+  PeaceCat_Swe ** open ParadigmsSwe, IrregSwe, LexiconSwe in {
 
   lin
 
@@ -20,16 +20,23 @@ concrete PeaceLexExt_Swe of PeaceLexExt =
     corpse_N = mk2N "lik" "lik" ;
     doctor_N = mkN "doktor" "doktorn" "doktorer" "doktorerna";
     enemy_N = mk2N "fiende" "fiender" ;
+    face_N = regN "ansikte" ;
     food_N = regN "mat";
     friend_N = mkN "vän" "vännen" "vänner" "vännerna" ;
+    ground_N = mk2N "mark" "marker";
+    knife_N = regN "kniv" ;
     landmine_N = regN "landmina" ;
+    map_N = regN "karta" ;
     medicine_N = mk2N "medicin" "mediciner";
+    police8officer_N = mk2N "polis" "poliser" ;
     skin_N = mk2N "skinn" "skinn" ;
     soldier_N = mk2N "soldat" "soldater" ;
     weapon_N = mkN "vapen" "vapnet" "vapen" "vapnen" ;
 
     -- Verbs
     cough_V = regV "hostar" ;
+    drop_V2 = dirV2 (regV "släpper") ;
+    hurt_V = partV göra_V "ont" ; -- FIXME: "Gör ont ditt ben?"
     need_V2 = dirV2 (regV "behöver");
     own_V2 = dirV2 (regV "äger") ;
     show_V3 = dirdirV3 (regV "visar") ;