Index: src/ch/ch.vc90.vcproj
===================================================================
diff -u -r633a533cb6e741d44fe28aa56339e1d2709b1b27 -r8422e5787e56453d78c7270066c3e8d1743ca757
--- src/ch/ch.vc90.vcproj	(.../ch.vc90.vcproj)	(revision 633a533cb6e741d44fe28aa56339e1d2709b1b27)
+++ src/ch/ch.vc90.vcproj	(.../ch.vc90.vcproj)	(revision 8422e5787e56453d78c7270066c3e8d1743ca757)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="windows-1250"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="ch"
 	ProjectGUID="{4B215B9A-58CA-4987-AC95-7DFC3043E100}"
 	RootNamespace="ch"
 	Keyword="MFCProj"
-	TargetFrameworkVersion="131072"
+	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
 		<Platform
@@ -20,9 +20,9 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Debug-Unicode|Win32"
-			OutputDirectory="$(SolutionDir)bin\debug\"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\"
+			IntermediateDirectory="$(SolutionDir)intermediate\vc90\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="1"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib libicpf32ud.lib libictranslate32ud.lib Dbghelp.lib libchcore32ud.lib"
+				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib Dbghelp.lib libchcore32ud.lib libictranslate32ud.lib libicpf32ud.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
@@ -108,9 +108,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug-Unicode|x64"
-			OutputDirectory="$(SolutionDir)bin\debug\"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\"
+			IntermediateDirectory="$(SolutionDir)intermediate\vc90\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="1"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -165,7 +165,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib libicpf64ud.lib libictranslate64ud.lib Dbghelp.lib libchcore64ud.lib"
+				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib Dbghelp.lib libchcore64ud.lib libictranslate64ud.lib libicpf64ud.lib"
 				OutputFile="$(OutDir)\$(ProjectName)64.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
@@ -196,9 +196,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release-Unicode|Win32"
-			OutputDirectory="$(SolutionDir)bin\release\"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\"
+			IntermediateDirectory="$(SolutionDir)intermediate\vc90\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="1"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -255,7 +255,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib libicpf32u.lib libictranslate32u.lib Dbghelp.lib libchcore32u.lib"
+				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib Dbghelp.lib libchcore32u.lib libictranslate32u.lib libicpf32u.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
@@ -286,9 +286,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release-Unicode|x64"
-			OutputDirectory="$(SolutionDir)bin\release\"
-			IntermediateDirectory="$(SolutionDir)intermediate\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\"
+			IntermediateDirectory="$(SolutionDir)intermediate\vc90\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="1"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -345,7 +345,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib libicpf64u.lib libictranslate64u.lib Dbghelp.lib libchcore64u.lib"
+				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib Dbghelp.lib libchcore64u.lib libictranslate64u.lib libicpf64u.lib"
 				OutputFile="$(OutDir)\$(ProjectName)64.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
@@ -375,6 +375,366 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Testing Debug|Win32"
+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\"
+			IntermediateDirectory="$(SolutionDir)intermediate\vc90\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<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"
+				AdditionalOptions="/Zm150"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\ext\gmock\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;TESTING;_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				ProgramDataBaseFileName="$(IntDir)\$(TargetName)_vs90.pdb"
+				WarningLevel="4"
+				WarnAsError="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 Dbghelp.lib gmock32d.lib libchcore32ud.lib libictranslate32ud.lib libicpf32ud.lib"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="cd &quot;$(TargetDir)&quot;&#x0D;&#x0A;&quot;$(TargetPath)&quot;&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Testing Debug|x64"
+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\"
+			IntermediateDirectory="$(SolutionDir)intermediate\vc90\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<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"
+				AdditionalOptions="/Zm150"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\ext\gmock\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;TESTING;_CONSOLE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				ProgramDataBaseFileName="$(IntDir)\$(TargetName)_vs90.pdb"
+				WarningLevel="4"
+				WarnAsError="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 Dbghelp.lib gmock64d.lib libchcore64ud.lib libictranslate64ud.lib libicpf64ud.lib"
+				OutputFile="$(OutDir)\$(ProjectName)64.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="cd &quot;$(TargetDir)&quot;&#x0D;&#x0A;&quot;$(TargetPath)&quot;&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Testing Release|Win32"
+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\"
+			IntermediateDirectory="$(SolutionDir)intermediate\vc90\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<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"
+				AdditionalOptions="/Zm150"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\ext\gmock\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;TESTING;_CONSOLE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="2"
+				ProgramDataBaseFileName="$(IntDir)\$(TargetName)_vs90.pdb"
+				WarningLevel="4"
+				WarnAsError="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 Dbghelp.lib gmock32.lib libchcore32u.lib libictranslate32u.lib libicpf32u.lib"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="cd &quot;$(TargetDir)&quot;&#x0D;&#x0A;&quot;$(TargetPath)&quot;&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Testing Release|x64"
+			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)\"
+			IntermediateDirectory="$(SolutionDir)intermediate\vc90\$(PlatformName)\$(ProjectName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<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"
+				AdditionalOptions="/Zm150"
+				Optimization="0"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\ext\gmock\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;TESTING;_CONSOLE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="2"
+				ProgramDataBaseFileName="$(IntDir)\$(TargetName)_vs90.pdb"
+				WarningLevel="4"
+				WarnAsError="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 Dbghelp.lib gmock64.lib libchcore64u.lib libictranslate64u.lib libicpf64u.lib"
+				OutputFile="$(OutDir)\$(ProjectName)64.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="cd &quot;$(TargetDir)&quot;&#x0D;&#x0A;&quot;$(TargetPath)&quot;&#x0D;&#x0A;"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -387,10 +747,6 @@
 				Name="Shared"
 				>
 				<File
-					RelativePath="..\common\EShellCommands.h"
-					>
-				</File>
-				<File
 					RelativePath="..\Common\ipcstructs.h"
 					>
 				</File>
@@ -415,18 +771,6 @@
 				Name="Core"
 				>
 				<File
-					RelativePath="DataBuffer.cpp"
-					>
-				</File>
-				<File
-					RelativePath="DataBuffer.h"
-					>
-				</File>
-				<File
-					RelativePath="Device IO.h"
-					>
-				</File>
-				<File
 					RelativePath=".\FeedbackHandler.cpp"
 					>
 				</File>
@@ -435,173 +779,13 @@
 					>
 				</File>
 				<File
-					RelativePath=".\FileFilter.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\FileFilter.h"
-					>
-				</File>
-				<File
-					RelativePath="FileInfo.cpp"
-					>
-				</File>
-				<File
-					RelativePath="FileInfo.h"
-					>
-				</File>
-				<File
-					RelativePath=".\SerializationHelpers.h"
-					>
-				</File>
-				<File
 					RelativePath="structs.cpp"
 					>
 				</File>
 				<File
 					RelativePath="structs.h"
 					>
 				</File>
-				<File
-					RelativePath=".\task.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\task.h"
-					>
-				</File>
-				<File
-					RelativePath=".\TAutoHandles.h"
-					>
-				</File>
-				<File
-					RelativePath=".\TBasePathData.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\TBasePathData.h"
-					>
-				</File>
-				<File
-					RelativePath=".\TBasicProgressInfo.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\TBasicProgressInfo.h"
-					>
-				</File>
-				<File
-					RelativePath=".\TLocalFilesystem.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\TLocalFilesystem.h"
-					>
-				</File>
-				<File
-					RelativePath=".\TSubTaskContext.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\TSubTaskContext.h"
-					>
-				</File>
-				<File
-					RelativePath=".\TTaskConfigTracker.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\TTaskConfigTracker.h"
-					>
-				</File>
-				<File
-					RelativePath=".\TTaskConfiguration.h"
-					>
-				</File>
-				<File
-					RelativePath=".\TWorkerThreadController.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\TWorkerThreadController.h"
-					>
-				</File>
-				<Filter
-					Name="NewProgressTracking"
-					>
-					<File
-						RelativePath=".\TSubTaskProgressInfo.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\TSubTaskProgressInfo.h"
-						>
-					</File>
-					<File
-						RelativePath=".\TTaskProgressInfo.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\TTaskProgressInfo.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="SubTasks"
-					>
-					<File
-						RelativePath=".\TSubTaskBase.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\TSubTaskBase.h"
-						>
-					</File>
-					<File
-						RelativePath=".\TSubTaskCopyMove.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\TSubTaskCopyMove.h"
-						>
-					</File>
-					<File
-						RelativePath=".\TSubTaskDelete.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\TSubTaskDelete.h"
-						>
-					</File>
-					<File
-						RelativePath=".\TSubTaskScanDirectory.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\TSubTaskScanDirectory.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="OldProgressTracking"
-					>
-					<File
-						RelativePath=".\TTaskGlobalStats.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\TTaskGlobalStats.h"
-						>
-					</File>
-					<File
-						RelativePath=".\TTaskLocalStats.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\TTaskLocalStats.h"
-						>
-					</File>
-				</Filter>
 			</Filter>
 			<Filter
 				Name="Tools"
@@ -651,6 +835,14 @@
 					>
 				</File>
 				<File
+					RelativePath=".\TRecentPathsTools.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\TRecentPathsTools.h"
+					>
+				</File>
+				<File
 					RelativePath=".\UpdateChecker.cpp"
 					>
 				</File>
@@ -678,63 +870,63 @@
 					RelativePath="stdafx.cpp"
 					>
 					<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"
 							UsePrecompiledHeader="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Testing Debug|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							UsePrecompiledHeader="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Testing Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							UsePrecompiledHeader="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Testing Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
 							UsePrecompiledHeader="1"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|x64"
+						Name="Testing Release|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -837,6 +1029,14 @@
 						RelativePath="ThemedButton.h"
 						>
 					</File>
+					<File
+						RelativePath=".\TProgressCtrlEx.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\TProgressCtrlEx.h"
+						>
+					</File>
 				</Filter>
 				<Filter
 					Name="Dialogs"
@@ -882,10 +1082,6 @@
 						>
 					</File>
 					<File
-						RelativePath="DstFileErrorDlg.h"
-						>
-					</File>
-					<File
 						RelativePath=".\FeedbackFileErrorDlg.cpp"
 						>
 					</File>
@@ -1004,90 +1200,90 @@
 				RelativePath="ch.rc"
 				>
 				<FileConfiguration
-					Name="Debug-Unicode|Win32"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling resources $(InputPath)"
-						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"
+						CommandLine="&quot;$(SolutionDir)\tools\rc2lng.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)scripts\header.lng&quot; &quot;$(IntDir)\chtmp.rc&quot; &quot;$(OutDir)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;$(IntDir)\chtmp.rc&quot;&#x0D;&#x0A;del &quot;$(IntDir)\chtmp.rc&quot;&#x0D;&#x0A;"
+						AdditionalDependencies="res/ch.rc2;version.h"
 						Outputs="$(OutDir)\$(InputName).res"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug-Unicode|x64"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling resources $(InputPath)"
-						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"
+						CommandLine="&quot;$(SolutionDir)\tools\rc2lng.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)scripts\header.lng&quot; &quot;$(IntDir)\chtmp.rc&quot; &quot;$(OutDir)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;$(IntDir)\chtmp.rc&quot;&#x0D;&#x0A;del &quot;$(IntDir)\chtmp.rc&quot;&#x0D;&#x0A;"
+						AdditionalDependencies="res/ch.rc2;version.h"
 						Outputs="$(OutDir)\$(InputName).res"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release-Unicode|Win32"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling resources $(InputPath)"
-						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"
+						CommandLine="&quot;$(SolutionDir)\tools\rc2lng.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)scripts\header.lng&quot; &quot;$(IntDir)\chtmp.rc&quot; &quot;$(OutDir)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;$(IntDir)\chtmp.rc&quot;&#x0D;&#x0A;del &quot;$(IntDir)\chtmp.rc&quot;&#x0D;&#x0A;"
+						AdditionalDependencies="res/ch.rc2;version.h"
 						Outputs="$(OutDir)\$(InputName).res"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release-Unicode|x64"
+					Name="Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Compiling resources $(InputPath)"
-						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"
+						CommandLine="&quot;$(SolutionDir)\tools\rc2lng.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)scripts\header.lng&quot; &quot;$(IntDir)\chtmp.rc&quot; &quot;$(OutDir)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;$(IntDir)\chtmp.rc&quot;&#x0D;&#x0A;del &quot;$(IntDir)\chtmp.rc&quot;&#x0D;&#x0A;"
+						AdditionalDependencies="res/ch.rc2;version.h"
 						Outputs="$(OutDir)\$(InputName).res"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Testing Debug|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;"
-						AdditionalDependencies="ch.rc2;version.h"
+						CommandLine="&quot;$(SolutionDir)\tools\rc2lng.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)scripts\header.lng&quot; &quot;$(IntDir)\chtmp.rc&quot; &quot;$(OutDir)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;$(IntDir)\chtmp.rc&quot;&#x0D;&#x0A;del &quot;$(IntDir)\chtmp.rc&quot;&#x0D;&#x0A;"
+						AdditionalDependencies="res/ch.rc2;version.h"
 						Outputs="$(OutDir)\$(InputName).res"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Testing Debug|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;"
-						AdditionalDependencies="ch.rc2;version.h"
+						CommandLine="&quot;$(SolutionDir)\tools\rc2lng.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)scripts\header.lng&quot; &quot;$(IntDir)\chtmp.rc&quot; &quot;$(OutDir)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;$(IntDir)\chtmp.rc&quot;&#x0D;&#x0A;del &quot;$(IntDir)\chtmp.rc&quot;&#x0D;&#x0A;"
+						AdditionalDependencies="res/ch.rc2;version.h"
 						Outputs="$(OutDir)\$(InputName).res"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Testing Release|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;"
-						AdditionalDependencies="ch.rc2;version.h"
+						CommandLine="&quot;$(SolutionDir)\tools\rc2lng.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)scripts\header.lng&quot; &quot;$(IntDir)\chtmp.rc&quot; &quot;$(OutDir)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;$(IntDir)\chtmp.rc&quot;&#x0D;&#x0A;del &quot;$(IntDir)\chtmp.rc&quot;&#x0D;&#x0A;"
+						AdditionalDependencies="res/ch.rc2;version.h"
 						Outputs="$(OutDir)\$(InputName).res"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Testing Release|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;"
-						AdditionalDependencies="ch.rc2;version.h"
+						CommandLine="&quot;$(SolutionDir)\tools\rc2lng.exe&quot; &quot;$(InputPath)&quot; &quot;$(InputDir)scripts\header.lng&quot; &quot;$(IntDir)\chtmp.rc&quot; &quot;$(OutDir)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;$(IntDir)\chtmp.rc&quot;&#x0D;&#x0A;del &quot;$(IntDir)\chtmp.rc&quot;&#x0D;&#x0A;"
+						AdditionalDependencies="res/ch.rc2;version.h"
 						Outputs="$(OutDir)\$(InputName).res"
 					/>
 				</FileConfiguration>
@@ -1104,7 +1300,7 @@
 				RelativePath="resource.h"
 				>
 				<FileConfiguration
-					Name="Debug-Unicode|Win32"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1114,7 +1310,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug-Unicode|x64"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1124,7 +1320,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release-Unicode|Win32"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1134,7 +1330,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release-Unicode|x64"
+					Name="Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1144,7 +1340,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Testing Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1154,7 +1350,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Testing Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1164,7 +1360,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Testing Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1174,7 +1370,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Testing Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1333,18 +1529,6 @@
 					>
 				</File>
 				<File
-					RelativePath=".\help\english\162.txt"
-					>
-				</File>
-				<File
-					RelativePath=".\help\english\164.txt"
-					>
-				</File>
-				<File
-					RelativePath=".\help\english\165.txt"
-					>
-				</File>
-				<File
 					RelativePath=".\help\english\167.txt"
 					>
 				</File>
@@ -1453,89 +1637,89 @@
 					RelativePath=".\help\english\help.hhp"
 					>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Making help file..."
-							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;start /wait hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)english.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;$(InputDir)english.chm&quot; &quot;$(OutDir)\help\english.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
+							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)english.chm&quot; goto :HelpError&#x0D;&#x0A;if not exist &quot;$(OutDir)\help&quot; mkdir &quot;$(OutDir)\help&quot;&#x0D;&#x0A;copy &quot;$(InputDir)english.chm&quot; &quot;$(OutDir)\help\english.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
 							AdditionalDependencies="help\HTMLDefines.h"
 							Outputs="help\english\english.chm"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Making help file..."
-							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;start /wait hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)english.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;$(InputDir)english.chm&quot; &quot;$(OutDir)\help\english.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
+							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)english.chm&quot; goto :HelpError&#x0D;&#x0A;if not exist &quot;$(OutDir)\help&quot; mkdir &quot;$(OutDir)\help&quot;&#x0D;&#x0A;copy &quot;$(InputDir)english.chm&quot; &quot;$(OutDir)\help\english.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
 							AdditionalDependencies="help\HTMLDefines.h"
 							Outputs="help\english\english.chm"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Making help file..."
-							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;start /wait hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)english.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;$(InputDir)english.chm&quot; &quot;$(OutDir)\help\english.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
+							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)english.chm&quot; goto :HelpError&#x0D;&#x0A;if not exist &quot;$(OutDir)\help&quot; mkdir &quot;$(OutDir)\help&quot;&#x0D;&#x0A;copy &quot;$(InputDir)english.chm&quot; &quot;$(OutDir)\help\english.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
 							AdditionalDependencies="help\HTMLDefines.h"
 							Outputs="help\english\english.chm"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Making help file..."
-							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;start /wait hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)english.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;$(InputDir)english.chm&quot; &quot;$(OutDir)\help\english.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
+							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)english.chm&quot; goto :HelpError&#x0D;&#x0A;if not exist &quot;$(OutDir)\help&quot; mkdir &quot;$(OutDir)\help&quot;&#x0D;&#x0A;copy &quot;$(InputDir)english.chm&quot; &quot;$(OutDir)\help\english.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
 							AdditionalDependencies="help\HTMLDefines.h"
 							Outputs="help\english\english.chm"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Testing Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Making help file..."
-							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;start /wait hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)english.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;$(InputDir)english.chm&quot; &quot;$(OutDir)\help\english.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
+							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)english.chm&quot; goto :HelpError&#x0D;&#x0A;if not exist &quot;$(OutDir)\help&quot; mkdir &quot;$(OutDir)\help&quot;&#x0D;&#x0A;copy &quot;$(InputDir)english.chm&quot; &quot;$(OutDir)\help\english.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
 							AdditionalDependencies="help\HTMLDefines.h"
 							Outputs="help\english\english.chm"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Testing Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Making help file..."
-							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;start /wait hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)english.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;$(InputDir)english.chm&quot; &quot;$(OutDir)\help\english.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
+							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)english.chm&quot; goto :HelpError&#x0D;&#x0A;if not exist &quot;$(OutDir)\help&quot; mkdir &quot;$(OutDir)\help&quot;&#x0D;&#x0A;copy &quot;$(InputDir)english.chm&quot; &quot;$(OutDir)\help\english.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
 							AdditionalDependencies="help\HTMLDefines.h"
 							Outputs="help\english\english.chm"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Testing Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Making help file..."
-							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;start /wait hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)english.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;$(InputDir)english.chm&quot; &quot;$(OutDir)\help\english.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
+							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)english.chm&quot; goto :HelpError&#x0D;&#x0A;if not exist &quot;$(OutDir)\help&quot; mkdir &quot;$(OutDir)\help&quot;&#x0D;&#x0A;copy &quot;$(InputDir)english.chm&quot; &quot;$(OutDir)\help\english.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
 							AdditionalDependencies="help\HTMLDefines.h"
 							Outputs="help\english\english.chm"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|x64"
+						Name="Testing Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Making help file..."
-							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;start /wait hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)english.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;$(InputDir)english.chm&quot; &quot;$(OutDir)\help\english.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
+							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)english.chm&quot; goto :HelpError&#x0D;&#x0A;if not exist &quot;$(OutDir)\help&quot; mkdir &quot;$(OutDir)\help&quot;&#x0D;&#x0A;copy &quot;$(InputDir)english.chm&quot; &quot;$(OutDir)\help\english.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
 							AdditionalDependencies="help\HTMLDefines.h"
 							Outputs="help\english\english.chm"
 						/>
@@ -1641,10 +1825,10 @@
 				Filter="lng"
 				>
 				<File
-					RelativePath=".\langs\bulgarian.lng"
+					RelativePath=".\langs\afrikaans.lng"
 					>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1654,7 +1838,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1664,7 +1848,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1674,7 +1858,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1684,6 +1868,50 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
+						Name="Testing 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="Testing 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="Testing 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="Testing 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>
+				<File
+					RelativePath=".\langs\bulgarian.lng"
+					>
+					<FileConfiguration
 						Name="Debug|Win32"
 						>
 						<Tool
@@ -1723,12 +1951,8 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\chinese.lng"
-					>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Testing Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1738,7 +1962,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Testing Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1748,7 +1972,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Testing Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1758,7 +1982,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Testing Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1767,6 +1991,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\chinese.lng"
+					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -1807,12 +2035,8 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\czech.lng"
-					>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Testing Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1822,7 +2046,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Testing Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1832,7 +2056,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Testing Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1842,7 +2066,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Testing Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1851,6 +2075,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\czech.lng"
+					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -1891,12 +2119,52 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+					<FileConfiguration
+						Name="Testing 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="Testing 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="Testing 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="Testing 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>
 				<File
 					RelativePath=".\langs\dutch.lng"
 					>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1906,7 +2174,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1916,7 +2184,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1926,7 +2194,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1935,12 +2203,8 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\french.lng"
-					>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Testing Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1950,7 +2214,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Testing Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1960,7 +2224,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Testing Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1970,7 +2234,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Testing Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -1979,6 +2243,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\french.lng"
+					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2019,12 +2287,8 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\german.lng"
-					>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Testing Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2034,7 +2298,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Testing Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2044,7 +2308,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Testing Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2054,7 +2318,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Testing Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2063,6 +2327,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\german.lng"
+					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2103,12 +2371,8 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\german2.lng"
-					>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Testing Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2118,7 +2382,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Testing Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2128,7 +2392,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Testing Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2138,7 +2402,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Testing Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2147,6 +2411,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\german2.lng"
+					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2187,12 +2455,8 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\italian.lng"
-					>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Testing Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2202,7 +2466,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Testing Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2212,7 +2476,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Testing Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2222,7 +2486,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Testing Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2231,6 +2495,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\italian.lng"
+					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2271,12 +2539,8 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\japanese.lng"
-					>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Testing Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2286,7 +2550,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Testing Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2296,7 +2560,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Testing Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2306,7 +2570,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Testing Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2315,6 +2579,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\japanese.lng"
+					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2355,12 +2623,8 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\korean.lng"
-					>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Testing Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2370,7 +2634,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Testing Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2380,7 +2644,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Testing Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2390,7 +2654,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Testing Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2399,6 +2663,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\korean.lng"
+					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2439,12 +2707,8 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\polish.lng"
-					>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Testing Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2454,7 +2718,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Testing Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2464,7 +2728,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Testing Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2474,7 +2738,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Testing Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2483,6 +2747,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\polish.lng"
+					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2523,12 +2791,8 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\russian.lng"
-					>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Testing Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2538,7 +2802,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Testing Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2548,7 +2812,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Testing Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2558,7 +2822,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Testing Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2567,6 +2831,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\russian.lng"
+					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2607,12 +2875,8 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\spanish.lng"
-					>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Testing Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2622,7 +2886,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Testing Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2632,7 +2896,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Testing Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2642,7 +2906,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Testing Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2651,6 +2915,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\spanish.lng"
+					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2691,12 +2959,52 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+					<FileConfiguration
+						Name="Testing 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="Testing 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="Testing 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="Testing 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>
 				<File
 					RelativePath=".\langs\TraditionalChinese.lng"
 					>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2706,7 +3014,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2716,7 +3024,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2726,7 +3034,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2735,12 +3043,8 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\turkish.lng"
-					>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Testing Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2750,7 +3054,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Testing Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2760,7 +3064,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Testing Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2770,7 +3074,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Testing Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2779,6 +3083,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\turkish.lng"
+					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2819,12 +3127,8 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\langs\valencian.lng"
-					>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Testing Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2834,7 +3138,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Testing Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2844,7 +3148,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Testing Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2854,7 +3158,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Testing Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
@@ -2863,6 +3167,10 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\langs\valencian.lng"
+					>
 					<FileConfiguration
 						Name="Debug|Win32"
 						>
@@ -2903,6 +3211,46 @@
 							Outputs="$(OutDir)\langs\$(InputFileName)"
 						/>
 					</FileConfiguration>
+					<FileConfiguration
+						Name="Testing 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="Testing 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="Testing 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="Testing 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
@@ -2942,18 +3290,6 @@
 					>
 				</File>
 				<File
-					RelativePath=".\help\polish\162.txt"
-					>
-				</File>
-				<File
-					RelativePath=".\help\polish\164.txt"
-					>
-				</File>
-				<File
-					RelativePath=".\help\polish\165.txt"
-					>
-				</File>
-				<File
 					RelativePath=".\help\polish\167.txt"
 					>
 				</File>
@@ -3062,89 +3398,89 @@
 					RelativePath=".\help\polish\help.hhp"
 					>
 					<FileConfiguration
-						Name="Debug-Unicode|Win32"
+						Name="Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Making help file..."
-							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;start /wait hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)polish.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;$(InputDir)polish.chm&quot; &quot;$(OutDir)\help\polish.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
+							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)polish.chm&quot; goto :HelpError&#x0D;&#x0A;if not exist &quot;$(OutDir)\help&quot; mkdir &quot;$(OutDir)\help&quot;&#x0D;&#x0A;copy &quot;$(InputDir)polish.chm&quot; &quot;$(OutDir)\help\polish.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
 							AdditionalDependencies="help\HTMLDefines.h"
 							Outputs="help\polish\polish.chm"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug-Unicode|x64"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Making help file..."
-							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;start /wait hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)polish.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;$(InputDir)polish.chm&quot; &quot;$(OutDir)\help\polish.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
+							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)polish.chm&quot; goto :HelpError&#x0D;&#x0A;if not exist &quot;$(OutDir)\help&quot; mkdir &quot;$(OutDir)\help&quot;&#x0D;&#x0A;copy &quot;$(InputDir)polish.chm&quot; &quot;$(OutDir)\help\polish.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
 							AdditionalDependencies="help\HTMLDefines.h"
 							Outputs="help\polish\polish.chm"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|Win32"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Making help file..."
-							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;start /wait hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)polish.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;$(InputDir)polish.chm&quot; &quot;$(OutDir)\help\polish.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
+							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)polish.chm&quot; goto :HelpError&#x0D;&#x0A;if not exist &quot;$(OutDir)\help&quot; mkdir &quot;$(OutDir)\help&quot;&#x0D;&#x0A;copy &quot;$(InputDir)polish.chm&quot; &quot;$(OutDir)\help\polish.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
 							AdditionalDependencies="help\HTMLDefines.h"
 							Outputs="help\polish\polish.chm"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release-Unicode|x64"
+						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Making help file..."
-							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;start /wait hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)polish.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;$(InputDir)polish.chm&quot; &quot;$(OutDir)\help\polish.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
+							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)polish.chm&quot; goto :HelpError&#x0D;&#x0A;if not exist &quot;$(OutDir)\help&quot; mkdir &quot;$(OutDir)\help&quot;&#x0D;&#x0A;copy &quot;$(InputDir)polish.chm&quot; &quot;$(OutDir)\help\polish.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
 							AdditionalDependencies="help\HTMLDefines.h"
 							Outputs="help\polish\polish.chm"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32"
+						Name="Testing Debug|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Making help file..."
-							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;start /wait hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)polish.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;$(InputDir)polish.chm&quot; &quot;$(OutDir)\help\polish.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
+							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)polish.chm&quot; goto :HelpError&#x0D;&#x0A;if not exist &quot;$(OutDir)\help&quot; mkdir &quot;$(OutDir)\help&quot;&#x0D;&#x0A;copy &quot;$(InputDir)polish.chm&quot; &quot;$(OutDir)\help\polish.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
 							AdditionalDependencies="help\HTMLDefines.h"
 							Outputs="help\polish\polish.chm"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Testing Debug|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Making help file..."
-							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;start /wait hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)polish.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;$(InputDir)polish.chm&quot; &quot;$(OutDir)\help\polish.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
+							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)polish.chm&quot; goto :HelpError&#x0D;&#x0A;if not exist &quot;$(OutDir)\help&quot; mkdir &quot;$(OutDir)\help&quot;&#x0D;&#x0A;copy &quot;$(InputDir)polish.chm&quot; &quot;$(OutDir)\help\polish.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
 							AdditionalDependencies="help\HTMLDefines.h"
 							Outputs="help\polish\polish.chm"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Testing Release|Win32"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Making help file..."
-							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;start /wait hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)polish.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;$(InputDir)polish.chm&quot; &quot;$(OutDir)\help\polish.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
+							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)polish.chm&quot; goto :HelpError&#x0D;&#x0A;if not exist &quot;$(OutDir)\help&quot; mkdir &quot;$(OutDir)\help&quot;&#x0D;&#x0A;copy &quot;$(InputDir)polish.chm&quot; &quot;$(OutDir)\help\polish.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
 							AdditionalDependencies="help\HTMLDefines.h"
 							Outputs="help\polish\polish.chm"
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|x64"
+						Name="Testing Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Making help file..."
-							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;start /wait hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)polish.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;$(InputDir)polish.chm&quot; &quot;$(OutDir)\help\polish.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
+							CommandLine="copy &quot;help\HTMLDefines.h&quot; &quot;$(InputDir)HTMLDefines.h&quot;&#x0D;&#x0A;hhc &quot;$(InputPath)&quot;&#x0D;&#x0A;if not exist &quot;$(InputDir)polish.chm&quot; goto :HelpError&#x0D;&#x0A;if not exist &quot;$(OutDir)\help&quot; mkdir &quot;$(OutDir)\help&quot;&#x0D;&#x0A;copy &quot;$(InputDir)polish.chm&quot; &quot;$(OutDir)\help\polish.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo $(InputPath)(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"
 							AdditionalDependencies="help\HTMLDefines.h"
 							Outputs="help\polish\polish.chm"
 						/>
@@ -3253,39 +3589,147 @@
 				RelativePath="..\chext\chext_i.c"
 				>
 				<FileConfiguration
-					Name="Debug-Unicode|Win32"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug-Unicode|x64"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release-Unicode|Win32"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release-Unicode|x64"
+					Name="Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Testing Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Testing Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Testing Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Testing Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
+		<Filter
+			Name="Tests"
+			>
+			<File
+				RelativePath="..\..\tests\tests_shared\TestsExports.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Testing Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Testing Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Testing Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Testing Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 		<Global