Index: src/ch/ch.vc90.vcproj
===================================================================
diff -u -N -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf -re8841688af4947fb9294b7cda9f5cf2e36938fcd
--- src/ch/ch.vc90.vcproj	(.../ch.vc90.vcproj)	(revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf)
+++ src/ch/ch.vc90.vcproj	(.../ch.vc90.vcproj)	(revision e8841688af4947fb9294b7cda9f5cf2e36938fcd)
@@ -20,374 +20,6 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)bin\debug\"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/ch.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\libicpf\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				ProgramDataBaseFileName="$(IntDir)\$(TargetName)_vs90.pdb"
-				BrowseInformation="0"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkLibraryDependencies="false"
-				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib libicpf32d.lib Dbghelp.lib"
-				OutputFile="$(OutDir)\ch.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="2"
-				DataExecutionPrevention="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)bin\debug\"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Debug/ch.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\libicpf\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				ProgramDataBaseFileName="$(IntDir)\$(TargetName)_vs90.pdb"
-				BrowseInformation="0"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkLibraryDependencies="false"
-				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib libicpf64d.lib Dbghelp.lib"
-				OutputFile="$(OutDir)\ch64.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="2"
-				DataExecutionPrevention="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)bin\release\"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/ch.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="..\libicpf\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
-				ProgramDataBaseFileName="$(IntDir)\$(TargetName)_vs90.pdb"
-				BrowseInformation="0"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkLibraryDependencies="false"
-				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib libicpf32.lib Dbghelp.lib"
-				OutputFile="$(OutDir)\ch.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="2"
-				DataExecutionPrevention="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)bin\release\"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Release/ch.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="..\libicpf\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
-				ProgramDataBaseFileName="$(IntDir)\$(TargetName)_vs90.pdb"
-				BrowseInformation="0"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkLibraryDependencies="false"
-				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib libicpf64.lib Dbghelp.lib"
-				OutputFile="$(OutDir)\ch64.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="2"
-				DataExecutionPrevention="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
 			Name="Debug-Unicode|Win32"
 			OutputDirectory="$(SolutionDir)bin\debug\"
 			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
@@ -787,51 +419,51 @@
 				RelativePath="ch.rc"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Debug-Unicode|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling resources $(InputPath)"
-						CommandLine="&quot;$(SolutionDir)\tools\exe2lng.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)scripts\header.lng&quot; &quot;$(InputDir)chtmp.rc&quot; &quot;$(ProjectDir)langs\english.lng&quot; &quot;$(InputDir)resource.h&quot; &quot;$(VCInstallDir)atlmfc\include\afxres.h&quot;&#x0D;&#x0A;rc.exe /l 0x409 /d &quot;NDEBUG&quot; /d &quot;_AFXDLL&quot; /fo&quot;$(OutDir)\$(InputName).res&quot; &quot;$(InputDir)chtmp.rc&quot;&#x0D;&#x0A;del &quot;$(InputDir)\chtmp.rc&quot;&#x0D;&#x0A;copy &quot;$(ProjectDir)langs\english.lng&quot; &quot;$(OutDir)\langs\english.lng&quot;&#x0D;&#x0A;"
+						CommandLine="&quot;$(OutDir)\rc2lng.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)scripts\header.lng&quot; &quot;$(InputDir)chtmp.rc&quot; &quot;$(ProjectDir)langs\english.lng&quot; &quot;$(InputDir)resource.h&quot; &quot;$(VCInstallDir)atlmfc\include\afxres.h&quot;&#x0D;&#x0A;rc.exe /l 0x409 /d &quot;NDEBUG&quot; /d &quot;_AFXDLL&quot; /fo&quot;$(OutDir)\$(InputName).res&quot; &quot;$(InputDir)chtmp.rc&quot;&#x0D;&#x0A;del &quot;$(InputDir)\chtmp.rc&quot;&#x0D;&#x0A;copy &quot;$(ProjectDir)langs\english.lng&quot; &quot;$(OutDir)\langs\english.lng&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="ch.rc2;version.h"
 						Outputs="$(OutDir)\$(InputName).res"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Debug-Unicode|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling resources $(InputPath)"
-						CommandLine="&quot;$(SolutionDir)\tools\exe2lng.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)scripts\header.lng&quot; &quot;$(InputDir)chtmp.rc&quot; &quot;$(ProjectDir)langs\english.lng&quot; &quot;$(InputDir)resource.h&quot; &quot;$(VCInstallDir)atlmfc\include\afxres.h&quot;&#x0D;&#x0A;rc.exe /l 0x409 /d &quot;NDEBUG&quot; /d &quot;_AFXDLL&quot; /fo&quot;$(OutDir)\$(InputName).res&quot; &quot;$(InputDir)chtmp.rc&quot;&#x0D;&#x0A;del &quot;$(InputDir)\chtmp.rc&quot;&#x0D;&#x0A;copy &quot;$(ProjectDir)langs\english.lng&quot; &quot;$(OutDir)\langs\english.lng&quot;&#x0D;&#x0A;"
+						CommandLine="&quot;$(OutDir)\rc2lng.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)scripts\header.lng&quot; &quot;$(InputDir)chtmp.rc&quot; &quot;$(ProjectDir)langs\english.lng&quot; &quot;$(InputDir)resource.h&quot; &quot;$(VCInstallDir)atlmfc\include\afxres.h&quot;&#x0D;&#x0A;rc.exe /l 0x409 /d &quot;NDEBUG&quot; /d &quot;_AFXDLL&quot; /fo&quot;$(OutDir)\$(InputName).res&quot; &quot;$(InputDir)chtmp.rc&quot;&#x0D;&#x0A;del &quot;$(InputDir)\chtmp.rc&quot;&#x0D;&#x0A;copy &quot;$(ProjectDir)langs\english.lng&quot; &quot;$(OutDir)\langs\english.lng&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="ch.rc2;version.h"
 						Outputs="$(OutDir)\$(InputName).res"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Release-Unicode|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling resources $(InputPath)"
-						CommandLine="&quot;$(SolutionDir)\tools\exe2lng.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)scripts\header.lng&quot; &quot;$(InputDir)chtmp.rc&quot; &quot;$(ProjectDir)langs\english.lng&quot; &quot;$(InputDir)resource.h&quot; &quot;$(VCInstallDir)atlmfc\include\afxres.h&quot;&#x0D;&#x0A;rc.exe /l 0x409 /d &quot;NDEBUG&quot; /d &quot;_AFXDLL&quot; /fo&quot;$(OutDir)\$(InputName).res&quot; &quot;$(InputDir)chtmp.rc&quot;&#x0D;&#x0A;del &quot;$(InputDir)\chtmp.rc&quot;&#x0D;&#x0A;copy &quot;$(ProjectDir)langs\english.lng&quot; &quot;$(OutDir)\langs\english.lng&quot;&#x0D;&#x0A;"
+						CommandLine="&quot;$(OutDir)\rc2lng.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)scripts\header.lng&quot; &quot;$(InputDir)chtmp.rc&quot; &quot;$(ProjectDir)langs\english.lng&quot; &quot;$(InputDir)resource.h&quot; &quot;$(VCInstallDir)atlmfc\include\afxres.h&quot;&#x0D;&#x0A;rc.exe /l 0x409 /d &quot;NDEBUG&quot; /d &quot;_AFXDLL&quot; /fo&quot;$(OutDir)\$(InputName).res&quot; &quot;$(InputDir)chtmp.rc&quot;&#x0D;&#x0A;del &quot;$(InputDir)\chtmp.rc&quot;&#x0D;&#x0A;copy &quot;$(ProjectDir)langs\english.lng&quot; &quot;$(OutDir)\langs\english.lng&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="ch.rc2;version.h"
 						Outputs="$(OutDir)\$(InputName).res"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Release-Unicode|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling resources $(InputPath)"
-						CommandLine="&quot;$(SolutionDir)\tools\exe2lng.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)scripts\header.lng&quot; &quot;$(InputDir)chtmp.rc&quot; &quot;$(ProjectDir)langs\english.lng&quot; &quot;$(InputDir)resource.h&quot; &quot;$(VCInstallDir)atlmfc\include\afxres.h&quot;&#x0D;&#x0A;rc.exe /l 0x409 /d &quot;NDEBUG&quot; /d &quot;_AFXDLL&quot; /fo&quot;$(OutDir)\$(InputName).res&quot; &quot;$(InputDir)chtmp.rc&quot;&#x0D;&#x0A;del &quot;$(InputDir)\chtmp.rc&quot;&#x0D;&#x0A;copy &quot;$(ProjectDir)langs\english.lng&quot; &quot;$(OutDir)\langs\english.lng&quot;&#x0D;&#x0A;"
+						CommandLine="&quot;$(OutDir)\rc2lng.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)scripts\header.lng&quot; &quot;$(InputDir)chtmp.rc&quot; &quot;$(ProjectDir)langs\english.lng&quot; &quot;$(InputDir)resource.h&quot; &quot;$(VCInstallDir)atlmfc\include\afxres.h&quot;&#x0D;&#x0A;rc.exe /l 0x409 /d &quot;NDEBUG&quot; /d &quot;_AFXDLL&quot; /fo&quot;$(OutDir)\$(InputName).res&quot; &quot;$(InputDir)chtmp.rc&quot;&#x0D;&#x0A;del &quot;$(InputDir)\chtmp.rc&quot;&#x0D;&#x0A;copy &quot;$(ProjectDir)langs\english.lng&quot; &quot;$(OutDir)\langs\english.lng&quot;&#x0D;&#x0A;"
 						AdditionalDependencies="ch.rc2;version.h"
 						Outputs="$(OutDir)\$(InputName).res"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug-Unicode|Win32"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -842,7 +474,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug-Unicode|x64"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -853,7 +485,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release-Unicode|Win32"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -864,7 +496,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release-Unicode|x64"
+					Name="Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -995,63 +627,63 @@
 				RelativePath="stdafx.cpp"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Debug-Unicode|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Debug-Unicode|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Release-Unicode|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Release-Unicode|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug-Unicode|Win32"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug-Unicode|x64"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release-Unicode|Win32"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release-Unicode|x64"
+					Name="Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1228,7 +860,7 @@
 				RelativePath="resource.h"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Debug-Unicode|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1238,7 +870,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Debug-Unicode|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1248,7 +880,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Release-Unicode|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1258,7 +890,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Release-Unicode|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1268,7 +900,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug-Unicode|Win32"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1278,7 +910,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug-Unicode|x64"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1288,7 +920,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release-Unicode|Win32"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1298,7 +930,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release-Unicode|x64"
+					Name="Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1634,7 +1266,7 @@
 					RelativePath=".\help\english\help.hhp"
 					>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug-Unicode|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1645,7 +1277,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Debug-Unicode|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1656,7 +1288,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release-Unicode|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1667,7 +1299,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|x64"
+						Name="Release-Unicode|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1678,7 +1310,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1689,7 +1321,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1700,7 +1332,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1711,7 +1343,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1825,46 +1457,6 @@
 					RelativePath=".\langs\bulgarian.lng"
 					>
 					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Copying language file $(InputFileName)..."
-							CommandLine="copy &quot;$(InputPath)&quot; &quot;$(OutDir)\langs\$(InputFileName)&quot;&#x0D;&#x0A;"
-							Outputs="$(OutDir)\langs\$(InputFileName)"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Copying language file $(InputFileName)..."
-							CommandLine="copy &quot;$(InputPath)&quot; &quot;$(OutDir)\langs\$(InputFileName)&quot;&#x0D;&#x0A;"
-							Outputs="$(OutDir)\langs\$(InputFileName)"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Copying language file $(InputFileName)..."
-							CommandLine="copy &quot;$(InputPath)&quot; &quot;$(OutDir)\langs\$(InputFileName)&quot;&#x0D;&#x0A;"
-							Outputs="$(OutDir)\langs\$(InputFileName)"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Copying language file $(InputFileName)..."
-							CommandLine="copy &quot;$(InputPath)&quot; &quot;$(OutDir)\langs\$(InputFileName)&quot;&#x0D;&#x0A;"
-							Outputs="$(OutDir)\langs\$(InputFileName)"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
 						Name="Debug-Unicode|Win32"
 						>
 						<Tool
@@ -1904,10 +1496,6 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\chinese.lng"
-					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -1948,6 +1536,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\chinese.lng"
+					>
 					<FileConfiguration
 						Name="Debug-Unicode|Win32"
 						>
@@ -1988,10 +1580,6 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\czech.lng"
-					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2032,6 +1620,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\czech.lng"
+					>
 					<FileConfiguration
 						Name="Debug-Unicode|Win32"
 						>
@@ -2072,10 +1664,6 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\french.lng"
-					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2116,6 +1704,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\french.lng"
+					>
 					<FileConfiguration
 						Name="Debug-Unicode|Win32"
 						>
@@ -2156,10 +1748,6 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\german.lng"
-					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2200,6 +1788,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\german.lng"
+					>
 					<FileConfiguration
 						Name="Debug-Unicode|Win32"
 						>
@@ -2240,10 +1832,6 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\german2.lng"
-					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2284,6 +1872,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\german2.lng"
+					>
 					<FileConfiguration
 						Name="Debug-Unicode|Win32"
 						>
@@ -2324,10 +1916,6 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\italian.lng"
-					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2368,6 +1956,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\italian.lng"
+					>
 					<FileConfiguration
 						Name="Debug-Unicode|Win32"
 						>
@@ -2408,10 +2000,6 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\japanese.lng"
-					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2452,6 +2040,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\japanese.lng"
+					>
 					<FileConfiguration
 						Name="Debug-Unicode|Win32"
 						>
@@ -2492,10 +2084,6 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\korean.lng"
-					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2536,6 +2124,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\korean.lng"
+					>
 					<FileConfiguration
 						Name="Debug-Unicode|Win32"
 						>
@@ -2576,10 +2168,6 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\polish.lng"
-					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2620,6 +2208,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\polish.lng"
+					>
 					<FileConfiguration
 						Name="Debug-Unicode|Win32"
 						>
@@ -2660,10 +2252,6 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\russian.lng"
-					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2704,6 +2292,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\russian.lng"
+					>
 					<FileConfiguration
 						Name="Debug-Unicode|Win32"
 						>
@@ -2744,10 +2336,6 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\spanish.lng"
-					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2788,6 +2376,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\spanish.lng"
+					>
 					<FileConfiguration
 						Name="Debug-Unicode|Win32"
 						>
@@ -2828,10 +2420,6 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\turkish.lng"
-					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2872,6 +2460,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\turkish.lng"
+					>
 					<FileConfiguration
 						Name="Debug-Unicode|Win32"
 						>
@@ -2912,10 +2504,6 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\valencian.lng"
-					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2956,6 +2544,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\valencian.lng"
+					>
 					<FileConfiguration
 						Name="Debug-Unicode|Win32"
 						>
@@ -2996,6 +2588,46 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Copying language file $(InputFileName)..."
+							CommandLine="copy &quot;$(InputPath)&quot; &quot;$(OutDir)\langs\$(InputFileName)&quot;&#x0D;&#x0A;"
+							Outputs="$(OutDir)\langs\$(InputFileName)"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Copying language file $(InputFileName)..."
+							CommandLine="copy &quot;$(InputPath)&quot; &quot;$(OutDir)\langs\$(InputFileName)&quot;&#x0D;&#x0A;"
+							Outputs="$(OutDir)\langs\$(InputFileName)"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Copying language file $(InputFileName)..."
+							CommandLine="copy &quot;$(InputPath)&quot; &quot;$(OutDir)\langs\$(InputFileName)&quot;&#x0D;&#x0A;"
+							Outputs="$(OutDir)\langs\$(InputFileName)"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Copying language file $(InputFileName)..."
+							CommandLine="copy &quot;$(InputPath)&quot; &quot;$(OutDir)\langs\$(InputFileName)&quot;&#x0D;&#x0A;"
+							Outputs="$(OutDir)\langs\$(InputFileName)"
+						/>
+					</FileConfiguration>
 				</File>
 			</Filter>
 			<Filter
@@ -3155,7 +2787,7 @@
 					RelativePath=".\help\polish\help.hhp"
 					>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Debug-Unicode|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -3166,7 +2798,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Debug-Unicode|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -3177,7 +2809,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Release-Unicode|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -3188,7 +2820,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|x64"
+						Name="Release-Unicode|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -3199,7 +2831,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -3210,7 +2842,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -3221,7 +2853,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -3232,7 +2864,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"