diff --git a/Intro.cpp b/Intro.cpp
index 24964e78f..ad49ebf7c 100644
--- a/Intro.cpp
+++ b/Intro.cpp
@@ -504,9 +504,26 @@ void DisplaySirtechSplashScreen()
 //	FilenameForBPP("INTERFACE\\TShold.sti", VObjectDesc.ImageFile);
 	if( !AddVideoObject(&VObjectDesc, &uiLogoID) )
 	{	
+  	FilenameForBPP("GERMAN\\SPLASH_GERMAN.sti", VObjectDesc.ImageFile);
+	  if( !AddVideoObject(&VObjectDesc, &uiLogoID) )
+	  {	
+      /* 
+       * This is the place, where most non english coders stranding.
+       * Don't hesitate, don't give up! 
+       * I'll now tell You what You made wrong
+       *                                (2006-10-10, Sergeant_Kolja)
+       */
+      #ifdef _DEBUG
+      #  if defined(ENGLISH)
+		     AssertMsg( 0, String( "Wheter English nor German works. May be You built English - but have only German or other foreign Disk?" ) );
+      #  elif defined(GERMAN)
+		     AssertMsg( 0, String( "Weder Englisch noch Deutsch geht. Deutsche Version kompiliert und mit englischer CDs gestartet? Das geht nicht!" ) );
+      #  endif
+      #endif
 		AssertMsg( 0, String( "Failed to load %s", VObjectDesc.ImageFile ) );
 		return;
 	}
+	}
 
 	GetVideoObject(&hPixHandle, uiLogoID);
 	BltVideoObject(FRAME_BUFFER, hPixHandle, 0,(SCREEN_WIDTH-640)/2, (SCREEN_HEIGHT-480)/2, VO_BLT_SRCTRANSPARENCY,NULL);
diff --git a/JA2.suo b/JA2.suo
index e9b33e8dd..2d5c7a9c5 100644
Binary files a/JA2.suo and b/JA2.suo differ
diff --git a/Language Defines.h b/Language Defines.h
index 5c95c2406..438577df7 100644
--- a/Language Defines.h	
+++ b/Language Defines.h	
@@ -1,18 +1,58 @@
 #ifndef __LANGUAGE_DEFINES_H
 #define __LANGUAGE_DEFINES_H
 
-//ONLY ONE OF THESE CAN BE DEFINED AT A TIME!
+#pragma once
 
+/* ============================================================================
+ * ONLY ONE OF THESE LANGUAGES CAN BE DEFINED AT A TIME!
+ * BUT now You can define it _here_ by uncommenting one _or_ (better):
+ * You can comment them all out and then set it _global_ in "Preprocessor 
+ * options" (do it for ALL projects in the workspace and both debug & release)
+ *   _or_
+ * give it do Your MAKEFILE, f.i. make ENGLISH, but keep in mind that some 
+ * weird make tools will require 'make ENGLISH=1' instead
+ * 
+ * using one of the two later methods will keep this SVN file unchanged for the
+ * future, only Your private project files (workspace/solution) will differ 
+ * from the SVN stuff.
+ *                                             (2006-10-10, Sergeant_Kolja)
+ */
+
+#if !defined(ENGLISH) && !defined(GERMAN) && !defined(RUSSIAN) && !defined(DUTCH) && !defined(POLISH)
+/* please set one manually here (by uncommenting) if not willingly to set Workspace wide */
 #define ENGLISH
 //#define GERMAN
 //#define RUSSIAN
 //#define DUTCH
 //#define POLISH
+#endif
+
+
+
+/* ====================================================================
+ * Regardless of if we did it Workspace wide or by uncommenting above,
+ * HERE we must see, what languaga was selected. If one, we
+ */
+#if defined(ENGLISH)
+#  pragma message(" (Language set to ENGLISH, You'll need english CDs)")
+#elif defined(GERMAN)
+#  pragma message(" (Language set to GERMAN, You'll need Topware/german CDs)")
+#elif defined(RUSSIAN)
+#  pragma message(" (Language set to RUSSIAN, You'll need russian CDs)")
+#elif defined(DUTCH)
+#  pragma message(" (Language set to DUTCH, You'll need dutch CDs)")
+#elif defined(POLISH)
+#  pragma message(" (Language set to POLISH, You'll need polish CDs)")
+#else
+#  error "At least You have to specify a Language somewhere. See comments above."
+#endif
+
+
+
+
 
 #define BLOOD_N_GORE_ENABLED
 
-
-
 //if the language represents words as single chars
 #ifdef TAIWAN
 	#define	SINGLE_CHAR_WORDS