- VC7 compiling against "single-threaded debug" libc.

- language split, so i can use struct locale from external tools.

src/common/attributes/attributes.vcproj

@@ -24,7 +24,7 @@
 				AdditionalIncludeDirectories="../kernel,../util,../..,.."
 				PreprocessorDefinitions="_WINDOWS,WIN32,_DEBUG"
 				BasicRuntimeChecks="0"
-				RuntimeLibrary="4"
+				RuntimeLibrary="5"
 				DisableLanguageExtensions="TRUE"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"

src/common/gamecode/gamecode.vcproj

@@ -116,7 +116,7 @@
 				AdditionalIncludeDirectories="../kernel,../util,../..,.."
 				PreprocessorDefinitions="_WINDOWS,WIN32"
 				BasicRuntimeChecks="0"
-				RuntimeLibrary="4"
+				RuntimeLibrary="5"
 				DisableLanguageExtensions="TRUE"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"

src/common/gamecode/report.c

@@ -1410,7 +1410,7 @@ describe(FILE * F, const region * r, int partial, faction * f)
 	}
 }
 
-void
+static void
 statistics(FILE * F, const region * r, const faction * f)
 {
 	const unit *u;

src/common/items/items.vcproj

@@ -69,7 +69,7 @@
 				AdditionalIncludeDirectories="../kernel,../util,../..,.."
 				PreprocessorDefinitions="_WINDOWS,WIN32"
 				BasicRuntimeChecks="0"
-				RuntimeLibrary="4"
+				RuntimeLibrary="5"
 				DisableLanguageExtensions="TRUE"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"

src/common/kernel/kernel.vcproj

@@ -70,7 +70,7 @@
 				AdditionalIncludeDirectories="../util,../..,.."
 				PreprocessorDefinitions="_WINDOWS,WIN32"
 				BasicRuntimeChecks="0"
-				RuntimeLibrary="4"
+				RuntimeLibrary="5"
 				DisableLanguageExtensions="TRUE"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"

src/common/modules/modules.vcproj

@@ -24,7 +24,7 @@
 				AdditionalIncludeDirectories="../kernel,../util,../..,.."
 				PreprocessorDefinitions="_WINDOWS,WIN32"
 				BasicRuntimeChecks="0"
-				RuntimeLibrary="4"
+				RuntimeLibrary="5"
 				DisableLanguageExtensions="TRUE"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"

src/common/races/races.vcproj

@@ -24,7 +24,7 @@
 				AdditionalIncludeDirectories="../kernel,../util,../..,.."
 				PreprocessorDefinitions="_WINDOWS,WIN32"
 				BasicRuntimeChecks="0"
-				RuntimeLibrary="4"
+				RuntimeLibrary="5"
 				DisableLanguageExtensions="TRUE"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"

src/common/spells/spells.vcproj

@@ -69,7 +69,7 @@
 				AdditionalIncludeDirectories="../kernel,../util,../..,.."
 				PreprocessorDefinitions="_WINDOWS,WIN32,_DEBUG"
 				BasicRuntimeChecks="0"
-				RuntimeLibrary="4"
+				RuntimeLibrary="5"
 				DisableLanguageExtensions="TRUE"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"

src/common/triggers/triggers.vcproj

@@ -24,7 +24,7 @@
 				AdditionalIncludeDirectories="../util,../kernel,../..,.."
 				PreprocessorDefinitions="_WINDOWS,WIN32,_DEBUG"
 				BasicRuntimeChecks="0"
-				RuntimeLibrary="4"
+				RuntimeLibrary="5"
 				DisableLanguageExtensions="TRUE"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"

src/common/util/language.c

@@ -13,6 +13,7 @@
  */
 #include <config.h>
 #include "language.h"
+#include "language_struct.h"
 
 #include "log.h"
 #include "goodies.h"
@@ -22,22 +23,8 @@
 #include <string.h>
 #include <assert.h>
 
-#define SMAXHASH 512
-
 /** importing **/
 
-typedef struct locale {
-	struct locale * next;
-	unsigned int hashkey;
-	const char * name;
-	struct locale_string {
-		unsigned int hashkey;
-		struct locale_string * nexthash;
-		char * str;
-		char * key;
-	} * strings[SMAXHASH];
-} locale;
-
 locale * default_locale;
 locale * locales;
 

src/common/util/language_struct.h

@@ -0,0 +1,25 @@
+#ifndef CLASS_LANGUAGE_STRUCT
+#define CLASS_LANGUAGE_STRUCT
+
+/* This file should not be included by anything in the server. If you 
+ * feel that you need to include it, it's a sure sign that you're trying to
+ * do something BAD. */
+
+#define SMAXHASH 512
+
+typedef struct locale {
+	struct locale * next;
+	unsigned int hashkey;
+	const char * name;
+	struct locale_string {
+		unsigned int hashkey;
+		struct locale_string * nexthash;
+		char * str;
+		char * key;
+	} * strings[SMAXHASH];
+} locale;
+
+extern locale * default_locale;
+extern locale * locales;
+
+#endif

src/common/util/util.vcproj

@@ -116,7 +116,7 @@
 				AdditionalIncludeDirectories="../..,.."
 				PreprocessorDefinitions="_WINDOWS,WIN32,_DEBUG"
 				BasicRuntimeChecks="0"
-				RuntimeLibrary="4"
+				RuntimeLibrary="5"
 				DisableLanguageExtensions="TRUE"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"
@@ -183,6 +183,9 @@
 			<File
 				RelativePath=".\language.h">
 			</File>
+			<File
+				RelativePath="language_struct.h">
+			</File>
 			<File
 				RelativePath=".\lists.h">
 			</File>

src/eressea.sln

@@ -21,29 +21,40 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "triggers", "common\triggers
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "common\util\util.vcproj", "{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlsplitter", "tools\xmlsplitter.vcproj", "{8031178A-081B-4BFA-AA98-46A2B03A3202}"
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Debug
 		ConfigName.1 = Release
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
-		{B859D542-781E-4647-BCAB-3FE5ED077366}.0 = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.0 = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
-		{B859D542-781E-4647-BCAB-3FE5ED077366}.1 = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.1 = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
-		{B859D542-781E-4647-BCAB-3FE5ED077366}.2 = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.2 = {79659D44-EC28-42B9-9475-6C0D62D0AAE0}
-		{B859D542-781E-4647-BCAB-3FE5ED077366}.3 = {601CF164-F483-4DE7-8014-64BDD30680B5}
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.3 = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
 		{B859D542-781E-4647-BCAB-3FE5ED077366}.4 = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
-		{B859D542-781E-4647-BCAB-3FE5ED077366}.5 = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.5 = {601CF164-F483-4DE7-8014-64BDD30680B5}
-		{B859D542-781E-4647-BCAB-3FE5ED077366}.6 = {79659D44-EC28-42B9-9475-6C0D62D0AAE0}
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.6 = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
-		{B859D542-781E-4647-BCAB-3FE5ED077366}.7 = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.7 = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
-		{B859D542-781E-4647-BCAB-3FE5ED077366}.8 = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
+		{B859D542-781E-4647-BCAB-3FE5ED077366}.8 = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
-		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.0 = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
+		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.0 = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
-		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.1 = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
+		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.1 = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
-		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.2 = {601CF164-F483-4DE7-8014-64BDD30680B5}
+		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.2 = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
-		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.3 = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
+		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.3 = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
-		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.4 = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
+		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.4 = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
-		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.5 = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
+		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.5 = {601CF164-F483-4DE7-8014-64BDD30680B5}
-		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.6 = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
+		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.6 = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
-		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.7 = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
+		{17F83AAB-352D-4F68-ADA6-09F36D86826F}.7 = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
+		{8031178A-081B-4BFA-AA98-46A2B03A3202}.0 = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
+		{8031178A-081B-4BFA-AA98-46A2B03A3202}.1 = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
+		{8031178A-081B-4BFA-AA98-46A2B03A3202}.2 = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
+		{8031178A-081B-4BFA-AA98-46A2B03A3202}.3 = {79659D44-EC28-42B9-9475-6C0D62D0AAE0}
+		{8031178A-081B-4BFA-AA98-46A2B03A3202}.4 = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
+		{8031178A-081B-4BFA-AA98-46A2B03A3202}.5 = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
+		{8031178A-081B-4BFA-AA98-46A2B03A3202}.6 = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
+		{8031178A-081B-4BFA-AA98-46A2B03A3202}.7 = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
+		{8031178A-081B-4BFA-AA98-46A2B03A3202}.8 = {601CF164-F483-4DE7-8014-64BDD30680B5}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Debug.ActiveCfg = Debug|Win32
@@ -88,6 +99,10 @@ Global
 		{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Debug.Build.0 = Debug|Win32
 		{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Release.ActiveCfg = Release|Win32
 		{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Release.Build.0 = Release|Win32
+		{8031178A-081B-4BFA-AA98-46A2B03A3202}.Debug.ActiveCfg = Debug|Win32
+		{8031178A-081B-4BFA-AA98-46A2B03A3202}.Debug.Build.0 = Debug|Win32
+		{8031178A-081B-4BFA-AA98-46A2B03A3202}.Release.ActiveCfg = Release|Win32
+		{8031178A-081B-4BFA-AA98-46A2B03A3202}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

src/eressea/eressea.vcproj

@@ -136,7 +136,7 @@
 				AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.."
 				PreprocessorDefinitions="_CONSOLE,WIN32"
 				BasicRuntimeChecks="0"
-				RuntimeLibrary="4"
+				RuntimeLibrary="5"
 				DisableLanguageExtensions="TRUE"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"
@@ -204,6 +204,9 @@
 		<File
 			RelativePath="..\common\settings-eressea.h">
 		</File>
+		<File
+			RelativePath="..\common\settings-tutorial.h">
+		</File>
 		<File
 			RelativePath="..\common\settings-vinyambar-classic.h">
 		</File>

src/mapper/map_modify.c

@@ -85,12 +85,6 @@ terrain_create(int climate)
 	return terrain;
 }
 
-static int
-blockcoord(int x)
-{
-	return ((x<0)?((x-BLOCKSIZE+1) / BLOCKSIZE):(x / BLOCKSIZE)) * BLOCKSIZE;
-}
-
 static char newblock[BLOCKSIZE][BLOCKSIZE];
 static int g_maxluxuries;
 

src/mapper/mapper.vcproj

@@ -80,7 +80,7 @@
 				AdditionalIncludeDirectories="$(CURSES_ROOT)/include;../common/kernel,../common/gamecode,../common/util,../common,.."
 				PreprocessorDefinitions="_CONSOLE,WIN32"
 				BasicRuntimeChecks="0"
-				RuntimeLibrary="4"
+				RuntimeLibrary="5"
 				DisableLanguageExtensions="TRUE"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"

src/res/de/strings.xml

@@ -2011,289 +2011,6 @@
 	<string name="WERWESEN">
 		<text locale="de">WERWESEN</text>
 	</string>
-	<string name="Adler">
-		<text locale="de">Adler</text>
-	</string>
-	<string name="Drache">
-		<text locale="de">Drache</text>
-	</string>
-	<string name="Drachen">
-		<text locale="de">Drachen</text>
-	</string>
-	<string name="Dämon">
-		<text locale="de">Dämon</text>
-	</string>
-	<string name="Dämonen">
-		<text locale="de">Dämonen</text>
-	</string>
-	<string name="Einhorn">
-		<text locale="de">Einhorn</text>
-	</string>
-	<string name="Einhörner">
-		<text locale="de">Einhörner</text>
-	</string>
-	<string name="Elf">
-		<text locale="de">Elf</text>
-	</string>
-	<string name="Elfen">
-		<text locale="de">Elfen</text>
-	</string>
-	<string name="Eule">
-		<text locale="de">Eule</text>
-	</string>
-	<string name="Eulen">
-		<text locale="de">Eulen</text>
-	</string>
-	<string name="Geist">
-		<text locale="de">Geist</text>
-	</string>
-	<string name="Geister">
-		<text locale="de">Geister</text>
-	</string>
-	<string name="Goblin">
-		<text locale="de">Goblin</text>
-	</string>
-	<string name="Goblins">
-		<text locale="de">Goblins</text>
-	</string>
-	<string name="Halbling">
-		<text locale="de">Halbling</text>
-	</string>
-	<string name="Halblinge">
-		<text locale="de">Halblinge</text>
-	</string>
-	<string name="Hirntöter">
-		<text locale="de">Hirntöter</text>
-	</string>
-	<string name="Insekt">
-		<text locale="de">Insekt</text>
-	</string>
-	<string name="Insekten">
-		<text locale="de">Insekten</text>
-	</string>
-	<string name="Jungdrache">
-		<text locale="de">Jungdrache</text>
-	</string>
-	<string name="Jungdrachen">
-		<text locale="de">Jungdrachen</text>
-	</string>
-	<string name="Katze">
-		<text locale="de">Katze</text>
-	</string>
-	<string name="Katzen">
-		<text locale="de">Katzen</text>
-	</string>
-	<string name="Luchs">
-		<text locale="de">Luchs</text>
-	</string>
-	<string name="Luchse">
-		<text locale="de">Luchse</text>
-	</string>
-	<string name="Meermensch">
-		<text locale="de">Meermensch</text>
-	</string>
-	<string name="Meermenschen">
-		<text locale="de">Meermenschen</text>
-	</string>
-	<string name="Mensch">
-		<text locale="de">Mensch</text>
-	</string>
-	<string name="Menschen">
-		<text locale="de">Menschen</text>
-	</string>
-	<string name="Ork">
-		<text locale="de">Ork</text>
-	</string>
-	<string name="Orks">
-		<text locale="de">Orks</text>
-	</string>
-	<string name="Uruk">
-		<text locale="de">Ork</text>
-	</string>
-	<string name="Uruks">
-		<text locale="de">Orks</text>
-	</string>
-	<string name="Snotling">
-		<text locale="de">Snotling</text>
-	</string>
-	<string name="Snotlinge">
-		<text locale="de">Snotlinge</text>
-	</string>
-
-	<string name="Riesenschildkröte">
-		<text locale="de">Riesenschildkröte</text>
-	</string>
-	<string name="Riesenschildkröten">
-		<text locale="de">Riesenschildkröten</text>
-	</string>
-	<string name="Schablone">
-		<text locale="de">Schablone</text>
-	</string>
-	<string name="Schablonen">
-		<text locale="de">Schablonen</text>
-	</string>
-	<string name="Schattenritter">
-		<text locale="de">Schattenritter</text>
-	</string>
-	<string name="Seeschlange">
-		<text locale="de">Seeschlange</text>
-	</string>
-	<string name="Troll">
-		<text locale="de">Troll</text>
-	</string>
-	<string name="Trolle">
-		<text locale="de">Trolle</text>
-	</string>
-	<string name="Untote">
-		<text locale="de">Untote</text>
-	</string>
-	<string name="Untoter">
-		<text locale="de">Untoter</text>
-	</string>
-	<string name="Warg">
-		<text locale="de">Warg</text>
-	</string>
-	<string name="Warge">
-		<text locale="de">Warge</text>
-	</string>
-	<string name="Zombie">
-		<text locale="de">Zombie</text>
-	</string>
-	<string name="Zombies">
-		<text locale="de">Zombies</text>
-	</string>
-	<string name="Zwerg">
-		<text locale="de">Zwerg</text>
-	</string>
-	<string name="Zwerge">
-		<text locale="de">Zwerge</text>
-	</string>
-
-	<comment>races, future use:</comment>
-	<string name="rc_lynx">
-		<text locale="de">Luchse</text>
-	</string>
-	<string name="rc_unicorn_p">
-		<text locale="de">Einhörner</text>
-	</string>
-	<string name="rc_wolve_p">
-		<text locale="de">Warge</text>
-	</string>
-	<string name="rc_dragon_p">
-		<text locale="de">Drachen</text>
-	</string>
-	<string name="rc_catdragon_p">
-		<text locale="de">Katzendrachen</text>
-	</string>
-	<string name="rc_ghost_p">
-		<text locale="de">Geister</text>
-	</string>
-	<string name="rc_cat_p">
-		<text locale="de">Katzen</text>
-	</string>
-	<string name="rc_human_p">
-		<text locale="de">Menschen</text>
-	</string>
-	<string name="rc_cat">
-		<text locale="de">Katze</text>
-	</string>
-	<string name="rc_elf">
-		<text locale="de">Elf</text>
-	</string>
-	<string name="rc_human">
-		<text locale="de">Mensch</text>
-	</string>
-	<string name="rc_elve_p">
-		<text locale="de">Elfen</text>
-	</string>
-	<string name="rc_aquarian">
-		<text locale="de">Meermensch</text>
-	</string>
-	<string name="rc_dwarve_p">
-		<text locale="de">Zwerge</text>
-	</string>
-	<string name="rc_lynx_p">
-		<text locale="de">Luchs</text>
-	</string>
-	<string name="rc_unicorn">
-		<text locale="de">Einhorn</text>
-	</string>
-	<string name="rc_wolf">
-		<text locale="de">Warg</text>
-	</string>
-	<string name="rc_dragon">
-		<text locale="de">Drache</text>
-	</string>
-	<string name="rc_catdragon">
-		<text locale="de">Katzendrache</text>
-	</string>
-	<string name="rc_dwarf">
-		<text locale="de">Zwerg</text>
-	</string>
-	<string name="rc_aquarian_p">
-		<text locale="de">Meermenschen</text>
-	</string>
-	<string name="rc_insect_p">
-		<text locale="de">Insekten</text>
-	</string>
-	<string name="rc_insect">
-		<text locale="de">Insekt</text>
-	</string>
-	<string name="rc_ghost">
-		<text locale="de">Geist</text>
-	</string>
-	<string name="rc_halfling">
-		<text locale="de">Halbling</text>
-	</string>
-	<string name="rc_halfling_p">
-		<text locale="de">Halblinge</text>
-	</string>
-	<string name="rc_troll_p">
-		<text locale="de">Trolle</text>
-	</string>
-	<string name="rc_troll">
-		<text locale="de">Troll</text>
-	</string>
-	<string name="rc_undead">
-		<text locale="de">Untote</text>
-	</string>
-	<string name="rc_undead_p">
-		<text locale="de">Untoter</text>
-	</string>
-	<string name="rc_owl">
-		<text locale="de">Eule</text>
-	</string>
-	<string name="rc_giantturtle">
-		<text locale="de">Riesenschildkröte</text>
-	</string>
-	<string name="rc_orc_p">
-		<text locale="de">Altorks</text>
-	</string>
-	<string name="rc_orc">
-		<text locale="de">Altork</text>
-	</string>
-	<string name="rc_uruk_p">
-		<text locale="de">Orks</text>
-	</string>
-	<string name="rc_uruk">
-		<text locale="de">Ork</text>
-	</string>
-	<string name="rc_snotling">
-		<text locale="de">Snotling</text>
-	</string>
-	<string name="rc_snotling_p">
-		<text locale="de">Snotlinge</text>
-	</string>
-	<string name="rc_zombie">
-		<text locale="de">Zombie</text>
-	</string>
-	<string name="rc_zombie_p">
-		<text locale="de">Zombies</text>
-	</string>
-	<string name="rc_shadowknight">
-		<text locale="de">Schattenritter</text>
-	</string>
-
 
 	<comment>NR generieren</comment>
 	<string name="nr_options">

src/res/eressea.xml

@@ -6,6 +6,7 @@
 	<comment>English Localization</comment>
 	<include file="en/messages.xml"></include>
 	<include file="en/strings.xml"></include>
+	<include file="fr/strings.xml"></include>
 
 	<include file="races.xml"></include>
 	<include file="resources.xml"></include>

src/res/fr/strings.xml

@@ -1588,259 +1588,259 @@
 	</string>
 
 	<namespace name="race">
-	<string name="Adler">
+	<string name="eagle">
 		<text locale="fr">aigle</text>
 	</string>
-	<string name="Drache">
+	<string name="eagle_p">
 		<text locale="fr">dragon</text>
 	</string>
-	<string name="Drachen">
+	<string name="dragon_p">
 		<text locale="fr">dragons</text>
 	</string>
-	<string name="Dämon">
+	<string name="demon">
 		<text locale="fr">démon</text>
 	</string>
-	<string name="Dämonen">
+	<string name="demon_p">
 		<text locale="fr">démons</text>
 	</string>
-	<string name="Einhorn">
+	<string name="unicorn">
 		<text locale="fr">licorne</text>
 	</string>
-	<string name="Einhörner">
+	<string name="unicorn_p">
 		<text locale="fr">licornes</text>
 	</string>
-	<string name="Elf">
+	<string name="elf">
 		<text locale="fr">elfe</text>
 	</string>
-	<string name="Elfen">
+	<string name="elf_p">
 		<text locale="fr">elfes</text>
 	</string>
-	<string name="Eule">
+	<string name="owl">
 		<text locale="fr">hibou</text>
 	</string>
-	<string name="Eulen">
+	<string name="owl_p">
 		<text locale="fr">hibous</text>
 	</string>
-	<string name="Geist">
+	<string name="ghost">
 		<text locale="fr">fantôme</text>
 	</string>
-	<string name="Geister">
+	<string name="ghost_p">
 		<text locale="fr">fantômes</text>
 	</string>
-	<string name="Goblin">
+	<string name="goblin">
 		<text locale="fr">gobelin</text>
 	</string>
-	<string name="Goblins">
+	<string name="goblin_p">
 		<text locale="fr">gobelins</text>
 	</string>
-	<string name="Halbling">
+	<string name="halfling">
 		<text locale="fr">hobbit</text>
 	</string>
-	<string name="Halblinge">
+	<string name="halfling_p">
 		<text locale="fr">hobbits</text>
 	</string>
-	<string name="Hirntöter">
+	<string name="braineater">
 		<text locale="fr">céphalophage</text>
 	</string>
-	<string name="Insekt">
+	<string name="insect">
 		<text locale="fr">insecte</text>
 	</string>
-	<string name="Insekten">
+	<string name="insect_p">
 		<text locale="fr">insectes</text>
 	</string>
-	<string name="Jungdrache">
+	<string name="young dragon">
 		<text locale="fr">dragonnet</text>
 	</string>
-	<string name="Jungdrachen">
+	<string name="young dragon_p">
 		<text locale="fr">dragonnets</text>
 	</string>
-	<string name="Katze">
+	<string name="cat">
 		<text locale="fr">chat</text>
 	</string>
-	<string name="Katzen">
+	<string name="cat_p">
 		<text locale="fr">chats</text>
 	</string>
-	<string name="Katzendrache">
+	<string name="catdragon">
 		<text locale="fr">dragon-chat</text>
 	</string>
-	<string name="Katzendrachen">
+	<string name="catdragon_p">
 		<text locale="fr">dragons-chats</text>
 	</string>
-	<string name="Luchs">
+	<string name="lynx">
 		<text locale="fr">lynx</text>
 	</string>
-	<string name="Luchse">
+	<string name="lynx_p">
 		<text locale="fr">lynx</text>
 	</string>
-	<string name="Meermensch">
+	<string name="aquarian">
 		<text locale="fr">atlante</text>
 	</string>
-	<string name="Meermenschen">
+	<string name="aquarian_p">
 		<text locale="fr">atlantes</text>
 	</string>
-	<string name="Mensch">
+	<string name="human">
 		<text locale="fr">humain</text>
 	</string>
-	<string name="Menschen">
+	<string name="human_p">
 		<text locale="fr">humains</text>
 	</string>
-	<string name="Ork">
+	<string name="orc">
 		<text locale="fr">orque</text>
 	</string>
-	<string name="Orks">
+	<string name="orc_p">
 		<text locale="fr">orques</text>
 	</string>
-	<string name="Uruk">
+	<string name="uruk">
 		<text locale="fr">orque</text>
 	</string>
-	<string name="Uruks">
+	<string name="uruk_p">
 		<text locale="fr">orques</text>
 	</string>
-	<string name="Riesenschildkröte">
+	<string name="giantturtle">
 		<text locale="fr">tortue géante</text>
 	</string>
-	<string name="Riesenschildkröten">
+	<string name="giantturtle_p">
 		<text locale="fr">tortues géantes</text>
 	</string>
-	<string name="Schablone">
+	<string name="template">
 		<text locale="fr">modèle</text>
 	</string>
-	<string name="Schablonen">
+	<string name="template_p">
 		<text locale="fr">modèles</text>
 	</string>
-	<string name="Schattenritter">
+	<string name="shadow knight">
 		<text locale="fr">guerrier illusoire</text>
 	</string>
-	<string name="Seeschlange">
+	<string name="sea serpent">
 		<text locale="fr">serpent de mer</text>
 	</string>
-	<string name="Troll">
+	<string name="troll">
 		<text locale="fr">troll</text>
 	</string>
-	<string name="Trolle">
+	<string name="troll_p">
 		<text locale="fr">trolls</text>
 	</string>
-	<string name="Untote">
+	<string name="undead">
 		<text locale="fr">mort-vivant</text>
 	</string>
-	<string name="Untoter">
+	<string name="undead_p">
 		<text locale="fr">morts-vivants</text>
 	</string>
-	<string name="Warg">
+	<string name="direwolf">
 		<text locale="fr">warg</text>
 	</string>
-	<string name="Warge">
+	<string name="direwolf_p">
 		<text locale="fr">wargs</text>
 	</string>
-	<string name="Zombie">
+	<string name="zombie">
 		<text locale="fr">zombie</text>
 	</string>
-	<string name="Zombie_p">
+	<string name="zombie_p">
 		<text locale="fr">zombies</text>
 	</string>
-	<string name="Zwerg">
+	<string name="dwarf">
 		<text locale="fr">nain</text>
 	</string>
-	<string name="Zwerge">
+	<string name="dwarf_p">
 		<text locale="fr">nains</text>
 	</string>
-	<string name="Kröte">
+	<string name="toad">
 		<text locale="fr">crapaud</text>
 	</string>
-	<string name="Kröten">
+	<string name="toad_p">
 		<text locale="fr">crapauds</text>
 	</string>
-	<string name="Klon">
+	<string name="clone">
 		<text locale="fr">métamorphe</text>
 	</string>
-	<string name="Gnom">
+	<string name="gnome">
 		<text locale="fr">gnome</text>
 	</string>
-	<string name="Museumsgeist">
+	<string name="museumghost">
 		<text locale="fr">fantôme du musée</text>
 	</string>
-	<string name="Ghast">
+	<string name="ghast">
 		<text locale="fr">spectre</text>
 	</string>
-	<string name="Ghoul">
+	<string name="ghoul">
 		<text locale="fr">goule</text>
 	</string>
-	<string name="Juju-Zombie">
+	<string name="juju-zombie">
 		<text locale="fr">zombie juju</text>
 	</string>
-	<string name="Skelettherr">
+	<string name="skeleton lord">
 		<text locale="fr">liche</text>
 	</string>
-	<string name="Zentaur">
+	<string name="centaur">
 		<text locale="fr">centaure</text>
 	</string>
-	<string name="Krake">
+	<string name="kraken">
 		<text locale="fr">kraken</text>
 	</string>
-	<string name="Delphin">
+	<string name="dolphin">
 		<text locale="fr">dauphin</text>
 	</string>
-	<string name="Tiger">
+	<string name="tiger">
 		<text locale="fr">tigre</text>
 	</string>
-	<string name="Höllenkatze">
+	<string name="hellcat">
 		<text locale="fr">chat de l'Enfer</text>
 	</string>
-	<string name="Traumkatze">
+	<string name="dreamcat">
 		<text locale="fr">chat des rêves</text>
 	</string>
-	<string name="Teufelchen">
+	<string name="imp">
 		<text locale="fr">diablotin</text>
 	</string>
-	<string name="Nymphe">
+	<string name="nymph">
 		<text locale="fr">nymphe</text>
 	</string>
-	<string name="Singdrache">
+	<string name="songdragon">
 		<text locale="fr">dragon chinois</text>
 	</string>
-	<string name="Ratte">
+	<string name="rat">
 		<text locale="fr">rat</text>
 	</string>
-	<string name="Tunnelwurm">
+	<string name="tunnelworm">
 		<text locale="fr">ver des profondeurs</text>
 	</string>
-	<string name="Wolf">
+	<string name="wolf">
 		<text locale="fr">loup</text>
 	</string>
-	<string name="Bauer">
+	<string name="peasant">
 		<text locale="fr">paysan</text>
 	</string>
-	<string name="Alp">
+	<string name="alp">
 		<text locale="fr">quauquemaire</text>
 	</string>
-	<string name="Bergwächter">
+	<string name="mountainguard">
 		<text locale="fr">yéti</text>
 	</string>
-	<string name="Schattenmeister">
+	<string name="shadowmaster">
 		<text locale="fr">lémure</text>
 	</string>
-	<string name="Schattendämon">
+	<string name="shadowdemon">
 		<text locale="fr">ombre</text>
 	</string>
-	<string name="Eisengolem">
+	<string name="irongolem">
 		<text locale="fr">golem de fer</text>
 	</string>
-	<string name="Zauber">
+	<string name="spell">
 		<text locale="fr">enchantement</text>
 	</string>
-	<string name="Spezial">
+	<string name="special">
 		<text locale="fr">spécial</text>
 	</string>
-	<string name="Dracoid">
+	<string name="dracoid">
 		<text locale="fr">draconien</text>
 	</string>
-	<string name="Ent">
+	<string name="ent">
 		<text locale="fr">ent</text>
 	</string>
-	<string name="Wyrm">
+	<string name="wyrm">
 		<text locale="fr">wyrm</text>
 	</string>
-	<string name="Illusion">
+	<string name="illusion">
 		<text locale="fr">illusion</text>
 	</string>
 	</namespace>