winmerge-svn

[Winmerge-svn] SF.net SVN: winmerge:[7384] branches/R2_14

[<ge...@us...>]

Revision: 7384
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7384&view=rev
Author:   gerundt
Date:     2010-10-31 11:43:34 +0000 (Sun, 31 Oct 2010)

Log Message:
-----------
PATCH: [ 3095046 ] Drop Ansi config from x86 project 

Modified Paths:
--------------
    branches/R2_14/Src/Merge.vcproj
    branches/R2_14/WinMerge.sln

Modified: branches/R2_14/Src/Merge.vcproj
===================================================================
--- branches/R2_14/Src/Merge.vcproj	2010-10-31 10:42:48 UTC (rev 7383)
+++ branches/R2_14/Src/Merge.vcproj	2010-10-31 11:43:34 UTC (rev 7384)
@@ -226,216 +226,6 @@
 				CommandLine="PostBuild.bat $(IntDir) $(TargetPath)"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\BuildTmp\MergeDebug"
-			IntermediateDirectory=".\..\BuildTmp\MergeDebug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\BuildTmp\MergeDebug/Merge.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/EHa "
-				Optimization="0"
-				AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\&quot;pr\&quot;;DIFF_PROGRAM=\&quot;diff\&quot;;REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;_CRT_SECURE_NO_DEPRECATE"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\..\BuildTmp\MergeDebug/Merge.pch"
-				AssemblerListingLocation=".\..\BuildTmp\MergeDebug/"
-				ObjectFile=".\..\BuildTmp\MergeDebug/"
-				ProgramDataBaseFileName=".\..\BuildTmp\MergeDebug/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="PreLink.bat $(IntDir) $(TargetPath)"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib scew_d.lib"
-				OutputFile="..\Build\MergeDebug/WinMerge.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\..\BuildTmp\MergeDebug/WinMerge.pdb"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="$(InputDir)\res\$(TargetFileName).manifest"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(IntDir) $(TargetPath)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\BuildTmp\MergeRelease"
-			IntermediateDirectory=".\..\BuildTmp\MergeRelease"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\BuildTmp\MergeRelease/Merge.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/EHa "
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
-				PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\&quot;pr\&quot;;DIFF_PROGRAM=\&quot;diff\&quot;;REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;_CRT_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\..\BuildTmp\MergeRelease/Merge.pch"
-				AssemblerListingLocation=".\..\BuildTmp\MergeRelease/"
-				ObjectFile=".\..\BuildTmp\MergeRelease/"
-				ProgramDataBaseFileName=".\..\BuildTmp\MergeRelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="0"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="PreLink.bat $(IntDir) $(TargetPath)"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/verbose:lib"
-				AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib scew.lib"
-				OutputFile="..\Build\MergeRelease/WinMerge.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="false"
-				ProgramDatabaseFile=""
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="$(InputDir)\res\$(TargetFileName).manifest"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="PostBuild.bat $(IntDir) $(TargetPath)"
-			/>
-		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -468,27 +258,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="AboutDlg.cpp"
@@ -514,27 +283,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\AnsiConvert.cpp"
@@ -564,31 +312,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="BCMenu.cpp"
@@ -614,27 +337,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\Common\Bitmap.cpp"
@@ -664,27 +366,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="charsets.c"
@@ -712,29 +393,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ChildFrm.cpp"
@@ -760,27 +418,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Common\ClipBoard.cpp"
@@ -806,27 +443,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Common\CMoveConstraint.cpp"
@@ -852,27 +468,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="codepage.cpp"
@@ -898,27 +493,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="codepage_detect.cpp"
@@ -944,27 +518,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ColorButton.cpp"
@@ -990,27 +543,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="CompareOptions.cpp"
@@ -1042,33 +574,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="CompareStatisticsDlg.cpp"
@@ -1094,27 +599,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="CompareStats.cpp"
@@ -1146,33 +630,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ConfigLog.cpp"
@@ -1198,27 +655,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ConfirmFolderCopyDlg.cpp"
@@ -1244,27 +680,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ConflictFileParser.cpp"
@@ -1290,27 +705,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Common\coretools.cpp"
@@ -1338,29 +732,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Common\CShellFileOp.cpp"
@@ -1386,27 +757,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Common\CSubclass.cpp"
@@ -1432,27 +782,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DiffContext.cpp"
@@ -1478,27 +807,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DiffFileData.cpp"
@@ -1524,27 +832,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DiffFileInfo.cpp"
@@ -1570,27 +857,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DiffItem.cpp"
@@ -1616,27 +882,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DiffItemList.cpp"
@@ -1664,29 +909,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DiffList.cpp"
@@ -1712,27 +934,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DiffTextBuffer.cpp"
@@ -1758,27 +959,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DiffThread.cpp"
@@ -1804,27 +984,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DiffViewBar.cpp"
@@ -1850,27 +1009,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DiffWrapper.cpp"
@@ -1896,27 +1034,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DirActions.cpp"
@@ -1942,27 +1059,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DirCmpReport.cpp"
@@ -1988,27 +1084,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DirCmpReportDlg.cpp"
@@ -2034,27 +1109,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DirColsDlg.cpp"
@@ -2080,27 +1134,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DirCompProgressDlg.cpp"
@@ -2126,27 +1159,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DirDoc.cpp"
@@ -2172,27 +1184,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DirFrame.cpp"
@@ -2218,27 +1209,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DirItem.cpp"
@@ -2264,27 +1234,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DirScan.cpp"
@@ -2310,27 +1259,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DirTravel.cpp"
@@ -2358,29 +1286,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DirView.cpp"
@@ -2406,27 +1311,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DirViewColHandler.cpp"
@@ -2452,27 +1336,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DirViewColItems.cpp"
@@ -2498,27 +1361,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Common\dllproxy.c"
@@ -2546,29 +1388,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="dllpstub.cpp"
@@ -2594,27 +1413,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="EditorFilepathBar.cpp"
@@ -2640,27 +1438,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Environment.cpp"
@@ -2686,27 +1463,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="FileActionScript.cpp"
@@ -2732,27 +1488,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="FileFilterHelper.cpp"
@@ -2778,27 +1513,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="FileFilterMgr.cpp"
@@ -2824,27 +1538,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="FileFiltersDlg.cpp"
@@ -2870,27 +1563,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="FileOrFolderSelect.cpp"
@@ -2916,27 +1588,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="FilepathEdit.cpp"
@@ -2962,27 +1613,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="files.cpp"
@@ -3008,27 +1638,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="FileTextEncoding.cpp"
@@ -3054,27 +1663,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="FileTransform.cpp"
@@ -3100,27 +1688,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="FileVersion.cpp"
@@ -3152,33 +1719,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="FilterCommentsManager.cpp"
@@ -3204,27 +1744,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="FilterList.cpp"
@@ -3250,27 +1769,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="FolderCmp.cpp"
@@ -3296,27 +1794,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="GhostTextBuffer.cpp"
@@ -3342,27 +1819,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="GhostTextView.cpp"
@@ -3388,27 +1844,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\HexMergeDoc.cpp"
@@ -3446,27 +1881,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\LineFiltersDlg.cpp"
@@ -3500,31 +1914,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="LoadSaveCodepageDlg.cpp"
@@ -3550,27 +1939,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="locality.cpp"
@@ -3596,27 +1964,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="LocationBar.cpp"
@@ -3642,27 +1989,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="LocationView.cpp"
@@ -3688,27 +2014,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Common\LogFile.cpp"
@@ -3734,27 +2039,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Common\lwdisp.c"
@@ -3782,29 +2066,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="MainFrm.cpp"
@@ -3830,27 +2091,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="markdown.cpp"
@@ -3878,29 +2118,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Common\MDITabBar.cpp"
@@ -3926,27 +2143,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Merge.cpp"
@@ -3972,27 +2168,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Merge.rc"
@@ -4038,27 +2213,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="MergeDiffDetailView.cpp"
@@ -4084,27 +2238,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="MergeDoc.cpp"
@@ -4130,27 +2263,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="MergeDocDiffSync.cpp"
@@ -4176,27 +2288,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="MergeDocEncoding.cpp"
@@ -4222,27 +2313,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="MergeDocLineDiffs.cpp"
@@ -4268,27 +2338,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<Fi...
 
[truncated message content]

[Winmerge-svn] SF.net SVN: winmerge:[7398] branches/R2_14

[<ge...@us...>]

Revision: 7398
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7398&view=rev
Author:   gerundt
Date:     2010-11-01 13:32:09 +0000 (Mon, 01 Nov 2010)

Log Message:
-----------
PATCH: [ 3059318 ] Drop Ansi config from x64 project

Modified Paths:
--------------
    branches/R2_14/Src/MergeLangX64.vcproj
    branches/R2_14/Src/MergeX64.vcproj
    branches/R2_14/WinMergeX64.sln

Modified: branches/R2_14/Src/MergeLangX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeLangX64.vcproj	2010-11-01 12:25:55 UTC (rev 7397)
+++ branches/R2_14/Src/MergeLangX64.vcproj	2010-11-01 13:32:09 UTC (rev 7398)
@@ -20,328 +20,6 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\Build\MergeDebug"
-			IntermediateDirectory=".\..\BuildTmp\MergeLang\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MERGELANG_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/MergeLang.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/MergeLang.pdb"
-				SubSystem="2"
-				ResourceOnlyDLL="true"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/MergeLang.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".\..\Build\$(PlatformName)\Merge$(ConfigurationName)"
-			IntermediateDirectory=".\..\BuildTmp\MergeLang\$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MERGELANG_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/MergeLang.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/MergeLang.pdb"
-				SubSystem="2"
-				ResourceOnlyDLL="true"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/MergeLang.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\Build\Merge$(ConfigurationName)"
-			IntermediateDirectory=".\..\BuildTmp\MergeLang\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MERGELANG_EXPORTS"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/MergeLang.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ResourceOnlyDLL="true"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/MergeLang.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\Build\$(PlatformName)\Merge$(ConfigurationName)"
-			IntermediateDirectory=".\..\BuildTmp\MergeLang\$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MERGELANG_EXPORTS"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/MergeLang.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ResourceOnlyDLL="true"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/MergeLang.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
 			Name="UnicodeDebug|Win32"
 			OutputDirectory=".\..\Build\MergeUnicodeDebug"
 			IntermediateDirectory=".\..\BuildTmp\MergeLang\$(ConfigurationName)"
@@ -419,7 +97,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
+				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -501,7 +179,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
+				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -580,7 +258,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
+				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -660,7 +338,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
+				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -741,7 +419,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
+				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -823,7 +501,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
+				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -902,7 +580,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
+				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -982,7 +660,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
+				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -993,42 +671,6 @@
 			RelativePath=".\Merge.rc"
 			>
 			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
-					Outputs="Languages\MergeLang.rc"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|x64"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
-					Outputs="Languages\MergeLang.rc"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
-					Outputs="Languages\MergeLang.rc"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|x64"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
-					Outputs="Languages\MergeLang.rc"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
 				Name="UnicodeDebug|Win32"
 				>
 				<Tool

Modified: branches/R2_14/Src/MergeX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeX64.vcproj	2010-11-01 12:25:55 UTC (rev 7397)
+++ branches/R2_14/Src/MergeX64.vcproj	2010-11-01 13:32:09 UTC (rev 7398)
@@ -410,388 +410,6 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\BuildTmp\MergeDebug"
-			IntermediateDirectory=".\..\BuildTmp\MergeDebug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/EHa "
-				Optimization="0"
-				AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\&quot;pr\&quot;;DIFF_PROGRAM=\&quot;diff\&quot;;REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdafx.h"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_MSC_VER=1500"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
-				OutputFile="..\Build\MergeDebug/WinMerge.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew,..\Build\heksedit"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory=".\..\BuildTmp\$(PlatformName)\Merge$(ConfigurationName)"
-			IntermediateDirectory=".\..\BuildTmp\$(PlatformName)\Merge$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/EHa "
-				Optimization="0"
-				AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
-				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\&quot;pr\&quot;;DIFF_PROGRAM=\&quot;diff\&quot;;REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdafx.h"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_MSC_VER=1500"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
-				OutputFile="..\Build\X64\MergeDebug/WinMerge.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\Build\expat\X64,..\Build\pcre\X64,..\Build\scew\X64,..\Build\heksedit\X64"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\..\BuildTmp\MergeRelease"
-			IntermediateDirectory=".\..\BuildTmp\MergeRelease"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/EHa "
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
-				PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\&quot;pr\&quot;;DIFF_PROGRAM=\&quot;diff\&quot;;REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdafx.h"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_MSC_VER=1500"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/verbose:lib"
-				AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
-				OutputFile="..\Build\MergeRelease/WinMerge.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew,..\Build\heksedit"
-				IgnoreDefaultLibraryNames="msvcrtd.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\..\BuildTmp\$(PlatformName)\Merge$(ConfigurationName)"
-			IntermediateDirectory=".\..\BuildTmp\$(PlatformName)\Merge$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/EHa "
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
-				PreprocessorDefinitions="WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\&quot;pr\&quot;;DIFF_PROGRAM=\&quot;diff\&quot;;REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdafx.h"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_MSC_VER=1500"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/verbose:lib"
-				AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
-				OutputFile="..\Build\X64\MergeRelease/WinMerge.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\Build\expat\X64,..\Build\pcre\X64,..\Build\scew\X64,..\Build\heksedit\X64"
-				IgnoreDefaultLibraryNames="msvcrtd.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
 			Name="X64 Debug|Win32"
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
@@ -1235,48 +853,6 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
 					Name="X64 Debug|Win32"
 					>
 					<Tool
@@ -1365,48 +941,6 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
 					Name="X64 Debug|Win32"
 					>
 					<Tool
@@ -1485,38 +1019,6 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
 					Name="X64 Debug|Win32"
 					>
 					<Tool
@@ -1595,48 +1097,6 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
 					Name="X64 Debug|Win32"
 					>
 					<Tool
@@ -1729,48 +1189,6 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
 					Name="X64 Debug|Win32"
 					>
 					<Tool
@@ -1863,52 +1281,6 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
 					Name="X64 Debug|Win32"
 					>
 					<Tool
@@ -2001,48 +1373,6 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
 					Name="X64 Debug|Win32"
 					>
 					<Tool
@@ -2131,48 +1461,6 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
 					Name="X64 Debug|Win32"
 					>
 					<Tool
@@ -2261,48 +1549,6 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
 					Name="X64 Debug|Win32"
 					>
 					<Tool
@@ -2391,48 +1637,6 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
 					Name="X64 Debug|Win32"
 					>
 					<Tool
@@ -2521,48 +1725,6 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInfo...
 
[truncated message content]

[Winmerge-svn] SF.net SVN: winmerge:[7400] branches/R2_14

[<ge...@us...>]

Revision: 7400
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7400&view=rev
Author:   gerundt
Date:     2010-11-01 13:51:46 +0000 (Mon, 01 Nov 2010)

Log Message:
-----------
PATCH: [ 3061941 ] Drop X64 * configs from x64 project

Modified Paths:
--------------
    branches/R2_14/Src/MergeLangX64.vcproj
    branches/R2_14/Src/MergeX64.vcproj
    branches/R2_14/WinMergeX64.sln

Modified: branches/R2_14/Src/MergeLangX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeLangX64.vcproj	2010-11-01 13:43:17 UTC (rev 7399)
+++ branches/R2_14/Src/MergeLangX64.vcproj	2010-11-01 13:51:46 UTC (rev 7400)
@@ -341,328 +341,6 @@
 				CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
 			/>
 		</Configuration>
-		<Configuration
-			Name="X64 Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MERGELANG_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/MergeLang.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/MergeLang.pdb"
-				SubSystem="2"
-				ResourceOnlyDLL="true"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/MergeLang.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="X64 Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MERGELANG_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/MergeLang.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/MergeLang.pdb"
-				SubSystem="2"
-				ResourceOnlyDLL="true"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/MergeLang.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="X64 Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MERGELANG_EXPORTS"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/MergeLang.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ResourceOnlyDLL="true"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/MergeLang.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="X64 Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MERGELANG_EXPORTS"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/MergeLang.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ResourceOnlyDLL="true"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/MergeLang.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="pushd $(InputDir)\Languages&#x0D;&#x0A;cscript UpdatePoFilesFromPotFile.vbs&#x0D;&#x0A;popd&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2&gt; NUL&#x0D;&#x0A;mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2&gt; NUL&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\&quot;&#x0D;&#x0A;copy /Y &quot;$(InputDir)Languages\*.po&quot; &quot;$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\&quot;&#x0D;&#x0A;"
-			/>
-		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -706,42 +384,6 @@
 					Outputs="Languages\MergeLang.rc"
 				/>
 			</FileConfiguration>
-			<FileConfiguration
-				Name="X64 Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
-					Outputs="Languages\MergeLang.rc"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="X64 Debug|x64"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
-					Outputs="Languages\MergeLang.rc"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="X64 Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
-					Outputs="Languages\MergeLang.rc"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="X64 Release|x64"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					CommandLine="cd Languages&#x0D;&#x0A;cscript CreateMasterPotFile.vbs&#x0D;&#x0A;"
-					Outputs="Languages\MergeLang.rc"
-				/>
-			</FileConfiguration>
 		</File>
 		<File
 			RelativePath=".\Languages\MergeLang.rc"

Modified: branches/R2_14/Src/MergeX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeX64.vcproj	2010-11-01 13:43:17 UTC (rev 7399)
+++ branches/R2_14/Src/MergeX64.vcproj	2010-11-01 13:51:46 UTC (rev 7400)
@@ -409,396 +409,6 @@
 				CommandLine=""
 			/>
 		</Configuration>
-		<Configuration
-			Name="X64 Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			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"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/EHa "
-				Optimization="0"
-				AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\&quot;pr\&quot;;DIFF_PROGRAM=\&quot;diff\&quot;;REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdafx.h"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_MSC_VER=1500"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
-				OutputFile="..\Build\MergeUnicodeDebug/WinMergeU.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew,..\Build\heksedit"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				EntryPointSymbol="wWinMainCRTStartup"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="X64 Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine=""
-				Outputs="$(TargetDir)WinMergeU.map"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/EHa "
-				Optimization="0"
-				AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
-				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\&quot;pr\&quot;;DIFF_PROGRAM=\&quot;diff\&quot;;REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdafx.h"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_MSC_VER=1500"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
-				OutputFile="..\Build\X64\MergeUnicodeDebug/WinMergeU.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\Build\expat\X64,..\Build\pcre\X64,..\Build\scew\X64,..\Build\heksedit\X64"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				EntryPointSymbol="wWinMainCRTStartup"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="X64 Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			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"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/EHa "
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
-				PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\&quot;pr\&quot;;DIFF_PROGRAM=\&quot;diff\&quot;;REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdafx.h"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_MSC_VER=1500"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/verbose:lib"
-				AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
-				OutputFile="..\Build\MergeUnicodeRelease\WinMergeU.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew,..\Build\heksedit"
-				IgnoreDefaultLibraryNames="msvcrtd.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				EntryPointSymbol="wWinMainCRTStartup"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="X64 Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine=""
-				Outputs="$(TargetDir)WinMergeU.map"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/EHa "
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
-				PreprocessorDefinitions="WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\&quot;pr\&quot;;DIFF_PROGRAM=\&quot;diff\&quot;;REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdafx.h"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_MSC_VER=1500"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/verbose:lib"
-				AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
-				OutputFile="..\Build\X64\MergeUnicodeRelease\WinMergeU.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\Build\expat\X64,..\Build\pcre\X64,..\Build\scew\X64,..\Build\heksedit\X64"
-				IgnoreDefaultLibraryNames="msvcrtd.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				EntryPointSymbol="wWinMainCRTStartup"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -852,48 +462,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="AboutDlg.cpp"
@@ -940,48 +508,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\AnsiConvert.cpp"
@@ -1018,38 +544,6 @@
 						UsePrecompiledHeader="0"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="BCMenu.cpp"
@@ -1096,48 +590,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Common\Bitmap.cpp"
@@ -1188,48 +640,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="charsets.c"
@@ -1280,52 +690,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ChildFrm.cpp"
@@ -1372,48 +736,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Common\ClipBoard.cpp"
@@ -1460,48 +782,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Common\CMoveConstraint.cpp"
@@ -1548,48 +828,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="codepage.cpp"
@@ -1636,48 +874,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="codepage_detect.cpp"
@@ -1724,48 +920,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ColorButton.cpp"
@@ -1812,48 +966,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="CompareOptions.cpp"
@@ -1912,60 +1024,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="CompareStatisticsDlg.cpp"
@@ -2012,48 +1070,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="CompareStats.cpp"
@@ -2112,60 +1128,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						PrecompiledHeaderFile=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ConfigLog.cpp"
@@ -2212,48 +1174,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ConfirmFolderCopyDlg.cpp"
@@ -2300,48 +1220,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="ConflictFileParser.cpp"
@@ -2388,48 +1266,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Common\coretools.cpp"
@@ -2480,52 +1316,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="common\CShellFileOp.cpp"
@@ -2572,48 +1362,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Common\CSubclass.cpp"
@@ -2660,48 +1408,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DiffContext.cpp"
@@ -2748,48 +1454,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DiffFileData.cpp"
@@ -2836,48 +1500,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DiffFileInfo.cpp"
@@ -2924,48 +1546,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DiffItem.cpp"
@@ -3012,48 +1592,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DiffItemList.cpp"
@@ -3108,54 +1646,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="0"
-						PrecompiledHeaderThrough=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DiffList.cpp"
@@ -3202,48 +1692,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\DiffTextBuffer.cpp"
@@ -3294,48 +1742,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DiffViewBar.cpp"
@@ -3382,48 +1788,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="DiffWrapper.cpp"
@@ -3470,48 +1834,6 @@
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="1"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="X64 Release|x64"
-					>
-...
 
[truncated message content]

[Winmerge-svn] SF.net SVN: winmerge:[7409] branches/R2_14

[<ki...@us...>]

Revision: 7409
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7409&view=rev
Author:   kimmov
Date:     2010-11-04 18:13:18 +0000 (Thu, 04 Nov 2010)

Log Message:
-----------
PATCH: #2092180 Allow editing context line count in patch creator

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/Merge.rc
    branches/R2_14/Src/PatchDlg.cpp
    branches/R2_14/Src/PatchDlg.h

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-03 18:52:56 UTC (rev 7408)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-04 18:13:18 UTC (rev 7409)
@@ -10,6 +10,7 @@
   Add menuitems for selecting automatic or manual prediffing (#2638608)
   Add accelerator keys for Shell context menu (#2823536)
   Improve editing of linefilter regular expressions (#3015416)
+  Allow editing context line count in patch creator (#2092180)
   Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed 
     in status bar (#3025855)
 

Modified: branches/R2_14/Src/Merge.rc
===================================================================
--- branches/R2_14/Src/Merge.rc	2010-11-03 18:52:56 UTC (rev 7408)
+++ branches/R2_14/Src/Merge.rc	2010-11-04 18:13:18 UTC (rev 7409)
@@ -1036,7 +1036,7 @@
     COMBOBOX        IDC_DIFF_STYLE,63,92,80,68,CBS_DROPDOWNLIST | WS_VSCROLL |
                     WS_TABSTOP
     LTEXT           "&Context:",IDC_STATIC,13,109,46,8
-    COMBOBOX        IDC_DIFF_CONTEXT,63,108,80,65,CBS_DROPDOWNLIST |
+    COMBOBOX        IDC_DIFF_CONTEXT,63,108,80,65,CBS_DROPDOWN | CBS_SORT |
                     WS_DISABLED | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "W&hitespaces",IDC_STATIC,155,81,123,46
     CONTROL         "Com&pare",IDC_DIFF_WHITESPACE_COMPARE,"Button",

Modified: branches/R2_14/Src/PatchDlg.cpp
===================================================================
--- branches/R2_14/Src/PatchDlg.cpp	2010-11-03 18:52:56 UTC (rev 7408)
+++ branches/R2_14/Src/PatchDlg.cpp	2010-11-04 18:13:18 UTC (rev 7409)
@@ -175,6 +175,7 @@
 
 	// Save combobox history
 	m_ctlResult.SaveState(_T("Files\\DiffFileResult"));
+	m_comboContext.SaveState(_T("PatchCreator\\DiffContext"));
 	// Don't save filenames if multiple file selected (as editbox reads
 	// [X files selected])
 	if (selectCount <= 1)
@@ -201,6 +202,7 @@
 	// Load combobox history
 	m_ctlFile1.LoadState(_T("Files\\DiffFile1"));
 	m_ctlFile2.LoadState(_T("Files\\DiffFile2"));
+	m_comboContext.LoadState(_T("PatchCreator\\DiffContext"));
 	m_ctlResult.LoadState(_T("Files\\DiffFileResult"));
 
 	int count = m_fileList.size();
@@ -233,13 +235,15 @@
 	m_outputStyle = OUTPUT_NORMAL;
 	m_comboStyle.SetCurSel(0);
 
-	// Add context line counts to combobox
-	m_comboContext.AddString(_T("0"));
-	m_comboContext.AddString(_T("1"));
-	m_comboContext.AddString(_T("3"));
-	m_comboContext.AddString(_T("5"));
-	m_comboContext.AddString(_T("7"));
-	m_comboContext.AddString(_T("11"));
+	// Add default context line counts to combobox if its empty
+	if (m_comboContext.GetCount() == 0)
+	{
+		m_comboContext.AddString(_T("0"));
+		m_comboContext.AddString(_T("1"));
+		m_comboContext.AddString(_T("3"));
+		m_comboContext.AddString(_T("5"));
+		m_comboContext.AddString(_T("7"));
+	}
 	
 	LoadSettings();
 

Modified: branches/R2_14/Src/PatchDlg.h
===================================================================
--- branches/R2_14/Src/PatchDlg.h	2010-11-03 18:52:56 UTC (rev 7408)
+++ branches/R2_14/Src/PatchDlg.h	2010-11-04 18:13:18 UTC (rev 7409)
@@ -43,18 +43,18 @@
 // Construction
 public:
 	CPatchDlg(CWnd* pParent = NULL);   // standard constructor
-	
+
 	// Functions to add and get selected files (as PATCHFILEs)
 	void AddItem(const PATCHFILES& pf);
 	int GetItemCount();
-    const PATCHFILES& GetItemAt(int position);
+	const PATCHFILES& GetItemAt(int position);
 	void ClearItems();
 
 // Dialog Data
 	//{{AFX_DATA(CPatchDlg)
 	enum { IDD = IDD_GENERATE_PATCH };
 	CComboBox m_comboStyle;
-	CComboBox m_comboContext;
+	CSuperComboBox m_comboContext;
 	BOOL m_caseSensitive;
 	CSuperComboBox m_ctlFile1;
 	CSuperComboBox m_ctlFile2;
@@ -82,8 +82,8 @@
 // Implementation
 protected:
 
-    std::vector<PATCHFILES> m_fileList; /**< Source files to create patch from */
-	
+	std::vector<PATCHFILES> m_fileList; /**< Source files to create patch from */
+
 	void ChangeFile(const CString &sFile, BOOL bLeft);
 	void UpdateSettings();
 	void LoadSettings();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7410] branches/R2_14

[<ki...@us...>]

Revision: 7410
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7410&view=rev
Author:   kimmov
Date:     2010-11-04 18:34:37 +0000 (Thu, 04 Nov 2010)

Log Message:
-----------
PATCH: #2818451 Improve color options organization

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/Common/PreferencesDlg.cpp
    branches/R2_14/Src/Common/PreferencesDlg.h
    branches/R2_14/Src/Merge.rc
    branches/R2_14/Src/resource.h

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-04 18:13:18 UTC (rev 7409)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-04 18:34:37 UTC (rev 7410)
@@ -11,6 +11,7 @@
   Add accelerator keys for Shell context menu (#2823536)
   Improve editing of linefilter regular expressions (#3015416)
   Allow editing context line count in patch creator (#2092180)
+  Improve color options organization (#2818451)
   Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed 
     in status bar (#3025855)
 

Modified: branches/R2_14/Src/Common/PreferencesDlg.cpp
===================================================================
--- branches/R2_14/Src/Common/PreferencesDlg.cpp	2010-11-04 18:13:18 UTC (rev 7409)
+++ branches/R2_14/Src/Common/PreferencesDlg.cpp	2010-11-04 18:34:37 UTC (rev 7410)
@@ -102,9 +102,9 @@
 	AddPage(&m_pageGeneral, IDS_OPTIONSPG_GENERAL);
 	AddPage(&m_pageCompare, IDS_OPTIONSPG_COMPARE);
 	AddPage(&m_pageEditor, IDS_OPTIONSPG_EDITOR);
-	AddPage(&m_pageMergeColors, IDS_OPTIONSPG_COLORS);
-	AddPage(&m_pageTextColors, IDS_OPTIONSPG_TEXTCOLORS);
-	AddPage(&m_pageSyntaxColors, IDS_OPTIONSPG_SYNTAXCOLORS);
+	AddPage(&m_pageMergeColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_MERGECOLORS);
+	AddPage(&m_pageSyntaxColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_SYNTAXCOLORS);
+	AddPage(&m_pageTextColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_TEXTCOLORS);
 	AddPage(&m_pageArchive, IDS_OPTIONSPG_ARCHIVE);
 	AddPage(&m_pageSystem, IDS_OPTIONSPG_SYSTEM);
 	AddPage(&m_pageBackups, IDS_OPTIONSPG_BACKUPS);
@@ -151,6 +151,14 @@
 	AddPage(pPage, sPath.c_str());
 }
 
+void CPreferencesDlg::AddPage(CPropertyPage* pPage, UINT nTopHeading, UINT nSubHeading)
+{
+	String sPath = theApp.LoadString(nTopHeading);
+	sPath += _T(">");
+	sPath += theApp.LoadString(nSubHeading);
+	AddPage(pPage, sPath.c_str());
+}
+
 void CPreferencesDlg::AddPage(CPropertyPage* pPage, LPCTSTR szPath)
 {
 	CString sPath(szPath);

Modified: branches/R2_14/Src/Common/PreferencesDlg.h
===================================================================
--- branches/R2_14/Src/Common/PreferencesDlg.h	2010-11-04 18:13:18 UTC (rev 7409)
+++ branches/R2_14/Src/Common/PreferencesDlg.h	2010-11-04 18:34:37 UTC (rev 7410)
@@ -99,6 +99,7 @@
 protected:
 	void AddPage(CPropertyPage* pPage, UINT nResourceID);
 	void AddPage(CPropertyPage* pPage, LPCTSTR szPath);
+	void AddPage(CPropertyPage* pPage, UINT nTopHeading, UINT nSubHeading);
 	void SetActivePage(int nPage);
 	CString GetItemPath(HTREEITEM hti);
 	void ReadOptions(BOOL bUpdate = FALSE);

Modified: branches/R2_14/Src/Merge.rc
===================================================================
--- branches/R2_14/Src/Merge.rc	2010-11-04 18:13:18 UTC (rev 7409)
+++ branches/R2_14/Src/Merge.rc	2010-11-04 18:34:37 UTC (rev 7410)
@@ -1945,14 +1945,15 @@
     IDS_OPTIONSPG_COMPARE   "Compare"
     IDS_OPTIONSPG_EDITOR    "Editor"
     IDS_OPTIONSPG_COLORS    "Colors"
-    IDS_OPTIONSPG_SYNTAXCOLORS "Syntax colors"
-    IDS_OPTIONSPG_TEXTCOLORS "Text Colors"
+    IDS_OPTIONSPG_TEXTCOLORS "Text"
+    IDS_OPTIONSPG_SYNTAXCOLORS "Syntax"
     IDS_OPTIONSPG_SYSTEM    "System"
     IDS_OPTIONSPG_VERSIONCONTROL "Version Control"
     IDS_OPTIONSPG_CODEPAGE  "Codepage"
     IDS_OPTIONSPG_ARCHIVE   "Archive Support"
     IDS_OPTIONSPG_BACKUPS   "Backup Files"
     IDS_OPTIONSPG_SHELL     "Shell Integration"
+    IDS_OPTIONSPG_MERGECOLORS "Differences"
 END
 
 // WINMERGE CUSTOM STRINGS

Modified: branches/R2_14/Src/resource.h
===================================================================
--- branches/R2_14/Src/resource.h	2010-11-04 18:13:18 UTC (rev 7409)
+++ branches/R2_14/Src/resource.h	2010-11-04 18:34:37 UTC (rev 7410)
@@ -490,6 +490,7 @@
 #define IDS_OPTIONSPG_ARCHIVE           9050
 #define IDS_OPTIONSPG_BACKUPS           9051
 #define IDS_OPTIONSPG_SHELL             9052
+#define IDS_OPTIONSPG_MERGECOLORS       9053
 #define IDS_TO                          16000
 #define IDS_FROM_LEFT                   16001
 #define IDS_TO_LEFT                     16002


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7416] branches/R2_14

[<ge...@us...>]

Revision: 7416
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7416&view=rev
Author:   gerundt
Date:     2010-11-10 08:53:25 +0000 (Wed, 10 Nov 2010)

Log Message:
-----------
RFE [ 2827836 ] Auto Close if Compare is the Same

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/MainFrm.cpp
    branches/R2_14/Src/MainFrm.h
    branches/R2_14/Src/MergeCmdLineInfo.cpp
    branches/R2_14/Src/MergeCmdLineInfo.h
    branches/R2_14/Src/MergeDoc.cpp

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-06 20:00:20 UTC (rev 7415)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-10 08:53:25 UTC (rev 7416)
@@ -12,6 +12,8 @@
   Improve editing of linefilter regular expressions (#3015416)
   Allow editing context line count in patch creator (#2092180)
   Improve color options organization (#2818451)
+  Add /xq command line switch for closing WinMerge after identical files
+    and not showing message (#2827836)
   Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed 
     in status bar (#3025855)
 

Modified: branches/R2_14/Src/MainFrm.cpp
===================================================================
--- branches/R2_14/Src/MainFrm.cpp	2010-11-06 20:00:20 UTC (rev 7415)
+++ branches/R2_14/Src/MainFrm.cpp	2010-11-10 08:53:25 UTC (rev 7416)
@@ -74,6 +74,7 @@
 #include "FileOrFolderSelect.h"
 #include "PropBackups.h"
 #include "PluginsListDlg.h"
+#include "MergeCmdLineInfo.h"
 
 /*
  One source file must compile the stubs for multimonitor
@@ -274,7 +275,7 @@
 , m_bFirstTime(TRUE)
 , m_bEscShutdown(FALSE)
 , m_bClearCaseTool(FALSE)
-, m_bExitIfNoDiff(FALSE)
+, m_bExitIfNoDiff(MergeCmdLineInfo::Disabled)
 , m_bShowErrors(TRUE)
 , m_CheckOutMulti(FALSE)
 , m_bVCProjSync(FALSE)

Modified: branches/R2_14/Src/MainFrm.h
===================================================================
--- branches/R2_14/Src/MainFrm.h	2010-11-06 20:00:20 UTC (rev 7415)
+++ branches/R2_14/Src/MainFrm.h	2010-11-10 08:53:25 UTC (rev 7416)
@@ -34,7 +34,7 @@
 #include "MDITabBar.h"
 #include "OptionsMgr.h"
 #include "VSSHelper.h"
-struct FileLocation;
+#include "MergeCmdLineInfo.h"
 
 /**
  * @brief Flags used when opening files
@@ -83,8 +83,8 @@
 class SyntaxColors;
 class LineFiltersList;
 class TempFile;
+struct FileLocation;
 
-
 // typed lists (homogenous pointer lists)
 typedef CTypedPtrList<CPtrList, CMergeDoc *> MergeDocList;
 typedef CTypedPtrList<CPtrList, CDirDoc *> DirDocList;
@@ -177,7 +177,7 @@
 	SyntaxColors * GetMainSyntaxColors() { return m_pSyntaxColors; }
 	BOOL m_bClearCaseTool; /**< WinMerge is executed as an external Rational ClearCase compare/merge tool. */
 	BOOL m_bFlashing; /**< Window is flashing. */
-	BOOL m_bExitIfNoDiff; /**< If command line switch -x given close application if files are identical. */
+	MergeCmdLineInfo::ExitNoDiff m_bExitIfNoDiff; /**< Exit if files are identical? */
 	LineFiltersList *m_pLineFilters; /**< List of linefilters */
 
 	/**

Modified: branches/R2_14/Src/MergeCmdLineInfo.cpp
===================================================================
--- branches/R2_14/Src/MergeCmdLineInfo.cpp	2010-11-06 20:00:20 UTC (rev 7415)
+++ branches/R2_14/Src/MergeCmdLineInfo.cpp	2010-11-10 08:53:25 UTC (rev 7416)
@@ -118,7 +118,7 @@
 	m_nCmdShow(SW_SHOWNORMAL),
 	m_bClearCaseTool(false),
 	m_bEscShutdown(false),
-	m_bExitIfNoDiff(false),
+	m_bExitIfNoDiff(Disabled),
 	m_bRecurse(false),
 	m_bNonInteractive(false),
 	m_bSingleInstance(false),
@@ -327,8 +327,14 @@
 		else if (param == _T("x"))
 		{
 			// -x to close application if files are identical.
-			m_bExitIfNoDiff = true;
+			m_bExitIfNoDiff = Exit;
 		}
+		else if (param == _T("xq"))
+		{
+			// -xn to close application if files are identical without showing
+			// any messages
+			m_bExitIfNoDiff = ExitQuiet;
+		}
 		else if (param == _T("ignorews"))
 		{
 			q = SetOption(q, OPT_CMP_IGNORE_WHITESPACE);

Modified: branches/R2_14/Src/MergeCmdLineInfo.h
===================================================================
--- branches/R2_14/Src/MergeCmdLineInfo.h	2010-11-06 20:00:20 UTC (rev 7415)
+++ branches/R2_14/Src/MergeCmdLineInfo.h	2010-11-10 08:53:25 UTC (rev 7416)
@@ -44,11 +44,18 @@
 
 public:
 
+	enum ExitNoDiff
+	{
+		Disabled, /**< Don't exit. */
+		Exit, /**< Exit and show message. */
+		ExitQuiet, /**< Exit and don't show message. */
+	};
+
 	int m_nCmdShow; /**< Initial state of the application's window. */
 
 	bool m_bClearCaseTool; /**< Running as Rational ClearCase external tool. */
 	bool m_bEscShutdown; /**< Pressing ESC will close the application */
-	bool m_bExitIfNoDiff; /**< Exit after telling the user that files are identical. */
+	ExitNoDiff m_bExitIfNoDiff; /**< Exit if files are identical. */
 	bool m_bRecurse; /**< Include sub folder in directories compare. */
 	bool m_bNonInteractive; /**< Suppress user's notifications. */
 	bool m_bSingleInstance; /**< Allow only one instance of WinMerge executable. */

Modified: branches/R2_14/Src/MergeDoc.cpp
===================================================================
--- branches/R2_14/Src/MergeDoc.cpp	2010-11-06 20:00:20 UTC (rev 7415)
+++ branches/R2_14/Src/MergeDoc.cpp	2010-11-10 08:53:25 UTC (rev 7416)
@@ -62,6 +62,7 @@
 #include "FileOrFolderSelect.h"
 #include "LineFiltersList.h"
 #include "TempFile.h"
+#include "MergeCmdLineInfo.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -679,18 +680,20 @@
 		{
 			UINT nFlags = MB_ICONINFORMATION | MB_DONT_DISPLAY_AGAIN;
 
-			// Show the "files are identical" error message even if the user
-			// requested not to show it again. It is better than to close
-			// the application without a warning.
-			if (GetMainFrame()->m_bExitIfNoDiff)
+			if (GetMainFrame()->m_bExitIfNoDiff == MergeCmdLineInfo::Exit)
 			{
+				// Show the "files are identical" for basic "exit no diff" flag
+				// If user don't want to see the message one uses the quiet version
+				// of the "exit no diff".
 				nFlags &= ~MB_DONT_DISPLAY_AGAIN;
 			}
 
-			LangMessageBox(IDS_FILESSAME, nFlags);
+			if (GetMainFrame()->m_bExitIfNoDiff != MergeCmdLineInfo::ExitQuiet)
+				LangMessageBox(IDS_FILESSAME, nFlags);
 
 			// Exit application if files are identical.
-			if (GetMainFrame()->m_bExitIfNoDiff)
+			if (GetMainFrame()->m_bExitIfNoDiff == MergeCmdLineInfo::Exit ||
+				GetMainFrame()->m_bExitIfNoDiff == MergeCmdLineInfo::ExitQuiet)
 			{
 				GetMainFrame()->PostMessage(WM_COMMAND, ID_APP_EXIT);
 			}
@@ -2376,7 +2379,7 @@
 
 		// Exit if files are identical should only work for the first
 		// comparison and must be disabled afterward.
-		GetMainFrame()->m_bExitIfNoDiff = FALSE;
+		GetMainFrame()->m_bExitIfNoDiff = MergeCmdLineInfo::Disabled;
 	}
 	else
 	{
@@ -2591,7 +2594,7 @@
 
 		// Exit if files are identical should only work for the first
 		// comparison and must be disabled afterward.
-		GetMainFrame()->m_bExitIfNoDiff = FALSE;
+		GetMainFrame()->m_bExitIfNoDiff = MergeCmdLineInfo::Disabled;
 	}
 	else
 	{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7417] branches/R2_14

[<ge...@us...>]

Revision: 7417
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7417&view=rev
Author:   gerundt
Date:     2010-11-11 11:06:50 +0000 (Thu, 11 Nov 2010)

Log Message:
-----------
PATCH: [ 2725549 ] Set a codepage with command-line parameter
 Submitted by bulklodd <bul...@us...>

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Docs/Users/Contributors.txt
    branches/R2_14/Src/Merge.cpp
    branches/R2_14/Src/MergeCmdLineInfo.cpp
    branches/R2_14/Src/MergeCmdLineInfo.h

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-10 08:53:25 UTC (rev 7416)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-11 11:06:50 UTC (rev 7417)
@@ -14,6 +14,7 @@
   Improve color options organization (#2818451)
   Add /xq command line switch for closing WinMerge after identical files
     and not showing message (#2827836)
+  Allow setting codepage from command line (#2725549)
   Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed 
     in status bar (#3025855)
 

Modified: branches/R2_14/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_14/Docs/Users/Contributors.txt	2010-11-10 08:53:25 UTC (rev 7416)
+++ branches/R2_14/Docs/Users/Contributors.txt	2010-11-11 11:06:50 UTC (rev 7417)
@@ -142,6 +142,7 @@
 Other Contributors (code, ideas, testing..):
 * Andre Arpin
 * Steve Beaudoin
+* bulklodd <bul...@us...>
 * Adam Carrivick
 * Hern Chen
 * Jeremy Dewey

Modified: branches/R2_14/Src/Merge.cpp
===================================================================
--- branches/R2_14/Src/Merge.cpp	2010-11-10 08:53:25 UTC (rev 7416)
+++ branches/R2_14/Src/Merge.cpp	2010-11-11 11:06:50 UTC (rev 7417)
@@ -56,6 +56,7 @@
 #include "OptionsDef.h"
 #include "MergeCmdLineInfo.h"
 #include "ConflictFileParser.h"
+#include "codepage.h"
 
 // For shutdown cleanup
 #include "charsets.h"
@@ -626,6 +627,12 @@
 		m_globalFileFilter.SetFilter(cmdInfo.m_sFileFilter.c_str());
 	}
 
+	// Set codepage.
+	if (cmdInfo.m_nCodepage)
+	{
+		updateDefaultCodepage(2,cmdInfo.m_nCodepage);
+	}
+
 	// Unless the user has requested to see WinMerge's usage open files for
 	// comparison.
 	if (cmdInfo.m_bShowUsage)

Modified: branches/R2_14/Src/MergeCmdLineInfo.cpp
===================================================================
--- branches/R2_14/Src/MergeCmdLineInfo.cpp	2010-11-10 08:53:25 UTC (rev 7416)
+++ branches/R2_14/Src/MergeCmdLineInfo.cpp	2010-11-11 11:06:50 UTC (rev 7417)
@@ -123,6 +123,7 @@
 	m_bNonInteractive(false),
 	m_bSingleInstance(false),
 	m_bShowUsage(false),
+	m_nCodepage(0),
 	m_dwLeftFlags(FFILEOPEN_CMDLINE),
 	m_dwRightFlags(FFILEOPEN_CMDLINE)
 {
@@ -335,6 +336,12 @@
 			// any messages
 			m_bExitIfNoDiff = ExitQuiet;
 		}
+		else if (param == _T("cp"))
+		{
+			String codepage;
+			q = EatParam(q, codepage);
+			m_nCodepage = _ttoi(codepage.c_str());
+		}
 		else if (param == _T("ignorews"))
 		{
 			q = SetOption(q, OPT_CMP_IGNORE_WHITESPACE);

Modified: branches/R2_14/Src/MergeCmdLineInfo.h
===================================================================
--- branches/R2_14/Src/MergeCmdLineInfo.h	2010-11-10 08:53:25 UTC (rev 7416)
+++ branches/R2_14/Src/MergeCmdLineInfo.h	2010-11-11 11:06:50 UTC (rev 7417)
@@ -60,6 +60,7 @@
 	bool m_bNonInteractive; /**< Suppress user's notifications. */
 	bool m_bSingleInstance; /**< Allow only one instance of WinMerge executable. */
 	bool m_bShowUsage; /**< Show a brief reminder to command line arguments. */
+	int  m_nCodepage;  /**< Codepage. */
 
 	DWORD m_dwLeftFlags; /**< Left side file's behavior options. */
 	DWORD m_dwRightFlags; /**< Right side file's behavior options. */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7419] branches/R2_14

[<ge...@us...>]

Revision: 7419
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7419&view=rev
Author:   gerundt
Date:     2010-11-12 08:13:22 +0000 (Fri, 12 Nov 2010)

Log Message:
-----------
PATCH: [ 2923684 ] GUI Language update
 Fixes bug #2808178
 Submitted by Matthias Mayer

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/ChildFrm.cpp
    branches/R2_14/Src/DiffViewBar.cpp
    branches/R2_14/Src/DiffViewBar.h
    branches/R2_14/Src/LocationBar.cpp
    branches/R2_14/Src/LocationBar.h

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-11 12:22:43 UTC (rev 7418)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-12 08:13:22 UTC (rev 7419)
@@ -17,6 +17,7 @@
   Allow setting codepage from command line (#2725549)
   Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed 
     in status bar (#3025855)
+  Bugfix: Pane headers not updated after language change (#2923684)
 
 WinMerge 2.13.20 - 2010-10-20 (r7319)
   Add missing keywords to Pascal highlighter (#2834192)

Modified: branches/R2_14/Src/ChildFrm.cpp
===================================================================
--- branches/R2_14/Src/ChildFrm.cpp	2010-11-11 12:22:43 UTC (rev 7418)
+++ branches/R2_14/Src/ChildFrm.cpp	2010-11-12 08:13:22 UTC (rev 7419)
@@ -767,6 +767,8 @@
 {
 	m_leftStatus.UpdateResources();
 	m_rightStatus.UpdateResources();
+	m_wndLocationBar.UpdateResources();
+	m_wndDetailBar.UpdateResources();
 }
 
 /**

Modified: branches/R2_14/Src/DiffViewBar.cpp
===================================================================
--- branches/R2_14/Src/DiffViewBar.cpp	2010-11-11 12:22:43 UTC (rev 7418)
+++ branches/R2_14/Src/DiffViewBar.cpp	2010-11-12 08:13:22 UTC (rev 7419)
@@ -11,6 +11,7 @@
 //////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
+#include "Merge.h"
 
 #include "ChildFrm.h"
 #include "DiffViewBar.h"
@@ -159,3 +160,11 @@
 {
 	m_hwndFrame = hwndFrame;
 }
+/**
+ * @brief Update any resources necessary after a GUI language change
+ */
+void CDiffViewBar::UpdateResources()
+{
+	String sCaption = theApp.LoadString(IDS_DIFFBAR_CAPTION);
+	SetWindowText(sCaption.c_str());
+}

Modified: branches/R2_14/Src/DiffViewBar.h
===================================================================
--- branches/R2_14/Src/DiffViewBar.h	2010-11-11 12:22:43 UTC (rev 7418)
+++ branches/R2_14/Src/DiffViewBar.h	2010-11-12 08:13:22 UTC (rev 7419)
@@ -38,6 +38,7 @@
 	int  GetPanelHeight();
 	void UpdateBarHeight(int DiffPanelHeight);
 	void SetFrameHwnd(HWND hwndFrame);
+	void UpdateResources();
 
 protected:
 	CSplitterWndEx * m_pwndDetailSplitter;

Modified: branches/R2_14/Src/LocationBar.cpp
===================================================================
--- branches/R2_14/Src/LocationBar.cpp	2010-11-11 12:22:43 UTC (rev 7418)
+++ branches/R2_14/Src/LocationBar.cpp	2010-11-12 08:13:22 UTC (rev 7419)
@@ -125,3 +125,11 @@
 {
 	m_hwndFrame = hwndFrame;
 }
+/**
+ * @brief Update any resources necessary after a GUI language change
+ */
+void CLocationBar::UpdateResources()
+{
+	String sCaption = theApp.LoadString(IDS_LOCBAR_CAPTION);
+	SetWindowText(sCaption.c_str());
+}

Modified: branches/R2_14/Src/LocationBar.h
===================================================================
--- branches/R2_14/Src/LocationBar.h	2010-11-11 12:22:43 UTC (rev 7418)
+++ branches/R2_14/Src/LocationBar.h	2010-11-12 08:13:22 UTC (rev 7419)
@@ -34,7 +34,7 @@
 		UINT nID = AFX_IDW_PANE_FIRST);
 
 	void SetFrameHwnd(HWND hwndFrame);
-
+	void UpdateResources();
 protected:
 // Overrides
 	// ClassWizard generated virtual function overrides


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7427] branches/R2_14

[<ge...@us...>]

Revision: 7427
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7427&view=rev
Author:   gerundt
Date:     2010-11-16 13:31:14 +0000 (Tue, 16 Nov 2010)

Log Message:
-----------
PATCH: [ 2929005 ] Quickcompare and EOL
 Fixes bug #2210403
 Submitted by Matthias Mayer

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/CompareEngines/ByteComparator.cpp

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-16 13:20:50 UTC (rev 7426)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-16 13:31:14 UTC (rev 7427)
@@ -18,6 +18,7 @@
   Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed 
     in status bar (#3025855)
   Bugfix: Pane headers not updated after language change (#2923684)
+  Bugfix: Quick contents compare didn't ignore EOL byte differences (#2929005)
 
 WinMerge 2.13.20 - 2010-10-20 (r7319)
   Add missing keywords to Pascal highlighter (#2834192)

Modified: branches/R2_14/Src/CompareEngines/ByteComparator.cpp
===================================================================
--- branches/R2_14/Src/CompareEngines/ByteComparator.cpp	2010-11-16 13:20:50 UTC (rev 7426)
+++ branches/R2_14/Src/CompareEngines/ByteComparator.cpp	2010-11-16 13:31:14 UTC (rev 7427)
@@ -394,9 +394,9 @@
 			}
 			else
 			{
-				if (!eof0 || !eof1)
+				// we are at the end on one side?
+				if (!eof0 && !eof1)
 				{
-					result = RESULT_DIFF;
 					goto need_more;
 				}
 				else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7429] branches/R2_14

[<ge...@us...>]

Revision: 7429
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7429&view=rev
Author:   gerundt
Date:     2010-11-16 14:34:03 +0000 (Tue, 16 Nov 2010)

Log Message:
-----------
PATCH: #2919510 TimeSizecompare
 Submitted by Matthias Mayer
 Comparing files by size also always compared by time.

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/CompareEngines/TimeSizeCompare.cpp

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-16 14:27:33 UTC (rev 7428)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-16 14:34:03 UTC (rev 7429)
@@ -19,6 +19,7 @@
     in status bar (#3025855)
   Bugfix: Pane headers not updated after language change (#2923684)
   Bugfix: Quick contents compare didn't ignore EOL byte differences (#2929005)
+  Bugfix: Compare by size always checked file times too (#2919510)
 
 WinMerge 2.13.20 - 2010-10-20 (r7319)
   Add missing keywords to Pascal highlighter (#2834192)

Modified: branches/R2_14/Src/CompareEngines/TimeSizeCompare.cpp
===================================================================
--- branches/R2_14/Src/CompareEngines/TimeSizeCompare.cpp	2010-11-16 14:27:33 UTC (rev 7428)
+++ branches/R2_14/Src/CompareEngines/TimeSizeCompare.cpp	2010-11-16 14:34:03 UTC (rev 7429)
@@ -40,40 +40,39 @@
  */
 int TimeSizeCompare::CompareFiles(int compMethod, const DIFFITEM &di)
 {
-	UINT code = 0;
-
-	// Compare by modified date
-	// Check that we have both filetimes
-	if (di.left.mtime != 0 && di.right.mtime != 0)
+	UINT code = DIFFCODE::SAME;
+	if ((compMethod == CMP_DATE) || (compMethod == CMP_DATE_SIZE))
 	{
-		INT64 nTimeDiff = di.left.mtime - di.right.mtime;
-		// Remove sign
-		nTimeDiff = (nTimeDiff > 0 ? nTimeDiff : -nTimeDiff);
-		if (m_ignoreSmallDiff)
+		// Compare by modified date
+		// Check that we have both filetimes
+		if (di.left.mtime != 0 && di.right.mtime != 0)
 		{
-			// If option to ignore small timediffs (couple of seconds)
-			// is set, decrease absolute difference by allowed diff
-			nTimeDiff -= SmallTimeDiff;
+			INT64 nTimeDiff =_abs64(di.left.mtime - di.right.mtime);
+			if (m_ignoreSmallDiff)
+			{
+				// If option to ignore small timediffs (couple of seconds)
+				// is set, decrease absolute difference by allowed diff
+				nTimeDiff -= SmallTimeDiff;
+			}
+			if (nTimeDiff <= 0)
+				code = DIFFCODE::SAME;
+			else
+				code = DIFFCODE::DIFF;
 		}
-		if (nTimeDiff <= 0)
-			code = DIFFCODE::SAME;
 		else
-			code = DIFFCODE::DIFF;
+		{
+			// Filetimes for item(s) could not be read. So we have to
+			// set error status, unless we have DATE_SIZE -compare
+			// when we have still hope for size compare..
+			if (compMethod == CMP_DATE_SIZE)
+				code = DIFFCODE::SAME;
+			else
+				code = DIFFCODE::CMPERR;
+		}
 	}
-	else
-	{
-		// Filetimes for item(s) could not be read. So we have to
-		// set error status, unless we have DATE_SIZE -compare
-		// when we have still hope for size compare..
-		if (compMethod == CMP_DATE_SIZE)
-			code = DIFFCODE::SAME;
-		else
-			code = DIFFCODE::CMPERR;
-	}
-
-	// This is actual CMP_DATE_SIZE method..
+	// This is actual CMP_SIZE method..
 	// If file sizes differ mark them different
-	if (compMethod == CMP_DATE_SIZE)
+	if ((compMethod == CMP_DATE_SIZE) || (compMethod == CMP_SIZE))
 	{
 		if (di.left.size != di.right.size)
 		{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7435] branches/R2_14

[<ge...@us...>]

Revision: 7435
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7435&view=rev
Author:   gerundt
Date:     2010-11-20 12:21:01 +0000 (Sat, 20 Nov 2010)

Log Message:
-----------
PATCH: [ 3109525 ] Crash when pasting from clipboard
 Submitted by Lars Wittenburg

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Docs/Users/Contributors.txt
    branches/R2_14/Src/editlib/ccrystaltextview2.cpp

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-20 12:20:37 UTC (rev 7434)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-20 12:21:01 UTC (rev 7435)
@@ -20,6 +20,7 @@
   Bugfix: Pane headers not updated after language change (#2923684)
   Bugfix: Quick contents compare didn't ignore EOL byte differences (#2929005)
   Bugfix: Compare by size always checked file times too (#2919510)
+  Bugfix: Crash when pasting from clipboard (#3109525)
 
 WinMerge 2.13.20 - 2010-10-20 (r7319)
   Add missing keywords to Pascal highlighter (#2834192)

Modified: branches/R2_14/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_14/Docs/Users/Contributors.txt	2010-11-20 12:20:37 UTC (rev 7434)
+++ branches/R2_14/Docs/Users/Contributors.txt	2010-11-20 12:21:01 UTC (rev 7435)
@@ -180,6 +180,7 @@
 * Vikrant
 * Gilbert Wellisch
 * Paul Welter
+* Lars Wittenburg
 
 
 WinMerge includes code from:

Modified: branches/R2_14/Src/editlib/ccrystaltextview2.cpp
===================================================================
--- branches/R2_14/Src/editlib/ccrystaltextview2.cpp	2010-11-20 12:20:37 UTC (rev 7434)
+++ branches/R2_14/Src/editlib/ccrystaltextview2.cpp	2010-11-20 12:21:01 UTC (rev 7435)
@@ -1166,7 +1166,8 @@
           if (pszData != NULL)
             {
               UINT cbData = (UINT) GlobalSize (hData);
-              int cchText = cbData / sizeof(TCHAR) - 1;
+              // in case we get an odd length for unicodes
+              int cchText = ((cbData + 1) / sizeof(TCHAR)) - 1;
               if (cchText >= 0)
                 memcpy(text.GetBufferSetLength(cchText), pszData, cbData);
               GlobalUnlock (hData);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7438] branches/R2_14

[<ge...@us...>]

Revision: 7438
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7438&view=rev
Author:   gerundt
Date:     2010-11-21 13:34:25 +0000 (Sun, 21 Nov 2010)

Log Message:
-----------
PATCH: [ 3111581 ] Keeps verifing path even turned off in options

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/OpenDlg.cpp

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-21 13:34:03 UTC (rev 7437)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-21 13:34:25 UTC (rev 7438)
@@ -21,6 +21,7 @@
   Bugfix: Quick contents compare didn't ignore EOL byte differences (#2929005)
   Bugfix: Compare by size always checked file times too (#2919510)
   Bugfix: Crash when pasting from clipboard (#3109525)
+  Bugfix: Keeps verifing path even turned off in options (#3111581)
 
 WinMerge 2.13.20 - 2010-10-20 (r7319)
   Add missing keywords to Pascal highlighter (#2834192)

Modified: branches/R2_14/Src/OpenDlg.cpp
===================================================================
--- branches/R2_14/Src/OpenDlg.cpp	2010-11-21 13:34:03 UTC (rev 7437)
+++ branches/R2_14/Src/OpenDlg.cpp	2010-11-21 13:34:25 UTC (rev 7438)
@@ -402,9 +402,10 @@
 		bProject = TRUE;
 
 	// Enable buttons as appropriate
-	PATH_EXISTENCE pathsType = GetPairComparability(m_strLeft, m_strRight);
 	if (GetOptionsMgr()->GetBool(OPT_VERIFY_OPEN_PATHS))
 	{
+		PATH_EXISTENCE pathsType = GetPairComparability(m_strLeft, m_strRight);
+
 		if (bProject)
 		{
 			m_ctlOk.EnableWindow(TRUE);
@@ -417,31 +418,31 @@
 			m_ctlUnpacker.EnableWindow(pathsType == IS_EXISTING_FILE);
 			m_ctlSelectUnpacker.EnableWindow(pathsType == IS_EXISTING_FILE);
 		}
-	}
 
-	if (!bProject)
-	{
-		if (paths_DoesPathExist(m_strLeft) == DOES_NOT_EXIST)
-			bLeftInvalid = TRUE;
-		if (paths_DoesPathExist(m_strRight) == DOES_NOT_EXIST)
-			bRightInvalid = TRUE;
-	}
+		if (!bProject)
+		{
+			if (paths_DoesPathExist(m_strLeft) == DOES_NOT_EXIST)
+				bLeftInvalid = TRUE;
+			if (paths_DoesPathExist(m_strRight) == DOES_NOT_EXIST)
+				bRightInvalid = TRUE;
+		}
 
-	if (bLeftInvalid && bRightInvalid)
-		SetStatus(IDS_OPEN_BOTHINVALID);
-	else if (bLeftInvalid)
-		SetStatus(IDS_OPEN_LEFTINVALID);
-	else if (bRightInvalid)
-		SetStatus(IDS_OPEN_RIGHTINVALID);
-	else if (!bLeftInvalid && !bRightInvalid && pathsType == DOES_NOT_EXIST)
-		SetStatus(IDS_OPEN_MISMATCH);
-	else
-		SetStatus(IDS_OPEN_FILESDIRS);
+		if (bLeftInvalid && bRightInvalid)
+			SetStatus(IDS_OPEN_BOTHINVALID);
+		else if (bLeftInvalid)
+			SetStatus(IDS_OPEN_LEFTINVALID);
+		else if (bRightInvalid)
+			SetStatus(IDS_OPEN_RIGHTINVALID);
+		else if (!bLeftInvalid && !bRightInvalid && pathsType == DOES_NOT_EXIST)
+			SetStatus(IDS_OPEN_MISMATCH);
+		else
+			SetStatus(IDS_OPEN_FILESDIRS);
 
-	if (pathsType == IS_EXISTING_FILE || bProject)
-		SetUnpackerStatus(0);	//Empty field
-	else
-		SetUnpackerStatus(IDS_OPEN_UNPACKERDISABLED);
+		if (pathsType == IS_EXISTING_FILE || bProject)
+			SetUnpackerStatus(0);	//Empty field
+		else
+			SetUnpackerStatus(IDS_OPEN_UNPACKERDISABLED);
+	}
 }
 
 /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7440] branches/R2_14

[<ge...@us...>]

Revision: 7440
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7440&view=rev
Author:   gerundt
Date:     2010-11-21 17:42:49 +0000 (Sun, 21 Nov 2010)

Log Message:
-----------
PATCH: [ 3109521 ] Crash after deleting text
 Submitted by Lars Wittenburg

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/MergeEditView.cpp

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-21 17:42:27 UTC (rev 7439)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2010-11-21 17:42:49 UTC (rev 7440)
@@ -22,6 +22,7 @@
   Bugfix: Compare by size always checked file times too (#2919510)
   Bugfix: Crash when pasting from clipboard (#3109525)
   Bugfix: Keeps verifing path even turned off in options (#3111581)
+  Bugfix: Crash after deleting text (#3109521)
 
 WinMerge 2.13.20 - 2010-10-20 (r7319)
   Add missing keywords to Pascal highlighter (#2834192)

Modified: branches/R2_14/Src/MergeEditView.cpp
===================================================================
--- branches/R2_14/Src/MergeEditView.cpp	2010-11-21 17:42:27 UTC (rev 7439)
+++ branches/R2_14/Src/MergeEditView.cpp	2010-11-21 17:42:49 UTC (rev 7440)
@@ -431,6 +431,9 @@
 void CMergeEditView::GetLineColors2(int nLineIndex, DWORD ignoreFlags, COLORREF & crBkgnd,
                                 COLORREF & crText, BOOL & bDrawWhitespace)
 {
+	if (GetLineCount() <= nLineIndex)
+		return;
+
 	DWORD dwLineFlags = GetLineFlags(nLineIndex);
 
 	if (dwLineFlags & ignoreFlags)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7464] branches/R2_14

[<ge...@us...>]

Revision: 7464
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7464&view=rev
Author:   gerundt
Date:     2010-12-07 19:20:51 +0000 (Tue, 07 Dec 2010)

Log Message:
-----------
BUG: [ 2817546 ] Copy pathname appends CRLF to path

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/DirView.cpp

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2010-12-07 19:12:20 UTC (rev 7463)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2010-12-07 19:20:51 UTC (rev 7464)
@@ -23,6 +23,7 @@
   Bugfix: Crash when pasting from clipboard (#3109525)
   Bugfix: Keeps verifing path even turned off in options (#3111581)
   Bugfix: Crash after deleting text (#3109521)
+  Bugfix: Added EOL chars between copied file/path names (#2817546)
 
 WinMerge 2.13.20 - 2010-10-20 (r7319)
   Add missing keywords to Pascal highlighter (#2834192)

Modified: branches/R2_14/Src/DirView.cpp
===================================================================
--- branches/R2_14/Src/DirView.cpp	2010-12-07 19:12:20 UTC (rev 7463)
+++ branches/R2_14/Src/DirView.cpp	2010-12-07 19:20:51 UTC (rev 7464)
@@ -3095,9 +3095,12 @@
 			// If item is a folder then subfolder (relative to base folder)
 			// is in filename member.
 			strPaths = paths_ConcatPath(strPaths, di.left.filename);
-			strPaths += _T("\r\n");
+			// Append space between (and end) of paths. Space is better than
+			// EOL since it allows copying to console/command line.
+			strPaths += _T(" ");
 		}
 	}
+	strPaths = string_trim_ws_end(strPaths);
 	PutToClipboard(strPaths, AfxGetMainWnd()->GetSafeHwnd());
 }
 
@@ -3119,9 +3122,12 @@
 			// If item is a folder then subfolder (relative to base folder)
 			// is in filename member.
 			strPaths = paths_ConcatPath(strPaths, di.right.filename);
-			strPaths += _T("\r\n");
+			// Append space between (and end) of paths. Space is better than
+			// EOL since it allows copying to console/command line.
+			strPaths += _T(" ");
 		}
 	}
+	strPaths = string_trim_ws_end(strPaths);
 	PutToClipboard(strPaths, AfxGetMainWnd()->GetSafeHwnd());
 }
 
@@ -3143,7 +3149,9 @@
 			// If item is a folder then subfolder (relative to base folder)
 			// is in filename member.
 			strPaths = paths_ConcatPath(strPaths, di.left.filename);
-			strPaths += _T("\r\n");
+			// Append space between (and end) of paths. Space is better than
+			// EOL since it allows copying to console/command line.
+			strPaths += _T(" ");
 		}
 
 		if (!di.diffcode.isSideLeftOnly())
@@ -3152,9 +3160,12 @@
 			// If item is a folder then subfolder (relative to base folder)
 			// is in filename member.
 			strPaths = paths_ConcatPath(strPaths, di.right.filename);
-			strPaths += _T("\r\n");
+			// Append space between (and end) of paths. Space is better than
+			// EOL since it allows copying to console/command line.
+			strPaths += _T(" ");
 		}
 	}
+	strPaths = string_trim_ws_end(strPaths);
 	PutToClipboard(strPaths, AfxGetMainWnd()->GetSafeHwnd());
 }
 
@@ -3172,9 +3183,12 @@
 		if (!di.diffcode.isDirectory())
 		{
 			strPaths += di.left.filename;
-			strPaths += _T("\r\n");
+			// Append space between (and end) of paths. Space is better than
+			// EOL since it allows copying to console/command line.
+			strPaths += _T(" ");
 		}
 	}
+	strPaths = string_trim_ws_end(strPaths);
 	PutToClipboard(strPaths, AfxGetMainWnd()->GetSafeHwnd());
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7465] branches/R2_14

[<ge...@us...>]

Revision: 7465
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7465&view=rev
Author:   gerundt
Date:     2010-12-07 19:29:29 +0000 (Tue, 07 Dec 2010)

Log Message:
-----------
BUG: [ 2890961 ] Creation of matching folder is wrong in recursive view mode

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/DirView.cpp
    branches/R2_14/Src/DirView.h

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2010-12-07 19:20:51 UTC (rev 7464)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2010-12-07 19:29:29 UTC (rev 7465)
@@ -24,6 +24,7 @@
   Bugfix: Keeps verifing path even turned off in options (#3111581)
   Bugfix: Crash after deleting text (#3109521)
   Bugfix: Added EOL chars between copied file/path names (#2817546)
+  Bugfix: Created new matching folder to wrong folder (#2890961)
 
 WinMerge 2.13.20 - 2010-10-20 (r7319)
   Add missing keywords to Pascal highlighter (#2834192)

Modified: branches/R2_14/Src/DirView.cpp
===================================================================
--- branches/R2_14/Src/DirView.cpp	2010-12-07 19:20:51 UTC (rev 7464)
+++ branches/R2_14/Src/DirView.cpp	2010-12-07 19:29:29 UTC (rev 7465)
@@ -299,7 +299,7 @@
 	// Load the icons used for the list view (to reflect diff status)
 	// NOTE: these must be in the exactly the same order than in enum
 	// definition in begin of this file!
-	VERIFY (m_imageList.Create(iconCX, iconCY, ILC_COLOR32 | ILC_MASK, 15, 1));
+	VERIFY(m_imageList.Create(iconCX, iconCY, ILC_COLOR32 | ILC_MASK, 15, 1));
 	VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_LFILE)));
 	VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_RFILE)));
 	VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_NOTEQUALFILE)));
@@ -1270,9 +1270,10 @@
  * contents and don't necessarily need to copy whole folder structure.
  * @param [in] di DIFFITEM for folder compare item.
  * @param [in] side1 true if our unique folder item is side1 item.
+ * @param [out] newFolder New created folder (full folder path).
  * @return true if user agreed and folder was created.
  */
-bool CDirView::CreateFoldersPair(DIFFITEM & di, bool side1)
+bool CDirView::CreateFoldersPair(DIFFITEM & di, bool side1, String &newFolder)
 {
 	String subdir;
 	String basedir;
@@ -1282,6 +1283,7 @@
 		// right side base path (where to create)
 		subdir = di.left.filename;
 		basedir = GetDocument()->GetRightBasePath();
+		basedir = di.GetLeftFilepath(basedir);
 	}
 	else
 	{
@@ -1289,8 +1291,10 @@
 		// left side base path (where to create)
 		subdir = di.right.filename;
 		basedir = GetDocument()->GetLeftBasePath();
+		basedir = di.GetRightFilepath(basedir);
 	}
 	String createpath = paths_ConcatPath(basedir, subdir);
+	newFolder = createpath;
 
 	CString message;
 	LangFormatString1(message, IDS_CREATE_PAIR_FOLDER, createpath.c_str());
@@ -1345,7 +1349,7 @@
 		// Open left-only item to editor if its not a folder or binary
 		if (isDir)
 		{
-			if (CreateFoldersPair(**di1, true))
+			if (CreateFoldersPair(**di1, true, path2))
 			{
 				return true;
 			}
@@ -1361,7 +1365,7 @@
 		// Open right-only item to editor if its not a folder or binary
 		if (isDir)
 		{
-			if (CreateFoldersPair(**di1, false))
+			if (CreateFoldersPair(**di1, false, path1))
 			{
 				return true;
 			}

Modified: branches/R2_14/Src/DirView.h
===================================================================
--- branches/R2_14/Src/DirView.h	2010-12-07 19:20:51 UTC (rev 7464)
+++ branches/R2_14/Src/DirView.h	2010-12-07 19:29:29 UTC (rev 7465)
@@ -254,7 +254,7 @@
 			String &path1, String &path2, int & sel1, bool & isDir);
 	bool OpenTwoItems(UINT_PTR pos1, UINT_PTR pos2, DIFFITEM **di1, DIFFITEM **di2,
 			String &path1, String &path2, int & sel1, int & sel2, bool & isDir);
-	bool CreateFoldersPair(DIFFITEM & di, bool side1);
+	bool CreateFoldersPair(DIFFITEM & di, bool side1, String &newFolder);
 
 // Implementation data
 protected:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7472] branches/R2_14

[<ge...@us...>]

Revision: 7472
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7472&view=rev
Author:   gerundt
Date:     2010-12-08 12:28:29 +0000 (Wed, 08 Dec 2010)

Log Message:
-----------
PATCH: [ 2942869 ] Location Pane scrolling
 Fixes bug #2915350
 Submitted by Matthias Mayer

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/LocationView.cpp

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2010-12-08 11:24:20 UTC (rev 7471)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2010-12-08 12:28:29 UTC (rev 7472)
@@ -25,6 +25,7 @@
   Bugfix: Crash after deleting text (#3109521)
   Bugfix: Added EOL chars between copied file/path names (#2817546)
   Bugfix: Created new matching folder to wrong folder (#2890961)
+  Bugfix: Strange scrolling effect in location pane (#2942869)
 
 WinMerge 2.13.20 - 2010-10-20 (r7319)
   Add missing keywords to Pascal highlighter (#2834192)

Modified: branches/R2_14/Src/LocationView.cpp
===================================================================
--- branches/R2_14/Src/LocationView.cpp	2010-12-08 11:24:20 UTC (rev 7471)
+++ branches/R2_14/Src/LocationView.cpp	2010-12-08 12:28:29 UTC (rev 7472)
@@ -922,9 +922,10 @@
 			// Make sure locationbox has min hight
 			if ((nBottomCoord - nTopCoord) < INDICATOR_MIN_HEIGHT)
 			{
-				int iPos = (INDICATOR_MIN_HEIGHT - (nBottomCoord - nTopCoord) )/2;
-				nTopCoord -= iPos;
-				nBottomCoord +=iPos;
+				// If we have a high number of lines, it may be better
+				// to keep the topline, otherwise the cursor can 
+				// jump up and down unexpected
+				nBottomCoord = nTopCoord + INDICATOR_MIN_HEIGHT;
 			}
 		}
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7474] branches/R2_14

[<ge...@us...>]

Revision: 7474
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7474&view=rev
Author:   gerundt
Date:     2010-12-20 12:24:01 +0000 (Mon, 20 Dec 2010)

Log Message:
-----------
Move HTML version of WinMerge Help to manual.winmerge.org

Modified Paths:
--------------
    branches/R2_14/Docs/Users/Languages/ReadMe-Brazilian.txt
    branches/R2_14/Docs/Users/Languages/ReadMe-Bulgarian.txt
    branches/R2_14/Docs/Users/Languages/ReadMe-Catalan.txt
    branches/R2_14/Docs/Users/Languages/ReadMe-ChineseSimplified.txt
    branches/R2_14/Docs/Users/Languages/ReadMe-ChineseTraditional.txt
    branches/R2_14/Docs/Users/Languages/ReadMe-Croatian.txt
    branches/R2_14/Docs/Users/Languages/ReadMe-Dutch.txt
    branches/R2_14/Docs/Users/Languages/ReadMe-French.txt
    branches/R2_14/Docs/Users/Languages/ReadMe-Galician.txt
    branches/R2_14/Docs/Users/Languages/ReadMe-Greek.txt
    branches/R2_14/Docs/Users/Languages/ReadMe-Japanese.txt
    branches/R2_14/Docs/Users/Languages/ReadMe-Romanian.txt
    branches/R2_14/Docs/Users/Languages/ReadMe-Serbian.txt
    branches/R2_14/Docs/Users/Languages/ReadMe-Spanish.txt
    branches/R2_14/Docs/Users/Languages/ReadMe-Swedish.txt
    branches/R2_14/Docs/Users/Languages/ReadMe-Ukrainian.txt
    branches/R2_14/Docs/Users/Manual/About_Doc.xml
    branches/R2_14/Docs/Users/Manual/tour/WinMerge_tour.xml
    branches/R2_14/Docs/Users/ReadMe.txt
    branches/R2_14/Src/Constants.h

Modified: branches/R2_14/Docs/Users/Languages/ReadMe-Brazilian.txt
===================================================================
--- branches/R2_14/Docs/Users/Languages/ReadMe-Brazilian.txt	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/Languages/ReadMe-Brazilian.txt	2010-12-20 12:24:01 UTC (rev 7474)
@@ -4,10 +4,10 @@
 http://winmerge.org
 
  In\xEDcio r\xE1pido para o WinMerge: Leia o cap\xEDtulo do in\xEDcio r\xE1pido do manual online para se iniciar com o WinMerge:
- http://winmerge.org/docs/manual/QuickStart.html
+ http://manual.winmerge.org/QuickStart.html
 
  Manual em HTML: O manual est\xE1 dispon\xEDvel online em 
-http://winmerge.org/docs/manual/ ele est\xE1 tamb\xE9m possivelmente instalado (se escolhido assim) localmente e descarreg\xE1vel separadamente de http://winmerge.org/ (veja a documenta\xE7\xE3o) Suporte para Arquivos: O 
+http://manual.winmerge.org/ ele est\xE1 tamb\xE9m possivelmente instalado (se escolhido assim) localmente e descarreg\xE1vel separadamente de http://winmerge.org/ (veja a documenta\xE7\xE3o) Suporte para Arquivos: O 
 WinMerge usa o 7-Zip para o suporte para arquivos dentro de arquivos. 7-Zip (http://www.7-zip.org) \xE9 uma ferramenta para arquivos com o c\xF3digo fonte aberto. Para instalar o suporte para arquivos dentro de arquivos, baixe o instalador do plugin do 7-Zip de http://winmerge.org/ 
 
 Instalando o suporte para arquivos: \xC9 recomendado instalar o aplicativo 7-Zip. Se isto n\xE3o pode ser feito por alguma raz\xE3o, o instalador do plugin do 7-Zip pode instalar apenas os arquivos necess\xE1rios para ativar o suporte para arquivos dentro dos arquivos. Note que N\xC3O permite o uso isolado do 7-Zip, apenas o suporte para arquivos para oWinMerge.

Modified: branches/R2_14/Docs/Users/Languages/ReadMe-Bulgarian.txt
===================================================================
--- branches/R2_14/Docs/Users/Languages/ReadMe-Bulgarian.txt	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/Languages/ReadMe-Bulgarian.txt	2010-12-20 12:24:01 UTC (rev 7474)
@@ -9,11 +9,11 @@
 
 \xC1\xFA\xF0\xE7\xEE \xE2\xFA\xE2\xE5\xE4\xE5\xED\xE8\xE5 \xE2 WinMerge:
 \xCC\xEE\xEB\xFF, \xEF\xF0\xEE\xF7\xE5\xF2\xE5\xF2\xE5 \xEF\xEE\xEC\xEE\xF9\xED\xE0\xF2\xE0 \xEE\xED\xEB\xE0\xE9\xED \xE8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xFF \xE7\xE0 \xEA\xF0\xE0\xF2\xEA\xEE \xE2\xFA\xE2\xE5\xE4\xE5\xED\xE8\xE5 \xE2 WinMerge:
-http://winmerge.org/docs/manual/QuickStart.html
+http://manual.winmerge.org/QuickStart.html
 
 HTML \xF0\xFA\xEA\xEE\xE2\xEE\xE4\xF1\xF2\xE2\xEE:
 \xD0\xFA\xEA\xEE\xE2\xEE\xE4\xF1\xF2\xE2\xEE\xF2\xEE \xE5 \xE4\xEE\xF1\xF2\xFA\xEF\xED\xEE \xEE\xED\xEB\xE0\xE9\xED \xED\xE0 \xE0\xE4\xF0\xE5\xF1:
-http://winmerge.org/docs/manual/
+http://manual.winmerge.org/
 \xEC\xEE\xE6\xE5 \xE4\xE0 \xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xED\xEE \xED\xE0 \xC2\xE0\xF8\xE8\xFF\xF2 \xEA\xEE\xEC\xEF\xFE\xF2\xFA\xF0 (\xE0\xEA\xEE \xE5 \xE8\xE7\xE1\xF0\xE0\xED\xEE) \xE8\xEB\xE8 \xE4\xE0 \xE3\xEE
 \xF1\xE2\xE0\xEB\xE8\xF2\xE5 \xEE\xF2 http://winmerge.org/ (\xE2\xE8\xE6\xF2\xE5 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0\xF6\xE8\xFF\xF2\xE0)
 

Modified: branches/R2_14/Docs/Users/Languages/ReadMe-Catalan.txt
===================================================================
--- branches/R2_14/Docs/Users/Languages/ReadMe-Catalan.txt	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/Languages/ReadMe-Catalan.txt	2010-12-20 12:24:01 UTC (rev 7474)
@@ -9,11 +9,11 @@
 
 Inici r\xE0pid amb el WinMerge:
 Llegiu el cap\xEDtol Quick-start del manual en l\xEDnia per a comen\xE7ar amb el WinMerge:
-http://winmerge.org/docs/manual/QuickStart.html
+http://manual.winmerge.org/QuickStart.html
 
 Manual HTML:
 El manual est\xE0 disponible en l\xEDnia a
-http://winmerge.org/docs/manual/
+http://manual.winmerge.org/
 Possiblement tamb\xE9 estigui instal\xB7lada localment (si aix\xED es va triar) i es pot 
 baixar separadament des de http://winmerge.org/ (veieu la documentaci\xF3)
 

Modified: branches/R2_14/Docs/Users/Languages/ReadMe-ChineseSimplified.txt
===================================================================
--- branches/R2_14/Docs/Users/Languages/ReadMe-ChineseSimplified.txt	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/Languages/ReadMe-ChineseSimplified.txt	2010-12-20 12:24:01 UTC (rev 7474)
@@ -7,10 +7,10 @@
 
 WinMerge \xBF\xEC\xCB\xD9\xC8\xEB\xC3ţ\xBA
 \xC7\xEB\xD4Ķ\xC1\xD4\xDA\xCF\xDF\xCAֲ\xE1\xB5ġ\xB0Quick-start\xA1\xB1\xD5½\xDA\xC0\xB4\xC1˽Ⲣ\xBF\xAAʼ\xBC\xB4\xD3\xC3 WinMerge \xA3\xBA
-http://winmerge.org/docs/manual/QuickStart.html
+http://manual.winmerge.org/QuickStart.html
 
 HTML \xCAֲ᣺
-\xD3û\xA7\xCAֲ\xE1\xBF\xC9\xD2Դ\xD3 http://winmerge.org/docs/manual/ \xB5õ\xBD\xA3\xACҲ\xBF\xC9\xD2\xD4\xD4ڰ\xB2װʱѡ\xD4\xF1
+\xD3û\xA7\xCAֲ\xE1\xBF\xC9\xD2Դ\xD3 http://manual.winmerge.org/ \xB5õ\xBD\xA3\xACҲ\xBF\xC9\xD2\xD4\xD4ڰ\xB2װʱѡ\xD4\xF1
 \xB0\xB2װ\xB5\xBD\xB1\xBE\xB5أ\xAC\xBB\xF2\xD5\xDFҲ\xBF\xC9\xD2Ե\xA5\xB6\xC0\xB4\xD3 http://winmerge.org/ \xCF\xC2\xD4ء\xA3(\xB2μ\xFB\xCEĵ\xB5)
 
 ѹ\xCB\xF5\xB0\xFC֧\xB3֣\xBA

Modified: branches/R2_14/Docs/Users/Languages/ReadMe-ChineseTraditional.txt
===================================================================
--- branches/R2_14/Docs/Users/Languages/ReadMe-ChineseTraditional.txt	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/Languages/ReadMe-ChineseTraditional.txt	2010-12-20 12:24:01 UTC (rev 7474)
@@ -8,13 +8,13 @@
 
 \xA5ߧY\xA4W\xA4\xE2
 ===========
-\xA6w\xB8˫\xE1\xA1A\xBEDz߰򥻾ާ@\xA1A\xAB\xF6 \xBB\xA1\xA9\xFA > WinMerge \xBB\xA1\xA9\xFA\xA1C\xC2s\xC4\xFD Quick Start \xB3\xB9\xA1C\xA9Φ\xDC http://winmerge.org/docs/manual/QuickStart.html \xC2s\xC4\xFD\xA8\xE4\xBA\xF4\xB8\x{12AA61}C
+\xA6w\xB8˫\xE1\xA1A\xBEDz߰򥻾ާ@\xA1A\xAB\xF6 \xBB\xA1\xA9\xFA > WinMerge \xBB\xA1\xA9\xFA\xA1C\xC2s\xC4\xFD Quick Start \xB3\xB9\xA1C\xA9Φ\xDC http://manual.winmerge.org/QuickStart.html \xC2s\xC4\xFD\xA8\xE4\xBA\xF4\xB8\x{12AA61}C
 
 WinMerge \xBB\xA1\xA9\xFA
 ============= 
 \xA6w\xB8\xCB WinMerge \xAEɡA\xA8仡\xA9\xFA\xC0ɦb\xA6a\xA6w\xB8˦\xA8 Microsoft HTML Help \xC0\xC9 ( WinMerge.chm)\xA1C\xB6}\xB1һ\xA1\xA9\xFA\xC0ɡA\xAB\xF6\xA1GHelp > WinMerge \xBB\xA1\xA9\xFA\xA1C\xA9Ω\xF3WinMerge \xB5\xA1\xA1A\xAB\xF6 F1\xA1C\xA9\xF3\xA9R\xA5O\xA6C\xA1A\xABh\xA5H "/?" \xB0Ѽư\xF5\xA6\xE6 WinMerge \xAA\xBA\xA5i\xB0\xF5\xA6\xE6\xC0ɡC
 
-\xB1z\xA4]\xA5i\xA5H\xA8\xEC http://winmerge.org/docs/manual/ \xC2s\xC4\xFD\xA8\xE4HTML \xAA\xA9\xA1C
+\xB1z\xA4]\xA5i\xA5H\xA8\xEC http://manual.winmerge.org/ \xC2s\xC4\xFD\xA8\xE4HTML \xAA\xA9\xA1C
 
 \xC0\xA3\xC1Y\xA4䴩
 ===============

Modified: branches/R2_14/Docs/Users/Languages/ReadMe-Croatian.txt
===================================================================
--- branches/R2_14/Docs/Users/Languages/ReadMe-Croatian.txt	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/Languages/ReadMe-Croatian.txt	2010-12-20 12:24:01 UTC (rev 7474)
@@ -16,7 +16,7 @@
 ===========
 Pokrnuli ste WinMerge, kliknite Pomo\xE6 --> Quick start i nau\xE8ite kako koristiti
 osnovne mogu\xE6nosti, ili po\xF0ite na Internet i posjetite
-http://winmerge.org/docs/manual/QuickStart.html.
+http://manual.winmerge.org/QuickStart.html.
 
 WinMerge Pomo\xE6
 ============= 
@@ -26,7 +26,7 @@
 naredbom, /? help.
 
  
-Na internetu na http://winmerge.org/docs/manual/ tako\xF0er mo\x9Eete pregledati
+Na internetu na http://manual.winmerge.org/ tako\xF0er mo\x9Eete pregledati
 WinMerge Help.
 
 Podr\x9Aka arhiva

Modified: branches/R2_14/Docs/Users/Languages/ReadMe-Dutch.txt
===================================================================
--- branches/R2_14/Docs/Users/Languages/ReadMe-Dutch.txt	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/Languages/ReadMe-Dutch.txt	2010-12-20 12:24:01 UTC (rev 7474)
@@ -17,7 +17,7 @@
 ==========
 om te leren hoe u basisoperaties uitvoert na de installatie van WinMerge klikt u op
 Help > WinMerge Help en navigeert u naar het Quickstart-topic. U kan ook naar de 
-webversie gaan op http://winmerge.org/docs/manual/QuickStart.html.
+webversie gaan op http://manual.winmerge.org/QuickStart.html.
 
 WinMerge-help
 ============= 
@@ -27,7 +27,7 @@
 start u het uitvoerbestand van WinMerge (WinMerge.exe) met de /? help-switch.
 
 U kan ook surfen naar de HTML-version van WinMerge-help op 
-http://winmerge.org/docs/manual/.
+http://manual.winmerge.org/.
 
 Archiefondersteuning
 ====================

Modified: branches/R2_14/Docs/Users/Languages/ReadMe-French.txt
===================================================================
--- branches/R2_14/Docs/Users/Languages/ReadMe-French.txt	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/Languages/ReadMe-French.txt	2010-12-20 12:24:01 UTC (rev 7474)
@@ -19,7 +19,7 @@
 Pour apprendre comment effectuer des op\xE9rations de base apr\xE8s l'installation
 de WinMerge, cliquez sur Aide > Rubrique d'aide WinMerge et acc\xE9dez \xE0 la 
 rubrique D\xE9marrage rapide. Ou lisez le manuel en ligne \xE0:
-http://winmerge.org/docs/manual/QuickStart.html
+http://manual.winmerge.org/QuickStart.html
 
 Aide WinMerge
 =============
@@ -30,7 +30,7 @@
 suivi du commutateur d'aide /?.
 
 Vous pouvez aussi consulter la version en ligne de l'aide WinMerge \xE0:
-http://winmerge.org/docs/manual/
+http://manual.winmerge.org/
 
 
 Support d'archive

Modified: branches/R2_14/Docs/Users/Languages/ReadMe-Galician.txt
===================================================================
--- branches/R2_14/Docs/Users/Languages/ReadMe-Galician.txt	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/Languages/ReadMe-Galician.txt	2010-12-20 12:24:01 UTC (rev 7474)
@@ -17,7 +17,7 @@
 ===========
 Para aprender como levar a cabo as operaci\xF3ns b\xE1sicas logo de instalar o WinMerge, 
 preme en Axuda>Axuda do WinMerge e vai ao tema Quick start.  Ou, podes visitar a 
-versi\xF3n Web en http://winmerge.org/docs/manual/QuickStart.html.
+versi\xF3n Web en http://manual.winmerge.org/QuickStart.html.
 
 Axuda do WinMerge
 ===============
@@ -27,7 +27,7 @@
 executa o WinMerge coa opci\xF3n de axuda /?.
 
 Tam\xE9n podes explorar a versi\xF3n HTML da axuda do WinMerge en 
-http://winmerge.org/docs/manual/.
+http://manual.winmerge.org/.
 
 Soporte de Arquivo
 ==============

Modified: branches/R2_14/Docs/Users/Languages/ReadMe-Greek.txt
===================================================================
--- branches/R2_14/Docs/Users/Languages/ReadMe-Greek.txt	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/Languages/ReadMe-Greek.txt	2010-12-20 12:24:01 UTC (rev 7474)
@@ -19,7 +19,7 @@
 \xC3\xE9\xE1 \xED\xE1 \xEC\xDC\xE8\xE5\xF4\xE5 \xF0\xFE\xF2 \xED\xE1 \xE4\xE9\xE5\xEE\xDC\xE3\xE5\xF4\xE5 \xE2\xE1\xF3\xE9\xEA\xDD\xF2 \xEB\xE5\xE9\xF4\xEF\xF5\xF1\xE3\xDF\xE5\xF2 \xE1\xF6\xEF\xFD \xE5\xE3\xEA\xE1\xF4\xE1\xF3\xF4\xDE\xF3\xE5\xF4\xE5 \xF4\xEF
 WinMerge, \xE5\xF0\xE9\xEB\xDD\xEE\xE1\xF4\xE5 \xC2\xEF\xDE\xE8\xE5\xE9\xE1>\xC2\xEF\xDE\xE8\xE5\xE9\xE1 WinMerge \xEA\xE1\xE9 \xE4\xE9\xE1\xE2\xDC\xF3\xF4\xE5 \xF4\xEF \xEA\xE5\xF6\xDC\xEB\xE1\xE9\xEF
 \xC3\xF1\xDE\xE3\xEF\xF1\xE7 \xC5\xEA\xEA\xDF\xED\xE7\xF3\xE7. \xB9, \xF0\xE7\xE3\xE1\xDF\xED\xE5\xF4\xE5 \xF3\xF4\xE7\xED \xE1\xED\xF4\xDF\xF3\xF4\xEF\xE9\xF7\xE7 \xE9\xF3\xF4\xEF\xF3\xE5\xEB\xDF\xE4\xE1 \xF3\xF4\xE7 \xE4\xE9\xE5\xFD\xE8\xF5\xED\xF3\xE7
-http://winmerge.org/docs/manual/QuickStart.html
+http://manual.winmerge.org/QuickStart.html
 
 \xC2\xEF\xDE\xE8\xE5\xE9\xE1 \xF4\xEF\xF5 WinMerge
 ====================
@@ -30,7 +30,7 @@
 \xE2\xEF\xE7\xE8\xE5\xDF\xE1\xF2 /?.
 
 \xCC\xF0\xEF\xF1\xE5\xDF\xF4\xE5 \xE5\xF0\xDF\xF3\xE7\xF2 \xED\xE1 \xEC\xE5\xEB\xE5\xF4\xDE\xF3\xE5\xF4\xE5 \xF4\xE7 \xC2\xEF\xDE\xE8\xE5\xE9\xE1 \xF4\xEF\xF5 WinMerge \xF3\xE5 \xEC\xEF\xF1\xF6\xDE HTML \xF3\xF4\xE7
-\xE4\xE9\xE5\xFD\xE8\xF5\xED\xF3\xE7 http://winmerge.org/docs/manual/.
+\xE4\xE9\xE5\xFD\xE8\xF5\xED\xF3\xE7 http://manual.winmerge.org/.
 
 \xD5\xF0\xEF\xF3\xF4\xDE\xF1\xE9\xEE\xE7 \xD3\xF5\xEC\xF0\xE9\xE5\xF3\xEC\xDD\xED\xF9\xED \xC1\xF1\xF7\xE5\xDF\xF9\xED
 ===============================

Modified: branches/R2_14/Docs/Users/Languages/ReadMe-Japanese.txt
===================================================================
--- branches/R2_14/Docs/Users/Languages/ReadMe-Japanese.txt	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/Languages/ReadMe-Japanese.txt	2010-12-20 12:24:01 UTC (rev 7474)
@@ -16,7 +16,7 @@
 ===========
 WinMerge\x82\xF0\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB5\x82\xBD\x8C\xE3\x81A\x8A\xEE\x96{\x93I\x82ȑ\x80\x8D\xEC\x82̎d\x95\xFB\x82\xF0\x92m\x82邽\x82߂ɁA[\x83w\x83\x8B\x83v]\x83\x81\x83j\x83\x85\x81[\x81\xA8
 [WinMerge\x83w\x83\x8B\x83v]\x82\xF0\x83N\x83\x8A\x83b\x83N\x82\xB5\x81A\x83N\x83C\x83b\x83N\x83X\x83^\x81[\x83g\x83g\x83s\x83b\x83N\x82\xF0\x95\\x8E\xA6\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-\x82܂\xBD\x82́AWeb\x83o\x81[\x83W\x83\x87\x83\x93\x82\xCChttp://winmerge.org/docs/manual/QuickStart.html
+\x82܂\xBD\x82́AWeb\x83o\x81[\x83W\x83\x87\x83\x93\x82\xCChttp://manual.winmerge.org/QuickStart.html
 \x82\xF0\x8EQ\x8FƂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
 
 WinMerge\x82̃w\x83\x8B\x83v
@@ -26,7 +26,7 @@
 \x83N\x83\x8A\x83b\x83N\x82\xB7\x82邩\x81AWinMerge\x83E\x83C\x83\x93\x83h\x83E\x82\xC5F1\x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
 \x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x82ł́A/? \x83w\x83\x8B\x83v\x83X\x83C\x83b\x83`\x82\xF0\x82‚\xAF\x82\xC4WinMerge\x82̎\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xF0\x8E\xC0\x8Ds\x82\xB5\x82܂\xB7\x81B
 
-http://winmerge.org/docs/manual/ \x82\xA9\x82\xE7\x82ł\xE0HTML\x94ł\xCCWinMerge\x83w\x83\x8B\x83v\x82\xF0\x89{\x97\x97\x82\xB7\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B
+http://manual.winmerge.org/ \x82\xA9\x82\xE7\x82ł\xE0HTML\x94ł\xCCWinMerge\x83w\x83\x8B\x83v\x82\xF0\x89{\x97\x97\x82\xB7\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B
 
 \x83A\x81[\x83J\x83C\x83u\x83T\x83|\x81[\x83g:
 ===============

Modified: branches/R2_14/Docs/Users/Languages/ReadMe-Romanian.txt
===================================================================
--- branches/R2_14/Docs/Users/Languages/ReadMe-Romanian.txt	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/Languages/ReadMe-Romanian.txt	2010-12-20 12:24:01 UTC (rev 7474)
@@ -12,11 +12,11 @@
 Start rapid către utilizarea WinMerge:
 Citiţi capitolul Quick-start din manualul on-line pentru a vă
 familiariza cu WinMerge:
-http://winmerge.org/docs/manual/QuickStart.html
+http://manual.winmerge.org/QuickStart.html
 
 Manualul HTML:
 Manualul este disponibil la
-http://winmerge.org/docs/manual/
+http://manual.winmerge.org/
 este posibil să-l aveţi instalat (dacă s-a optat pentru aceasta) local,
 dar este şi copiabil separat de la http://winmerge.org/
 (vezi documentaţia)

Modified: branches/R2_14/Docs/Users/Languages/ReadMe-Serbian.txt
===================================================================
--- branches/R2_14/Docs/Users/Languages/ReadMe-Serbian.txt	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/Languages/ReadMe-Serbian.txt	2010-12-20 12:24:01 UTC (rev 7474)
@@ -16,7 +16,7 @@
 ===========
 \xC4\xE0 \xE1\xE8 \xF1\xF2\xE5 \xF1\xE0\xE7\xED\xE0\xEB\xE8 \xEA\xE0\xEA\xEE \xE4\xE0 \xEA\xEE\xF0\xE8\xF1\xF2\xE8\xF2\xE5 WinMerge, \xEA\xEB\xE8\xEA\xED\xE8\xF2\xE5 \xED\xE0 \xE4\xF3\xE3\xEC\xE5
 '\xCF\xEE\xEC\xEE\x9E' \xE8 \xE8\xE4\xE8\xF2\xE5 \xED\xE0 Quick start \xE8\xEB\xE8 \xE8\xE4\xE8\xF2\xE5 \xED\xE0 \xE8\xED\xF2\xE5\xF0\xED\xE5\xF2 \xE8 \xEF\xEE\xF1\xE5\xF2\xE8\xF2\xE5
- http://winmerge.org/docs/manual/QuickStart.html.
+ http://manual.winmerge.org/QuickStart.html.
 
 WinMerge \xCF\xEE\xEC\xEE\x9E
 ============= 
@@ -26,7 +26,7 @@
 
 
 \xD2\xE0\xEA\xEE\x90\xE5 \xEC\xEE\xE6\xE5\xF2\xE5 \xEF\xF0\xE5\xE3\xEB\xE5\xE4\xE0\xF2\xE8 WinMerge Help \xED\xE0 \xF1\xEB\xE5\xE4\xE5\x9E\xEE\xBC \xE0\xE4\xF0\xE5\xF1\xE8
-http://winmerge.org/docs/manual/.
+http://manual.winmerge.org/.
 
 \xCF\xEE\xE4\xF0\xF8\xEA\xE0 \xE0\xF0\xF5\xE8\xE2\xE0
 ===============

Modified: branches/R2_14/Docs/Users/Languages/ReadMe-Spanish.txt
===================================================================
--- branches/R2_14/Docs/Users/Languages/ReadMe-Spanish.txt	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/Languages/ReadMe-Spanish.txt	2010-12-20 12:24:01 UTC (rev 7474)
@@ -9,11 +9,11 @@
 
 Gu\xEDa r\xE1pida de WinMerge:
 Lea el cap\xEDtulo Quick-start del manual on-line para comenzar con WinMerge;
-http://winmerge.org/docs/manual/QuickStart.html
+http://manual.winmerge.org/QuickStart.html
 
 Manual HTML:
 el manual est\xE1 disponible online en:
-http://winmerge.org/docs/manual/
+http://manual.winmerge.org/
 Posiblemente tambi\xE9n est\xE9 instalado (si se eligi\xF3 as\xED) localmente, y se puede 
 descargar por separado desde http://winmerge.org/ (ver Documentaci\xF3n)
 

Modified: branches/R2_14/Docs/Users/Languages/ReadMe-Swedish.txt
===================================================================
--- branches/R2_14/Docs/Users/Languages/ReadMe-Swedish.txt	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/Languages/ReadMe-Swedish.txt	2010-12-20 12:24:01 UTC (rev 7474)
@@ -17,7 +17,7 @@
 F\xF6r att l\xE4ra sig hur man ska utf\xF6ra grundl\xE4ggande uppgifter efter att ha 
 installerat WinMerge, klicka p\xE5 "Hj\xE4lp>WinMerge Hj\xE4lp") 
 och navigera till "Quick start"-\xE4mnet.  Eller, g\xE5 till Internetversionen p\xE5
-http://winmerge.org/docs/manual/QuickStart.html.
+http://manual.winmerge.org/QuickStart.html.
 
 WinMerge Help (WinMerges Hj\xE4lp)
 ============= 
@@ -27,7 +27,7 @@
 k\xF6r WinMerge-programmet med  /? hj\xE4lpparametern.
 
 Du kan ocks\xE5 bl\xE4ddra i HTML-versionen av WinMerges Hj\xE4lp p\xE5 
-http://winmerge.org/docs/manual/.
+http://manual.winmerge.org/.
 
 Archive Support (Arkivsupport)
 ===============

Modified: branches/R2_14/Docs/Users/Languages/ReadMe-Ukrainian.txt
===================================================================
--- branches/R2_14/Docs/Users/Languages/ReadMe-Ukrainian.txt	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/Languages/ReadMe-Ukrainian.txt	2010-12-20 12:24:01 UTC (rev 7474)
@@ -9,11 +9,11 @@
 
 \xCF\xEE\xF7\xE0\xF2\xEE\xEA \xF0\xEE\xE1\xEE\xF2\xE8 \xE7 WinMerge:
 \xD9\xEE\xE4\xEE \xF6\xFC\xEE\xE3\xEE \xF7\xE8\xF2\xE0\xE9\xF2\xE5 \xE2\xB3\xE4\xEF\xEE\xE2\xB3\xE4\xED\xE8\xE9 \xF0\xEE\xE7\xE4\xB3\xEB \xEE\xED\xEB\xE0\xE9\xED-\xE4\xEE\xE2\xB3\xE4\xEA\xE8 WinMerge:
-http://winmerge.org/docs/manual/QuickStart.html
+http://manual.winmerge.org/QuickStart.html
 
 HTML-\xE4\xEE\xE2\xB3\xE4\xEA\xE0:
 \xC4\xEE\xE2\xB3\xE4\xEA\xE0 \xE4\xEE\xF1\xF2\xF3\xEF\xED\xE0 \xEE\xED\xEB\xE0\xE9\xED
-http://winmerge.org/docs/manual/
+http://manual.winmerge.org/
 \xBF\xBF \xF2\xE0\xEA\xEE\xE6 \xEC\xEE\xE6\xED\xE0 \xE2\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xE8 (\xFF\xEA\xF9\xEE \xEE\xE1\xF0\xE0\xED\xEE) \xEB\xEE\xEA\xE0\xEB\xFC\xED\xEE \xF2\xE0 \xE7\xE0\xE2\xE0\xED\xF2\xE0\xE6\xE8\xF2\xE8 \xEE\xEA\xF0\xE5\xEC\xEE \xE7
 http://winmerge.org/ (\xE4\xE8\xE2. \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0\xF6\xB3\xFE)
 

Modified: branches/R2_14/Docs/Users/Manual/About_Doc.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/About_Doc.xml	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/Manual/About_Doc.xml	2010-12-20 12:24:01 UTC (rev 7474)
@@ -71,7 +71,7 @@
           <para>Open your Web browser to <ulink
           url="http://winmerge.org/">winmerge.org</ulink>. Under <ulink
           url="http://winmerge.org/docs/">Documentation</ulink>, follow the
-          <ulink url="http://winmerge.org/docs/manual/">Manual</ulink> link to
+          <ulink url="http://manual.winmerge.org/">Manual</ulink> link to
           the latest Help version.</para>
         </listitem>
       </varlistentry>

Modified: branches/R2_14/Docs/Users/Manual/tour/WinMerge_tour.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/tour/WinMerge_tour.xml	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/Manual/tour/WinMerge_tour.xml	2010-12-20 12:24:01 UTC (rev 7474)
@@ -41,7 +41,7 @@
 
       <para>This tour just scratches the surface. For detailed information and
       guidance about using WinMerge, see the Help that is installed with
-      WinMerge and available <ulink url="http://winmerge.org/docs/manual/">on
+      WinMerge and available <ulink url="http://manual.winmerge.org/">on
       our Web site</ulink>.</para>
     </abstract>
   </bookinfo>

Modified: branches/R2_14/Docs/Users/ReadMe.txt
===================================================================
--- branches/R2_14/Docs/Users/ReadMe.txt	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Docs/Users/ReadMe.txt	2010-12-20 12:24:01 UTC (rev 7474)
@@ -16,7 +16,7 @@
 ===========
 To learn how to perform basic operations after installing WinMerge, click
 Help>WinMerge Help and navigate to the Quick start topic.  Or, go to the Web
-version at http://winmerge.org/docs/manual/QuickStart.html.
+version at http://manual.winmerge.org/QuickStart.html.
 
 WinMerge Help
 ============= 
@@ -26,7 +26,7 @@
 /? help switch.
 
 You can also browse the HTML version of WinMerge Help at 
-http://winmerge.org/docs/manual/.
+http://manual.winmerge.org/.
 
 Archive Support
 ===============

Modified: branches/R2_14/Src/Constants.h
===================================================================
--- branches/R2_14/Src/Constants.h	2010-12-20 12:22:56 UTC (rev 7473)
+++ branches/R2_14/Src/Constants.h	2010-12-20 12:24:01 UTC (rev 7474)
@@ -17,7 +17,7 @@
  * @brief URL to help index in internet.
  * We use internet help when local help file is not found (not installed).
  */
-const TCHAR DocsURL[] = _T("http://winmerge.org/docs/manual/index.html");
+const TCHAR DocsURL[] = _T("http://manual.winmerge.org/index.html");
 
 /** @brief URL to translations page in internet. */
 const TCHAR TranslationsUrl[] = _T("http://winmerge.org/translations/");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7484] branches/R2_14

[<ge...@us...>]

Revision: 7484
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7484&view=rev
Author:   gerundt
Date:     2010-12-28 20:56:59 +0000 (Tue, 28 Dec 2010)

Log Message:
-----------
PATCH: [ 2919475 ] plug in error after ESC in foldercompare
 Submitted by Matthias Mayer

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/FileTransform.cpp

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2010-12-28 20:50:55 UTC (rev 7483)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2010-12-28 20:56:59 UTC (rev 7484)
@@ -26,6 +26,7 @@
   Bugfix: Added EOL chars between copied file/path names (#2817546)
   Bugfix: Created new matching folder to wrong folder (#2890961)
   Bugfix: Strange scrolling effect in location pane (#2942869)
+  Bugfix: Plugin error after interrupting folder compare (#2919475)
 
 WinMerge 2.13.20 - 2010-10-20 (r7319)
   Add missing keywords to Pascal highlighter (#2834192)

Modified: branches/R2_14/Src/FileTransform.cpp
===================================================================
--- branches/R2_14/Src/FileTransform.cpp	2010-12-28 20:50:55 UTC (rev 7483)
+++ branches/R2_14/Src/FileTransform.cpp	2010-12-28 20:56:59 UTC (rev 7484)
@@ -137,6 +137,9 @@
 	PluginInfo * plugin = CAllThreadsScripts::GetActiveSet()->GetPluginByName(L"FILE_PACK_UNPACK", handler->pluginName.c_str());
 	if (plugin == NULL)
 		plugin = CAllThreadsScripts::GetActiveSet()->GetPluginByName(L"BUFFER_PACK_UNPACK", handler->pluginName.c_str());
+	if (plugin == NULL)
+		return FALSE;
+
 	LPDISPATCH piScript = plugin->m_lpDispatch;
 	if (handler->bWithFile)
 	{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7502] branches/R2_14

[<ge...@us...>]

Revision: 7502
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7502&view=rev
Author:   gerundt
Date:     2011-01-03 13:46:19 +0000 (Mon, 03 Jan 2011)

Log Message:
-----------
PATCH: #3010934 custom code as String or integer
 Fixes bug item #2813825
 Patch submitted by Matthias Mayer

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/PropCodepage.cpp
    branches/R2_14/Src/PropCodepage.h

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2011-01-03 13:29:00 UTC (rev 7501)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2011-01-03 13:46:19 UTC (rev 7502)
@@ -15,6 +15,7 @@
   Add /xq command line switch for closing WinMerge after identical files
     and not showing message (#2827836)
   Allow setting codepage from command line (#2725549)
+  Allow giving encoding name as custom codepage (#2813825, #3010934)
   Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed 
     in status bar (#3025855)
   Bugfix: Pane headers not updated after language change (#2923684)

Modified: branches/R2_14/Src/PropCodepage.cpp
===================================================================
--- branches/R2_14/Src/PropCodepage.cpp	2011-01-03 13:29:00 UTC (rev 7501)
+++ branches/R2_14/Src/PropCodepage.cpp	2011-01-03 13:46:19 UTC (rev 7502)
@@ -33,6 +33,7 @@
 #include "OptionsDef.h"
 #include "OptionsMgr.h"
 #include "OptionsPanel.h"
+#include "charsets.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -53,7 +54,7 @@
 	CPropertyPage::DoDataExchange(pDX);
 	//{{AFX_DATA_MAP(PropCodepage)
 	DDX_Radio(pDX, IDC_CP_SYSTEM, m_nCodepageSystem);
-	DDX_Text(pDX, IDC_CUSTOM_CP_NUMBER, m_nCustomCodepageValue);
+	DDX_Text(pDX, IDC_CUSTOM_CP_NUMBER, m_cCustomCodepageValue);
 	DDX_Check(pDX, IDC_DETECT_CODEPAGE, m_bDetectCodepage);
 	//}}AFX_DATA_MAP
 }
@@ -74,6 +75,7 @@
 {
 	m_nCodepageSystem = GetOptionsMgr()->GetInt(OPT_CP_DEFAULT_MODE);
 	m_nCustomCodepageValue = GetOptionsMgr()->GetInt(OPT_CP_DEFAULT_CUSTOM);
+	m_cCustomCodepageValue.Format(_T("%d"),m_nCustomCodepageValue);
 	m_bDetectCodepage = GetOptionsMgr()->GetBool(OPT_CP_DETECT);
 }
 
@@ -83,6 +85,7 @@
 void PropCodepage::WriteOptions()
 {
 	GetOptionsMgr()->SaveOption(OPT_CP_DEFAULT_MODE, (int)m_nCodepageSystem);
+	GetEncodingCodePageFromNameString();
 	GetOptionsMgr()->SaveOption(OPT_CP_DEFAULT_CUSTOM, (int)m_nCustomCodepageValue);
 	GetOptionsMgr()->SaveOption(OPT_CP_DETECT, m_bDetectCodepage == TRUE);
 }
@@ -118,3 +121,20 @@
 {
 	GetDlgItem(IDC_CUSTOM_CP_NUMBER)->EnableWindow(FALSE);	
 }
+
+void PropCodepage::GetEncodingCodePageFromNameString()
+{
+	int nCustomCodepageValue = _ttol(m_cCustomCodepageValue);
+	if (nCustomCodepageValue == 0)
+	{
+		char *result= new char[80]; 
+		long len = wcslen(m_cCustomCodepageValue); 
+		_wcstombsz(result, m_cCustomCodepageValue, len); //conversion to char * 
+		result[len] = '\0'; //don't forget to put the caracter of terminated string 
+		nCustomCodepageValue = GetEncodingCodePageFromName(result);
+		delete [] result;
+	}
+	//if found a new codepage valid
+	if (nCustomCodepageValue)
+		m_nCustomCodepageValue = nCustomCodepageValue;
+}

Modified: branches/R2_14/Src/PropCodepage.h
===================================================================
--- branches/R2_14/Src/PropCodepage.h	2011-01-03 13:29:00 UTC (rev 7501)
+++ branches/R2_14/Src/PropCodepage.h	2011-01-03 13:46:19 UTC (rev 7502)
@@ -45,6 +45,7 @@
 	// Generated message map functions
 	//{{AFX_MSG(PropCodepage)
 	virtual BOOL OnInitDialog();
+	void GetEncodingCodePageFromNameString();
 	afx_msg void OnCpSystem();
 	afx_msg void OnCpCustom();
 	afx_msg void OnCpUi();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7509] branches/R2_14

[<ge...@us...>]

Revision: 7509
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7509&view=rev
Author:   gerundt
Date:     2011-01-28 20:32:11 +0000 (Fri, 28 Jan 2011)

Log Message:
-----------
PATCH: [ 3164982 ] Hungarian language file
 Submitted by Mihalicza J?\195?\179zsef

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Docs/Users/Contributors.txt
    branches/R2_14/Src/Languages/Hungarian.po

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2011-01-28 20:12:55 UTC (rev 7508)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2011-01-28 20:32:11 UTC (rev 7509)
@@ -28,6 +28,8 @@
   Bugfix: Created new matching folder to wrong folder (#2890961)
   Bugfix: Strange scrolling effect in location pane (#2942869)
   Bugfix: Plugin error after interrupting folder compare (#2919475)
+  Translation updates:
+  - Hungarian (#3164982)
 
 WinMerge 2.13.20 - 2010-10-20 (r7319)
   Add missing keywords to Pascal highlighter (#2834192)

Modified: branches/R2_14/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_14/Docs/Users/Contributors.txt	2011-01-28 20:12:55 UTC (rev 7508)
+++ branches/R2_14/Docs/Users/Contributors.txt	2011-01-28 20:32:11 UTC (rev 7509)
@@ -75,6 +75,7 @@
 
 * Hungarian:
   M\xE1rton Bal\xE1zs <do...@us...>
+  Mihalicza J\xF3zsef <jmi...@gm...>
 
 * Italian:
   Andrea Decorte <dec...@ho...>

Modified: branches/R2_14/Src/Languages/Hungarian.po
===================================================================
--- branches/R2_14/Src/Languages/Hungarian.po	2011-01-28 20:12:55 UTC (rev 7508)
+++ branches/R2_14/Src/Languages/Hungarian.po	2011-01-28 20:32:11 UTC (rev 7509)
@@ -3,6 +3,7 @@
 #
 # Translators:
 # * M\xE1rton Bal\xE1zs <documan at users.sourceforge.net>
+# * Mihalicza J\xF3zsef <jmihalicza at gmail.com>
 #
 # ID line follows -- this is updated by SVN
 # $Id$
@@ -12,7 +13,7 @@
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2011-01-24 21:42+0100\n"
 "Last-Translator: \n"
 "Language-Team: Hungarian <win...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -140,7 +141,7 @@
 #: Merge.rc:316
 #, c-format
 msgid "Op&en Conflict File..."
-msgstr ""
+msgstr "Konfliktus f\xE1jl megnyit\xE1sa..."
 
 #: Merge.rc:116
 #: Merge.rc:197
@@ -154,12 +155,12 @@
 #: Merge.rc:319
 #, c-format
 msgid "Sa&ve Project..."
-msgstr ""
+msgstr "Projekt ment\xE9se..."
 
 #: Merge.rc:119
 #, c-format
 msgid "Recent Projects"
-msgstr ""
+msgstr "Legut\xF3bbi projektek"
 
 #: Merge.rc:121
 #: Merge.rc:205
@@ -208,35 +209,35 @@
 #: Merge.rc:413
 #, c-format
 msgid "&Toolbar"
-msgstr ""
+msgstr "Eszk\xF6zt\xE1r"
 
 #: Merge.rc:134
 #: Merge.rc:233
 #: Merge.rc:415
 #, c-format
 msgid "&None"
-msgstr ""
+msgstr "&Nincs"
 
 #: Merge.rc:135
 #: Merge.rc:234
 #: Merge.rc:416
 #, c-format
 msgid "&Small"
-msgstr ""
+msgstr "Kic&si"
 
 #: Merge.rc:136
 #: Merge.rc:235
 #: Merge.rc:417
 #, c-format
 msgid "&Big"
-msgstr ""
+msgstr "Nagy"
 
 #: Merge.rc:138
 #: Merge.rc:237
 #: Merge.rc:419
 #, c-format
 msgid "&Status Bar"
-msgstr "&\xC1lapotsor"
+msgstr "&\xC1llapotsor"
 
 #: Merge.rc:139
 #: Merge.rc:238
@@ -285,7 +286,7 @@
 #: Merge.rc:454
 #, c-format
 msgid "&List..."
-msgstr ""
+msgstr "&Lista..."
 
 #: Merge.rc:152
 #: Merge.rc:273
@@ -388,7 +389,7 @@
 #: Merge.rc:175
 #: Merge.rc:296
 #: Merge.rc:484
-#: Merge.rc:1933
+#: Merge.rc:1935
 #, c-format
 msgid "&Help"
 msgstr "&S\xFAg\xF3"
@@ -398,7 +399,7 @@
 #: Merge.rc:486
 #, c-format
 msgid "&WinMerge Help\tF1"
-msgstr ""
+msgstr "&WinMerge S\xFAg\xF3\tF1"
 
 #: Merge.rc:179
 #: Merge.rc:300
@@ -412,7 +413,7 @@
 #: Merge.rc:489
 #, c-format
 msgid "&Translations"
-msgstr ""
+msgstr "Ford\xED&t\xE1sok"
 
 #: Merge.rc:181
 #: Merge.rc:302
@@ -457,7 +458,7 @@
 #: Merge.rc:203
 #, c-format
 msgid "File En&coding"
-msgstr ""
+msgstr "F\xE1jl k\xF3dol\xE1s"
 
 #: Merge.rc:209
 #: Merge.rc:363
@@ -468,32 +469,32 @@
 #: Merge.rc:215
 #, c-format
 msgid "Show &Identical Items"
-msgstr ""
+msgstr "Egyez\xF5 elemek mutat\xE1sa"
 
 #: Merge.rc:216
 #, c-format
 msgid "Show &Different Items"
-msgstr ""
+msgstr "K\xFCl\xF6nb\xF6z\xF5 elemek mutat\xE1sa"
 
 #: Merge.rc:217
 #, c-format
 msgid "Show L&eft Unique Items"
-msgstr ""
+msgstr "Csak bal oldali elemek mutat\xE1sa"
 
 #: Merge.rc:218
 #, c-format
 msgid "Show Ri&ght Unique Items"
-msgstr ""
+msgstr "Csak jobb oldali elemek mutat\xE1sa"
 
 #: Merge.rc:219
 #, c-format
 msgid "Show S&kipped Items"
-msgstr ""
+msgstr "Kihagyott elemek mutat\xE1sa"
 
 #: Merge.rc:220
 #, c-format
 msgid "S&how Binary Files"
-msgstr ""
+msgstr "Bin\xE1ris f\xE1jlok mutat\xE1sa"
 
 #: Merge.rc:222
 #, c-format
@@ -503,22 +504,22 @@
 #: Merge.rc:224
 #, c-format
 msgid "Tree &Mode"
-msgstr ""
+msgstr "Fa &m\xF3d"
 
 #: Merge.rc:225
 #, c-format
 msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "Minden alk\xF6nyvt\xE1r kibont\xE1sa"
 
 #: Merge.rc:226
 #, c-format
 msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "Minden alk\xF6nyvt\xE1r bez\xE1r\xE1sa"
 
 #: Merge.rc:239
 #, c-format
 msgid "Compa&re Statistics"
-msgstr ""
+msgstr "\xD6sszehasonl\xEDt\xE1si statisztika"
 
 #: Merge.rc:243
 #: Merge.rc:426
@@ -529,7 +530,7 @@
 #: Merge.rc:244
 #, c-format
 msgid "&Refresh Selected\tCtrl+F5"
-msgstr ""
+msgstr "Kijel\xF6ltek friss\xEDt\xE9se\tCtrl+F5"
 
 #: Merge.rc:246
 #: Merge.rc:428
@@ -631,37 +632,37 @@
 #: Merge.rc:333
 #, c-format
 msgid "&Print..."
-msgstr ""
+msgstr "Nyomtat\xE1s..."
 
 #: Merge.rc:334
 #, c-format
 msgid "Page Se&tup"
-msgstr ""
+msgstr "Oldalbe\xE1ll\xEDt\xE1s"
 
 #: Merge.rc:335
 #, c-format
 msgid "Print Previe&w"
-msgstr ""
+msgstr "Nyomtat\xE1si k\xE9p"
 
 #: Merge.rc:340
 #, c-format
 msgid "&Convert Line Endings to"
-msgstr ""
+msgstr "Sorv\xE9gek \xE1talak\xEDt\xE1sa"
 
 #: Merge.rc:342
 #, c-format
 msgid "&Windows (CRLF)"
-msgstr ""
+msgstr "&Windows (CRLF)"
 
 #: Merge.rc:343
 #, c-format
 msgid "&Unix (LF)"
-msgstr ""
+msgstr "&Unix (LF)"
 
 #: Merge.rc:344
 #, c-format
 msgid "&Mac (CR)"
-msgstr ""
+msgstr "&Mac (CR)"
 
 #: Merge.rc:347
 #, c-format
@@ -671,7 +672,7 @@
 #: Merge.rc:349
 #, c-format
 msgid "&File Encoding..."
-msgstr ""
+msgstr "&F\xE1jl k\xF3dol\xE1s..."
 
 #: Merge.rc:355
 #, c-format
@@ -719,7 +720,7 @@
 msgstr "&Szkriptek"
 
 #: Merge.rc:370
-#: Merge.rc:2789
+#: Merge.rc:2791
 #, c-format
 msgid "< Empty >"
 msgstr "< \xDCres >"
@@ -737,27 +738,27 @@
 #: Merge.rc:378
 #, c-format
 msgid "&Bookmarks"
-msgstr ""
+msgstr "K\xF6nyvjelz\xF5k"
 
 #: Merge.rc:380
 #, c-format
 msgid "&Toggle Bookmark\tCtrl+F2"
-msgstr ""
+msgstr "K\xF6nyvjelz\xF5 ki/be\tCtrl+F2"
 
 #: Merge.rc:381
 #, c-format
 msgid "&Next Bookmark\tF2"
-msgstr ""
+msgstr "K\xF6vetkez\xF5 k\xF6nyvjelz\xF5\tF2"
 
 #: Merge.rc:382
 #, c-format
 msgid "&Previous bookmark\tShift+F2"
-msgstr ""
+msgstr "El\xF5z\xF5 k\xF6nyvjelz\xF5\tShift+F2"
 
 #: Merge.rc:383
 #, c-format
 msgid "&Clear All Bookmarks"
-msgstr ""
+msgstr "\xD6sszes k\xF6nyvjelz\xF5 t\xF6rl\xE9se"
 
 #: Merge.rc:385
 #, c-format
@@ -767,17 +768,17 @@
 #: Merge.rc:393
 #, c-format
 msgid "&Zoom"
-msgstr ""
+msgstr "Nagy\xEDt\xE1s"
 
 #: Merge.rc:395
 #, c-format
 msgid "Zoom &In\tCtrl++"
-msgstr ""
+msgstr "Nagy\xEDt\xE1s\tCtrl++"
 
 #: Merge.rc:396
 #, c-format
 msgid "Zoom &Out\tCtrl+-"
-msgstr ""
+msgstr "Kicsiny\xEDt\xE9s\tCtrl+-"
 
 #. Zoom to normal
 #: Merge.rc:397
@@ -793,7 +794,7 @@
 #: Merge.rc:404
 #, c-format
 msgid "&Lock Panes"
-msgstr ""
+msgstr "Pane&lek r\xF6gz\xEDt\xE9se"
 
 #: Merge.rc:405
 #, c-format
@@ -808,22 +809,22 @@
 #: Merge.rc:407
 #, c-format
 msgid "View Line &Numbers"
-msgstr ""
+msgstr "Sorsz\xE1mok megjelen\xEDt\xE9se"
 
 #: Merge.rc:408
 #, c-format
 msgid "View &Margins"
-msgstr ""
+msgstr "Marg\xF3k megjelen\xEDt\xE9se"
 
 #: Merge.rc:409
 #, c-format
 msgid "W&rap Lines"
-msgstr ""
+msgstr "Sort\xF6rdel\xE9s"
 
 #: Merge.rc:411
 #, c-format
 msgid "Sw&ap Panes"
-msgstr ""
+msgstr "Panelek megcser\xE9l\xE9se"
 
 #: Merge.rc:421
 #, c-format
@@ -873,7 +874,7 @@
 #: Merge.rc:505
 #, c-format
 msgid "&XML"
-msgstr ""
+msgstr "&XML"
 
 #: Merge.rc:510
 #, c-format
@@ -916,15 +917,15 @@
 msgstr "&T\xF6rl\xE9s"
 
 #: Merge.rc:522
-#: Merge.rc:1135
-#: Merge.rc:1517
+#: Merge.rc:1137
+#: Merge.rc:1519
 #, c-format
 msgid "&Left"
 msgstr "&Bal oldal"
 
 #: Merge.rc:523
-#: Merge.rc:1137
-#: Merge.rc:1520
+#: Merge.rc:1139
+#: Merge.rc:1522
 #, c-format
 msgid "&Right"
 msgstr "&Jobb oldal"
@@ -937,7 +938,7 @@
 #: Merge.rc:526
 #, c-format
 msgid "Re&name"
-msgstr ""
+msgstr "\xC1t&nevez\xE9s"
 
 #: Merge.rc:527
 #, c-format
@@ -982,7 +983,7 @@
 #: Merge.rc:550
 #, c-format
 msgid "&Zip"
-msgstr ""
+msgstr "&Zip"
 
 #: Merge.rc:552
 #, c-format
@@ -1054,1003 +1055,1003 @@
 msgid "Moved Block for &Current Diff"
 msgstr "A &jelenlegi Elt\xE9r\xE9s mozgatott blokkja"
 
-#: Merge.rc:662
+#: Merge.rc:664
 #, c-format
 msgid "About WinMerge"
 msgstr "A WinMerge n\xE9vjegye"
 
-#: Merge.rc:668
+#: Merge.rc:670
 #, c-format
 msgid "(Private Build)"
-msgstr ""
+msgstr "(Priv\xE1t build)"
 
-#: Merge.rc:669
+#: Merge.rc:671
 #, c-format
 msgid "All rights reserved."
 msgstr "Minden jog fenntartva."
 
-#: Merge.rc:670
+#: Merge.rc:672
 #, c-format
 msgid "Visit the WinMerge HomePage!"
 msgstr "L\xE1togasd meg a WinMerge honlapj\xE1t!"
 
-#: Merge.rc:673
-#: Merge.rc:705
-#: Merge.rc:797
-#: Merge.rc:983
-#: Merge.rc:1054
-#: Merge.rc:1083
-#: Merge.rc:1093
-#: Merge.rc:1259
-#: Merge.rc:1323
-#: Merge.rc:1336
-#: Merge.rc:1428
-#: Merge.rc:1443
-#: Merge.rc:1665
+#: Merge.rc:675
+#: Merge.rc:707
+#: Merge.rc:799
+#: Merge.rc:985
+#: Merge.rc:1056
+#: Merge.rc:1085
+#: Merge.rc:1095
+#: Merge.rc:1261
+#: Merge.rc:1325
+#: Merge.rc:1338
+#: Merge.rc:1430
+#: Merge.rc:1445
+#: Merge.rc:1667
 #, c-format
 msgid "OK"
 msgstr "Vissza"
 
-#: Merge.rc:674
+#: Merge.rc:676
 #, c-format
 msgid "Contributors"
 msgstr "K\xF6zrem\xFBk\xF6d\xF5k"
 
-#: Merge.rc:681
+#: Merge.rc:683
 #, c-format
 msgid "Select Files or Folders"
 msgstr "V\xE1laszd ki a f\xE1jlokat vagy k\xF6nyvt\xE1rakat..."
 
-#: Merge.rc:684
-#: Merge.rc:1594
+#: Merge.rc:686
+#: Merge.rc:1596
 #, c-format
 msgid "&Left:"
 msgstr "&Bal:"
 
-#: Merge.rc:688
-#: Merge.rc:749
-#: Merge.rc:997
-#: Merge.rc:1019
+#: Merge.rc:690
+#: Merge.rc:751
+#: Merge.rc:999
+#: Merge.rc:1021
 #, c-format
 msgid "&Browse..."
 msgstr "&Tall\xF3z\xE1s..."
 
-#: Merge.rc:689
-#: Merge.rc:1598
+#: Merge.rc:691
+#: Merge.rc:1600
 #, c-format
 msgid "&Right:"
 msgstr "&Jobb:"
 
-#: Merge.rc:693
-#: Merge.rc:1030
+#: Merge.rc:695
+#: Merge.rc:1032
 #, c-format
 msgid "Bro&wse..."
 msgstr "T&all\xF3z\xE1s..."
 
-#: Merge.rc:694
-#: Merge.rc:1602
+#: Merge.rc:696
+#: Merge.rc:1604
 #, c-format
 msgid "&Filter:"
 msgstr "&Sz\xFBr\xF5:"
 
-#: Merge.rc:697
-#: Merge.rc:1604
+#: Merge.rc:699
+#: Merge.rc:1606
 #, c-format
 msgid "Select..."
 msgstr "Kiv\xE1laszt\xE1s..."
 
-#: Merge.rc:698
+#: Merge.rc:700
 #, c-format
 msgid "&Unpacker:"
 msgstr "&Csomagol\xF3:"
 
-#: Merge.rc:701
+#: Merge.rc:703
 #, c-format
 msgid "&Select..."
 msgstr "&Kiv\xE1laszt\xE1s..."
 
-#: Merge.rc:702
-#: Merge.rc:1605
+#: Merge.rc:704
+#: Merge.rc:1607
 #, c-format
 msgid "&Include Subfolders"
 msgstr "&Alk\xF6nyvt\xE1rakkal egy\xFCtt"
 
-#: Merge.rc:704
+#: Merge.rc:706
 #, c-format
 msgid "Status:"
 msgstr "\xC1llapot:"
 
-#: Merge.rc:706
-#: Merge.rc:736
-#: Merge.rc:798
-#: Merge.rc:828
-#: Merge.rc:860
-#: Merge.rc:870
-#: Merge.rc:1055
-#: Merge.rc:1084
-#: Merge.rc:1094
-#: Merge.rc:1145
-#: Merge.rc:1260
-#: Merge.rc:1337
-#: Merge.rc:1429
-#: Merge.rc:1444
-#: Merge.rc:1666
+#: Merge.rc:708
+#: Merge.rc:738
+#: Merge.rc:800
+#: Merge.rc:830
+#: Merge.rc:862
+#: Merge.rc:872
+#: Merge.rc:1057
+#: Merge.rc:1086
+#: Merge.rc:1096
+#: Merge.rc:1147
+#: Merge.rc:1262
+#: Merge.rc:1339
+#: Merge.rc:1431
+#: Merge.rc:1446
+#: Merge.rc:1668
 #, c-format
 msgid "Cancel"
 msgstr "M\xE9gsem"
 
-#: Merge.rc:707
-#: Merge.rc:1338
+#: Merge.rc:709
+#: Merge.rc:1340
 #, c-format
 msgid "Help"
 msgstr "S\xFAg\xF3"
 
-#: Merge.rc:708
+#: Merge.rc:710
 #, c-format
 msgid "Files or Folders to Compare"
 msgstr "\xD6sszehasonl\xEDtand\xF3 f\xE1jlok vagy k\xF6nyvt\xE1rak"
 
-#: Merge.rc:715
+#: Merge.rc:717
 #, c-format
 msgid "Visual SourceSafe"
-msgstr ""
+msgstr "Visual SourceSafe"
 
-#: Merge.rc:720
+#: Merge.rc:722
 #, c-format
 msgid "Database:"
 msgstr "Adatb\xE1zis:"
 
-#: Merge.rc:723
+#: Merge.rc:725
 #, c-format
 msgid "Project:"
 msgstr "Projekt:"
 
-#: Merge.rc:726
+#: Merge.rc:728
 #, c-format
 msgid "User:"
 msgstr "Felhaszn\xE1l\xF3:"
 
-#: Merge.rc:728
+#: Merge.rc:730
 #, c-format
 msgid "Password:"
 msgstr "Jelsz\xF3:"
 
-#: Merge.rc:730
+#: Merge.rc:732
 #, c-format
 msgid "Link to Destination VSS project"
 msgstr "Link a c\xE9l VSS projekthez"
 
-#: Merge.rc:732
-#: Merge.rc:875
+#: Merge.rc:734
+#: Merge.rc:877
 #, c-format
 msgid "Apply to all items"
 msgstr "Alkalmaz\xE1s minden elemen"
 
-#: Merge.rc:734
+#: Merge.rc:736
 #, c-format
 msgid "Check Out"
 msgstr "Ellen\xF5rz\xE9s"
 
-#: Merge.rc:735
-#: Merge.rc:871
+#: Merge.rc:737
+#: Merge.rc:873
 #, c-format
 msgid "Save As..."
 msgstr "Ment\xE9s m\xE1sk\xE9nt..."
 
-#: Merge.rc:741
+#: Merge.rc:743
 #, c-format
 msgid "Versioning System"
 msgstr "Verzi\xF3 Rendszer"
 
-#: Merge.rc:744
+#: Merge.rc:746
 #, c-format
 msgid "&Versioning System:"
 msgstr "&Verzi\xF3 Rendszer:"
 
-#: Merge.rc:747
-#: Merge.rc:2065
+#: Merge.rc:749
+#: Merge.rc:2067
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "A &cleartool.exe el\xE9r\xE9si \xFAtvonala:"
 
-#: Merge.rc:754
-#: Merge.rc:1941
+#: Merge.rc:756
+#: Merge.rc:1943
 #, c-format
 msgid "General"
 msgstr "\xC1ltal\xE1nos"
 
-#: Merge.rc:757
+#: Merge.rc:759
 #, c-format
 msgid "Automatically &scroll to first difference"
 msgstr "Automatikus &ugr\xE1s az els\xF5 elt\xE9r\xE9sre"
 
-#: Merge.rc:760
+#: Merge.rc:762
 #, c-format
 msgid "&Disable Splash Screen"
 msgstr "&Splash Screen letilt\xE1sa"
 
-#: Merge.rc:762
+#: Merge.rc:764
 #, c-format
 msgid "Cl&ose windows with ESC"
 msgstr "Ablakok bez\xE1r\xE1sa az &ESC billenty\xFBvel"
 
-#: Merge.rc:764
+#: Merge.rc:766
 #, c-format
 msgid "&Automatically verify paths in Open-dialog"
 msgstr "Automatikus \xFAtvonalellen\xF5rz\xE9s a &Megnyit\xE1s ablakban"
 
-#: Merge.rc:767
+#: Merge.rc:769
 #, c-format
 msgid "All&ow only one instance to run"
 msgstr "Csak &egy p\xE9ld\xE1ny fut\xE1s\xE1nak enged\xE9lyez\xE9se"
 
-#: Merge.rc:769
+#: Merge.rc:771
 #, c-format
 msgid "As&k when closing multiple windows"
-msgstr ""
+msgstr "R\xE1&k\xE9rdez\xE9s t\xF6bb ablak bez\xE1r\xE1sakor"
 
-#: Merge.rc:771
+#: Merge.rc:773
 #, c-format
 msgid "&Preserve file time in file compare"
-msgstr ""
+msgstr "F\xE1jl id\xF5k meg\xF5rz\xE9se \xF6sszehasonl\xEDt\xE1skor"
 
-#: Merge.rc:774
+#: Merge.rc:776
 #, c-format
 msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "\"V\xE1laszd ki a f\xE1jlokat vagy k\xF6nyvt\xE1rakat\" ablak indul\xE1skor"
 
-#: Merge.rc:776
+#: Merge.rc:778
 #, c-format
 msgid "O&pen-dialog Auto-Completion:"
 msgstr ""
 
-#: Merge.rc:779
+#: Merge.rc:781
 #, c-format
 msgid "Enable multiple compare windows for"
 msgstr "T\xF6bbsz\xF6r\xF6s \xF6sszehasonl\xEDt\xF3 ablakok enged\xE9lyez\xE9se:"
 
-#: Merge.rc:781
-#: Merge.rc:1617
+#: Merge.rc:783
+#: Merge.rc:1619
 #, c-format
 msgid "&Folder compare"
 msgstr "&Mappa \xF6sszehasonl\xEDt\xE1skor"
 
-#: Merge.rc:783
-#: Merge.rc:1619
+#: Merge.rc:785
+#: Merge.rc:1621
 #, c-format
 msgid "Fil&e compare"
 msgstr "&F\xE1jl \xF6sszehasonl\xEDt\xE1skor"
 
-#: Merge.rc:785
+#: Merge.rc:787
 #, c-format
 msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
-msgstr ""
+msgstr "A WinMerge lehet\xF5v\xE9 teszi \xE1ltal\xE1nos \xFCzenetablakok elrejt\xE9s\xE9t. A Vissza\xE1ll\xEDt gombbal minden \xFCzenetablak \xFAjra l\xE1that\xF3v\xE1 tehet\xF5."
 
-#: Merge.rc:787
+#: Merge.rc:789
 #, c-format
 msgid "Reset"
 msgstr "Vissza\xE1ll\xEDt"
 
-#: Merge.rc:794
+#: Merge.rc:796
 #, c-format
 msgid "Language"
 msgstr "Nyelv"
 
-#: Merge.rc:801
+#: Merge.rc:803
 #, c-format
 msgid "Available languages:"
 msgstr "V\xE1laszthat\xF3 nyelvek:"
 
-#: Merge.rc:807
+#: Merge.rc:809
 #, c-format
 msgid "Find"
 msgstr "Keres\xE9s"
 
-#: Merge.rc:810
-#: Merge.rc:837
+#: Merge.rc:812
+#: Merge.rc:839
 #, c-format
 msgid "Fi&nd what:"
 msgstr "&Sz\xF6veg:"
 
-#: Merge.rc:813
-#: Merge.rc:843
+#: Merge.rc:815
+#: Merge.rc:845
 #, c-format
 msgid "Match &whole word only"
 msgstr "Csak &teljes szavak mutat\xE1sa"
 
-#: Merge.rc:815
-#: Merge.rc:845
+#: Merge.rc:817
+#: Merge.rc:847
 #, c-format
 msgid "Match &case"
 msgstr "Kis-nagybet\xFB &\xE9rz\xE9kenys\xE9g"
 
-#: Merge.rc:817
-#: Merge.rc:847
+#: Merge.rc:819
+#: Merge.rc:849
 #, c-format
 msgid "Regular &expression"
 msgstr "&Regul\xE1ris kifejez\xE9sek"
 
-#: Merge.rc:819
+#: Merge.rc:821
 #, c-format
 msgid "D&on't wrap end of file"
 msgstr ""
 
-#: Merge.rc:822
+#: Merge.rc:824
 #, c-format
 msgid "Direction"
 msgstr "Ir\xE1ny"
 
-#: Merge.rc:823
+#: Merge.rc:825
 #, c-format
 msgid "&Up"
 msgstr "&Fel"
 
-#: Merge.rc:825
+#: Merge.rc:827
 #, c-format
 msgid "&Down"
 msgstr "&Le"
 
-#: Merge.rc:827
-#: Merge.rc:857
+#: Merge.rc:829
+#: Merge.rc:859
 #, c-format
 msgid "&Find Next"
 msgstr "Kere&s\xE9s"
 
-#: Merge.rc:834
+#: Merge.rc:836
 #, c-format
 msgid "Replace"
 msgstr "Csere"
 
-#: Merge.rc:840
+#: Merge.rc:842
 #, c-format
 msgid "Re&place with:"
 msgstr "Cs&ere erre:"
 
-#: Merge.rc:849
+#: Merge.rc:851
 #, c-format
 msgid "&Don't wrap end of file"
 msgstr "&\xC1lljon meg a f\xE1jl v\xE9g\xE9n\xE9l"
 
-#: Merge.rc:852
+#: Merge.rc:854
 #, c-format
 msgid "Replace in"
 msgstr "A csere tartom\xE1nya"
 
-#: Merge.rc:853
+#: Merge.rc:855
 #, c-format
 msgid "&Selection"
 msgstr "&Kijel\xF6l\xE9s"
 
-#: Merge.rc:855
+#: Merge.rc:857
 #, c-format
 msgid "Wh&ole file"
 msgstr "Teljes &f\xE1jl"
 
-#: Merge.rc:858
+#: Merge.rc:860
 #, c-format
 msgid "&Replace"
 msgstr "&Csere"
 
-#: Merge.rc:859
+#: Merge.rc:861
 #, c-format
 msgid "Replace &All"
 msgstr "&Mindet"
 
-#: Merge.rc:866
-#: Merge.rc:2187
+#: Merge.rc:868
+#: Merge.rc:2189
 #, c-format
 msgid "Rational ClearCase"
-msgstr ""
+msgstr "Rational ClearCase"
 
-#: Merge.rc:869
+#: Merge.rc:871
 #, c-format
 msgid "CheckOut"
 msgstr "Ellen\xF5riz"
 
-#: Merge.rc:874
-#: Merge.rc:1179
+#: Merge.rc:876
+#: Merge.rc:1181
 #, c-format
 msgid "Comments"
 msgstr "Megjegyz\xE9sek"
 
-#: Merge.rc:877
+#: Merge.rc:879
 #, c-format
 msgid "CheckIn after checkout"
 msgstr ""
 
-#: Merge.rc:883
+#: Merge.rc:885
 #, c-format
 msgid "Linefilters"
 msgstr "Sorsz\xFBr\xF5k"
 
-#: Merge.rc:886
+#: Merge.rc:888
 #, c-format
 msgid "Enable Line Filters"
 msgstr ""
 
-#: Merge.rc:889
+#: Merge.rc:891
 #, c-format
 msgid "Regular Expressions (one per line):"
 msgstr "Regul\xE1ris kifejez\xE9sek (soronk\xE9nt egy):"
 
-#: Merge.rc:896
+#: Merge.rc:898
 #, c-format
 msgid "Save"
 msgstr ""
 
-#: Merge.rc:897
+#: Merge.rc:899
 #, c-format
 msgid "New"
-msgstr ""
+msgstr "\xDAj"
 
-#: Merge.rc:898
+#: Merge.rc:900
 #, c-format
 msgid "Edit"
-msgstr ""
+msgstr "Szerkeszt\xE9s"
 
-#: Merge.rc:899
+#: Merge.rc:901
 #, c-format
 msgid "Remove"
-msgstr ""
+msgstr "Elt\xE1vol\xEDt\xE1s"
 
-#: Merge.rc:904
-#: Merge.rc:1944
+#: Merge.rc:906
+#: Merge.rc:1946
 #, c-format
 msgid "Colors"
 msgstr "Sz\xEDnek"
 
-#: Merge.rc:907
+#: Merge.rc:909
 #, c-format
 msgid "Difference:"
 msgstr "Elt\xE9r\xE9s:"
 
-#: Merge.rc:911
+#: Merge.rc:913
 #, c-format
 msgid "Selected Difference:"
 msgstr "Kijel\xF6lt Elt\xE9r\xE9s:"
 
-#: Merge.rc:915
-#: Merge.rc:1569
+#: Merge.rc:917
+#: Merge.rc:1571
 #, c-format
 msgid "Background"
 msgstr "H\xE1tt\xE9r"
 
-#: Merge.rc:916
+#: Merge.rc:918
 #, c-format
 msgid "Deleted"
 msgstr "T\xF6r\xF6lt"
 
-#: Merge.rc:929
-#: Merge.rc:1364
-#: Merge.rc:1570
+#: Merge.rc:931
+#: Merge.rc:1366
+#: Merge.rc:1572
 #, c-format
 msgid "Text"
 msgstr "Sz\xF6veg"
 
-#: Merge.rc:933
+#: Merge.rc:935
 #, c-format
 msgid "Ignored Difference:"
 msgstr "Kihagyott Elt\xE9r\xE9s:"
 
-#: Merge.rc:943
+#: Merge.rc:945
 #, c-format
 msgid "Moved:"
 msgstr "\xC1thelyezett:"
 
-#: Merge.rc:953
+#: Merge.rc:955
 #, c-format
 msgid "Selected Moved:"
 msgstr "Kijel\xF6lt \xE1thelyezett:"
 
-#: Merge.rc:960
+#: Merge.rc:962
 #, c-format
 msgid "Word Difference:"
 msgstr "Sz\xF3 elt\xE9r\xE9s:"
 
-#: Merge.rc:967
+#: Merge.rc:969
 #, c-format
 msgid "Selected Word Diff:"
 msgstr "Kijel\xF6lt sz\xF3 elt\xE9r\xE9s:"
 
-#: Merge.rc:974
-#: Merge.rc:1053
-#: Merge.rc:1082
-#: Merge.rc:1182
-#: Merge.rc:1410
+#: Merge.rc:976
+#: Merge.rc:1055
+#: Merge.rc:1084
+#: Merge.rc:1184
+#: Merge.rc:1412
 #, c-format
 msgid "Defaults"
 msgstr "Alap\xE9rt\xE9kek"
 
-#: Merge.rc:980
-#: Merge.rc:1352
-#: Merge.rc:1558
+#: Merge.rc:982
+#: Merge.rc:1354
+#: Merge.rc:1560
 #, c-format
 msgid "Dialog"
 msgstr "K\xE9rd\xE9s"
 
-#: Merge.rc:990
-#: Merge.rc:1947
+#: Merge.rc:992
+#: Merge.rc:1949
 #, c-format
 msgid "System"
 msgstr "Rendszer"
 
-#: Merge.rc:993
+#: Merge.rc:995
 #, c-format
 msgid "&Send deleted files to Recycle Bin"
 msgstr "A t\xF6r\xF6lt f\xE1jlok a &Lomt\xE1rba ker\xFCljenek"
 
-#: Merge.rc:995
+#: Merge.rc:997
 #, c-format
 msgid "&External editor:"
 msgstr "&Bels\xF5 szerkeszt\xF5:"
 
-#: Merge.rc:998
+#: Merge.rc:1000
 #, c-format
 msgid "&Filter folder:"
 msgstr ""
 
-#: Merge.rc:1000
+#: Merge.rc:1002
 #, c-format
 msgid "B&rowse..."
-msgstr ""
+msgstr "Tall\xF3z..."
 
-#: Merge.rc:1001
+#: Merge.rc:1003
 #, c-format
 msgid "Temporary files folder"
-msgstr ""
+msgstr "\xC1tmeneti f\xE1jlok k\xF6nyvt\xE1ra"
 
-#: Merge.rc:1002
+#: Merge.rc:1004
 #, c-format
 msgid "S&ystem's temp folder"
-msgstr ""
+msgstr "A rendszer temp k\xF6nyvt\xE1ra"
 
-#: Merge.rc:1004
+#: Merge.rc:1006
 #, c-format
 msgid "C&ustom folder:"
-msgstr ""
+msgstr "Egyedi k\xF6nyvt\xE1r:"
 
-#: Merge.rc:1007
-#: Merge.rc:1023
+#: Merge.rc:1009
+#: Merge.rc:1025
 #, c-format
 msgid "Br&owse..."
 msgstr "T&all\xF3z\xE1s..."
 
-#: Merge.rc:1013
+#: Merge.rc:1015
 #, c-format
 msgid "Patch Generator"
 msgstr "Patch Gener\xE1tor"
 
-#: Merge.rc:1016
+#: Merge.rc:1018
 #, c-format
 msgid "File&1:"
 msgstr "F\xE1jl&1:"
 
-#: Merge.rc:1020
+#: Merge.rc:1022
 #, c-format
 msgid "File&2:"
 msgstr "F\xE1jl&2:"
 
-#: Merge.rc:1024
+#: Merge.rc:1026
 #, c-format
 msgid "&Swap"
 msgstr "&Megford\xEDt\xE1s"
 
-#: Merge.rc:1025
+#: Merge.rc:1027
 #, c-format
 msgid "&Append to existing file"
 msgstr "&Hozz\xE1f\xFBz\xE9s a l\xE9tez\xF5 f\xE1jlhoz"
 
-#: Merge.rc:1027
+#: Merge.rc:1029
 #, c-format
 msgid "&Result:"
 msgstr "&Eredm\xE9ny:"
 
-#: Merge.rc:1031
+#: Merge.rc:1033
 #, c-format
 msgid "&Format"
 msgstr "&Form\xE1tum"
 
-#: Merge.rc:1032
+#: Merge.rc:1034
 #, c-format
 msgid "St&yle:"
 msgstr "St&\xEDlus:"
 
-#: Merge.rc:1035
+#: Merge.rc:1037
 #, c-format
 msgid "&Context:"
 msgstr "&K\xF6rnyezet:"
 
-#: Merge.rc:1038
+#: Merge.rc:1040
 #, c-format
 msgid "W&hitespaces"
 msgstr "&Sz\xF3k\xF6z\xF6k"
 
-#: Merge.rc:1039
+#: Merge.rc:1041
 #, c-format
 msgid "Com&pare"
 msgstr "&\xD6sszehasonl\xEDt"
 
-#: Merge.rc:1041
+#: Merge.rc:1043
 #, c-format
 msgid "I&gnore changes"
 msgstr "&V\xE1ltoz\xE1sok kihagy\xE1sa"
 
-#: Merge.rc:1043
+#: Merge.rc:1045
 #, c-format
 msgid "Ig&nore all"
 msgstr "Minden kihagy\xE1sa"
 
-#: Merge.rc:1045
+#: Merge.rc:1047
 #, c-format
 msgid "Ignor&e blank lines"
 msgstr "\xDCres sorok kihagy\xE1sa"
 
-#: Merge.rc:1047
+#: Merge.rc:1049
 #, c-format
 msgid "Case sensi&tive"
 msgstr "&Kis-nagybet\xFB \xE9rz\xE9kenys\xE9g"
 
-#: Merge.rc:1049
+#: Merge.rc:1051
 #, c-format
 msgid "Inclu&de command line"
 msgstr "&Parancssor mell\xE9kel\xE9se"
 
-#: Merge.rc:1051
+#: Merge.rc:1053
 #, c-format
 msgid "Open to e&xternal editor"
 msgstr "Megnyit\xE1s a &Bels\xF5 Szerkeszt\xF5vel"
 
-#: Merge.rc:1073
+#: Merge.rc:1075
 #, c-format
 msgid "Display Columns"
 msgstr "Oszlopok mutat\xE1sa"
 
-#: Merge.rc:1079
+#: Merge.rc:1081
 #, c-format
 msgid "Move &Up"
-msgstr ""
+msgstr "Mozgat\xE1s fel"
 
-#: Merge.rc:1080
+#: Merge.rc:1082
 #, c-format
 msgid "Move &Down"
-msgstr ""
+msgstr "Mozgat\xE1s le"
 
-#: Merge.rc:1090
+#: Merge.rc:1092
 #, c-format
 msgid "Select Unpacker"
 msgstr "Kicsomagol\xF3 kiv\xE1laszt\xE1sa"
 
-#: Merge.rc:1095
+#: Merge.rc:1097
 #, c-format
 msgid "File unpacker:"
 msgstr "F\xE1jl kicsomagol\xF3:"
 
-#: Merge.rc:1098
+#: Merge.rc:1100
 #, c-format
 msgid "Display all unpackers, don't check the extension"
 msgstr "Minden kicsomagol\xF3 mutat\xE1sa kiterjeszt\xE9st\xF5l f\xFCggetlen\xFCl"
 
-#: Merge.rc:1101
+#: Merge.rc:1103
 #, c-format
 msgid "Extensions list:"
 msgstr "Kiterjeszt\xE9sek list\xE1ja:"
 
-#: Merge.rc:1102
+#: Merge.rc:1104
 #, c-format
 msgid "Description:"
 msgstr "Le\xEDr\xE1s:"
 
-#: Merge.rc:1113
+#: Merge.rc:1115
 #, c-format
 msgid " Folder Compare Progress"
-msgstr ""
+msgstr " K\xF6nyvt\xE1r \xF6sszehasonl\xEDt\xE1s folyamata"
 
-#: Merge.rc:1116
-#: Merge.rc:1894
+#: Merge.rc:1118
+#: Merge.rc:1896
 #, c-format
 msgid "Stop"
 msgstr "Le\xE1ll\xEDt\xE1s"
 
-#: Merge.rc:1121
+#: Merge.rc:1123
 #, c-format
 msgid "Comparing items..."
-msgstr ""
+msgstr "Elemek \xF6sszehasonl\xEDt\xE1sa..."
 
-#: Merge.rc:1122
+#: Merge.rc:1124
 #, c-format
 msgid "Items compared:"
-msgstr ""
+msgstr "\xD6sszehasonl\xEDtott elemek:"
 
-#: Merge.rc:1123
+#: Merge.rc:1125
 #, c-format
 msgid "Items total:"
-msgstr ""
+msgstr "\xD6sszes elem:"
 
-#: Merge.rc:1129
+#: Merge.rc:1131
 #, c-format
 msgid "Go To"
 msgstr "Ugr\xE1s"
 
-#: Merge.rc:1132
+#: Merge.rc:1134
 #, c-format
 msgid "G&oto:"
 msgstr "U&gr\xE1s:"
 
-#: Merge.rc:1134
+#: Merge.rc:1136
 #, c-format
 msgid "File"
 msgstr "F\xE1jl"
 
-#: Merge.rc:1139
+#: Merge.rc:1141
 #, c-format
 msgid "Goto what"
 msgstr "Mire ugorjon:"
 
-#: Merge.rc:1140
+#: Merge.rc:1142
 #, c-format
 msgid "Li&ne"
 msgstr "&Sorra"
 
-#: Merge.rc:1142
+#: Merge.rc:1144
 #, c-format
 msgid "&Difference"
 msgstr "&Elt\xE9r\xE9sre"
 
-#: Merge.rc:1144
+#: Merge.rc:1146
 #, c-format
 msgid "&Go To"
 msgstr "&Ugr\xE1s"
 
-#: Merge.rc:1150
-#: Merge.rc:1942
+#: Merge.rc:1152
+#: Merge.rc:1944
 #, c-format
 msgid "Compare"
 msgstr "\xD6sszehasonl\xEDt\xE1s"
 
-#: Merge.rc:1153
+#: Merge.rc:1155
 #, c-format
 msgid "Whitespace"
 msgstr "Sz\xF3k\xF6z\xF6k"
 
-#: Merge.rc:1154
+#: Merge.rc:1156
 #, c-format
 msgid "&Compare"
 msgstr "&\xD6sszehasonl\xEDt\xE1s"
 
-#: Merge.rc:1156
+#: Merge.rc:1158
 #, c-format
 msgid "&Ignore change"
 msgstr "&V\xE1ltoztat\xE1sok kihagy\xE1sa"
 
-#: Merge.rc:1158
+#: Merge.rc:1160
 #, c-format
 msgid "I&gnore all"
 msgstr "&Minden kihagy\xE1sa"
 
-#: Merge.rc:1160
+#: Merge.rc:1162
 #, c-format
 msgid "Ignore blan&k lines"
 msgstr "&\xDCres sorok kihagy\xE1sa"
 
-#: Merge.rc:1162
+#: Merge.rc:1164
 #, c-format
 msgid "Ignore &case"
 msgstr "&Kis-nagybet\xFB k\xFCl\xF6nbs\xE9gek kihagy\xE1sa"
 
-#: Merge.rc:1164
+#: Merge.rc:1166
 #, c-format
 msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "Sorv\xE9g k\xFCl\xF6nbs\xE9gek figyelmen k\xEDv\xFCl hagy\xE1sa (Windows/Unix/Mac)"
 
-#: Merge.rc:1167
+#: Merge.rc:1169
 #, c-format
 msgid "E&nable moved block detection"
 msgstr "Mozgatott &blokk \xE9szlel\xE9s bekapcsol\xE1sa"
 
-#: Merge.rc:1169
+#: Merge.rc:1171
 #, c-format
 msgid "&Match similar lines"
 msgstr ""
 
-#: Merge.rc:1171
+#: Merge.rc:1173
 #, c-format
 msgid "Ign&ore time differences less than 3 seconds"
-msgstr ""
+msgstr "3 m\xE1sodperc alatti id\xF5k\xFCl\xF6nbs\xE9gek mell\xF5z\xE9se"
 
-#: Merge.rc:1174
+#: Merge.rc:1176
 #, c-format
 msgid "&File Compare method:"
-msgstr "&F\xE1jl \xF6sszehasonl\xEDt\xE1si m\xF3dszer:"
+msgstr ""
 
-#: Merge.rc:1177
+#: Merge.rc:1179
 #, c-format
 msgid "S&top after first difference"
 msgstr "Meg\xE1ll\xE1s az &els\xF5 k\xFCl\xF6nbs\xE9gn\xE9l"
 
-#: Merge.rc:1180
+#: Merge.rc:1182
 #, c-format
 msgid "Filter Comments"
 msgstr ""
 
-#: Merge.rc:1187
-#: Merge.rc:1943
+#: Merge.rc:1189
+#: Merge.rc:1945
 #, c-format
 msgid "Editor"
 msgstr "Szerkeszt\xF5"
 
-#: Merge.rc:1190
+#: Merge.rc:1192
 #, c-format
 msgid "&Highlight syntax"
 msgstr "&Szintaxis kiemel\xE9s"
 
-#: Merge.rc:1192
+#: Merge.rc:1194
 #, c-format
 msgid "&Automatic rescan"
 msgstr "&Automatikus \xFAjraolvas\xE1s"
 
-#: Merge.rc:1194
+#: Merge.rc:1196
 #, c-format
 msgid "&Preserve original EOL chars"
 msgstr "&Eredeti \xFAjsor-karakterek meg\xF5rz\xE9se"
 
-#: Merge.rc:1196
+#: Merge.rc:1198
 #, c-format
 msgid "Tabs"
 msgstr "Tabul\xE1torok"
 
-#: Merge.rc:1197
+#: Merge.rc:1199
 #, c-format
 msgid "&Tab size:"
 msgstr "Tab. &m\xE9rete:"
 
-#: Merge.rc:1200
+#: Merge.rc:1202
 #, c-format
 msgid "&Insert Tabs"
 msgstr "&Tabul\xE1torok haszn\xE1lata"
 
-#: Merge.rc:1202
+#: Merge.rc:1204
 #, c-format
 msgid "Insert &Spaces"
 msgstr "&Sz\xF3k\xF6z\xF6k haszn\xE1lata"
 
-#: Merge.rc:1204
+#: Merge.rc:1206
 #, c-format
 msgid "Line Difference Coloring"
 msgstr "Sorok elt\xE9r\xE9s\xE9nek sz\xEDnez\xE9se"
 
-#: Merge.rc:1206
+#: Merge.rc:1208
 #, c-format
 msgid "View line differences"
 msgstr "Sorok elt\xE9r\xE9s\xE9nek mutat\xE1sa"
 
-#: Merge.rc:1208
+#: Merge.rc:1210
 #, c-format
 msgid "&Character level"
 msgstr ""
 
-#: Merge.rc:1210
+#: Merge.rc:1212
 #, c-format
 msgid "&Word-level:"
 msgstr ""
 
-#: Merge.rc:1225
+#: Merge.rc:1227
 #, c-format
 msgid "Filefilters"
 msgstr "F\xE1jlSz\xFBr\xF5k"
 
-#: Merge.rc:1231
+#: Merge.rc:1233
 #, c-format
 msgid "Test"
 msgstr ""
 
-#: Merge.rc:1232
+#: Merge.rc:1234
 #, c-format
 msgid "Install..."
-msgstr ""
+msgstr "Telep\xEDt\xE9s..."
 
-#: Merge.rc:1233
+#: Merge.rc:1235
 #, c-format
 msgid "New..."
 msgstr "\xDAj..."
 
-#: Merge.rc:1234
+#: Merge.rc:1236
 #, c-format
 msgid "Edit..."
 msgstr "Szerkeszt..."
 
-#: Merge.rc:1235
+#: Merge.rc:1237
 #, c-format
 msgid "Delete..."
 msgstr "T\xF6r\xF6l..."
 
-#: Merge.rc:1241
+#: Merge.rc:1243
 #, c-format
 msgid "Save modified files?"
 msgstr "M\xF3dos\xEDtott f\xE1jlok ment\xE9se?"
 
-#: Merge.rc:1244
+#: Merge.rc:1246
 #, c-format
 msgid "Left side file"
 msgstr "Bal oldali f\xE1jl"
 
-#: Merge.rc:1247
+#: Merge.rc:1249
 #, c-format
 msgid "&Save changes"
 msgstr "&V\xE1ltoztat\xE1sok ment\xE9se"
 
-#: Merge.rc:1249
+#: Merge.rc:1251
 #, c-format
 msgid "&Discard changes"
 msgstr "V\xE1ltoztat\xE1sok &elvet\xE9se"
 
-#: Merge.rc:1251
+#: Merge.rc:1253
 #, c-format
 msgid "Right side file"
 msgstr "Jobb oldali f\xE1jl"
 
-#: Merge.rc:1254
+#: Merge.rc:1256
 #, c-format
 msgid "S&ave changes"
 msgstr "V&\xE1ltoztat\xE1sok ment\xE9se"
 
-#: Merge.rc:1256
+#: Merge.rc:1258
 #, c-format
 msgid "Dis&card changes"
 msgstr "V\xE1ltoztat\xE1sok e&lvet\xE9se"
 
-#: Merge.rc:1258
+#: Merge.rc:1260
 #, c-format
 msgid "Discard All"
-msgstr "Elvet mindent"
+msgstr ""
 
-#: Merge.rc:1265
-#: Merge.rc:1513
-#: Merge.rc:1949
+#: Merge.rc:1267
+#: Merge.rc:1515
+#: Merge.rc:1951
 #, c-format
 msgid "Codepage"
 msgstr "K\xF3dlap"
 
-#: Merge.rc:1268
+#: Merge.rc:1270
 #, c-format
 msgid "Default Codepage"
 msgstr "Alap\xE9rtelmezett k\xF3dlap"
 
-#: Merge.rc:1269
+#: Merge.rc:1271
 #, c-format
 msgid "Select the default codepage assumed when loading non-Unicode files:"
 msgstr "V\xE1laszd ki az alap\xE9rtelmezett k\xF3dlapot a nem-Unicode f\xE1jlokhoz:"
 
-#: Merge.rc:1271
+#: Merge.rc:1273
 #, c-format
 msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
-msgstr ""
+msgstr "K\xF3dlap inform\xE1ci\xF3 detekt\xE1l\xE1sa ezen f\xE1jlokn\xE1l: .html, .rc, .xml \nprogram \xFAjraind\xEDt\xE1s sz\xFCks\xE9ges"
 
-#: Merge.rc:1274
+#: Merge.rc:1276
 #, c-format
 msgid "System codepage"
 msgstr "Rendszer k\xF3dlap"
 
-#: Merge.rc:1276
+#: Merge.rc:1278
 #, c-format
 msgid "According to WinMerge User Interface"
 msgstr "A Winmerge felhaszn\xE1l\xF3i fel\xFClet\xE9hez igazodva"
 
-#: Merge.rc:1278
+#: Merge.rc:1280
 #, c-format
 msgid "Custom codepage:"
-msgstr ""
+msgstr "Egyedi k\xF3dlap:"
 
-#: Merge.rc:1286
+#: Merge.rc:1288
 #, c-format
 msgid "WinMerge - Archive support disabled"
 msgstr "WinMerge - Arch\xEDvum t\xE1mogat\xE1s letiltva"
 
-#: Merge.rc:1289
+#: Merge.rc:1291
 #, c-format
 msgid "Unable to detect 7-Zip version (not installed?)"
 msgstr "Nem ismerhet\xF5 fel a 7-Zip verzi\xF3ja (nincs telep\xEDtve?)"
 
-#: Merge.rc:1292
+#: Merge.rc:1294
 #, c-format
 msgid ""
 "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
@@ -2059,12 +2060,12 @@
 "Az Arch\xEDvum t\xE1mogat\xE1s a 7-Zip 3.11-es vagy \xFAjabb verzi\xF3j\xE1t ig\xE9nyli, melynek telep\xEDtve kell lennie a helyi g\xE9pen, vagy a\n"
 "sz\xFCks\xE9ges komponenseknek megtal\xE1lhat\xF3aknak kell lenni\xFCk a program k\xF6nyvt\xE1r\xE1ban."
 
-#: Merge.rc:1294
+#: Merge.rc:1296
 #, c-format
 msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
 msgstr "Sz\xFCks\xE9ges tov\xE1bb\xE1 egy megfelel\xF5 fel\xFCleti b\xF5v\xEDtm\xE9ny (Merge7z*.dll) az \xFAtvonalban."
 
-#: Merge.rc:1296
+#: Merge.rc:1298
 #, c-format
 msgid ""
 "Please use the version of 7-Zip recommended below until interface plugins for later\n"
@@ -2073,12 +2074,12 @@
 "K\xE9rlek haszn\xE1ld a 7-Zip lentebb megjel\xF6lt verzi\xF3j\xE1t, am\xEDg a fel\xFCleti b\xF5v\xEDtm\xE9ny \xFAjabb\n"
 "verzi\xF3ja meg nem jelenik."
 
-#: Merge.rc:1298
+#: Merge.rc:1300
 #, c-format
 msgid "Version"
 msgstr "Verzi\xF3"
 
-#: Merge.rc:1300
+#: Merge.rc:1302
 #, c-format
 msgid ""
 "Plugin required\n"
@@ -2087,587 +2088,587 @@
 "Sz\xFCks\xE9ges b\xF5v\xEDtm\xE9ny\n"
 "(dllbuild %04u)"
 
-#: Merge.rc:1302
+#: Merge.rc:1304
 #, c-format
 msgid "Recommended version of 7-Zip:"
 msgstr "A 7-Zip javasolt verzi\xF3ja:"
 
-#: Merge.rc:1305
-#: Merge.rc:1308
+#: Merge.rc:1307
+#: Merge.rc:1310
 #, c-format
 msgid "present"
 msgstr "megvan"
 
-#: Merge.rc:1306
+#: Merge.rc:1308
 #, c-format
 msgid "Merge7z000U.dll"
 msgstr ""
 
-#: Merge.rc:1309
+#: Merge.rc:1311
 #, c-format
 msgid "7-Zip software installed on your computer:"
 msgstr "A sz\xE1m\xEDt\xF3g\xE9pen telep\xEDtett 7-Zip szoftver:"
 
-#: Merge.rc:1311
-#: Merge.rc:1316
+#: Merge.rc:1313
+#: Merge.rc:1318
 #, c-format
 msgid "none"
 msgstr "nincs"
 
-#: Merge.rc:1313
+#: Merge.rc:1315
 #, c-format
 msgid "missing"
 msgstr "hi\xE1nyzik"
 
-#: Merge.rc:1314
+#: Merge.rc:1316
 #, c-format
 msgid "7-Zip components for standalone operation:"
 msgstr "Az \xF6n\xE1ll\xF3 m\xFBk\xF6d\xE9shez sz\xFCks\xE9ges 7-Zip komponensek:"
 
-#: Merge.rc:1318
+#: Merge.rc:1320
 #, c-format
 msgid "outdated"
 msgstr "lej\xE1rt"
 
-#: Merge.rc:1319
+#: Merge.rc:1321
 #, c-format
 msgid "Plugins on path:"
 msgstr "El\xE9rhet\xF5 b\xF5v\xEDtm\xE9nyek:"
 
-#: Merge.rc:1320
+#: Merge.rc:1322
 #, c-format
 msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
-msgstr ""
+msgstr "Ne jelenjen &meg \xFAjra ez az \xFCzenet.\n(A S\xFAg\xF3 men\xFCb\xF5l az \xFCzenet b\xE1rmikor \xFAjra bekapcsolhat\xF3.)"
 
-#: Merge.rc:1324
+#: Merge.rc:1326
 #, c-format
 msgid "Plugin Download"
 msgstr "B\xF5v\xEDtm\xE9ny let\xF6lt\xE9se"
 
-#: Merge.rc:1333
+#: Merge.rc:1335
 #, c-format
 msgid "Options"
 msgstr "Opci\xF3k"
 
-#: Merge.rc:1344
+#: Merge.rc:1346
 #, c-format
 msgid " Categories"
 msgstr " Kateg\xF3ri\xE1k"
 
-#: Merge.rc:1346
+#: Merge.rc:1348
 #, c-format
 msgid "Import..."
-msgstr ""
+msgstr "Import\xE1l\xE1s..."
 
-#: Merge.rc:1347
+#: Merge.rc:1349
 #, c-format
 msgid "Export..."
-msgstr ""
+msgstr "Export\xE1l\xE1s..."
 
-#: Merge.rc:1355
+#: Merge.rc:1357
 #, c-format
 msgid "Keywords:"
 msgstr "Kulcsszavak:"
 
-#: Merge.rc:1356
+#: Merge.rc:1358
 #, c-format
 msgid "Function names:"
 msgstr "F\xFCggv\xE9ny nevek:"
 
-#: Merge.rc:1357
+#: Merge.rc:1359
 #, c-format
 msgid "Comments:"
 msgstr "Megjegyz\xE9sek:"
 
-#: Merge.rc:1358
+#: Merge.rc:1360
 #, c-format
 msgid "Numbers:"
 msgstr "Sz\xE1mok:"
 
-#: Merge.rc:1359
+#: Merge.rc:1361
 #, c-format
 msgid "Operators:"
 msgstr "Oper\xE1torok:"
 
-#: Merge.rc:1360
+#: Merge.rc:1362
 #, c-format
 msgid "Strings:"
 msgstr "Sztringek:"
 
-#: Merge.rc:1361
+#: Merge.rc:1363
 #, c-format
 msgid "Preprocessor:"
 msgstr "El\xF5feldolgoz\xF3:"
 
-#: Merge.rc:1362
+#: Merge.rc:1364
 #, c-format
 msgid "User 1:"
 msgstr "Felhaszn\xE1l\xF3 1:"
 
-#: Merge.rc:1363
+#: Merge.rc:1365
 #, c-format
 msgid "User 2:"
 msgstr "Felhaszn\xE1l\xF3 2:"
 
-#: Merge.rc:1368
-#: Merge.rc:1373
-#: Merge.rc:1378
-#: Merge.rc:1383
-#: Merge.rc:1388
-#: Merge.rc:1393
-#: Merge.rc:1398
-#: Merge.rc:1403
-#: Merge.rc:1408
+#: Merge.rc:1370
+#: Merge.rc:1375
+#: Merge.rc:1380
+#: Merge.rc:1385
+#: Merge.rc:1390
+#: Merge.rc:1395
+#: Merge.rc:1400
+#: Merge.rc:1405
+#: Merge.rc:1410
 #, c-format
 msgid "Bold"
 msgstr "F\xE9lk\xF6v\xE9r"
 
-#: Merge.rc:1416
+#: Merge.rc:1418
 #, c-format
 msgid "Folder Compare Report"
 msgstr "K\xF6nyvt\xE1r \xF6sszehason\xEDt\xE1si jelent\xE9s"
 
-#: Merge.rc:1419
+#: Merge.rc:1421
 #, c-format
 msgid "Report &File:"
 msgstr "Jelent\xE9s &f\xE1jl:"
 
-#: Merge.rc:1422
-#: Merge.rc:1596
-#: Merge.rc:1600
-#: Merge.rc:1627
+#: Merge.rc:1424
+#: Merge.rc:1598
+#: Merge.rc:1602
+#: Merge.rc:1629
 #, c-format
 msgid "Browse..."
 msgstr "Tall\xF3z\xE1s..."
 
-#: Merge.rc:1423
+#: Merge.rc:1425
 #, c-format
 msgid "&Style:"
 msgstr "&St\xEDlus:"
 
-#: Merge.rc:1426
+#: Merge.rc:1428
 #, c-format
 msgid "&Copy to Clipboard"
-msgstr ""
+msgstr "M\xE1sol\xE1s v\xE1g\xF3lapra"
 
-#: Merge.rc:1434
+#: Merge.rc:1436
 #, c-format
 msgid "Shared or Private Filter"
 msgstr "Megosztott vagy saj\xE1t sz\xFBr\xF5"
 
-#: Merge.rc:1437
+#: Merge.rc:1439
 #, c-format
 msgid "Which type of filter do you want to create?"
 msgstr "Milyen t\xEDpus\xFA sz\xFBr\xF5t szeretn\xE9l l\xE9trehozni?"
 
-#: Merge.rc:1439
+#: Merge.rc:1441
 #, c-format
 msgid "Shared Filter (for all users on this machine)"
 msgstr "Megosztott sz\xFBr\xF5 (a g\xE9p minden felhaszn\xE1l\xF3j\xE1nak)"
 
-#: Merge.rc:1441
+#: Merge.rc:1443
 #, c-format
 msgid "Private Filter (only for current user)"
 msgstr "Saj\xE1t sz\xFBr\xF5 (csak a jelenlegi felhaszn\xE1l\xF3nak)"
 
-#: Merge.rc:1449
-#: Merge.rc:1950
+#: Merge.rc:1451
+#: Merge.rc:1952
 #, c-format
 msgid "Archive Support"
 msgstr "Arch\xEDvum t\xE1mogat\xE1s"
 
-#: Merge.rc:1452
+#: Merge.rc:1454
 #, c-format
 msgid "Archive support requires 7-Zip plugin installed:"
 msgstr "Az arch\xEDvum t\xE1mogat\xE1shoz a 7-Zip b\xF5v\xEDtm\xE9ny telep\xEDt\xE9se sz\xFCks\xE9ges:"
 
-#: Merge.rc:1454
+#: Merge.rc:1456
 #, c-format
 msgid "Download 7-zip Plugin"
 msgstr "7-Zip b\xF5v\xEDtm\xE9ny let\xF6lt\xE9se"
 
-#: Merge.rc:1455
+#: Merge.rc:1457
 #, c-format
 msgid "&Enable archive file support"
 msgstr "Arch\xEDv f\xE1jlok t\xE1mogat\xE1s\xE1nak &enged\xE9lyez\xE9se"
 
-#: Merge.rc:1457
+#: Merge.rc:1459
 #, c-format
 msgid "&Use stand-alone 7-Zip if available"
 msgstr "&Haszn\xE1lja a k\xFCl\xF6n\xE1ll\xF3 7-Zip programot, ha el\xE9rhet\xF5"
 
-#: Merge.rc:1460
+#: Merge.rc:1462
 #, c-format
 msgid "U&se local 7-Zip from WinMerge folder"
 msgstr "H&aszn\xE1lja a helyi 7-Zip programot a WinMerge mapp\xE1j\xE1ban"
 
-#: Merge.rc:1462
+#: Merge.rc:1464
 #, c-format
 msgid "&Detect archive type from file signature"
 msgstr "Arch\xEDv f\xE1jl t\xEDpus\xE1nak meg\xE1llap\xEDt\xE1sa a f\xE1jl &szignat\xFAr\xE1ja alapj\xE1n"
 
-#: Merge.rc:1470
+#: Merge.rc:1472
 #, c-format
 msgid "Compare Statistics"
-msgstr ""
+msgstr "\xD6sszehasonl\xEDt\xE1si statisztika"
 
-#: Merge.rc:1473
+#: Merge.rc:1475
 #, c-format
 msgid "Folders:"
-msgstr ""
+msgstr "K\xF6nyvt\xE1rak:"
 
-#: Merge.rc:1474
+#: Merge.rc:1476
 #, c-format
 msgid "Files:"
-msgstr ""
+msgstr "F\xE1jlok:"
 
-#: Merge.rc:1475
-#: Merge.rc:2341
+#: Merge.rc:1477
+#: Merge.rc:2343
 #, c-format
 msgid "Different"
 msgstr "K\xFCl\xF6nb\xF6z\xF5"
 
-#: Merge.rc:1476
+#: Merge.rc:1478
 #, c-format
 msgid "Text:"
-msgstr ""
+msgstr "Sz\xF6veg:"
 
-#: Merge.rc:1479
-#: Merge.rc:1498
+#: Merge.rc:1481
+#: Merge.rc:1500
 #, c-format
 msgid "Binary:"
-msgstr ""
+msgstr "Bin\xE1ris:"
 
-#: Merge.rc:1482
+#: Merge.rc:1484
 #, c-format
 msgid "Unique"
 msgstr ""
 
-#: Merge.rc:1483
+#: Merge.rc:1485
 #, c-format
 msgid "Left:"
-msgstr ""
+msgstr "Bal:"
 
-#: Merge.rc:1488
+#: Merge.rc:1490
 #, c-format
 msgid "Right:"
-msgstr ""
+msgstr "Jobb:"
 
-#: Merge.rc:1493
-#: Merge.rc:2335
+#: Merge.rc:1495
+#: Merge.rc:2337
 #, c-format
 msgid "Identical"
 msgstr "Egyez\xF5"
 
-#: Merge.rc:1502
+#: Merge.rc:1504
 #, c-format
 msgid "Total:"
-msgstr ""
+msgstr "\xD6sszesen:"
 
-#: Merge.rc:1507
+#: Merge.rc:1509
 #, c-format
 msgid "Close"
-msgstr ""
+msgstr "Bez\xE1r"
 
-#: Merge.rc:1516
+#: Merge.rc:1518
 #, c-format
 msgid "Affects"
 msgstr ""
 
-#: Merge.rc:1519
-#: Merge.rc:1522
+#: Merge.rc:1521
+#: Merge.rc:1524
 #, c-format
 msgid "(Affects)"
 msgstr ""
 
-#: Merge.rc:1523
+#: Merge.rc:1525
 #, c-format
 msgid "Select Codepage for"
-msgstr ""
+msgstr "K\xF3dlap kiv\xE1laszt\xE1sa"
 
-#: Merge.rc:1524
+#: Merge.rc:1526
 #, c-format
 msgid "&File Loading:"
-msgstr ""
+msgstr "F\xE1jl t\xF6lt\xE9se:"
 
-#: Merge.rc:1526
-#: Merge.rc:1529
+#: Merge.rc:1528
+#: Merge.rc:1531
 #, c-format
 msgid "..."
-msgstr ""
+msgstr "..."
 
-#: Merge.rc:1527
+#: Merge.rc:1529
 #, c-format
 msgid "File &Saving:"
-msgstr ""
+msgstr "F\xE1jl ment\xE9&se:"
 
-#: Merge.rc:1530
+#: Merge.rc:1532
 #, c-format
 msgid "&Use same codepage for both"
-msgstr ""
+msgstr "&Ugyanazon k\xF3dlap haszn\xE1lata mindkett\xF5h\xF6z"
 
-#: Merge.rc:1533
+#: Merge.rc:1535
 #, c-format
 msgid "&Apply"
-msgstr ""
+msgstr "&Alkalmaz"
 
-#: Merge.rc:1534
-#: Merge.rc:1916
+#: Merge.rc:1536
+#: Merge.rc:1918
 #, c-format
 msgid "&Cancel"
 msgstr "&M\xE9gsem"
 
-#: Merge.rc:1539
+#: Merge.rc:1541
 #, c-format
 msgid "Test Filter"
 msgstr ""
 
-#: Merge.rc:1542
+#: Merge.rc:1544
 #, c-format
 msgid "Testing filter ..."
 msgstr ""
 
-#: Merge.rc:1544
+#: Merge.rc:1546
 #, c-format
 msgid "&Enter text to test:"
 msgstr ""
 
-#: Merge.rc:1546
+#: Merge.rc:1548
 #, c-format
 msgid "&Folder Name"
-msgstr ""
+msgstr "K\xF6nyvt\xE1r neve"
 
-#: Merge.rc:1548
+#: Merge.rc:1550
 #, c-format
 msgid "Result:"
-msgstr ""
+msgstr "Eredm\xE9ny:"
 
-#: Merge.rc:1552
+#: Merge.rc:1554
 #, c-format
 msgid "&Test"
 msgstr ""
 
-#: Merge.rc:1553
+#: Merge.rc:1555
 #, c-format
 msgid "&Close"
-msgstr ""
+msgstr "Bez\xE1r"
 
-#: Merge.rc:1561
+#: Merge.rc:1563
 #, c-format
 msgid "&Use customized text colors"
-msgstr ""
+msgstr "Egy\xE9ni sz\xF6vegsz\xEDnek haszn\xE1lata"
 
-#: Merge.rc:1564
+#: Merge.rc:1566
 #, c-format
 msgid "Custom text colors"
-msgstr ""
+msgstr "Egy\xE9ni sz\xF6vegsz\xEDnek"
 
-#: Merge.rc:1566
+#: Merge.rc:1568
 #, c-format
 msgid "Whitespace:"
-msgstr ""
+msgstr "Sz\xF3k\xF6z, tab:"
 
-#: Merge.rc:1567
+#: Merge.rc:1569
 #, c-format
 msgid "Regular text:"
-msgstr ""
+msgstr "Sima sz\xF6veg:"
 
-#: Merge.rc:1568
+#: Merge.rc:1570
 #, c-format
 msgid "Selection:"
-msgstr ""
+msgstr "Kijel\xF6l\xE9s:"
 
-#: Merge.rc:1591
+#: Merge.rc:1593
 #, c-format
 msgid "Paths"
 msgstr ""
 
-#: Merge.rc:1597
+#: Merge.rc:1599
 #, c-format
 msgid "R&ead-only"
-msgstr ""
+msgstr "Csak olvashat\xF3"
 
-#: Merge.rc:1601
+#: Merge.rc:1603
 #, c-format
 msgid "Re&ad-only"
-msgstr ""
+msgstr "Cs&ak olvashat\xF3"
 
-#: Merge.rc:1607
+#: Merge.rc:1609
 #, c-format
 msgid "Open..."
-msgstr ""
+msgstr "Megnyit\xE1s..."
 
-#: Merge.rc:1608
+#: Merge.rc:1610
 #, c-format
 msgid "Save..."
-msgstr ""
+msgstr "Ment\xE9s..."
 
-#: Merge.rc:1613
-#: Merge.rc:1951
+#: Merge.rc:1615
+#: Merge.rc:1953
 #, c-format
 msgid "Backup Files"
-msgstr ""
+msgstr "Vissza\xE1ll\xEDt\xE1si f\xE1jlok"
 
-#: Merge.rc:1616
+#: Merge.rc:1618
 #, c-format
 msgid "Create backup files in:"
-msgstr ""
+msgstr "Vissza\xE1ll\xEDt\xE1si f\xE1jlok k\xE9sz\xEDt\xE9se itt:"
 
-#: Merge.rc:1621
+#: Merge.rc:1623
 #, c-format
 msgid "Create backup files into:"
-msgstr ""
+msgstr "Vissza\xE1ll\xEDt\xE1si f\xE1jlok k\xE9sz\xEDt\xE9se ide:"
 
-#: Merge.rc:1622
+#: Merge.rc:1624
 #, c-format
 msgid "&Original file's folder"
-msgstr ""
+msgstr "Eredeti f\xE1jl k\xF6nyvt\xE1ra"
 
-#: Merge.rc:1624
+#: Merge.rc:1626
 #, c-format
 msgid "&Global backup folder:"
-msgstr ""
+msgstr "Glob\xE1lis vissza\xE1ll\xEDt\xE1si k\xF6nyvt\xE1r:"
 
-#: Merge.rc:1628
+#: Merge.rc:1630
 #, c-format
 msgid "Backup filename:"
-msgstr ""
+msgstr "Vissza\xE1ll\xEDt\xE1si f\xE1jl neve:"
 
-#: Merge.rc:1629
+#: Merge.rc:1631
 #, c-format
 msgid "&Append .bak -extension"
-msgstr ""
+msgstr ".bak kiterjeszt\xE9s hozz\xE1f\xFBz\xE9se"
 
-#: Merge.rc:1631
+#: Merge.rc:1633
 #, c-format
 msgid "A&ppend timestamp"
-msgstr ""
+msgstr "Id\xF5pecs\xE9t hozz\xE1f\xFBz\xE9se"
 
-#: Merge.rc:1638
-#: Merge.rc:2243
+#: Merge.rc:1640
+#: Merge.rc:2245
 #, c-format
 msgid "Confirm Copy"
-msgstr ""
+msgstr "M\xE1sol\xE1s meger\xF5s\xEDt\xE9se"
 
-#: Merge.rc:1642
+#: Merge.rc:1644
 #, c-format
 msgid "Are you sure you want to copy XXX items?"
-msgstr ""
+msgstr "Biztosan m\xE1solni szeretne XXX elemet?"
 
-#: Merge.rc:1644
+#: Merge.rc:1646
 #, c-format
 msgid "From left"
-msgstr ""
+msgstr "Balr\xF3l"
 
-#: Merge.rc:1647
+#: Merge.rc:1649
 #, c-format
 msgid "To right"
-msgstr ""
+msgstr "Jobbra"
 
-#: Merge.rc:1650
+#: Merge.rc:1652
 #, c-format
 msgid "Yes"
-msgstr ""
+msgstr "Igen"
 
-#: Merge.rc:1651
+#: Merge.rc:1653
 #, c-format
 msgid "No"
-msgstr ""
+msgstr "Nem"
 
-#: Merge.rc:1657
+#: Merge.rc:1659
 #, c-format
 msgid "Plugins"
-msgstr ""
+msgstr "B\xF5v\xEDtm\xE9nyek"
 
-#: Merge.rc:1660
+#: Merge.rc:1662
 #, c-format
 msgid "&Enable plugins"
-msgstr ""
+msgstr "B\xF5v\xEDtm\xE9ny&ek bekapcsol\xE1sa"
 
-#: Merge.rc:1671
-#: Merge.rc:1952
+#: Merge.rc:1673
+#: Merge.rc:1954
 #, c-format
 msgid "Shell Integration"
 msgstr ""
 
-#: Merge.rc:1674
+#: Merge.rc:1676
 #, c-format
 msgid "Explorer"
-msgstr ""
+msgstr "Int\xE9z\xF5"
 
-#: Merge.rc:1675
+#: Merge.rc:1677
 #, c-format
 msgid "E&nable advanced menu"
 msgstr "&B\xF5v\xEDtett men\xFC enged\xE9lyez\xE9se"
 
-#: Merge.rc:1677
+#: Merge.rc:1679
 #, c-format
 msgid "In&clude subfolders by default"
-msgstr ""
+msgstr "Alk\xF6nyvt\xE1rakat is alap\xE9rtelmez\xE9sk\xE9nt"
 
-#: Merge.rc:1679
+#: Merge.rc:1681
 #, c-format
 msgid "&Add to context menu"
-msgstr ""
+msgstr "Hozz\xE1ad\xE1s a helyi men\xFCh\xF6z"
 
-#: Merge.rc:1681
+#: Merge.rc:1683
 #, c-format
 msgid "Folder compare"
-msgstr ""
+msgstr "K\xF6nyvt\xE1r \xF6sszehasonl\xEDt\xE1s"
 
-#: Merge.rc:1682
+#: Merge.rc:1684
 #, c-format
 msgid "Add &Shell menu to context menu"
 msgstr ""
 
 #. StringFileInfo.Block
-#: Merge.rc:1708
+#: Merge.rc:1710
 #, c-format
 msgid "040904e4"
 msgstr "040E04e2"
 
 #. VarFileInfo.Translation
-#: Merge.rc:1724
+#: Merge.rc:1726
 #, c-format
 msgid "0x409, 1252"
 msgstr "0x040E, 1250"
 
-#: Merge.rc:1739
+#: Merge.rc:1741
 #, c-format
 msgid "Ready"
 msgstr "K\xE9sz"
 
-#: Merge.rc:1745
+#: Merge.rc:1747
 #, c-format
 msgid "EXT"
 msgstr ""
 
-#: Merge.rc:1746
+#: Merge.rc:1748
 #, c-format
 msgid "CAP"
 msgstr ""
 
-#: Merge.rc:1747
+#: Merge.rc:1749
 #, c-format
 msgid "NUM"
 msgstr ""
 
-#: Merge.rc:1748
+#: Merge.rc:1750
 #, c-format
 msgid "SCRL"
 msgstr ""
 
-#: Merge.rc:1749
+#: Merge.rc:1751
 #, c-format
 msgid "OVR"
-msgstr ""
+msgstr "\xC1T\xCDR"
 
-#: Merge.rc:1750
+#: Merge.rc:1752
 #, c-format
 msgid "REC"
 msgstr ""
 
-#: Merge.rc:1756
+#: Merge.rc:1758
 #, c-format
 msgid ""
 "Create empty documents\n"
@@ -2676,7 +2677,7 @@
 "\xDAj dokumentumok l\xE9trehoz\xE1sa\n"
 "\xDAj dokumentum (Ctrl+N)"
 
-#: Merge.rc:1757
+#: Merge.rc:1759
 #, c-format
 msgid ""
 "Open an existing document\n"
@@ -2685,7 +2686,7 @@
 "L\xE9tez\xF5 dokumentum megnyit\xE1sa\n"
 "Megnyit\xE1s (Ctrl+O)"
 
-#: Merge.rc:1758
+#: Merge.rc:1760
 #, c-format
 msgid ""
 "Close the active document\n"
@@ -2694,7 +2695,7 @@
 "Az akt\xEDv dokumentum bez\xE1r\xE1sa\n"
 "Bez\xE1r\xE1s"
 
-#: Merge.rc:1759
+#: Merge.rc:1761
 #, c-format
 msgid ""
 "Save the active document\n"
@@ -2703,7 +2704,7 @@
 "Az akt\xEDv dokumentum ment\xE9se\n"
 "Ment\xE9s (Ctrl+S)"
 
-#: Merge.rc:1760
+#: Merge.rc:1762
 #, c-format
 msgid ""
 "Save the active document with a new name\n"
@@ -2712,7 +2713,7 @@
 "Az akt\xEDv dokumntum ment\xE9se \xFAj n\xE9ven\n"
 "Ment\xE9s m\xE9sk\xE9nt"
 
-#: Merge.rc:1761
+#: Merge.rc:1763
 #, c-format
 msgid ""
 "Change the printing options\n"
@@ -2721,7 +2722,7 @@
 "A nyomtat\xE1si be\xE1ll\xEDt\xE1sok megv\xE1ltoztat\xE1sa\n"
 "Oldalbe\xE1ll\xEDt\xE1s"
 
-#: Merge.rc:1762
+#: Merge.rc:1764
 #, c-format
 msgid ""
 "Change the printer and printing options\n"
@@ -2730,7 +2731,7 @@
 "A nyomtat\xF3 \xE9s a nyomtat\xE1si opci\xF3k megv\xE1ltoztat\xE1sa\n"
 "Nyomtat\xF3be\xE1ll\xEDt\xE1s"
 
-#: Merge.rc:1763
+#: Merge.rc:1765
 #, c-format
 msgid ""
 "Print the active document\n"
@@ -2739,7 +2740,7 @@
 "Az akt\xEDv dokumentum nyomtat\xE1sa\n"
 "Nyomtat\xE1s"
 
-#: Merge.rc:1764
+#: Merge.rc:1766
 #, c-format
 msgid ""
 "Display full pages\n"
@@ -2748,27 +2749,27 @@
 "Az oldalak megjelen\xEDt\xE9se\n"
 "Nyomtat\xE1si el\xF5n\xE9zet"
 
-#: Merge.rc:1769
+#: Merge.rc:1771
 #, c-format
 msgid "Make all hidden items visible again"
 msgstr "Minden rejtett elem legyen \xFAjb\xF3l l\xE1that\xF3"
 
-#: Merge.rc:1770
+#: Merge.rc:1772
 #, c-format
 msgid "Toggle tree mode"
-msgstr ""
+msgstr "Fa m\xF3d ki/be"
 
-#: Merge.rc:1771
+#: Merge.rc:1773
 #, c-format
 msgid "Expand all subfolders"
-msgstr ""
+msgstr "Minden alk\xF6nyvt\xE1r kibont\xE1sa"
 
-#: Merge.rc:1772
+#: Merge.rc:1774
 #, c-format
 msgid "Collapse all subfolders"
-msgstr ""
+msgstr "Minden alk\xF6nyvt\xE1r bez\xE1r\xE1sa"
 
-#: Merge.rc:1778
+#: Merge.rc:1780
 #, c-format
 msgid ""
 "Open project file\n"
@@ -2777,39 +2778,41 @@
 "Projekt f\xE1jl megnyit\xE1sa\n"
 "Projekt f\xE1jl (Ctrl+J)"
 
-#: Merge.rc:1779
+#: Merge.rc:1781
 #, c-format
 msgid "Unknown error attempting to open project file"
-msgstr ""
+msgstr "Ismeretlen hiba a projekt f\xE1jl megnyit\xE1sakor"
 
-#: Merge.rc:1780
+#: Merge.rc:1782
 #, c-format
 msgid "Unknown error attempting to save project file"
-msgstr ""
+msgstr "Ismeretlen hiba a projekt f\xE1jl ment\xE9sekor"
 
-#: Merge.rc:1781
+#: Merge.rc:1783
 #, c-format
 msgid "Project File"
-msgstr ""
+msgstr "Projekt f\xE1jl"
 
-#: Merge.rc:1782
+#: Merge.rc:1784
 #, c-format
 msgid "Project file successfully loaded."
-msgstr ""
+msgstr "Projekt f\xE1jl sikeresen bet\xF6ltve."
 
-#: Merge.rc:1783
+#: Merge.rc:1785
 #, c-format
 msgid "Project file successfully saved."
-msgstr ""
+msgstr "Projekt f\xE1jl sikeresen elmentve."
 
-#: Merge.rc:1784
+#: Merge.rc:1786
 #, c-format
 msgid ""
 "Save current paths and options to project file\n"
 "Save Project File"
 msgstr ""
+"Aktu\xE1lis el\xE9r\xE9si utak \xE9s be\xE1ll\xEDt\xE1sok ment\xE9se a projekt f\xE1jlba\n"
+"Projekt f\xE1jl ment\xE9se"
 
-#: Merge.rc:1789
+#: Merge.rc:1791
 #, c-format
 msgid ""
 "Display program information, version number and copyright\n"
@@ -2818,7 +2821,7 @@
 "A programmal kapcsolatos inform\xE1ci\xF3k megjelen\xEDt\xE9se\n"
 "N\xE9vjegy"
 
-#: Merge.rc:1790
+#: Merge.rc:1792
 #, c-format
 msgid ""
 "Quit the application; prompts to save documents\n"
@@ -2827,8 +2830,6 @@
 "A program bez\xE1r\xE1sa; a nem mentett f\xE1jlok elment\xE9s\xE9nek lehet\xF5s\xE9g\xE9vel\n"
 "Kil\xE9p\xE9s"
 
-#: Merge.rc:1796
-#: Merge.rc:1797
 #: Merge.rc:1798
 #: Merge.rc:1799
 #: Merge.rc:1800
@@ -2843,11 +2844,13 @@
 #: Merge.rc:1809
 #: Merge.rc:1810
 #: Merge.rc:1811
+#: Merge.rc:1812
+#: Merge.rc:1813
 #, c-format
 msgid "Open this document"
 msgstr "A dokumentum megnyit\xE1sa"
 
-#: Merge.rc:1816
+#: Merge.rc:1818
 #, c-format
 msgid ""
 "Switch to the next window pane\n"
@@ -2856,7 +2859,7 @@
 "V\xE1lt\xE1s a k\xF6vetkez\xF5 ablak panelj\xE1ra\n"
 "K\xF6vetkez\xF5 panel"
 
-#: Merge.rc:1817
+#: Merge.rc:1819
 #, c-format
 msgid ""
 "Switch back to the previous window pane\n"
@@ -2865,7 +2868,7 @@
 "V\xE1lt\xE1s az el\xF5z\xF5 ablak panelj\xE1ra\n"
 "El\xF5z\xF5 panel"
 
-#: Merge.rc:1823
+#: Merge.rc:1825
 #, c-format
 msgid ""
 "Arrange windows so they overlap\n"
@@ -2874,7 +2877,7 @@
 "Az Ablakok egym\xE1sra helyez\xE9se\n"
 "Ablakok egym\xE1sra elhelyez\xE9se"
 
-#: Merge.rc:1824
+#: Merge.rc:1826
 #, fuzzy, c-format
 msgid ""
 "Arrange windows as non-overlapping tiles horizontally\n"
@@ -2883,7 +2886,7 @@
 "Az ablakok feloszt\xE1sa egym\xE1st nem fed\xF5 m\xF3don\n"
 "Ablakok feloszt\xE1sa"
 
-#: Merge.rc:1825
+#: Merge.rc:1827
 #, fuzzy, c-format
 msgid ""
 "Arrange windows as non-overlapping tiles vertically\n"
@@ -2892,7 +2895,7 @@
 "Az ablakok feloszt\xE1sa egym\xE1st nem fed\xF5 m\xF3don\n"
 "Ablakok feloszt\xE1sa"
 
-#: Merge.rc:1831
+#: Merge.rc:1833
 #, c-format
 msgid ""
 "Copy the selection and put it on the Clipboard\n"
@@ -2901,7 +2904,7 @@
 "A kijel\xF6l\xE9s m\xE1sol\xE1sa a v\xE1g\xF3lapra\n"
 "M\xE1sol\xE1s"
 
-#: Merge.rc:1832
+#: Merge.rc:1834
 #, c-format
 msgid ""
 "Cut the selection and put it on the Clipboard\n"
@@ -2910,7 +2913,7 @@
 "A kijel\xF6l\xE9s kiv\xE1g\xE1sa a v\xE1g\xF3lapra\n"
 "Kiv\xE1g\xE1s"
 
-#: Merge.rc:1833
+#: Merge.rc:1835
 #, c-format
 msgid ""
 "Find the specified text\n"
@@ -2919,7 +2922,7 @@
 "A megadott sz\xF6veg keres\xE9se\n"
 "Keres\xE9s"
 
-#: Merge.rc:1834
+#: Merge.rc:1836
 #, c-format
 msgid ""
 "Insert Clipboard contents\n"
@@ -2928,7 +2931,7 @@
 "A v\xE1g\xF3lap tartalm\xE1nak beilleszt\xE9se\n"
 "Beilleszt\xE9s"
 
-#: Merge.rc:1835
+#: Merge.rc:1837
 #, c-format
 msgid ""
 "Repeat the last action\n"
@@ -2937,7 +2940,7 @@
 "Az utols\xF3 m\xFBvelet megism\xE9tl\xE9se\n"
 "Ism\xE9t"
 
-#: Merge.rc:1836
+#: Merge.rc:1838
 #, c-format
 msgid ""
 "Replace specific text with different text\n"
@@ -2946,7 +2949,7 @@
 "A megadott sz\xF6veg cser\xE9je a k\xEDv\xE1nt \xFAj sz\xF6veggel\n"
 "Csere"
 
-#: Merge.rc:1837
+#: Merge.rc:1839
 #, c-format
 msgid ""
 "Select the entire document\n"
@@ -2955,7 +2958,7 @@
 "A teljes dokumentum kijel\xF6l\xE9se\n"
 "Kijel\xF6l mindent"
 
-#: Merge.rc:1838
+#: Merge.rc:1840
 #, c-format
 msgid ""
 "Undo the last action\n"
@@ -2964,7 +2967,7 @@
 "Az utols\xF3 m\xFBvelet visszavon\xE1sa\n"
 "Visszavon\xE1s (Ctrl+Z)"
 
-#: Merge.rc:1839
+#: Merge.rc:1841
 #, c-format
 msgid ""
 "Redo the previously undone action\n"
@@ -2973,7 +2976,7 @@
 "Az utolj\xE1ra visszavont m\xFBvelet megism\xE9tl\xE9se\n"
 "M\xE9gis (Ctrl+Y)"
 
-#: Merge.rc:1845
+#: Merge.rc:1847
 #, c-format
 msgid ""
 "Show or hide the toolbar\n"
@@ -2982,7 +2985,7 @@
 "Megmutatja vagy elrejti az Eszk\xF6zt\xE1rat\n"
 "Eszk\xF6zt\xE1r"
 
-#: Merge.rc:1846
+#: Merge.rc:1848
 #, c-format
 msgid ""
 "Show or hide the status bar\n"
@@ -2991,69 +2994,69 @@
 "Megmutatja vagy elrejti az \xC1llapotsort\n"
 "\xC1llapotsor"
 
-#: Merge.rc:1847
+#: Merge.rc:1849
 #, c-format
 msgid ""
 "Show or hide the tab bar\n"
 "Toggle TabBar"
 msgstr ""
 
-#: Merge.rc:1848
+#: Merge.rc:1850
 #, c-format
 msgid "Automatically resize panes\nLock Panes"
-msgstr ""
+msgstr "Panelek automatikus \xE1tm\xE9retez\xE9se\nPanelek r\xF6gz\xEDt\xE9se"
 
-#: Merge.rc:1854
+#: Merge.rc:1856
 #, c-format
 msgid "Change the window size"
 msgstr "Az ablak m\xE9ret\xE9nek v\xE1ltoztat\xE1sa"
 
-#: Merge.rc:1855
+#: Merge.rc:1857
 #, c-format
 msgid "Change the window position"
 msgstr "Az ablak poz\xEDci\xF3j\xE1nak v\xE1ltoztat\xE1sa"
 
-#: Merge.rc:1856
+#: Merge.rc:1858
 #, c-format
 msgid "Reduce the window to an icon"
 msgstr "Az ablak ikon\xE1llapotra kicsiny\xEDt\xE9se"
 
-#: Merge.rc:1857
+#: Merge.rc:1859
 #, c-format
 msgid "Enlarge the window to full size"
 msgstr "Az ablak teljes m\xE9ret\xFBv\xE9 t\xE9tele"
 
-#: Merge.rc:1858
+#: Merge.rc:1860
 #, c-format
 msgid "Switch to the next document window"
 msgstr "V\xE1lt\xE1s a k\xF6vetkez\xF5 dokumentum ablak\xE1ra"
 
-#: Merge.rc:1859
+#: Merge.rc:1861
 #, c-format
 msgid "Switch to the previous document window"
 msgstr "V\xE1lt\xE1s az el\xF5z\xF5 dokumentum ablak\xE1ra"
 
-#: Merge.rc:1860
+#: Merge.rc:1862
 #, c-format
 msgid "Close the active window and prompts to save the documents"
 msgstr "Az akt\xEDv ablak bez\xE1r\xE1sa a v\xE1ltoztat\xE1sok ment\xE9s\xE9nek lehet\xF5s\xE9g\xE9vel"
 
-#: Merge.rc:1865
+#: Merge.rc:1867
 #, c-format
 msgid "Restore the window to normal size"
 msgstr "Az ablak vissaz\xE1ll\xEDt\xE1sa az eredeti m\xE9ret\xE9re"
 
-#: Merge.rc:1866
+#: Merge.rc:1868
 #, c-format
 msgid "Activate Task List"
 msgstr "A Feladat Lista aktiv\xE1l\xE1sa"
 
-#: Merge.rc:1867
+#: Merge.rc:1869
 #, c-format
 msgid "Activate this window"
 msgstr "Ennek az ablaknak az aktiv\xE1l\xE1sa"
 
-#: Merge.rc:1873
+#: Merge.rc:1875
 #, c-format
 msgid ""
 "Close print preview mode\n"
@@ -3062,188 +3065,188 @@
 "A Nyomtat\xE1si el\xF5n\xE9zet bez\xE1r\xE1sa\n"
 "Nyomtat\xE1si el\xF5n\xE9zet bez\xE1r\xE1sa"
 
-#: Merge.rc:1880
+#: Merge.rc:1882
 #, c-format
 msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
 msgstr ""
 
-#: Merge.rc:1881
+#: Merge.rc:1883
 #, c-format
 msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
 msgstr ""
 
-#: Merge.rc:1888
+#: Merge.rc:1890
 #, c-format
 msgid "Preserve original EOL chars"
 msgstr "Az eredeti \xFAjsor-karakterek meg\xF5rz\xE9se"
 
-#: Merge.rc:1895
+#: Merge.rc:1897
 #, c-format
 msgid "Press any key"
 msgstr "Nyomj egy billenty\xFBt"
 
-#: Merge.rc:1901
-#: Merge.rc:1902
+#: Merge.rc:1903
+#: Merge.rc:1904
 #, c-format
 msgid "Right click on the path to copy"
 msgstr "Kattints a jobb eg\xE9rgombbal az \xFAtvonalra annak m\xE1sol\xE1s\xE1hoz"
 
-#: Merge.rc:1908
+#: Merge.rc:1910
 #, c-format
 msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
 msgstr ""
 
-#: Merge.rc:1909
+#: Merge.rc:1911
 #, c-format
 msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
 msgstr ""
 
-#: Merge.rc:1915
+#: Merge.rc:1917
 #, c-format
 msgid "&Ok"
 msgstr "&Rendben"
 
-#: Merge.rc:1917
+#: Merge.rc:1919
 #, c-format
 msgid "&Abort"
 msgstr "&Le\xE1ll\xEDt"
 
-#: Merge.rc:1918
+#: Merge.rc:1920
 #, c-format
 msgid "&Retry"
 msgstr "&Ism\xE9t"
 
-#: Merge.rc:1919
+#: Merge.rc:1921
 #, c-format
 msgid "&Ignore"
 msgstr "&Kihagy"
 
-#: Merge.rc:1920
+#: Merge.rc:1922
 #, c-format
 msgid "Ignore &all"
 msgstr "Kihagy M&indent"
 
-#: Merge.rc:1921
+#: Merge.rc:1923
 #, c-format
 msgid "&Yes"
 msgstr "&Igen"
 
-#: Merge.rc:1927
+#: Merge.rc:1929
 #, c-format
 msgid "Yes to &all"
 msgstr "Igen &mindenre"
 
-#: Merge.rc:1928
+#: Merge.rc:1930
 #, c-format
 msgid "&No"
 msgstr "&Nem"
 
-#: Merge.rc:1929
+#: Merge.rc:1931
 #, c-format
 msgid "No to a&ll"
 msgstr "Nem m&indenre"
 
-#: Merge.rc:1930
+#: Merge.rc:1932
 #, c-format
 msgid "&Continue"
 msgstr "&Folytat\xE1s"
 
-#: Merge.rc:1931
+#: Merge.rc:1933
 #, c-format
 msgid "&Skip"
 msgstr "&Kihagy"
 
-#: Merge.rc:1932
+#: Merge.rc:1934
 #, c-format
 msgid "Skip &all"
 msgstr "Kihagy &mindent"
 
-#: Merge.rc:1934
+#: Merge.rc:1936
 #, c-format
 msgid "Don't display this &message again."
 msgstr "&Ne jelenjen meg t\xF6bbet ez az \xFCzenet."
 
-#: Merge.rc:1935
+#: Merge.rc:1937
 #, c-format
 msgid "Don't ask this &question again."
 msgstr "&Ne jelenjen meg t\xF6bbet ez a k\xE9rd\xE9s."
 
-#: Merge.rc:1945
+#: Merge.rc:1947
 #, c-format
 msgid "Syntax colors"
-msgstr "Szintaxis sz\xEDnek"
+msgstr ""
 
-#: Merge.rc:1946
+#: Merge.rc:1948
 #, c-format
 msgid "Text Colors"
 msgstr ""
 
-#: Merge.rc:1948
+#: Merge.rc:1950
 #, c-format
 msgid "Version Control"
 msgstr "Verzi\xF3 Kontroll"
 
-#: Merge.rc:1959
+#: Merge.rc:1961
 #, c-format
 msgid "To:"
 msgstr ""
 
-#: Merge.rc:1960
+#: Merge.rc:1962
 #, c-format
 msgid "From left:"
-msgstr ""
+msgstr "Balr\xF3l:"
 
-#: Merge.rc:1961
+#: Merge.rc:1963
 #, c-format
 msgid "To left:"
-msgstr ""
+msgstr "Jobbra:"
 
-#: Merge.rc:1962
+#: Merge.rc:1964
 #, c-format
 msgid "From right:"
-msgstr ""
+msgstr "Jobbr\xF3l:"
 
-#: Merge.rc:1963
+#: Merge.rc:1965
 #, c-format
 msgid "To right:"
-msgstr ""
+msgstr "Jobbra:"
 
-#: Merge.rc:1969
+#: Merge.rc:1971
 #, c-format
 msgid "Version %1"
 msgstr "Verzi\xF3 %1"
 
-#: Merge.rc:1970
+#: Merge.rc:1972
 #, c-format
 msgid "Unicode"
-msgstr ""
+msgstr "Unicode"
 
-#: Merge.rc:1971
+#: Merge.rc:1973
 #, c-format
 msgid "X64"
-msgstr ""
+msgstr "X64"
 
-#: Merge.rc:1977
+#: Merge.rc:19...
 
[truncated message content]

[Winmerge-svn] SF.net SVN: winmerge:[7523] branches/R2_14

[<sdo...@us...>]

Revision: 7523
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7523&view=rev
Author:   sdottaka
Date:     2011-05-22 14:40:23 +0000 (Sun, 22 May 2011)

Log Message:
-----------
PATCH: [ 2819626 ] Create own options page for folder compare options

backport from rev. 6907

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/Common/PreferencesDlg.cpp
    branches/R2_14/Src/Common/PreferencesDlg.h
    branches/R2_14/Src/Merge.rc
    branches/R2_14/Src/Merge.vcproj
    branches/R2_14/Src/MergeX64.vcproj
    branches/R2_14/Src/PropCompare.cpp
    branches/R2_14/Src/PropCompare.h
    branches/R2_14/Src/resource.h

Added Paths:
-----------
    branches/R2_14/Src/PropCompareFolder.cpp
    branches/R2_14/Src/PropCompareFolder.h

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2011-05-22 13:48:30 UTC (rev 7522)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2011-05-22 14:40:23 UTC (rev 7523)
@@ -16,6 +16,7 @@
     and not showing message (#2827836)
   Allow setting codepage from command line (#2725549)
   Allow giving encoding name as custom codepage (#2813825, #3010934)
+  Add new options dialog panel for folder compare options (#2819626)
   Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed 
     in status bar (#3025855)
   Bugfix: Pane headers not updated after language change (#2923684)

Modified: branches/R2_14/Src/Common/PreferencesDlg.cpp
===================================================================
--- branches/R2_14/Src/Common/PreferencesDlg.cpp	2011-05-22 13:48:30 UTC (rev 7522)
+++ branches/R2_14/Src/Common/PreferencesDlg.cpp	2011-05-22 14:40:23 UTC (rev 7523)
@@ -58,6 +58,7 @@
 , m_pageBackups(regOptions)
 , m_pageVss(regOptions)
 , m_pageShell(regOptions)
+, m_pageCompareFolder(regOptions)
 {
 	UNREFERENCED_PARAMETER(nMenuID);
 }
@@ -100,7 +101,8 @@
 	// For example "General" creates top-level "General" page
 	// and "General>Colors" creates "Colors" sub-page for "General"
 	AddPage(&m_pageGeneral, IDS_OPTIONSPG_GENERAL);
-	AddPage(&m_pageCompare, IDS_OPTIONSPG_COMPARE);
+	AddPage(&m_pageCompare, IDS_OPTIONSPG_COMPARE, IDS_OPTIONSPG_GENCOMPARE);
+	AddPage(&m_pageCompareFolder, IDS_OPTIONSPG_COMPARE, IDS_OPTIONSPG_FOLDERCOMPARE);
 	AddPage(&m_pageEditor, IDS_OPTIONSPG_EDITOR);
 	AddPage(&m_pageMergeColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_MERGECOLORS);
 	AddPage(&m_pageSyntaxColors, IDS_OPTIONSPG_COLORS, IDS_OPTIONSPG_SYNTAXCOLORS);
@@ -260,6 +262,7 @@
 	m_pageSyntaxColors.ReadOptions();
 	m_pageSystem.ReadOptions();
 	m_pageCompare.ReadOptions();
+	m_pageCompareFolder.ReadOptions();
 	m_pageEditor.ReadOptions();
 	m_pageCodepage.ReadOptions();
 	m_pageVss.ReadOptions();
@@ -275,6 +278,7 @@
 		SafeUpdatePage(&m_pageSyntaxColors, FALSE);
 		SafeUpdatePage(&m_pageSystem, FALSE);
 		SafeUpdatePage(&m_pageCompare, FALSE);
+		SafeUpdatePage(&m_pageCompareFolder, FALSE);
 		SafeUpdatePage(&m_pageEditor, FALSE);
 		SafeUpdatePage(&m_pageCodepage, FALSE);
 		SafeUpdatePage(&m_pageVss, FALSE);
@@ -292,6 +296,7 @@
 	m_pageGeneral.WriteOptions();
 	m_pageSystem.WriteOptions();
 	m_pageCompare.WriteOptions();
+	m_pageCompareFolder.WriteOptions();
 	m_pageEditor.WriteOptions();
 	m_pageMergeColors.WriteOptions();
 	m_pageTextColors.WriteOptions();

Modified: branches/R2_14/Src/Common/PreferencesDlg.h
===================================================================
--- branches/R2_14/Src/Common/PreferencesDlg.h	2011-05-22 13:48:30 UTC (rev 7522)
+++ branches/R2_14/Src/Common/PreferencesDlg.h	2011-05-22 14:40:23 UTC (rev 7523)
@@ -30,6 +30,7 @@
 #include "PropArchive.h"
 #include "PropBackups.h"
 #include "PropShell.h"
+#include "PropCompareFolder.h"
 
 #include "PropertyPageHost.h"
 
@@ -70,6 +71,7 @@
 	PropArchive m_pageArchive;
 	PropBackups m_pageBackups;
 	PropShell m_pageShell;
+	PropCompareFolder m_pageCompareFolder;
 
 	SyntaxColors *m_pSyntaxColors;
 

Modified: branches/R2_14/Src/Merge.rc
===================================================================
--- branches/R2_14/Src/Merge.rc	2011-05-22 13:48:30 UTC (rev 7522)
+++ branches/R2_14/Src/Merge.rc	2011-05-22 14:40:23 UTC (rev 7523)
@@ -1154,35 +1154,18 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX        "Whitespace",IDC_STATIC,7,7,221,50
-    CONTROL         "&Compare",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON |
-                    WS_GROUP,14,19,206,10
-    CONTROL         "&Ignore change",IDC_WHITE_CHANGE,"Button",
-                    BS_AUTORADIOBUTTON,14,30,206,10
-    CONTROL         "I&gnore all",IDC_ALL_WHITE,"Button",BS_AUTORADIOBUTTON,
-                    14,41,206,10
-    CONTROL         "Ignore blan&k lines",IDC_IGNBLANKS_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP | WS_GROUP,7,60,221,10
-    CONTROL         "Ignore &case",IDC_IGNCASE_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,70,221,10
-    CONTROL         "Igno&re carriage return differences (Windows/Unix/Mac)",
-                    IDC_EOL_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
-                    7,80,221,10
-    CONTROL         "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
-    CONTROL         "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
-    CONTROL         "Ign&ore time differences less than 3 seconds",
-                    IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,7,110,222,10
-    LTEXT           "&File Compare method:",IDC_STATIC,7,125,100,9
-    COMBOBOX        IDC_COMPAREMETHODCOMBO,110,123,114,70,CBS_DROPDOWNLIST |
-                    WS_VSCROLL | WS_TABSTOP
-    CONTROL         "S&top after first difference",IDC_COMPARE_STOPFIRST,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,140,202,10
-    GROUPBOX        "Comments",IDC_STATIC,7,154,221,32
-    CONTROL         "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,15,167,205,10
-    PUSHBUTTON      "Defaults",IDC_COMPARE_DEFAULTS,7,190,70,14
+    CONTROL         "&Compare",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,19,206,10
+    CONTROL         "&Ignore change",IDC_WHITE_CHANGE,"Button",BS_AUTORADIOBUTTON,14,30,206,10
+    CONTROL         "I&gnore all",IDC_ALL_WHITE,"Button",BS_AUTORADIOBUTTON,14,41,206,10
+    CONTROL         "Ignore blan&k lines",IDC_IGNBLANKS_CHECK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,60,221,10
+    CONTROL         "Ignore &case",IDC_IGNCASE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,70,221,10
+    CONTROL         "Igno&re carriage return differences (Windows/Unix/Mac)",IDC_EOL_SENSITIVE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,80,221,10
+    CONTROL         "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
+    CONTROL         "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+    GROUPBOX        "Comments",IDC_STATIC,7,114,221,32
+    CONTROL         "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,127,205,10
+    PUSHBUTTON      "Defaults",IDC_COMPARE_DEFAULTS,5,187,70,14
 END
 
 IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
@@ -1687,6 +1670,20 @@
                     WS_TABSTOP,19,69,200,10
 END
 
+IDD_PROPPAGE_COMPARE_FOLDER DIALOGEX 0, 0, 235, 205
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Folder"
+FONT 8, "MS Shell Dlg", 00, 0, 0x1
+BEGIN
+    COMBOBOX        IDC_COMPAREMETHODCOMBO,110,7,114,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "S&top after first difference",IDC_COMPARE_STOPFIRST,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,28,202,10
+    CONTROL         "Ign&ore time differences less than 3 seconds",IDC_IGNORE_SMALLTIMEDIFF,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,41,222,10
+    LTEXT           "&Compare method:",IDC_STATIC,7,9,100,9
+    PUSHBUTTON      "Defaults",IDC_COMPAREFOLDER_DEFAULTS,7,184,70,14
+END
+
 #ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1954,6 +1951,8 @@
     IDS_OPTIONSPG_BACKUPS   "Backup Files"
     IDS_OPTIONSPG_SHELL     "Shell Integration"
     IDS_OPTIONSPG_MERGECOLORS "Differences"
+    IDS_OPTIONSPG_GENCOMPARE "General"
+    IDS_OPTIONSPG_FOLDERCOMPARE "Folder"
 END
 
 // WINMERGE CUSTOM STRINGS

Modified: branches/R2_14/Src/Merge.vcproj
===================================================================
--- branches/R2_14/Src/Merge.vcproj	2011-05-22 13:48:30 UTC (rev 7522)
+++ branches/R2_14/Src/Merge.vcproj	2011-05-22 14:40:23 UTC (rev 7523)
@@ -3006,6 +3006,31 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="PropCompareFolder.cpp"
+				>
+				<FileConfiguration
+					Name="UnicodeRelease|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="1"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="UnicodeDebug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="PropEditor.cpp"
 				>
 				<FileConfiguration
@@ -4597,6 +4622,10 @@
 				>
 			</File>
 			<File
+				RelativePath="PropCompareFolder.h"
+				>
+			</File>
+			<File
 				RelativePath="PropEditor.h"
 				>
 			</File>

Modified: branches/R2_14/Src/MergeX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeX64.vcproj	2011-05-22 13:48:30 UTC (rev 7522)
+++ branches/R2_14/Src/MergeX64.vcproj	2011-05-22 14:40:23 UTC (rev 7523)
@@ -5328,6 +5328,10 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath=".\PropCompareFolder.cpp"
+				>
+			</File>
+			<File
 				RelativePath="PropEditor.cpp"
 				>
 				<FileConfiguration
@@ -7787,6 +7791,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\PropCompareFolder.h"
+				>
+			</File>
+			<File
 				RelativePath="PropEditor.h"
 				>
 			</File>

Modified: branches/R2_14/Src/PropCompare.cpp
===================================================================
--- branches/R2_14/Src/PropCompare.cpp	2011-05-22 13:48:30 UTC (rev 7522)
+++ branches/R2_14/Src/PropCompare.cpp	2011-05-22 14:40:23 UTC (rev 7523)
@@ -31,9 +31,7 @@
  , m_nIgnoreWhite(-1)
  , m_bMovedBlocks(FALSE)
  , m_bMatchSimilarLines(FALSE)
- , m_bStopAfterFirst(FALSE)
  , m_bFilterCommentsLines(FALSE)
-, m_bIgnoreSmallTimeDiff(FALSE)
 {
 }
 
@@ -41,7 +39,6 @@
 {
 	CPropertyPage::DoDataExchange(pDX);
 	//{{AFX_DATA_MAP(PropCompare)
-	DDX_CBIndex(pDX, IDC_COMPAREMETHODCOMBO, m_compareMethod);
 	DDX_Check(pDX, IDC_IGNCASE_CHECK, m_bIgnoreCase);
 	DDX_Check(pDX, IDC_IGNBLANKS_CHECK, m_bIgnoreBlankLines);
 	DDX_Check(pDX, IDC_FILTERCOMMENTS_CHECK, m_bFilterCommentsLines);
@@ -49,8 +46,6 @@
 	DDX_Radio(pDX, IDC_WHITESPACE, m_nIgnoreWhite);
 	DDX_Check(pDX, IDC_MOVED_BLOCKS, m_bMovedBlocks);
 	DDX_Check(pDX, IDC_MATCH_SIMILAR_LINES, m_bMatchSimilarLines);
-	DDX_Check(pDX, IDC_COMPARE_STOPFIRST, m_bStopAfterFirst);
-	DDX_Check(pDX, IDC_IGNORE_SMALLTIMEDIFF, m_bIgnoreSmallTimeDiff);
 	//}}AFX_DATA_MAP
 }
 
@@ -59,7 +54,6 @@
 	//{{AFX_MSG_MAP(PropCompare)
 	ON_BN_CLICKED(IDC_COMPARE_DEFAULTS, OnDefaults)
 	//}}AFX_MSG_MAP
-	ON_CBN_SELCHANGE(IDC_COMPAREMETHODCOMBO, OnCbnSelchangeComparemethodcombo)
 END_MESSAGE_MAP()
 
 /** 
@@ -76,9 +70,6 @@
 	m_bIgnoreEol = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_EOL) ? true : false;
 	m_bMovedBlocks = GetOptionsMgr()->GetBool(OPT_CMP_MOVED_BLOCKS);
 	m_bMatchSimilarLines = GetOptionsMgr()->GetBool(OPT_CMP_MATCH_SIMILAR_LINES);
-	m_compareMethod = GetOptionsMgr()->GetInt(OPT_CMP_METHOD);
-	m_bStopAfterFirst = GetOptionsMgr()->GetBool(OPT_CMP_STOP_AFTER_FIRST);
-	m_bIgnoreSmallTimeDiff = GetOptionsMgr()->GetBool(OPT_IGNORE_SMALL_FILETIME);
 }
 
 /** 
@@ -93,11 +84,8 @@
 	GetOptionsMgr()->SaveOption(OPT_CMP_FILTER_COMMENTLINES, m_bFilterCommentsLines == TRUE);
 	GetOptionsMgr()->SaveOption(OPT_CMP_IGNORE_EOL, m_bIgnoreEol == TRUE);
 	GetOptionsMgr()->SaveOption(OPT_CMP_IGNORE_CASE, m_bIgnoreCase == TRUE);
-	GetOptionsMgr()->SaveOption(OPT_CMP_METHOD, (int)m_compareMethod);
 	GetOptionsMgr()->SaveOption(OPT_CMP_MOVED_BLOCKS, m_bMovedBlocks == TRUE);
 	GetOptionsMgr()->SaveOption(OPT_CMP_MATCH_SIMILAR_LINES, m_bMatchSimilarLines == TRUE);
-	GetOptionsMgr()->SaveOption(OPT_CMP_STOP_AFTER_FIRST, m_bStopAfterFirst == TRUE);
-	GetOptionsMgr()->SaveOption(OPT_IGNORE_SMALL_FILETIME, m_bIgnoreSmallTimeDiff == TRUE);
 }
 
 /** 
@@ -107,26 +95,7 @@
 {
 	theApp.TranslateDialog(m_hWnd);
 	CPropertyPage::OnInitDialog();
-	CComboBox * combo = (CComboBox*) GetDlgItem(IDC_COMPAREMETHODCOMBO);
 
-	String item = theApp.LoadString(IDS_COMPMETHOD_FULL_CONTENTS);
-	combo->AddString(item.c_str());
-	item = theApp.LoadString(IDS_COMPMETHOD_QUICK_CONTENTS);
-	combo->AddString(item.c_str());
-	item = theApp.LoadString(IDS_COMPMETHOD_MODDATE);
-	combo->AddString(item.c_str());
-	item = theApp.LoadString(IDS_COMPMETHOD_DATESIZE);
-	combo->AddString(item.c_str());
-	item = theApp.LoadString(IDS_COMPMETHOD_SIZE);
-	combo->AddString(item.c_str());
-	combo->SetCurSel(m_compareMethod);
-
-	CButton * pBtn = (CButton*) GetDlgItem(IDC_COMPARE_STOPFIRST);
-	if (m_compareMethod == 1)
-		pBtn->EnableWindow(TRUE);
-	else
-		pBtn->EnableWindow(FALSE);
-
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
@@ -137,8 +106,6 @@
 void PropCompare::OnDefaults()
 {
 	DWORD tmp;
-	GetOptionsMgr()->GetDefault(OPT_CMP_METHOD, tmp);
-	m_compareMethod = tmp;
 	GetOptionsMgr()->GetDefault(OPT_CMP_IGNORE_WHITESPACE, tmp);
 	m_nIgnoreWhite = tmp;
 	GetOptionsMgr()->GetDefault(OPT_CMP_IGNORE_EOL, tmp);
@@ -153,22 +120,5 @@
 	m_bMovedBlocks = tmp;
 	GetOptionsMgr()->GetDefault(OPT_CMP_MATCH_SIMILAR_LINES, tmp);
 	m_bMatchSimilarLines = tmp;
-	GetOptionsMgr()->GetDefault(OPT_CMP_STOP_AFTER_FIRST, tmp);
-	m_bStopAfterFirst = tmp;
 	UpdateData(FALSE);
 }
-
-/** 
- * @brief Called when compare method dropdown selection is changed.
- * Enables / disables "Stop compare after first difference" checkbox.
- * That checkbox is valid only for quick contents compare method.
- */
-void PropCompare::OnCbnSelchangeComparemethodcombo()
-{
-	CComboBox * pCombo = (CComboBox*) GetDlgItem(IDC_COMPAREMETHODCOMBO);
-	CButton * pBtn = (CButton*) GetDlgItem(IDC_COMPARE_STOPFIRST);
-	if (pCombo->GetCurSel() == 1)
-		pBtn->EnableWindow(TRUE);
-	else
-		pBtn->EnableWindow(FALSE);
-}

Modified: branches/R2_14/Src/PropCompare.h
===================================================================
--- branches/R2_14/Src/PropCompare.h	2011-05-22 13:48:30 UTC (rev 7522)
+++ branches/R2_14/Src/PropCompare.h	2011-05-22 14:40:23 UTC (rev 7523)
@@ -43,16 +43,13 @@
 // Dialog Data
 	//{{AFX_DATA(PropCompare)
 	enum { IDD = IDD_PROPPAGE_COMPARE };
-	int     m_compareMethod;
 	BOOL    m_bIgnoreEol;
 	BOOL    m_bIgnoreCase;
 	BOOL    m_bIgnoreBlankLines;
 	int     m_nIgnoreWhite;
 	BOOL    m_bMovedBlocks;
 	BOOL    m_bMatchSimilarLines;
-	BOOL    m_bStopAfterFirst;
 	BOOL    m_bFilterCommentsLines;
-	BOOL    m_bIgnoreSmallTimeDiff;
 	//}}AFX_DATA
 
 
@@ -69,7 +66,6 @@
 	//{{AFX_MSG(PropCompare)
 	afx_msg BOOL OnInitDialog();
 	afx_msg void OnDefaults();
-	afx_msg void OnCbnSelchangeComparemethodcombo();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };

Added: branches/R2_14/Src/PropCompareFolder.cpp
===================================================================
--- branches/R2_14/Src/PropCompareFolder.cpp	                        (rev 0)
+++ branches/R2_14/Src/PropCompareFolder.cpp	2011-05-22 14:40:23 UTC (rev 7523)
@@ -0,0 +1,135 @@
+/** 
+ * @file  PropCompareFolder.cpp
+ *
+ * @brief Implementation of PropCompareFolder propertysheet
+ */
+// ID line follows -- this is updated by SVN
+// $Id: PropCompareFolder.cpp 6921 2009-07-23 15:20:41Z kimmov $
+
+#include "stdafx.h"
+#include "merge.h"
+#include "PropCompareFolder.h"
+#include "OptionsDef.h"
+#include "OptionsMgr.h"
+#include "OptionsPanel.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+static const int Mega = 1024 * 1024;
+
+/** 
+ * @brief Constructor.
+ * @param [in] optionsMgr Pointer to COptionsMgr.
+ */
+PropCompareFolder::PropCompareFolder(COptionsMgr *optionsMgr) 
+ : OptionsPanel(optionsMgr, PropCompareFolder::IDD)
+ , m_compareMethod(-1)
+ , m_bStopAfterFirst(FALSE)
+ , m_bIgnoreSmallTimeDiff(FALSE)
+{
+}
+
+void PropCompareFolder::DoDataExchange(CDataExchange* pDX)
+{
+	CPropertyPage::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(PropCompareFolder)
+	DDX_CBIndex(pDX, IDC_COMPAREMETHODCOMBO, m_compareMethod);
+	DDX_Check(pDX, IDC_COMPARE_STOPFIRST, m_bStopAfterFirst);
+	DDX_Check(pDX, IDC_IGNORE_SMALLTIMEDIFF, m_bIgnoreSmallTimeDiff);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(PropCompareFolder, CPropertyPage)
+	//{{AFX_MSG_MAP(PropCompareFolder)
+	ON_BN_CLICKED(IDC_COMPAREFOLDER_DEFAULTS, OnDefaults)
+	//}}AFX_MSG_MAP
+	ON_CBN_SELCHANGE(IDC_COMPAREMETHODCOMBO, OnCbnSelchangeComparemethodcombo)
+END_MESSAGE_MAP()
+
+/** 
+ * @brief Reads options values from storage to UI.
+ * Property sheet calls this before displaying GUI to load values
+ * into members.
+ */
+void PropCompareFolder::ReadOptions()
+{
+	m_compareMethod = GetOptionsMgr()->GetInt(OPT_CMP_METHOD);
+	m_bStopAfterFirst = GetOptionsMgr()->GetBool(OPT_CMP_STOP_AFTER_FIRST);
+	m_bIgnoreSmallTimeDiff = GetOptionsMgr()->GetBool(OPT_IGNORE_SMALL_FILETIME);
+}
+
+/** 
+ * @brief Writes options values from UI to storage.
+ * Property sheet calls this after dialog is closed with OK button to
+ * store values in member variables.
+ */
+void PropCompareFolder::WriteOptions()
+{
+	GetOptionsMgr()->SaveOption(OPT_CMP_METHOD, (int)m_compareMethod);
+	GetOptionsMgr()->SaveOption(OPT_CMP_STOP_AFTER_FIRST, m_bStopAfterFirst == TRUE);
+	GetOptionsMgr()->SaveOption(OPT_IGNORE_SMALL_FILETIME, m_bIgnoreSmallTimeDiff == TRUE);
+}
+
+/** 
+ * @brief Called before propertysheet is drawn.
+ */
+BOOL PropCompareFolder::OnInitDialog() 
+{
+	theApp.TranslateDialog(m_hWnd);
+	CPropertyPage::OnInitDialog();
+	CComboBox * combo = (CComboBox*) GetDlgItem(IDC_COMPAREMETHODCOMBO);
+
+	String item = theApp.LoadString(IDS_COMPMETHOD_FULL_CONTENTS);
+	combo->AddString(item.c_str());
+	item = theApp.LoadString(IDS_COMPMETHOD_QUICK_CONTENTS);
+	combo->AddString(item.c_str());
+	item = theApp.LoadString(IDS_COMPMETHOD_MODDATE);
+	combo->AddString(item.c_str());
+	item = theApp.LoadString(IDS_COMPMETHOD_DATESIZE);
+	combo->AddString(item.c_str());
+	item = theApp.LoadString(IDS_COMPMETHOD_SIZE);
+	combo->AddString(item.c_str());
+	combo->SetCurSel(m_compareMethod);
+
+	CButton * pBtn = (CButton*) GetDlgItem(IDC_COMPARE_STOPFIRST);
+	if (m_compareMethod == 1)
+		pBtn->EnableWindow(TRUE);
+	else
+		pBtn->EnableWindow(FALSE);
+
+	return TRUE;  // return TRUE unless you set the focus to a control
+	              // EXCEPTION: OCX Property Pages should return FALSE
+}
+
+/** 
+ * @brief Sets options to defaults
+ */
+void PropCompareFolder::OnDefaults()
+{
+	DWORD tmp;
+	GetOptionsMgr()->GetDefault(OPT_CMP_METHOD, tmp);
+	m_compareMethod = tmp;
+	GetOptionsMgr()->GetDefault(OPT_CMP_STOP_AFTER_FIRST, tmp);
+	m_bStopAfterFirst = tmp;
+	UpdateData(FALSE);
+}
+
+/** 
+ * @brief Called when compare method dropdown selection is changed.
+ * Enables / disables "Stop compare after first difference" checkbox.
+ * That checkbox is valid only for quick contents compare method.
+ */
+void PropCompareFolder::OnCbnSelchangeComparemethodcombo()
+{
+	CComboBox * pCombo = (CComboBox*) GetDlgItem(IDC_COMPAREMETHODCOMBO);
+	CButton * pBtn = (CButton*) GetDlgItem(IDC_COMPARE_STOPFIRST);
+	if (pCombo->GetCurSel() == 1)
+		pBtn->EnableWindow(TRUE);
+	else
+		pBtn->EnableWindow(FALSE);
+}

Added: branches/R2_14/Src/PropCompareFolder.h
===================================================================
--- branches/R2_14/Src/PropCompareFolder.h	                        (rev 0)
+++ branches/R2_14/Src/PropCompareFolder.h	2011-05-22 14:40:23 UTC (rev 7523)
@@ -0,0 +1,69 @@
+/** 
+ * @file  PropCompareFolder.h
+ *
+ * @brief Declaration of PropCompareFolder propertysheet
+ */
+// ID line follows -- this is updated by SVN
+// $Id: PropCompareFolder.h 6921 2009-07-23 15:20:41Z kimmov $
+
+#ifndef _PROPCOMPARE_FOLDER_H_
+#define _PROPCOMPARE_FOLDER_H_
+
+#include "OptionsPanel.h"
+
+class COptionsMgr;
+
+/////////////////////////////////////////////////////////////////////////////
+// PropCompareFolder dialog
+
+/**
+ * @brief Property page to set folder compare options for WinMerge.
+ *
+ * Compare methods:
+ *  - compare by contents
+ *  - compare by modified date
+ *  - compare by file size
+ *  - compare by date and size
+ *  - compare by quick contents
+ */
+class PropCompareFolder : public OptionsPanel
+{
+// Construction
+public:
+	PropCompareFolder(COptionsMgr *optionsMgr);
+
+// Implement IOptionsPanel
+	virtual void ReadOptions();
+	virtual void WriteOptions();
+
+// Dialog Data
+	//{{AFX_DATA(PropCompareFolder)
+	enum { IDD = IDD_PROPPAGE_COMPARE_FOLDER };
+	int     m_compareMethod;
+	BOOL    m_bStopAfterFirst;
+	BOOL    m_bIgnoreSmallTimeDiff;
+	//}}AFX_DATA
+
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(PropCompareFolder)
+	protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+protected:
+	// Generated message map functions
+	//{{AFX_MSG(CPropCompare)
+	afx_msg BOOL OnInitDialog();
+	afx_msg void OnDefaults();
+	afx_msg void OnCbnSelchangeComparemethodcombo();
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // _PROPCOMPARE_FOLDER_H_

Modified: branches/R2_14/Src/resource.h
===================================================================
--- branches/R2_14/Src/resource.h	2011-05-22 13:48:30 UTC (rev 7522)
+++ branches/R2_14/Src/resource.h	2011-05-22 14:40:23 UTC (rev 7523)
@@ -56,6 +56,7 @@
 #define IDD_CONFIRM_COPY                235
 #define IDD_PLUGINS_LIST                236
 #define IDD_PROPPAGE_SHELL              237
+#define IDD_PROPPAGE_COMPARE_FOLDER     238
 #define IDR_SPLASH                      308
 #define IDB_WINMERGE                    309
 #define IDB_OLDSPLASH                   310
@@ -443,6 +444,7 @@
 #define IDC_PLUGINSLIST_LIST            1342
 #define IDC_ENABLE_SHELL_CONTEXT_MENU   1343
 #define IDC_STARTUP_FOLDER_SELECT       1344
+#define IDC_COMPAREFOLDER_DEFAULTS      1348
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605
@@ -491,6 +493,8 @@
 #define IDS_OPTIONSPG_BACKUPS           9051
 #define IDS_OPTIONSPG_SHELL             9052
 #define IDS_OPTIONSPG_MERGECOLORS       9053
+#define IDS_OPTIONSPG_GENCOMPARE        9054
+#define IDS_OPTIONSPG_FOLDERCOMPARE     9055
 #define IDS_TO                          16000
 #define IDS_FROM_LEFT                   16001
 #define IDS_TO_LEFT                     16002
@@ -1019,9 +1023,9 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        238
+#define _APS_NEXT_RESOURCE_VALUE        239
 #define _APS_NEXT_COMMAND_VALUE         33178
-#define _APS_NEXT_CONTROL_VALUE         1345
+#define _APS_NEXT_CONTROL_VALUE         1349
 #define _APS_NEXT_SYMED_VALUE           113
 #endif
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7524] branches/R2_14

[<sdo...@us...>]

Revision: 7524
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7524&view=rev
Author:   sdottaka
Date:     2011-05-22 15:01:25 +0000 (Sun, 22 May 2011)

Log Message:
-----------
PATCH: [ 2825628 ] Add option GUI for Quick compare limit option

backport from rev. 6921

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/Languages/English.pot
    branches/R2_14/Src/Merge.rc
    branches/R2_14/Src/PropCompareFolder.cpp
    branches/R2_14/Src/PropCompareFolder.h
    branches/R2_14/Src/resource.h

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2011-05-22 14:40:23 UTC (rev 7523)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2011-05-22 15:01:25 UTC (rev 7524)
@@ -17,6 +17,7 @@
   Allow setting codepage from command line (#2725549)
   Allow giving encoding name as custom codepage (#2813825, #3010934)
   Add new options dialog panel for folder compare options (#2819626)
+  Add options GUI for quick compare limit (#2825628)
   Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed 
     in status bar (#3025855)
   Bugfix: Pane headers not updated after language change (#2923684)

Modified: branches/R2_14/Src/Languages/English.pot
===================================================================
--- branches/R2_14/Src/Languages/English.pot	2011-05-22 14:40:23 UTC (rev 7523)
+++ branches/R2_14/Src/Languages/English.pot	2011-05-22 15:01:25 UTC (rev 7524)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2010-10-19 20:38+0000\n"
+"POT-Creation-Date: 2011-05-22 23:52+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <win...@li...>\n"
@@ -68,7 +68,7 @@
 
 #: Merge.rc:81
 #: Merge.rc:103
-#: Merge.rc:508
+#: Merge.rc:512
 #, c-format
 msgid "&Copy"
 msgstr ""
@@ -80,7 +80,7 @@
 msgstr ""
 
 #: Merge.rc:84
-#: Merge.rc:589
+#: Merge.rc:593
 #, c-format
 msgid "&Goto..."
 msgstr ""
@@ -91,64 +91,64 @@
 msgstr ""
 
 #: Merge.rc:88
-#: Merge.rc:531
-#: Merge.rc:537
+#: Merge.rc:535
+#: Merge.rc:541
 #, c-format
 msgid "with &Registered Application"
 msgstr ""
 
 #: Merge.rc:89
-#: Merge.rc:532
-#: Merge.rc:538
+#: Merge.rc:536
+#: Merge.rc:542
 #, c-format
 msgid "with &External Editor"
 msgstr ""
 
 #: Merge.rc:90
-#: Merge.rc:533
-#: Merge.rc:539
+#: Merge.rc:537
+#: Merge.rc:543
 #, c-format
 msgid "&with..."
 msgstr ""
 
 #: Merge.rc:110
-#: Merge.rc:191
-#: Merge.rc:312
+#: Merge.rc:194
+#: Merge.rc:315
 #, c-format
 msgid "&File"
 msgstr ""
 
 #: Merge.rc:112
-#: Merge.rc:193
-#: Merge.rc:314
+#: Merge.rc:196
+#: Merge.rc:317
 #, c-format
 msgid "&New\tCtrl+N"
 msgstr ""
 
 #: Merge.rc:113
-#: Merge.rc:194
-#: Merge.rc:315
+#: Merge.rc:197
+#: Merge.rc:318
 #, c-format
 msgid "&Open...\tCtrl+O"
 msgstr ""
 
 #: Merge.rc:114
-#: Merge.rc:195
-#: Merge.rc:316
+#: Merge.rc:198
+#: Merge.rc:319
 #, c-format
 msgid "Op&en Conflict File..."
 msgstr ""
 
 #: Merge.rc:116
-#: Merge.rc:197
-#: Merge.rc:318
+#: Merge.rc:200
+#: Merge.rc:321
 #, c-format
 msgid "Open Pro&ject...\tCtrl+J"
 msgstr ""
 
 #: Merge.rc:117
-#: Merge.rc:198
-#: Merge.rc:319
+#: Merge.rc:201
+#: Merge.rc:322
 #, c-format
 msgid "Sa&ve Project..."
 msgstr ""
@@ -159,1657 +159,1670 @@
 msgstr ""
 
 #: Merge.rc:121
-#: Merge.rc:205
-#: Merge.rc:351
+#: Merge.rc:208
+#: Merge.rc:354
 #, c-format
 msgid "E&xit"
 msgstr ""
 
 #: Merge.rc:123
-#: Merge.rc:207
-#: Merge.rc:353
+#: Merge.rc:210
+#: Merge.rc:356
 #, c-format
 msgid "&Edit"
 msgstr ""
 
 #: Merge.rc:125
-#: Merge.rc:211
-#: Merge.rc:387
+#: Merge.rc:214
+#: Merge.rc:390
 #, c-format
 msgid "&Options..."
 msgstr ""
 
 #: Merge.rc:127
-#: Merge.rc:213
-#: Merge.rc:389
+#: Merge.rc:216
+#: Merge.rc:392
 #, c-format
 msgid "&View"
 msgstr ""
 
 #: Merge.rc:129
-#: Merge.rc:228
-#: Merge.rc:391
+#: Merge.rc:231
+#: Merge.rc:394
 #, c-format
 msgid "Select &Font..."
 msgstr ""
 
 #: Merge.rc:130
-#: Merge.rc:229
-#: Merge.rc:392
+#: Merge.rc:232
+#: Merge.rc:395
 #, c-format
 msgid "Use Default F&ont"
 msgstr ""
 
 #: Merge.rc:132
-#: Merge.rc:231
-#: Merge.rc:413
+#: Merge.rc:234
+#: Merge.rc:416
 #, c-format
 msgid "&Toolbar"
 msgstr ""
 
 #: Merge.rc:134
-#: Merge.rc:233
-#: Merge.rc:415
+#: Merge.rc:236
+#: Merge.rc:418
 #, c-format
 msgid "&None"
 msgstr ""
 
 #: Merge.rc:135
-#: Merge.rc:234
-#: Merge.rc:416
+#: Merge.rc:237
+#: Merge.rc:419
 #, c-format
 msgid "&Small"
 msgstr ""
 
 #: Merge.rc:136
-#: Merge.rc:235
-#: Merge.rc:417
+#: Merge.rc:238
+#: Merge.rc:420
 #, c-format
 msgid "&Big"
 msgstr ""
 
 #: Merge.rc:138
-#: Merge.rc:237
-#: Merge.rc:419
+#: Merge.rc:240
+#: Merge.rc:422
 #, c-format
 msgid "&Status Bar"
 msgstr ""
 
 #: Merge.rc:139
-#: Merge.rc:238
-#: Merge.rc:420
+#: Merge.rc:241
+#: Merge.rc:423
 #, c-format
 msgid "Ta&b Bar"
 msgstr ""
 
 #: Merge.rc:141
-#: Merge.rc:241
-#: Merge.rc:424
+#: Merge.rc:244
+#: Merge.rc:427
 #, c-format
 msgid "&Language..."
 msgstr ""
 
 #: Merge.rc:143
-#: Merge.rc:262
-#: Merge.rc:446
+#: Merge.rc:265
+#: Merge.rc:449
 #, c-format
 msgid "&Tools"
 msgstr ""
 
 #: Merge.rc:145
-#: Merge.rc:265
-#: Merge.rc:448
+#: Merge.rc:268
+#: Merge.rc:451
 #, c-format
 msgid "&Filters..."
 msgstr ""
 
 #: Merge.rc:146
-#: Merge.rc:266
-#: Merge.rc:449
+#: Merge.rc:269
+#: Merge.rc:452
 #, c-format
 msgid "&Generate Patch..."
 msgstr ""
 
 #: Merge.rc:148
-#: Merge.rc:269
-#: Merge.rc:452
+#: Merge.rc:272
+#: Merge.rc:455
 #, c-format
 msgid "&Plugins"
 msgstr ""
 
 #: Merge.rc:150
-#: Merge.rc:271
-#: Merge.rc:454
+#: Merge.rc:274
+#: Merge.rc:457
 #, c-format
 msgid "&List..."
 msgstr ""
 
 #: Merge.rc:152
-#: Merge.rc:273
-#: Merge.rc:456
 #, c-format
-msgid "&Manual Unpacking"
+msgid "Ma&nual Prediffer"
 msgstr ""
 
 #: Merge.rc:153
-#: Merge.rc:274
-#: Merge.rc:457
 #, c-format
-msgid "&Automatic Unpacking"
+msgid "A&utomatic Prediffer"
 msgstr ""
 
 #: Merge.rc:155
 #: Merge.rc:276
 #: Merge.rc:459
 #, c-format
-msgid "&Edit with Unpacker"
+msgid "&Manual Unpacking"
 msgstr ""
 
-#: Merge.rc:157
-#: Merge.rc:278
-#: Merge.rc:466
+#: Merge.rc:156
+#: Merge.rc:277
+#: Merge.rc:460
 #, c-format
-msgid "&Reload plugins"
+msgid "&Automatic Unpacking"
 msgstr ""
 
-#: Merge.rc:159
-#: Merge.rc:280
-#: Merge.rc:468
+#: Merge.rc:158
+#: Merge.rc:279
+#: Merge.rc:462
 #, c-format
-msgid "&Debug"
+msgid "&Edit with Unpacker"
 msgstr ""
 
-#: Merge.rc:161
-#: Merge.rc:282
-#: Merge.rc:470
+#: Merge.rc:160
+#: Merge.rc:281
+#: Merge.rc:469
 #, c-format
-msgid "&Load Config..."
+msgid "&Reload plugins"
 msgstr ""
 
 #: Merge.rc:162
 #: Merge.rc:283
 #: Merge.rc:471
 #, c-format
-msgid "&Reset Options"
+msgid "&Debug"
 msgstr ""
 
 #: Merge.rc:164
 #: Merge.rc:285
 #: Merge.rc:473
 #, c-format
-msgid "&Window"
+msgid "&Load Config..."
 msgstr ""
 
-#: Merge.rc:166
-#: Merge.rc:287
-#: Merge.rc:475
+#: Merge.rc:165
+#: Merge.rc:286
+#: Merge.rc:474
 #, c-format
-msgid "Cl&ose"
+msgid "&Reset Options"
 msgstr ""
 
 #: Merge.rc:167
 #: Merge.rc:288
 #: Merge.rc:476
 #, c-format
-msgid "Clo&se All"
+msgid "&Window"
 msgstr ""
 
 #: Merge.rc:169
 #: Merge.rc:290
 #: Merge.rc:478
 #, c-format
-msgid "Change &Pane\tF6"
+msgid "Cl&ose"
 msgstr ""
 
-#: Merge.rc:171
-#: Merge.rc:292
-#: Merge.rc:480
+#: Merge.rc:170
+#: Merge.rc:291
+#: Merge.rc:479
 #, c-format
-msgid "Tile &Horizontally"
+msgid "Clo&se All"
 msgstr ""
 
 #: Merge.rc:172
 #: Merge.rc:293
 #: Merge.rc:481
 #, c-format
-msgid "Tile &Vertically"
+msgid "Change &Pane\tF6"
 msgstr ""
 
-#: Merge.rc:173
-#: Merge.rc:294
-#: Merge.rc:482
+#: Merge.rc:174
+#: Merge.rc:295
+#: Merge.rc:483
 #, c-format
-msgid "&Cascade"
+msgid "Tile &Horizontally"
 msgstr ""
 
 #: Merge.rc:175
 #: Merge.rc:296
 #: Merge.rc:484
-#: Merge.rc:1935
 #, c-format
-msgid "&Help"
+msgid "Tile &Vertically"
 msgstr ""
 
-#: Merge.rc:177
-#: Merge.rc:298
-#: Merge.rc:486
+#: Merge.rc:176
+#: Merge.rc:297
+#: Merge.rc:485
 #, c-format
-msgid "&WinMerge Help\tF1"
+msgid "&Cascade"
 msgstr ""
 
-#: Merge.rc:179
-#: Merge.rc:300
-#: Merge.rc:488
+#: Merge.rc:178
+#: Merge.rc:299
+#: Merge.rc:487
+#: Merge.rc:1935
 #, c-format
-msgid "R&elease Notes"
+msgid "&Help"
 msgstr ""
 
 #: Merge.rc:180
 #: Merge.rc:301
 #: Merge.rc:489
 #, c-format
-msgid "&Translations"
+msgid "&WinMerge Help\tF1"
 msgstr ""
 
-#: Merge.rc:181
-#: Merge.rc:302
-#: Merge.rc:490
-#, c-format
-msgid "C&onfiguration"
-msgstr ""
-
 #: Merge.rc:182
 #: Merge.rc:303
 #: Merge.rc:491
 #, c-format
-msgid "A&rchive Support disabled..."
+msgid "R&elease Notes"
 msgstr ""
 
+#: Merge.rc:183
+#: Merge.rc:304
+#: Merge.rc:492
+#, c-format
+msgid "&Translations"
+msgstr ""
+
 #: Merge.rc:184
 #: Merge.rc:305
 #: Merge.rc:493
 #, c-format
-msgid "&GNU General Public License"
+msgid "C&onfiguration"
 msgstr ""
 
 #: Merge.rc:185
 #: Merge.rc:306
 #: Merge.rc:494
 #, c-format
+msgid "A&rchive Support disabled..."
+msgstr ""
+
+#: Merge.rc:187
+#: Merge.rc:308
+#: Merge.rc:496
+#, c-format
+msgid "&GNU General Public License"
+msgstr ""
+
+#: Merge.rc:188
+#: Merge.rc:309
+#: Merge.rc:497
+#, c-format
 msgid "&About WinMerge..."
 msgstr ""
 
-#: Merge.rc:200
-#: Merge.rc:337
+#: Merge.rc:203
+#: Merge.rc:340
 #, c-format
 msgid "L&eft Read-only"
 msgstr ""
 
-#: Merge.rc:201
-#: Merge.rc:338
+#: Merge.rc:204
+#: Merge.rc:341
 #, c-format
 msgid "Ri&ght Read-only"
 msgstr ""
 
-#: Merge.rc:203
+#: Merge.rc:206
 #, c-format
 msgid "File En&coding"
 msgstr ""
 
-#: Merge.rc:209
-#: Merge.rc:363
+#: Merge.rc:212
+#: Merge.rc:366
 #, c-format
 msgid "Select &All\tCtrl+A"
 msgstr ""
 
-#: Merge.rc:215
+#: Merge.rc:218
 #, c-format
 msgid "Show &Identical Items"
 msgstr ""
 
-#: Merge.rc:216
+#: Merge.rc:219
 #, c-format
 msgid "Show &Different Items"
 msgstr ""
 
-#: Merge.rc:217
+#: Merge.rc:220
 #, c-format
 msgid "Show L&eft Unique Items"
 msgstr ""
 
-#: Merge.rc:218
+#: Merge.rc:221
 #, c-format
 msgid "Show Ri&ght Unique Items"
 msgstr ""
 
-#: Merge.rc:219
+#: Merge.rc:222
 #, c-format
 msgid "Show S&kipped Items"
 msgstr ""
 
-#: Merge.rc:220
+#: Merge.rc:223
 #, c-format
 msgid "S&how Binary Files"
 msgstr ""
 
-#: Merge.rc:222
+#: Merge.rc:225
 #, c-format
 msgid "Show Hidd&en Items"
 msgstr ""
 
-#: Merge.rc:224
+#: Merge.rc:227
 #, c-format
 msgid "Tree &Mode"
 msgstr ""
 
-#: Merge.rc:225
+#: Merge.rc:228
 #, c-format
 msgid "E&xpand All Subfolders"
 msgstr ""
 
-#: Merge.rc:226
+#: Merge.rc:229
 #, c-format
 msgid "&Collapse All Subfolders"
 msgstr ""
 
-#: Merge.rc:239
+#: Merge.rc:242
 #, c-format
 msgid "Compa&re Statistics"
 msgstr ""
 
-#: Merge.rc:243
-#: Merge.rc:426
+#: Merge.rc:246
+#: Merge.rc:429
 #, c-format
 msgid "Refre&sh\tF5"
 msgstr ""
 
-#: Merge.rc:244
+#: Merge.rc:247
 #, c-format
 msgid "&Refresh Selected\tCtrl+F5"
 msgstr ""
 
-#: Merge.rc:246
-#: Merge.rc:428
+#: Merge.rc:249
+#: Merge.rc:431
 #, c-format
 msgid "&Merge"
 msgstr ""
 
-#: Merge.rc:248
+#: Merge.rc:251
 #, c-format
 msgid "Co&mpare\tEnter"
 msgstr ""
 
-#: Merge.rc:250
-#: Merge.rc:430
+#: Merge.rc:253
+#: Merge.rc:433
 #, c-format
 msgid "&Next Difference\tAlt+Down"
 msgstr ""
 
-#: Merge.rc:251
-#: Merge.rc:431
+#: Merge.rc:254
+#: Merge.rc:434
 #, c-format
 msgid "&Previous Difference\tAlt+Up"
 msgstr ""
 
-#: Merge.rc:253
-#: Merge.rc:433
+#: Merge.rc:256
+#: Merge.rc:436
 #, c-format
 msgid "&First Difference\tAlt+Home"
 msgstr ""
 
-#: Merge.rc:254
-#: Merge.rc:434
+#: Merge.rc:257
+#: Merge.rc:437
 #, c-format
 msgid "&Current Difference\tAlt+Enter"
 msgstr ""
 
-#: Merge.rc:255
-#: Merge.rc:435
+#: Merge.rc:258
+#: Merge.rc:438
 #, c-format
 msgid "&Last Difference\tAlt+End"
 msgstr ""
 
-#: Merge.rc:257
-#: Merge.rc:437
+#: Merge.rc:260
+#: Merge.rc:440
 #, c-format
 msgid "Copy to &Right\tAlt+Right"
 msgstr ""
 
-#: Merge.rc:258
-#: Merge.rc:438
+#: Merge.rc:261
+#: Merge.rc:441
 #, c-format
 msgid "Copy to L&eft\tAlt+Left"
 msgstr ""
 
-#: Merge.rc:260
+#: Merge.rc:263
 #, c-format
 msgid "&Delete\tDel"
 msgstr ""
 
-#: Merge.rc:264
-#: Merge.rc:562
+#: Merge.rc:267
+#: Merge.rc:566
 #, c-format
 msgid "&Customize Columns..."
 msgstr ""
 
-#: Merge.rc:267
-#: Merge.rc:450
+#: Merge.rc:270
+#: Merge.rc:453
 #, c-format
 msgid "Generate &Report..."
 msgstr ""
 
-#: Merge.rc:321
+#: Merge.rc:324
 #, c-format
 msgid "&Save\tCtrl+S"
 msgstr ""
 
-#: Merge.rc:322
+#: Merge.rc:325
 #, c-format
 msgid "Save &Left"
 msgstr ""
 
-#: Merge.rc:324
-#: Merge.rc:329
+#: Merge.rc:327
+#: Merge.rc:332
 #, c-format
 msgid "&Save"
 msgstr ""
 
-#: Merge.rc:325
-#: Merge.rc:330
+#: Merge.rc:328
+#: Merge.rc:333
 #, c-format
 msgid "Save &As..."
 msgstr ""
 
-#: Merge.rc:327
+#: Merge.rc:330
 #, c-format
 msgid "Save &Right"
 msgstr ""
 
-#: Merge.rc:333
+#: Merge.rc:336
 #, c-format
 msgid "&Print..."
 msgstr ""
 
-#: Merge.rc:334
+#: Merge.rc:337
 #, c-format
 msgid "Page Se&tup"
 msgstr ""
 
-#: Merge.rc:335
+#: Merge.rc:338
 #, c-format
 msgid "Print Previe&w"
 msgstr ""
 
-#: Merge.rc:340
+#: Merge.rc:343
 #, c-format
 msgid "&Convert Line Endings to"
 msgstr ""
 
-#: Merge.rc:342
+#: Merge.rc:345
 #, c-format
 msgid "&Windows (CRLF)"
 msgstr ""
 
-#: Merge.rc:343
+#: Merge.rc:346
 #, c-format
 msgid "&Unix (LF)"
 msgstr ""
 
-#: Merge.rc:344
+#: Merge.rc:347
 #, c-format
 msgid "&Mac (CR)"
 msgstr ""
 
-#: Merge.rc:347
+#: Merge.rc:350
 #, c-format
 msgid "&Merge Mode\tF9"
 msgstr ""
 
-#: Merge.rc:349
+#: Merge.rc:352
 #, c-format
 msgid "&File Encoding..."
 msgstr ""
 
-#: Merge.rc:355
+#: Merge.rc:358
 #, c-format
 msgid "&Undo\tCtrl+Z"
 msgstr ""
 
-#: Merge.rc:356
+#: Merge.rc:359
 #, c-format
 msgid "&Redo\tCtrl+Y"
 msgstr ""
 
-#: Merge.rc:358
+#: Merge.rc:361
 #, c-format
 msgid "Cu&t\tCtrl+X"
 msgstr ""
 
-#: Merge.rc:359
+#: Merge.rc:362
 #, c-format
 msgid "&Copy\tCtrl+C"
 msgstr ""
 
-#: Merge.rc:360
+#: Merge.rc:363
 #, c-format
 msgid "&Paste\tCtrl+V"
 msgstr ""
 
-#: Merge.rc:362
+#: Merge.rc:365
 #, c-format
 msgid "Select Line &Difference\tF4"
 msgstr ""
 
-#: Merge.rc:365
+#: Merge.rc:368
 #, c-format
 msgid "F&ind...\tCtrl+F"
 msgstr ""
 
-#: Merge.rc:366
+#: Merge.rc:369
 #, c-format
 msgid "Repla&ce...\tCtrl+H"
 msgstr ""
 
-#: Merge.rc:368
+#: Merge.rc:371
 #, c-format
 msgid "&Scripts"
 msgstr ""
 
-#: Merge.rc:370
-#: Merge.rc:2791
+#: Merge.rc:373
+#: Merge.rc:2695
 #, c-format
 msgid "< Empty >"
 msgstr ""
 
-#: Merge.rc:373
+#: Merge.rc:376
 #, c-format
 msgid "Advanced"
 msgstr ""
 
-#: Merge.rc:375
+#: Merge.rc:378
 #, c-format
 msgid "&Copy With Line Numbers\tCtrl+Shift+C"
 msgstr ""
 
-#: Merge.rc:378
+#: Merge.rc:381
 #, c-format
 msgid "&Bookmarks"
 msgstr ""
 
-#: Merge.rc:380
+#: Merge.rc:383
 #, c-format
 msgid "&Toggle Bookmark\tCtrl+F2"
 msgstr ""
 
-#: Merge.rc:381
+#: Merge.rc:384
 #, c-format
 msgid "&Next Bookmark\tF2"
 msgstr ""
 
-#: Merge.rc:382
+#: Merge.rc:385
 #, c-format
 msgid "&Previous bookmark\tShift+F2"
 msgstr ""
 
-#: Merge.rc:383
+#: Merge.rc:386
 #, c-format
 msgid "&Clear All Bookmarks"
 msgstr ""
 
-#: Merge.rc:385
+#: Merge.rc:388
 #, c-format
 msgid "&Go To...\tCtrl+G"
 msgstr ""
 
-#: Merge.rc:393
+#: Merge.rc:396
 #, c-format
 msgid "&Zoom"
 msgstr ""
 
-#: Merge.rc:395
+#: Merge.rc:398
 #, c-format
 msgid "Zoom &In\tCtrl++"
 msgstr ""
 
-#: Merge.rc:396
+#: Merge.rc:399
 #, c-format
 msgid "Zoom &Out\tCtrl+-"
 msgstr ""
 
 #. Zoom to normal
-#: Merge.rc:397
+#: Merge.rc:400
 #, c-format
 msgid "&Normal\tCtrl+*"
 msgstr ""
 
-#: Merge.rc:399
+#: Merge.rc:402
 #, c-format
 msgid "Syntax Highlight"
 msgstr ""
 
-#: Merge.rc:404
+#: Merge.rc:407
 #, c-format
 msgid "&Lock Panes"
 msgstr ""
 
-#: Merge.rc:405
+#: Merge.rc:408
 #, c-format
 msgid "&View Whitespace"
 msgstr ""
 
-#: Merge.rc:406
+#: Merge.rc:409
 #, c-format
 msgid "Vie&w Line Differences"
 msgstr ""
 
-#: Merge.rc:407
+#: Merge.rc:410
 #, c-format
 msgid "View Line &Numbers"
 msgstr ""
 
-#: Merge.rc:408
+#: Merge.rc:411
 #, c-format
 msgid "View &Margins"
 msgstr ""
 
-#: Merge.rc:409
+#: Merge.rc:412
 #, c-format
 msgid "W&rap Lines"
 msgstr ""
 
-#: Merge.rc:411
+#: Merge.rc:414
 #, c-format
 msgid "Sw&ap Panes"
 msgstr ""
 
-#: Merge.rc:421
+#: Merge.rc:424
 #, c-format
 msgid "Diff &Pane"
 msgstr ""
 
-#: Merge.rc:422
+#: Merge.rc:425
 #, c-format
 msgid "Lo&cation Pane"
 msgstr ""
 
-#: Merge.rc:440
+#: Merge.rc:443
 #, c-format
 msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
 msgstr ""
 
-#: Merge.rc:441
+#: Merge.rc:444
 #, c-format
 msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
 msgstr ""
 
-#: Merge.rc:443
+#: Merge.rc:446
 #, c-format
 msgid "Copy &All to Right"
 msgstr ""
 
-#: Merge.rc:444
+#: Merge.rc:447
 #, c-format
 msgid "Cop&y All to Left"
 msgstr ""
 
-#: Merge.rc:461
+#: Merge.rc:464
 #, c-format
 msgid "&Prediffer"
 msgstr ""
 
-#: Merge.rc:502
+#: Merge.rc:505
 #, c-format
 msgid "Comp&are"
 msgstr ""
 
-#: Merge.rc:503
+#: Merge.rc:506
 #, c-format
-msgid "Co&mpare Special"
+msgid "Co&mpare As"
 msgstr ""
 
-#: Merge.rc:505
+#: Merge.rc:508
 #, c-format
 msgid "&XML"
 msgstr ""
 
-#: Merge.rc:510
+#: Merge.rc:509
 #, c-format
+msgid "&Binary"
+msgstr ""
+
+#: Merge.rc:514
+#, c-format
 msgid "&Left to Right"
 msgstr ""
 
-#: Merge.rc:511
+#: Merge.rc:515
 #, c-format
 msgid "L&eft to..."
 msgstr ""
 
-#: Merge.rc:512
+#: Merge.rc:516
 #, c-format
 msgid "&Right to Left"
 msgstr ""
 
-#: Merge.rc:513
+#: Merge.rc:517
 #, c-format
 msgid "R&ight to..."
 msgstr ""
 
-#: Merge.rc:515
+#: Merge.rc:519
 #, c-format
 msgid "&Move"
 msgstr ""
 
-#: Merge.rc:517
+#: Merge.rc:521
 #, c-format
 msgid "&Left to..."
 msgstr ""
 
-#: Merge.rc:518
+#: Merge.rc:522
 #, c-format
 msgid "&Right to..."
 msgstr ""
 
-#: Merge.rc:520
+#: Merge.rc:524
 #, c-format
 msgid "&Delete"
 msgstr ""
 
-#: Merge.rc:522
-#: Merge.rc:1137
-#: Merge.rc:1519
+#: Merge.rc:526
+#: Merge.rc:1138
+#: Merge.rc:1503
 #, c-format
 msgid "&Left"
 msgstr ""
 
-#: Merge.rc:523
-#: Merge.rc:1139
-#: Merge.rc:1522
+#: Merge.rc:527
+#: Merge.rc:1140
+#: Merge.rc:1506
 #, c-format
 msgid "&Right"
 msgstr ""
 
-#: Merge.rc:524
+#: Merge.rc:528
 #, c-format
 msgid "&Both"
 msgstr ""
 
-#: Merge.rc:526
+#: Merge.rc:530
 #, c-format
 msgid "Re&name"
 msgstr ""
 
-#: Merge.rc:527
+#: Merge.rc:531
 #, c-format
 msgid "&Hide Items"
 msgstr ""
 
-#: Merge.rc:529
+#: Merge.rc:533
 #, c-format
 msgid "&Open Left"
 msgstr ""
 
-#: Merge.rc:535
+#: Merge.rc:539
 #, c-format
 msgid "O&pen Right"
 msgstr ""
 
-#: Merge.rc:542
+#: Merge.rc:546
 #, c-format
 msgid "Cop&y Pathnames"
 msgstr ""
 
-#: Merge.rc:544
+#: Merge.rc:548
 #, c-format
 msgid "&Left (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:545
+#: Merge.rc:549
 #, c-format
 msgid "&Right (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:546
+#: Merge.rc:550
 #, c-format
 msgid "&Both (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:548
+#: Merge.rc:552
 #, c-format
 msgid "Copy &Filenames"
 msgstr ""
 
-#: Merge.rc:550
+#: Merge.rc:554
 #, c-format
 msgid "&Zip"
 msgstr ""
 
-#: Merge.rc:552
+#: Merge.rc:556
 #, c-format
 msgid "&Left... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:553
+#: Merge.rc:557
 #, c-format
 msgid "&Right... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:554
+#: Merge.rc:558
 #, c-format
 msgid "&Both... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:555
+#: Merge.rc:559
 #, c-format
 msgid "&Differences... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:558
+#: Merge.rc:562
 #, c-format
 msgid "&Refresh"
 msgstr ""
 
-#: Merge.rc:570
+#: Merge.rc:574
 #, c-format
 msgid "&Copy Full Path"
 msgstr ""
 
-#: Merge.rc:571
+#: Merge.rc:575
 #, c-format
 msgid "Copy &Filename"
 msgstr ""
 
-#: Merge.rc:577
+#: Merge.rc:581
 #, c-format
 msgid "Prediffer Settings"
 msgstr ""
 
-#: Merge.rc:579
+#: Merge.rc:583
 #, c-format
 msgid "&No prediffer"
 msgstr ""
 
-#: Merge.rc:580
+#: Merge.rc:584
 #, c-format
 msgid "Auto prediffer"
 msgstr ""
 
-#: Merge.rc:588
+#: Merge.rc:592
 #, c-format
 msgid "G&oto Diff"
 msgstr ""
 
-#: Merge.rc:591
+#: Merge.rc:595
 #, c-format
 msgid "&No Moved Blocks"
 msgstr ""
 
-#: Merge.rc:592
+#: Merge.rc:596
 #, c-format
 msgid "&All Moved Blocks"
 msgstr ""
 
-#: Merge.rc:593
+#: Merge.rc:597
 #, c-format
 msgid "Moved Block for &Current Diff"
 msgstr ""
 
-#: Merge.rc:664
+#: Merge.rc:668
 #, c-format
 msgid "About WinMerge"
 msgstr ""
 
-#: Merge.rc:670
+#: Merge.rc:674
 #, c-format
 msgid "(Private Build)"
 msgstr ""
 
-#: Merge.rc:671
+#: Merge.rc:675
 #, c-format
 msgid "All rights reserved."
 msgstr ""
 
-#: Merge.rc:672
+#: Merge.rc:676
 #, c-format
 msgid "Visit the WinMerge HomePage!"
 msgstr ""
 
-#: Merge.rc:675
-#: Merge.rc:707
-#: Merge.rc:799
-#: Merge.rc:985
-#: Merge.rc:1056
-#: Merge.rc:1085
-#: Merge.rc:1095
-#: Merge.rc:1261
-#: Merge.rc:1325
-#: Merge.rc:1338
-#: Merge.rc:1430
-#: Merge.rc:1445
-#: Merge.rc:1667
+#: Merge.rc:679
+#: Merge.rc:711
+#: Merge.rc:803
+#: Merge.rc:986
+#: Merge.rc:1057
+#: Merge.rc:1086
+#: Merge.rc:1096
+#: Merge.rc:1245
+#: Merge.rc:1309
+#: Merge.rc:1322
+#: Merge.rc:1414
+#: Merge.rc:1429
+#: Merge.rc:1651
 #, c-format
 msgid "OK"
 msgstr ""
 
-#: Merge.rc:676
+#: Merge.rc:680
 #, c-format
 msgid "Contributors"
 msgstr ""
 
-#: Merge.rc:683
+#: Merge.rc:687
 #, c-format
 msgid "Select Files or Folders"
 msgstr ""
 
-#: Merge.rc:686
-#: Merge.rc:1596
+#: Merge.rc:690
+#: Merge.rc:1580
 #, c-format
 msgid "&Left:"
 msgstr ""
 
-#: Merge.rc:690
-#: Merge.rc:751
-#: Merge.rc:999
-#: Merge.rc:1021
+#: Merge.rc:694
+#: Merge.rc:755
+#: Merge.rc:1000
+#: Merge.rc:1022
 #, c-format
 msgid "&Browse..."
 msgstr ""
 
-#: Merge.rc:691
-#: Merge.rc:1600
+#: Merge.rc:695
+#: Merge.rc:1584
 #, c-format
 msgid "&Right:"
 msgstr ""
 
-#: Merge.rc:695
-#: Merge.rc:1032
+#: Merge.rc:699
+#: Merge.rc:1033
 #, c-format
 msgid "Bro&wse..."
 msgstr ""
 
-#: Merge.rc:696
-#: Merge.rc:1604
+#: Merge.rc:700
+#: Merge.rc:1588
 #, c-format
 msgid "&Filter:"
 msgstr ""
 
-#: Merge.rc:699
-#: Merge.rc:1606
+#: Merge.rc:703
+#: Merge.rc:1590
 #, c-format
 msgid "Select..."
 msgstr ""
 
-#: Merge.rc:700
+#: Merge.rc:704
 #, c-format
 msgid "&Unpacker:"
 msgstr ""
 
-#: Merge.rc:703
+#: Merge.rc:707
 #, c-format
 msgid "&Select..."
 msgstr ""
 
-#: Merge.rc:704
-#: Merge.rc:1607
+#: Merge.rc:708
+#: Merge.rc:1591
 #, c-format
 msgid "&Include Subfolders"
 msgstr ""
 
-#: Merge.rc:706
+#: Merge.rc:710
 #, c-format
 msgid "Status:"
 msgstr ""
 
-#: Merge.rc:708
-#: Merge.rc:738
-#: Merge.rc:800
-#: Merge.rc:830
-#: Merge.rc:862
-#: Merge.rc:872
-#: Merge.rc:1057
-#: Merge.rc:1086
-#: Merge.rc:1096
-#: Merge.rc:1147
-#: Merge.rc:1262
-#: Merge.rc:1339
-#: Merge.rc:1431
-#: Merge.rc:1446
-#: Merge.rc:1668
+#: Merge.rc:712
+#: Merge.rc:742
+#: Merge.rc:804
+#: Merge.rc:834
+#: Merge.rc:866
+#: Merge.rc:876
+#: Merge.rc:1058
+#: Merge.rc:1087
+#: Merge.rc:1097
+#: Merge.rc:1148
+#: Merge.rc:1246
+#: Merge.rc:1323
+#: Merge.rc:1415
+#: Merge.rc:1430
+#: Merge.rc:1652
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#: Merge.rc:709
-#: Merge.rc:1340
+#: Merge.rc:713
+#: Merge.rc:1324
 #, c-format
 msgid "Help"
 msgstr ""
 
-#: Merge.rc:710
+#: Merge.rc:714
 #, c-format
 msgid "Files or Folders to Compare"
 msgstr ""
 
-#: Merge.rc:717
+#: Merge.rc:721
 #, c-format
 msgid "Visual SourceSafe"
 msgstr ""
 
-#: Merge.rc:722
+#: Merge.rc:726
 #, c-format
 msgid "Database:"
 msgstr ""
 
-#: Merge.rc:725
+#: Merge.rc:729
 #, c-format
 msgid "Project:"
 msgstr ""
 
-#: Merge.rc:728
+#: Merge.rc:732
 #, c-format
 msgid "User:"
 msgstr ""
 
-#: Merge.rc:730
+#: Merge.rc:734
 #, c-format
 msgid "Password:"
 msgstr ""
 
-#: Merge.rc:732
+#: Merge.rc:736
 #, c-format
 msgid "Link to Destination VSS project"
 msgstr ""
 
-#: Merge.rc:734
-#: Merge.rc:877
+#: Merge.rc:738
+#: Merge.rc:881
 #, c-format
 msgid "Apply to all items"
 msgstr ""
 
-#: Merge.rc:736
+#: Merge.rc:740
 #, c-format
 msgid "Check Out"
 msgstr ""
 
-#: Merge.rc:737
-#: Merge.rc:873
+#: Merge.rc:741
+#: Merge.rc:877
 #, c-format
 msgid "Save As..."
 msgstr ""
 
-#: Merge.rc:743
+#: Merge.rc:747
 #, c-format
 msgid "Versioning System"
 msgstr ""
 
-#: Merge.rc:746
+#: Merge.rc:750
 #, c-format
 msgid "&Versioning System:"
 msgstr ""
 
-#: Merge.rc:749
-#: Merge.rc:2067
+#: Merge.rc:753
+#: Merge.rc:2070
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr ""
 
-#: Merge.rc:756
+#: Merge.rc:760
 #: Merge.rc:1943
+#: Merge.rc:1956
 #, c-format
 msgid "General"
 msgstr ""
 
-#: Merge.rc:759
+#: Merge.rc:763
 #, c-format
 msgid "Automatically &scroll to first difference"
 msgstr ""
 
-#: Merge.rc:762
+#: Merge.rc:766
 #, c-format
 msgid "&Disable Splash Screen"
 msgstr ""
 
-#: Merge.rc:764
+#: Merge.rc:768
 #, c-format
 msgid "Cl&ose windows with ESC"
 msgstr ""
 
-#: Merge.rc:766
+#: Merge.rc:770
 #, c-format
 msgid "&Automatically verify paths in Open-dialog"
 msgstr ""
 
-#: Merge.rc:769
+#: Merge.rc:773
 #, c-format
 msgid "All&ow only one instance to run"
 msgstr ""
 
-#: Merge.rc:771
+#: Merge.rc:775
 #, c-format
 msgid "As&k when closing multiple windows"
 msgstr ""
 
-#: Merge.rc:773
+#: Merge.rc:777
 #, c-format
 msgid "&Preserve file time in file compare"
 msgstr ""
 
-#: Merge.rc:776
+#: Merge.rc:780
 #, c-format
 msgid "Show \"Select Files or Folders\" Dialog on Startup"
 msgstr ""
 
-#: Merge.rc:778
+#: Merge.rc:782
 #, c-format
 msgid "O&pen-dialog Auto-Completion:"
 msgstr ""
 
-#: Merge.rc:781
+#: Merge.rc:785
 #, c-format
 msgid "Enable multiple compare windows for"
 msgstr ""
 
-#: Merge.rc:783
-#: Merge.rc:1619
+#: Merge.rc:787
+#: Merge.rc:1603
 #, c-format
 msgid "&Folder compare"
 msgstr ""
 
-#: Merge.rc:785
-#: Merge.rc:1621
+#: Merge.rc:789
+#: Merge.rc:1605
 #, c-format
 msgid "Fil&e compare"
 msgstr ""
 
-#: Merge.rc:787
+#: Merge.rc:791
 #, c-format
 msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
 msgstr ""
 
-#: Merge.rc:789
+#: Merge.rc:793
 #, c-format
 msgid "Reset"
 msgstr ""
 
-#: Merge.rc:796
+#: Merge.rc:800
 #, c-format
 msgid "Language"
 msgstr ""
 
-#: Merge.rc:803
+#: Merge.rc:807
 #, c-format
 msgid "Available languages:"
 msgstr ""
 
-#: Merge.rc:809
+#: Merge.rc:813
 #, c-format
 msgid "Find"
 msgstr ""
 
-#: Merge.rc:812
-#: Merge.rc:839
+#: Merge.rc:816
+#: Merge.rc:843
 #, c-format
 msgid "Fi&nd what:"
 msgstr ""
 
-#: Merge.rc:815
-#: Merge.rc:845
+#: Merge.rc:819
+#: Merge.rc:849
 #, c-format
 msgid "Match &whole word only"
 msgstr ""
 
-#: Merge.rc:817
-#: Merge.rc:847
+#: Merge.rc:821
+#: Merge.rc:851
 #, c-format
 msgid "Match &case"
 msgstr ""
 
-#: Merge.rc:819
-#: Merge.rc:849
+#: Merge.rc:823
+#: Merge.rc:853
 #, c-format
 msgid "Regular &expression"
 msgstr ""
 
-#: Merge.rc:821
+#: Merge.rc:825
 #, c-format
 msgid "D&on't wrap end of file"
 msgstr ""
 
-#: Merge.rc:824
+#: Merge.rc:828
 #, c-format
 msgid "Direction"
 msgstr ""
 
-#: Merge.rc:825
+#: Merge.rc:829
 #, c-format
 msgid "&Up"
 msgstr ""
 
-#: Merge.rc:827
+#: Merge.rc:831
 #, c-format
 msgid "&Down"
 msgstr ""
 
-#: Merge.rc:829
-#: Merge.rc:859
+#: Merge.rc:833
+#: Merge.rc:863
 #, c-format
 msgid "&Find Next"
 msgstr ""
 
-#: Merge.rc:836
+#: Merge.rc:840
 #, c-format
 msgid "Replace"
 msgstr ""
 
-#: Merge.rc:842
+#: Merge.rc:846
 #, c-format
 msgid "Re&place with:"
 msgstr ""
 
-#: Merge.rc:851
+#: Merge.rc:855
 #, c-format
 msgid "&Don't wrap end of file"
 msgstr ""
 
-#: Merge.rc:854
+#: Merge.rc:858
 #, c-format
 msgid "Replace in"
 msgstr ""
 
-#: Merge.rc:855
+#: Merge.rc:859
 #, c-format
 msgid "&Selection"
 msgstr ""
 
-#: Merge.rc:857
+#: Merge.rc:861
 #, c-format
 msgid "Wh&ole file"
 msgstr ""
 
-#: Merge.rc:860
+#: Merge.rc:864
 #, c-format
 msgid "&Replace"
 msgstr ""
 
-#: Merge.rc:861
+#: Merge.rc:865
 #, c-format
 msgid "Replace &All"
 msgstr ""
 
-#: Merge.rc:868
-#: Merge.rc:2189
+#: Merge.rc:872
+#: Merge.rc:2192
 #, c-format
 msgid "Rational ClearCase"
 msgstr ""
 
-#: Merge.rc:871
+#: Merge.rc:875
 #, c-format
 msgid "CheckOut"
 msgstr ""
 
-#: Merge.rc:876
-#: Merge.rc:1181
+#: Merge.rc:880
+#: Merge.rc:1166
 #, c-format
 msgid "Comments"
 msgstr ""
 
-#: Merge.rc:879
+#: Merge.rc:883
 #, c-format
 msgid "CheckIn after checkout"
 msgstr ""
 
-#: Merge.rc:885
+#: Merge.rc:889
 #, c-format
 msgid "Linefilters"
 msgstr ""
 
-#: Merge.rc:888
+#: Merge.rc:892
 #, c-format
 msgid "Enable Line Filters"
 msgstr ""
 
-#: Merge.rc:891
+#: Merge.rc:895
 #, c-format
 msgid "Regular Expressions (one per line):"
 msgstr ""
 
-#: Merge.rc:898
+#: Merge.rc:900
 #, c-format
-msgid "Save"
-msgstr ""
-
-#: Merge.rc:899
-#, c-format
 msgid "New"
 msgstr ""
 
-#: Merge.rc:900
+#: Merge.rc:901
 #, c-format
 msgid "Edit"
 msgstr ""
 
-#: Merge.rc:901
+#: Merge.rc:902
 #, c-format
 msgid "Remove"
 msgstr ""
 
-#: Merge.rc:906
+#: Merge.rc:907
 #: Merge.rc:1946
 #, c-format
 msgid "Colors"
 msgstr ""
 
-#: Merge.rc:909
+#: Merge.rc:910
 #, c-format
 msgid "Difference:"
 msgstr ""
 
-#: Merge.rc:913
+#: Merge.rc:914
 #, c-format
 msgid "Selected Difference:"
 msgstr ""
 
-#: Merge.rc:917
-#: Merge.rc:1571
+#: Merge.rc:918
+#: Merge.rc:1555
 #, c-format
 msgid "Background"
 msgstr ""
 
-#: Merge.rc:918
+#: Merge.rc:919
 #, c-format
 msgid "Deleted"
 msgstr ""
 
-#: Merge.rc:931
-#: Merge.rc:1366
-#: Merge.rc:1572
+#: Merge.rc:932
+#: Merge.rc:1350
+#: Merge.rc:1556
+#: Merge.rc:1947
 #, c-format
 msgid "Text"
 msgstr ""
 
-#: Merge.rc:935
+#: Merge.rc:936
 #, c-format
 msgid "Ignored Difference:"
 msgstr ""
 
-#: Merge.rc:945
+#: Merge.rc:946
 #, c-format
 msgid "Moved:"
 msgstr ""
 
-#: Merge.rc:955
+#: Merge.rc:956
 #, c-format
 msgid "Selected Moved:"
 msgstr ""
 
-#: Merge.rc:962
+#: Merge.rc:963
 #, c-format
 msgid "Word Difference:"
 msgstr ""
 
-#: Merge.rc:969
+#: Merge.rc:970
 #, c-format
 msgid "Selected Word Diff:"
 msgstr ""
 
-#: Merge.rc:976
-#: Merge.rc:1055
-#: Merge.rc:1084
-#: Merge.rc:1184
-#: Merge.rc:1412
+#: Merge.rc:977
+#: Merge.rc:1056
+#: Merge.rc:1085
+#: Merge.rc:1168
+#: Merge.rc:1396
+#: Merge.rc:1686
 #, c-format
 msgid "Defaults"
 msgstr ""
 
-#: Merge.rc:982
-#: Merge.rc:1354
-#: Merge.rc:1560
+#: Merge.rc:983
+#: Merge.rc:1338
+#: Merge.rc:1544
 #, c-format
 msgid "Dialog"
 msgstr ""
 
-#: Merge.rc:992
+#: Merge.rc:993
 #: Merge.rc:1949
 #, c-format
 msgid "System"
 msgstr ""
 
-#: Merge.rc:995
+#: Merge.rc:996
 #, c-format
 msgid "&Send deleted files to Recycle Bin"
 msgstr ""
 
-#: Merge.rc:997
+#: Merge.rc:998
 #, c-format
 msgid "&External editor:"
 msgstr ""
 
-#: Merge.rc:1000
+#: Merge.rc:1001
 #, c-format
 msgid "&Filter folder:"
 msgstr ""
 
-#: Merge.rc:1002
+#: Merge.rc:1003
 #, c-format
 msgid "B&rowse..."
 msgstr ""
 
-#: Merge.rc:1003
+#: Merge.rc:1004
 #, c-format
 msgid "Temporary files folder"
 msgstr ""
 
-#: Merge.rc:1004
+#: Merge.rc:1005
 #, c-format
 msgid "S&ystem's temp folder"
 msgstr ""
 
-#: Merge.rc:1006
+#: Merge.rc:1007
 #, c-format
 msgid "C&ustom folder:"
 msgstr ""
 
-#: Merge.rc:1009
-#: Merge.rc:1025
+#: Merge.rc:1010
+#: Merge.rc:1026
 #, c-format
 msgid "Br&owse..."
 msgstr ""
 
-#: Merge.rc:1015
+#: Merge.rc:1016
 #, c-format
 msgid "Patch Generator"
 msgstr ""
 
-#: Merge.rc:1018
+#: Merge.rc:1019
 #, c-format
 msgid "File&1:"
 msgstr ""
 
-#: Merge.rc:1022
+#: Merge.rc:1023
 #, c-format
 msgid "File&2:"
 msgstr ""
 
-#: Merge.rc:1026
+#: Merge.rc:1027
 #, c-format
 msgid "&Swap"
 msgstr ""
 
-#: Merge.rc:1027
+#: Merge.rc:1028
 #, c-format
 msgid "&Append to existing file"
 msgstr ""
 
-#: Merge.rc:1029
+#: Merge.rc:1030
 #, c-format
 msgid "&Result:"
 msgstr ""
 
-#: Merge.rc:1033
+#: Merge.rc:1034
 #, c-format
 msgid "&Format"
 msgstr ""
 
-#: Merge.rc:1034
+#: Merge.rc:1035
 #, c-format
 msgid "St&yle:"
 msgstr ""
 
-#: Merge.rc:1037
+#: Merge.rc:1038
 #, c-format
 msgid "&Context:"
 msgstr ""
 
-#: Merge.rc:1040
+#: Merge.rc:1041
 #, c-format
 msgid "W&hitespaces"
 msgstr ""
 
-#: Merge.rc:1041
+#: Merge.rc:1042
 #, c-format
 msgid "Com&pare"
 msgstr ""
 
-#: Merge.rc:1043
+#: Merge.rc:1044
 #, c-format
 msgid "I&gnore changes"
 msgstr ""
 
-#: Merge.rc:1045
+#: Merge.rc:1046
 #, c-format
 msgid "Ig&nore all"
 msgstr ""
 
-#: Merge.rc:1047
+#: Merge.rc:1048
 #, c-format
 msgid "Ignor&e blank lines"
 msgstr ""
 
-#: Merge.rc:1049
+#: Merge.rc:1050
 #, c-format
 msgid "Case sensi&tive"
 msgstr ""
 
-#: Merge.rc:1051
+#: Merge.rc:1052
 #, c-format
 msgid "Inclu&de command line"
 msgstr ""
 
-#: Merge.rc:1053
+#: Merge.rc:1054
 #, c-format
 msgid "Open to e&xternal editor"
 msgstr ""
 
-#: Merge.rc:1075
+#: Merge.rc:1076
 #, c-format
 msgid "Display Columns"
 msgstr ""
 
-#: Merge.rc:1081
+#: Merge.rc:1082
 #, c-format
 msgid "Move &Up"
 msgstr ""
 
-#: Merge.rc:1082
+#: Merge.rc:1083
 #, c-format
 msgid "Move &Down"
 msgstr ""
 
-#: Merge.rc:1092
+#: Merge.rc:1093
 #, c-format
 msgid "Select Unpacker"
 msgstr ""
 
-#: Merge.rc:1097
+#: Merge.rc:1098
 #, c-format
 msgid "File unpacker:"
 msgstr ""
 
-#: Merge.rc:1100
+#: Merge.rc:1101
 #, c-format
 msgid "Display all unpackers, don't check the extension"
 msgstr ""
 
-#: Merge.rc:1103
+#: Merge.rc:1104
 #, c-format
 msgid "Extensions list:"
 msgstr ""
 
-#: Merge.rc:1104
+#: Merge.rc:1105
 #, c-format
 msgid "Description:"
 msgstr ""
 
-#: Merge.rc:1115
+#: Merge.rc:1116
 #, c-format
 msgid " Folder Compare Progress"
 msgstr ""
 
-#: Merge.rc:1118
+#: Merge.rc:1119
 #: Merge.rc:1896
 #, c-format
 msgid "Stop"
 msgstr ""
 
-#: Merge.rc:1123
+#: Merge.rc:1124
 #, c-format
 msgid "Comparing items..."
 msgstr ""
 
-#: Merge.rc:1124
+#: Merge.rc:1125
 #, c-format
 msgid "Items compared:"
 msgstr ""
 
-#: Merge.rc:1125
+#: Merge.rc:1126
 #, c-format
 msgid "Items total:"
 msgstr ""
 
-#: Merge.rc:1131
+#: Merge.rc:1132
 #, c-format
 msgid "Go To"
 msgstr ""
 
-#: Merge.rc:1134
+#: Merge.rc:1135
 #, c-format
 msgid "G&oto:"
 msgstr ""
 
-#: Merge.rc:1136
+#: Merge.rc:1137
 #, c-format
 msgid "File"
 msgstr ""
 
-#: Merge.rc:1141
+#: Merge.rc:1142
 #, c-format
 msgid "Goto what"
 msgstr ""
 
-#: Merge.rc:1142
+#: Merge.rc:1143
 #, c-format
 msgid "Li&ne"
 msgstr ""
 
-#: Merge.rc:1144
+#: Merge.rc:1145
 #, c-format
 msgid "&Difference"
 msgstr ""
 
-#: Merge.rc:1146
+#: Merge.rc:1147
 #, c-format
 msgid "&Go To"
 msgstr ""
 
-#: Merge.rc:1152
+#: Merge.rc:1153
 #: Merge.rc:1944
 #, c-format
 msgid "Compare"
 msgstr ""
 
-#: Merge.rc:1155
+#: Merge.rc:1156
 #, c-format
 msgid "Whitespace"
 msgstr ""
 
-#: Merge.rc:1156
+#: Merge.rc:1157
 #, c-format
 msgid "&Compare"
 msgstr ""
@@ -1819,792 +1832,804 @@
 msgid "&Ignore change"
 msgstr ""
 
-#: Merge.rc:1160
+#: Merge.rc:1159
 #, c-format
 msgid "I&gnore all"
 msgstr ""
 
-#: Merge.rc:1162
+#: Merge.rc:1160
 #, c-format
 msgid "Ignore blan&k lines"
 msgstr ""
 
-#: Merge.rc:1164
+#: Merge.rc:1161
 #, c-format
 msgid "Ignore &case"
 msgstr ""
 
-#: Merge.rc:1166
+#: Merge.rc:1162
 #, c-format
 msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
 msgstr ""
 
-#: Merge.rc:1169
+#: Merge.rc:1164
 #, c-format
 msgid "E&nable moved block detection"
 msgstr ""
 
-#: Merge.rc:1171
+#: Merge.rc:1165
 #, c-format
 msgid "&Match similar lines"
 msgstr ""
 
-#: Merge.rc:1173
+#: Merge.rc:1167
 #, c-format
-msgid "Ign&ore time differences less than 3 seconds"
-msgstr ""
-
-#: Merge.rc:1176
-#, c-format
-msgid "&File Compare method:"
-msgstr ""
-
-#: Merge.rc:1179
-#, c-format
-msgid "S&top after first difference"
-msgstr ""
-
-#: Merge.rc:1182
-#, c-format
 msgid "Filter Comments"
 msgstr ""
 
-#: Merge.rc:1189
+#: Merge.rc:1173
 #: Merge.rc:1945
 #, c-format
 msgid "Editor"
 msgstr ""
 
-#: Merge.rc:1192
+#: Merge.rc:1176
 #, c-format
 msgid "&Highlight syntax"
 msgstr ""
 
-#: Merge.rc:1194
+#: Merge.rc:1178
 #, c-format
 msgid "&Automatic rescan"
 msgstr ""
 
-#: Merge.rc:1196
+#: Merge.rc:1180
 #, c-format
 msgid "&Preserve original EOL chars"
 msgstr ""
 
-#: Merge.rc:1198
+#: Merge.rc:1182
 #, c-format
 msgid "Tabs"
 msgstr ""
 
-#: Merge.rc:1199
+#: Merge.rc:1183
 #, c-format
 msgid "&Tab size:"
 msgstr ""
 
-#: Merge.rc:1202
+#: Merge.rc:1186
 #, c-format
 msgid "&Insert Tabs"
 msgstr ""
 
-#: Merge.rc:1204
+#: Merge.rc:1188
 #, c-format
 msgid "Insert &Spaces"
 msgstr ""
 
-#: Merge.rc:1206
+#: Merge.rc:1190
 #, c-format
 msgid "Line Difference Coloring"
 msgstr ""
 
-#: Merge.rc:1208
+#: Merge.rc:1192
 #, c-format
 msgid "View line differences"
 msgstr ""
 
-#: Merge.rc:1210
+#: Merge.rc:1194
 #, c-format
 msgid "&Character level"
 msgstr ""
 
-#: Merge.rc:1212
+#: Merge.rc:1196
 #, c-format
 msgid "&Word-level:"
 msgstr ""
 
-#: Merge.rc:1227
+#: Merge.rc:1211
 #, c-format
 msgid "Filefilters"
 msgstr ""
 
-#: Merge.rc:1233
+#: Merge.rc:1217
 #, c-format
 msgid "Test"
 msgstr ""
 
-#: Merge.rc:1234
+#: Merge.rc:1218
 #, c-format
 msgid "Install..."
 msgstr ""
 
-#: Merge.rc:1235
+#: Merge.rc:1219
 #, c-format
 msgid "New..."
 msgstr ""
 
-#: Merge.rc:1236
+#: Merge.rc:1220
 #, c-format
 msgid "Edit..."
 msgstr ""
 
-#: Merge.rc:1237
+#: Merge.rc:1221
 #, c-format
 msgid "Delete..."
 msgstr ""
 
-#: Merge.rc:1243
+#: Merge.rc:1227
 #, c-format
 msgid "Save modified files?"
 msgstr ""
 
-#: Merge.rc:1246
+#: Merge.rc:1230
 #, c-format
 msgid "Left side file"
 msgstr ""
 
-#: Merge.rc:1249
+#: Merge.rc:1233
 #, c-format
 msgid "&Save changes"
 msgstr ""
 
-#: Merge.rc:1251
+#: Merge.rc:1235
 #, c-format
 msgid "&Discard changes"
 msgstr ""
 
-#: Merge.rc:1253
+#: Merge.rc:1237
 #, c-format
 msgid "Right side file"
 msgstr ""
 
-#: Merge.rc:1256
+#: Merge.rc:1240
 #, c-format
 msgid "S&ave changes"
 msgstr ""
 
-#: Merge.rc:1258
+#: Merge.rc:1242
 #, c-format
 msgid "Dis&card changes"
 msgstr ""
 
-#: Merge.rc:1260
+#: Merge.rc:1244
 #, c-format
 msgid "Discard All"
 msgstr ""
 
-#: Merge.rc:1267
-#: Merge.rc:1515
+#: Merge.rc:1251
+#: Merge.rc:1499
 #: Merge.rc:1951
 #, c-format
 msgid "Codepage"
 msgstr ""
 
-#: Merge.rc:1270
+#: Merge.rc:1254
 #, c-format
 msgid "Default Codepage"
 msgstr ""
 
-#: Merge.rc:1271
+#: Merge.rc:1255
 #, c-format
 msgid "Select the default codepage assumed when loading non-Unicode files:"
 msgstr ""
 
-#: Merge.rc:1273
+#: Merge.rc:1257
 #, c-format
 msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
 msgstr ""
 
-#: Merge.rc:1276
+#: Merge.rc:1260
 #, c-format
 msgid "System codepage"
 msgstr ""
 
-#: Merge.rc:1278
+#: Merge.rc:1262
 #, c-format
 msgid "According to WinMerge User Interface"
 msgstr ""
 
-#: Merge.rc:1280
+#: Merge.rc:1264
 #, c-format
 msgid "Custom codepage:"
 msgstr ""
 
-#: Merge.rc:1288
+#: Merge.rc:1272
 #, c-format
 msgid "WinMerge - Archive support disabled"
 msgstr ""
 
-#: Merge.rc:1291
+#: Merge.rc:1275
 #, c-format
 msgid "Unable to detect 7-Zip version (not installed?)"
 msgstr ""
 
-#: Merge.rc:1294
+#: Merge.rc:1278
 #, c-format
 msgid "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation."
 msgstr ""
 
-#: Merge.rc:1296
+#: Merge.rc:1280
 #, c-format
 msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
 msgstr ""
 
-#: Merge.rc:1298
+#: Merge.rc:1282
 #, c-format
 msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available."
 msgstr ""
 
-#: Merge.rc:1300
+#: Merge.rc:1284
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: Merge.rc:1302
+#: Merge.rc:1286
 #, c-format
 msgid "Plugin required\n(dllbuild %04u)"
 msgstr ""
 
-#: Merge.rc:1304
+#: Merge.rc:1288
 #, c-format
 msgid "Recommended version of 7-Zip:"
 msgstr ""
 
-#: Merge.rc:1307
-#: Merge.rc:1310
+#: Merge.rc:1291
+#: Merge.rc:1294
 #, c-format
 msgid "present"
 msgstr ""
 
-#: Merge.rc:1308
+#: Merge.rc:1292
 #, c-format
 msgid "Merge7z000U.dll"
 msgstr ""
 
-#: Merge.rc:1311
+#: Merge.rc:1295
 #, c-format
 msgid "7-Zip software installed on your computer:"
 msgstr ""
 
-#: Merge.rc:1313
-#: Merge.rc:1318
+#: Merge.rc:1297
+#: Merge.rc:1302
 #, c-format
 msgid "none"
 msgstr ""
 
-#: Merge.rc:1315
+#: Merge.rc:1299
 #, c-format
 msgid "missing"
 msgstr ""
 
-#: Merge.rc:1316
+#: Merge.rc:1300
 #, c-format
 msgid "7-Zip components for standalone operation:"
 msgstr ""
 
-#: Merge.rc:1320
+#: Merge.rc:1304
 #, c-format
 msgid "outdated"
 msgstr ""
 
-#: Merge.rc:1321
+#: Merge.rc:1305
 #, c-format
 msgid "Plugins on path:"
 msgstr ""
 
-#: Merge.rc:1322
+#: Merge.rc:1306
 #, c-format
 msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
 msgstr ""
 
-#: Merge.rc:1326
+#: Merge.rc:1310
 #, c-format
 msgid "Plugin Download"
 msgstr ""
 
-#: Merge.rc:1335
+#: Merge.rc:1319
 #, c-format
 msgid "Options"
 msgstr ""
 
-#: Merge.rc:1346
+#: Merge.rc:1330
 #, c-format
 msgid " Categories"
 msgstr ""
 
-#: Merge.rc:1348
+#: Merge.rc:1332
 #, c-format
 msgid "Import..."
 msgstr ""
 
-#: Merge.rc:1349
+#: Merge.rc:1333
 #, c-format
 msgid "Export..."
 msgstr ""
 
-#: Merge.rc:1357
+#: Merge.rc:1341
 #, c-format
 msgid "Keywords:"
 msgstr ""
 
-#: Merge.rc:1358
+#: Merge.rc:1342
 #, c-format
 msgid "Function names:"
 msgstr ""
 
-#: Merge.rc:1359
+#: Merge.rc:1343
 #, c-format
 msgid "Comments:"
 msgstr ""
 
-#: Merge.rc:1360
+#: Merge.rc:1344
 #, c-format
 msgid "Numbers:"
 msgstr ""
 
-#: Merge.rc:1361
+#: Merge.rc:1345
 #, c-format
 msgid "Operators:"
 msgstr ""
 
-#: Merge.rc:1362
+#: Merge.rc:1346
 #, c-format
 msgid "Strings:"
 msgstr ""
 
-#: Merge.rc:1363
+#: Merge.rc:1347
 #, c-format
 msgid "Preprocessor:"
 msgstr ""
 
-#: Merge.rc:1364
+#: Merge.rc:1348
 #, c-format
 msgid "User 1:"
 msgstr ""
 
-#: Merge.rc:1365
+#: Merge.rc:1349
 #, c-format
 msgid "User 2:"
 msgstr ""
 
-#: Merge.rc:1370
-#: Merge.rc:1375
-#: Merge.rc:1380
-#: Merge.rc:1385
-#: Merge.rc:1390
-#: Merge.rc:1395
-#: Merge.rc:1400
-#: Merge.rc:1405
-#: Merge.rc:1410
+#: Merge.rc:1354
+#: Merge.rc:1359
+#: Merge.rc:1364
+#: Merge.rc:1369
+#: Merge.rc:1374
+#: Merge.rc:1379
+#: Merge.rc:1384
+#: Merge.rc:1389
+#: Merge.rc:1394
 #, c-format
 msgid "Bold"
 msgstr ""
 
-#: Merge.rc:1418
+#: Merge.rc:1402
 #, c-format
 msgid "Folder Compare Report"
 msgstr ""
 
-#: Merge.rc:1421
+#: Merge.rc:1405
 #, c-format
 msgid "Report &File:"
 msgstr ""
 
-#: Merge.rc:1424
-#: Merge.rc:1598
-#: Merge.rc:1602
-#: Merge.rc:1629
+#: Merge.rc:1408
+#: Merge.rc:1582
+#: Merge.rc:1586
+#: Merge.rc:1613
 #, c-format
 msgid "Browse..."
 msgstr ""
 
-#: Merge.rc:1425
+#: Merge.rc:1409
 #, c-format
 msgid "&Style:"
 msgstr ""
 
-#: Merge.rc:1428
+#: Merge.rc:1412
 #, c-format
 msgid "&Copy to Clipboard"
 msgstr ""
 
-#: Merge.rc:1436
+#: Merge.rc:1420
 #, c-format
 msgid "Shared or Private Filter"
 msgstr ""
 
-#: Merge.rc:1439
+#: Merge.rc:1423
 #, c-format
 msgid "Which type of filter do you want to create?"
 msgstr ""
 
-#: Merge.rc:1441
+#: Merge.rc:1425
 #, c-format
 msgid "Shared Filter (for all users on this machine)"
 msgstr ""
 
-#: Merge.rc:1443
+#: Merge.rc:1427
 #, c-format
 msgid "Private Filter (only for current user)"
 msgstr ""
 
-#: Merge.rc:1451
+#: Merge.rc:1435
 #: Merge.rc:1952
 #, c-format
 msgid "Archive Support"
 msgstr ""
 
-#: Merge.rc:1454
+#: Merge.rc:1438
 #, c-format
 msgid "Archive support requires 7-Zip plugin installed:"
 msgstr ""
 
-#: Merge.rc:1456
+#: Merge.rc:1440
 #, c-format
 msgid "Download 7-zip Plugin"
 msgstr ""
 
-#: Merge.rc:1457
+#: Merge.rc:1441
 #, c-format
 msgid "&Enable archive file support"
 msgstr ""
 
-#: Merge.rc:1459
+#: Merge.rc:1443
 #, c-format
 msgid "&Use stand-alone 7-Zip if available"
 msgstr ""
 
-#: Merge.rc:1462
+#: Merge.rc:1446
 #, c-format
 msgid "U&se local 7-Zip from WinMerge folder"
 msgstr ""
 
-#: Merge.rc:1464
+#: Merge.rc:1448
 #, c-format
 msgid "&Detect archive type from file signature"
 msgstr ""
 
-#: Merge.rc:1472
+#: Merge.rc:1456
 #, c-format
 msgid "Compare Statistics"
 msgstr ""
 
-#: Merge.rc:1475
+#: Merge.rc:1459
 #, c-format
 msgid "Folders:"
 msgstr ""
 
-#: Merge.rc:1476
+#: Merge.rc:1460
 #, c-format
 msgid "Files:"
 msgstr ""
 
-#: Merge.rc:1477
-#: Merge.rc:2343
+#: Merge.rc:1461
+#: Merge.rc:2346
 #, c-format
 msgid "Different"
 msgstr ""
 
-#: Merge.rc:1478
+#: Merge.rc:1462
 #, c-format
 msgid "Text:"
 msgstr ""
 
-#: Merge.rc:1481
-#: Merge.rc:1500
+#: Merge.rc:1465
+#: Merge.rc:1484
 #, c-format
 msgid "Binary:"
 msgstr ""
 
-#: Merge.rc:1484
+#: Merge.rc:1468
 #, c-format
 msgid "Unique"
 msgstr ""
 
-#: Merge.rc:1485
+#: Merge.rc:1469
 #, c-format
 msgid "Left:"
 msgstr ""
 
-#: Merge.rc:1490
+#: Merge.rc:1474
 #, c-format
 msgid "Right:"
 msgstr ""
 
-#: Merge.rc:1495
-#: Merge.rc:2337
+#: Merge.rc:1479
+#: Merge.rc:2340
 #, c-format
 msgid "Identical"
 msgstr ""
 
-#: Merge.rc:1504
+#: Merge.rc:1488
 #, c-format
 msgid "Total:"
 msgstr ""
 
-#: Merge.rc:1509
+#: Merge.rc:1493
 #, c-format
 msgid "Close"
 msgstr ""
 
-#: Merge.rc:1518
+#: Merge.rc:1502
 #, c-format
 msgid "Affects"
 msgstr ""
 
-#: Merge.rc:1521
-#: Merge.rc:1524
+#: Merge.rc:1505
+#: Merge.rc:1508
 #, c-format
 msgid "(Affects)"
 msgstr ""
 
-#: Merge.rc:1525
+#: Merge.rc:1509
 #, c-format
 msgid "Select Codepage for"
 msgstr ""
 
-#: Merge.rc:1526
+#: Merge.rc:1510
 #, c-format
 msgid "&File Loading:"
 msgstr ""
 
-#: Merge.rc:1528
-#: Merge.rc:1531
+#: Merge.rc:1512
+#: Merge.rc:1515
 #, c-format
 msgid "..."
 msgstr ""
 
-#: Merge.rc:1529
+#: Merge.rc:1513
 #, c-format
 msgid "File &Saving:"
 msgstr ""
 
-#: Merge.rc:1532
+#: Merge.rc:1516
 #, c-format
 msgid "&Use same codepage for both"
 msgstr ""
 
-#: Merge.rc:1535
+#: Merge.rc:1519
 #, c-format
 msgid "&Apply"
 msgstr ""
 
-#: Merge.rc:1536
+#: Merge.rc:1520
 #: Merge.rc:1918
 #, c-format
 msgid "&Cancel"
 msgstr ""
 
-#: Merge.rc:1541
+#: Merge.rc:1525
 #, c-format
 msgid "Test Filter"
 msgstr ""
 
-#: Merge.rc:1544
+#: Merge.rc:1528
 #, c-format
 msgid "Testing filter ..."
 msgstr ""
 
-#: Merge.rc:1546
+#: Merge.rc:1530
 #, c-format
 msgid "&Enter text to test:"
 msgstr ""
 
-#: Merge.rc:1548
+#: Merge.rc:1532
 #, c-format
 msgid "&Folder Name"
 msgstr ""
 
-#: Merge.rc:1550
+#: Merge.rc:1534
 #, c-format
 msgid "Result:"
 msgstr ""
 
-#: Merge.rc:1554
+#: Merge.rc:1538
 #, c-format
 msgid "&Test"
 msgstr ""
 
-#: Merge.rc:1555
+#: Merge.rc:1539
 #, c-format
 msgid "&Close"
 msgstr ""
 
-#: Merge.rc:1563
+#: Merge.rc:1547
 #, c-format
 msgid "&Use customized text colors"
 msgstr ""
 
-#: Merge.rc:1566
+#: Merge.rc:1550
 #, c-format
 msgid "Custom text colors"
 msgstr ""
 
-#: Merge.rc:1568
+#: Merge.rc:1552
 #, c-format
 msgid "Whitespace:"
 msgstr ""
 
-#: Merge.rc:1569
+#: Merge.rc:1553
 #, c-format
 msgid "Regular text:"
 msgstr ""
 
-#: Merge.rc:1570
+#: Merge.rc:1554
 #, c-format
 msgid "Selection:"
 msgstr ""
 
-#: Merge.rc:1593
+#: Merge.rc:1577
 #, c-format
 msgid "Paths"
 msgstr ""
 
-#: Merge.rc:1599
+#: Merge.rc:1583
 #, c-format
 msgid "R&ead-only"
 msgstr ""
 
-#: Merge.rc:1603
+#: Merge.rc:1587
 #, c-format
 msgid "Re&ad-only"
 msgstr ""
 
-#: Merge.rc:1609
+#: Merge.rc:1593
 #, c-format
 msgid "Open..."
 msgstr ""
 
-#: Merge.rc:1610
+#: Merge.rc:1594
 #, c-format
 msgid "Save..."
 msgstr ""
 
-#: Merge.rc:1615
+#: Merge.rc:1599
 #: Merge.rc:1953
 #, c-format
 msgid "Backup Files"
 msgstr ""
 
-#: Merge.rc:1618
+#: Merge.rc:1602
 #, c-format
 msgid "Create backup files in:"
 msgstr ""
 
-#: Merge.rc:1623
+#: Merge.rc:1607
 #, c-format
 msgid "Create backup files into:"
 msgstr ""
 
-#: Merge.rc:1624
+#: Merge.rc:1608
 #, c-format
 msgid "&Original file's folder"
 msgstr ""
 
-#: Merge.rc:1626
+#: Merge.rc:1610
 #, c-format
 msgid "&Global backup folder:"
 msgstr ""
 
-#: Merge.rc:1630
+#: Merge.rc:1614
 #, c-format
 msgid "Backup filename:"
 msgstr ""
 
-#: Merge.rc:1631
+#: Merge.rc:1615
 #, c-format
 msgid "&Append .bak -extension"
 msgstr ""
 
-#: Merge.rc:1633
+#: Merge.rc:1617
 #, c-format
 msgid "A&ppend timestamp"
 msgstr ""
 
-#: Merge.rc:1640
-#: Merge.rc:2245
+#: Merge.rc:1624
+#: Merge.rc:2248
 #, c-format
 msgid "Confirm Copy"
 msgstr ""
 
-#: Merge.rc:1644
+#: Merge.rc:1628
 #, c-format
 msgid "Are you sure you want to copy XXX items?"
 msgstr ""
 
-#: Merge.rc:1646
+#: Merge.rc:1630
 #, c-format
 msgid "From left"
 msgstr ""
 
-#: Merge.rc:1649
+#: Merge.rc:1633
 #, c-format
 msgid "To right"
 msgstr ""
 
-#: Merge.rc:1652
+#: Merge.rc:1636
 #, c-format
 msgid "Yes"
 msgstr ""
 
-#: Merge.rc:1653
+#: Merge.rc:1637
 #, c-format
 msgid "No"
 msgstr ""
 
-#: Merge.rc:1659
+#: Merge.rc:1643
 #, c-format
 msgid "Plugins"
 msgstr ""
 
-#: Merge.rc:1662
+#: Merge.rc:1646
 #, c-format
 msgid "&Enable plugins"
 msgstr ""
 
-#: Merge.rc:1673
+#: Merge.rc:1657
 #: Merge.rc:1954
 #, c-format
 msgid "Shell Integration"
 msgstr ""
 
-#: Merge.rc:1676
+#: Merge.rc:1660
 #, c-format
 msgid "Explorer"
 msgstr ""
 
-#: Merge.rc:1677
+#: Merge.rc:1661
 #, c-format
 msgid "E&nable advanced menu"
 msgstr ""
 
-#: Merge.rc:1679
+#: Merge.rc:1663
 #, c-format
 msgid "In&clude subfolders by default"
 msgstr ""
 
-#: Merge.rc:1681
+#: Merge.rc:1665
 #, c-format
 msgid "&Add to context menu"
 msgstr ""
 
-#: Merge.rc:1683
+#: Merge.rc:1667
 #, c-format
 msgid "Folder compare"
 msgstr ""
 
-#: Merge.rc:1684
+#: Merge.rc:1668
 #, c-format
 msgid "Add &Shell menu to context menu"
 msgstr ""
 
+#: Merge.rc:1675
+#: Merge.rc:1957
+#: Merge.rc:2294
+#, c-format
+msgid "Folder"
+msgstr ""
+
+#: Merge.rc:1679
+#, c-format
+msgid "S&top after first difference"
+msgstr ""
+
+#: Merge.rc:1681
+#, c-format
+msgid "Ign&ore time differences less than 3 seconds"
+msgstr ""
+
+#: Merge.rc:1683
+#, c-format
+msgid "&Compare method:"
+msgstr ""
+
+#: Merge.rc:1684
+#, c-format
+msgid "&Quick compare limit (MB):"
+msgstr ""
+
 #. StringFileInfo.Block
 #: Merge.rc:1710
 #, c-format
@@ -3033,14 +3058,9 @@
 msgid "Don't ask this &question again."
 msgstr ""
 
-#: Merge.rc:1947
-#, c-format
-msgid "Syntax colors"
-msgstr ""
-
 #: Merge.rc:1948
 #, c-format
-msgid "Text Colors"
+msgid "Syntax"
 msgstr ""
 
 #: Merge.rc:1950
@@ -3048,2589 +3068,2319 @@
 msgid "Version Control"
 msgstr ""
 
-#: Merge.rc:1961
+#: Merge.rc:1955
+#: Merge.rc:2326
 #, c-format
+msgid "Differences"
+msgstr ""
+
+#: Merge.rc:1964
+#, c-format
 msgid "To:"
 msgstr ""
 
-#: Merge.rc:1962
+#: Merge.rc:1965
 #, c-format
 msgid "From left:"
 msgstr ""
 
-#: Merge.rc:1963
+#: Merge.rc:1966
 #, c-format
 msgid "To left:"
 msgstr ""
 
-#: Merge.rc:1964
+#: Merge.rc:1967
 #, c-format
 msgid "From right:"
 msgstr ""
 
-#: Merge.rc:1965
+#: Merge.rc:1968
 #, c-format
 msgid "To right:"
 msgstr ""
 
-#: Merge.rc:1971
+#: Merge.rc:1974
 #, c-format
 msgid "Version %1"
 msgstr ""
 
-#: Merge.rc:1972
+#: Merge.rc:1975
 #, c-format
 msgid "Unicode"
 msgstr ""
 
-#: Merge.rc:1973
+#: Merge.rc:1976
 #, c-format
 msgid "X64"
 msgstr ""
 
-#: Merge.rc:1979
+#: Merge.rc:1982
 #, c-format
 msgid "Options (%1)"
 msgstr ""
 
-#: Merge.rc:1980
+#: Merge.rc:1983
 #, c-format
 msgid "All message boxes are now displayed again."
 msgstr ""
 
-#: Merge.rc:1981
+#: Merge.rc:1984
 #, c-format
 msgid "Modifications have been made to the current file comparison session.  Some settings may not take place until the current file comparison is restarted."
 msgstr ""
 
-#: Merge.rc:1982
+#: Merge.rc:1985
 #, c-format
 msgid "The selected font change will not be applied to any currently visible difference windows."
 msgstr ""
 
-#: Merge.rc:1984
+#: Merge.rc:1987
 #, c-format
 msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
 msgstr ""
 
-#: Merge.rc:1986
+#: Merge.rc:1989
 #, c-format
 msgid "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
 msgstr ""
 
-#: Merge.rc:1992
+#: Merge.rc:1995
 #, c-format
 msgid "Open"
 msgstr ""
 
-#: Merge.rc:1993
+#: Merge.rc:1996
 #, c-format
 msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1994
+#: Merge.rc:1997
 #, c-format
 msgid "All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1995
+#: Merge.rc:1998
 #, c-format
 msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
 msgstr ""
 
-#: Merge.rc:1997
+#: Merge.rc:2000
 #, c-format
 msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:2003
+#: Merge.rc:2006
 #, c-format
 msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:2004
+#: Merge.rc:2007
 #, c-format
 msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:2005
+#: Merge.rc:2008
 #, c-format
 msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:2011
+#: Merge.rc:2014
 #, c-format
 msgid "UTF-8"
 msgstr ""
 
-#: Merge.rc:2012
+#: Merge.rc:2015
 #, c-format
 msgid "UTF-8 (B)"
 msgstr ""
 
-#: Merge.rc:2013
+#: Merge.rc:2016
 #, c-format
 msgid "UCS-2 LE"
 msgstr ""
 
-#: Merge.rc:2014
+#: Merge.rc:2017
 #, c-format
 msgid "UCS-2 BE"
 msgstr ""
 
-#: Merge.rc:2020
+#: Merge.rc:2023
 #, c-format
 msgid "Full Contents"
 msgstr ""
 
-#: Merge.rc:2021
+#: Merge.rc:2024
 #, c-format
 msgid "Quick Contents"
 msgstr ""
 
-#: Merge.rc:2022
+#: Merge.rc:2025
 #, c-format
 msgid "Modified Date"
 msgstr ""
 
-#: Merge.rc:2023
+#: Merge.rc:2026
 #, c-format
 msgid "Modified Date and Size"
 msgstr ""
 
-#: Merge.rc:2024
+#: Merge.rc:2027
 #, c-format
 msgid "Size"
 msgstr ""
 
-#: Merge.rc:2030
-#: Merge.rc:2655
+#: Merge.rc:2033
+#: Merge.rc:2559
 #, c-format
 msgid "Name"
 msgstr ""
 
-#: Merge.rc:2031
+#: Merge.rc:2034
 #, c-format
 msgid "Location"
 msgstr ""
 
-#: Merge.rc:2032
+#: Merge.rc:2035
 #, c-format
 msgid "Filters"
 msgstr ""
 
-#: Merge.rc:2033
+#: Merge.rc:2036
 #, c-format
 msgid "[F] "
 msgstr ""
 
-#: Merge.rc:2034
-#: Merge.rc:2657
+#: Merge.rc:2037
+#: Merge.rc:2561
 #, c-format
 msgid "Description"
 msgstr ""
 
-#: Merge.rc:2035
+#: Merge.rc:2038
 #, c-format
 msgid "Select filename for new filter"
 msgstr ""
 
-#: Merge.rc:2036
+#: Merge.rc:2039
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:2038
+#: Merge.rc:2041
 #, c-format
 msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2."
 msgstr ""
 
-#: Merge.rc:2040
+#: Merge.rc:2043
 #, c-format
 msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable."
 msgstr ""
 
-#: Merge.rc:2042
+#: Merge.rc:2045
 #, c-format
 msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System."
 msgstr ""
 
-#: Merge.rc:2044
+#: Merge.rc:2047
 #, c-format
 msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
 msgstr ""
 
-#: Merge.rc:2045
+#: Merge.rc:2048
 #, c-format
 msgid "Locate filter file to install"
 msgstr ""
 
-#: Merge.rc:2047
+#: Merge.rc:2050
 #, c-format
 msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
 msgstr ""
 
-#: Merge.rc:2049
+#: Merge.rc:2052
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr ""
 
-#: Merge.rc:2055
+#: Merge.rc:2058
 #, c-format
 msgid "Regular expression"
 msgstr ""
 
-#: Merge.rc:2061
+#: Merge.rc:2064
 #, c-format
 msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
 msgstr ""
 
-#: Merge.rc:2068
+#: Merge.rc:2071
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr ""
 
-#: Merge.rc:2074
+#: Merge.rc:2077
 #, c-format
 msgid "Folder Comparison Results"
 msgstr ""
 
-#: Merge.rc:2075
+#: Merge.rc:2078
 #, c-format
 msgid "File Comparison"
 msgstr ""
 
-#: Merge.rc:2076
+#: Merge.rc:2079
 #, c-format
 msgid "Untitled left"
 msgstr ""
 
-#: Merge.rc:2077
+#: Merge.rc:2080
 #, c-format
 msgid "Untitled right"
 msgstr ""
 
-#: Merge.rc:2078
+#: Merge.rc:2081
 #, c-format
 msgid "Theirs File"
 msgstr ""
 
-#: Merge.rc:2079
+#: Merge.rc:2082
 #, c-format
 msgid "Mine File"
 msgstr ""
 
-#: Merge.rc:2085
+#: Merge.rc:2088
 #, c-format
 msgid "Scanning files..."
 msgstr ""
 
-#: Merge.rc:2086
+#: Merge.rc:2089
 #, c-format
 msgid "Opening selection"
 msgstr ""
 
-#: Merge.rc:2087
+#: Merge.rc:2090
 #, c-format
 msgid "Copying Left to Right"
 msgstr ""
 
-#: Merge.rc:2088
+#: Merge.rc:2091
 #, c-format
 msgid "Copying Right to Left"
 msgstr ""
 
-#: Merge.rc:2089
+#: Merge.rc:2092
 #, c-format
 msgid "Copying All to Left"
 msgstr ""
 
-#: Merge.rc:2090
+#: Merge.rc:2093
 #, c-format
 msgid "Copying All to Right"
 msgstr ""
 
-#: Merge.rc:2091
+#: Merge.rc:2094
 #, c-format
 msgid "Copying files..."
 msgstr ""
 
-#: Merge.rc:2092
+#: Merge.rc:2095
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: Merge.rc:2093
+#: Merge.rc:2096
 #, c-format
 msgid "Moving files..."
 msgstr ""
 
-#: Merge.rc:2094
+#: Merge.rc:2097
 #, c-format
 msgid "Creating the report..."
 msgstr ""
 
-#: Merge.rc:2095
+#: Merge.rc:2098
 #, c-format
 msgid "Undoing the last operation..."
 msgstr ""
 
-#: Merge.rc:2096
+#: Merge.rc:2099
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr ""
 
-#: Merge.rc:2102
+#: Merge.rc:2105
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
-#: Merge.rc:2103
+#: Merge.rc:2106
 #, c-format
 msgid "Line: %s"
 msgstr ""
 
-#: Merge.rc:2104
+#: Merge.rc:2107
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
-#: Merge.rc:2105
+#: Merge.rc:2108
 #, c-format
 msgid "Merge"
 msgstr ""
 
-#: Merge.rc:2106
+#: Merge.rc:2109
 #, c-format
 msgid "Difference %1 of %2"
 msgstr ""
 
-#: Merge.rc:2107
+#: Merge.rc:2110
 #, c-format
 msgid "%1 Differences Found"
 msgstr ""
 
-#: Merge.rc:2108
+#: Merge.rc:2111
 #, c-format
 msgid "1 Difference Found"
 msgstr ""
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2109
+#: Merge.rc:2112
 #, c-format
 msgid "RO"
 msgstr ""
 
-#: Merge.rc:2115
+#: Merge.rc:2118
 #, c-format
 msgid "Item %1 of %2"
 msgstr ""
 
-#: Merge.rc:2116
+#: Merge.rc:2119
 #, c-format
 msgid "Items: %1"
 msgstr ""
 
-#: Merge.rc:2122
+#: Merge.rc:2125
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr ""
 
-#: Merge.rc:2123
+#: Merge.rc:2126
 #, c-format
 msgid "Folder Selection"
 msgstr ""
 
-#: Merge.rc:2124
+#: Merge.rc:2127
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr ""
 
-#: Merge.rc:2125
+#: Merge.rc:2128
 #, c-format
 msgid "Left path is invalid!"
 msgstr ""
 
-#: Merge.rc:2126
+#: Merge.rc:2129
 #, c-format
 msgid "Right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2127
+#: Merge.rc:2130
 #, c-format
 msgid "Both paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2128
+#: Merge.rc:2131
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr ""
 
-#: Merge.rc:2129
+#: Merge.rc:2132
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr ""
 
-#: Merge.rc:2135
+#: Merge.rc:2138
 #, c-format
 msgid "File not found: %1"
 msgstr ""
 
-#: Merge.rc:2136
+#: Merge.rc:2139
 #, c-format
 msgid "File not unpacked: %1"
 msgstr ""
 
-#: Merge.rc:2137
+#: Merge.rc:2140
 #, c-format
 msgid "Cannot open file\n%1\n\n%2"
 msgstr ""
 
-#: Merge.rc:2138
+#: Merge.rc:2141
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr ""
 
-#: Merge.rc:2139
+#: Merge.rc:2142
 #, c-format
 msgid "The file\n%1\nis not a conflict file."
 msgstr ""
 
-#: Merge.rc:2145
+#: Merge.rc:2148
 #, c-format
 msgid "Save As"
 msgstr ""
 
-#: Merge.rc:2146
+#: Merge.rc:2149
 #, c-format
 msgid "Save changes to %1?"
 msgstr ""
 
-#: Merge.rc:2147
+#: Merge.rc:2150
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr ""
 
-#: Merge.rc:2148
+#: Merge.rc:2151
 #, c-format
 msgid "Error checking destination writeability"
 msgstr ""
 
-#: Merge.rc:2149
+#: Merge.rc:2152
 #, c-format
 msgid "Error backing up file"
 msgstr ""
 
-#: Merge.rc:2151
+#: Merge.rc:2154
 #, c-format
 msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
 msgstr ""
 
-#: Merge.rc:2152
+#: Merge.rc:2155
 #, c-format
 msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
 msgstr ""
 
-#: Merge.rc:2153
+#: Merge.rc:2156
 #, c-format
 msgid "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
 msgstr ""
 
-#: Merge.rc:2154
+#: Merge.rc:2157
 #, c-format
 msgid "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
 msgstr ""
 
-#: Merge.rc:2155
+#: Merge.rc:2158
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite chang...
 
[truncated message content]

[Winmerge-svn] SF.net SVN: winmerge:[7527] branches/R2_14

[<sdo...@us...>]

Revision: 7527
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7527&view=rev
Author:   sdottaka
Date:     2011-05-23 13:54:11 +0000 (Mon, 23 May 2011)

Log Message:
-----------
Write config log as UTF-8 file.

backport from rev. 7057

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/ConfigLog.cpp
    branches/R2_14/Src/ConfigLog.h

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2011-05-22 15:10:48 UTC (rev 7526)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2011-05-23 13:54:11 UTC (rev 7527)
@@ -18,6 +18,7 @@
   Allow giving encoding name as custom codepage (#2813825, #3010934)
   Add new options dialog panel for folder compare options (#2819626)
   Add options GUI for quick compare limit (#2825628)
+  Write config log as UTF-8 file (r7057)
   Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed 
     in status bar (#3025855)
   Bugfix: Pane headers not updated after language change (#2923684)

Modified: branches/R2_14/Src/ConfigLog.cpp
===================================================================
--- branches/R2_14/Src/ConfigLog.cpp	2011-05-22 15:10:48 UTC (rev 7526)
+++ branches/R2_14/Src/ConfigLog.cpp	2011-05-23 13:54:11 UTC (rev 7527)
@@ -25,6 +25,7 @@
 #include "StdAfx.h"
 #include "Constants.h"
 #include "version.h"
+#include "UniFile.h"
 #include "DiffWrapper.h"
 #include "ConfigLog.h"
 #include "winnt_supp.h"
@@ -44,11 +45,13 @@
 CConfigLog::CConfigLog()
 : m_pCfgSettings(NULL)
 {
+	m_pfile = new UniStdioFile();
 }
 
 CConfigLog::~CConfigLog()
 {
 	CloseFile();
+	delete m_pfile;
 }
 
 
@@ -64,10 +67,11 @@
 /** 
  * @brief Write plugin names
  */
-void CConfigLog::WritePluginsInLogFile(LPCWSTR transformationEvent, CStdioFile & file)
+void CConfigLog::WritePluginsInLogFile(LPCWSTR transformationEvent)
 {
 	// do nothing if actually reading config file
-	if (file.m_hFile == CFile::hFileNull) return;
+	if (!m_writing)
+		return;
 
 	// get an array with the available scripts
 	PluginArray * piPluginArray; 
@@ -79,11 +83,11 @@
 	for (iPlugin = 0 ; iPlugin < piPluginArray->GetSize() ; iPlugin++)
 	{
 		PluginInfo & plugin = piPluginArray->ElementAt(iPlugin);
-		file.WriteString(_T("\n  "));
-		file.WriteString(plugin.m_name.c_str());
-		file.WriteString(_T(" ["));
-		file.WriteString(plugin.m_filepath.c_str());
-		file.WriteString(_T("]"));
+		m_pfile->WriteString(_T("\r\n  "));
+		m_pfile->WriteString(plugin.m_name.c_str());
+		m_pfile->WriteString(_T(" ["));
+		m_pfile->WriteString(plugin.m_filepath.c_str());
+		m_pfile->WriteString(_T("]"));
 	}
 }
 
@@ -131,27 +135,29 @@
 /**
  * @brief Write string item
  */
-static void WriteItem(CStdioFile &file, int indent, LPCTSTR key, LPCTSTR value = 0)
+void CConfigLog::WriteItem(int indent, LPCTSTR key, LPCTSTR value)
 {
 	// do nothing if actually reading config file
-	if (file.m_hFile == CFile::hFileNull) return;
+	if (!m_writing)
+		return;
 
 	CString text;
-	text.Format(value ? _T("%*.0s%s: %s\n") : _T("%*.0s%s:\n"), indent, key, key, value);
-	file.WriteString(text);
+	text.Format(value ? _T("%*.0s%s: %s\r\n") : _T("%*.0s%s:\r\n"), indent, key, key, value);
+	m_pfile->WriteString((LPCTSTR)text);
 }
 
 /**
  * @brief Write int item
  */
-static void WriteItem(CStdioFile &file, int indent, LPCTSTR key, long value)
+void CConfigLog::WriteItem(int indent, LPCTSTR key, long value)
 {
 	// do nothing if actually reading config file
-	if (file.m_hFile == CFile::hFileNull) return;
+	if (!m_writing)
+		return;
 
 	CString text;
-	text.Format(_T("%*.0s%s: %ld\n"), indent, key, key, value);
-	file.WriteString(text);
+	text.Format(_T("%*.0s%s: %ld\r\n"), indent, key, key, value);
+	m_pfile->WriteString((LPCTSTR)text);
 }
 
 /**
@@ -162,8 +168,8 @@
 	if (m_writing)
 	{
 		CString text;
-		text.Format(_T("%*.0s%s: %s\n"), indent, key, key, *pvalue ? _T("Yes") : _T("No"));
-		m_file.WriteString(text);
+		text.Format(_T("%*.0s%s: %s\r\n"), indent, key, key, *pvalue ? _T("Yes") : _T("No"));
+		m_pfile->WriteString((LPCTSTR)text);
 	}
 	else
 	{
@@ -194,27 +200,29 @@
 /**
  * @brief Write out various possibly relevant windows locale information
  */
-static void WriteLocaleSettings(CStdioFile & file, LCID locid, LPCTSTR title)
+void CConfigLog::WriteLocaleSettings(LCID locid, LPCTSTR title)
 {
 	// do nothing if actually reading config file
-	if (file.m_hFile == CFile::hFileNull) return;
+	if (!m_writing)
+		return;
 
-	WriteItem(file, 1, title);
-	WriteItem(file, 2, _T("Def ANSI codepage"), GetLocaleString(locid, LOCALE_IDEFAULTANSICODEPAGE));
-	WriteItem(file, 2, _T("Def OEM codepage"), GetLocaleString(locid, LOCALE_IDEFAULTCODEPAGE));
-	WriteItem(file, 2, _T("Country"), GetLocaleString(locid, LOCALE_SENGCOUNTRY));
-	WriteItem(file, 2, _T("Language"), GetLocaleString(locid, LOCALE_SENGLANGUAGE));
-	WriteItem(file, 2, _T("Language code"), GetLocaleString(locid, LOCALE_ILANGUAGE));
-	WriteItem(file, 2, _T("ISO Language code"), GetLocaleString(locid, LOCALE_SISO639LANGNAME));
+	WriteItem(1, title);
+	WriteItem(2, _T("Def ANSI codepage"), GetLocaleString(locid, LOCALE_IDEFAULTANSICODEPAGE));
+	WriteItem(2, _T("Def OEM codepage"), GetLocaleString(locid, LOCALE_IDEFAULTCODEPAGE));
+	WriteItem(2, _T("Country"), GetLocaleString(locid, LOCALE_SENGCOUNTRY));
+	WriteItem(2, _T("Language"), GetLocaleString(locid, LOCALE_SENGLANGUAGE));
+	WriteItem(2, _T("Language code"), GetLocaleString(locid, LOCALE_ILANGUAGE));
+	WriteItem(2, _T("ISO Language code"), GetLocaleString(locid, LOCALE_SISO639LANGNAME));
 }
 
 /**
  * @brief Write version of a single executable file
  */
-static void WriteVersionOf1(CStdioFile &file, int indent, LPTSTR path)
+void CConfigLog::WriteVersionOf1(int indent, LPTSTR path)
 {
-	// do nothing if actually reading config file
-	if (file.m_hFile == CFile::hFileNull) return;
+	// Do nothing if actually reading config file
+	if (!m_writing)
+		return;
 
 	LPTSTR name = PathFindFileName(path);
 	CVersionInfo vi(path, TRUE);
@@ -222,8 +230,8 @@
 	text.Format
 	(
 		name == path
-	?	_T("%*s%-20s %s=%u.%02u %s=%04u\n")
-	:	_T("%*s%-20s %s=%u.%02u %s=%04u path=%s\n"),
+	?	_T("%*s%-20s %s=%u.%02u %s=%04u\r\n")
+	:	_T("%*s%-20s %s=%u.%02u %s=%04u path=%s\r\n"),
 		indent,
 		// Tilde prefix for modules currently mapped into WinMerge
 		GetModuleHandle(path) ? _T("~") : _T("")/*name*/,
@@ -239,13 +247,13 @@
 		vi.m_dvi.dwBuildNumber,
 		path
 	);
-	file.WriteString(text);
+	m_pfile->WriteString((LPCTSTR)text);
 }
 
 /**
  * @brief Write version of a set of executable files
  */
-static void WriteVersionOf(CStdioFile &file, int indent, LPTSTR path)
+void CConfigLog::WriteVersionOf(int indent, LPTSTR path)
 {
 	LPTSTR name = PathFindFileName(path);
 	WIN32_FIND_DATA ff;
@@ -255,7 +263,7 @@
 		do
 		{
 			lstrcpy(name, ff.cFileName);
-			WriteVersionOf1(file, indent, path);
+			WriteVersionOf1(indent, path);
 		} while (FindNextFile(h, &ff));
 		FindClose(h);
 	}
@@ -264,23 +272,23 @@
 /**
  * @brief Write version of 7-Zip plugins and shell context menu handler
  */
-static void WriteVersionOf7z(CStdioFile &file, LPTSTR path)
+void CConfigLog::WriteVersionOf7z(LPTSTR path)
 {
 	lstrcat(path, _T("\\7-zip*.dll"));
 	LPTSTR pattern = PathFindFileName(path);
-	WriteVersionOf(file, 2, path);
-	WriteItem(file, 2, _T("Codecs"));
+	WriteVersionOf(2, path);
+	WriteItem(2, _T("Codecs"));
 	lstrcpy(pattern, _T("codecs\\*.dll"));
-	WriteVersionOf(file, 3, path);
-	WriteItem(file, 2, _T("Formats"));
+	WriteVersionOf(3, path);
+	WriteItem(2, _T("Formats"));
 	lstrcpy(pattern, _T("formats\\*.dll"));
-	WriteVersionOf(file, 3, path);
+	WriteVersionOf(3, path);
 }
 
 /**
  * @brief Write archive support stuff
  */
-static void WriteArchiveSupport(CStdioFile &file)
+void CConfigLog::WriteArchiveSupport()
 {
 	DWORD registered = VersionOf7z(FALSE);
 	DWORD standalone = VersionOf7z(TRUE);
@@ -288,27 +296,27 @@
 	DWORD type = 0;
 	DWORD size = sizeof path;
 
-	WriteItem(file, 0, _T("Archive support"));
-	WriteItem(file, 1, _T("Enable"),
+	WriteItem(0, _T("Archive support"));
+	WriteItem(1, _T("Enable"),
 		AfxGetApp()->GetProfileInt(_T("Merge7z"), _T("Enable"), 0));
 
 	wsprintf(path, _T("%u.%02u"), UINT HIWORD(registered), UINT LOWORD(registered));
-	WriteItem(file, 1, _T("7-Zip software installed on your computer"), path);
+	WriteItem(1, _T("7-Zip software installed on your computer"), path);
 	static const TCHAR szSubKey[] = _T("Software\\7-Zip");
 	static const TCHAR szValue[] = _T("Path");
 	SHGetValue(HKEY_LOCAL_MACHINE, szSubKey, szValue, &type, path, &size);
-	WriteVersionOf7z(file, path);
+	WriteVersionOf7z(path);
 
 	wsprintf(path, _T("%u.%02u"), UINT HIWORD(standalone), UINT LOWORD(standalone));
-	WriteItem(file, 1, _T("7-Zip components for standalone operation"), path);
+	WriteItem(1, _T("7-Zip components for standalone operation"), path);
 	GetModuleFileName(0, path, countof(path));
 	LPTSTR pattern = PathFindFileName(path);
 	PathRemoveFileSpec(path);
-	WriteVersionOf7z(file, path);
+	WriteVersionOf7z(path);
 
-	WriteItem(file, 1, _T("Merge7z plugins on path"));
+	WriteItem(1, _T("Merge7z plugins on path"));
 	lstrcpy(pattern, _T("Merge7z*.dll"));
-	WriteVersionOf(file, 2, path);
+	WriteVersionOf(2, path);
 	// now see what's on the path:
 	if (DWORD cchPath = GetEnvironmentVariable(_T("path"), 0, 0))
 	{
@@ -323,7 +331,7 @@
 				CopyMemory(path, pchItem, cchItem*sizeof*pchItem);
 				path[cchItem] = 0;
 				PathAppend(path, _T("Merge7z*.dll"));
-				WriteVersionOf(file, 2, path);
+				WriteVersionOf(2, path);
 			}
 			pchItem += cchItem;
 		}
@@ -352,7 +360,7 @@
 			if (*pvalue == namemap[i].ival)
 				text = namemap[i].sval;
 		}
-		WriteItem(m_file, indent, key, text);
+		WriteItem(indent, key, text);
 	}
 	else
 	{
@@ -372,7 +380,6 @@
  */
 bool CConfigLog::DoFile(bool writing, CString &sError)
 {
-	CFileException e;
 	CVersionInfo version;
 	CString text;
 
@@ -385,26 +392,27 @@
 		sFileName = paths_ConcatPath(sFileName, _T("WinMerge.txt"));
 		m_sFileName = sFileName.c_str();
 
-		if (!m_file.Open(m_sFileName, CFile::modeCreate | CFile::modeWrite, &e))
+		if (!m_pfile->OpenCreateUtf8(m_sFileName))
 		{
-			TCHAR szError[1024];
-			e.GetErrorMessage(szError, 1024);
-			sError = szError;
+			const UniFile::UniError &err = m_pfile->GetLastUniError();
+			sError = err.GetError().c_str();
 			return false;
 		}
+		m_pfile->SetBom(true);
+		m_pfile->WriteBom();
 	}
 
 // Begin log
-	FileWriteString(_T("WinMerge configuration log\n"));
-	FileWriteString(_T("--------------------------\n"));
+	FileWriteString(_T("WinMerge configuration log\r\n"));
+	FileWriteString(_T("--------------------------\r\n"));
 	FileWriteString(_T("Saved to: "));
 	FileWriteString(m_sFileName);
-	FileWriteString(_T("\n* Please add this information (or attach this file)\n"));
-	FileWriteString(_T("* when reporting bugs.\n"));
-	FileWriteString(_T("Module names prefixed with tilda (~) are currently loaded in WinMerge process.\n"));
+	FileWriteString(_T("\r\n* Please add this information (or attach this file)\r\n"));
+	FileWriteString(_T("* when reporting bugs.\r\n"));
+	FileWriteString(_T("Module names prefixed with tilda (~) are currently loaded in WinMerge process.\r\n"));
 
 // Platform stuff
-	FileWriteString(_T("\n\nVersion information:\n"));
+	FileWriteString(_T("\r\n\r\nVersion information:\r\n"));
 	FileWriteString(_T(" WinMerge.exe: "));
 	FileWriteString(version.GetFixedProductVersion());
 
@@ -416,7 +424,7 @@
 	}
 
 	text = GetBuildFlags();
-	FileWriteString(_T("\n Build config: "));
+	FileWriteString(_T("\r\n Build config: "));
 	FileWriteString(text);
 
 	LPCTSTR szCmdLine = ::GetCommandLine();
@@ -444,24 +452,24 @@
 		szCmdLine = _T(" none");
 	}
 
-	FileWriteString(_T("\n Command Line: "));
+	FileWriteString(_T("\r\n Command Line: "));
 	FileWriteString(szCmdLine);
 
-	FileWriteString(_T("\n Windows: "));
+	FileWriteString(_T("\r\n Windows: "));
 	text = GetWindowsVer();
 	FileWriteString(text);
 
-	FileWriteString(_T("\n"));
-	WriteVersionOf1(m_file, 1, _T("COMCTL32.dll"));
-	WriteVersionOf1(m_file, 1, _T("shlwapi.dll"));
-	WriteVersionOf1(m_file, 1, _T("MergeLang.dll"));
-	WriteVersionOf1(m_file, 1, _T("ShellExtension.dll"));
-	WriteVersionOf1(m_file, 1, _T("ShellExtensionU.dll"));
-	WriteVersionOf1(m_file, 1, _T("ShellExtensionX64.dll"));
+	FileWriteString(_T("\r\n"));
+	WriteVersionOf1(1, _T("COMCTL32.dll"));
+	WriteVersionOf1(1, _T("shlwapi.dll"));
+	WriteVersionOf1(1, _T("MergeLang.dll"));
+	WriteVersionOf1(1, _T("ShellExtension.dll"));
+	WriteVersionOf1(1, _T("ShellExtensionU.dll"));
+	WriteVersionOf1(1, _T("ShellExtensionX64.dll"));
 
 // WinMerge settings
-	FileWriteString(_T("\nWinMerge configuration:\n"));
-	FileWriteString(_T(" Compare settings:\n"));
+	FileWriteString(_T("\r\nWinMerge configuration:\r\n"));
+	FileWriteString(_T(" Compare settings:\r\n"));
 
 	WriteItemYesNo(2, _T("Ignore blank lines"), &m_diffOptions.bIgnoreBlankLines);
 	WriteItemYesNo(2, _T("Ignore case"), &m_diffOptions.bIgnoreCase);
@@ -470,16 +478,16 @@
 	WriteItemWhitespace(2, _T("Whitespace compare"), &m_diffOptions.nIgnoreWhitespace);
 
 	WriteItemYesNo(2, _T("Detect moved blocks"), &m_miscSettings.bMovedBlocks);
-	WriteItem(m_file, 2, _T("Compare method"), m_compareSettings.nCompareMethod);
+	WriteItem(2, _T("Compare method"), m_compareSettings.nCompareMethod);
 	WriteItemYesNo(2, _T("Stop after first diff"), &m_compareSettings.bStopAfterFirst);
 
-	FileWriteString(_T("\n Other settings:\n"));
+	FileWriteString(_T("\r\n Other settings:\r\n"));
 	WriteItemYesNo(2, _T("Automatic rescan"), &m_miscSettings.bAutomaticRescan);
 	WriteItemYesNoInverted(2, _T("Simple EOL"), &m_miscSettings.bAllowMixedEol);
 	WriteItemYesNo(2, _T("Automatic scroll to 1st difference"), &m_miscSettings.bScrollToFirst);
 	WriteItemYesNo(2, _T("Backup original file"), &m_miscSettings.bBackup);
 
-	FileWriteString(_T("\n Folder compare:\n"));
+	FileWriteString(_T("\r\n Folder compare:\r\n"));
 	WriteItemYesNo(2, _T("Identical files"), &m_viewSettings.bShowIdent);
 	WriteItemYesNo(2, _T("Different files"), &m_viewSettings.bShowDiff);
 	WriteItemYesNo(2, _T("Left Unique files"), &m_viewSettings.bShowUniqueLeft);
@@ -488,54 +496,54 @@
 	WriteItemYesNo(2, _T("Skipped files"), &m_viewSettings.bShowSkipped);
 	WriteItemYesNo(2, _T("Tree-mode enabled"), &m_viewSettings.bTreeView);
 
-	FileWriteString(_T("\n File compare:\n"));
+	FileWriteString(_T("\r\n File compare:\r\n"));
 	WriteItemYesNo(2, _T("Preserve filetimes"), &m_miscSettings.bPreserveFiletimes);
 	WriteItemYesNo(2, _T("Match similar lines"), &m_miscSettings.bMatchSimilarLines);
 
-	FileWriteString(_T("\n Editor settings:\n"));
+	FileWriteString(_T("\r\n Editor settings:\r\n"));
 	WriteItemYesNo(2, _T("View Whitespace"), &m_miscSettings.bViewWhitespace);
 	WriteItemYesNo(2, _T("Merge Mode enabled"), &m_miscSettings.bMergeMode);
 	WriteItemYesNo(2, _T("Show linenumbers"), &m_miscSettings.bShowLinenumbers);
 	WriteItemYesNo(2, _T("Wrap lines"), &m_miscSettings.bWrapLines);
 	WriteItemYesNo(2, _T("Syntax Highlight"), &m_miscSettings.bSyntaxHighlight);
-	WriteItem(m_file, 2, _T("Tab size"), m_miscSettings.nTabSize);
+	WriteItem(2, _T("Tab size"), m_miscSettings.nTabSize);
 	WriteItemYesNoInverted(2, _T("Insert tabs"), &m_miscSettings.nInsertTabs);
 	
 // Font settings
-	FileWriteString(_T("\n Font:\n"));
-	FileWriteString(Fmt(_T("  Font facename: %s\n"), m_fontSettings.sFacename));
-	FileWriteString(Fmt(_T("  Font charset: %d (%s)\n"), m_fontSettings.nCharset, 
+	FileWriteString(_T("\r\n Font:\r\n"));
+	FileWriteString(Fmt(_T("  Font facename: %s\r\n"), m_fontSettings.sFacename));
+	FileWriteString(Fmt(_T("  Font charset: %d (%s)\r\n"), m_fontSettings.nCharset, 
 		FontCharsetName(m_fontSettings.nCharset)));
 
 // System settings
-	FileWriteString(_T("\nSystem settings:\n"));
-	FileWriteString(_T(" codepage settings:\n"));
-	WriteItem(m_file, 2, _T("ANSI codepage"), GetACP());
-	WriteItem(m_file, 2, _T("OEM codepage"), GetOEMCP());
-	WriteLocaleSettings(m_file, GetThreadLocale(), _T("Locale (Thread)"));
-	WriteLocaleSettings(m_file, LOCALE_USER_DEFAULT, _T("Locale (User)"));
-	WriteLocaleSettings(m_file, LOCALE_SYSTEM_DEFAULT, _T("Locale (System)"));
+	FileWriteString(_T("\r\nSystem settings:\r\n"));
+	FileWriteString(_T(" codepage settings:\r\n"));
+	WriteItem(2, _T("ANSI codepage"), GetACP());
+	WriteItem(2, _T("OEM codepage"), GetOEMCP());
+	WriteLocaleSettings(GetThreadLocale(), _T("Locale (Thread)"));
+	WriteLocaleSettings(LOCALE_USER_DEFAULT, _T("Locale (User)"));
+	WriteLocaleSettings(LOCALE_SYSTEM_DEFAULT, _T("Locale (System)"));
 
 // Codepage settings
 	WriteItemYesNo(1, _T("Detect codepage automatically for RC and HTML files"), &m_cpSettings.bDetectCodepage);
-	WriteItem(m_file, 1, _T("unicoder codepage"), getDefaultCodepage());
+	WriteItem(1, _T("unicoder codepage"), getDefaultCodepage());
 
 // Plugins
-	FileWriteString(_T("\nPlugins:\n"));
+	FileWriteString(_T("\r\nPlugins:\r\n"));
 	WriteItemYesNo(1, _T("Plugins enabled"), &m_miscSettings.bPluginsEnabled);
 	FileWriteString(_T(" Unpackers: "));
-	WritePluginsInLogFile(L"FILE_PACK_UNPACK", m_file);
-	WritePluginsInLogFile(L"BUFFER_PACK_UNPACK", m_file);
-	FileWriteString(_T("\n Prediffers: "));
-	WritePluginsInLogFile(L"FILE_PREDIFF", m_file);
-	WritePluginsInLogFile(L"BUFFER_PREDIFF", m_file);
-	FileWriteString(_T("\n Editor scripts: "));
-	WritePluginsInLogFile(L"EDITOR_SCRIPT", m_file);
+	WritePluginsInLogFile(L"FILE_PACK_UNPACK");
+	WritePluginsInLogFile(L"BUFFER_PACK_UNPACK");
+	FileWriteString(_T("\r\n Prediffers: "));
+	WritePluginsInLogFile(L"FILE_PREDIFF");
+	WritePluginsInLogFile(L"BUFFER_PREDIFF");
+	FileWriteString(_T("\r\n Editor scripts: "));
+	WritePluginsInLogFile(L"EDITOR_SCRIPT");
 	if (IsWindowsScriptThere() == FALSE)
-		FileWriteString(_T("\n .sct scripts disabled (Windows Script Host not found)\n"));
+		FileWriteString(_T("\r\n .sct scripts disabled (Windows Script Host not found)\r\n"));
 
-	FileWriteString(_T("\n\n"));
-	WriteArchiveSupport(m_file);
+	FileWriteString(_T("\r\n\r\n"));
+	WriteArchiveSupport();
 
 	CloseFile();
 
@@ -786,7 +794,7 @@
 		break;
 
 	case VER_PLATFORM_WIN32s:
-		sVersion = _T("Microsoft Win32s\n");
+		sVersion = _T("Microsoft Win32s\r\n");
 		break;
 
 	default:
@@ -892,7 +900,7 @@
 CConfigLog::FileWriteString(LPCTSTR lpsz)
 {
 	if (m_writing)
-		m_file.WriteString(lpsz);
+		m_pfile->WriteString(lpsz);
 }
 
 /**
@@ -901,8 +909,8 @@
 void
 CConfigLog::CloseFile()
 {
-	if (m_file.m_hFile != CFile::hFileNull)
-		m_file.Close();
+	if (m_pfile->IsOpen())
+		m_pfile->Close();
 	delete m_pCfgSettings;
 	m_pCfgSettings = 0;
 }

Modified: branches/R2_14/Src/ConfigLog.h
===================================================================
--- branches/R2_14/Src/ConfigLog.h	2011-05-22 15:10:48 UTC (rev 7526)
+++ branches/R2_14/Src/ConfigLog.h	2011-05-23 13:54:11 UTC (rev 7527)
@@ -26,6 +26,7 @@
 #define _CONFIGLOG_H_
 
 class CfgSettings;
+class UniStdioFile;
 
 /** 
  * @brief Compare-related settings.
@@ -112,11 +113,19 @@
 	bool WriteLogFile(CString &sError);
 	void ReadLogFile(const CString & Filepath);
 
+	// Implementation methods
+protected:
+	void WriteItem(int indent, LPCTSTR key, LPCTSTR value = 0);
+	void WriteItem(int indent, LPCTSTR key, long value);
+	void WriteVersionOf1(int indent, LPTSTR path);
+	void WriteVersionOf(int indent, LPTSTR path);
+	void WriteLocaleSettings(LCID locid, LPCTSTR title);
+	void WriteArchiveSupport();
+	void WriteVersionOf7z(LPTSTR path);
 
-	// Implementation methods
 private:
 	bool DoFile(bool writing, CString &sError);
-	void WritePluginsInLogFile(LPCWSTR transformationEvent, CStdioFile & file);
+	void WritePluginsInLogFile(LPCWSTR transformationEvent);
 	CString GetWindowsVer();
 	CString GetBuildFlags();
 	void FileWriteString(LPCTSTR lpsz);
@@ -128,11 +137,10 @@
 	bool ParseSettings(const CString & Filepath);
 	CString GetValueFromConfig(const CString & key);
 
-
 	// Implementation data
 private:
 	CString m_sFileName;
-	CStdioFile m_file;
+	UniStdioFile *m_pfile;
 	bool m_writing;
 	CfgSettings * m_pCfgSettings;
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7531] branches/R2_14

[<ge...@us...>]

Revision: 7531
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7531&view=rev
Author:   gerundt
Date:     2011-05-29 11:37:22 +0000 (Sun, 29 May 2011)

Log Message:
-----------
PATCH: [ 3306182 ] "+/-" from number block don't work

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/DirView.cpp
    branches/R2_14/Src/Merge.rc

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2011-05-29 11:36:51 UTC (rev 7530)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2011-05-29 11:37:22 UTC (rev 7531)
@@ -31,6 +31,7 @@
   Bugfix: Created new matching folder to wrong folder (#2890961)
   Bugfix: Strange scrolling effect in location pane (#2942869)
   Bugfix: Plugin error after interrupting folder compare (#2919475)
+  Bugfix: "+" and "-" from the number block don't work in the editor (#3306182)
   Translation updates:
   - Hungarian (#3164982)
 

Modified: branches/R2_14/Src/DirView.cpp
===================================================================
--- branches/R2_14/Src/DirView.cpp	2011-05-29 11:36:51 UTC (rev 7530)
+++ branches/R2_14/Src/DirView.cpp	2011-05-29 11:37:22 UTC (rev 7531)
@@ -2485,6 +2485,17 @@
 					return FALSE;
 				}
 			}
+			int sel = GetFocusedItem();
+			if (pMsg->wParam == VK_SUBTRACT)
+			{
+				CollapseSubdir(sel);
+				return TRUE;
+			}
+			if (pMsg->wParam == VK_ADD)
+			{
+				ExpandSubdir(sel);
+				return TRUE;
+			}
 		}
 		else
 		{

Modified: branches/R2_14/Src/Merge.rc
===================================================================
--- branches/R2_14/Src/Merge.rc	2011-05-29 11:36:51 UTC (rev 7530)
+++ branches/R2_14/Src/Merge.rc	2011-05-29 11:37:22 UTC (rev 7531)
@@ -649,9 +649,7 @@
     VK_RIGHT,       ID_L2R,                 VIRTKEY, ALT, NOINVERT
     VK_RIGHT,       ID_L2RNEXT,             VIRTKEY, CONTROL, ALT, NOINVERT
     VK_UP,          ID_PREVDIFF,            VIRTKEY, ALT, NOINVERT
-    VK_ADD,         ID_VIEW_EXPAND,         VIRTKEY,  NOINVERT
     VK_ADD,         ID_VIEW_ZOOMIN,         VIRTKEY, CONTROL, NOINVERT
-    VK_SUBTRACT,    ID_VIEW_COLLAPSE,       VIRTKEY, NOINVERT
     VK_SUBTRACT,    ID_VIEW_ZOOMOUT,        VIRTKEY, CONTROL, NOINVERT
     VK_MULTIPLY,    ID_VIEW_ZOOMNORMAL,     VIRTKEY, CONTROL, NOINVERT
 END


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Winmerge-svn] SF.net SVN: winmerge:[7533] branches/R2_14

[<sdo...@us...>]

Revision: 7533
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7533&view=rev
Author:   sdottaka
Date:     2011-05-30 16:21:43 +0000 (Mon, 30 May 2011)

Log Message:
-----------
BUG: [ 3175189 ] Date format does not respect Regional Settings

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/locality.cpp

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2011-05-30 16:20:52 UTC (rev 7532)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2011-05-30 16:21:43 UTC (rev 7533)
@@ -32,6 +32,7 @@
   Bugfix: Strange scrolling effect in location pane (#2942869)
   Bugfix: Plugin error after interrupting folder compare (#2919475)
   Bugfix: "+" and "-" from the number block don't work in the editor (#3306182)
+  Bugfix: Date format did not respect Regional Settings (#3175189)
   Translation updates:
   - Hungarian (#3164982)
 

Modified: branches/R2_14/Src/locality.cpp
===================================================================
--- branches/R2_14/Src/locality.cpp	2011-05-30 16:20:52 UTC (rev 7532)
+++ branches/R2_14/Src/locality.cpp	2011-05-30 16:21:43 UTC (rev 7533)
@@ -146,9 +146,9 @@
 	SYSTEMTIME sysTime;
 	odt.GetAsSystemTime(sysTime);
 	TCHAR buff[128];
-	int len = GetDateFormat(LOCALE_USER_DEFAULT, LOCALE_NOUSEROVERRIDE, &sysTime, NULL, buff, countof(buff));
+	int len = GetDateFormat(LOCALE_USER_DEFAULT, 0, &sysTime, NULL, buff, countof(buff));
 	buff[len - 1] = ' ';
-	GetTimeFormat(LOCALE_USER_DEFAULT, LOCALE_NOUSEROVERRIDE, &sysTime, NULL, buff + len, countof(buff) - len - 1);
+	GetTimeFormat(LOCALE_USER_DEFAULT, 0, &sysTime, NULL, buff + len, countof(buff) - len - 1);
 	return buff;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.