From beacb850c6b670bbbf6799698164fe6e6302ec2b Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 23 Aug 2014 00:35:06 +0200
Subject: [PATCH] fix MAKE TEMP, for real this time. I hate skip_token and all
 that stuff.

---
 res/core/en/strings.xml | 2 +-
 s/preview               | 2 +-
 src/laws.c              | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/res/core/en/strings.xml b/res/core/en/strings.xml
index c58d11918..f91b1d9a7 100644
--- a/res/core/en/strings.xml
+++ b/res/core/en/strings.xml
@@ -1476,7 +1476,7 @@
     <text locale="en">MAKE</text>
   </string>
   <string name="maketemp">
-    <text locale="de">MAKETEMP</text>
+    <text locale="en">MAKETEMP</text>
   </string>
   <string name="move">
     <text locale="en">MOVE</text>
diff --git a/s/preview b/s/preview
index f5aebd818..c25987ced 100755
--- a/s/preview
+++ b/s/preview
@@ -88,7 +88,7 @@ zip="$turn-$1.zip"
 zip -q -u $zip $turn-$1.?r
 email=$(grep "faction=$1:" reports.txt | cut -d: -f2 | sed 's/email=//')
 echo "sending reports to $1 / $email"
-cat /dev/null | mutt -F $ERESSEA/etc/muttrc -s "Testauswertung Spiel $GAME Partei $1" -a $zip -- $email
+cat /dev/null | mutt -F $ERESSEA/etc/muttrc -s "Testauswertung Spiel $game Partei $1" -a $zip -- $email
 }
 
 game=0
diff --git a/src/laws.c b/src/laws.c
index d24ae795a..fe2ec329b 100755
--- a/src/laws.c
+++ b/src/laws.c
@@ -3627,6 +3627,8 @@ void new_units(void)
                         }
                         continue;
                     }
+                    init_tokens(makeord);
+                    skip_token();
                     alias = getid();
 
                     token = getstrtoken();