diff --git a/stepmania/Installer/Languages/de.ini b/stepmania/Installer/Languages/de.ini
new file mode 100644
index 0000000000..956c883a62
--- /dev/null
+++ b/stepmania/Installer/Languages/de.ini
@@ -0,0 +1,34 @@
+[Installer Sections]
+TEXT_IO_CHECK_FOR_UPDATES=Updates zu überprüfen
+TEXT_IO_RUN=${PRODUCT_DISPLAY}
+TEXT_IO_OPEN_PROGRAM_FOLDER=${PRODUCT_NAME} Programmordner öffnen
+TEXT_IO_MANUAL=${PRODUCT_ID} Dokumentation
+TEXT_IO_TOOLS=${PRODUCT_ID} Werkzeug
+TEXT_IO_WEB_SITE=${PRODUCT_ID} Webseite
+TEXT_IO_UNINSTALL=Deinstallation von ${PRODUCT_DISPLAY}
+TEXT_IO_VIEW_STATISTICS=Statistiken anschauen
+TEXT_IO_REMOVE_ONLY=${PRODUCT_DISPLAY} (Nur entfernen)
+TEXT_IO_SMZIP_PACKAGE=SMZIP Paket
+TEXT_IO_FATAL_ERROR_COPYING_PCK=Fatal error copying pck files.
+TEXT_IO_FATAL_ERROR_INSTALL=Fatal error during install.
+
+[Installer Functions]
+TEXT_IO_TITLE=${PRODUCT_DISPLAY}
+TEXT_IO_SUBTITLE=  
+TEXT_IO_INSTALL=Installieren
+TEXT_IO_PLAY=Spielen
+TEXT_IO_REINSTALL=Noch mal installieren
+
+[Leave Autorun]
+TEXT_IO_COULD_NOT_EXECUTE=Konnte $INSTDIR\Program\${PRODUCT_FAMILY}.exe nicht ausführen
+
+[PreInstall]
+TEXT_IO_UNINSTALL_PREVIOUS=Die letzte Version von ${PRODUCT_ID} muss deinstalliert werden, bevor Sie weiter machen. Wollen Sie fortfahren?
+TEXT_IO_DIRECTX_VISIT_MICROSOFT=Die letzte Version von DirectX (8.1 oder höher) ist dringend zu empfehlen.  Wollen Sie die Webseite von Microsoft jetzt besuchen?
+TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY=Deinstallation fehlgeschlagen.  Trotzdem installieren?
+TEXT_IO_INSTALL_DIRECTX=Die letzte Version von DirectX (8.1 oder höher) ist dringend zu empfehlen.  Wollen Sie es jetzt installieren?
+TEXT_IO_FULL_INSTALL_NOT_FOUND=$(PRODUCT_ID) scheint nicht installiert zu sein.\nWollen Sie fortfahren?
+
+[Uninstall]
+TEXT_IO_FATAL_ERROR_UNINSTALL=Fatal error during uninstall.
+
diff --git a/stepmania/Installer/Languages/en.ini b/stepmania/Installer/Languages/en.ini
new file mode 100644
index 0000000000..e2d21cd147
--- /dev/null
+++ b/stepmania/Installer/Languages/en.ini
@@ -0,0 +1,33 @@
+[Installer Sections]
+TEXT_IO_CHECK_FOR_UPDATES=Check for Updates
+TEXT_IO_RUN=${PRODUCT_DISPLAY}
+TEXT_IO_OPEN_PROGRAM_FOLDER=Open ${PRODUCT_ID} Program Folder
+TEXT_IO_MANUAL=${PRODUCT_ID} Manual
+TEXT_IO_TOOLS=${PRODUCT_ID} Tools
+TEXT_IO_WEB_SITE=${PRODUCT_ID} Web Site
+TEXT_IO_UNINSTALL=Uninstall ${PRODUCT_DISPLAY}
+TEXT_IO_VIEW_STATISTICS=View Statistics
+TEXT_IO_REMOVE_ONLY=${PRODUCT_DISPLAY} (remove only)
+TEXT_IO_SMZIP_PACKAGE=SMZIP package
+TEXT_IO_FATAL_ERROR_COPYING_PCK	=Fatal error copying pck files.
+TEXT_IO_FATAL_ERROR_INSTALL=Fatal error during install.
+
+[Installer Functions]
+TEXT_IO_TITLE=${PRODUCT_DISPLAY}
+TEXT_IO_SUBTITLE= 
+TEXT_IO_INSTALL=Install
+TEXT_IO_PLAY=Play
+TEXT_IO_REINSTALL=Reinstall
+
+[Leave Autorun]
+TEXT_IO_COULD_NOT_EXECUTE=Could not execute $INSTDIR\Program\${PRODUCT_FAMILY}.exe
+
+[PreInstall]
+TEXT_IO_UNINSTALL_PREVIOUS=The previous version of ${PRODUCT_ID} must be uninstalled before continuing.\nDo you wish to continue?
+TEXT_IO_DIRECTX_VISIT_MICROSOFT=The latest version of DirectX (8.1 or higher) is strongly recommended.\nDo you wish to visit Microsoft's site now?
+TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY=Uninstallation failed.  Install anyway?
+TEXT_IO_INSTALL_DIRECTX=The latest version of DirectX (8.1 or higher) is required.\n Do you wish to install DirectX 8.1 now?
+TEXT_IO_FULL_INSTALL_NOT_FOUND=${PRODUCT_ID} does not appear to be installed.\nDo you wish to continue?
+
+[Uninstall]
+TEXT_IO_FATAL_ERROR_UNINSTALL=Fatal error during uninstall.
diff --git a/stepmania/Installer/Languages/es.ini b/stepmania/Installer/Languages/es.ini
new file mode 100644
index 0000000000..51a30e9425
--- /dev/null
+++ b/stepmania/Installer/Languages/es.ini
@@ -0,0 +1,34 @@
+[Installer Sections]
+TEXT_IO_CHECK_FOR_UPDATES=Compruebe para actualizaciones
+TEXT_IO_RUN=${PRODUCT_DISPLAY}
+TEXT_IO_OPEN_PROGRAM_FOLDER=Open ${PRODUCT_ID} Program Folder
+TEXT_IO_MANUAL=${PRODUCT_ID} Documenatione
+TEXT_IO_TOOLS=${PRODUCT_ID} Herramientas
+TEXT_IO_WEB_SITE=${PRODUCT_ID} Web Site
+TEXT_IO_UNINSTALL=Uninstall ${PRODUCT_DISPLAY}
+TEXT_IO_VIEW_STATISTICS=Vea la estadística
+TEXT_IO_REMOVE_ONLY=${PRODUCT_DISPLAY} (Quite solamente)
+TEXT_IO_SMZIP_PACKAGE=SMZIP package
+TEXT_IO_FATAL_ERROR_COPYING_PCK=Fatal error copying pck files.
+TEXT_IO_FATAL_ERROR_INSTALL=Fatal error during install.
+
+[Installer Functions]
+TEXT_IO_TITLE=${PRODUCT_DISPLAY}
+TEXT_IO_SUBTITLE= 
+TEXT_IO_INSTALL=Instale
+TEXT_IO_PLAY=Juego
+TEXT_IO_REINSTALL=Reinstálese
+
+[Leave Autorun]
+TEXT_IO_COULD_NOT_EXECUTE=$INSTDIR\Program\${PRODUCT_FAMILY}.exe No podía ejecutarse
+
+[PreInstall]
+TEXT_IO_UNINSTALL_PREVIOUS=La versión ${PRODUCT_ID} anterior del debe ser uninstalled antes de continuar.  Usted desea continuar?
+TEXT_IO_DIRECTX_VISIT_MICROSOFT=La versión más última de DirectX (8,1 o más alto) se recomienda fuertemente.  Usted desea ahora visitar el sitio de Microsoft?
+TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY=Uninstallation falló.  ¿Instale de todos modos?
+TEXT_IO_INSTALL_DIRECTX=La versión más última de DirectX (8,1 o más alto) se recomienda fuertemente.  Usted desea ahora instalarla?
+TEXT_IO_FULL_INSTALL_NOT_FOUND=${PRODUCT_ID}
+
+[Uninstall]
+TEXT_IO_FATAL_ERROR_UNINSTALL=Fatal error during uninstall.
+
diff --git a/stepmania/Installer/Languages/fr.ini b/stepmania/Installer/Languages/fr.ini
new file mode 100644
index 0000000000..6c6d9a71c6
--- /dev/null
+++ b/stepmania/Installer/Languages/fr.ini
@@ -0,0 +1,34 @@
+[Installer Sections]
+TEXT_IO_CHECK_FOR_UPDATES=Vérifier les mises à jour
+TEXT_IO_RUN=${PRODUCT_DISPLAY}
+TEXT_IO_OPEN_PROGRAM_FOLDER=Open ${PRODUCT_ID} Program Folder
+TEXT_IO_MANUAL=Documentation de ${PRODUCT_ID}
+TEXT_IO_TOOLS=d'Outils de ${PRODUCT_ID}
+TEXT_IO_WEB_SITE=Le site web de ${PRODUCT_ID}
+TEXT_IO_UNINSTALL=Désinstaller ${PRODUCT_DISPLAY}
+TEXT_IO_VIEW_STATISTICS=Voir les statistiques
+TEXT_IO_REMOVE_ONLY=${PRODUCT_DISPLAY} (Supprimer uniquement)
+TEXT_IO_SMZIP_PACKAGE=SMZIP package
+TEXT_IO_FATAL_ERROR_COPYING_PCK=Fatal error copying pck files.
+TEXT_IO_FATAL_ERROR_INSTALL=Fatal error during install.
+
+[Installer Functions]
+TEXT_IO_TITLE=${PRODUCT_DISPLAY}
+TEXT_IO_SUBTITLE= 
+TEXT_IO_INSTALL=Installer
+TEXT_IO_PLAY=Jouer
+TEXT_IO_REINSTALL=Réinstaller
+
+[Leave Autorun]
+TEXT_IO_COULD_NOT_EXECUTE=N'a pas pu exécuter $INSTDIR\Program\${PRODUCT_FAMILY}.exe
+
+[PreInstall]
+TEXT_IO_UNINSTALL_PREVIOUS=La version précédente de ${PRODUCT_ID} doit être déinstallée pour pouvoir continuer. Voulez-vous continuer ?
+TEXT_IO_DIRECTX_VISIT_MICROSOFT=La dernière version de DirectX (8.1 ou supérieure) est hautement recommandée. Voulez-vous visiter le site de Microsoft maintenant ?
+TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY=Echec de la déinstallation. Voulez-vous tout de même lancer l'installation ?
+TEXT_IO_INSTALL_DIRECTX=La dernière version de DirectX (8.1 ou supérieure) est hautement recommandée. Désirez-vous l'installer maintenant ?
+TEXT_IO_FULL_INSTALL_NOT_FOUND=${PRODUCT_ID}
+
+[Uninstall]
+TEXT_IO_FATAL_ERROR_UNINSTALL=Fatal error during uninstall.
+
diff --git a/stepmania/Installer/Languages/it.ini b/stepmania/Installer/Languages/it.ini
new file mode 100644
index 0000000000..433e138709
--- /dev/null
+++ b/stepmania/Installer/Languages/it.ini
@@ -0,0 +1,34 @@
+[Installer Sections]
+TEXT_IO_CHECK_FOR_UPDATES=Per cercare aggiornamenti
+TEXT_IO_RUN=${PRODUCT_DISPLAY}
+TEXT_IO_OPEN_PROGRAM_FOLDER=Open ${PRODUCT_ID} Program Folder
+TEXT_IO_MANUAL=${PRODUCT_ID} Documentazione
+TEXT_IO_TOOLS=${PRODUCT_ID} Strumenti
+TEXT_IO_WEB_SITE=${PRODUCT_ID} Sito Web
+TEXT_IO_UNINSTALL=Disinstalla ${PRODUCT_DISPLAY}
+TEXT_IO_VIEW_STATISTICS=Mostra Statistiche
+TEXT_IO_REMOVE_ONLY=${PRODUCT_DISPLAY} (Elimina soltanto)
+TEXT_IO_SMZIP_PACKAGE=SMZIP package
+TEXT_IO_FATAL_ERROR_COPYING_PCK=Fatal error copying pck files.
+TEXT_IO_FATAL_ERROR_INSTALL=Fatal error during install.
+
+[Installer Functions]
+TEXT_IO_TITLE=${PRODUCT_DISPLAY}
+TEXT_IO_SUBTITLE= 
+TEXT_IO_INSTALL=Installa
+TEXT_IO_PLAY=Gioca
+TEXT_IO_REINSTALL=Re-installa
+
+[Leave Autorun]
+TEXT_IO_COULD_NOT_EXECUTE=Impossibile eseguire $INSTDIR\Program\${PRODUCT_FAMILY}.exe
+
+[PreInstall]
+TEXT_IO_UNINSTALL_PREVIOUS=Prima di continuare va installata la versione precendente di ${PRODUCT_ID}.  Vuoi continuare?
+TEXT_IO_DIRECTX_VISIT_MICROSOFT=Si consiglia vivamente di installare la versione più recente di TDirectX (8.1 o superiore).  Vuoi visitare il sito Microsoft adesso?
+TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY=Disinstallazione non riuscita.  Vuoi installare comunque?
+TEXT_IO_INSTALL_DIRECTX=Si consiglia vivamente di installare la versione più recente di TDirectX (8.1 o superiore).  Vuoi installarla adesso?
+TEXT_IO_FULL_INSTALL_NOT_FOUND=${PRODUCT_ID}
+
+[Uninstall]
+TEXT_IO_FATAL_ERROR_UNINSTALL=Fatal error during uninstall.
+
diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini
index 0bccb06728..d4f5d55de2 100644
--- a/stepmania/Themes/default/Languages/en.ini
+++ b/stepmania/Themes/default/Languages/en.ini
@@ -136,7 +136,7 @@ Error reading line '%s' from '%s': Each line must have either 3 or 4 values.  Th
 Error reading file '%s'.=Error reading file '%s'.
 Exported to your Desktop as '%s'.=Exported to your Desktop as '%s'.
 Failed to save '%s'.=Failed to save '%s'.
-Imported %d strings into '%s'.  %d were overwritten.  %d empty strings were ignored.=Imported %d strings into '%s'.  %d were overwritten.  %d empty strings were ignored.
+Imported %d strings into '%s'.\n - %d were added.\n - %d were modified\n - %d were unchanged\n - %d empty strings were ignored=Imported %d strings into '%s'.\n - %d were added.\n - %d were modified\n - %d were unchanged\n - %d empty strings were ignored
 Importing these strings will override all data in '%s'. Continue?=Importing these strings will overwrite all data in '%s'. Continue?
 There are no strings to export for this language.=There are no strings to export for this language.
 This will permanently delete '%s'. Continue?=This will permanently delete '%s'. Continue?
diff --git a/stepmania/src/ExportNsisStrings.cpp b/stepmania/src/ExportNsisStrings.cpp
new file mode 100644
index 0000000000..2a21e88b97
--- /dev/null
+++ b/stepmania/src/ExportNsisStrings.cpp
@@ -0,0 +1,66 @@
+#include "global.h"
+#include "ExportNsisStrings.h"
+#include "RageFile.h"
+#include "RageUtil.h"
+#include "IniFile.h"
+
+const RString INSTALLER_LANGUAGES_DIR = "Installer/Languages/";
+
+void ExportNsisStrings::Do()
+{
+	RageFile out;
+	if( !out.Open( "nsis_strings_temp.inc", RageFile::WRITE ) )
+		RageException::Throw("Error opening file for write.");
+
+	vector<RString> vs;
+	GetDirListing( INSTALLER_LANGUAGES_DIR + "*.ini", vs, false, false );
+	FOREACH_CONST( RString, vs, s )
+	{
+		RString sThrowAway, sLangCode;
+		splitpath( *s, sThrowAway, sLangCode, sThrowAway );
+		const LanguageInfo *pLI = GetLanguageInfo( sLangCode );
+		
+		RString sLangNameUpper = pLI->szEnglishName;
+		sLangNameUpper.MakeUpper();
+
+		IniFile ini;
+		if( !ini.ReadFile( INSTALLER_LANGUAGES_DIR + *s ) )
+			RageException::Throw("Error opening file for read.");
+		FOREACH_CONST_Child( &ini, child )
+		{
+			FOREACH_CONST_Attr( child, attr )
+			{
+				RString sName = attr->first;
+				RString sValue = attr->second;
+				sValue.Replace( "\\n", "$\\n" );
+				RString sLine = ssprintf( "LangString %s ${LANG_%s} \"%s\"", sName.c_str(), sLangNameUpper.c_str(), sValue.c_str() );
+				out.PutLine( sLine );
+			}
+		}
+	}
+}
+
+/*
+ * (c) 2006 Chris Danford
+ * All rights reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons to
+ * whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+ * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
+ * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
diff --git a/stepmania/src/ExportNsisStrings.h b/stepmania/src/ExportNsisStrings.h
new file mode 100644
index 0000000000..8e3304bb7d
--- /dev/null
+++ b/stepmania/src/ExportNsisStrings.h
@@ -0,0 +1,36 @@
+/* ExportNsisStrings -  */
+
+#ifndef ExportNsisStrings_H
+#define ExportNsisStrings_H
+
+namespace ExportNsisStrings
+{
+	void Do();
+}
+
+#endif
+
+/*
+ * (c) 2006 Chris Danford
+ * All rights reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons to
+ * whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+ * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
+ * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am
index 31bf314cc3..954d9a9254 100644
--- a/stepmania/src/Makefile.am
+++ b/stepmania/src/Makefile.am
@@ -130,15 +130,16 @@ Trail.cpp Trail.h TrailUtil.cpp TrailUtil.h TitleSubstitution.cpp TitleSubstitut
 Tween.cpp Tween.h
 
 FileTypes = IniFile.cpp IniFile.h \
-		MsdFile.cpp MsdFile.h \
-		XmlFile.cpp XmlFile.h \
-		XmlFileUtil.cpp XmlFileUtil.h
+MsdFile.cpp MsdFile.h \
+XmlFile.cpp XmlFile.h \
+XmlFileUtil.cpp XmlFileUtil.h
 
-StepMania = StdString.h \
-		StepMania.cpp StepMania.h \
-		GameLoop.cpp GameLoop.h \
-		global.cpp global.h \
-		SpecialFiles.cpp SpecialFiles.h
+StepMania = ExportNsisStrings.cpp ExportNsisStrings.h \
+StdString.h \
+StepMania.cpp StepMania.h \
+GameLoop.cpp GameLoop.h \
+global.cpp global.h \
+SpecialFiles.cpp SpecialFiles.h
 
 LoadingWindow = arch/LoadingWindow/LoadingWindow.h \
 		arch/LoadingWindow/LoadingWindow_Null.h
diff --git a/stepmania/src/StepMania-net2003.vcproj b/stepmania/src/StepMania-net2003.vcproj
index d82a19926c..4e964fb90f 100644
--- a/stepmania/src/StepMania-net2003.vcproj
+++ b/stepmania/src/StepMania-net2003.vcproj
@@ -1198,6 +1198,12 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 		<Filter
 			Name="StepMania"
 			Filter="">
+			<File
+				RelativePath=".\ExportNsisStrings.cpp">
+			</File>
+			<File
+				RelativePath=".\ExportNsisStrings.h">
+			</File>
 			<File
 				RelativePath=".\GameLoop.cpp">
 			</File>
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index e3e51ee5e4..84704e8afb 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -38,6 +38,7 @@
 #include "RageSurface_Load.h"
 #include "arch/arch.h"
 #include "CatalogXml.h"
+#include "ExportNsisStrings.h"
 
 //
 // StepMania global classes
@@ -1113,7 +1114,10 @@ int main(int argc, char* argv[])
 		NSMAN->DisplayStartupStatus();	// If we're using networking show what happened
 
 	/* Run the main loop. */
-	GameLoop::RunGameLoop();
+	if( GetCommandlineArgument("ExportNsisStrings") )
+		ExportNsisStrings::Do();
+	else
+		GameLoop::RunGameLoop();
 
 	/* If we ended mid-game, finish up. */
 	GAMESTATE->EndGame();
diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index e148254d70..3dbaee0fb3 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="StepMania" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 60000
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
@@ -62,7 +62,7 @@ IntDir=.\../Debug6
 TargetDir=\cvs\stepmania\Program
 TargetName=StepMania-debug
 SOURCE="$(InputPath)"
-PreLink_Cmds=archutils\Win32\verinc      	cl        /Zl        /nologo        /c        verstub.cpp        /Fo$(IntDir)\ 
+PreLink_Cmds=archutils\Win32\verinc       	cl         /Zl         /nologo         /c         verstub.cpp         /Fo$(IntDir)\ 
 PostBuild_Cmds=archutils\Win32\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
 # End Special Build Tool
 
@@ -96,10 +96,10 @@ LINK32=link.exe
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 IntDir=.\../Release6
-TargetDir=\cvs\stepmania\Program
+TargetDir=\cvs\stepmania-clean\Program
 TargetName=StepMania
 SOURCE="$(InputPath)"
-PreLink_Cmds=archutils\Win32\verinc               cl               /Zl               /nologo               /c               verstub.cpp               /Fo$(IntDir)\ 
+PreLink_Cmds=archutils\Win32\verinc                cl                /Zl                /nologo                /c                verstub.cpp                /Fo$(IntDir)\ 
 PostBuild_Cmds=archutils\Win32\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
 # End Special Build Tool
 
@@ -654,6 +654,10 @@ SOURCE=.\RageUtil_WorkerThread.cpp
 
 SOURCE=.\RageUtil_WorkerThread.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\RageUtilLua.cpp
+# End Source File
 # End Group
 # Begin Group "Data Structures"
 
@@ -1840,6 +1844,14 @@ SOURCE=.\archutils\Win32\WindowsResources.rc
 # End Group
 # Begin Source File
 
+SOURCE=.\ExportNsisStrings.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ExportNsisStrings.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\GameLoop.cpp
 # End Source File
 # Begin Source File
diff --git a/stepmania/stepmania.nsi b/stepmania/stepmania.nsi
index b677f67336..4aafb507d2 100644
--- a/stepmania/stepmania.nsi
+++ b/stepmania/stepmania.nsi
@@ -135,6 +135,10 @@
 	;!insertmacro MUI_LANGUAGE "Bosnian"
 	;!insertmacro MUI_LANGUAGE "Kurdish"
 
+	; generate, then include installer strings
+	!system "Program\${PRODUCT_FAMILY}.exe --ExportNsisStrings"
+	!include "nsis_strings_temp.inc"
+
 ;--------------------------------
 ;Reserve Files
   
@@ -165,67 +169,6 @@ FunctionEnd
 ;--------------------------------
 ;Installer Sections
 
-LangString TEXT_IO_CHECK_FOR_UPDATES		${LANG_ENGLISH} "Check for Updates"
-LangString TEXT_IO_RUN						${LANG_ENGLISH} "${PRODUCT_DISPLAY}"
-LangString TEXT_IO_OPEN_PROGRAM_FOLDER		${LANG_ENGLISH} "Open ${PRODUCT_ID} Program Folder"
-LangString TEXT_IO_MANUAL					${LANG_ENGLISH} "${PRODUCT_ID} Manual"
-LangString TEXT_IO_TOOLS					${LANG_ENGLISH} "${PRODUCT_ID} Tools"
-LangString TEXT_IO_WEB_SITE					${LANG_ENGLISH} "${PRODUCT_ID} Web Site"
-LangString TEXT_IO_UNINSTALL				${LANG_ENGLISH} "Uninstall ${PRODUCT_DISPLAY}"
-LangString TEXT_IO_VIEW_STATISTICS			${LANG_ENGLISH} "View Statistics"
-LangString TEXT_IO_REMOVE_ONLY				${LANG_ENGLISH} "${PRODUCT_DISPLAY} (remove only)"
-LangString TEXT_IO_SMZIP_PACKAGE			${LANG_ENGLISH} "SMZIP package"
-LangString TEXT_IO_FATAL_ERROR_COPYING_PCK	${LANG_ENGLISH} "Fatal error copying pck files."
-LangString TEXT_IO_FATAL_ERROR_INSTALL		${LANG_ENGLISH} "Fatal error during install."
-LangString TEXT_IO_CHECK_FOR_UPDATES		${LANG_FRENCH} "Vérifier les mises à jour"
-LangString TEXT_IO_RUN						${LANG_FRENCH} "${PRODUCT_DISPLAY}"
-LangString TEXT_IO_OPEN_PROGRAM_FOLDER		${LANG_FRENCH} "Open ${PRODUCT_ID} Program Folder"
-LangString TEXT_IO_MANUAL					${LANG_FRENCH} "Documentation de ${PRODUCT_ID}"
-LangString TEXT_IO_TOOLS					${LANG_FRENCH} "d'Outils de ${PRODUCT_ID}"
-LangString TEXT_IO_WEB_SITE					${LANG_FRENCH} "Le site web de ${PRODUCT_ID}"
-LangString TEXT_IO_UNINSTALL				${LANG_FRENCH} "Désinstaller ${PRODUCT_DISPLAY}"
-LangString TEXT_IO_VIEW_STATISTICS			${LANG_FRENCH} "Voir les statistiques"
-LangString TEXT_IO_REMOVE_ONLY				${LANG_FRENCH} "${PRODUCT_DISPLAY} (Supprimer uniquement)"
-LangString TEXT_IO_SMZIP_PACKAGE			${LANG_FRENCH} "SMZIP package"
-LangString TEXT_IO_FATAL_ERROR_COPYING_PCK	${LANG_FRENCH} "Fatal error copying pck files."
-LangString TEXT_IO_FATAL_ERROR_INSTALL		${LANG_FRENCH} "Fatal error during install."
-LangString TEXT_IO_CHECK_FOR_UPDATES		${LANG_GERMAN} "Updates zu überprüfen"
-LangString TEXT_IO_RUN						${LANG_GERMAN} "${PRODUCT_DISPLAY}"
-LangString TEXT_IO_OPEN_PROGRAM_FOLDER		${LANG_GERMAN} "Open ${PRODUCT_ID} Program Folder"
-LangString TEXT_IO_MANUAL					${LANG_GERMAN} "${PRODUCT_ID} Dokumentation"
-LangString TEXT_IO_TOOLS					${LANG_GERMAN} "${PRODUCT_ID} Werkzeug"
-LangString TEXT_IO_WEB_SITE					${LANG_GERMAN} "${PRODUCT_ID} Webseite"
-LangString TEXT_IO_UNINSTALL				${LANG_GERMAN} "Deinstallation von ${PRODUCT_DISPLAY}"
-LangString TEXT_IO_VIEW_STATISTICS			${LANG_GERMAN} "Statistiken anschauen"
-LangString TEXT_IO_REMOVE_ONLY				${LANG_GERMAN} "${PRODUCT_DISPLAY} (Nur entfernen)"
-LangString TEXT_IO_SMZIP_PACKAGE			${LANG_GERMAN} "SMZIP package"
-LangString TEXT_IO_FATAL_ERROR_COPYING_PCK	${LANG_GERMAN} "Fatal error copying pck files."
-LangString TEXT_IO_FATAL_ERROR_INSTALL		${LANG_GERMAN} "Fatal error during install."
-LangString TEXT_IO_CHECK_FOR_UPDATES		${LANG_SPANISH} "Compruebe para actualizaciones"
-LangString TEXT_IO_RUN						${LANG_SPANISH} "${PRODUCT_DISPLAY}"
-LangString TEXT_IO_OPEN_PROGRAM_FOLDER		${LANG_SPANISH} "Open ${PRODUCT_ID} Program Folder"
-LangString TEXT_IO_MANUAL					${LANG_SPANISH} "${PRODUCT_ID} Documenatione"
-LangString TEXT_IO_TOOLS					${LANG_SPANISH} "${PRODUCT_ID} Herramientas"
-LangString TEXT_IO_WEB_SITE					${LANG_SPANISH} "${PRODUCT_ID} Web Site"
-LangString TEXT_IO_UNINSTALL				${LANG_SPANISH} "Uninstall ${PRODUCT_DISPLAY}"
-LangString TEXT_IO_VIEW_STATISTICS			${LANG_SPANISH} "Vea la estadística"
-LangString TEXT_IO_REMOVE_ONLY				${LANG_SPANISH} "${PRODUCT_DISPLAY} (Quite solamente)"
-LangString TEXT_IO_SMZIP_PACKAGE			${LANG_SPANISH} "SMZIP package"
-LangString TEXT_IO_FATAL_ERROR_COPYING_PCK	${LANG_SPANISH} "Fatal error copying pck files."
-LangString TEXT_IO_FATAL_ERROR_INSTALL		${LANG_SPANISH} "Fatal error during install."
-LangString TEXT_IO_CHECK_FOR_UPDATES		${LANG_ITALIAN} "Per cercare aggiornamenti"
-LangString TEXT_IO_RUN						${LANG_ITALIAN} "${PRODUCT_DISPLAY}"
-LangString TEXT_IO_OPEN_PROGRAM_FOLDER		${LANG_ITALIAN} "Open ${PRODUCT_ID} Program Folder"
-LangString TEXT_IO_MANUAL					${LANG_ITALIAN} "${PRODUCT_ID} Documentazione"
-LangString TEXT_IO_TOOLS					${LANG_ITALIAN} "${PRODUCT_ID} Strumenti"
-LangString TEXT_IO_WEB_SITE					${LANG_ITALIAN} "${PRODUCT_ID} Sito Web"
-LangString TEXT_IO_UNINSTALL				${LANG_ITALIAN} "Disinstalla ${PRODUCT_DISPLAY}"
-LangString TEXT_IO_VIEW_STATISTICS			${LANG_ITALIAN} "Mostra Statistiche"
-LangString TEXT_IO_REMOVE_ONLY				${LANG_ITALIAN} "${PRODUCT_DISPLAY} (Elimina soltanto)"
-LangString TEXT_IO_SMZIP_PACKAGE			${LANG_ITALIAN} "SMZIP package"
-LangString TEXT_IO_FATAL_ERROR_COPYING_PCK	${LANG_ITALIAN} "Fatal error copying pck files."
-LangString TEXT_IO_FATAL_ERROR_INSTALL		${LANG_ITALIAN} "Fatal error during install."
-
 Section "Main Section" SecMain
 
 	; write out uninstaller
@@ -411,32 +354,6 @@ SectionEnd
 ;--------------------------------
 ;Installer Functions
 
-LangString TEXT_IO_TITLE		${LANG_ENGLISH} "${PRODUCT_DISPLAY}"
-LangString TEXT_IO_SUBTITLE		${LANG_ENGLISH} " "
-LangString TEXT_IO_INSTALL		${LANG_ENGLISH} "Install"
-LangString TEXT_IO_PLAY			${LANG_ENGLISH} "Play"
-LangString TEXT_IO_REINSTALL	${LANG_ENGLISH} "Reinstall"
-LangString TEXT_IO_TITLE		${LANG_FRENCH} "${PRODUCT_DISPLAY}"
-LangString TEXT_IO_SUBTITLE		${LANG_FRENCH} " "
-LangString TEXT_IO_INSTALL		${LANG_FRENCH} "Installer"
-LangString TEXT_IO_PLAY			${LANG_FRENCH} "Jouer"
-LangString TEXT_IO_REINSTALL	${LANG_FRENCH} "Réinstaller"
-LangString TEXT_IO_TITLE		${LANG_GERMAN} "${PRODUCT_DISPLAY}"
-LangString TEXT_IO_SUBTITLE		${LANG_GERMAN} " "
-LangString TEXT_IO_INSTALL		${LANG_GERMAN} "Installieren"
-LangString TEXT_IO_PLAY			${LANG_GERMAN} "Spielen"
-LangString TEXT_IO_REINSTALL	${LANG_GERMAN} "Noch mal installieren"
-LangString TEXT_IO_TITLE		${LANG_SPANISH} "${PRODUCT_DISPLAY}"
-LangString TEXT_IO_SUBTITLE		${LANG_SPANISH} " "
-LangString TEXT_IO_INSTALL		${LANG_SPANISH} "Instale"
-LangString TEXT_IO_PLAY			${LANG_SPANISH} "Juego"
-LangString TEXT_IO_REINSTALL	${LANG_SPANISH} "Reinstálese"
-LangString TEXT_IO_TITLE		${LANG_ITALIAN} "${PRODUCT_DISPLAY}"
-LangString TEXT_IO_SUBTITLE		${LANG_ITALIAN} " "
-LangString TEXT_IO_INSTALL		${LANG_ITALIAN} "Installa"
-LangString TEXT_IO_PLAY			${LANG_ITALIAN} "Gioca"
-LangString TEXT_IO_REINSTALL	${LANG_ITALIAN} "Re-installa"
-
 !ifdef SHOW_AUTORUN
 Var hwnd ; Window handle of the custom page
 
@@ -479,12 +396,6 @@ Function ShowAutorun
 
 FunctionEnd
 
-LangString TEXT_IO_COULD_NOT_EXECUTE	${LANG_ENGLISH} "Could not execute $INSTDIR\Program\${PRODUCT_FAMILY}.exe"
-LangString TEXT_IO_COULD_NOT_EXECUTE	${LANG_FRENCH} "N'a pas pu exécuter $INSTDIR\Program\${PRODUCT_FAMILY}.exe"
-LangString TEXT_IO_COULD_NOT_EXECUTE	${LANG_GERMAN} "Konnte $INSTDIR\Program\${PRODUCT_FAMILY}.exe nicht ausführen"
-LangString TEXT_IO_COULD_NOT_EXECUTE	${LANG_SPANISH} "$INSTDIR\Program\${PRODUCT_FAMILY}.exe No podía ejecutarse"
-LangString TEXT_IO_COULD_NOT_EXECUTE	${LANG_ITALIAN} "Impossibile eseguire $INSTDIR\Program\${PRODUCT_FAMILY}.exe"
-
 Function LeaveAutorun
 
 	; At this point the user has either pressed Next or one of our custom buttons
@@ -515,32 +426,6 @@ Function LeaveAutorun
 FunctionEnd
 !endif
 
-LangString TEXT_IO_UNINSTALL_PREVIOUS				${LANG_ENGLISH} "The previous version of ${PRODUCT_ID} must be uninstalled before continuing.$\nDo you wish to continue?"
-LangString TEXT_IO_DIRECTX_VISIT_MICROSOFT			${LANG_ENGLISH} "The latest version of DirectX (8.1 or higher) is strongly recommended.$\n Do you wish to visit Microsoft's site now?"
-LangString TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY		${LANG_ENGLISH} "Uninstallation failed.  Install anyway?"
-LangString TEXT_IO_INSTALL_DIRECTX				${LANG_ENGLISH} "The latest version of DirectX (8.1 or higher) is required.$\n Do you wish to install DirectX 8.1 now?"
-LangString TEXT_IO_FULL_INSTALL_NOT_FOUND			${LANG_ENGLISH} "${PRODUCT_ID} does not appear to be installed.$\nDo you wish to continue?"
-LangString TEXT_IO_UNINSTALL_PREVIOUS				${LANG_FRENCH} "La version précédente de ${PRODUCT_ID} doit être déinstallée pour pouvoir continuer. Voulez-vous continuer ?"
-LangString TEXT_IO_DIRECTX_VISIT_MICROSOFT			${LANG_FRENCH} "La dernière version de DirectX (8.1 ou supérieure) est hautement recommandée. Voulez-vous visiter le site de Microsoft maintenant ?"
-LangString TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY		${LANG_FRENCH} "Echec de la déinstallation. Voulez-vous tout de même lancer l'installation ?"
-LangString TEXT_IO_INSTALL_DIRECTX				${LANG_FRENCH} "La dernière version de DirectX (8.1 ou supérieure) est hautement recommandée. Désirez-vous l'installer maintenant ?"
-LangString TEXT_IO_FULL_INSTALL_NOT_FOUND			${LANG_FRENCH} "${PRODUCT_ID}"
-LangString TEXT_IO_UNINSTALL_PREVIOUS				${LANG_GERMAN} "Die letzte Version von ${PRODUCT_ID} muss deinstalliert werden, bevor Sie weiter machen. Wollen Sie fortfahren?"
-LangString TEXT_IO_DIRECTX_VISIT_MICROSOFT			${LANG_GERMAN} "Die letzte Version von DirectX (8.1 oder höher) ist dringend zu empfehlen.  Wollen Sie die Webseite von Microsoft jetzt besuchen?"
-LangString TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY		${LANG_GERMAN} "Deinstallation fehlgeschlagen.  Trotzdem installieren?"
-LangString TEXT_IO_INSTALL_DIRECTX				${LANG_GERMAN} "Die letzte Version von DirectX (8.1 oder höher) ist dringend zu empfehlen.  Wollen Sie es jetzt installieren?"
-LangString TEXT_IO_FULL_INSTALL_NOT_FOUND			${LANG_GERMAN} "${PRODUCT_ID}"
-LangString TEXT_IO_UNINSTALL_PREVIOUS				${LANG_SPANISH} "La versión ${PRODUCT_ID} anterior del debe ser uninstalled antes de continuar.  Usted desea continuar?"
-LangString TEXT_IO_DIRECTX_VISIT_MICROSOFT			${LANG_SPANISH} "La versión más última de DirectX (8,1 o más alto) se recomienda fuertemente.  Usted desea ahora visitar el sitio de Microsoft?"
-LangString TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY		${LANG_SPANISH} "Uninstallation falló.  ¿Instale de todos modos?"
-LangString TEXT_IO_INSTALL_DIRECTX				${LANG_SPANISH} "La versión más última de DirectX (8,1 o más alto) se recomienda fuertemente.  Usted desea ahora instalarla?"
-LangString TEXT_IO_FULL_INSTALL_NOT_FOUND			${LANG_SPANISH} "${PRODUCT_ID}"
-LangString TEXT_IO_UNINSTALL_PREVIOUS				${LANG_ITALIAN} "Prima di continuare va installata la versione precendente di ${PRODUCT_ID}.  Vuoi continuare?"
-LangString TEXT_IO_DIRECTX_VISIT_MICROSOFT			${LANG_ITALIAN} "Si consiglia vivamente di installare la versione più recente di TDirectX (8.1 o superiore).  Vuoi visitare il sito Microsoft adesso?"
-LangString TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY		${LANG_ITALIAN} "Disinstallazione non riuscita.  Vuoi installare comunque?"
-LangString TEXT_IO_INSTALL_DIRECTX				${LANG_ITALIAN} "Si consiglia vivamente di installare la versione più recente di TDirectX (8.1 o superiore).  Vuoi installarla adesso?"
-LangString TEXT_IO_FULL_INSTALL_NOT_FOUND			${LANG_ITALIAN} "${PRODUCT_ID}"
-
 Function PreInstall
 
 !ifdef FULL_INSTALL
@@ -650,12 +535,6 @@ FunctionEnd
 ;--------------------------------
 ;Uninstaller Section
 
-LangString TEXT_IO_FATAL_ERROR_UNINSTALL		${LANG_ENGLISH} "Fatal error during uninstall."
-LangString TEXT_IO_FATAL_ERROR_UNINSTALL		${LANG_FRENCH} "Fatal error during uninstall."
-LangString TEXT_IO_FATAL_ERROR_UNINSTALL		${LANG_GERMAN} "Fatal error during uninstall."
-LangString TEXT_IO_FATAL_ERROR_UNINSTALL		${LANG_SPANISH} "Fatal error during uninstall."
-LangString TEXT_IO_FATAL_ERROR_UNINSTALL		${LANG_ITALIAN} "Fatal error during uninstall."
-
 Section "Uninstall"
 
 	; add delete commands to delete whatever files/registry keys/etc you installed here.