Index: src/ch/ch.vc90.vcproj
===================================================================
diff -u -r8bf223e9f8ab564d95bef4eb4f64a9c6628f62f9 -rcaa71fb57fcfdd3b3731ed038cecc280ff69a78e
--- src/ch/ch.vc90.vcproj	(.../ch.vc90.vcproj)	(revision 8bf223e9f8ab564d95bef4eb4f64a9c6628f62f9)
+++ src/ch/ch.vc90.vcproj	(.../ch.vc90.vcproj)	(revision caa71fb57fcfdd3b3731ed038cecc280ff69a78e)
@@ -51,9 +51,10 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/analyze"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\libicpf\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
@@ -77,7 +78,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib libicpf32ud.lib libictranslate32ud.lib Dbghelp.lib"
+				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib libicpf32ud.lib libictranslate32ud.lib Dbghelp.lib libchcore32ud.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -142,9 +143,10 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/analyze"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\libicpf\src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
@@ -168,7 +170,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib libicpf64ud.lib libictranslate64ud.lib Dbghelp.lib"
+				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib libicpf64ud.lib libictranslate64ud.lib Dbghelp.lib libchcore64ud.lib"
 				OutputFile="$(OutDir)\$(ProjectName)64.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -236,7 +238,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\libicpf\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -261,7 +263,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib libicpf32u.lib libictranslate32u.lib Dbghelp.lib"
+				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib libicpf32u.lib libictranslate32u.lib Dbghelp.lib libchcore32u.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -329,7 +331,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\libicpf\src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -354,7 +356,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="false"
-				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib libicpf64u.lib libictranslate64u.lib Dbghelp.lib"
+				AdditionalDependencies="winmm.lib imagehlp.lib version.lib htmlhelp.lib libicpf64u.lib libictranslate64u.lib Dbghelp.lib libchcore64u.lib"
 				OutputFile="$(OutDir)\$(ProjectName)64.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -396,25 +398,470 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
-				RelativePath="AboutDlg.cpp"
+				RelativePath="MainWnd.cpp"
 				>
 			</File>
 			<File
-				RelativePath="AppHelper.cpp"
+				RelativePath="MainWnd.h"
 				>
 			</File>
-			<File
-				RelativePath="BufferSizeDlg.cpp"
+			<Filter
+				Name="Dialogs"
 				>
-			</File>
-			<File
-				RelativePath="CfgProperties.cpp"
+				<File
+					RelativePath="AboutDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="AboutDlg.h"
+					>
+				</File>
+				<File
+					RelativePath="BufferSizeDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="BufferSizeDlg.h"
+					>
+				</File>
+				<File
+					RelativePath=".\CrashDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\CrashDlg.h"
+					>
+				</File>
+				<File
+					RelativePath="CustomCopyDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CustomCopyDlg.h"
+					>
+				</File>
+				<File
+					RelativePath="Dialogs.cpp"
+					>
+				</File>
+				<File
+					RelativePath="Dialogs.h"
+					>
+				</File>
+				<File
+					RelativePath="DstFileErrorDlg.h"
+					>
+				</File>
+				<File
+					RelativePath=".\FeedbackFileErrorDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\FeedbackFileErrorDlg.h"
+					>
+				</File>
+				<File
+					RelativePath=".\FeedbackNotEnoughSpaceDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\FeedbackNotEnoughSpaceDlg.h"
+					>
+				</File>
+				<File
+					RelativePath=".\FeedbackReplaceDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\FeedbackReplaceDlg.h"
+					>
+				</File>
+				<File
+					RelativePath="FilterDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="FilterDlg.h"
+					>
+				</File>
+				<File
+					RelativePath="FolderDialog.cpp"
+					>
+				</File>
+				<File
+					RelativePath="FolderDialog.h"
+					>
+				</File>
+				<File
+					RelativePath="MiniViewDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="MiniViewDlg.h"
+					>
+				</File>
+				<File
+					RelativePath="OptionsDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="OptionsDlg.h"
+					>
+				</File>
+				<File
+					RelativePath="RecentDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="RecentDlg.h"
+					>
+				</File>
+				<File
+					RelativePath="ReplacePathsDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ReplacePathsDlg.h"
+					>
+				</File>
+				<File
+					RelativePath="ShortcutsDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ShortcutsDlg.h"
+					>
+				</File>
+				<File
+					RelativePath="ShutdownDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ShutdownDlg.h"
+					>
+				</File>
+				<File
+					RelativePath="StatusDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="StatusDlg.h"
+					>
+				</File>
+				<File
+					RelativePath=".\UpdaterDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\UpdaterDlg.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Controls"
 				>
-			</File>
-			<File
-				RelativePath="ch.cpp"
+				<File
+					RelativePath="DirTreeCtrl.cpp"
+					>
+				</File>
+				<File
+					RelativePath="DirTreeCtrl.h"
+					>
+				</File>
+				<File
+					RelativePath="FFListCtrl.cpp"
+					>
+				</File>
+				<File
+					RelativePath="FFListCtrl.h"
+					>
+				</File>
+				<File
+					RelativePath="ProgressListBox.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ProgressListBox.h"
+					>
+				</File>
+				<File
+					RelativePath="PropertyListCtrl.cpp"
+					>
+				</File>
+				<File
+					RelativePath="PropertyListCtrl.h"
+					>
+				</File>
+				<File
+					RelativePath="StaticEx.cpp"
+					>
+				</File>
+				<File
+					RelativePath="StaticEx.h"
+					>
+				</File>
+				<File
+					RelativePath="ThemedButton.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ThemedButton.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Shared"
 				>
-			</File>
+				<File
+					RelativePath="..\Common\ipcstructs.h"
+					>
+				</File>
+				<File
+					RelativePath="..\common\targetver.h"
+					>
+				</File>
+				<File
+					RelativePath="..\common\version.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Core"
+				>
+				<File
+					RelativePath="DataBuffer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="DataBuffer.h"
+					>
+				</File>
+				<File
+					RelativePath="DestPath.cpp"
+					>
+				</File>
+				<File
+					RelativePath="DestPath.h"
+					>
+				</File>
+				<File
+					RelativePath="Device IO.h"
+					>
+				</File>
+				<File
+					RelativePath=".\FeedbackHandler.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\FeedbackHandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\FileFilter.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\FileFilter.h"
+					>
+				</File>
+				<File
+					RelativePath="FileInfo.cpp"
+					>
+				</File>
+				<File
+					RelativePath="FileInfo.h"
+					>
+				</File>
+				<File
+					RelativePath="structs.cpp"
+					>
+				</File>
+				<File
+					RelativePath="structs.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Tools"
+				>
+				<File
+					RelativePath="AppHelper.cpp"
+					>
+				</File>
+				<File
+					RelativePath="AppHelper.h"
+					>
+				</File>
+				<File
+					RelativePath="charvect.h"
+					>
+				</File>
+				<File
+					RelativePath="..\common\FileSupport.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\Common\FileSupport.h"
+					>
+				</File>
+				<File
+					RelativePath="MemDC.h"
+					>
+				</File>
+				<File
+					RelativePath="register.cpp"
+					>
+				</File>
+				<File
+					RelativePath="register.h"
+					>
+				</File>
+				<File
+					RelativePath="shortcuts.cpp"
+					>
+				</File>
+				<File
+					RelativePath="shortcuts.h"
+					>
+				</File>
+				<File
+					RelativePath="StringHelpers.cpp"
+					>
+				</File>
+				<File
+					RelativePath="StringHelpers.h"
+					>
+				</File>
+				<File
+					RelativePath="Theme Helpers.cpp"
+					>
+				</File>
+				<File
+					RelativePath="Theme Helpers.h"
+					>
+				</File>
+				<File
+					RelativePath="TrayIcon.cpp"
+					>
+				</File>
+				<File
+					RelativePath="TrayIcon.h"
+					>
+				</File>
+				<File
+					RelativePath=".\UpdateChecker.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\UpdateChecker.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Other"
+				>
+				<File
+					RelativePath="af_defs.h"
+					>
+				</File>
+				<File
+					RelativePath="btnIDs.h"
+					>
+				</File>
+				<File
+					RelativePath="CfgProperties.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CfgProperties.h"
+					>
+				</File>
+				<File
+					RelativePath="ch.cpp"
+					>
+				</File>
+				<File
+					RelativePath="ch.h"
+					>
+				</File>
+				<File
+					RelativePath="stdafx.cpp"
+					>
+					<FileConfiguration
+						Name="Debug-Unicode|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug-Unicode|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release-Unicode|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release-Unicode|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="stdafx.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 			<File
 				RelativePath="ch.rc"
 				>
@@ -508,355 +955,14 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\CrashDlg.cpp"
+				RelativePath="res\ch.rc2"
 				>
 			</File>
 			<File
-				RelativePath="CustomCopyDlg.cpp"
+				RelativePath="res\main_toolbar.bmp"
 				>
 			</File>
 			<File
-				RelativePath="DataBuffer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="DestPath.cpp"
-				>
-			</File>
-			<File
-				RelativePath="Dialogs.cpp"
-				>
-			</File>
-			<File
-				RelativePath="DirTreeCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="DstFileErrorDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="FFListCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="FileInfo.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\common\FileSupport.cpp"
-				>
-			</File>
-			<File
-				RelativePath="FilterDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="FolderDialog.cpp"
-				>
-			</File>
-			<File
-				RelativePath="MainWnd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="MiniViewDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="NotEnoughRoomDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="OptionsDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ProgressListBox.cpp"
-				>
-			</File>
-			<File
-				RelativePath="PropertyListCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="RecentDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="register.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ReplaceFilesDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ReplaceOnlyDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ReplacePathsDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="shortcuts.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ShortcutsDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ShutdownDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="SmallReplaceFilesDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="StaticEx.cpp"
-				>
-			</File>
-			<File
-				RelativePath="StatusDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="stdafx.cpp"
-				>
-				<FileConfiguration
-					Name="Debug-Unicode|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug-Unicode|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-Unicode|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-Unicode|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="StringHelpers.cpp"
-				>
-			</File>
-			<File
-				RelativePath="structs.cpp"
-				>
-			</File>
-			<File
-				RelativePath="Theme Helpers.cpp"
-				>
-			</File>
-			<File
-				RelativePath="ThemedButton.cpp"
-				>
-			</File>
-			<File
-				RelativePath="TrayIcon.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="AboutDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="af_defs.h"
-				>
-			</File>
-			<File
-				RelativePath="AppHelper.h"
-				>
-			</File>
-			<File
-				RelativePath="btnIDs.h"
-				>
-			</File>
-			<File
-				RelativePath="BufferSizeDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="CfgProperties.h"
-				>
-			</File>
-			<File
-				RelativePath="ch.h"
-				>
-			</File>
-			<File
-				RelativePath="charvect.h"
-				>
-			</File>
-			<File
-				RelativePath=".\CrashDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="CustomCopyDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="DataBuffer.h"
-				>
-			</File>
-			<File
-				RelativePath="DestPath.h"
-				>
-			</File>
-			<File
-				RelativePath="Device IO.h"
-				>
-			</File>
-			<File
-				RelativePath="Dialogs.h"
-				>
-			</File>
-			<File
-				RelativePath="DirTreeCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="DstFileErrorDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="ExceptionEx.h"
-				>
-			</File>
-			<File
-				RelativePath="FFListCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="FileInfo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Common\FileSupport.h"
-				>
-			</File>
-			<File
-				RelativePath="FilterDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="FolderDialog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Common\ipcstructs.h"
-				>
-			</File>
-			<File
-				RelativePath="MainWnd.h"
-				>
-			</File>
-			<File
-				RelativePath="MemDC.h"
-				>
-			</File>
-			<File
-				RelativePath="MiniViewDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="NotEnoughRoomDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="OptionsDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="ProgressListBox.h"
-				>
-			</File>
-			<File
-				RelativePath="PropertyListCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="RecentDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="register.h"
-				>
-			</File>
-			<File
-				RelativePath="ReplaceFilesDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="ReplaceOnlyDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="ReplacePathsDlg.h"
-				>
-			</File>
-			<File
 				RelativePath="resource.h"
 				>
 				<FileConfiguration
@@ -944,169 +1050,112 @@
 				RelativePath=".\resource.hm"
 				>
 			</File>
-			<File
-				RelativePath="shortcuts.h"
+			<Filter
+				Name="Icons"
 				>
-			</File>
-			<File
-				RelativePath="ShortcutsDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="ShutdownDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="SmallReplaceFilesDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="StaticEx.h"
-				>
-			</File>
-			<File
-				RelativePath="StatusDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="stdafx.h"
-				>
-			</File>
-			<File
-				RelativePath="StringHelpers.h"
-				>
-			</File>
-			<File
-				RelativePath="structs.h"
-				>
-			</File>
-			<File
-				RelativePath="Theme Helpers.h"
-				>
-			</File>
-			<File
-				RelativePath="ThemedButton.h"
-				>
-			</File>
-			<File
-				RelativePath="TrayIcon.h"
-				>
-			</File>
+				<File
+					RelativePath="res\addshort.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\cancelled.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\cd.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\ch.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\delshort.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\err.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\error.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\finished.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\folder.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\hd.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\hd2.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\info.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\large.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\list.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\net.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\newdir.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\paused.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\question.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\report.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\shut.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\small.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\tribe.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\waiting.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\warning.ico"
+					>
+				</File>
+				<File
+					RelativePath="res\working.ico"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath="res\addshort.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\cancelled.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\cd.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\ch.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\ch.rc2"
-				>
-			</File>
-			<File
-				RelativePath="res\delshort.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\err.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\error.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\finished.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\folder.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\hd.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\hd2.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\info.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\large.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\list.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\main_toolbar.bmp"
-				>
-			</File>
-			<File
-				RelativePath="res\net.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\newdir.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\paused.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\question.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\report.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\shut.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\small.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\tribe.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\waiting.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\warning.ico"
-				>
-			</File>
-			<File
-				RelativePath="res\working.ico"
-				>
-			</File>
-		</Filter>
-		<Filter
 			Name="Localization"
 			>
 			<Filter
@@ -2462,6 +2511,10 @@
 					</FileConfiguration>
 				</File>
 				<File
+					RelativePath=".\langs\TraditionalChinese.lng"
+					>
+				</File>
+				<File
 					RelativePath=".\langs\turkish.lng"
 					>
 					<FileConfiguration
@@ -2971,6 +3024,46 @@
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="Generated Files"
+			>
+			<File
+				RelativePath="..\chext\chext_i.c"
+				>
+				<FileConfiguration
+					Name="Debug-Unicode|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug-Unicode|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-Unicode|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-Unicode|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 		<Global