From df88ebdf83f3aef11615f88d3755d64c13735a35 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 22 Apr 2001 20:17:25 +0000
Subject: [PATCH] bugfix segfault durch kaputte message

---
 src/common/gamecode/gamecode-6.dsp | 16 ++++++++--------
 src/res/de/messages.xml            |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/common/gamecode/gamecode-6.dsp b/src/common/gamecode/gamecode-6.dsp
index 5f1a3cb2f..8430cbc79 100644
--- a/src/common/gamecode/gamecode-6.dsp
+++ b/src/common/gamecode/gamecode-6.dsp
@@ -7,21 +7,21 @@
 CFG=gamecode - Win32 Conversion
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "gamecode-6.mak".
-!MESSAGE
+!MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "gamecode-6.mak" CFG="gamecode - Win32 Conversion"
-!MESSAGE
+!MESSAGE 
 !MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE 
 !MESSAGE "gamecode - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "gamecode - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE "gamecode - Win32 Conversion" (based on "Win32 (x86) Static Library")
 !MESSAGE "gamecode - Win32 Profile" (based on "Win32 (x86) Static Library")
-!MESSAGE
+!MESSAGE 
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../util" /I "../kernel" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../kernel" /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD BASE RSC /l 0x407
 # ADD RSC /l 0x407
 BSC32=bscmake.exe
@@ -124,7 +124,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
-!ENDIF
+!ENDIF 
 
 # Begin Target
 
diff --git a/src/res/de/messages.xml b/src/res/de/messages.xml
index 95b673278..9c6de6c42 100644
--- a/src/res/de/messages.xml
+++ b/src/res/de/messages.xml
@@ -3956,18 +3956,18 @@
 
 <message name="donation">
 	<type>
-		<arg name="from" type="unit"></arg>
+		<arg name="from" type="faction"></arg>
 		<arg name="amount" type="int"></arg>
-		<arg name="to" type="unit"></arg>
+		<arg name="to" type="faction"></arg>
 	</type>
 	<locale name="de">
 		<nr section="events">
-			<text>"$unit($from) spendete $int($amount) Silber an $unit($to)."</text>
+			<text>"$faction($from) spendete $int($amount) Silber an $faction($to)."</text>
 		</nr>
 	</locale>
 	<locale name="en">
 		<nr section="none">
-			<text>"$unit($from) donates $int($amount) silver to $unit($to)."</text>
+			<text>"$faction($from) donates $int($amount) silver to $faction($to)."</text>
 		</nr>
 	</locale>
 </message>