Thread: [Winmerge-svn] SF.net SVN: winmerge: [3531] trunk
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2006-09-06 15:06:42
|
Revision: 3531 http://svn.sourceforge.net/winmerge/?rev=3531&view=rev Author: kimmov Date: 2006-09-06 08:06:33 -0700 (Wed, 06 Sep 2006) Log Message: ----------- PATCH: [ 1552901 ] Update VC loose filefilter Modified Paths: -------------- trunk/Filters/Merge_VC_loose.flt trunk/Src/Changes.txt Modified: trunk/Filters/Merge_VC_loose.flt =================================================================== --- trunk/Filters/Merge_VC_loose.flt 2006-09-06 15:02:13 UTC (rev 3530) +++ trunk/Filters/Merge_VC_loose.flt 2006-09-06 15:06:33 UTC (rev 3531) @@ -26,7 +26,11 @@ f: \.pdb$ ## VC program database file (debugging symbolic information) f: \.sbr$ ## VC source browser file (used to create bsc file) f: \.res$ ## VC compiled resources file (output of RC [resource compiler]) +f: \.suo$ ## VC options file (binary) +f: \.ncb$ ## VC Intellisense file +f: \.opt$ ## VC project options file f: \.bak$ ## backup d: \\cvs$ ## CVS control directory +d: \\.svn$ ## Subversion control directory Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-06 15:02:13 UTC (rev 3530) +++ trunk/Src/Changes.txt 2006-09-06 15:06:33 UTC (rev 3531) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-06 Kimmo + PATCH: [ 1552901 ] Update VC loose filefilter + Filters: Merge_VC_loose.flt + 2006-09-05 Kimmo PATCH: [ 1552095 ] Fix last compare method not visible in GUI list Src: Merge.rc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdo...@us...> - 2006-09-11 14:29:40
|
Revision: 3546 http://svn.sourceforge.net/winmerge/?rev=3546&view=rev Author: sdottaka Date: 2006-09-11 07:29:27 -0700 (Mon, 11 Sep 2006) Log Message: ----------- Japanese translation update Modified Paths: -------------- trunk/Installer/InnoSetup/Changes.txt trunk/Installer/InnoSetup/Languages/Japanese.isl trunk/Src/Changes.txt trunk/Src/Languages/Japanese/MergeJapanese.rc Modified: trunk/Installer/InnoSetup/Changes.txt =================================================================== --- trunk/Installer/InnoSetup/Changes.txt 2006-09-11 14:09:56 UTC (rev 3545) +++ trunk/Installer/InnoSetup/Changes.txt 2006-09-11 14:29:27 UTC (rev 3546) @@ -1,3 +1,7 @@ +2006-09-11 Takashi + Japanese translation update + InnoSetup/Languages: Japanese.isl + 2006-09-05 Kimmo PATCH: [ 1552248 ] Install as a TortoiseSVN diff tool InnoSetup: WinMerge.iss Modified: trunk/Installer/InnoSetup/Languages/Japanese.isl =================================================================== --- trunk/Installer/InnoSetup/Languages/Japanese.isl 2006-09-11 14:09:56 UTC (rev 3545) +++ trunk/Installer/InnoSetup/Languages/Japanese.isl 2006-09-11 14:29:27 UTC (rev 3546) @@ -350,7 +350,7 @@ ;Tasks ExplorerContextMenu=\x83G\x83N\x83X\x83v\x83\x8D\x81[\x83\x89\x82̃R\x83\x93\x83e\x83L\x83X\x83g\x83\x81\x83j\x83\x85\x81[\x82ɒlj\xC1(&E) IntegrateTortoiseCVS=TortoiseCVS\x82Ƃ̘A\x8Cg(&T) -IntegrateTortoiseSVN=Integrate with T&ortoiseSVN +IntegrateTortoiseSVN=TortoiseSVN\x82Ƃ̘A\x8Cg(&O) IntegrateDelphi4=Borland Delphi 4 \x83o\x83C\x83i\x83\x8A\x83t\x83@\x83C\x83\x8B\x83T\x83|\x81[\x83g(&4) UpdatingCommonControls=\x83V\x83X\x83e\x83\x80\x82̃R\x83\x82\x83\x93\x83R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x82\xF0\x83A\x83b\x83v\x83f\x81[\x83g\x82\xB5\x82܂\xB7 Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-11 14:09:56 UTC (rev 3545) +++ trunk/Src/Changes.txt 2006-09-11 14:29:27 UTC (rev 3546) @@ -3,6 +3,10 @@ (This summarizes all changes to all files under Src, including Src\Languages.) 2006-09-11 Takashi + Japanese translation - update + Src/Languages/Japanese: MergeJapanese.rc + +2006-09-11 Takashi PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down Src: GhostTextView.cpp GhostTextView.h MergeDiffDetailView.cpp MergeDiffDetailView.h Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc =================================================================== --- trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-09-11 14:09:56 UTC (rev 3545) +++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-09-11 14:29:27 UTC (rev 3546) @@ -1948,12 +1948,12 @@ STRINGTABLE BEGIN IDS_CMDLINE_FILEMASK "/f or -f \x83t\x83@\x83C\x83\x8B\x83}\x83X\x83N\x82܂\xBD\x82̓t\x83B\x83\x8B\x83^\x96\xBC\x82\xF0\x90ݒ肵\x82܂\xB7" - IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical" - IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance" + IDS_CMDLINE_FASTCLOSE "/x or -x \x82\xE0\x82\xB5\x94\xE4\x8Ar\x8C\x8B\x89ʂ\xAA\x93\xAF\x88\xEA\x82ł\xA0\x82\xE9\x82Ȃ\xE7\x82\xCE WinMerge\x82\xF0\x95\xB6\x82܂\xB7" + IDS_CMDLINE_SINGLE_INST "/s or -s \x8E\xC0\x8Ds\x92\x86\x82\xCCWinMerge\x82Ŏw\x92肵\x82\xBD\x83p\x83X\x82\xF0\x8AJ\x82\xAB\x82܂\xB7" IDS_CMDLINE_LEFTPATH "leftpath \x82́A\x8D\xB6\x91\xA4\x82ŊJ\x82\xAD\x83t\x83H\x83\x8B\x83_\x82܂\xBD\x82̓t\x83@\x83C\x83\x8B\x96\xBC\x82ł\xB7" IDS_CMDLINE_RIGHTPATH "rightpath \x82́A\x89E\x91\xA4\x82ŊJ\x82\xAD\x83t\x83H\x83\x8B\x83_\x82܂\xBD\x82̓t\x83@\x83C\x83\x8B\x96\xBC\x82ł\xB7" IDS_CMDLINE_OUTPUTPATH "outputpath \x82́A\x8Fȗ\xAA\x89\\x82ȃ}\x81[\x83W\x82\xB3\x82ꂽ\x83t\x83@\x83C\x83\x8B\x82̕ۑ\xB6\x90\xE6\x83t\x83H\x83\x8B\x83_\x82ł\xB7" - IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference." + IDS_CMDLINE_SEEMANUAL "\x8F\xE3\x8BL\x82\xAA\x91S\x82Ăł͂\xA0\x82\xE8\x82܂\xB9\x82\xF1\x81B\x8A\xAE\x91S\x82ȃR\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x8F\x91\x8E\xAE\x82ɂ\xA2\x82Ă̓}\x83j\x83\x85\x83A\x83\x8B\x82\xF0\x8EQ\x8FƂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2" END // VARIOUS OPTIONS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-15 20:43:17
|
Revision: 3564 http://svn.sourceforge.net/winmerge/?rev=3564&view=rev Author: kimmov Date: 2006-09-15 13:43:06 -0700 (Fri, 15 Sep 2006) Log Message: ----------- BUG: [ 1558839 ] ShellExtension does not compile as 64-bit Modified Paths: -------------- trunk/ShellExtension/WinMergeShell.cpp trunk/ShellExtension/WinMergeShell.h trunk/Src/Changes.txt Modified: trunk/ShellExtension/WinMergeShell.cpp =================================================================== --- trunk/ShellExtension/WinMergeShell.cpp 2006-09-14 21:36:08 UTC (rev 3563) +++ trunk/ShellExtension/WinMergeShell.cpp 2006-09-15 20:43:06 UTC (rev 3564) @@ -232,7 +232,7 @@ } /// Gets string shown explorer's status bar when menuitem selected -HRESULT CWinMergeShell::GetCommandString(UINT idCmd, UINT uFlags, +HRESULT CWinMergeShell::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT* pwReserved, LPSTR pszName, UINT cchMax) { AFX_MANAGE_STATE(AfxGetStaticModuleState()) @@ -500,7 +500,7 @@ } /// Determine help text shown in explorer's statusbar -CString CWinMergeShell::GetHelpText(int idCmd) +CString CWinMergeShell::GetHelpText(UINT_PTR idCmd) { CString strHelp; Modified: trunk/ShellExtension/WinMergeShell.h =================================================================== --- trunk/ShellExtension/WinMergeShell.h 2006-09-14 21:36:08 UTC (rev 3563) +++ trunk/ShellExtension/WinMergeShell.h 2006-09-15 20:43:06 UTC (rev 3564) @@ -69,7 +69,7 @@ BOOL CheckExecutable(CString path); int DrawSimpleMenu(HMENU hmenu, UINT uMenuIndex, UINT uidFirstCmd); int DrawAdvancedMenu(HMENU hmenu, UINT uMenuIndex, UINT uidFirstCmd); - CString GetHelpText(int idCmd); + CString GetHelpText(UINT_PTR idCmd); CString FormatCmdLine(const CString &winmergePath, const CString &path1, const CString &path2, BOOL bAlterSubFolders); @@ -78,7 +78,7 @@ STDMETHOD(Initialize)(LPCITEMIDLIST, LPDATAOBJECT, HKEY); // IContextMenu - STDMETHOD(GetCommandString)(UINT, UINT, UINT*, LPSTR, UINT); + STDMETHOD(GetCommandString)(UINT_PTR, UINT, UINT*, LPSTR, UINT); STDMETHOD(InvokeCommand)(LPCMINVOKECOMMANDINFO); STDMETHOD(QueryContextMenu)(HMENU, UINT, UINT, UINT, UINT); }; Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-14 21:36:08 UTC (rev 3563) +++ trunk/Src/Changes.txt 2006-09-15 20:43:06 UTC (rev 3564) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-15 Kimmo + BUG: [ 1558839 ] ShellExtension does not compile as 64-bit + ShellExtension: WinMergeShell.cpp WinMergeShell.h + 2006-09-13 Kimmo BUG: [ 1547247 ] WinMerge ANSI target does not compile with VS2005 Fix from Perry This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-16 06:53:35
|
Revision: 3567 http://svn.sourceforge.net/winmerge/?rev=3567&view=rev Author: kimmov Date: 2006-09-15 23:53:25 -0700 (Fri, 15 Sep 2006) Log Message: ----------- PATCH: [ 1559619 ] 64-bit shellextension project file Modified Paths: -------------- trunk/Src/Changes.txt Added Paths: ----------- trunk/ShellExtension/ShellExtensionX64.def trunk/ShellExtension/ShellExtensionX64.vcproj Added: trunk/ShellExtension/ShellExtensionX64.def =================================================================== --- trunk/ShellExtension/ShellExtensionX64.def (rev 0) +++ trunk/ShellExtension/ShellExtensionX64.def 2006-09-16 06:53:25 UTC (rev 3567) @@ -0,0 +1,9 @@ +; ShellExtension64.def : Declares the module parameters. + +LIBRARY "ShellExtension64.DLL" + +EXPORTS + DllCanUnloadNow @1 PRIVATE + DllGetClassObject @2 PRIVATE + DllRegisterServer @3 PRIVATE + DllUnregisterServer @4 PRIVATE Added: trunk/ShellExtension/ShellExtensionX64.vcproj =================================================================== --- trunk/ShellExtension/ShellExtensionX64.vcproj (rev 0) +++ trunk/ShellExtension/ShellExtensionX64.vcproj 2006-09-16 06:53:25 UTC (rev 3567) @@ -0,0 +1,2283 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="ShellExtension" + ProjectGUID="{C388C7AA-862D-455A-8D3B-8F4BF5AE44EA}" + SccProjectName="" + SccLocalPath="" + Keyword="MFCProj"> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Unicode Debug|Win32" + OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeDebug" + IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeDebug" + ConfigurationType="2" + UseOfMFC="2" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="1"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../src/common" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="3" + PrecompiledHeaderThrough="stdafx.h" + PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.pch" + AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeDebug/" + ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/" + ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeDebug/" + WarningLevel="3" + SuppressStartupBanner="TRUE" + DebugInformationFormat="4" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool" + Description="Performing registration" + CommandLine="if "%OS%"=="" goto NOTNT +if not "%OS%"=="Windows_NT" goto NOTNT +regsvr32 /s /c "$(TargetPath)" +echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" +goto end +:NOTNT +echo Warning : Cannot register Unicode DLL on Windows 95 +:end +" + Outputs="$(OutDir)\regsvr32.trg"/> + <Tool + Name="VCLinkerTool" + OutputFile="..\Build\MergeUnicodeDebug\ShellExtensionU.dll" + LinkIncremental="1" + SuppressStartupBanner="TRUE" + ModuleDefinitionFile=".\ShellExtensionU.def" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.pdb" + SubSystem="2" + ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.lib" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.tlb" + HeaderFileName=""/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Unicode Release MinSize|Win32" + OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize" + IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize" + ConfigurationType="2" + UseOfMFC="2" + UseOfATL="2" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="1"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../src/common" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF" + StringPooling="TRUE" + RuntimeLibrary="2" + EnableFunctionLevelLinking="TRUE" + UsePrecompiledHeader="3" + PrecompiledHeaderThrough="stdafx.h" + PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.pch" + AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/" + ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/" + ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/" + WarningLevel="3" + SuppressStartupBanner="TRUE" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool" + Description="Performing registration" + CommandLine="if "%OS%"=="" goto NOTNT +if not "%OS%"=="Windows_NT" goto NOTNT +regsvr32 /s /c "$(TargetPath)" +echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" +goto end +:NOTNT +echo Warning : Cannot register Unicode DLL on Windows 95 +:end +" + Outputs="$(OutDir)\regsvr32.trg"/> + <Tool + Name="VCLinkerTool" + OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll" + LinkIncremental="1" + SuppressStartupBanner="TRUE" + ModuleDefinitionFile=".\ShellExtensionU.def" + ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.pdb" + SubSystem="2" + ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.lib" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.tlb" + HeaderFileName=""/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Unicode Release MinDependency|Win32" + OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency" + IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency" + ConfigurationType="2" + UseOfMFC="2" + UseOfATL="1" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="1"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../src/common" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF" + StringPooling="TRUE" + RuntimeLibrary="2" + EnableFunctionLevelLinking="TRUE" + UsePrecompiledHeader="3" + PrecompiledHeaderThrough="stdafx.h" + PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.pch" + AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/" + ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/" + ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/" + WarningLevel="3" + SuppressStartupBanner="TRUE" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool" + Description="Performing registration" + CommandLine="if "%OS%"=="" goto NOTNT +if not "%OS%"=="Windows_NT" goto NOTNT +regsvr32 /s /c "$(TargetPath)" +echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" +goto end +:NOTNT +echo Warning : Cannot register Unicode DLL on Windows 95 +:end +" + Outputs="$(OutDir)\regsvr32.trg"/> + <Tool + Name="VCLinkerTool" + OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll" + LinkIncremental="1" + SuppressStartupBanner="TRUE" + ModuleDefinitionFile=".\ShellExtensionU.def" + ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.pdb" + SubSystem="2" + ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.lib" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb" + HeaderFileName=""/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Release MinDependency|Win32" + OutputDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinDependency" + IntermediateDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinDependency" + ConfigurationType="2" + UseOfMFC="2" + UseOfATL="1" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../src/common" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF" + StringPooling="TRUE" + RuntimeLibrary="2" + EnableFunctionLevelLinking="TRUE" + UsePrecompiledHeader="3" + PrecompiledHeaderThrough="stdafx.h" + PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pch" + AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/" + ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/" + ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/" + WarningLevel="3" + SuppressStartupBanner="TRUE" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool" + Description="Performing registration" + CommandLine="regsvr32 /s /c "$(TargetPath)" +echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" +" + Outputs="$(OutDir)\regsvr32.trg"/> + <Tool + Name="VCLinkerTool" + OutputFile="..\Build\MergeRelease\ShellExtension.dll" + LinkIncremental="1" + SuppressStartupBanner="TRUE" + ModuleDefinitionFile=".\ShellExtension.def" + ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pdb" + SubSystem="2" + ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.lib" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.tlb" + HeaderFileName=""/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Release MinSize|Win32" + OutputDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinSize" + IntermediateDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinSize" + ConfigurationType="2" + UseOfMFC="2" + UseOfATL="2" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../src/common" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF" + StringPooling="TRUE" + RuntimeLibrary="2" + EnableFunctionLevelLinking="TRUE" + UsePrecompiledHeader="3" + PrecompiledHeaderThrough="stdafx.h" + PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pch" + AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinSize/" + ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/" + ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/" + WarningLevel="3" + SuppressStartupBanner="TRUE" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool" + Description="Performing registration" + CommandLine="regsvr32 /s /c "$(TargetPath)" +echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" +" + Outputs="$(OutDir)\regsvr32.trg"/> + <Tool + Name="VCLinkerTool" + OutputFile="..\Build\MergeRelease\ShellExtension.dll" + LinkIncremental="1" + SuppressStartupBanner="TRUE" + ModuleDefinitionFile=".\ShellExtension.def" + ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pdb" + SubSystem="2" + ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.lib" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.tlb" + HeaderFileName=""/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\..\BuildTmp\ShellExtension__Debug" + IntermediateDirectory=".\..\BuildTmp\ShellExtension__Debug" + ConfigurationType="2" + UseOfMFC="2" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../src/common" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="3" + PrecompiledHeaderThrough="stdafx.h" + PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pch" + AssemblerListingLocation=".\..\BuildTmp\ShellExtension__Debug/" + ObjectFile=".\..\BuildTmp\ShellExtension__Debug/" + ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__Debug/" + WarningLevel="3" + SuppressStartupBanner="TRUE" + DebugInformationFormat="4" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool" + Description="Performing registration" + CommandLine="regsvr32 /s /c "$(TargetPath)" +echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" +" + Outputs="$(OutDir)\regsvr32.trg"/> + <Tool + Name="VCLinkerTool" + OutputFile="..\Build\MergeDebug\ShellExtension.dll" + LinkIncremental="1" + SuppressStartupBanner="TRUE" + ModuleDefinitionFile=".\ShellExtension.def" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pdb" + SubSystem="2" + ImportLibrary=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.lib" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.tlb" + HeaderFileName=""/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Release X64|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + UseOfMFC="2" + UseOfATL="1" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="1"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../src/common" + PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF" + StringPooling="TRUE" + ExceptionHandling="FALSE" + RuntimeLibrary="2" + BufferSecurityCheck="FALSE" + EnableFunctionLevelLinking="TRUE" + UsePrecompiledHeader="3" + PrecompiledHeaderThrough="stdafx.h" + PrecompiledHeaderFile=".\..\BuildTmp\ShellExtensionX64/ShellExtension.pch" + AssemblerListingLocation=".\..\BuildTmp\ShellExtensionX64/" + ObjectFile=".\..\BuildTmp\ShellExtensionX64/" + ProgramDataBaseFileName=".\..\BuildTmp\ShellExtensionX64/" + WarningLevel="3" + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool" + Description="Performing registration" + CommandLine="if "%OS%"=="" goto NOTNT +if not "%OS%"=="Windows_NT" goto NOTNT +regsvr32 /s /c "$(TargetPath)" +echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" +goto end +:NOTNT +echo Warning : Cannot register Unicode DLL on Windows 95 +:end +" + Outputs="$(OutDir)\regsvr32.trg"/> + <Tool + Name="VCLinkerTool" + AdditionalOptions="/machine:AMD64" + AdditionalDependencies="bufferoverflowU.lib" + OutputFile="..\Build\ShellExtensionX64\ShellExtensionX64.dll" + LinkIncremental="1" + SuppressStartupBanner="TRUE" + ModuleDefinitionFile=".\ShellExtensionX64.def" + ProgramDatabaseFile=".\..\BuildTmp\ShellExtensionX64/ShellExtensionU.pdb" + SubSystem="2" + OptimizeForWindows98="1" + ImportLibrary=".\..\BuildTmp\ShellExtensionX64/ShellExtensionU.lib" + TargetMachine="1"/> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb" + HeaderFileName=""/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> + <File + RelativePath="..\src\common\coretools.cpp"> + <FileConfiguration + Name="Unicode Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)" + BasicRuntimeChecks="3"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/> + </FileConfiguration> + </File> + <File + RelativePath="..\src\common\RegKey.cpp"> + <FileConfiguration + Name="Unicode Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)" + BasicRuntimeChecks="3"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/> + </FileConfiguration> + </File> + <File + RelativePath="ShellExtension.cpp"> + <FileConfiguration + Name="Unicode Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)" + BasicRuntimeChecks="3"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/> + </FileConfiguration> + </File> + <File + RelativePath="ShellExtension.def"> + <FileConfiguration + Name="Unicode Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCustomBuildTool"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCustomBuildTool"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCustomBuildTool"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCustomBuildTool"/> + </FileConfiguration> + </File> + <File + RelativePath="ShellExtension.idl"> + <FileConfiguration + Name="Unicode Debug|Win32"> + <Tool + Name="VCMIDLTool" + GenerateStublessProxies="TRUE" + TypeLibraryName=".\ShellExtension.tlb" + HeaderFileName="ShellExtension.h" + InterfaceIdentifierFileName="ShellExtension_i.c"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32"> + <Tool + Name="VCMIDLTool" + GenerateStublessProxies="TRUE" + TypeLibraryName=".\ShellExtension.tlb" + HeaderFileName="ShellExtension.h" + InterfaceIdentifierFileName="ShellExtension_i.c"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32"> + <Tool + Name="VCMIDLTool" + GenerateStublessProxies="TRUE" + TypeLibraryName=".\ShellExtension.tlb" + HeaderFileName="ShellExtension.h" + InterfaceIdentifierFileName="ShellExtension_i.c"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32"> + <Tool + Name="VCMIDLTool" + GenerateStublessProxies="TRUE" + TypeLibraryName=".\ShellExtension.tlb" + HeaderFileName="ShellExtension.h" + InterfaceIdentifierFileName="ShellExtension_i.c"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32"> + <Tool + Name="VCMIDLTool" + GenerateStublessProxies="TRUE" + TypeLibraryName=".\ShellExtension.tlb" + HeaderFileName="ShellExtension.h" + InterfaceIdentifierFileName="ShellExtension_i.c"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCMIDLTool" + GenerateStublessProxies="TRUE" + TypeLibraryName=".\ShellExtension.tlb" + HeaderFileName="ShellExtension.h" + InterfaceIdentifierFileName="ShellExtension_i.c"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32"> + <Tool + Name="VCMIDLTool" + GenerateStublessProxies="TRUE" + TypeLibraryName=".\ShellExtension.tlb" + HeaderFileName="ShellExtension.h" + InterfaceIdentifierFileName="ShellExtension_i.c"/> + </FileConfiguration> + </File> + <File + RelativePath="ShellExtensionU.def"> + <FileConfiguration + Name="Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCustomBuildTool"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCustomBuildTool"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCCustomBuildTool"/> + </FileConfiguration> + </File> + <File + RelativePath="StdAfx.cpp"> + <FileConfiguration + Name="Unicode Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)" + BasicRuntimeChecks="3" + UsePrecompiledHeader="1"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)" + UsePrecompiledHeader="1"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)" + UsePrecompiledHeader="1"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + UsePrecompiledHeader="1"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + UsePrecompiledHeader="1"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + UsePrecompiledHeader="1"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)" + UsePrecompiledHeader="1"/> + </FileConfiguration> + </File> + <File + RelativePath="WinMergeShell.cpp"> + <FileConfiguration + Name="Unicode Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)" + BasicRuntimeChecks="3"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl"> + <File + RelativePath="..\src\common\coretools.h"> + </File> + <File + RelativePath="..\src\common\RegKey.h"> + </File> + <File + RelativePath="Resource.h"> + </File> + <File + RelativePath="StdAfx.h"> + </File> + <File + RelativePath="WinMergeShell.h"> + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> + <File + RelativePath="ShellExtension.rc"> + <FileConfiguration + Name="Unicode Debug|Win32"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="$(OUTDIR)"/> + </FileConfiguration> + </File> + <File + RelativePath="Languages\ShellExtensionBrazilian.rc"> + <FileConfiguration + Name="Unicode Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + </File> + <File + RelativePath="Languages\ShellExtensionBulgarian.rc"> + <FileConfiguration + Name="Unicode Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + </File> + <File + RelativePath="Languages\ShellExtensionCatalan.rc"> + <FileConfiguration + Name="Unicode Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + </File> + <File + RelativePath="Languages\ShellExtensionChineseSimplified.rc"> + <FileConfiguration + Name="Unicode Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + </File> + <File + RelativePath="Languages\ShellExtensionChineseTraditional.rc"> + <FileConfiguration + Name="Unicode Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + </File> + <File + RelativePath="Languages\ShellExtensionCzech.rc"> + <FileConfiguration + Name="Unicode Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + </File> + <File + RelativePath="Languages\ShellExtensionDanish.rc"> + <FileConfiguration + Name="Unicode Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + </File> + <File + RelativePath="Languages\ShellExtensionDutch.rc"> + <FileConfiguration + Name="Unicode Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + </File> + <File + RelativePath="Languages\ShellExtensionFrench.rc"> + <FileConfiguration + Name="Unicode Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + </File> + <File + RelativePath="Languages\ShellExtensionGerman.rc"> + <FileConfiguration + Name="Unicode Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + </File> + <File + RelativePath="Languages\ShellExtensionHungarian.rc"> + <FileConfiguration + Name="Unicode Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + </File> + <File + RelativePath="Languages\ShellExtensionItalian.rc"> + <FileConfiguration + Name="Unicode Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Unicode Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinDependency|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release MinSize|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + <FileConfiguration + Name="Release X64|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" + AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> + </FileConfiguration> + </File> + <File + RelativePath="Languages\ShellExtensionJapanese.rc"> + <FileConfiguration + Name="Unicode Debug|Win32" + ExcludedFromBuild="TRUE"> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)" + Additiona... [truncated message content] |
From: <ki...@us...> - 2006-09-18 20:18:15
|
Revision: 3579 http://svn.sourceforge.net/winmerge/?rev=3579&view=rev Author: kimmov Date: 2006-09-18 13:18:03 -0700 (Mon, 18 Sep 2006) Log Message: ----------- Cleanup 64-bit ShellExtension projectfile, add a debug target Modified Paths: -------------- trunk/ShellExtension/ShellExtensionX64.vcproj trunk/Src/Changes.txt Modified: trunk/ShellExtension/ShellExtensionX64.vcproj =================================================================== --- trunk/ShellExtension/ShellExtensionX64.vcproj 2006-09-18 19:58:38 UTC (rev 3578) +++ trunk/ShellExtension/ShellExtensionX64.vcproj 2006-09-18 20:18:03 UTC (rev 3579) @@ -13,29 +13,33 @@ </Platforms> <Configurations> <Configuration - Name="Unicode Debug|Win32" - OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeDebug" - IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeDebug" + Name="Debug X64|Win32" + OutputDirectory=".\..\BuildTmp\ShellExtensionX64Debug" + IntermediateDirectory=".\..\BuildTmp\ShellExtensionX64Debug" ConfigurationType="2" UseOfMFC="2" + UseOfATL="1" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../src/common" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF" - BasicRuntimeChecks="3" + PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF" + BasicRuntimeChecks="0" + SmallerTypeCheck="FALSE" RuntimeLibrary="3" + BufferSecurityCheck="TRUE" UsePrecompiledHeader="3" PrecompiledHeaderThrough="stdafx.h" - PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.pch" - AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeDebug/" - ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/" - ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeDebug/" + PrecompiledHeaderFile=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtension.pch" + AssemblerListingLocation=".\..\BuildTmp\ShellExtensionX64Debug/" + ObjectFile=".\..\BuildTmp\ShellExtensionX64Debug/" + ProgramDataBaseFileName=".\..\BuildTmp\ShellExtensionX64Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3" CompileAs="0"/> <Tool Name="VCCustomBuildTool" @@ -52,14 +56,17 @@ Outputs="$(OutDir)\regsvr32.trg"/> <Tool Name="VCLinkerTool" - OutputFile="..\Build\MergeUnicodeDebug\ShellExtensionU.dll" + AdditionalOptions="/machine:AMD64" + AdditionalDependencies="bufferoverflowU.lib" + OutputFile="..\Build\ShellExtensionX64Debug\ShellExtensionX64.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" - ModuleDefinitionFile=".\ShellExtensionU.def" + ModuleDefinitionFile=".\ShellExtensionX64.def" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.pdb" + ProgramDatabaseFile=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtensionU.pdb" SubSystem="2" - ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.lib" + OptimizeForWindows98="1" + ImportLibrary=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtensionU.lib" TargetMachine="1"/> <Tool Name="VCMIDLTool" @@ -87,365 +94,9 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="Unicode Release MinSize|Win32" - OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize" - IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize" - ConfigurationType="2" - UseOfMFC="2" - UseOfATL="2" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="1"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="../src/common" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="3" - PrecompiledHeaderThrough="stdafx.h" - PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.pch" - AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/" - ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/" - ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/" - WarningLevel="3" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool" - Description="Performing registration" - CommandLine="if "%OS%"=="" goto NOTNT -if not "%OS%"=="Windows_NT" goto NOTNT -regsvr32 /s /c "$(TargetPath)" -echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" -goto end -:NOTNT -echo Warning : Cannot register Unicode DLL on Windows 95 -:end -" - Outputs="$(OutDir)\regsvr32.trg"/> - <Tool - Name="VCLinkerTool" - OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ModuleDefinitionFile=".\ShellExtensionU.def" - ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.pdb" - SubSystem="2" - ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.lib" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Unicode Release MinDependency|Win32" - OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency" - IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency" - ConfigurationType="2" - UseOfMFC="2" - UseOfATL="1" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="1"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="../src/common" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="3" - PrecompiledHeaderThrough="stdafx.h" - PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.pch" - AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/" - ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/" - ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/" - WarningLevel="3" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool" - Description="Performing registration" - CommandLine="if "%OS%"=="" goto NOTNT -if not "%OS%"=="Windows_NT" goto NOTNT -regsvr32 /s /c "$(TargetPath)" -echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" -goto end -:NOTNT -echo Warning : Cannot register Unicode DLL on Windows 95 -:end -" - Outputs="$(OutDir)\regsvr32.trg"/> - <Tool - Name="VCLinkerTool" - OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ModuleDefinitionFile=".\ShellExtensionU.def" - ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.pdb" - SubSystem="2" - ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.lib" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Release MinDependency|Win32" - OutputDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinDependency" - IntermediateDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinDependency" - ConfigurationType="2" - UseOfMFC="2" - UseOfATL="1" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="../src/common" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="3" - PrecompiledHeaderThrough="stdafx.h" - PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pch" - AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/" - ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/" - ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/" - WarningLevel="3" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool" - Description="Performing registration" - CommandLine="regsvr32 /s /c "$(TargetPath)" -echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" -" - Outputs="$(OutDir)\regsvr32.trg"/> - <Tool - Name="VCLinkerTool" - OutputFile="..\Build\MergeRelease\ShellExtension.dll" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ModuleDefinitionFile=".\ShellExtension.def" - ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pdb" - SubSystem="2" - ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.lib" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Release MinSize|Win32" - OutputDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinSize" - IntermediateDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinSize" - ConfigurationType="2" - UseOfMFC="2" - UseOfATL="2" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="../src/common" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF" - StringPooling="TRUE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="3" - PrecompiledHeaderThrough="stdafx.h" - PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pch" - AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinSize/" - ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/" - ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/" - WarningLevel="3" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool" - Description="Performing registration" - CommandLine="regsvr32 /s /c "$(TargetPath)" -echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" -" - Outputs="$(OutDir)\regsvr32.trg"/> - <Tool - Name="VCLinkerTool" - OutputFile="..\Build\MergeRelease\ShellExtension.dll" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ModuleDefinitionFile=".\ShellExtension.def" - ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pdb" - SubSystem="2" - ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.lib" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Debug|Win32" - OutputDirectory=".\..\BuildTmp\ShellExtension__Debug" - IntermediateDirectory=".\..\BuildTmp\ShellExtension__Debug" - ConfigurationType="2" - UseOfMFC="2" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="../src/common" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="3" - PrecompiledHeaderThrough="stdafx.h" - PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pch" - AssemblerListingLocation=".\..\BuildTmp\ShellExtension__Debug/" - ObjectFile=".\..\BuildTmp\ShellExtension__Debug/" - ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__Debug/" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="4" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool" - Description="Performing registration" - CommandLine="regsvr32 /s /c "$(TargetPath)" -echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" -" - Outputs="$(OutDir)\regsvr32.trg"/> - <Tool - Name="VCLinkerTool" - OutputFile="..\Build\MergeDebug\ShellExtension.dll" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - ModuleDefinitionFile=".\ShellExtension.def" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pdb" - SubSystem="2" - ImportLibrary=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.lib" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration Name="Release X64|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + OutputDirectory=".\..\BuildTmp\ShellExtensionX64/" + IntermediateDirectory=".\..\BuildTmp\ShellExtensionX64/" ConfigurationType="2" UseOfMFC="2" UseOfATL="1" @@ -458,7 +109,7 @@ AdditionalIncludeDirectories="../src/common" PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF" StringPooling="TRUE" - ExceptionHandling="FALSE" + ExceptionHandling="TRUE" RuntimeLibrary="2" BufferSecurityCheck="FALSE" EnableFunctionLevelLinking="TRUE" @@ -533,7 +184,7 @@ <File RelativePath="..\src\common\coretools.cpp"> <FileConfiguration - Name="Unicode Debug|Win32"> + Name="Debug X64|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" @@ -542,47 +193,6 @@ BasicRuntimeChecks="3"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32"> <Tool Name="VCCLCompilerTool" @@ -594,7 +204,7 @@ <File RelativePath="..\src\common\RegKey.cpp"> <FileConfiguration - Name="Unicode Debug|Win32"> + Name="Debug X64|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" @@ -603,47 +213,6 @@ BasicRuntimeChecks="3"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32"> <Tool Name="VCCLCompilerTool" @@ -655,7 +224,7 @@ <File RelativePath="ShellExtension.cpp"> <FileConfiguration - Name="Unicode Debug|Win32"> + Name="Debug X64|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" @@ -664,47 +233,6 @@ BasicRuntimeChecks="3"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32"> <Tool Name="VCCLCompilerTool" @@ -716,24 +244,12 @@ <File RelativePath="ShellExtension.def"> <FileConfiguration - Name="Unicode Debug|Win32" + Name="Debug X64|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCustomBuildTool"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCustomBuildTool"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCustomBuildTool"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32" ExcludedFromBuild="TRUE"> <Tool @@ -743,7 +259,7 @@ <File RelativePath="ShellExtension.idl"> <FileConfiguration - Name="Unicode Debug|Win32"> + Name="Debug X64|Win32"> <Tool Name="VCMIDLTool" GenerateStublessProxies="TRUE" @@ -752,51 +268,6 @@ InterfaceIdentifierFileName="ShellExtension_i.c"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32"> - <Tool - Name="VCMIDLTool" - GenerateStublessProxies="TRUE" - TypeLibraryName=".\ShellExtension.tlb" - HeaderFileName="ShellExtension.h" - InterfaceIdentifierFileName="ShellExtension_i.c"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32"> - <Tool - Name="VCMIDLTool" - GenerateStublessProxies="TRUE" - TypeLibraryName=".\ShellExtension.tlb" - HeaderFileName="ShellExtension.h" - InterfaceIdentifierFileName="ShellExtension_i.c"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32"> - <Tool - Name="VCMIDLTool" - GenerateStublessProxies="TRUE" - TypeLibraryName=".\ShellExtension.tlb" - HeaderFileName="ShellExtension.h" - InterfaceIdentifierFileName="ShellExtension_i.c"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32"> - <Tool - Name="VCMIDLTool" - GenerateStublessProxies="TRUE" - TypeLibraryName=".\ShellExtension.tlb" - HeaderFileName="ShellExtension.h" - InterfaceIdentifierFileName="ShellExtension_i.c"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCMIDLTool" - GenerateStublessProxies="TRUE" - TypeLibraryName=".\ShellExtension.tlb" - HeaderFileName="ShellExtension.h" - InterfaceIdentifierFileName="ShellExtension_i.c"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32"> <Tool Name="VCMIDLTool" @@ -808,29 +279,11 @@ </File> <File RelativePath="ShellExtensionU.def"> - <FileConfiguration - Name="Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCustomBuildTool"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCustomBuildTool"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCCustomBuildTool"/> - </FileConfiguration> </File> <File RelativePath="StdAfx.cpp"> <FileConfiguration - Name="Unicode Debug|Win32"> + Name="Debug X64|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" @@ -840,52 +293,6 @@ UsePrecompiledHeader="1"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)" - UsePrecompiledHeader="1"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)" - UsePrecompiledHeader="1"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - UsePrecompiledHeader="1"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - UsePrecompiledHeader="1"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - UsePrecompiledHeader="1"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32"> <Tool Name="VCCLCompilerTool" @@ -898,7 +305,7 @@ <File RelativePath="WinMergeShell.cpp"> <FileConfiguration - Name="Unicode Debug|Win32"> + Name="Debug X64|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" @@ -907,47 +314,6 @@ BasicRuntimeChecks="3"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32"> <Tool Name="VCCLCompilerTool" @@ -982,48 +348,13 @@ <File RelativePath="ShellExtension.rc"> <FileConfiguration - Name="Unicode Debug|Win32"> + Name="Debug X64|Win32"> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)" AdditionalIncludeDirectories="$(OUTDIR)"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32"> <Tool Name="VCResourceCompilerTool" @@ -1034,7 +365,7 @@ <File RelativePath="Languages\ShellExtensionBrazilian.rc"> <FileConfiguration - Name="Unicode Debug|Win32" + Name="Debug X64|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCResourceCompilerTool" @@ -1042,46 +373,6 @@ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32" ExcludedFromBuild="TRUE"> <Tool @@ -1093,7 +384,7 @@ <File RelativePath="Languages\ShellExtensionBulgarian.rc"> <FileConfiguration - Name="Unicode Debug|Win32" + Name="Debug X64|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCResourceCompilerTool" @@ -1101,46 +392,6 @@ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32" ExcludedFromBuild="TRUE"> <Tool @@ -1152,7 +403,7 @@ <File RelativePath="Languages\ShellExtensionCatalan.rc"> <FileConfiguration - Name="Unicode Debug|Win32" + Name="Debug X64|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCResourceCompilerTool" @@ -1160,46 +411,6 @@ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32" ExcludedFromBuild="TRUE"> <Tool @@ -1211,7 +422,7 @@ <File RelativePath="Languages\ShellExtensionChineseSimplified.rc"> <FileConfiguration - Name="Unicode Debug|Win32" + Name="Debug X64|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCResourceCompilerTool" @@ -1219,46 +430,6 @@ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32" ExcludedFromBuild="TRUE"> <Tool @@ -1270,7 +441,7 @@ <File RelativePath="Languages\ShellExtensionChineseTraditional.rc"> <FileConfiguration - Name="Unicode Debug|Win32" + Name="Debug X64|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCResourceCompilerTool" @@ -1278,46 +449,6 @@ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32" ExcludedFromBuild="TRUE"> <Tool @@ -1329,7 +460,7 @@ <File RelativePath="Languages\ShellExtensionCzech.rc"> <FileConfiguration - Name="Unicode Debug|Win32" + Name="Debug X64|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCResourceCompilerTool" @@ -1337,46 +468,6 @@ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32" ExcludedFromBuild="TRUE"> <Tool @@ -1388,7 +479,7 @@ <File RelativePath="Languages\ShellExtensionDanish.rc"> <FileConfiguration - Name="Unicode Debug|Win32" + Name="Debug X64|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCResourceCompilerTool" @@ -1396,46 +487,6 @@ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32" ExcludedFromBuild="TRUE"> <Tool @@ -1447,7 +498,7 @@ <File RelativePath="Languages\ShellExtensionDutch.rc"> <FileConfiguration - Name="Unicode Debug|Win32" + Name="Debug X64|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCResourceCompilerTool" @@ -1455,46 +506,6 @@ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32" ExcludedFromBuild="TRUE"> <Tool @@ -1506,7 +517,7 @@ <File RelativePath="Languages\ShellExtensionFrench.rc"> <FileConfiguration - Name="Unicode Debug|Win32" + Name="Debug X64|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCResourceCompilerTool" @@ -1514,46 +525,6 @@ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32" ExcludedFromBuild="TRUE"> <Tool @@ -1565,7 +536,7 @@ <File RelativePath="Languages\ShellExtensionGerman.rc"> <FileConfiguration - Name="Unicode Debug|Win32" + Name="Debug X64|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCResourceCompilerTool" @@ -1573,46 +544,6 @@ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32" ExcludedFromBuild="TRUE"> <Tool @@ -1624,7 +555,7 @@ <File RelativePath="Languages\ShellExtensionHungarian.rc"> <FileConfiguration - Name="Unicode Debug|Win32" + Name="Debug X64|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCResourceCompilerTool" @@ -1632,46 +563,6 @@ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32" ExcludedFromBuild="TRUE"> <Tool @@ -1683,7 +574,7 @@ <File RelativePath="Languages\ShellExtensionItalian.rc"> <FileConfiguration - Name="Unicode Debug|Win32" + Name="Debug X64|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCResourceCompilerTool" @@ -1691,46 +582,6 @@ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32" ExcludedFromBuild="TRUE"> <Tool @@ -1742,7 +593,7 @@ <File RelativePath="Languages\ShellExtensionJapanese.rc"> <FileConfiguration - Name="Unicode Debug|Win32" + Name="Debug X64|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCResourceCompilerTool" @@ -1750,46 +601,6 @@ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32" ExcludedFromBuild="TRUE"> <Tool @@ -1801,7 +612,7 @@ <File RelativePath="Languages\ShellExtensionKorean.rc"> <FileConfiguration - Name="Unicode Debug|Win32" + Name="Debug X64|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCResourceCompilerTool" @@ -1809,46 +620,6 @@ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32" ExcludedFromBuild="TRUE"> <Tool @@ -1860,7 +631,7 @@ <File RelativePath="Languages\ShellExtensionNorwegian.rc"> <FileConfiguration - Name="Unicode Debug|Win32" + Name="Debug X64|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCResourceCompilerTool" @@ -1868,46 +639,6 @@ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32" ExcludedFromBuild="TRUE"> <Tool @@ -1919,7 +650,7 @@ <File RelativePath="Languages\ShellExtensionPolish.rc"> <FileConfiguration - Name="Unicode Debug|Win32" + Name="Debug X64|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCResourceCompilerTool" @@ -1927,46 +658,6 @@ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Unicode Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinDependency|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="" - AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> - </FileConfiguration> - <FileConfiguration Name="Release X64|Win32" ExcludedFromBuild="TRUE"> <Tool @@ -1978,7 +669,7 @@ <File RelativePath="Languages\ShellExtensionRussian.rc"> <FileConfiguration - Name="Unicode Debug|Win32" + Name="Debug X64|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCResourceCompilerTool" @@ -1986,46 +677,6 @@ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/> </FileConfiguration> <FileConfiguration - Name="Unicode Release MinSize|Win32" - ExcludedFromBuild="TRUE"> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - AdditionalInclu... [truncated message content] |
From: <ki...@us...> - 2006-09-21 16:49:23
|
Revision: 3596 http://svn.sourceforge.net/winmerge/?rev=3596&view=rev Author: kimmov Date: 2006-09-21 09:49:15 -0700 (Thu, 21 Sep 2006) Log Message: ----------- Bump ShellExtension version to 1.9.0 (first 64-bit Windows version) Modified Paths: -------------- trunk/ShellExtension/ShellExtension.rc trunk/Src/Changes.txt Modified: trunk/ShellExtension/ShellExtension.rc =================================================================== --- trunk/ShellExtension/ShellExtension.rc 2006-09-21 16:45:44 UTC (rev 3595) +++ trunk/ShellExtension/ShellExtension.rc 2006-09-21 16:49:15 UTC (rev 3596) @@ -224,8 +224,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,8,1,0 - PRODUCTVERSION 1,8,1,0 + FILEVERSION 1,9,0,0 + PRODUCTVERSION 1,9,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -243,7 +243,7 @@ VALUE "Comments", "\0" VALUE "CompanyName", "\0" VALUE "FileDescription", "ShellExtension Module\0" - VALUE "FileVersion", "1.8.1.0\0" + VALUE "FileVersion", "1.9.0.0\0" VALUE "InternalName", "ShellExtension\0" VALUE "LegalCopyright", "Copyright 2003-2006\0" VALUE "LegalTrademarks", "\0" @@ -251,7 +251,7 @@ VALUE "OriginalFilename", "ShellExtension.DLL\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "ShellExtension Module\0" - VALUE "ProductVersion", "1.8.1.0\0" + VALUE "ProductVersion", "1.9.0.0\0" VALUE "SpecialBuild", "\0" END END Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-21 16:45:44 UTC (rev 3595) +++ trunk/Src/Changes.txt 2006-09-21 16:49:15 UTC (rev 3596) @@ -5,6 +5,8 @@ 2006-09-21 Kimmo PATCH: [ 1558213 ] Tweak text positions in splash screen Src: Splash.cpp + Bump ShellExtension version to 1.9.0 (first 64-bit Windows version) + ShellExtension: ShellExtension.rc 2006-09-20 Kimmo PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-21 17:33:07
|
Revision: 3599 http://svn.sourceforge.net/winmerge/?rev=3599&view=rev Author: kimmov Date: 2006-09-21 10:33:00 -0700 (Thu, 21 Sep 2006) Log Message: ----------- Minor tweaks to 64-bit ShellExtension project file Modified Paths: -------------- trunk/ShellExtension/ShellExtensionX64.vcproj trunk/Src/Changes.txt Modified: trunk/ShellExtension/ShellExtensionX64.vcproj =================================================================== --- trunk/ShellExtension/ShellExtensionX64.vcproj 2006-09-21 17:11:10 UTC (rev 3598) +++ trunk/ShellExtension/ShellExtensionX64.vcproj 2006-09-21 17:33:00 UTC (rev 3599) @@ -29,7 +29,7 @@ BasicRuntimeChecks="0" SmallerTypeCheck="FALSE" RuntimeLibrary="3" - BufferSecurityCheck="TRUE" + BufferSecurityCheck="FALSE" UsePrecompiledHeader="3" PrecompiledHeaderThrough="stdafx.h" PrecompiledHeaderFile=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtension.pch" @@ -66,7 +66,7 @@ ProgramDatabaseFile=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtensionU.pdb" SubSystem="2" OptimizeForWindows98="1" - ImportLibrary=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtensionU.lib" + ImportLibrary=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtensionX64.lib" TargetMachine="1"/> <Tool Name="VCMIDLTool" @@ -147,7 +147,7 @@ ProgramDatabaseFile=".\..\BuildTmp\ShellExtensionX64/ShellExtensionU.pdb" SubSystem="2" OptimizeForWindows98="1" - ImportLibrary=".\..\BuildTmp\ShellExtensionX64/ShellExtensionU.lib" + ImportLibrary=".\..\BuildTmp\ShellExtensionX64/ShellExtensionX64.lib" TargetMachine="1"/> <Tool Name="VCMIDLTool" @@ -278,9 +278,12 @@ </FileConfiguration> </File> <File - RelativePath="ShellExtensionU.def"> + RelativePath=".\ShellExtensionU.def"> </File> <File + RelativePath=".\ShellExtensionX64.def"> + </File> + <File RelativePath="StdAfx.cpp"> <FileConfiguration Name="Debug X64|Win32"> Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-21 17:11:10 UTC (rev 3598) +++ trunk/Src/Changes.txt 2006-09-21 17:33:00 UTC (rev 3599) @@ -11,6 +11,8 @@ Src: GhostTextBuffer.h Fix 64-bit pointer truncation in SetWindowLongPtr call (the last I hope) Src: ChildFrm.cpp + Minor tweaks to 64-bit ShellExtension project file + ShellExtension: ShellExtensionX64.vcproj 2006-09-20 Kimmo PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-09-27 14:22:37
|
Revision: 3650 http://svn.sourceforge.net/winmerge/?rev=3650&view=rev Author: kimmov Date: 2006-09-27 07:22:28 -0700 (Wed, 27 Sep 2006) Log Message: ----------- PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows Modified Paths: -------------- trunk/ShellExtension/Register.bat trunk/Src/Changes.txt Modified: trunk/ShellExtension/Register.bat =================================================================== --- trunk/ShellExtension/Register.bat 2006-09-26 20:34:48 UTC (rev 3649) +++ trunk/ShellExtension/Register.bat 2006-09-27 14:22:28 UTC (rev 3650) @@ -14,15 +14,23 @@ IF "%1" == "/U" Goto Uninstall Echo Registering ShellExtension.dll... -if "%OS%" == "" RegSvr32 ShellExtension.dll -if "%OS%" == "Windows_NT" RegSvr32 ShellExtensionU.dll +IF "%OS%" == "" RegSvr32 ShellExtension.dll +IF "%OS%" == "Windows_NT" ( + IF "%PROCESSOR_ARCHITECTURE%" == "x86" RegSvr32 ShellExtensionU.dll + IF "%PROCESSOR_ARCHITECTURE%" == "AMD64" RegSvr32 ShellExtensionX64.dll + IF "%PROCESSOR_ARCHITECTURE%" == "IA64" RegSvr32 ShellExtensionX64.dll +) Goto End :Uninstall Echo UnRegistering ShellExtension.dll... -if "%OS%" == "" RegSvr32 /u ShellExtension.dll -if "%OS%" == "Windows_NT" RegSvr32 /u ShellExtensionU.dll +IF "%OS%" == "" RegSvr32 /u ShellExtension.dll +IF "%OS%" == "Windows_NT" ( + IF "%PROCESSOR_ARCHITECTURE%" == "x86" RegSvr32 /u ShellExtensionU.dll + IF "%PROCESSOR_ARCHITECTURE%" == "AMD64" RegSvr32 /u ShellExtensionX64.dll + IF "%PROCESSOR_ARCHITECTURE%" == "IA64" RegSvr32 /u ShellExtensionX64.dll +) :End CLS \ No newline at end of file Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-26 20:34:48 UTC (rev 3649) +++ trunk/Src/Changes.txt 2006-09-27 14:22:28 UTC (rev 3650) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-27 Kimmo + PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows + ShellExtension: Register.bat + 2006-09-26 Tim PATCH: [ 1565359 ] Various Updates in German Translation for WinMerge 2.6 Src/Languages/German: MergeGerman.rc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-10-08 10:14:43
|
Revision: 3688 http://svn.sourceforge.net/winmerge/?rev=3688&view=rev Author: kimmov Date: 2006-10-08 03:14:34 -0700 (Sun, 08 Oct 2006) Log Message: ----------- PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt Modified Paths: -------------- trunk/Docs/Users/Contributors.txt trunk/Src/Changes.txt Modified: trunk/Docs/Users/Contributors.txt =================================================================== --- trunk/Docs/Users/Contributors.txt 2006-10-07 09:42:17 UTC (rev 3687) +++ trunk/Docs/Users/Contributors.txt 2006-10-08 10:14:34 UTC (rev 3688) @@ -8,17 +8,19 @@ Project lead: * Christian List -Other developers: -* Laurent Ganier +Developers: * Tim Gerundt * Gal Hammer +* Perry Rapp +* Takashi Sawanaka +* Kimmo Varis + +Inactive/past developers: +* Laurent Ganier * Dennis Limm * Chris Mumford -* Perry Rapp -* Takashi Sawanaka * Christian "Seier" Blackburn (Installer) * Jochen Tucht -* Kimmo Varis Graphic Design: * Alexander Skinner Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-10-07 09:42:17 UTC (rev 3687) +++ trunk/Src/Changes.txt 2006-10-08 10:14:34 UTC (rev 3688) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-10-08 Kimmo + PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt + Docs/Users: Contributors.txt + 2006-10-07 Tim PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6 Src/Languages/German: MergeGerman.rc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-10-27 15:13:22
|
Revision: 3733 http://svn.sourceforge.net/winmerge/?rev=3733&view=rev Author: kimmov Date: 2006-10-27 08:07:00 -0700 (Fri, 27 Oct 2006) Log Message: ----------- Add CppUnit unit-testing framework for C++. The latest version 1.12 from http://cppunit.sourceforge.net/ Added Paths: ----------- trunk/Externals/ trunk/Externals/cppunit/ trunk/Externals/cppunit/AUTHORS trunk/Externals/cppunit/BUGS trunk/Externals/cppunit/COPYING trunk/Externals/cppunit/ChangeLog trunk/Externals/cppunit/CodingGuideLines.txt trunk/Externals/cppunit/INSTALL trunk/Externals/cppunit/INSTALL-WIN32.txt trunk/Externals/cppunit/INSTALL-unix trunk/Externals/cppunit/Makefile.am trunk/Externals/cppunit/Makefile.in trunk/Externals/cppunit/NEWS trunk/Externals/cppunit/README trunk/Externals/cppunit/THANKS trunk/Externals/cppunit/TODO trunk/Externals/cppunit/aclocal.m4 trunk/Externals/cppunit/config/ trunk/Externals/cppunit/config/ac_create_prefix_config_h.m4 trunk/Externals/cppunit/config/ac_cxx_have_sstream.m4 trunk/Externals/cppunit/config/ac_cxx_have_strstream.m4 trunk/Externals/cppunit/config/ac_cxx_namespaces.m4 trunk/Externals/cppunit/config/ac_cxx_rtti.m4 trunk/Externals/cppunit/config/ac_cxx_string_compare_string_first.m4 trunk/Externals/cppunit/config/ac_dll.m4 trunk/Externals/cppunit/config/ax_cxx_gcc_abi_demangle.m4 trunk/Externals/cppunit/config/bb_enable_doxygen.m4 trunk/Externals/cppunit/config/config.guess trunk/Externals/cppunit/config/config.h.in trunk/Externals/cppunit/config/config.sub trunk/Externals/cppunit/config/depcomp trunk/Externals/cppunit/config/install-sh trunk/Externals/cppunit/config/ltmain.sh trunk/Externals/cppunit/config/missing trunk/Externals/cppunit/configure trunk/Externals/cppunit/configure.in trunk/Externals/cppunit/contrib/ trunk/Externals/cppunit/contrib/bc5/ trunk/Externals/cppunit/contrib/bc5/bcc-makefile.zip trunk/Externals/cppunit/contrib/msvc/ trunk/Externals/cppunit/contrib/msvc/AddingUnitTestMethod.dsm trunk/Externals/cppunit/contrib/msvc/CppUnit.WWTpl trunk/Externals/cppunit/contrib/msvc/readme.txt trunk/Externals/cppunit/contrib/xml-xsl/ trunk/Externals/cppunit/contrib/xml-xsl/report.xsl trunk/Externals/cppunit/contrib/xml-xsl/tests.xml trunk/Externals/cppunit/cppunit-config.1 trunk/Externals/cppunit/cppunit-config.in trunk/Externals/cppunit/cppunit.m4 trunk/Externals/cppunit/cppunit.pc.in trunk/Externals/cppunit/cppunit.spec trunk/Externals/cppunit/cppunit.spec.in trunk/Externals/cppunit/doc/ trunk/Externals/cppunit/doc/Doxyfile.in trunk/Externals/cppunit/doc/FAQ trunk/Externals/cppunit/doc/Makefile.am trunk/Externals/cppunit/doc/Makefile.in trunk/Externals/cppunit/doc/Money.dox trunk/Externals/cppunit/doc/cookbook.dox trunk/Externals/cppunit/doc/footer.html trunk/Externals/cppunit/doc/header.html trunk/Externals/cppunit/doc/other_documentation.dox trunk/Externals/cppunit/examples/ trunk/Externals/cppunit/examples/ClockerPlugIn/ trunk/Externals/cppunit/examples/ClockerPlugIn/ClockerListener.cpp trunk/Externals/cppunit/examples/ClockerPlugIn/ClockerListener.h trunk/Externals/cppunit/examples/ClockerPlugIn/ClockerModel.cpp trunk/Externals/cppunit/examples/ClockerPlugIn/ClockerModel.h trunk/Externals/cppunit/examples/ClockerPlugIn/ClockerPlugIn.cpp trunk/Externals/cppunit/examples/ClockerPlugIn/ClockerPlugIn.dsp trunk/Externals/cppunit/examples/ClockerPlugIn/ClockerXmlHook.cpp trunk/Externals/cppunit/examples/ClockerPlugIn/ClockerXmlHook.h trunk/Externals/cppunit/examples/ClockerPlugIn/Makefile.am trunk/Externals/cppunit/examples/ClockerPlugIn/Makefile.in trunk/Externals/cppunit/examples/ClockerPlugIn/ReadMe.txt trunk/Externals/cppunit/examples/ClockerPlugIn/Timer.cpp trunk/Externals/cppunit/examples/ClockerPlugIn/Timer.h trunk/Externals/cppunit/examples/ClockerPlugIn/WinNtTimer.cpp trunk/Externals/cppunit/examples/ClockerPlugIn/WinNtTimer.h trunk/Externals/cppunit/examples/DumperPlugIn/ trunk/Externals/cppunit/examples/DumperPlugIn/DumperListener.cpp trunk/Externals/cppunit/examples/DumperPlugIn/DumperListener.h trunk/Externals/cppunit/examples/DumperPlugIn/DumperPlugIn.cpp trunk/Externals/cppunit/examples/DumperPlugIn/DumperPlugIn.dsp trunk/Externals/cppunit/examples/DumperPlugIn/Makefile.am trunk/Externals/cppunit/examples/DumperPlugIn/Makefile.in trunk/Externals/cppunit/examples/Makefile.am trunk/Externals/cppunit/examples/Makefile.in trunk/Externals/cppunit/examples/cppunittest/ trunk/Externals/cppunit/examples/cppunittest/BaseTestCase.cpp trunk/Externals/cppunit/examples/cppunittest/BaseTestCase.h trunk/Externals/cppunit/examples/cppunittest/CoreSuite.h trunk/Externals/cppunit/examples/cppunittest/CppUnitTestMain.cpp trunk/Externals/cppunit/examples/cppunittest/CppUnitTestMain.dsp trunk/Externals/cppunit/examples/cppunittest/CppUnitTestMain.dsw trunk/Externals/cppunit/examples/cppunittest/CppUnitTestPlugIn.cpp trunk/Externals/cppunit/examples/cppunittest/CppUnitTestPlugIn.dsp trunk/Externals/cppunit/examples/cppunittest/CppUnitTestSuite.cpp trunk/Externals/cppunit/examples/cppunittest/ExceptionTest.cpp trunk/Externals/cppunit/examples/cppunittest/ExceptionTest.h trunk/Externals/cppunit/examples/cppunittest/ExceptionTestCaseDecoratorTest.cpp trunk/Externals/cppunit/examples/cppunittest/ExceptionTestCaseDecoratorTest.h trunk/Externals/cppunit/examples/cppunittest/ExtensionSuite.h trunk/Externals/cppunit/examples/cppunittest/FailureException.h trunk/Externals/cppunit/examples/cppunittest/HelperMacrosTest.cpp trunk/Externals/cppunit/examples/cppunittest/HelperMacrosTest.h trunk/Externals/cppunit/examples/cppunittest/HelperSuite.h trunk/Externals/cppunit/examples/cppunittest/Makefile.am trunk/Externals/cppunit/examples/cppunittest/Makefile.in trunk/Externals/cppunit/examples/cppunittest/MessageTest.cpp trunk/Externals/cppunit/examples/cppunittest/MessageTest.h trunk/Externals/cppunit/examples/cppunittest/MockFunctor.h trunk/Externals/cppunit/examples/cppunittest/MockProtector.h trunk/Externals/cppunit/examples/cppunittest/MockTestCase.cpp trunk/Externals/cppunit/examples/cppunittest/MockTestCase.h trunk/Externals/cppunit/examples/cppunittest/MockTestListener.cpp trunk/Externals/cppunit/examples/cppunittest/MockTestListener.h trunk/Externals/cppunit/examples/cppunittest/OrthodoxTest.cpp trunk/Externals/cppunit/examples/cppunittest/OrthodoxTest.h trunk/Externals/cppunit/examples/cppunittest/OutputSuite.h trunk/Externals/cppunit/examples/cppunittest/RepeatedTestTest.cpp trunk/Externals/cppunit/examples/cppunittest/RepeatedTestTest.h trunk/Externals/cppunit/examples/cppunittest/StringToolsTest.cpp trunk/Externals/cppunit/examples/cppunittest/StringToolsTest.h trunk/Externals/cppunit/examples/cppunittest/SubclassedTestCase.cpp trunk/Externals/cppunit/examples/cppunittest/SubclassedTestCase.h trunk/Externals/cppunit/examples/cppunittest/SynchronizedTestResult.h trunk/Externals/cppunit/examples/cppunittest/TestAssertTest.cpp trunk/Externals/cppunit/examples/cppunittest/TestAssertTest.h trunk/Externals/cppunit/examples/cppunittest/TestCallerTest.cpp trunk/Externals/cppunit/examples/cppunittest/TestCallerTest.h trunk/Externals/cppunit/examples/cppunittest/TestCaseTest.cpp trunk/Externals/cppunit/examples/cppunittest/TestCaseTest.h trunk/Externals/cppunit/examples/cppunittest/TestDecoratorTest.cpp trunk/Externals/cppunit/examples/cppunittest/TestDecoratorTest.h trunk/Externals/cppunit/examples/cppunittest/TestFailureTest.cpp trunk/Externals/cppunit/examples/cppunittest/TestFailureTest.h trunk/Externals/cppunit/examples/cppunittest/TestPathTest.cpp trunk/Externals/cppunit/examples/cppunittest/TestPathTest.h trunk/Externals/cppunit/examples/cppunittest/TestResultCollectorTest.cpp trunk/Externals/cppunit/examples/cppunittest/TestResultCollectorTest.h trunk/Externals/cppunit/examples/cppunittest/TestResultTest.cpp trunk/Externals/cppunit/examples/cppunittest/TestResultTest.h trunk/Externals/cppunit/examples/cppunittest/TestSetUpTest.cpp trunk/Externals/cppunit/examples/cppunittest/TestSetUpTest.h trunk/Externals/cppunit/examples/cppunittest/TestSuiteTest.cpp trunk/Externals/cppunit/examples/cppunittest/TestSuiteTest.h trunk/Externals/cppunit/examples/cppunittest/TestTest.cpp trunk/Externals/cppunit/examples/cppunittest/TestTest.h trunk/Externals/cppunit/examples/cppunittest/ToolsSuite.h trunk/Externals/cppunit/examples/cppunittest/TrackedTestCase.cpp trunk/Externals/cppunit/examples/cppunittest/TrackedTestCase.h trunk/Externals/cppunit/examples/cppunittest/UnitTestToolSuite.h trunk/Externals/cppunit/examples/cppunittest/XmlElementTest.cpp trunk/Externals/cppunit/examples/cppunittest/XmlElementTest.h trunk/Externals/cppunit/examples/cppunittest/XmlOutputterTest.cpp trunk/Externals/cppunit/examples/cppunittest/XmlOutputterTest.h trunk/Externals/cppunit/examples/cppunittest/XmlUniformiser.cpp trunk/Externals/cppunit/examples/cppunittest/XmlUniformiser.h trunk/Externals/cppunit/examples/cppunittest/XmlUniformiserTest.cpp trunk/Externals/cppunit/examples/cppunittest/XmlUniformiserTest.h trunk/Externals/cppunit/examples/examples.dsw trunk/Externals/cppunit/examples/examples.opt trunk/Externals/cppunit/examples/hierarchy/ trunk/Externals/cppunit/examples/hierarchy/BoardGame.cpp trunk/Externals/cppunit/examples/hierarchy/BoardGame.h trunk/Externals/cppunit/examples/hierarchy/BoardGameTest.h trunk/Externals/cppunit/examples/hierarchy/Chess.cpp trunk/Externals/cppunit/examples/hierarchy/Chess.h trunk/Externals/cppunit/examples/hierarchy/ChessTest.h trunk/Externals/cppunit/examples/hierarchy/Makefile.am trunk/Externals/cppunit/examples/hierarchy/Makefile.in trunk/Externals/cppunit/examples/hierarchy/hierarchy.dsp trunk/Externals/cppunit/examples/hierarchy/hierarchy.dsw trunk/Externals/cppunit/examples/hierarchy/main.cpp trunk/Externals/cppunit/examples/money/ trunk/Externals/cppunit/examples/money/Makefile.am trunk/Externals/cppunit/examples/money/Makefile.in trunk/Externals/cppunit/examples/money/Money.h trunk/Externals/cppunit/examples/money/MoneyApp.cpp trunk/Externals/cppunit/examples/money/MoneyTest.cpp trunk/Externals/cppunit/examples/money/MoneyTest.h trunk/Externals/cppunit/examples/money/StdAfx.cpp trunk/Externals/cppunit/examples/money/StdAfx.h trunk/Externals/cppunit/examples/money/configure.in trunk/Externals/cppunit/examples/money/money.dsp trunk/Externals/cppunit/examples/money/money.dsw trunk/Externals/cppunit/examples/msvc6/ trunk/Externals/cppunit/examples/msvc6/.cvsignore trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/ trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/.cvsignore trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/CppUnitTestApp.cpp trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsw trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/CppUnitTestApp.h trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/CppUnitTestApp.rc trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/CppUnitTestAppDlg.cpp trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/CppUnitTestAppDlg.h trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/ReadMe.txt trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/Resource.h trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/StdAfx.cpp trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/StdAfx.h trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/res/ trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/res/CppUnitTestApp.ico trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/res/CppUnitTestApp.rc2 trunk/Externals/cppunit/examples/msvc6/HostApp/ trunk/Externals/cppunit/examples/msvc6/HostApp/.cvsignore trunk/Externals/cppunit/examples/msvc6/HostApp/ExampleTestCase.cpp trunk/Externals/cppunit/examples/msvc6/HostApp/ExampleTestCase.h trunk/Externals/cppunit/examples/msvc6/HostApp/HostApp.cpp trunk/Externals/cppunit/examples/msvc6/HostApp/HostApp.dsp trunk/Externals/cppunit/examples/msvc6/HostApp/HostApp.dsw trunk/Externals/cppunit/examples/msvc6/HostApp/HostApp.h trunk/Externals/cppunit/examples/msvc6/HostApp/HostApp.rc trunk/Externals/cppunit/examples/msvc6/HostApp/HostAppDoc.cpp trunk/Externals/cppunit/examples/msvc6/HostApp/HostAppDoc.h trunk/Externals/cppunit/examples/msvc6/HostApp/HostAppView.cpp trunk/Externals/cppunit/examples/msvc6/HostApp/HostAppView.h trunk/Externals/cppunit/examples/msvc6/HostApp/MainFrm.cpp trunk/Externals/cppunit/examples/msvc6/HostApp/MainFrm.h trunk/Externals/cppunit/examples/msvc6/HostApp/Makefile.am trunk/Externals/cppunit/examples/msvc6/HostApp/Resource.h trunk/Externals/cppunit/examples/msvc6/HostApp/StdAfx.cpp trunk/Externals/cppunit/examples/msvc6/HostApp/StdAfx.h trunk/Externals/cppunit/examples/msvc6/HostApp/res/ trunk/Externals/cppunit/examples/msvc6/HostApp/res/.cvsignore trunk/Externals/cppunit/examples/msvc6/HostApp/res/HostApp.ico trunk/Externals/cppunit/examples/msvc6/HostApp/res/HostApp.rc2 trunk/Externals/cppunit/examples/msvc6/HostApp/res/HostAppDoc.ico trunk/Externals/cppunit/examples/msvc6/HostApp/res/Makefile.am trunk/Externals/cppunit/examples/msvc6/HostApp/res/Toolbar.bmp trunk/Externals/cppunit/examples/msvc6/Makefile.am trunk/Externals/cppunit/examples/msvc6/TestPlugIn/ trunk/Externals/cppunit/examples/msvc6/TestPlugIn/.cvsignore trunk/Externals/cppunit/examples/qt/ trunk/Externals/cppunit/examples/qt/.cvsignore trunk/Externals/cppunit/examples/qt/ExampleTestCases.cpp trunk/Externals/cppunit/examples/qt/ExampleTestCases.h trunk/Externals/cppunit/examples/qt/Main.cpp trunk/Externals/cppunit/examples/qt/make_example trunk/Externals/cppunit/examples/qt/make_example.bat trunk/Externals/cppunit/examples/qt/qt_example.pro trunk/Externals/cppunit/examples/qt/qt_example.sln trunk/Externals/cppunit/examples/qt/qt_example.vcproj trunk/Externals/cppunit/examples/qt/qt_example_dll.vcproj trunk/Externals/cppunit/examples/qt/run.bat trunk/Externals/cppunit/examples/simple/ trunk/Externals/cppunit/examples/simple/ExampleTestCase.cpp trunk/Externals/cppunit/examples/simple/ExampleTestCase.h trunk/Externals/cppunit/examples/simple/Main.cpp trunk/Externals/cppunit/examples/simple/Makefile.am trunk/Externals/cppunit/examples/simple/Makefile.in trunk/Externals/cppunit/examples/simple/SimplePlugIn.cpp trunk/Externals/cppunit/examples/simple/simple.dsp trunk/Externals/cppunit/examples/simple/simple_plugin.dsp trunk/Externals/cppunit/include/ trunk/Externals/cppunit/include/Makefile.am trunk/Externals/cppunit/include/Makefile.in trunk/Externals/cppunit/include/cppunit/ trunk/Externals/cppunit/include/cppunit/AdditionalMessage.h trunk/Externals/cppunit/include/cppunit/Asserter.h trunk/Externals/cppunit/include/cppunit/BriefTestProgressListener.h trunk/Externals/cppunit/include/cppunit/CompilerOutputter.h trunk/Externals/cppunit/include/cppunit/Exception.h trunk/Externals/cppunit/include/cppunit/Makefile.am trunk/Externals/cppunit/include/cppunit/Makefile.in trunk/Externals/cppunit/include/cppunit/Message.h trunk/Externals/cppunit/include/cppunit/Outputter.h trunk/Externals/cppunit/include/cppunit/Portability.h trunk/Externals/cppunit/include/cppunit/Protector.h trunk/Externals/cppunit/include/cppunit/SourceLine.h trunk/Externals/cppunit/include/cppunit/SynchronizedObject.h trunk/Externals/cppunit/include/cppunit/Test.h trunk/Externals/cppunit/include/cppunit/TestAssert.h trunk/Externals/cppunit/include/cppunit/TestCaller.h trunk/Externals/cppunit/include/cppunit/TestCase.h trunk/Externals/cppunit/include/cppunit/TestComposite.h trunk/Externals/cppunit/include/cppunit/TestFailure.h trunk/Externals/cppunit/include/cppunit/TestFixture.h trunk/Externals/cppunit/include/cppunit/TestLeaf.h trunk/Externals/cppunit/include/cppunit/TestListener.h trunk/Externals/cppunit/include/cppunit/TestPath.h trunk/Externals/cppunit/include/cppunit/TestResult.h trunk/Externals/cppunit/include/cppunit/TestResultCollector.h trunk/Externals/cppunit/include/cppunit/TestRunner.h trunk/Externals/cppunit/include/cppunit/TestSuccessListener.h trunk/Externals/cppunit/include/cppunit/TestSuite.h trunk/Externals/cppunit/include/cppunit/TextOutputter.h trunk/Externals/cppunit/include/cppunit/TextTestProgressListener.h trunk/Externals/cppunit/include/cppunit/TextTestResult.h trunk/Externals/cppunit/include/cppunit/TextTestRunner.h trunk/Externals/cppunit/include/cppunit/XmlOutputter.h trunk/Externals/cppunit/include/cppunit/XmlOutputterHook.h trunk/Externals/cppunit/include/cppunit/config/ trunk/Externals/cppunit/include/cppunit/config/CppUnitApi.h trunk/Externals/cppunit/include/cppunit/config/Makefile.am trunk/Externals/cppunit/include/cppunit/config/Makefile.in trunk/Externals/cppunit/include/cppunit/config/SelectDllLoader.h trunk/Externals/cppunit/include/cppunit/config/SourcePrefix.h trunk/Externals/cppunit/include/cppunit/config/config-bcb5.h trunk/Externals/cppunit/include/cppunit/config/config-evc4.h trunk/Externals/cppunit/include/cppunit/config/config-mac.h trunk/Externals/cppunit/include/cppunit/config/config-msvc6.h trunk/Externals/cppunit/include/cppunit/extensions/ trunk/Externals/cppunit/include/cppunit/extensions/AutoRegisterSuite.h trunk/Externals/cppunit/include/cppunit/extensions/ExceptionTestCaseDecorator.h trunk/Externals/cppunit/include/cppunit/extensions/HelperMacros.h trunk/Externals/cppunit/include/cppunit/extensions/Makefile.am trunk/Externals/cppunit/include/cppunit/extensions/Makefile.in trunk/Externals/cppunit/include/cppunit/extensions/Orthodox.h trunk/Externals/cppunit/include/cppunit/extensions/RepeatedTest.h trunk/Externals/cppunit/include/cppunit/extensions/TestCaseDecorator.h trunk/Externals/cppunit/include/cppunit/extensions/TestDecorator.h trunk/Externals/cppunit/include/cppunit/extensions/TestFactory.h trunk/Externals/cppunit/include/cppunit/extensions/TestFactoryRegistry.h trunk/Externals/cppunit/include/cppunit/extensions/TestFixtureFactory.h trunk/Externals/cppunit/include/cppunit/extensions/TestNamer.h trunk/Externals/cppunit/include/cppunit/extensions/TestSetUp.h trunk/Externals/cppunit/include/cppunit/extensions/TestSuiteBuilderContext.h trunk/Externals/cppunit/include/cppunit/extensions/TestSuiteFactory.h trunk/Externals/cppunit/include/cppunit/extensions/TypeInfoHelper.h trunk/Externals/cppunit/include/cppunit/plugin/ trunk/Externals/cppunit/include/cppunit/plugin/DynamicLibraryManager.h trunk/Externals/cppunit/include/cppunit/plugin/DynamicLibraryManagerException.h trunk/Externals/cppunit/include/cppunit/plugin/Makefile.am trunk/Externals/cppunit/include/cppunit/plugin/Makefile.in trunk/Externals/cppunit/include/cppunit/plugin/PlugInManager.h trunk/Externals/cppunit/include/cppunit/plugin/PlugInParameters.h trunk/Externals/cppunit/include/cppunit/plugin/TestPlugIn.h trunk/Externals/cppunit/include/cppunit/plugin/TestPlugInDefaultImpl.h trunk/Externals/cppunit/include/cppunit/portability/ trunk/Externals/cppunit/include/cppunit/portability/CppUnitDeque.h trunk/Externals/cppunit/include/cppunit/portability/CppUnitMap.h trunk/Externals/cppunit/include/cppunit/portability/CppUnitSet.h trunk/Externals/cppunit/include/cppunit/portability/CppUnitStack.h trunk/Externals/cppunit/include/cppunit/portability/CppUnitVector.h trunk/Externals/cppunit/include/cppunit/portability/Makefile.am trunk/Externals/cppunit/include/cppunit/portability/Makefile.in trunk/Externals/cppunit/include/cppunit/portability/Stream.h trunk/Externals/cppunit/include/cppunit/tools/ trunk/Externals/cppunit/include/cppunit/tools/Algorithm.h trunk/Externals/cppunit/include/cppunit/tools/Makefile.am trunk/Externals/cppunit/include/cppunit/tools/Makefile.in trunk/Externals/cppunit/include/cppunit/tools/StringTools.h trunk/Externals/cppunit/include/cppunit/tools/XmlDocument.h trunk/Externals/cppunit/include/cppunit/tools/XmlElement.h trunk/Externals/cppunit/include/cppunit/ui/ trunk/Externals/cppunit/include/cppunit/ui/Makefile.am trunk/Externals/cppunit/include/cppunit/ui/Makefile.in trunk/Externals/cppunit/include/cppunit/ui/mfc/ trunk/Externals/cppunit/include/cppunit/ui/mfc/Makefile.am trunk/Externals/cppunit/include/cppunit/ui/mfc/Makefile.in trunk/Externals/cppunit/include/cppunit/ui/mfc/MfcTestRunner.h trunk/Externals/cppunit/include/cppunit/ui/mfc/TestRunner.h trunk/Externals/cppunit/include/cppunit/ui/qt/ trunk/Externals/cppunit/include/cppunit/ui/qt/Config.h trunk/Externals/cppunit/include/cppunit/ui/qt/Makefile.am trunk/Externals/cppunit/include/cppunit/ui/qt/Makefile.in trunk/Externals/cppunit/include/cppunit/ui/qt/QtTestRunner.h trunk/Externals/cppunit/include/cppunit/ui/qt/TestRunner.h trunk/Externals/cppunit/include/cppunit/ui/text/ trunk/Externals/cppunit/include/cppunit/ui/text/Makefile.am trunk/Externals/cppunit/include/cppunit/ui/text/Makefile.in trunk/Externals/cppunit/include/cppunit/ui/text/TestRunner.h trunk/Externals/cppunit/include/cppunit/ui/text/TextTestRunner.h trunk/Externals/cppunit/include/msvc6/ trunk/Externals/cppunit/include/msvc6/.cvsignore trunk/Externals/cppunit/include/msvc6/DSPlugin/ trunk/Externals/cppunit/include/msvc6/DSPlugin/TestRunnerDSPluginVC6.h trunk/Externals/cppunit/include/msvc6/DSPlugin/TestRunnerDSPluginVC6_i.c trunk/Externals/cppunit/include/msvc6/testrunner/ trunk/Externals/cppunit/include/msvc6/testrunner/TestPlugInInterface.h trunk/Externals/cppunit/include/msvc6/testrunner/TestRunner.h trunk/Externals/cppunit/lib/ trunk/Externals/cppunit/src/ trunk/Externals/cppunit/src/CppUnitLibraries.dsw trunk/Externals/cppunit/src/DllPlugInTester/ trunk/Externals/cppunit/src/DllPlugInTester/CommandLineParser.cpp trunk/Externals/cppunit/src/DllPlugInTester/CommandLineParser.h trunk/Externals/cppunit/src/DllPlugInTester/CommandLineParserTest.cpp trunk/Externals/cppunit/src/DllPlugInTester/CommandLineParserTest.h trunk/Externals/cppunit/src/DllPlugInTester/DllPlugInTester.cpp trunk/Externals/cppunit/src/DllPlugInTester/DllPlugInTester.dsp trunk/Externals/cppunit/src/DllPlugInTester/DllPlugInTesterTest.cpp trunk/Externals/cppunit/src/DllPlugInTester/DllPlugInTesterTest.dsp trunk/Externals/cppunit/src/DllPlugInTester/Makefile.am trunk/Externals/cppunit/src/DllPlugInTester/Makefile.in trunk/Externals/cppunit/src/Makefile.am trunk/Externals/cppunit/src/Makefile.in trunk/Externals/cppunit/src/cppunit/ trunk/Externals/cppunit/src/cppunit/AdditionalMessage.cpp trunk/Externals/cppunit/src/cppunit/Asserter.cpp trunk/Externals/cppunit/src/cppunit/BeOsDynamicLibraryManager.cpp trunk/Externals/cppunit/src/cppunit/BriefTestProgressListener.cpp trunk/Externals/cppunit/src/cppunit/CompilerOutputter.cpp trunk/Externals/cppunit/src/cppunit/DefaultProtector.cpp trunk/Externals/cppunit/src/cppunit/DefaultProtector.h trunk/Externals/cppunit/src/cppunit/DllMain.cpp trunk/Externals/cppunit/src/cppunit/DynamicLibraryManager.cpp trunk/Externals/cppunit/src/cppunit/DynamicLibraryManagerException.cpp trunk/Externals/cppunit/src/cppunit/Exception.cpp trunk/Externals/cppunit/src/cppunit/Makefile.am trunk/Externals/cppunit/src/cppunit/Makefile.in trunk/Externals/cppunit/src/cppunit/Message.cpp trunk/Externals/cppunit/src/cppunit/PlugInManager.cpp trunk/Externals/cppunit/src/cppunit/PlugInParameters.cpp trunk/Externals/cppunit/src/cppunit/Protector.cpp trunk/Externals/cppunit/src/cppunit/ProtectorChain.cpp trunk/Externals/cppunit/src/cppunit/ProtectorChain.h trunk/Externals/cppunit/src/cppunit/ProtectorContext.h trunk/Externals/cppunit/src/cppunit/RepeatedTest.cpp trunk/Externals/cppunit/src/cppunit/ShlDynamicLibraryManager.cpp trunk/Externals/cppunit/src/cppunit/SourceLine.cpp trunk/Externals/cppunit/src/cppunit/StringTools.cpp trunk/Externals/cppunit/src/cppunit/SynchronizedObject.cpp trunk/Externals/cppunit/src/cppunit/Test.cpp trunk/Externals/cppunit/src/cppunit/TestAssert.cpp trunk/Externals/cppunit/src/cppunit/TestCase.cpp trunk/Externals/cppunit/src/cppunit/TestCaseDecorator.cpp trunk/Externals/cppunit/src/cppunit/TestComposite.cpp trunk/Externals/cppunit/src/cppunit/TestDecorator.cpp trunk/Externals/cppunit/src/cppunit/TestFactoryRegistry.cpp trunk/Externals/cppunit/src/cppunit/TestFailure.cpp trunk/Externals/cppunit/src/cppunit/TestLeaf.cpp trunk/Externals/cppunit/src/cppunit/TestNamer.cpp trunk/Externals/cppunit/src/cppunit/TestPath.cpp trunk/Externals/cppunit/src/cppunit/TestPlugInDefaultImpl.cpp trunk/Externals/cppunit/src/cppunit/TestResult.cpp trunk/Externals/cppunit/src/cppunit/TestResultCollector.cpp trunk/Externals/cppunit/src/cppunit/TestRunner.cpp trunk/Externals/cppunit/src/cppunit/TestSetUp.cpp trunk/Externals/cppunit/src/cppunit/TestSuccessListener.cpp trunk/Externals/cppunit/src/cppunit/TestSuite.cpp trunk/Externals/cppunit/src/cppunit/TestSuiteBuilderContext.cpp trunk/Externals/cppunit/src/cppunit/TextOutputter.cpp trunk/Externals/cppunit/src/cppunit/TextTestProgressListener.cpp trunk/Externals/cppunit/src/cppunit/TextTestResult.cpp trunk/Externals/cppunit/src/cppunit/TextTestRunner.cpp trunk/Externals/cppunit/src/cppunit/TypeInfoHelper.cpp trunk/Externals/cppunit/src/cppunit/UnixDynamicLibraryManager.cpp trunk/Externals/cppunit/src/cppunit/Win32DynamicLibraryManager.cpp trunk/Externals/cppunit/src/cppunit/XmlDocument.cpp trunk/Externals/cppunit/src/cppunit/XmlElement.cpp trunk/Externals/cppunit/src/cppunit/XmlOutputter.cpp trunk/Externals/cppunit/src/cppunit/XmlOutputterHook.cpp trunk/Externals/cppunit/src/cppunit/cppunit.dsp trunk/Externals/cppunit/src/cppunit/cppunit_dll.dsp trunk/Externals/cppunit/src/msvc6/ trunk/Externals/cppunit/src/msvc6/DSPlugIn/ trunk/Externals/cppunit/src/msvc6/DSPlugIn/.cvsignore trunk/Externals/cppunit/src/msvc6/DSPlugIn/COMHelper.h trunk/Externals/cppunit/src/msvc6/DSPlugIn/DSAddIn.cpp trunk/Externals/cppunit/src/msvc6/DSPlugIn/DSAddIn.h trunk/Externals/cppunit/src/msvc6/DSPlugIn/DSPlugIn.cpp trunk/Externals/cppunit/src/msvc6/DSPlugIn/DSPlugIn.def trunk/Externals/cppunit/src/msvc6/DSPlugIn/DSPlugIn.dsp trunk/Externals/cppunit/src/msvc6/DSPlugIn/DSPlugIn.h trunk/Externals/cppunit/src/msvc6/DSPlugIn/DSPlugIn.rc trunk/Externals/cppunit/src/msvc6/DSPlugIn/DSPlugIn.rgs trunk/Externals/cppunit/src/msvc6/DSPlugIn/ReadMe.txt trunk/Externals/cppunit/src/msvc6/DSPlugIn/StdAfx.cpp trunk/Externals/cppunit/src/msvc6/DSPlugIn/StdAfx.h trunk/Externals/cppunit/src/msvc6/DSPlugIn/TestRunnerDSPlugin.idl trunk/Externals/cppunit/src/msvc6/DSPlugIn/res/ trunk/Externals/cppunit/src/msvc6/DSPlugIn/res/DSPlugIn.rc2 trunk/Externals/cppunit/src/msvc6/DSPlugIn/res/TBarLrge.bmp trunk/Externals/cppunit/src/msvc6/DSPlugIn/res/TBarMedm.bmp trunk/Externals/cppunit/src/msvc6/DSPlugIn/resource.h trunk/Externals/cppunit/src/msvc6/DllPlugInTester/ trunk/Externals/cppunit/src/msvc6/DllPlugInTester/.cvsignore trunk/Externals/cppunit/src/msvc6/DllPlugInTester/DllPlugInTester.cpp trunk/Externals/cppunit/src/msvc6/DllPlugInTester/DllPlugInTester.dsp trunk/Externals/cppunit/src/msvc6/testpluginrunner/ trunk/Externals/cppunit/src/msvc6/testpluginrunner/.cvsignore trunk/Externals/cppunit/src/msvc6/testpluginrunner/ReadMe.txt trunk/Externals/cppunit/src/msvc6/testpluginrunner/Resource.h trunk/Externals/cppunit/src/msvc6/testpluginrunner/StdAfx.cpp trunk/Externals/cppunit/src/msvc6/testpluginrunner/StdAfx.h trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugIn.cpp trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugIn.h trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInException.cpp trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInException.h trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInRunner.dsp trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInRunner.rc trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInRunnerApp.cpp trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInRunnerApp.h trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInRunnerDlg.cpp trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInRunnerDlg.h trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInRunnerModel.cpp trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInRunnerModel.h trunk/Externals/cppunit/src/msvc6/testpluginrunner/res/ trunk/Externals/cppunit/src/msvc6/testpluginrunner/res/TestPlugInRunner.ico trunk/Externals/cppunit/src/msvc6/testpluginrunner/res/TestPlugInRunner.rc2 trunk/Externals/cppunit/src/msvc6/testpluginrunner/res/errortype.bmp trunk/Externals/cppunit/src/msvc6/testpluginrunner/res/test_type.bmp trunk/Externals/cppunit/src/msvc6/testrunner/ trunk/Externals/cppunit/src/msvc6/testrunner/.cvsignore trunk/Externals/cppunit/src/msvc6/testrunner/ActiveTest.cpp trunk/Externals/cppunit/src/msvc6/testrunner/ActiveTest.h trunk/Externals/cppunit/src/msvc6/testrunner/Change-Diary-ResourceBugFix.txt trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/ trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/SizeCBar.cpp trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/SizeCBar.h trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/SizeCBar.html trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicBar.cpp trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicBar.h trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicControlsManager.cpp trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicControlsManager.h trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.cpp trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.h trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicFormView.cpp trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicFormView.h trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicPropSheet.cpp trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicPropSheet.h trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.cpp trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.h trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWndEx.cpp trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWndEx.h trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCSizeIconCtrl.cpp trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCSizeIconCtrl.h trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/doc/ trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/doc/cdxCDynamicWnd-DOC-big.gif trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/doc/cdxCDynamicWnd-DOC-small.gif trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/doc/cdxCDynamicWnd-DOC.html trunk/Externals/cppunit/src/msvc6/testrunner/ListCtrlFormatter.cpp trunk/Externals/cppunit/src/msvc6/testrunner/ListCtrlFormatter.h trunk/Externals/cppunit/src/msvc6/testrunner/ListCtrlSetter.cpp trunk/Externals/cppunit/src/msvc6/testrunner/ListCtrlSetter.h trunk/Externals/cppunit/src/msvc6/testrunner/MfcSynchronizationObject.h trunk/Externals/cppunit/src/msvc6/testrunner/MfcTestRunner.cpp trunk/Externals/cppunit/src/msvc6/testrunner/MostRecentTests.cpp trunk/Externals/cppunit/src/msvc6/testrunner/MostRecentTests.h trunk/Externals/cppunit/src/msvc6/testrunner/MsDevCallerListCtrl.cpp trunk/Externals/cppunit/src/msvc6/testrunner/MsDevCallerListCtrl.h trunk/Externals/cppunit/src/msvc6/testrunner/ProgressBar.cpp trunk/Externals/cppunit/src/msvc6/testrunner/ProgressBar.h trunk/Externals/cppunit/src/msvc6/testrunner/Resource.h trunk/Externals/cppunit/src/msvc6/testrunner/ResourceLoaders.cpp trunk/Externals/cppunit/src/msvc6/testrunner/ResourceLoaders.h trunk/Externals/cppunit/src/msvc6/testrunner/StdAfx.cpp trunk/Externals/cppunit/src/msvc6/testrunner/StdAfx.h trunk/Externals/cppunit/src/msvc6/testrunner/SynchronizedTestResult.h trunk/Externals/cppunit/src/msvc6/testrunner/TestResultDecorator.h trunk/Externals/cppunit/src/msvc6/testrunner/TestRunner.def trunk/Externals/cppunit/src/msvc6/testrunner/TestRunner.dsp trunk/Externals/cppunit/src/msvc6/testrunner/TestRunner.rc trunk/Externals/cppunit/src/msvc6/testrunner/TestRunnerApp.cpp trunk/Externals/cppunit/src/msvc6/testrunner/TestRunnerApp.h trunk/Externals/cppunit/src/msvc6/testrunner/TestRunnerDlg.cpp trunk/Externals/cppunit/src/msvc6/testrunner/TestRunnerDlg.h trunk/Externals/cppunit/src/msvc6/testrunner/TestRunnerModel.cpp trunk/Externals/cppunit/src/msvc6/testrunner/TestRunnerModel.h trunk/Externals/cppunit/src/msvc6/testrunner/TreeHierarchyDlg.cpp trunk/Externals/cppunit/src/msvc6/testrunner/TreeHierarchyDlg.h trunk/Externals/cppunit/src/msvc6/testrunner/res/ trunk/Externals/cppunit/src/msvc6/testrunner/res/TestRunner.rc2 trunk/Externals/cppunit/src/msvc6/testrunner/res/errortype.bmp trunk/Externals/cppunit/src/msvc6/testrunner/res/test_type.bmp trunk/Externals/cppunit/src/qttestrunner/ trunk/Externals/cppunit/src/qttestrunner/.cvsignore trunk/Externals/cppunit/src/qttestrunner/MostRecentTests.cpp trunk/Externals/cppunit/src/qttestrunner/MostRecentTests.h trunk/Externals/cppunit/src/qttestrunner/QtTestRunner.cpp trunk/Externals/cppunit/src/qttestrunner/TestBrowserDlgImpl.cpp trunk/Externals/cppunit/src/qttestrunner/TestBrowserDlgImpl.h trunk/Externals/cppunit/src/qttestrunner/TestFailureInfo.cpp trunk/Externals/cppunit/src/qttestrunner/TestFailureInfo.h trunk/Externals/cppunit/src/qttestrunner/TestFailureListViewItem.cpp trunk/Externals/cppunit/src/qttestrunner/TestFailureListViewItem.h trunk/Externals/cppunit/src/qttestrunner/TestListViewItem.cpp trunk/Externals/cppunit/src/qttestrunner/TestListViewItem.h trunk/Externals/cppunit/src/qttestrunner/TestRunnerDlgImpl.cpp trunk/Externals/cppunit/src/qttestrunner/TestRunnerDlgImpl.h trunk/Externals/cppunit/src/qttestrunner/TestRunnerFailureEvent.cpp trunk/Externals/cppunit/src/qttestrunner/TestRunnerFailureEvent.h trunk/Externals/cppunit/src/qttestrunner/TestRunnerModel.cpp trunk/Externals/cppunit/src/qttestrunner/TestRunnerModel.h trunk/Externals/cppunit/src/qttestrunner/TestRunnerModelThreadInterface.cpp trunk/Externals/cppunit/src/qttestrunner/TestRunnerModelThreadInterface.h trunk/Externals/cppunit/src/qttestrunner/TestRunnerTestCaseRunEvent.cpp trunk/Externals/cppunit/src/qttestrunner/TestRunnerTestCaseRunEvent.h trunk/Externals/cppunit/src/qttestrunner/TestRunnerThread.cpp trunk/Externals/cppunit/src/qttestrunner/TestRunnerThread.h trunk/Externals/cppunit/src/qttestrunner/TestRunnerThreadEvent.cpp trunk/Externals/cppunit/src/qttestrunner/TestRunnerThreadEvent.h trunk/Externals/cppunit/src/qttestrunner/TestRunnerThreadFinishedEvent.cpp trunk/Externals/cppunit/src/qttestrunner/TestRunnerThreadFinishedEvent.h trunk/Externals/cppunit/src/qttestrunner/make_lib trunk/Externals/cppunit/src/qttestrunner/make_lib.bat trunk/Externals/cppunit/src/qttestrunner/qttestrunner.vcproj trunk/Externals/cppunit/src/qttestrunner/qttestrunner_dll.vcproj trunk/Externals/cppunit/src/qttestrunner/qttestrunnerlib.pro trunk/Externals/cppunit/src/qttestrunner/testbrowserdlg.ui trunk/Externals/cppunit/src/qttestrunner/testrunnerdlg.ui Added: trunk/Externals/cppunit/AUTHORS =================================================================== --- trunk/Externals/cppunit/AUTHORS (rev 0) +++ trunk/Externals/cppunit/AUTHORS 2006-10-27 15:07:00 UTC (rev 3733) @@ -0,0 +1,6 @@ +Michael Feathers <mfe...@ob...> +Jerome Lacoste <lac...@al...> +E. Sommerlade <er...@so...> +Baptiste Lepilleur <gai...@fr...> <bl...@so...> +Bastiaan Bakker <bas...@li...> +Steve Robbins <sm...@so...> Added: trunk/Externals/cppunit/BUGS =================================================================== --- trunk/Externals/cppunit/BUGS (rev 0) +++ trunk/Externals/cppunit/BUGS 2006-10-27 15:07:00 UTC (rev 3733) @@ -0,0 +1,6 @@ + KNOWN BUGS + ---------- + +The handling of html and man pages in doc/Makefile.am is +flawed. It will not pass "make distcheck". + Added: trunk/Externals/cppunit/COPYING =================================================================== --- trunk/Externals/cppunit/COPYING (rev 0) +++ trunk/Externals/cppunit/COPYING 2006-10-27 15:07:00 UTC (rev 3733) @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this L... [truncated message content] |
From: <ki...@us...> - 2006-11-01 18:33:52
|
Revision: 3755 http://svn.sourceforge.net/winmerge/?rev=3755&view=rev Author: kimmov Date: 2006-11-01 10:32:37 -0800 (Wed, 01 Nov 2006) Log Message: ----------- PATCH: [ 1588212 ] Add manifest file to resource file Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/Languages/Brazilian/MergeBrazilian.rc trunk/Src/Languages/Bulgarian/MergeBulgarian.rc trunk/Src/Languages/Catalan/MergeCatalan.rc trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc trunk/Src/Languages/Czech/MergeCzech.rc trunk/Src/Languages/Danish/MergeDanish.rc trunk/Src/Languages/Dutch/MergeDutch.rc trunk/Src/Languages/French/MergeFrench.rc trunk/Src/Languages/German/MergeGerman.rc trunk/Src/Languages/Hungarian/MergeHungarian.rc trunk/Src/Languages/Italian/MergeItalian.rc trunk/Src/Languages/Japanese/MergeJapanese.rc trunk/Src/Languages/Korean/MergeKorean.rc trunk/Src/Languages/Norwegian/MergeNorwegian.rc trunk/Src/Languages/Polish/MergePolish.rc trunk/Src/Languages/Russian/MergeRussian.rc trunk/Src/Languages/Slovak/MergeSlovak.rc trunk/Src/Languages/Spanish/MergeSpanish.rc trunk/Src/Languages/Swedish/MergeSwedish.rc trunk/Src/Languages/Turkish/MergeTurkish.rc trunk/Src/Merge.rc Added Paths: ----------- trunk/Src/res/WinMerge.exe.manifest trunk/Src/res/WinMergeU.exe.manifest Removed Paths: ------------- trunk/Installer/InnoSetup/WinMerge.exe.manifest trunk/Installer/InnoSetup/WinMergeU.exe.manifest Deleted: trunk/Installer/InnoSetup/WinMerge.exe.manifest =================================================================== --- trunk/Installer/InnoSetup/WinMerge.exe.manifest 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Installer/InnoSetup/WinMerge.exe.manifest 2006-11-01 18:32:37 UTC (rev 3755) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="Microsoft.Winweb.WinMerge" - type="win32" - /> - <description>WinMerge Application</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> \ No newline at end of file Deleted: trunk/Installer/InnoSetup/WinMergeU.exe.manifest =================================================================== --- trunk/Installer/InnoSetup/WinMergeU.exe.manifest 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Installer/InnoSetup/WinMergeU.exe.manifest 2006-11-01 18:32:37 UTC (rev 3755) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="Microsoft.Winweb.WinMerge" - type="win32" - /> - <description>WinMerge Application</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> \ No newline at end of file Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Changes.txt 2006-11-01 18:32:37 UTC (rev 3755) @@ -10,6 +10,11 @@ PATCH: [ 1587574 ] Convert project files code to use expat+SCEW Src: Merge.dsp ProjectFile.cpp ProjectFile.h Remove folder: Src/ExpatLib/* + PATCH: [ 1588212 ] Add manifest file to resource file + Src: Merge.rc + Src/Languages/*: Merge*.rc + Move files from Installer/InnoSetup: WinMerge.exe.manifest WinMergeU.exe.manifest + to Src/res 2006-10-31 Kimmo PATCH: [ 1586869 ] Fix File Select -dialog modality (commit the file I missed in previous commit) Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc =================================================================== --- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc =================================================================== --- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc =================================================================== --- trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc =================================================================== --- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -62,6 +62,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc =================================================================== --- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/Czech/MergeCzech.rc =================================================================== --- trunk/Src/Languages/Czech/MergeCzech.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/Czech/MergeCzech.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/Danish/MergeDanish.rc =================================================================== --- trunk/Src/Languages/Danish/MergeDanish.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/Danish/MergeDanish.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/Dutch/MergeDutch.rc =================================================================== --- trunk/Src/Languages/Dutch/MergeDutch.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/Dutch/MergeDutch.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/French/MergeFrench.rc =================================================================== --- trunk/Src/Languages/French/MergeFrench.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/French/MergeFrench.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/German/MergeGerman.rc =================================================================== --- trunk/Src/Languages/German/MergeGerman.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/German/MergeGerman.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc =================================================================== --- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/Italian/MergeItalian.rc =================================================================== --- trunk/Src/Languages/Italian/MergeItalian.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/Italian/MergeItalian.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc =================================================================== --- trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/Korean/MergeKorean.rc =================================================================== --- trunk/Src/Languages/Korean/MergeKorean.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/Korean/MergeKorean.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc =================================================================== --- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/Polish/MergePolish.rc =================================================================== --- trunk/Src/Languages/Polish/MergePolish.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/Polish/MergePolish.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/Russian/MergeRussian.rc =================================================================== --- trunk/Src/Languages/Russian/MergeRussian.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/Russian/MergeRussian.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc =================================================================== --- trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc =================================================================== --- trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc =================================================================== --- trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc =================================================================== --- trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Modified: trunk/Src/Merge.rc =================================================================== --- trunk/Src/Merge.rc 2006-11-01 16:35:58 UTC (rev 3754) +++ trunk/Src/Merge.rc 2006-11-01 18:32:37 UTC (rev 3755) @@ -60,6 +60,15 @@ #endif // APSTUDIO_INVOKED +// Include the manifest file for VC6 and VS2003.Net +#if _MSC_VER < 1400 + #ifdef UNICODE + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMergeU.exe.manifest" + #else + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMerge.exe.manifest" + #endif +#endif // MSC_VER + ///////////////////////////////////////////////////////////////////////////// // // Icon Copied: trunk/Src/res/WinMerge.exe.manifest (from rev 3745, trunk/Installer/InnoSetup/WinMerge.exe.manifest) =================================================================== --- trunk/Src/res/WinMerge.exe.manifest (rev 0) +++ trunk/Src/res/WinMerge.exe.manifest 2006-11-01 18:32:37 UTC (rev 3755) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="Microsoft.Winweb.WinMerge" + type="win32" + /> + <description>WinMerge Application</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> \ No newline at end of file Copied: trunk/Src/res/WinMergeU.exe.manifest (from rev 3745, trunk/Installer/InnoSetup/WinMergeU.exe.manifest) =================================================================== --- trunk/Src/res/WinMergeU.exe.manifest (rev 0) +++ trunk/Src/res/WinMergeU.exe.manifest 2006-11-01 18:32:37 UTC (rev 3755) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="Microsoft.Winweb.WinMerge" + type="win32" + /> + <description>WinMerge Application</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdo...@us...> - 2006-11-06 17:25:34
|
Revision: 3774 http://svn.sourceforge.net/winmerge/?rev=3774&view=rev Author: sdottaka Date: 2006-11-06 09:24:58 -0800 (Mon, 06 Nov 2006) Log Message: ----------- PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico) Modified Paths: -------------- trunk/Docs/Users/Manual/Changes.txt trunk/Docs/Users/Manual/screenshots/equal.gif trunk/Docs/Users/Manual/screenshots/fileskip.gif trunk/Docs/Users/Manual/screenshots/foldercomp1.png trunk/Docs/Users/Manual/screenshots/lfile.gif trunk/Docs/Users/Manual/screenshots/notequal.gif trunk/Docs/Users/Manual/screenshots/rfile.gif trunk/Src/Changes.txt trunk/Src/res/equalfile.ico trunk/Src/res/fileskip.ico trunk/Src/res/lfile.ico trunk/Src/res/notequalfile.ico trunk/Src/res/rfile.ico Modified: trunk/Docs/Users/Manual/Changes.txt =================================================================== --- trunk/Docs/Users/Manual/Changes.txt 2006-11-06 17:07:27 UTC (rev 3773) +++ trunk/Docs/Users/Manual/Changes.txt 2006-11-06 17:24:58 UTC (rev 3774) @@ -1,3 +1,8 @@ +2006-11-06 Takashi + PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico) + Manual/screenshots: equal.gif fileskip.gif foldercomp1.png + lfile.gif notequal.gif rfile.gif + 2006-10-30 Tim PATCH: [ 1586867 ] Manual: Replace "example1.gif" with new PNG version Manual/screenshots new file: missing_lines.png Modified: trunk/Docs/Users/Manual/screenshots/equal.gif =================================================================== (Binary files differ) Modified: trunk/Docs/Users/Manual/screenshots/fileskip.gif =================================================================== (Binary files differ) Modified: trunk/Docs/Users/Manual/screenshots/foldercomp1.png =================================================================== (Binary files differ) Modified: trunk/Docs/Users/Manual/screenshots/lfile.gif =================================================================== (Binary files differ) Modified: trunk/Docs/Users/Manual/screenshots/notequal.gif =================================================================== (Binary files differ) Modified: trunk/Docs/Users/Manual/screenshots/rfile.gif =================================================================== (Binary files differ) Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-11-06 17:07:27 UTC (rev 3773) +++ trunk/Src/Changes.txt 2006-11-06 17:24:58 UTC (rev 3774) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-11-06 Takashi + PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico) + Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico + 2006-11-06 Kimmo PATCH: [ 1590892 ] Handle unicode paths for project files Src: ProjectFile.cpp Modified: trunk/Src/res/equalfile.ico =================================================================== (Binary files differ) Modified: trunk/Src/res/fileskip.ico =================================================================== (Binary files differ) Modified: trunk/Src/res/lfile.ico =================================================================== (Binary files differ) Modified: trunk/Src/res/notequalfile.ico =================================================================== (Binary files differ) Modified: trunk/Src/res/rfile.ico =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-11-07 16:30:38
|
Revision: 3781 http://svn.sourceforge.net/winmerge/?rev=3781&view=rev Author: kimmov Date: 2006-11-07 08:28:04 -0800 (Tue, 07 Nov 2006) Log Message: ----------- Add PCRE 6.7 (with windows build files from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Contrib/) Modified Paths: -------------- trunk/Src/Changes.txt Added Paths: ----------- trunk/Externals/pcre/ trunk/Externals/pcre/config_pcre/ trunk/Externals/pcre/config_pcre/config_pcre.dsp trunk/Externals/pcre/config_pcre/configure.mak trunk/Externals/pcre/dll_pcre/ trunk/Externals/pcre/dll_pcre/pcre.dsp trunk/Externals/pcre/lib_pcre/ trunk/Externals/pcre/lib_pcre/lib_pcre.dsp trunk/Externals/pcre/lib_pcreposix/ trunk/Externals/pcre/lib_pcreposix/lib_pcreposix.dsp trunk/Externals/pcre/pcre-6.7/ trunk/Externals/pcre/pcre-6.7/AUTHORS trunk/Externals/pcre/pcre-6.7/COPYING trunk/Externals/pcre/pcre-6.7/ChangeLog trunk/Externals/pcre/pcre-6.7/INSTALL trunk/Externals/pcre/pcre-6.7/LICENCE trunk/Externals/pcre/pcre-6.7/Makefile.in trunk/Externals/pcre/pcre-6.7/NEWS trunk/Externals/pcre/pcre-6.7/NON-UNIX-USE trunk/Externals/pcre/pcre-6.7/README trunk/Externals/pcre/pcre-6.7/RunGrepTest.in trunk/Externals/pcre/pcre-6.7/RunTest.in trunk/Externals/pcre/pcre-6.7/config.guess trunk/Externals/pcre/pcre-6.7/config.h.in trunk/Externals/pcre/pcre-6.7/config.sub trunk/Externals/pcre/pcre-6.7/configure trunk/Externals/pcre/pcre-6.7/configure.ac trunk/Externals/pcre/pcre-6.7/dftables.c trunk/Externals/pcre/pcre-6.7/doc/ trunk/Externals/pcre/pcre-6.7/doc/Tech.Notes trunk/Externals/pcre/pcre-6.7/doc/html/ trunk/Externals/pcre/pcre-6.7/doc/html/index.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_compile.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_compile2.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_config.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_copy_named_substring.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_copy_substring.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_dfa_exec.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_exec.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_free_substring.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_free_substring_list.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_fullinfo.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_get_named_substring.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_get_stringnumber.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_get_stringtable_entries.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_get_substring.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_get_substring_list.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_info.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_maketables.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_refcount.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_study.html trunk/Externals/pcre/pcre-6.7/doc/html/pcre_version.html trunk/Externals/pcre/pcre-6.7/doc/html/pcreapi.html trunk/Externals/pcre/pcre-6.7/doc/html/pcrebuild.html trunk/Externals/pcre/pcre-6.7/doc/html/pcrecallout.html trunk/Externals/pcre/pcre-6.7/doc/html/pcrecompat.html trunk/Externals/pcre/pcre-6.7/doc/html/pcrecpp.html trunk/Externals/pcre/pcre-6.7/doc/html/pcregrep.html trunk/Externals/pcre/pcre-6.7/doc/html/pcrematching.html trunk/Externals/pcre/pcre-6.7/doc/html/pcrepartial.html trunk/Externals/pcre/pcre-6.7/doc/html/pcrepattern.html trunk/Externals/pcre/pcre-6.7/doc/html/pcreperform.html trunk/Externals/pcre/pcre-6.7/doc/html/pcreposix.html trunk/Externals/pcre/pcre-6.7/doc/html/pcreprecompile.html trunk/Externals/pcre/pcre-6.7/doc/html/pcresample.html trunk/Externals/pcre/pcre-6.7/doc/html/pcrestack.html trunk/Externals/pcre/pcre-6.7/doc/html/pcretest.html trunk/Externals/pcre/pcre-6.7/doc/pcre.3 trunk/Externals/pcre/pcre-6.7/doc/pcre.txt trunk/Externals/pcre/pcre-6.7/doc/pcre_compile.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_compile2.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_config.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_copy_named_substring.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_copy_substring.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_dfa_exec.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_exec.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_free_substring.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_free_substring_list.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_fullinfo.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_get_named_substring.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_get_stringnumber.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_get_stringtable_entries.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_get_substring.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_get_substring_list.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_info.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_maketables.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_refcount.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_study.3 trunk/Externals/pcre/pcre-6.7/doc/pcre_version.3 trunk/Externals/pcre/pcre-6.7/doc/pcreapi.3 trunk/Externals/pcre/pcre-6.7/doc/pcrebuild.3 trunk/Externals/pcre/pcre-6.7/doc/pcrecallout.3 trunk/Externals/pcre/pcre-6.7/doc/pcrecompat.3 trunk/Externals/pcre/pcre-6.7/doc/pcrecpp.3 trunk/Externals/pcre/pcre-6.7/doc/pcregrep.1 trunk/Externals/pcre/pcre-6.7/doc/pcregrep.txt trunk/Externals/pcre/pcre-6.7/doc/pcrematching.3 trunk/Externals/pcre/pcre-6.7/doc/pcrepartial.3 trunk/Externals/pcre/pcre-6.7/doc/pcrepattern.3 trunk/Externals/pcre/pcre-6.7/doc/pcreperform.3 trunk/Externals/pcre/pcre-6.7/doc/pcreposix.3 trunk/Externals/pcre/pcre-6.7/doc/pcreprecompile.3 trunk/Externals/pcre/pcre-6.7/doc/pcresample.3 trunk/Externals/pcre/pcre-6.7/doc/pcrestack.3 trunk/Externals/pcre/pcre-6.7/doc/pcretest.1 trunk/Externals/pcre/pcre-6.7/doc/pcretest.txt trunk/Externals/pcre/pcre-6.7/doc/perltest.txt trunk/Externals/pcre/pcre-6.7/install-sh trunk/Externals/pcre/pcre-6.7/libpcre.def trunk/Externals/pcre/pcre-6.7/libpcre.pc.in trunk/Externals/pcre/pcre-6.7/libpcreposix.def trunk/Externals/pcre/pcre-6.7/ltmain.sh trunk/Externals/pcre/pcre-6.7/makevp.bat trunk/Externals/pcre/pcre-6.7/mkinstalldirs trunk/Externals/pcre/pcre-6.7/pcre-config.in trunk/Externals/pcre/pcre-6.7/pcre.def trunk/Externals/pcre/pcre-6.7/pcre.h trunk/Externals/pcre/pcre-6.7/pcre_compile.c trunk/Externals/pcre/pcre-6.7/pcre_config.c trunk/Externals/pcre/pcre-6.7/pcre_dfa_exec.c trunk/Externals/pcre/pcre-6.7/pcre_exec.c trunk/Externals/pcre/pcre-6.7/pcre_fullinfo.c trunk/Externals/pcre/pcre-6.7/pcre_get.c trunk/Externals/pcre/pcre-6.7/pcre_globals.c trunk/Externals/pcre/pcre-6.7/pcre_info.c trunk/Externals/pcre/pcre-6.7/pcre_internal.h trunk/Externals/pcre/pcre-6.7/pcre_maketables.c trunk/Externals/pcre/pcre-6.7/pcre_ord2utf8.c trunk/Externals/pcre/pcre-6.7/pcre_printint.src trunk/Externals/pcre/pcre-6.7/pcre_refcount.c trunk/Externals/pcre/pcre-6.7/pcre_scanner.cc trunk/Externals/pcre/pcre-6.7/pcre_scanner.h trunk/Externals/pcre/pcre-6.7/pcre_scanner_unittest.cc trunk/Externals/pcre/pcre-6.7/pcre_stringpiece.cc trunk/Externals/pcre/pcre-6.7/pcre_stringpiece.h.in trunk/Externals/pcre/pcre-6.7/pcre_stringpiece_unittest.cc trunk/Externals/pcre/pcre-6.7/pcre_study.c trunk/Externals/pcre/pcre-6.7/pcre_tables.c trunk/Externals/pcre/pcre-6.7/pcre_try_flipped.c trunk/Externals/pcre/pcre-6.7/pcre_ucp_searchfuncs.c trunk/Externals/pcre/pcre-6.7/pcre_valid_utf8.c trunk/Externals/pcre/pcre-6.7/pcre_version.c trunk/Externals/pcre/pcre-6.7/pcre_xclass.c trunk/Externals/pcre/pcre-6.7/pcrecpp.cc trunk/Externals/pcre/pcre-6.7/pcrecpp.h trunk/Externals/pcre/pcre-6.7/pcrecpp_unittest.cc trunk/Externals/pcre/pcre-6.7/pcrecpparg.h.in trunk/Externals/pcre/pcre-6.7/pcredemo.c trunk/Externals/pcre/pcre-6.7/pcregrep.c trunk/Externals/pcre/pcre-6.7/pcreposix.c trunk/Externals/pcre/pcre-6.7/pcreposix.h trunk/Externals/pcre/pcre-6.7/pcretest.c trunk/Externals/pcre/pcre-6.7/perltest trunk/Externals/pcre/pcre-6.7/testdata/ trunk/Externals/pcre/pcre-6.7/testdata/grepinput trunk/Externals/pcre/pcre-6.7/testdata/grepinputx trunk/Externals/pcre/pcre-6.7/testdata/greplist trunk/Externals/pcre/pcre-6.7/testdata/grepoutput trunk/Externals/pcre/pcre-6.7/testdata/testinput1 trunk/Externals/pcre/pcre-6.7/testdata/testinput2 trunk/Externals/pcre/pcre-6.7/testdata/testinput3 trunk/Externals/pcre/pcre-6.7/testdata/testinput4 trunk/Externals/pcre/pcre-6.7/testdata/testinput5 trunk/Externals/pcre/pcre-6.7/testdata/testinput6 trunk/Externals/pcre/pcre-6.7/testdata/testinput7 trunk/Externals/pcre/pcre-6.7/testdata/testinput8 trunk/Externals/pcre/pcre-6.7/testdata/testinput9 trunk/Externals/pcre/pcre-6.7/testdata/testoutput1 trunk/Externals/pcre/pcre-6.7/testdata/testoutput2 trunk/Externals/pcre/pcre-6.7/testdata/testoutput3 trunk/Externals/pcre/pcre-6.7/testdata/testoutput4 trunk/Externals/pcre/pcre-6.7/testdata/testoutput5 trunk/Externals/pcre/pcre-6.7/testdata/testoutput6 trunk/Externals/pcre/pcre-6.7/testdata/testoutput7 trunk/Externals/pcre/pcre-6.7/testdata/testoutput8 trunk/Externals/pcre/pcre-6.7/testdata/testoutput9 trunk/Externals/pcre/pcre-6.7/ucp.h trunk/Externals/pcre/pcre-6.7/ucpinternal.h trunk/Externals/pcre/pcre-6.7/ucptable.c trunk/Externals/pcre/pcre.dsw trunk/Externals/pcre/pcretest/ trunk/Externals/pcre/pcretest/pcretest.dsp Added: trunk/Externals/pcre/config_pcre/config_pcre.dsp =================================================================== --- trunk/Externals/pcre/config_pcre/config_pcre.dsp (rev 0) +++ trunk/Externals/pcre/config_pcre/config_pcre.dsp 2006-11-07 16:28:04 UTC (rev 3781) @@ -0,0 +1,58 @@ +# Microsoft Developer Studio Project File - Name="config_pcre" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) External Target" 0x0106 + +CFG=config_pcre - Win32 Configure +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "config_pcre.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "config_pcre.mak" CFG="config_pcre - Win32 Configure" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "config_pcre - Win32 Configure" (based on "Win32 (x86) External Target") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Configure" +# PROP BASE Intermediate_Dir "Configure" +# PROP BASE Cmd_Line "nmake /f "configure.mak"" +# PROP BASE Rebuild_Opt "/a rebuild" +# PROP BASE Target_File "..\bin\pcre_chartables.c" +# PROP BASE Bsc_Name "" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\bin" +# PROP Intermediate_Dir "." +# PROP Cmd_Line "nmake /f "configure.mak"" +# PROP Rebuild_Opt "/a rebuild" +# PROP Target_File "..\bin\pcre_chartables.c" +# PROP Bsc_Name "" +# PROP Target_Dir "" +# Begin Target + +# Name "config_pcre - Win32 Configure" + +!IF "$(CFG)" == "config_pcre - Win32 Configure" + +!ENDIF + +# Begin Source File + +SOURCE=.\configure.mak +# End Source File +# End Target +# End Project Added: trunk/Externals/pcre/config_pcre/configure.mak =================================================================== --- trunk/Externals/pcre/config_pcre/configure.mak (rev 0) +++ trunk/Externals/pcre/config_pcre/configure.mak 2006-11-07 16:28:04 UTC (rev 3781) @@ -0,0 +1,55 @@ +# +# Initial configuration for Win32 +# + +BIN = ..\bin +SOURCES = ..\pcre-6.7 + +H_config = $(BIN)\config.h +I_config = $(SOURCES)\config.h.in + +C_dftables = $(SOURCES)\dftables.c +X_dftables = $(BIN)\dftables.exe + +C_chartables = $(BIN)\pcre_chartables.c + +TARGETS = $(H_config) $(C_chartables) + +all : $(TARGETS) + +clean : ; -del $(TARGETS) + +rebuild : clean all + +# +# Generate config.h for Win32 +# + +$(H_config) : $(I_config) configure.mak + if not exist $(BIN) mkdir $(BIN) + copy $(I_config) + << $@ + +/* Automatically added for Win32 compilation */ +#define SUPPORT_UCP +#define SUPPORT_UTF8 + +<< + edlin $@ < << +1S#define HAVE_MEMMOVE +. +#define HAVE_MEMMOVE 1 +1S#define HAVE_STRERROR +. +#define HAVE_STRERROR 1 +E +<< + +# +# Generate pcre_chartables.c by a compile and run of dftables +# + +$(X_dftables) : $(C_dftables) $(H_config) + cl /nologo /I$(BIN) /Fe$@ $(C_dftables) + +$(C_chartables) : $(X_dftables) + $(X_dftables) $@ Added: trunk/Externals/pcre/dll_pcre/pcre.dsp =================================================================== --- trunk/Externals/pcre/dll_pcre/pcre.dsp (rev 0) +++ trunk/Externals/pcre/dll_pcre/pcre.dsp 2006-11-07 16:28:04 UTC (rev 3781) @@ -0,0 +1,169 @@ +# Microsoft Developer Studio Project File - Name="pcre" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=pcre - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "pcre.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "pcre.mak" CFG="pcre - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "pcre - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "pcre - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "pcre - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\bin\release" +# PROP Intermediate_Dir "o\release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PCRE_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\bin" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PCRE_EXPORTS" /FD /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 + +!ELSEIF "$(CFG)" == "pcre - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\bin\debug" +# PROP Intermediate_Dir "o\debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PCRE_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\bin" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PCRE_EXPORTS" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "pcre - Win32 Release" +# Name "pcre - Win32 Debug" +# Begin Source File + +SOURCE=..\bin\pcre_chartables.c +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_compile.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_config.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_dfa_exec.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_exec.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_fullinfo.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_get.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_globals.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_info.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_maketables.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_ord2utf8.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_refcount.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_study.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_tables.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_try_flipped.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_ucp_searchfuncs.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_valid_utf8.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_version.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_xclass.c" +# End Source File +# End Target +# End Project Added: trunk/Externals/pcre/lib_pcre/lib_pcre.dsp =================================================================== --- trunk/Externals/pcre/lib_pcre/lib_pcre.dsp (rev 0) +++ trunk/Externals/pcre/lib_pcre/lib_pcre.dsp 2006-11-07 16:28:04 UTC (rev 3781) @@ -0,0 +1,162 @@ +# Microsoft Developer Studio Project File - Name="lib_pcre" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=lib_pcre - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "lib_pcre.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "lib_pcre.mak" CFG="lib_pcre - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "lib_pcre - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "lib_pcre - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "lib_pcre - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\bin\release" +# PROP Intermediate_Dir "o\release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\bin" /D "NDEBUG" /D "_LIB" /D "PCRE_STATIC" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "lib_pcre - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\bin\debug" +# PROP Intermediate_Dir "o\debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\bin" /D "_DEBUG" /D "_LIB" /D "PCRE_STATIC" /FR /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "lib_pcre - Win32 Release" +# Name "lib_pcre - Win32 Debug" +# Begin Source File + +SOURCE=..\bin\pcre_chartables.c +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_compile.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_config.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_dfa_exec.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_exec.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_fullinfo.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_get.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_globals.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_info.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_maketables.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_ord2utf8.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_refcount.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_study.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_tables.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_try_flipped.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_ucp_searchfuncs.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_valid_utf8.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_version.c" +# End Source File +# Begin Source File + +SOURCE="..\pcre-6.7\pcre_xclass.c" +# End Source File +# End Target +# End Project Added: trunk/Externals/pcre/lib_pcreposix/lib_pcreposix.dsp =================================================================== --- trunk/Externals/pcre/lib_pcreposix/lib_pcreposix.dsp (rev 0) +++ trunk/Externals/pcre/lib_pcreposix/lib_pcreposix.dsp 2006-11-07 16:28:04 UTC (rev 3781) @@ -0,0 +1,90 @@ +# Microsoft Developer Studio Project File - Name="lib_pcreposix" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=lib_pcreposix - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "lib_pcreposix.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "lib_pcreposix.mak" CFG="lib_pcreposix - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "lib_pcreposix - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "lib_pcreposix - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "lib_pcreposix - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\bin\release" +# PROP Intermediate_Dir "o\release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\bin" /D "NDEBUG" /D "_LIB" /D "PCRE_STATIC" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "lib_pcreposix - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\bin\debug" +# PROP Intermediate_Dir "o\debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\bin" /D "_DEBUG" /D "_LIB" /D "PCRE_STATIC" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "lib_pcreposix - Win32 Release" +# Name "lib_pcreposix - Win32 Debug" +# Begin Source File + +SOURCE="..\pcre-6.7\pcreposix.c" +# End Source File +# End Target +# End Project Added: trunk/Externals/pcre/pcre-6.7/AUTHORS =================================================================== --- trunk/Externals/pcre/pcre-6.7/AUTHORS (rev 0) +++ trunk/Externals/pcre/pcre-6.7/AUTHORS 2006-11-07 16:28:04 UTC (rev 3781) @@ -0,0 +1,23 @@ +THE MAIN PCRE LIBRARY +--------------------- + +Written by: Philip Hazel +Email local part: ph10 +Email domain: cam.ac.uk + +University of Cambridge Computing Service, +Cambridge, England. Phone: +44 1223 334714. + +Copyright (c) 1997-2006 University of Cambridge +All rights reserved + + +THE C++ WRAPPER LIBRARY +----------------------- + +Written by: Google Inc. + +Copyright (c) 2006 Google Inc +All rights reserved + +#### Added: trunk/Externals/pcre/pcre-6.7/COPYING =================================================================== --- trunk/Externals/pcre/pcre-6.7/COPYING (rev 0) +++ trunk/Externals/pcre/pcre-6.7/COPYING 2006-11-07 16:28:04 UTC (rev 3781) @@ -0,0 +1,68 @@ +PCRE LICENCE +------------ + +PCRE is a library of functions to support regular expressions whose syntax +and semantics are as close as possible to those of the Perl 5 language. + +Release 6 of PCRE is distributed under the terms of the "BSD" licence, as +specified below. The documentation for PCRE, supplied in the "doc" +directory, is distributed under the same terms as the software itself. + +The basic library functions are written in C and are freestanding. Also +included in the distribution is a set of C++ wrapper functions. + + +THE BASIC LIBRARY FUNCTIONS +--------------------------- + +Written by: Philip Hazel +Email local part: ph10 +Email domain: cam.ac.uk + +University of Cambridge Computing Service, +Cambridge, England. Phone: +44 1223 334714. + +Copyright (c) 1997-2006 University of Cambridge +All rights reserved. + + +THE C++ WRAPPER FUNCTIONS +------------------------- + +Contributed by: Google Inc. + +Copyright (c) 2006, Google Inc. +All rights reserved. + + +THE "BSD" LICENCE +----------------- + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the name of Google + Inc. nor the names of their contributors may be used to endorse or + promote products derived from this software without specific prior + written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +End Added: trunk/Externals/pcre/pcre-6.7/ChangeLog =================================================================== --- trunk/Externals/pcre/pcre-6.7/ChangeLog (rev 0) +++ trunk/Externals/pcre/pcre-6.7/ChangeLog 2006-11-07 16:28:04 UTC (rev 3781) @@ -0,0 +1,2279 @@ +ChangeLog for PCRE +------------------ + +Version 6.7 04-Jul-06 +--------------------- + + 1. In order to handle tests when input lines are enormously long, pcretest has + been re-factored so that it automatically extends its buffers when + necessary. The code is crude, but this _is_ just a test program. The + default size has been increased from 32K to 50K. + + 2. The code in pcre_study() was using the value of the re argument before + testing it for NULL. (Of course, in any sensible call of the function, it + won't be NULL.) + + 3. The memmove() emulation function in pcre_internal.h, which is used on + systems that lack both memmove() and bcopy() - that is, hardly ever - + was missing a "static" storage class specifier. + + 4. When UTF-8 mode was not set, PCRE looped when compiling certain patterns + containing an extended class (one that cannot be represented by a bitmap + because it contains high-valued characters or Unicode property items, e.g. + [\pZ]). Almost always one would set UTF-8 mode when processing such a + pattern, but PCRE should not loop if you do not (it no longer does). + [Detail: two cases were found: (a) a repeated subpattern containing an + extended class; (b) a recursive reference to a subpattern that followed a + previous extended class. It wasn't skipping over the extended class + correctly when UTF-8 mode was not set.] + + 5. A negated single-character class was not being recognized as fixed-length + in lookbehind assertions such as (?<=[^f]), leading to an incorrect + compile error "lookbehind assertion is not fixed length". + + 6. The RunPerlTest auxiliary script was showing an unexpected difference + between PCRE and Perl for UTF-8 tests. It turns out that it is hard to + write a Perl script that can interpret lines of an input file either as + byte characters or as UTF-8, which is what "perltest" was being required to + do for the non-UTF-8 and UTF-8 tests, respectively. Essentially what you + can't do is switch easily at run time between having the "use utf8;" pragma + or not. In the end, I fudged it by using the RunPerlTest script to insert + "use utf8;" explicitly for the UTF-8 tests. + + 7. In multiline (/m) mode, PCRE was matching ^ after a terminating newline at + the end of the subject string, contrary to the documentation and to what + Perl does. This was true of both matching functions. Now it matches only at + the start of the subject and immediately after *internal* newlines. + + 8. A call of pcre_fullinfo() from pcretest to get the option bits was passing + a pointer to an int instead of a pointer to an unsigned long int. This + caused problems on 64-bit systems. + + 9. Applied a patch from the folks at Google to pcrecpp.cc, to fix "another + instance of the 'standard' template library not being so standard". + +10. There was no check on the number of named subpatterns nor the maximum + length of a subpattern name. The product of these values is used to compute + the size of the memory block for a compiled pattern. By supplying a very + long subpattern name and a large number of named subpatterns, the size + computation could be caused to overflow. This is now prevented by limiting + the length of names to 32 characters, and the number of named subpatterns + to 10,000. + +11. Subpatterns that are repeated with specific counts have to be replicated in + the compiled pattern. The size of memory for this was computed from the + length of the subpattern and the repeat count. The latter is limited to + 65535, but there was no limit on the former, meaning that integer overflow + could in principle occur. The compiled length of a repeated subpattern is + now limited to 30,000 bytes in order to prevent this. + +12. Added the optional facility to have named substrings with the same name. + +13. Added the ability to use a named substring as a condition, using the + Python syntax: (?(name)yes|no). This overloads (?(R)... and names that + are numbers (not recommended). Forward references are permitted. + +14. Added forward references in named backreferences (if you see what I mean). + +15. In UTF-8 mode, with the PCRE_DOTALL option set, a quantified dot in the + pattern could run off the end of the subject. For example, the pattern + "(?s)(.{1,5})"8 did this with the subject "ab". + +16. If PCRE_DOTALL or PCRE_MULTILINE were set, pcre_dfa_exec() behaved as if + PCRE_CASELESS was set when matching characters that were quantified with ? + or *. + +17. A character class other than a single negated character that had a minimum + but no maximum quantifier - for example [ab]{6,} - was not handled + correctly by pce_dfa_exec(). It would match only one character. + +18. A valid (though odd) pattern that looked like a POSIX character + class but used an invalid character after [ (for example [[,abc,]]) caused + pcre_compile() to give the error "Failed: internal error: code overflow" or + in some cases to crash with a glibc free() error. This could even happen if + the pattern terminated after [[ but there just happened to be a sequence of + letters, a binary zero, and a closing ] in the memory that followed. + +19. Perl's treatment of octal escapes in the range \400 to \777 has changed + over the years. Originally (before any Unicode support), just the bottom 8 + bits were taken. Thus, for example, \500 really meant \100. Nowadays the + output from "man perlunicode" includes this: + + The regular expression compiler produces polymorphic opcodes. That + is, the pattern adapts to the data and automatically switches to + the Unicode character scheme when presented with Unicode data--or + instead uses a traditional byte scheme when presented with byte + data. + + Sadly, a wide octal escape does not cause a switch, and in a string with + no other multibyte characters, these octal escapes are treated as before. + Thus, in Perl, the pattern /\500/ actually matches \100 but the pattern + /\500|\x{1ff}/ matches \500 or \777 because the whole thing is treated as a + Unicode string. + + I have not perpetrated such confusion in PCRE. Up till now, it took just + the bottom 8 bits, as in old Perl. I have now made octal escapes with + values greater than \377 illegal in non-UTF-8 mode. In UTF-8 mode they + translate to the appropriate multibyte character. + +29. Applied some refactoring to reduce the number of warnings from Microsoft + and Borland compilers. This has included removing the fudge introduced + seven years ago for the OS/2 compiler (see 2.02/2 below) because it caused + a warning about an unused variable. + +21. PCRE has not included VT (character 0x0b) in the set of whitespace + characters since release 4.0, because Perl (from release 5.004) does not. + [Or at least, is documented not to: some releases seem to be in conflict + with the documentation.] However, when a pattern was studied with + pcre_study() and all its branches started with \s, PCRE still included VT + as a possible starting character. Of course, this did no harm; it just + caused an unnecessary match attempt. + +22. Removed a now-redundant internal flag bit that recorded the fact that case + dependency changed within the pattern. This was once needed for "required + byte" processing, but is no longer used. This recovers a now-scarce options + bit. Also moved the least significant internal flag bit to the most- + significant bit of the word, which was not previously used (hangover from + the days when it was an int rather than a uint) to free up another bit for + the future. + +23. Added support for CRLF line endings as well as CR and LF. As well as the + default being selectable at build time, it can now be changed at runtime + via the PCRE_NEWLINE_xxx flags. There are now options for pcregrep to + specify that it is scanning data with non-default line endings. + +24. Changed the definition of CXXLINK to make it agree with the definition of + LINK in the Makefile, by replacing LDFLAGS to CXXFLAGS. + +25. Applied Ian Taylor's patches to avoid using another stack frame for tail + recursions. This makes a big different to stack usage for some patterns. + +26. If a subpattern containing a named recursion or subroutine reference such + as (?P>B) was quantified, for example (xxx(?P>B)){3}, the calculation of + the space required for the compiled pattern went wrong and gave too small a + value. Depending on the environment, this could lead to "Failed: internal + error: code overflow at offset 49" or "glibc detected double free or + corruption" errors. + +27. Applied patches from Google (a) to support the new newline modes and (b) to + advance over multibyte UTF-8 characters in GlobalReplace. + +28. Change free() to pcre_free() in pcredemo.c. Apparently this makes a + difference for some implementation of PCRE in some Windows version. + +29. Added some extra testing facilities to pcretest: + + \q<number> in a data line sets the "match limit" value + \Q<number> in a data line sets the "match recursion limt" value + -S <number> sets the stack size, where <number> is in megabytes + + The -S option isn't available for Windows. + + +Version 6.6 06-Feb-06 +--------------------- + + 1. Change 16(a) for 6.5 broke things, because PCRE_DATA_SCOPE was not defined + in pcreposix.h. I have copied the definition from pcre.h. + + 2. Change 25 for 6.5 broke compilation in a build directory out-of-tree + because pcre.h is no longer a built file. + + 3. Added Jeff Friedl's additional debugging patches to pcregrep. These are + not normally included in the compiled code. + + +Version 6.5 01-Feb-06 +--------------------- + + 1. When using the partial match feature with pcre_dfa_exec(), it was not + anchoring the second and subsequent partial matches at the new starting + point. This could lead to incorrect results. For example, with the pattern + /1234/, partially matching against "123" and then "a4" gave a match. + + 2. Changes to pcregrep: + + (a) All non-match returns from pcre_exec() were being treated as failures + to match the line. Now, unless the error is PCRE_ERROR_NOMATCH, an + error message is output. Some extra information is given for the + PCRE_ERROR_MATCHLIMIT and PCRE_ERROR_RECURSIONLIMIT errors, which are + probably the only errors that are likely to be caused by users (by + specifying a regex that has nested indefinite repeats, for instance). + If there are more than 20 of these errors, pcregrep is abandoned. + + (b) A binary zero was treated as data while matching, but terminated the + output line if it was written out. This has been fixed: binary zeroes + are now no different to any other data bytes. + + (c) Whichever of the LC_ALL or LC_CTYPE environment variables is set is + used to set a locale for matching. The --locale=xxxx long option has + been added (no short equivalent) to specify a locale explicitly on the + pcregrep command, overriding the environment variables. + + (d) When -B was used with -n, some line numbers in the output were one less + than they should have been. + + (e) Added the -o (--only-matching) option. + + (f) If -A or -C was used with -c (count only), some lines of context were + accidentally printed for the final match. + + (g) Added the -H (--with-filename) option. + + (h) The combination of options -rh failed to suppress file names for files + that were found from directory arguments. + + (i) Added the -D (--devices) and -d (--directories) options. + + (j) Added the -F (--fixed-strings) option. + + (k) Allow "-" to be used as a file name for -f as well as for a data file. + + (l) Added the --colo(u)r option. + + (m) Added Jeffrey Friedl's -S testing option, but within #ifdefs so that it + is not present by default. + + 3. A nasty bug was discovered in the handling of recursive patterns, that is, + items such as (?R) or (?1), when the recursion could match a number of + alternatives. If it matched one of the alternatives, but subsequently, + outside the recursion, there was a failure, the code tried to back up into + the recursion. However, because of the way PCRE is implemented, this is not + possible, and the result was an incorrect result from the match. + + In order to prevent this happening, the specification of recursion has + been changed so that all such subpatterns are automatically treated as + atomic groups. Thus, for example, (?R) is treated as if it were (?>(?R)). + + 4. I had overlooked the fact that, in some locales, there are characters for + which isalpha() is true but neither isupper() nor islower() are true. In + the fr_FR locale, for instance, the \xAA and \xBA characters (ordmasculine + and ordfeminine) are like this. This affected the treatment of \w and \W + when they appeared in character classes, but not when they appeared outside + a character class. The bit map for "word" characters is now created + separately from the results of isalnum() instead of just taking it from the + upper, lower, and digit maps. (Plus the underscore character, of course.) + + 5. The above bug also affected the handling of POSIX character classes such as + [[:alpha:]] and [[:alnum:]]. These do not have their own bit maps in PCRE's + permanent tables. Instead, the bit maps for such a class were previously + created as the appropriate unions of the upper, lower, and digit bitmaps. + Now they are created by subtraction from the [[:word:]] class, which has + its own bitmap. + + 6. The [[:blank:]] character class matches horizontal, but not vertical space. + It is created by subtracting the vertical space characters (\x09, \x0a, + \x0b, \x0c) from the [[:space:]] bitmap. Previously, however, the + subtraction was done in the overall bitmap for a character class, meaning + that a class such as [\x0c[:blank:]] was incorrect because \x0c would not + be recognized. This bug has been fixed. + + 7. Patches from the folks at Google: + + (a) pcrecpp.cc: "to handle a corner case that may or may not happen in + real life, but is still worth protecting against". + + (b) pcrecpp.cc: "corrects a bug when negative radixes are used with + regular expressions". + + (c) pcre_scanner.cc: avoid use of std::count() because not all systems + have it. + + (d) Split off pcrecpparg.h from pcrecpp.h and had the former built by + "configure" and the latter not, in order to fix a problem somebody had + with compiling the Arg class on HP-UX. + + (e) Improve the error-handling of the C++ wrapper a little bit. + + (f) New tests for checking recursion limiting. + + 8. The pcre_memmove() function, which is used only if the environment does not + have a standard memmove() function (and is therefore rarely compiled), + contained two bugs: (a) use of int instead of size_t, and (b) it was not + returning a result (though PCRE never actually uses the result). + + 9. In the POSIX regexec() interface, if nmatch is specified as a ridiculously + large number - greater than INT_MAX/(3*sizeof(int)) - REG_ESPACE is + returned instead of calling malloc() with an overflowing number that would + most likely cause subsequent chaos. + +10. The debugging option of pcretest was not showing the NO_AUTO_CAPTURE flag. + +11. The POSIX flag REG_NOSUB is now supported. When a pattern that was compiled + with this option is matched, the nmatch and pmatch options of regexec() are + ignored. + +12. Added REG_UTF8 to the POSIX interface. This is not defined by POSIX, but is + provided in case anyone wants to the the POSIX interface with UTF-8 + strings. + +13. Added CXXLDFLAGS to the Makefile parameters to provide settings only on the + C++ linking (needed for some HP-UX environments). + +14. Avoid compiler warnings in get_ucpname() when compiled without UCP support + (unused parameter) and in the pcre_printint() function (omitted "default" + switch label when the default is to do nothing). + +15. Added some code to make it possible, when PCRE is compiled as a C++ + library, to replace subject pointers for pcre_exec() with a smart pointer + class, thus making it possible to process discontinuous strings. + +16. The two macros PCRE_EXPORT and PCRE_DATA_SCOPE are confusing, and perform + much the same function. They were added by different people who were trying + to make PCRE easy to compile on non-Unix systems. It has been suggested + that PCRE_EXPORT be abolished now that there is more automatic apparatus + for compiling on Windows systems. I have therefore replaced it with + PCRE_DATA_SCOPE. This is set automatically for Windows; if not set it + defaults to "extern" for C or "extern C" for C++, which works fine on + Unix-like systems. It is now possible to override the value of PCRE_DATA_ + SCOPE with something explicit in config.h. In addition: + + (a) pcreposix.h still had just "extern" instead of either of these macros; + I have replaced it with PCRE_DATA_SCOPE. + + (b) Functions such as _pcre_xclass(), which are internal to the library, + but external in the C sense, all had PCRE_EXPORT in their definitions. + This is apparently wrong for the Windows case, so I have removed it. + (It makes no difference on Unix-like systems.) + +17. Added a new limit, MATCH_LIMIT_RECURSION, which limits the depth of nesting + of recursive calls to match(). This is different to MATCH_LIMIT because + that limits the total number of calls to match(), not all of which increase + the depth of recursion. Limiting the recursion depth limits the amount of + stack (or heap if NO_RECURSE is set) that is used. The default can be set + when PCRE is compiled, and changed at run time. A patch from Google adds + this functionality to the C++ interface. + +18. Changes to the handling of Unicode character properties: + + (a) Updated the table to Unicode 4.1.0. + + (b) Recognize characters that are not in the table as "Cn" (undefined). + + (c) I revised the way the table is implemented to a much improved format + which includes recognition of ranges. It now supports the ranges that + are defined in UnicodeData.txt, and it also amalgamates other + characters into ranges. This has reduced the number of entries in the + table from around 16,000 to around 3,000, thus reducing its size + considerably. I realized I did not need to use a tree structure after + all - a binary chop search is just as efficient. Having reduced the + number of entries, I extended their size from 6 bytes to 8 bytes to + allow for more data. + + (d) Added support for Unicode script names via properties such as \p{Han}. + +19. In UTF-8 mode, a backslash followed by a non-Ascii character was not + matching that character. + +20. When matching a repeated Unicode property with a minimum greater than zero, + (for example \pL{2,}), PCRE could look past the end of the subject if it + reached it while seeking the minimum number of characters. This could + happen only if some of the characters were more than one byte long, because + there is a check for at least the minimum number of bytes. + +21. Refactored the implementation of \p and \P so as to be more general, to + allow for more different types of property in future. This has changed the + compiled form incompatibly. Anybody with saved compiled patterns that use + \p or \P will have to recompile them. + +22. Added "Any" and "L&" to the supported property types. + +23. Recognize \x{...} as a code point specifier, even when not in UTF-8 mode, + but give a compile time error if the value is greater than 0xff. + +24. The man pages for pcrepartial, pcreprecompile, and pcre_compile2 were + accidentally not being installed or uninstalled. + +25. The pcre.h file was built from pcre.h.in, but the only changes that were + made were to insert the current release number. This seemed silly, because + it made things harder for people building PCRE on systems that don't run + "configure". I have turned pcre.h into a distributed file, no longer built + by "configure", with the version identification directly included. There is + no longer a pcre.h.in file. + + However, this change necessitated a change to the pcre-config script as + well. It is built from pcre-config.in, and one of the substitutions was the + release number. I have updated configure.ac so that ./configure now finds + the release number by grepping pcre.h. + +26. Added the ability to run the tests under valgrind. + + +Version 6.4 05-Sep-05 +--------------------- + + 1. Change 6.0/10/(l) to pcregrep introduced a bug that caused separator lines + "--" to be printed when multiple files were scanned, even when none of the + -A, -B, or -C options were used. This is not compatible with Gnu grep, so I + consider it to be a bug, and have restored the previous behaviour. + + 2. A couple of code tidies to get rid of compiler warnings. + + 3. The pcretest program used to cheat by referring to symbols in the library + whose names begin with _pcre_. These are internal symbols that are not + really supposed to be visible externally, and in some environments it is + possible to suppress them. The cheating is now confined to including + certain files from the library's source, which is a bit cleaner. + + 4. Renamed pcre.in as pcre.h.in to go with pcrecpp.h.in; it also makes the + file's purpose clearer. + + 5. Reorganized pcre_ucp_findchar(). + + +Version 6.3 15-Aug-05 +--------------------- + + 1. The file libpcre.pc.in did not have general read permission in the tarball. + + 2. There were some problems when building without C++ support: + + (a) If C++ support was not built, "make install" and "make test" still + tried to test it. + + (b) There were problems when the value of CXX was explicitly set. Some + changes have been made to try to fix these, and ... + + (c) --disable-cpp can now be used to explicitly disable C++ support. + + (d) The use of @CPP_OBJ@ directly caused a blank line preceded by a + backslash in a target when C++ was disabled. This confuses some + versions of "make", apparently. Using an intermediate variable solves + this. (Same for CPP_LOBJ.) + + 3. $(LINK_FOR_BUILD) now includes $(CFLAGS_FOR_BUILD) and $(LINK) + (non-Windows) now includes $(CFLAGS) because these flags are sometimes + necessary on certain architectures. + + 4. Added a setting of -export-symbols-regex to the link command to remove + those symbols that are exported in the C sense, but actually are local + within the library, and not documented. Their names all begin with + "_pcre_". This is not a perfect job, because (a) we have to except some + symbols that pcretest ("illegally") uses, and (b) the facility isn't always + available (and never for static libraries). I have made a note to try to + find a way round (a) in the future. + + +Version 6.2 01-Aug-05 +--------------------- + + 1. There was no test for integer overflow of quantifier values. A construction + such as {1111111111111111} would give undefined results. What is worse, if + a minimum quantifier for a parenthesized subpattern overflowed and became + negative, the calculation of the memory size went wrong. This could have + led to memory overwriting. + + 2. Building PCRE using VPATH was broken. Hopefully it is now fixed. + + 3. Added "b" to the 2nd argument of fopen() in dftables.c, for non-Unix-like + operating environments where this matters. + + 4. Applied Giuseppe Maxia's patch to add additional features for controlling + PCRE options from within the C++ wrapper. + + 5. Named capturing subpatterns were not being correctly counted when a pattern + was compiled. This caused two problems: (a) If there were more than 100 + such subpatterns, the calculation of the memory needed for the whole + compiled pattern went wrong, leading to an overflow error. (b) Numerical + back references of the form \12, where the number was greater than 9, were + not recognized as back references, even though there were sufficient + previous subpatterns. + + 6. Two minor patches to pcrecpp.cc in order to allow it to compile on older + versions of gcc, e.g. 2.95.4. + + +Version 6.1 21-Jun-05 +--------------------- + + 1. There was one reference to the variable "posix" in pcretest.c that was not + surrounded by "#if !defined NOPOSIX". + + 2. Make it possible to compile pcretest without DFA support, UTF8 support, or + the cross-check on the old pcre_info() function, for the benefit of the + cut-down version of PCRE that is currently imported into Exim. + + 3. A (silly) pattern starting with (?i)(?-i) caused an internal space + allocation error. I've done the easy fix, which wastes 2 bytes for sensible + patterns that start (?i) but I don't think that matters. The use of (?i) is + just an example; this all applies to the other options as well. + + 4. Since libtool seems to echo the compile commands it is issuing, the output + from "make" can be reduced a bit by putting "@" in front of each libtool + compile command. + + 5. Patch from the folks at Google for configure.in to be a bit more thorough + in checking for a suitable C++ installation before trying to compile the + C++ stuff. This should fix a reported problem when a compiler was present, + but no suitable headers. + + 6. The man pages all had just "PCRE" as their title. I have changed them to + be the relevant file name. I have also arranged that these names are + retained in the file doc/pcre.txt, which is a concatenation in text format + of all the man pages except the little individual ones for each function. + + 7. The NON-UNIX-USE file had not been updated for the different set of source + files that come with release 6. I also added a few comments about the C++ + wrapper. + + +Version 6.0 07-Jun-05 +--------------------- + + 1. Some minor internal re-organization to help with my DFA experiments. + + 2. Some missing #ifdef SUPPORT_UCP conditionals in pcretest and printint that + didn't matter for the library itself when fully configured, but did matter + when compiling without UCP support, or within Exim, where the ucp files are + not imported. + + 3. Refactoring of the library code to split up the various functions into + different source modules. The addition of the new DFA matching code (see + below) to a single monolithic source would have made it really too + unwieldy, quite apart from causing all the code to be include in a + statically linked application, when only some functions are used. This is + relevant even without the DFA addition now that patterns can be compiled in + one application and matched in another. + + The downside of splitting up is that there have to be some external + functions and data tables that are used internally in different modules of + the library but which are not part of the API. These have all had their + names changed to start with "_pcre_" so that they are unlikely to clash + with other external names. + + 4. Added an alternate matching function, pcre_dfa_exec(), which matches using + a different (DFA) algorithm. Although it is slower than the original + function, it does have some advantages for certain types of matching + problem. + + 5. Upgrades to pcretest in order to test the features of pcre_dfa_exec(), + including restarting after a partial match. + + 6. A patch for pcregrep that defines INVALID_FILE_ATTRIBUTES if it is not + defined when compiling for Windows was sent to me. I have put it into the + code, though I have no means of testing or verifying it. + + 7. Added the pcre_refcount() auxiliary function. + + 8. Added the PCRE_FIRSTLINE option. This constrains an unanchored pattern to + match before or at the first newline in the subject string. In pcretest, + the /f option on a pattern can be used to set this. + + 9. A repeated \w when used in UTF-8 mode with characters greater than 256 + would behave wrongly. This has been present in PCRE since release 4.0. + +10. A number of changes to the pcregrep command: + + (a) Refactored how -x works; insert ^(...)$ instead of setting + PCRE_ANCHORED and checking the length, in preparation for adding + something similar for -w. + + (b) Added the -w (match as a word) option. + + (c) Refactored the way lines are read and buffered so as to have more + than one at a time available. + + (d) Implemented a pcregrep test script. + + (e) Added the -M (multiline match) option. This allows patterns to match + over several lines of the subject. The buffering ensures that at least + 8K, or the rest of the document (whichever is the shorter) is available + for matching (and similarly the previous 8K for lookbehind assertions). + + (f) Changed the --help output so that it now says + + -w, --word-regex(p) + + instead of two lines, one with "regex" and the other with "regexp" + because that confused at least one person since the short forms are the + same. (This required a bit of code, as the output is generated + automatically from a table. It wasn't just a text change.) + + (g) -- can be used to terminate pcregrep options if the next thing isn't an + option but starts with a hyphen. Could be a pattern or a path name + starting with a hyphen, for instance. + + (h) "-" can be given as a file name to represent stdin. + + (i) When file names are being printed, "(standard input)" is used for + the standard input, for compatibility with GNU grep. Previously + "<stdin>" was used. + + (j) The option --label=xxx can be used to supply a name to be used for + stdin when file names are being printed. There is no ... [truncated message content] |
From: <ki...@us...> - 2006-11-26 20:30:15
|
Revision: 3851 http://svn.sourceforge.net/winmerge/?rev=3851&view=rev Author: kimmov Date: 2006-11-26 12:30:08 -0800 (Sun, 26 Nov 2006) Log Message: ----------- Perry is not active developer Modified Paths: -------------- trunk/Docs/Users/Contributors.txt trunk/Src/Changes.txt Modified: trunk/Docs/Users/Contributors.txt =================================================================== --- trunk/Docs/Users/Contributors.txt 2006-11-26 11:29:07 UTC (rev 3850) +++ trunk/Docs/Users/Contributors.txt 2006-11-26 20:30:08 UTC (rev 3851) @@ -11,7 +11,6 @@ Developers: * Tim Gerundt * Gal Hammer -* Perry Rapp * Takashi Sawanaka * Kimmo Varis @@ -19,6 +18,7 @@ * Laurent Ganier * Dennis Limm * Chris Mumford +* Perry Rapp * Christian "Seier" Blackburn (Installer) * Jochen Tucht Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-11-26 11:29:07 UTC (rev 3850) +++ trunk/Src/Changes.txt 2006-11-26 20:30:08 UTC (rev 3851) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-11-26 Kimmo + Perry is not active developer + Docs/Users: Contributors.txt + 2006-11-25 Kimmo PATCH: [ 1602365 ] Move SelectFile and SelectFolder routines to separate file Src: DirActions.cpp DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-12-01 21:39:34
|
Revision: 3882 http://svn.sourceforge.net/winmerge/?rev=3882&view=rev Author: kimmov Date: 2006-12-01 13:39:32 -0800 (Fri, 01 Dec 2006) Log Message: ----------- PATCH: [ 1606496 ] Slovak translation Submitted by Ivan Mas?\195?\161r Modified Paths: -------------- trunk/Installer/InnoSetup/Changes.txt trunk/Installer/InnoSetup/Languages/Slovak.isl trunk/ShellExtension/Languages/ShellExtensionSlovak.rc trunk/Src/Changes.txt trunk/Src/Languages/Slovak/MergeSlovak.rc Modified: trunk/Installer/InnoSetup/Changes.txt =================================================================== --- trunk/Installer/InnoSetup/Changes.txt 2006-12-01 16:13:58 UTC (rev 3881) +++ trunk/Installer/InnoSetup/Changes.txt 2006-12-01 21:39:32 UTC (rev 3882) @@ -1,3 +1,8 @@ +2006-12-01 Kimmo + PATCH: [ 1606496 ] Slovak translation + Submitted by Ivan Mas\xE1r + Languages: Slovak.isl + 2006-11-28 Takashi BUG: [ 1603032 ] Doubled item in language selection InnoSetup: WinMerge.iss Modified: trunk/Installer/InnoSetup/Languages/Slovak.isl =================================================================== --- trunk/Installer/InnoSetup/Languages/Slovak.isl 2006-12-01 16:13:58 UTC (rev 3881) +++ trunk/Installer/InnoSetup/Languages/Slovak.isl 2006-12-01 21:39:32 UTC (rev 3882) @@ -239,29 +239,29 @@ [CustomMessages] ;Inno Setup Built-in Custom Messages NameAndVersion=%1 verzia %2 -AdditionalIcons=\xCFal\x9A\xED z\xE1stupcovia: +AdditionalIcons=Dal\x9A\xED z\xE1stupcovia: OptionalFeatures=Optional Features: -CreateDesktopIcon=Vytvori\x9D z\xE1stupcu na &ploche -CreateQuickLaunchIcon=Vytvori\x9D z\xE1stupcu na paneli &R\xFDchle spustenie +CreateDesktopIcon=Vytvorit z\xE1stupcu na &ploche +CreateQuickLaunchIcon=Vytvorit z\xE1stupcu na paneli &R\xFDchle spustenie ProgramOnTheWeb=Aplik\xE1cia %1 na internete -UninstallProgram=Odin\x9Atalova\x9D aplik\xE1ciu %1 -LaunchProgram=Spusti\x9D aplik\xE1ciu %1 -AssocFileExtension=Vytvori\x9D &asoci\xE1ciu medzi s\xFAbormi typu %2 a aplik\xE1ciou %1 +UninstallProgram=Odin\x9Atalovat aplik\xE1ciu %1 +LaunchProgram=Spustit aplik\xE1ciu %1 +AssocFileExtension=Vytvorit &asoci\xE1ciu medzi s\xFAbormi typu %2 a aplik\xE1ciou %1 AssocingFileExtension=Vytv\xE1ra sa asoci\xE1cia medzi s\xFAbormi typu %2 a aplik\xE1ciou %1...;Things we can also localize CompanyName=Thingamahoochie Software ;Types -TypicalInstallation=Typical Installation -FullInstallation=Full Installation -CompactInstallation=Compact Installation -CustomInstallation=Custom Installation +TypicalInstallation=Typick\xE1 in\x9Atal\xE1cia +FullInstallation=Pln\xE1 in\x9Atal\xE1cia +CompactInstallation=kompaktn\xE1 in\x9Atal\xE1cia +CustomInstallation=Vlastn\xE1 in\x9Atal\xE1cia ;Components -AppCoreFiles=WinMerge Core Files -ApplicationRuntimes=Application Runtimes -UsersGuide=User's Guide -Filters=Filters -Plugins=Plugins +AppCoreFiles=Z\xE1kladn\xE9 s\xFAbory WinMerge +ApplicationRuntimes=S\xFAbory aplik\xE1cie vy\x9Eadovan\xE9 pocas behu +UsersGuide=Pr\xEDrucka pou\x9E\xEDvatela +Filters=Filtre +Plugins=Z\xE1suvn\xE9 modly ;Localization Components Languages=Languages @@ -289,21 +289,21 @@ ;Tasks ExplorerContextMenu=&Enable Explorer context menu integration -IntegrateTortoiseCVS=Integrate with &TortoiseCVS -IntegrateTortoiseSVN=Integrate with T&ortoiseSVN -IntegrateClearCase=Integrate with Rational &ClearCase -IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support -UpdatingCommonControls=Updating the System's Common Controls +IntegrateTortoiseCVS=Integr\xE1cia s &TortoiseCVS +IntegrateTortoiseSVN=Integr\xE1cia s T&ortoiseSVN +IntegrateClearCase=Integr\xE1cia s Rational &ClearCase +IntegrateDelphi4=Podpora bin\xE1rnych s\xFAborov Borland\xAE Delphi &4 +UpdatingCommonControls=Aktualizujem ovl\xE1dacie prvky syst\xE9mu ;Icon Labels -ReadMe=Read Me -UsersGuide=User's Guide -UpdatingCommonControls=Updating the System's Common Controls -ViewStartMenuFolder=&View the WinMerge Start Menu Folder -PluginsText=Plugins +ReadMe=s\xFAbor C\xEDtaj ma! +UsersGuide=Pr\xEDrucka pou\x9E\xEDvatela +UpdatingCommonControls=Aktualizujem ovl\xE1dacie prvky syst\xE9mu +ViewStartMenuFolder=&Zobrazit adres\xE1r WinMerge z ponuky \x8Atart +PluginsText=Z\xE1suvn\xE9 moduly ;Code Dialogs -DeletePreviousStartMenu=The installer has detected that you changed the location of your start menu from "%s" to "%s". Would you like to delete the previous start menu folder? +DeletePreviousStartMenu=In\x9Atal\xE1tor zistil, \x9Ee ste zmenili umiestnenie v\xE1\x9Aej ponuky \x8Atart z "%s" na "%s". \x8Eel\xE1te si zmazat predch\xE1dzaj\xFAci adres\xE1r ponuky \x8Atart? ; Project file description -ProjectFileDesc=WinMerge Project file +ProjectFileDesc=s\xFAbor projektu WinMerge Modified: trunk/ShellExtension/Languages/ShellExtensionSlovak.rc =================================================================== --- trunk/ShellExtension/Languages/ShellExtensionSlovak.rc 2006-12-01 16:13:58 UTC (rev 3881) +++ trunk/ShellExtension/Languages/ShellExtensionSlovak.rc 2006-12-01 21:39:32 UTC (rev 3882) @@ -32,14 +32,14 @@ BEGIN IDS_PROJNAME "ShellExtension" IDS_CONTEXT_MENU "WinMerge" - IDS_CONTEXT_HELP "Open with WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 2 items" - IDS_COMPARE "Compare" - IDS_COMPARE_ELLIPSIS "Compare..." - IDS_COMPARE_TO "Compare To" - IDS_HELP_SAVETHIS "Save this path. Select another path to compare with this path." - IDS_HELP_COMPARESAVED "Compare to saved path (%1)" - IDS_RESELECT_FIRST "Re-select First" + IDS_CONTEXT_HELP "Otvori\x9D pomocou WinMerge" + IDS_CONTEXT_HELP_MANYITEMS "Pros\xEDm, nevyberajte viac ako 2 polo\x9Eky" + IDS_COMPARE "Porovna\x9D" + IDS_COMPARE_ELLIPSIS "Porovna\x9D..." + IDS_COMPARE_TO "Porovna\x9D s" + IDS_HELP_SAVETHIS "Ulo\x9Ei\x9D t\xFAto cestu. Vybra\x9D in\xFA cestu, ktor\xE1 sa s \xF2ou porovn\xE1." + IDS_HELP_COMPARESAVED "Porovna\x9D s ulo\x9Eenou cestou (%1)" + IDS_RESELECT_FIRST "Najprv znova ozna\xE8te" END #endif // Slovak resources Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-12-01 16:13:58 UTC (rev 3881) +++ trunk/Src/Changes.txt 2006-12-01 21:39:32 UTC (rev 3882) @@ -2,6 +2,12 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-12-01 Kimmo + PATCH: [ 1606496 ] Slovak translation + Submitted by Ivan Mas\xE1r + ShellExtension/Languages: ShellExtensionSlovak.rc + Src/Languages/Slovak: MergeSlovak.rc + 2006-12-01 Gal PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug Src: MergeEditView.cpp Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc =================================================================== --- trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-12-01 16:13:58 UTC (rev 3881) +++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-12-01 21:39:32 UTC (rev 3882) @@ -121,13 +121,13 @@ MENUITEM "&Kop\xEDrova\x9D", ID_EDIT_COPY MENUITEM "V&lo\x9Ei\x9D", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Goto...", ID_EDIT_WMGOTO + MENUITEM "&Cho\xEF na...", ID_EDIT_WMGOTO MENUITEM SEPARATOR POPUP "Op&en" BEGIN - MENUITEM "with &Registered Application", ID_FILE_OPEN_REGISTERED - MENUITEM "with &External Editor", ID_FILE_OPEN_WITHEDITOR - MENUITEM "&with...", ID_FILE_OPEN_WITH + MENUITEM "®istrovanou aplik\xE1ciou", ID_FILE_OPEN_REGISTERED + MENUITEM "&extern\xFDm editorom", ID_FILE_OPEN_WITHEDITOR + MENUITEM "\xE8\xED&m...", ID_FILE_OPEN_WITH END END END @@ -136,12 +136,12 @@ BEGIN POPUP "_POPUP_" BEGIN - MENUITEM "C&opy to Right", ID_L2R - MENUITEM "Cop&y to Left", ID_R2L + MENUITEM "K&op\xEDrova\x9D vravo", ID_L2R + MENUITEM "Ko&p\xEDrova\x9D v\xBEavo", ID_R2L MENUITEM SEPARATOR - MENUITEM "Cu&t", ID_EDIT_CUT - MENUITEM "&Copy", ID_EDIT_COPY - MENUITEM "&Paste", ID_EDIT_PASTE + MENUITEM "Vys&trihn\xFA\x9D", ID_EDIT_CUT + MENUITEM "&Kop\xEDrova\x9D", ID_EDIT_COPY + MENUITEM "&Prilepi\x9D", ID_EDIT_PASTE END END @@ -149,17 +149,17 @@ BEGIN POPUP "&S\xFAbor" BEGIN - MENUITEM "&New\tCtrl+N", ID_FILE_NEW + MENUITEM "&Nov\xFD\tCtrl+N", ID_FILE_NEW MENUITEM "&Otvori\x9D...\tCtrl+O", ID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "Open Project...\tCtrl+J", ID_FILE_OPENPROJECT - MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT + MENUITEM "Otvori\x9D projekt...\tCtrl+J", ID_FILE_OPENPROJECT + MENUITEM "Ulo\x9Ei\x9D &projekt...", ID_FILE_SAVEPROJECT MENUITEM SEPARATOR MENUITEM "&Koniec", ID_APP_EXIT END POPUP "\xDApr&avy" BEGIN - MENUITEM "&Vlastnosti", ID_OPTIONS + MENUITEM "&Nastavenia", ID_OPTIONS END POPUP "&Poh\xBEad" BEGIN @@ -171,30 +171,30 @@ MENUITEM SEPARATOR MENUITEM "&Jazyk...", ID_VIEW_LANGUAGE END - POPUP "&Tools" + POPUP "&N\xE1stroje" BEGIN - MENUITEM "&Filters...", ID_TOOLS_FILTERS - MENUITEM "&Generate Patch...", ID_TOOLS_GENERATEPATCH + MENUITEM "&Filtre...", ID_TOOLS_FILTERS + MENUITEM "&Vytvor patch...", ID_TOOLS_GENERATEPATCH END POPUP "&Plugins" BEGIN - MENUITEM "&Manual Unpacking", ID_UNPACK_MANUAL - MENUITEM "&Automatic Unpacking", ID_UNPACK_AUTO + MENUITEM "&Manu\xE1lne rozbalenie", ID_UNPACK_MANUAL + MENUITEM "&Automatick\xE9 rozbalenie", ID_UNPACK_AUTO MENUITEM SEPARATOR - MENUITEM "&Edit with Unpacker", ID_POPUP_OPEN_WITH_UNPACKER + MENUITEM "&Upravova\x9D rozba\xBEovac\xEDm programom", ID_POPUP_OPEN_WITH_UNPACKER MENUITEM SEPARATOR - MENUITEM "&Reload plugins", ID_RELOAD_PLUGINS + MENUITEM "&Znovu na\xE8\xEDta\x9D z\xE1suvn\xE9 moduly", ID_RELOAD_PLUGINS END POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds BEGIN - MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG + MENUITEM "&Nahra\x9D konfigur\xE1ciu...", ID_DEBUG_LOADCONFIG END POPUP "&Okno" BEGIN - MENUITEM "Zavrie\x9D", ID_FILE_CLOSE - MENUITEM "Clo&se All", ID_WINDOW_CLOSEALL + MENUITEM "&Zatvori\x9D", ID_FILE_CLOSE + MENUITEM "Zatvori\x9D &v\x9Aetky", ID_WINDOW_CLOSEALL MENUITEM SEPARATOR - MENUITEM "Change &Pane\tF6", ID_WINDOW_CHANGE_PANE + MENUITEM "Zmeni\x9D &panel\tF6", ID_WINDOW_CHANGE_PANE MENUITEM SEPARATOR MENUITEM "Dla\x9Edice &vodorovne", ID_WINDOW_TILE_HORZ MENUITEM "Dla\x9Edice &zvislo", ID_WINDOW_TILE_VERT @@ -204,13 +204,13 @@ BEGIN MENUITEM "O&bsah...\tF1", ID_HELP_CONTENTS MENUITEM "&Index...", ID_HELP_INDEX - MENUITEM "&Search...", ID_HELP_SEARCH + MENUITEM "&H\xBEadanie...", ID_HELP_SEARCH MENUITEM SEPARATOR - MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG - MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH + MENUITEM "K&onfigur\xE1cia...", ID_HELP_GETCONFIG + MENUITEM "Podpora a&rch\xEDvov vypnut\xE1...", ID_HELP_MERGE7ZMISMATCH MENUITEM SEPARATOR MENUITEM "GNU Public License...", ID_HELP_GNULICENSE - MENUITEM "&O programe...", ID_APP_ABOUT + MENUITEM "&O aplik\xE1cii...", ID_APP_ABOUT END END @@ -218,53 +218,53 @@ BEGIN POPUP "&S\xFAbor" BEGIN - MENUITEM "&New\tCtrl+N", ID_FILE_NEW + MENUITEM "&Nov\xFD\tCtrl+N", ID_FILE_NEW MENUITEM "&Otvori\x9D...\tCtrl+O", ID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "Open Pro&ject...\tCtrl+J", ID_FILE_OPENPROJECT - MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT + MENUITEM "O&tvori\x9D projekt...\tCtrl+J", ID_FILE_OPENPROJECT + MENUITEM "&Ulo\x9Ei\x9D projekt...", ID_FILE_SAVEPROJECT MENUITEM SEPARATOR - MENUITEM "L&eft Read-only", ID_FILE_LEFT_READONLY - MENUITEM "Ri&ght Read-only", ID_FILE_RIGHT_READONLY + MENUITEM "\xBC&av\xFD len na \xE8\xEDtanie", ID_FILE_LEFT_READONLY + MENUITEM "&Prav\xFD len na \xE8\xEDtanie", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - MENUITEM "File En&coding", ID_FILE_ENCODING + MENUITEM "&K\xF3dovanie s\xFAboru", ID_FILE_ENCODING MENUITEM SEPARATOR MENUITEM "&Koniec", ID_APP_EXIT END POPUP "\xDApr&avy" BEGIN - MENUITEM "Select &All\tCtrl+A", ID_EDIT_SELECT_ALL + MENUITEM "Vybr&a\x9D v\x9Aetko\tCtrl+A", ID_EDIT_SELECT_ALL MENUITEM SEPARATOR MENUITEM "&Vlastnosti", ID_OPTIONS MENUITEM SEPARATOR - MENUITEM "Refre&sh\tF5", ID_REFRESH - MENUITEM "&Refresh Selected\tCtrl+F5", ID_DIR_RESCAN + MENUITEM "&Obnovi\x9D\tF5", ID_REFRESH + MENUITEM "O&bnovi\x9D vybran\xE9\tCtrl+F5", ID_DIR_RESCAN END POPUP "&Poh\xBEad" BEGIN - MENUITEM "Show &Identical Items", ID_OPTIONS_SHOWIDENTICAL - MENUITEM "Show &Different Items", ID_OPTIONS_SHOWDIFFERENT - MENUITEM "Show L&eft Unique Items", ID_OPTIONS_SHOWUNIQUELEFT - MENUITEM "Show Ri&ght Unique Items", ID_OPTIONS_SHOWUNIQUERIGHT - MENUITEM "Show S&kipped Items", ID_OPTIONS_SHOWSKIPPED - MENUITEM "S&how Binary Files", ID_OPTIONS_SHOWBINARIES + MENUITEM "Zobrazi\x9D &identick\xE9 polo\x9Eky", ID_OPTIONS_SHOWIDENTICAL + MENUITEM "Zobrazi\x9D &rozdielne polo\x9Eky", ID_OPTIONS_SHOWDIFFERENT + MENUITEM "Zobrazi\x9D polo\x9Eky jedine\xE8n\xE9 &v\xBEavo", ID_OPTIONS_SHOWUNIQUELEFT + MENUITEM "Zobrazi\x9D polo\x9Eky jedine\xE8n\xE9 vp&ravo",ID_OPTIONS_SHOWUNIQUERIGHT + MENUITEM "Zobrazi\x9D pres&ko\xE8en\xE9 polo\x9Eky", ID_OPTIONS_SHOWSKIPPED + MENUITEM "Z&obrazi\x9D bin\xE1rne s\xFAbory", ID_OPTIONS_SHOWBINARIES MENUITEM SEPARATOR - MENUITEM "Show Hidd&en Items", ID_VIEW_SHOWHIDDENITEMS + MENUITEM "Zobrazi\x9D &skryt\xE9 polo\x9Eky", ID_VIEW_SHOWHIDDENITEMS MENUITEM SEPARATOR MENUITEM "&Zvoli\x9D p\xEDsmo...", ID_VIEW_SELECTFONT MENUITEM "Pou\x9Ei\x9D z\xE1kladn\xE9 p\xEDsm&o", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "&Panel n\xE1strojov", ID_VIEW_TOOLBAR MENUITEM "&Stavov\xFD riadok", ID_VIEW_STATUS_BAR - MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS + MENUITEM "\x8Atatistika po&rovnania", ID_VIEW_DIR_STATISTICS MENUITEM SEPARATOR MENUITEM "&Jazyk...", ID_VIEW_LANGUAGE END - POPUP "M&erge" + POPUP "&Zl\xFA\xE8i\x9D" BEGIN - MENUITEM "Co&mpare\tEnter", ID_MERGE_COMPARE + MENUITEM "Po&rovna\x9D\tEnter", ID_MERGE_COMPARE MENUITEM SEPARATOR - MENUITEM "&N\xE1sleduj\xFAci rozdiel\tTAlt+Down", ID_NEXTDIFF + MENUITEM "&Nasleduj\xFAci rozdiel\tTAlt+Down", ID_NEXTDIFF MENUITEM "&Predch\xE1dzaj\xFAci rozdiel\tAlt+Up", ID_PREVDIFF MENUITEM SEPARATOR MENUITEM "Pr&v\xFD rozdiel\tAlt+Home", ID_FIRSTDIFF @@ -274,34 +274,34 @@ MENUITEM "Kop\xEDrova\x9D v\x9Aetko vpravo", ID_ALL_RIGHT MENUITEM "Kop\xEDrova\x9D v\x9Aetko v\xBEavo", ID_ALL_LEFT MENUITEM SEPARATOR - MENUITEM "&Delete\tDel", ID_MERGE_DELETE + MENUITEM "&Zmaza\x9D\tDel", ID_MERGE_DELETE END POPUP "&Tools" BEGIN - MENUITEM "&Customize Columns...", ID_TOOLS_CUSTOMIZECOLUMNS - MENUITEM "&Filters...", ID_TOOLS_FILTERS - MENUITEM "&Generate Patch...", ID_TOOLS_GENERATEPATCH - MENUITEM "Generate &Report...", ID_TOOLS_GENERATEREPORT + MENUITEM "&Prisp\xF4sobi\x9D st\xE5pce...", ID_TOOLS_CUSTOMIZECOLUMNS + MENUITEM "&Filtre...", ID_TOOLS_FILTERS + MENUITEM "&Vytvori\x9D patch...", ID_TOOLS_GENERATEPATCH + MENUITEM "Vystvori\x9D &spr\xE1vu...", ID_TOOLS_GENERATEREPORT END POPUP "&Plugins" BEGIN - MENUITEM "&Manual Unpacking", ID_UNPACK_MANUAL - MENUITEM "&Automatic Unpacking", ID_UNPACK_AUTO + MENUITEM "&Manual\xE1lne rozbalenie", ID_UNPACK_MANUAL + MENUITEM "&Automatick\xE9 rozbalenie", ID_UNPACK_AUTO MENUITEM SEPARATOR - MENUITEM "&Edit with Unpacker", ID_POPUP_OPEN_WITH_UNPACKER + MENUITEM "&Upravova\x9D rozba\xBEovac\xEDm programom", ID_POPUP_OPEN_WITH_UNPACKER MENUITEM SEPARATOR - MENUITEM "&Reload plugins", ID_RELOAD_PLUGINS + MENUITEM "&Znovu na\xE8\xEDta\x9D z\xE1suvn\xE9 moduly", ID_RELOAD_PLUGINS END - POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds + POPUP "&Ladi\x9D" // NOTE: NOT visible in releases, only in DEBUG builds BEGIN - MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG + MENUITEM "&Na\xE8\xEDta\x9D konfigur\xE1ciu...", ID_DEBUG_LOADCONFIG END POPUP "&Okno" BEGIN - MENUITEM "Zavrie\x9D", ID_FILE_CLOSE - MENUITEM "Clo&se All", ID_WINDOW_CLOSEALL + MENUITEM "&Zavrie\x9D", ID_FILE_CLOSE + MENUITEM "Zavrie\x9D &v\x9Aetky", ID_WINDOW_CLOSEALL MENUITEM SEPARATOR - MENUITEM "Change &Pane\tF6", ID_WINDOW_CHANGE_PANE + MENUITEM "Prepn\xFA\x9D &panel\tF6", ID_WINDOW_CHANGE_PANE MENUITEM SEPARATOR MENUITEM "Dla\x9Edice &vodorovne", ID_WINDOW_TILE_HORZ MENUITEM "Dla\x9Edice &zvislo", ID_WINDOW_TILE_VERT @@ -311,13 +311,13 @@ BEGIN MENUITEM "O&bsah...\tF1", ID_HELP_CONTENTS MENUITEM "&Index...", ID_HELP_INDEX - MENUITEM "&Search...", ID_HELP_SEARCH + MENUITEM "&Vyh\xBEad\xE1vanie...", ID_HELP_SEARCH MENUITEM SEPARATOR - MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG - MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH + MENUITEM "K&onfigur\xE1cia...", ID_HELP_GETCONFIG + MENUITEM "Podpora a&rch\xEDvov vypnut\xE1...", ID_HELP_MERGE7ZMISMATCH MENUITEM SEPARATOR MENUITEM "GNU Public License...", ID_HELP_GNULICENSE - MENUITEM "&O programe...", ID_APP_ABOUT + MENUITEM "&O aplik\xE1cii...", ID_APP_ABOUT END END @@ -328,35 +328,35 @@ MENUITEM "&New\tCtrl+N", ID_FILE_NEW MENUITEM "&Otvori\x9D...\tCtrl+O", ID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "Open Pro&ject...\tCtrl+J", ID_FILE_OPENPROJECT - MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT + MENUITEM "Otvori\x9D pro&jekt...\tCtrl+J", ID_FILE_OPENPROJECT + MENUITEM "Ulo\x9Ei\x9D &projekt...", ID_FILE_SAVEPROJECT MENUITEM SEPARATOR MENUITEM "&Ulo\x9Ei\x9D\tCtrl+S", ID_FILE_SAVE - POPUP "Save &Left" + POPUP "Ulo\x9Ei\x9D \xBE&av\xFD" BEGIN - MENUITEM "&Save", ID_FILE_SAVE_LEFT - MENUITEM "Save &As...", ID_FILE_SAVEAS_LEFT + MENUITEM "&Ulo\x9Ei\x9D", ID_FILE_SAVE_LEFT + MENUITEM "Ulo\x9Ei\x9D &ako...", ID_FILE_SAVEAS_LEFT END - POPUP "Save &Right" + POPUP "Ulo\x9Ei\x9D &prav\xFD" BEGIN - MENUITEM "&Save", ID_FILE_SAVE_RIGHT - MENUITEM "Save &As...", ID_FILE_SAVEAS_RIGHT + MENUITEM "&Ulo\x9Ei\x9D", ID_FILE_SAVE_RIGHT + MENUITEM "Ulo\x9Ei\x9D &ako...", ID_FILE_SAVEAS_RIGHT END MENUITEM SEPARATOR - MENUITEM "&Print...", ID_FILE_PRINT - MENUITEM "Print P&review", ID_FILE_PRINT_PREVIEW + MENUITEM "&Tla\xE8i\x9D...", ID_FILE_PRINT + MENUITEM "N\xE1h\xBEad p&red tla\xE8ou", ID_FILE_PRINT_PREVIEW MENUITEM SEPARATOR - MENUITEM "L&eft Read-only", ID_FILE_LEFT_READONLY - MENUITEM "Ri&ght Read-only", ID_FILE_RIGHT_READONLY + MENUITEM "\xBC&av\xFD len na \xE8\xEDtanie", ID_FILE_LEFT_READONLY + MENUITEM "Pra&v\xFD len na \xE8\xEDtanie", ID_FILE_RIGHT_READONLY MENUITEM SEPARATOR - POPUP "&Convert Line Endings to" + POPUP "&Konverova\x9D konce riadkov na" BEGIN MENUITEM "&DOS (CRLF)", ID_EOL_TO_DOS MENUITEM "&UNIX (LF)", ID_EOL_TO_UNIX MENUITEM "&MAC (CR)", ID_EOL_TO_MAC END MENUITEM SEPARATOR - MENUITEM "&Merge Mode\tF9", ID_FILE_MERGINGMODE + MENUITEM "&Zlu\xE8ovac\xED re\x9Eim\tF9", ID_FILE_MERGINGMODE MENUITEM SEPARATOR MENUITEM "&Koniec", ID_APP_EXIT END @@ -369,55 +369,55 @@ MENUITEM "&Kop\xEDrova\x9D\tCtrl+C", ID_EDIT_COPY MENUITEM "V&lo\x9Ei\x9D\tCtrl+V", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "Select Line &Difference\tF4", ID_SELECTLINEDIFF - MENUITEM "Select &All\tCtrl+A", ID_EDIT_SELECT_ALL + MENUITEM "Ozna\xE8i\x9D roz&diel v riadku\tF4", ID_SELECTLINEDIFF + MENUITEM "Ozna\xE8i\x9D &v\x9Aetko\tCtrl+A", ID_EDIT_SELECT_ALL MENUITEM SEPARATOR MENUITEM "&H\xBEadaj...\tCtrl+F", ID_EDIT_FIND MENUITEM "Nahra\xEF...\tCtrl+H", ID_EDIT_REPLACE MENUITEM SEPARATOR - POPUP "&Scripts" + POPUP "&Skripty" BEGIN MENUITEM "< Empty >", ID_NO_EDIT_SCRIPTS END MENUITEM SEPARATOR - POPUP "Advanced" + POPUP "Roz\x9A\xEDren\xE9" BEGIN - MENUITEM "&Copy With Line Numbers\tCtrl+Shift+C", - ID_EDIT_COPY_LINENUMBERS + MENUITEM "&Kop\xEDrova\x9D s \xE8\xEDslami riadkov\tCtrl+Shift+C", + ID_EDIT_COPY_LINENUMBERS END - POPUP "&Bookmarks" + POPUP "&Z\xE1lo\x9Eky" BEGIN - MENUITEM "&Toggle Bookmark\tCtrl+F2", ID_EDIT_TOGGLE_BOOKMARK - MENUITEM "&Next Bookmark\tF2", ID_EDIT_GOTO_NEXT_BOOKMARK - MENUITEM "&Previous bookmark\tShift+F2", ID_EDIT_GOTO_PREV_BOOKMARK - MENUITEM "&Clear All Bookmarks", ID_EDIT_CLEAR_ALL_BOOKMARKS + MENUITEM "&Prepn\xFA\x9D z\xE1lo\x9Eku\tCtrl+F2", ID_EDIT_TOGGLE_BOOKMARK + MENUITEM "&\xCFal\x9Aia z\xE1lo\x9Eka\tF2", ID_EDIT_GOTO_NEXT_BOOKMARK + MENUITEM "&Predo\x9Al\xE1 z\xE1lo\x9Eka\tShift+F2", ID_EDIT_GOTO_PREV_BOOKMARK + MENUITEM "&Zmaza\x9D v\x9Aetky z\xE1lo\x9Eky", ID_EDIT_CLEAR_ALL_BOOKMARKS END - MENUITEM "&Go To...\tCtrl+G", ID_EDIT_WMGOTO + MENUITEM "&Cho\xEF na...\tCtrl+G", ID_EDIT_WMGOTO MENUITEM SEPARATOR MENUITEM "&Vlastnosti", ID_OPTIONS MENUITEM SEPARATOR - MENUITEM "Refre&sh\tF5", ID_REFRESH + MENUITEM "&Obnovi\x9D\tF5", ID_REFRESH END POPUP "&Poh\xBEad" BEGIN MENUITEM "&Zvoli\x9D p\xEDsmo...", ID_VIEW_SELECTFONT - MENUITEM "Pou\x9Ei\x9D z\xE1kladn\xE9 p\xEDsm&o", ID_VIEW_USEDEFAULTFONT + MENUITEM "P&ou\x9Ei\x9D z\xE1kladn\xE9 p\xEDsmo", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "&Zobraz pr\xE1zdne miesto", ID_VIEW_WHITESPACE - MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS - MENUITEM "View Line &Numbers", ID_VIEW_LINENUMBERS - MENUITEM "W&rap Lines", ID_VIEW_WORDWRAP + MENUITEM "Zobraz&i\x9D rozdiely riadkov", ID_VIEW_LINEDIFFS + MENUITEM "Zobrazi\x9D \xE8\xEDsla &riadkov", ID_VIEW_LINENUMBERS + MENUITEM "&Zalamova\x9D riadky", ID_VIEW_WORDWRAP MENUITEM SEPARATOR - MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES + MENUITEM "&Vymeni\x9D panely", ID_VIEW_SWAPPANES MENUITEM SEPARATOR MENUITEM "&Panel n\xE1strojov", ID_VIEW_TOOLBAR MENUITEM "&Stavov\xFD riadok", ID_VIEW_STATUS_BAR - MENUITEM "Diff &Pane", ID_VIEW_DETAIL_BAR - MENUITEM "Location &Pane", ID_VIEW_LOCATION_BAR + MENUITEM "&Panel s rozdielom", ID_VIEW_DETAIL_BAR + MENUITEM "Panel &umiestnenia", ID_VIEW_LOCATION_BAR MENUITEM SEPARATOR MENUITEM "&Jazyk...", ID_VIEW_LANGUAGE END - POPUP "M&erge" + POPUP "&Zl\xFA\xE8i\x9D" BEGIN MENUITEM "&N\xE1sleduj\xFAci rozdiel\tTAlt+Down", ID_NEXTDIFF MENUITEM "&Predch\xE1dzaj\xFAci rozdiel\tAlt+Up", ID_PREVDIFF @@ -429,34 +429,34 @@ MENUITEM "Kop\xEDrova\x9D vpravo\t<-", ID_L2R MENUITEM "Kop\xEDrova\x9D v\xBEavo\t->", ID_R2L MENUITEM SEPARATOR - MENUITEM "C&opy to Right and Advance\tAlt+Ctrl+Right", ID_L2RNEXT - MENUITEM "Copy &to Left and Advance\tAlt+Ctrl+Left", ID_R2LNEXT + MENUITEM "Kop\xEDrova\x9D vpravo a \xEDs\x9D \xEFalej\tAlt+Ctrl+Right", ID_L2RNEXT + MENUITEM "Kop\xEDrova\x9D v\xBEavo a \xEDs\x9D \xEFalej\tAlt+Ctrl+Left", ID_R2LNEXT MENUITEM SEPARATOR MENUITEM "Kop\xEDrova\x9D v\x9Aetko vpravo", ID_ALL_RIGHT MENUITEM "Kop\xEDrova\x9D v\x9Aetko v\xBEavo", ID_ALL_LEFT END - POPUP "&Tools" + POPUP "&N\xE1stroje" BEGIN - MENUITEM "&Filters...", ID_TOOLS_FILTERS - MENUITEM "&Generate Patch...", ID_TOOLS_GENERATEPATCH + MENUITEM "&Filtre...", ID_TOOLS_FILTERS + MENUITEM "&Vytvori\x9D patch...", ID_TOOLS_GENERATEPATCH END - POPUP "&Plugins" + POPUP "&Z\xE1suvn\xE9 moduly" BEGIN - MENUITEM "&Manual Unpacking", ID_UNPACK_MANUAL - MENUITEM "&Automatic Unpacking", ID_UNPACK_AUTO + MENUITEM "&Ru\xE8n\xE9 rozbalenie", ID_UNPACK_MANUAL + MENUITEM "&Automatick\xE9 rozbalenie", ID_UNPACK_AUTO MENUITEM SEPARATOR - MENUITEM "&Edit with Unpacker", ID_POPUP_OPEN_WITH_UNPACKER + MENUITEM "&Upravova\x9D rozba\xBEovac\xEDm programom", ID_POPUP_OPEN_WITH_UNPACKER MENUITEM SEPARATOR - POPUP "&Prediffer" + POPUP "&Predspracovanie" BEGIN MENUITEM "", ID_NO_PREDIFFER END MENUITEM SEPARATOR - MENUITEM "&Reload plugins", ID_RELOAD_PLUGINS + MENUITEM "&Znovu na\xE8\xEDta\x9D z\xE1suvn\xE9 moduly", ID_RELOAD_PLUGINS END POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds BEGIN - MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG + MENUITEM "&na\xE8\xEDta\x9D konfigur\xE1ciu...", ID_DEBUG_LOADCONFIG END POPUP "&Okno" BEGIN @@ -473,10 +473,10 @@ BEGIN MENUITEM "O&bsah...\tF1", ID_HELP_CONTENTS MENUITEM "&Index...", ID_HELP_INDEX - MENUITEM "&Search...", ID_HELP_SEARCH + MENUITEM "&Vyh\xBEad\xE1va\x9D...", ID_HELP_SEARCH MENUITEM SEPARATOR - MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG - MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH + MENUITEM "K&onfigur\xE1cia...", ID_HELP_GETCONFIG + MENUITEM "Podpora a&rch\xEDvov vypnut\xE1...", ID_HELP_MERGE7ZMISMATCH MENUITEM SEPARATOR MENUITEM "GNU Public License...", ID_HELP_GNULICENSE MENUITEM "&O programe...", ID_APP_ABOUT @@ -487,63 +487,63 @@ BEGIN POPUP "_ITEM_POPUP_" BEGIN - MENUITEM "Comp&are", ID_MERGE_COMPARE + MENUITEM "Porovn&a\x9D", ID_MERGE_COMPARE MENUITEM SEPARATOR - POPUP "&Copy" + POPUP "&Kop\xEDrova\x9D" BEGIN - MENUITEM "&Left to Right", ID_DIR_COPY_LEFT_TO_RIGHT - MENUITEM "L&eft to...", ID_DIR_COPY_LEFT_TO_BROWSE - MENUITEM "&Right to Left", ID_DIR_COPY_RIGHT_TO_LEFT - MENUITEM "R&ight to...", ID_DIR_COPY_RIGHT_TO_BROWSE + MENUITEM "&\xBCav\xFD s prav\xFDm", ID_DIR_COPY_LEFT_TO_RIGHT + MENUITEM "\xBCa&v\xFD s...", ID_DIR_COPY_LEFT_TO_BROWSE + MENUITEM "&Prav\xFD s \xBEav\xFDm", ID_DIR_COPY_RIGHT_TO_LEFT + MENUITEM "P&av\xFD s...", ID_DIR_COPY_RIGHT_TO_BROWSE END - POPUP "&Move" + POPUP "&presun\xFA\x9D" BEGIN - MENUITEM "&Left to...", ID_DIR_MOVE_LEFT_TO_BROWSE - MENUITEM "&Right to...", ID_DIR_MOVE_RIGHT_TO_BROWSE + MENUITEM "\xBC&av\xFD do...", ID_DIR_MOVE_LEFT_TO_BROWSE + MENUITEM "&prav\xFD do...", ID_DIR_MOVE_RIGHT_TO_BROWSE END - POPUP "&Delete" + POPUP "&Zmaza\x9D" BEGIN - MENUITEM "&Left", ID_DIR_DEL_LEFT - MENUITEM "&Right", ID_DIR_DEL_RIGHT - MENUITEM "&Both", ID_DIR_DEL_BOTH + MENUITEM "\xBC&av\xFD", ID_DIR_DEL_LEFT + MENUITEM "&prav\xFD", ID_DIR_DEL_RIGHT + MENUITEM "&Oba", ID_DIR_DEL_BOTH END - MENUITEM "Re&name", ID_DIR_ITEM_RENAME - MENUITEM "&Hide Items", ID_DIR_HIDE_FILENAMES + MENUITEM "Preme&nova\x9D", ID_DIR_ITEM_RENAME + MENUITEM "&Skry\x9D polo\x9Eky", ID_DIR_HIDE_FILENAMES MENUITEM SEPARATOR - POPUP "&Open Left" + POPUP "&Otvori\x9D \xBEav\xFD" BEGIN - MENUITEM "with &Registered Application", ID_DIR_OPEN_LEFT - MENUITEM "with &External Editor", ID_DIR_OPEN_LEFT_WITHEDITOR - MENUITEM "&with...", ID_DIR_OPEN_LEFT_WITH + MENUITEM "®istrovanou aplik\xE1ciou", ID_DIR_OPEN_LEFT + MENUITEM "&extern\xFDm editorom", ID_DIR_OPEN_LEFT_WITHEDITOR + MENUITEM "\xE8\xED&m...", ID_DIR_OPEN_LEFT_WITH END - POPUP "O&pen Right" + POPUP "O&tvori\x9D prav\xFD" BEGIN - MENUITEM "with &Registered Application", ID_DIR_OPEN_RIGHT - MENUITEM "with &External Editor", ID_DIR_OPEN_RIGHT_WITHEDITOR - MENUITEM "&with...", ID_DIR_OPEN_RIGHT_WITH + MENUITEM "®istrovanou aplik\xE1ciou", ID_DIR_OPEN_RIGHT + MENUITEM "&extern\xFDm editorom", ID_DIR_OPEN_RIGHT_WITHEDITOR + MENUITEM "\xE8\xED&m...", ID_DIR_OPEN_RIGHT_WITH END MENUITEM SEPARATOR - POPUP "Cop&y Pathnames" + POPUP "Skop\xEDrova\x9D n\xE1zvy &ciest" BEGIN - MENUITEM "&Left (%1 of %2)", ID_DIR_COPY_PATHNAMES_LEFT - MENUITEM "&Right (%1 of %2)", ID_DIR_COPY_PATHNAMES_RIGHT - MENUITEM "&Both (%1 of %2)", ID_DIR_COPY_PATHNAMES_BOTH + MENUITEM "&\xBCav\xFD (%1 z %2)", ID_DIR_COPY_PATHNAMES_LEFT + MENUITEM "&prav\xFD (%1 z %2)", ID_DIR_COPY_PATHNAMES_RIGHT + MENUITEM "&Oba (%1 z %2)", ID_DIR_COPY_PATHNAMES_BOTH END - MENUITEM "Copy &Filenames", ID_DIR_COPY_FILENAMES + MENUITEM "Skop\xEDrova\x9D n\xE1zvy &s\xFAborov", ID_DIR_COPY_FILENAMES MENUITEM SEPARATOR - POPUP "&Zip" + POPUP "&Zipova\x9D" BEGIN - MENUITEM "&Left... (%1 of %2)", ID_DIR_ZIP_LEFT - MENUITEM "&Right... (%1 of %2)", ID_DIR_ZIP_RIGHT - MENUITEM "&Both... (%1 of %2)", ID_DIR_ZIP_BOTH - MENUITEM "&Differences... (%1 of %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY + MENUITEM "&\xBCav\xFD... (%1 of %2)", ID_DIR_ZIP_LEFT + MENUITEM "&prav\xFD... (%1 of %2)", ID_DIR_ZIP_RIGHT + MENUITEM "&Oba... (%1 of %2)", ID_DIR_ZIP_BOTH + MENUITEM "&Rozdiely... (%1 of %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY END MENUITEM SEPARATOR - MENUITEM "&Refresh", ID_DIR_RESCAN + MENUITEM "&Obnovi\x9D", ID_DIR_RESCAN END POPUP "_HDR_POPUP_" BEGIN - MENUITEM "&Customize Columns...", ID_TOOLS_CUSTOMIZECOLUMNS + MENUITEM "&Prisp\xF4sobi\x9D st\xE5pce...", ID_TOOLS_CUSTOMIZECOLUMNS END END @@ -551,17 +551,17 @@ BEGIN POPUP "_POPUP_" BEGIN - MENUITEM "&Copy Full Path", ID_EDITOR_COPY_PATH - MENUITEM "Copy &Filename", ID_EDITOR_COPY_FILENAME + MENUITEM "&Kop\xEDrova\x9D pln\xFA cestu", ID_EDITOR_COPY_PATH + MENUITEM "Kop\xEDrova\x9D n\xE1zov &s\xFAboru", ID_EDITOR_COPY_FILENAME END END IDR_POPUP_PLUGINS_SETTINGS MENU BEGIN - POPUP "Prediffer Settings" + POPUP "Nastavenia preprocesora" BEGIN - MENUITEM "&No prediffer", ID_PREDIFF_MANUAL - MENUITEM "Auto prediffer", ID_PREDIFF_AUTO + MENUITEM "&Bez preprocesora", ID_PREDIFF_MANUAL + MENUITEM "Auto preprocesor", ID_PREDIFF_AUTO END END @@ -569,12 +569,12 @@ BEGIN POPUP "_POPUP_" BEGIN - MENUITEM "G&oto Diff", ID_LOCBAR_GOTODIFF - MENUITEM "&Goto...", ID_EDIT_WMGOTO + MENUITEM "Ch&o\xEF na rozdiel", ID_LOCBAR_GOTODIFF + MENUITEM "&Cho\xEF...", ID_EDIT_WMGOTO MENUITEM SEPARATOR - MENUITEM "&No Moved Blocks", ID_DISPLAY_MOVED_NONE - MENUITEM "&All Moved Blocks", ID_DISPLAY_MOVED_ALL - MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF + MENUITEM "&Bez presunt\xFDch blokov", ID_DISPLAY_MOVED_NONE + MENUITEM "&V\x9Aetky presunut\xE9 bloky", ID_DISPLAY_MOVED_ALL + MENUITEM "Presunut\xFD blok pre &aktu\xE1lny rozdiel", ID_DISPLAY_MOVED_FOLLOW_DIFF END END @@ -640,19 +640,19 @@ IDD_ABOUTBOX DIALOGEX 0, 0, 223, 124 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "O programe" +CAPTION "O aplik\xE1cii" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX LTEXT "Verzia 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX - LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 + LTEXT "(S\xFAkromn\xE9 zostavenie)",IDC_PRIVATEBUILD,63,33,153,8 LTEXT "V\x9Aetky pr\xE1va vyhraden\xE9.",IDC_STATIC,7,60,170,8 LTEXT "Nav\x9At\xEDvte www str\xE1nku programu WinMerge!",IDC_WWW,7,79,209,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,95,209,1 LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 DEFPUSHBUTTON "OK",IDOK,166,103,50,14 - PUSHBUTTON "Contributors",IDC_OPEN_CONTRIBUTORS,7,103,65,14 + PUSHBUTTON "Prispievatelia",IDC_OPEN_CONTRIBUTORS,7,103,65,14 END IDD_OPEN DIALOGEX 0, 0, 374, 126 @@ -670,21 +670,21 @@ COMBOBOX IDC_RIGHT_COMBO,81,38,167,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, WS_EX_ACCEPTFILES - PUSHBUTTON "Pr&ech\xE1dza\x9D...",IDC_RIGHT_BUTTON,252,38,50,14 + PUSHBUTTON "&Prech\xE1dza\x9D...",IDC_RIGHT_BUTTON,252,38,50,14 RTEXT "Pr&\xEDpony:",IDC_STATIC,13,56,65,8 COMBOBOX IDC_EXT_COMBO,81,54,167,95,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Select...",IDC_SELECT_FILTER,252,54,50,14 - RTEXT "&Unpacker:",IDC_STATIC,13,72,65,8 + PUSHBUTTON "&Vybra\x9D...",IDC_SELECT_FILTER,252,54,50,14 + RTEXT "&Rozba\xBEovac\xED program:",IDC_STATIC,13,72,65,8 EDITTEXT IDC_UNPACKER_EDIT,81,70,167,12,ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Select...",IDC_SELECT_UNPACKER,252,70,50,14 - CONTROL "&Include Subfolders",IDC_RECURS_CHECK,"Button", + PUSHBUTTON "&Vybra\x9D...",IDC_SELECT_UNPACKER,252,70,50,14 + CONTROL "&Zahrn\xFA\x9D podadres\xE1re",IDC_RECURS_CHECK,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,81,86,167,10 LTEXT "Status:",IDC_OPEN_STATUS,15,102,192,8 DEFPUSHBUTTON "OK",IDOK,316,11,50,14 - PUSHBUTTON "Storno",IDCANCEL,316,28,50,14 - PUSHBUTTON "Help",ID_HELP,316,45,50,14 + PUSHBUTTON "Zru\x9Ai\x9D",IDCANCEL,316,28,50,14 + PUSHBUTTON "Pomoc",ID_HELP,316,45,50,14 GROUPBOX "S\xFAbory alebo adres\xE1re pre porovnanie",IDC_FILES_DIRS_GROUP,7, 7,302,111 END @@ -697,31 +697,31 @@ BEGIN LTEXT "",IDC_STATIC,7,7,243,47,SS_SUNKEN LTEXT "IDS_SAVEVSS_FMT",IDC_MESSAGE,14,13,231,34 - LTEXT "Database:",IDC_STATIC,7,64,36,8 + LTEXT "Datab\xE1za:",IDC_STATIC,7,64,36,8 COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - LTEXT "Project:",IDC_STATIC,7,81,36,8 + LTEXT "Projekt:",IDC_STATIC,7,81,36,8 COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - LTEXT "User:",IDC_STATIC,7,99,36,8 + LTEXT "Pou\x9E\xEDvate\xBE:",IDC_STATIC,7,99,36,8 EDITTEXT IDC_USER,48,96,70,14,ES_AUTOHSCROLL - RTEXT "Password:",IDC_STATIC,122,99,55,8 + RTEXT "Heslo:",IDC_STATIC,122,99,55,8 EDITTEXT IDC_PASSWORD,180,96,70,14,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "Link to Destination VSS project",IDC_VCPROJ_SYNC,"Button", + CONTROL "Odkaz na Cie\xBEov\xFD VSS projekt",IDC_VCPROJ_SYNC,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,115,235,8 - CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button", + CONTROL "Pou\x9Ei\x9D na v\x9Aetky polo\x9Eky",IDC_MULTI_CHECKOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,125,235,8 DEFPUSHBUTTON "Check Out",IDOK,91,145,50,14 - PUSHBUTTON "Save As...",IDC_SAVE_AS,145,145,50,14 - PUSHBUTTON "Cancel",IDCANCEL,200,145,50,14 + PUSHBUTTON "Ulo\x9Ei\x9D ako...",IDC_SAVE_AS,145,145,50,14 + PUSHBUTTON "Zru\x9Ai\x9D",IDCANCEL,200,145,50,14 END IDD_PROP_VSS DIALOGEX 0, 0, 235, 157 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "Syst\xE9m verzi\xED" +CAPTION "Syst\xE9m pre sp\xE1vu verzi\xED" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Syst\xE9m &verzi\xED:",IDC_STATIC,7,7,221,10 + LTEXT "Syst\xE9m pre spr\xE1vu &verzi\xED:",IDC_STATIC,7,7,221,10 COMBOBOX IDC_VER_SYS,7,18,166,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "&Cesta ku cleartool.exe:",IDC_VSS_L1,7,37,221,10 @@ -741,23 +741,23 @@ 17,206,10 CONTROL "&Nezobrazuj sp\xFA\x9A\x9Dac\xED banner",IDC_DISABLE_SPLASH,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10 - CONTROL "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button", + CONTROL "Zat&v\xE1ra\x9D ok\xE1 kl\xE1vesom ESC",IDC_ESC_CLOSES_WINDOW,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10 - CONTROL "&Automatically verify paths in Open-dialog", + CONTROL "&Automaticky overova\x9D cestu v dial\xF3gu Otvori\x9D", IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10 - CONTROL "All&ow only one instance to run",IDC_SINGLE_INSTANCE, + CONTROL "Um&o\x9Eni beh iba jednej in\x9Atancie",IDC_SINGLE_INSTANCE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10 - LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8 + LTEXT "A&utomatick\xE9 dop\xE5\xF2anie v dial\xF3gu Otvori\x9D:",IDC_STATIC,19,72,125,8 COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100, + GROUPBOX "Povo\xBE viacer\xE9 okn\xE1 pre porovnanie",IDC_STATIC,7,100, 221,37 - CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP, + CONTROL "Porovnanie &adres\xE1rov",IDC_MULTIDOC_DIRCMP, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 - CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP, + CONTROL "Porovnanie &s\xFAborov",IDC_MULTIDOC_FILECMP, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 - LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.", + LTEXT "WinMerge umo\x9E\xF2uje zamedzi\x9D zobrazovaniu be\x9En\xFDch spr\xE1v. Stla\xE8en\xEDm tla\xE8idla Reset sa znova spr\xE1vy zobrazia.", IDC_STATIC,7,153,168,31 PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT WS_TABSTOP @@ -770,7 +770,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN PUSHBUTTON "OK",IDOK,47,123,52,14 - PUSHBUTTON "Storno",IDCANCEL,115,123,52,14 + PUSHBUTTON "Zru\x9Ai\x9D",IDCANCEL,115,123,52,14 LISTBOX IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP | LBS_SORT LTEXT "Dostupn\xE9 jazyky:",IDC_STATIC,7,7,140,8 @@ -779,10 +779,10 @@ IDD_EDIT_FIND DIALOGEX 30, 73, 283, 74 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "N\xE1jdi" +CAPTION "H\xBEada\x9D" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "&H\xBEadaj:",IDC_STATIC,7,9,50,8 + LTEXT "&H\xBEada\x9D:",IDC_STATIC,7,9,50,8 COMBOBOX IDC_EDIT_FINDTEXT,59,7,160,65,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Iba cel\xE9 &slov\xE1",IDC_EDIT_WHOLE_WORD,"Button", @@ -791,24 +791,24 @@ BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10 CONTROL "&Regul\xE1rny v\xFDraz",IDC_EDIT_REGEXP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10 - CONTROL "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button", + CONTROL "&Nezalamova\x9D koniec s\xFAboru",IDC_FINDDLG_DONTWRAP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,57,135,10 - GROUPBOX "Smer h\xBEadania",IDC_STATIC,148,23,70,36,WS_GROUP + GROUPBOX "S&mer h\xBEadania",IDC_STATIC,148,23,70,36,WS_GROUP CONTROL "&Nahor",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | WS_GROUP,154,34,57,10 CONTROL "Na&dol",IDC_EDIT_DIRECTION_DOWN,"Button", BS_AUTORADIOBUTTON,154,44,57,10 DEFPUSHBUTTON "&N\xE1jdi \xEFal\x9A\xED",IDOK,226,7,50,14,WS_GROUP - PUSHBUTTON "Storno",IDCANCEL,226,24,50,14 + PUSHBUTTON "Zru\x9Ai\x9D",IDCANCEL,226,24,50,14 END IDD_EDIT_REPLACE DIALOGEX 36, 44, 306, 90 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Nahra?" +CAPTION "Nahradi\x9D" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "&H\xBEadaj:",IDC_STATIC,7,9,65,8 + LTEXT "&H\xBEada\x9D:",IDC_STATIC,7,9,65,8 COMBOBOX IDC_EDIT_FINDTEXT,75,7,165,66,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Nahradi\x9D:",IDC_STATIC,7,24,65,8 @@ -830,7 +830,7 @@ DEFPUSHBUTTON "N\xE1jdi \xEFal\x9A\xED",IDC_EDIT_SKIP,247,7,52,14,WS_GROUP PUSHBUTTON "Nahra\xEF",IDC_EDIT_REPLACE,247,24,52,14 PUSHBUTTON "Nahra\xEF v\x9Aetko",IDC_EDIT_REPLACE_ALL,247,41,52,14 - PUSHBUTTON "Storno",IDCANCEL,247,58,52,14 + PUSHBUTTON "Zru\x9Ai\x9D",IDCANCEL,247,58,52,14 END IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 @@ -840,23 +840,23 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "CheckOut",IDOK,169,115,50,14 - PUSHBUTTON "Cancel",IDCANCEL,223,115,50,14 - PUSHBUTTON "Save As...",IDC_SAVE_AS,169,115,50,14,NOT WS_VISIBLE + PUSHBUTTON "Zru\x9Ai\x9D",IDCANCEL,223,115,50,14 + PUSHBUTTON "Ulo\x9Ei\x9D ako...",IDC_SAVE_AS,169,115,50,14,NOT WS_VISIBLE EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL - LTEXT "Comments",IDC_STATIC,18,7,80,10 - CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button", + LTEXT "Koment\xE1re",IDC_STATIC,18,7,80,10 + CONTROL "Pou\x9Ei\x9D na v\x9Aetky polo\x9Eky",IDC_MULTI_CHECKOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,83,235,8 - CONTROL "CheckIn after checkout",IDC_CHECKIN,"Button", + CONTROL "Check in po checkout-e",IDC_CHECKIN,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8 END IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Linefilters" +CAPTION "Riakov\xE9 filtre" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Ignoruj riadky obsahuj\xFAce nasledovn\xE9 vzorky (patterns):", + CONTROL "Ignoruj riadky obsahuj\xFAce nasledovn\xE9 vzorky:", IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7, 7,221,15 LTEXT "Regul\xE1rne v\xFDrazy (jeden na riadok):",IDC_STATIC,7,28, @@ -878,8 +878,8 @@ CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - CTEXT "Background",IDC_STATIC,96,15,50,8 - CTEXT "Deleted",IDC_STATIC,145,15,38,8 + CTEXT "Pozadie",IDC_STATIC,96,15,50,8 + CTEXT "Zmazan\xE9",IDC_STATIC,145,15,38,8 CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,156,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE @@ -937,7 +937,7 @@ CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,170,50,14 + PUSHBUTTON "Predvolen\xE9",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -953,75 +953,75 @@ IDD_PROPPAGE_REGISTRY DIALOGEX 0, 0, 235, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "System" +CAPTION "Syst\xE9m" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "&Send deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN, + CONTROL "&Posiela\x9D zmazan\xE9 s\xFAbory do ko\x9Aa",IDC_USE_RECYCLE_BIN, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,222,10 - CONTROL "Ign&ore time differences less than 3 seconds", + CONTROL "Ign&oruj \xE8asov\xE9 rozdiely men\x9Aie ako 3 sekundy", IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,17,222,10 - GROUPBOX "Integration",IDC_STATIC,7,30,218,46 - CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT, + GROUPBOX "Integr\xE1cia",IDC_STATIC,7,30,218,46 + CONTROL "&Prida\x9D do kontextov\xE9ho menu Prieskumn\xEDka",IDC_EXPLORER_CONTEXT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,200,10 - CONTROL "E&nable advanced menu",IDC_EXPLORER_ADVANCED,"Button", + CONTROL "Zap&n\xFA\x9D roz\x9A\xEDren\xE9 menu",IDC_EXPLORER_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,51,200,10 - CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS, + CONTROL "Za&h\xE0\xF2a\x9D \x9Atandardne aj podadres\xE1re",IDC_EXPLORER_SUBFOLDERS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,61,200,10 - LTEXT "&External editor:",IDC_STATIC,7,83,222,8 + LTEXT "&Extern\xFD editor:",IDC_STATIC,7,83,222,8 EDITTEXT IDC_EXT_EDITOR_PATH,7,93,167,14,ES_AUTOHSCROLL - PUSHBUTTON "&Browse...",IDC_EXT_EDITOR_BROWSE,179,93,50,14 - LTEXT "&Filter folder:",IDC_STATIC,7,111,166,8 + PUSHBUTTON "&Preh\xBEad\xE1va\x9D...",IDC_EXT_EDITOR_BROWSE,179,93,50,14 + LTEXT "Adres\xE1r s &filtrami:",IDC_STATIC,7,111,166,8 EDITTEXT IDC_FILTER_USER_PATH,7,121,167,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_FILTER_USER_BROWSE,179,121,50,14 + PUSHBUTTON "Preh\xBEad\xE1va\x9D...",IDC_FILTER_USER_BROWSE,179,121,50,14 END IDD_GENERATE_PATCH DIALOGEX 0, 0, 340, 180 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Patch Generator" +CAPTION "Gener\xE1tor patchov" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "File&1:",IDC_STATIC,7,10,36,8 + LTEXT "S\xFAbor&1:",IDC_STATIC,7,10,36,8 COMBOBOX IDC_DIFF_FILE1,48,7,230,93,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Browse...",IDC_DIFF_BROWSE_FILE1,283,7,50,14 - LTEXT "File&2:",IDC_STATIC,7,27,36,8 + PUSHBUTTON "&Preh\xBEad\xE1va\x9D...",IDC_DIFF_BROWSE_FILE1,283,7,50,14 + LTEXT "S\xFAbor&2:",IDC_STATIC,7,27,36,8 COMBOBOX IDC_DIFF_FILE2,48,24,230,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Br&owse...",IDC_DIFF_BROWSE_FILE2,283,24,50,14 - PUSHBUTTON "&Swap",IDC_DIFF_SWAPFILES,283,41,50,14 - CONTROL "&Append to existing file",IDC_DIFF_APPENDFILE,"Button", + PUSHBUTTON "Preh\xBEad\xE1va\x9De...",IDC_DIFF_BROWSE_FILE2,283,24,50,14 + PUSHBUTTON "&Vymeni\x9D navz\xE1jom",IDC_DIFF_SWAPFILES,283,41,50,14 + CONTROL "&Roz\x9A\xEDri\x9D existuj\xFAci s\xFAbor",IDC_DIFF_APPENDFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,48,51,230,10 - LTEXT "&Result:",IDC_STATIC,7,66,37,8 + LTEXT "&V\xFDsledok:",IDC_STATIC,7,66,37,8 COMBOBOX IDC_DIFF_FILERESULT,48,63,230,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Bro&wse...",IDC_DIFF_BROWSE_RESULT,283,63,50,14 - GROUPBOX "&Format",IDC_STATIC,7,81,142,46 - LTEXT "St&yle:",IDC_STATIC,13,95,46,8 + PUSHBUTTON "Preh\xBEad\xE1va\x9D...",IDC_DIFF_BROWSE_RESULT,283,63,50,14 + GROUPBOX "&Form\xE1t",IDC_STATIC,7,81,142,46 + LTEXT "\x8A&t\xFDl:",IDC_STATIC,13,95,46,8 COMBOBOX IDC_DIFF_STYLE,63,92,80,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Context:",IDC_STATIC,13,109,46,8 + LTEXT "&Kontext:",IDC_STATIC,13,109,46,8 COMBOBOX IDC_DIFF_CONTEXT,63,108,80,65,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP - GROUPBOX "W&hitespaces",IDC_STATIC,155,81,123,46 + GROUPBOX "&Netla\xE8ite\xBEn\xE9 znaky:",IDC_STATIC,155,81,123,46 CONTROL "Com&pare",IDC_DIFF_WHITESPACE_COMPARE,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,162,92,110,10 - CONTROL "I&gnore changes",IDC_DIFF_WHITESPACE_IGNORE,"Button", + CONTROL "I&gnoruva\x9D zmeny",IDC_DIFF_WHITESPACE_IGNORE,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,162,102,110,10 - CONTROL "Ig&nore all",IDC_DIFF_WHITESPACE_IGNOREALL,"Button", + CONTROL "Ig&norova\x9D v\x9Aetko",IDC_DIFF_WHITESPACE_IGNOREALL,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,162,112,110,10 - CONTROL "Ignor&e blank lines",IDC_DIFF_WHITESPACE_IGNOREBLANKS, + CONTROL "Ignor&ova\x9D pr\xE1zdne riadky",IDC_DIFF_WHITESPACE_IGNOREBLANKS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,134,142,10 - CONTROL "Case sensi&tive",IDC_DIFF_CASESENSITIVE,"Button", + CONTROL "&Zoh\xBEadn\xF2ova\x9D ve\xBEkos\x9D p\xEDsmen",IDC_DIFF_CASESENSITIVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,145,142,10 - CONTROL "Inclu&de command line",IDC_DIFF_INCLCMDLINE,"Button", + CONTROL "Zahrn\xFA\x9D pr\xEDkazov\xFD ria&dok",IDC_DIFF_INCLCMDLINE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,155,134,170,10 - CONTROL "Open to e&xternal editor",IDC_DIFF_OPENTOEDITOR,"Button", + CONTROL "Otvori\x9D v e&xternom editore",IDC_DIFF_OPENTOEDITOR,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,155,145,170,10 - PUSHBUTTON "Defaults",IDC_DIFF_DEFAULTS,7,159,50,14 + PUSHBUTTON "Predvolen\xE9",IDC_DIFF_DEFAULTS,7,159,50,14 DEFPUSHBUTTON "OK",IDOK,230,159,50,14 - PUSHBUTTON "Cancel",IDCANCEL,283,159,50,14 + PUSHBUTTON "Zru\x9Ai\x9D",IDCANCEL,283,159,50,14 END IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12 @@ -1039,41 +1039,41 @@ IDD_DIRCOLS DIALOGEX 0, 0, 307, 163 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Display Columns" +CAPTION "Zobrazova\x9D st\xE5pce" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Show columns",IDC_GROUP_SHOW,7,7,145,102 + GROUPBOX "Zobrazova\x9D st\xE5pce",IDC_GROUP_SHOW,7,7,145,102 LISTBOX IDC_LIST_SHOW,52,18,92,83,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "&Up",IDC_UP,15,45,30,14 - PUSHBUTTON "&Down",IDC_DOWN,15,63,30,14 - GROUPBOX "Hide columns",IDC_GROUP_HIDE,193,7,108,102 + PUSHBUTTON "&Hore",IDC_UP,15,45,30,14 + PUSHBUTTON "&Dolu",IDC_DOWN,15,63,30,14 + GROUPBOX "Skry\x9D st\xE5pce",IDC_GROUP_HIDE,193,7,108,102 LISTBOX IDC_LIST_HIDE,201,18,92,83,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "<<",IDC_ADD,159,45,27,14 PUSHBUTTON ">>",IDC_REMOVE,159,63,27,14 EDITTEXT IDC_COLDLG_DESC,7,115,294,22,ES_MULTILINE | ES_READONLY - PUSHBUTTON "Defaults",IDC_COLDLG_DEFAULTS,7,143,50,14 + PUSHBUTTON "Predvolen\xE9",IDC_COLDLG_DEFAULTS,7,143,50,14 DEFPUSHBUTTON "OK",IDOK,197,143,50,14 - PUSHBUTTON "Cancel",IDCANCEL,251,143,50,14 + PUSHBUTTON "Zru\x9Ai\x9D",IDCANCEL,251,143,50,14 END IDD_SELECTUNPACKER DIALOGEX 0, 0, 278, 102 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Select Unpacker" +CAPTION "Vyber rozba\xBEovac\xED program" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",IDOK,168,81,50,14 - PUSHBUTTON "Cancel",IDCANCEL,222,81,50,14 - LTEXT "File unpacker:",IDC_STATIC,7,9,63,8 + PUSHBUTTON "Zru\x9Ai\x9D",IDCANCEL,222,81,50,14 + LTEXT "Rozba\xBEovac\xED program:",IDC_STATIC,7,9,63,8 COMBOBOX IDC_UNPACKER_NAME,72,7,200,54,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Display all unpackers, don't check the extension", + CONTROL "Zobraz v\x9Aetky rozba\xBEovacie programy, nekontroluj pr\xEDponu", IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,72,66,200,10 - LTEXT "Extensions list:",IDC_STATIC,7,26,63,8 - LTEXT "Description:",IDC_STATIC,7,43,63,8 + LTEXT "Zoznam pr\xEDpon:",IDC_STATIC,7,26,63,8 + LTEXT "Popis:",IDC_STATIC,7,43,63,8 EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12, ES_AUTOHSCROLL | ES_READONLY EDITTEXT IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL | @@ -1084,7 +1084,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION EXSTYLE WS_EX_TOOLWINDOW -CAPTION " Folder Compare Progress" +CAPTION " Priebeh porovnania adres\xE1rov" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,167,15,83,14 @@ -1092,63 +1092,63 @@ 44,241,9 RTEXT "0",IDC_ITEMSCOMPARED,95,29,30,8 RTEXT "0",IDC_ITEMSTOTAL,95,19,30,8 - LTEXT "Comparing items...",IDC_STATIC,7,7,150,8 - LTEXT "Items compared:",IDC_STATIC,7,29,85,8 - LTEXT "Items total:",IDC_STATIC,7,19,85,8 + LTEXT "Porovn\xE1vam polo\x9Eky...",IDC_STATIC,7,7,150,8 + LTEXT "Porovnan\xFDch polo\x9Eiek:",IDC_STATIC,7,29,85,8 + LTEXT "Polo\x9Eiek celkom:",IDC_STATIC,7,19,85,8 END IDD_WMGOTO DIALOGEX 0, 0, 210, 70 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Go To" +CAPTION "Cho\xEF na" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "G&oto:",IDC_STATIC,7,9,36,8 + LTEXT "Ch&o\xEF na:",IDC_STATIC,7,9,36,8 EDITTEXT IDC_WMGOTO_PARAM,45,7,102,14,ES_AUTOHSCROLL | ES_NUMBER - GROUPBOX "File",IDC_STATIC,7,27,57,35 - CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON | + GROUPBOX "S\xFAbor",IDC_STATIC,7,27,57,35 + CONTROL "\xBC&av\xFD",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,38,48,10 - CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button", + CONTROL "&Prav\xFD",IDC_WMGOTO_FILERIGHT,"Button", BS_AUTORADIOBUTTON,13,48,47,10 - GROUPBOX "Goto what",IDC_STATIC,69,27,78,35 - CONTROL "Li&ne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON | + GROUPBOX "Cho\xEF na...",IDC_STATIC,69,... [truncated message content] |
From: <sdo...@us...> - 2006-12-02 13:17:53
|
Revision: 3885 http://svn.sourceforge.net/winmerge/?rev=3885&view=rev Author: sdottaka Date: 2006-12-02 05:17:50 -0800 (Sat, 02 Dec 2006) Log Message: ----------- BUG: [ 1603077 ] Doesn't filter the file vc60.idb using "Merge_VC_loose.flt" Modified Paths: -------------- trunk/Filters/Merge_VC_loose.flt trunk/Src/Changes.txt Modified: trunk/Filters/Merge_VC_loose.flt =================================================================== --- trunk/Filters/Merge_VC_loose.flt 2006-12-02 06:20:59 UTC (rev 3884) +++ trunk/Filters/Merge_VC_loose.flt 2006-12-02 13:17:50 UTC (rev 3885) @@ -17,7 +17,7 @@ f: \.dll$ ## Windows DLL f: \.exe$ ## Windows/DOS executable f: \.exp$ ## VC library export file -f: \\vc60.idb$ ## VC ? +f: ^vc[4-9]0\.idb$ ## VC Minimal rebuild dependency file f: \.ilk$ ## VC incremental linker memory file f: \.lib$ ## compiled libraries f: \.ncb$ ## VC parser information file (class view & component gallery stuff) Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-12-02 06:20:59 UTC (rev 3884) +++ trunk/Src/Changes.txt 2006-12-02 13:17:50 UTC (rev 3885) @@ -3,6 +3,10 @@ (This summarizes all changes to all files under Src, including Src\Languages.) 2006-12-02 Takashi + BUG: [ 1603077 ] Doesn't filter the file vc60.idb using "Merge_VC_loose.flt" + Filters: Merge_VC_loose.flt + +2006-12-02 Takashi BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly Src: DirActions.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-12-03 11:18:30
|
Revision: 3893 http://svn.sourceforge.net/winmerge/?rev=3893&view=rev Author: kimmov Date: 2006-12-03 03:18:27 -0800 (Sun, 03 Dec 2006) Log Message: ----------- PATCH: [ 1606496 ] Slovak translation (update) - Submitted by Ivan Mas?\195?\161r Modified Paths: -------------- trunk/Installer/InnoSetup/Changes.txt trunk/Installer/InnoSetup/Languages/Slovak.isl trunk/Src/Changes.txt trunk/Src/Languages/Slovak/MergeSlovak.rc Modified: trunk/Installer/InnoSetup/Changes.txt =================================================================== --- trunk/Installer/InnoSetup/Changes.txt 2006-12-03 10:59:05 UTC (rev 3892) +++ trunk/Installer/InnoSetup/Changes.txt 2006-12-03 11:18:27 UTC (rev 3893) @@ -1,3 +1,8 @@ +2006-12-03 Kimmo + PATCH: [ 1606496 ] Slovak translation (update) + Submitted by Ivan Mas\xE1r + Languages: Slovak.isl + 2006-12-01 Kimmo PATCH: [ 1606496 ] Slovak translation Submitted by Ivan Mas\xE1r Modified: trunk/Installer/InnoSetup/Languages/Slovak.isl =================================================================== --- trunk/Installer/InnoSetup/Languages/Slovak.isl 2006-12-03 10:59:05 UTC (rev 3892) +++ trunk/Installer/InnoSetup/Languages/Slovak.isl 2006-12-03 11:18:27 UTC (rev 3893) @@ -12,8 +12,10 @@ ; *** *** ; *** Tomas Falb (to...@po...) *** ; *** *** -; *** Update: 13.10.2005 *** +; *** Ivan Mas\xE1r (he...@ce...) *** ; *** *** +; *** Update: 30.11.2006 *** +; *** *** ; ****************************************************** ; ; @@ -239,56 +241,56 @@ [CustomMessages] ;Inno Setup Built-in Custom Messages NameAndVersion=%1 verzia %2 -AdditionalIcons=Dal\x9A\xED z\xE1stupcovia: -OptionalFeatures=Optional Features: -CreateDesktopIcon=Vytvorit z\xE1stupcu na &ploche -CreateQuickLaunchIcon=Vytvorit z\xE1stupcu na paneli &R\xFDchle spustenie +AdditionalIcons=\xCFal\x9A\xED z\xE1stupcovia: +OptionalFeatures=Volite\xBEn\xE9 mo\x9Enosti: +CreateDesktopIcon=Vytvori\x9D z\xE1stupcu na &ploche +CreateQuickLaunchIcon=Vytvori\x9D z\xE1stupcu na paneli &R\xFDchle spustenie ProgramOnTheWeb=Aplik\xE1cia %1 na internete -UninstallProgram=Odin\x9Atalovat aplik\xE1ciu %1 -LaunchProgram=Spustit aplik\xE1ciu %1 -AssocFileExtension=Vytvorit &asoci\xE1ciu medzi s\xFAbormi typu %2 a aplik\xE1ciou %1 +UninstallProgram=Odin\x9Atalova\x9D aplik\xE1ciu %1 +LaunchProgram=Spusti\x9D aplik\xE1ciu %1 +AssocFileExtension=Vytvori\x9D &asoci\xE1ciu medzi s\xFAbormi typu %2 a aplik\xE1ciou %1 AssocingFileExtension=Vytv\xE1ra sa asoci\xE1cia medzi s\xFAbormi typu %2 a aplik\xE1ciou %1...;Things we can also localize CompanyName=Thingamahoochie Software ;Types TypicalInstallation=Typick\xE1 in\x9Atal\xE1cia FullInstallation=Pln\xE1 in\x9Atal\xE1cia -CompactInstallation=kompaktn\xE1 in\x9Atal\xE1cia +CompactInstallation=Kompaktn\xE1 in\x9Atal\xE1cia CustomInstallation=Vlastn\xE1 in\x9Atal\xE1cia ;Components AppCoreFiles=Z\xE1kladn\xE9 s\xFAbory WinMerge -ApplicationRuntimes=S\xFAbory aplik\xE1cie vy\x9Eadovan\xE9 pocas behu -UsersGuide=Pr\xEDrucka pou\x9E\xEDvatela +ApplicationRuntimes=S\xFAbory aplik\xE1cie vy\x9Eadovan\xE9 po\xE8as behu +UsersGuide=Pr\xEDru\xE8ka pou\x9E\xEDvate\xBEa Filters=Filtre -Plugins=Z\xE1suvn\xE9 modly +Plugins=Z\xE1suvn\xE9 moduly ;Localization Components -Languages=Languages -BulgarianLanguage=Bulgarian menus and dialogs -CatalanLanguage=Catalan menus and dialogs -ChineseSimplifiedLanguage=Chinese (Simplified) menus and dialogs -ChineseTraditionalLanguage=Chinese (Traditional) menus and dialogs -CzechLanguage=Czech menus and dialogs -DanishLanguage=Danish menus and dialogs -DutchLanguage=Dutch menus and dialogs -FrenchLanguage=French menus and dialogs -GermanLanguage=German menus and dialogs -HungarianLanguage=Hungarian menus and dialogs -ItalianLanguage=Italian menus and dialogs -JapaneseLanguage=Japanese menus and dialogs -KoreanLanguage=Korean menus and dialogs -NorwegianLanguage=Norwegian menus and dialogs -PolishLanguage=Polish menus and dialogs -PortugueseLanguage=Portuguese (Brazilian) menus and dialogs -RussianLanguage=Russian menus and dialogs -SlovakLanguage=Slovak menus and dialogs -SpanishLanguage=Spanish menus and dialogs -SwedishLanguage=Swedish menus and dialogs -TurkishLanguage=Turkish menus and dialogs +Languages=Jazyky +BulgarianLanguage=Bulharsk\xE9 ponuky a dial\xF3gy +CatalanLanguage=Katal\xE1nske ponuky a dial\xF3gy +ChineseSimplifiedLanguage=\xC8\xEDnske (zjednodu\x9Aen\xE1) ponuky a dial\xF3gy +ChineseTraditionalLanguage=\xC8\xEDnske (tradi\xE8n\xE1) ponuky a dial\xF3gy +CzechLanguage=\xC8esk\xE9 ponuky a dial\xF3gy +DanishLanguage=D\xE1nske ponuky a dial\xF3gy +DutchLanguage=Holandsk\xE9 ponuky a dial\xF3gy +FrenchLanguage=Franc\xFAzske ponuky a dial\xF3gy +GermanLanguage=Nemeck\xE9 ponuky a dial\xF3gy +HungarianLanguage=Ma\xEFarsk\xE9 ponuky a dial\xF3gy +ItalianLanguage=Talianske ponuky a dial\xF3gy +JapaneseLanguage=Japonsk\xE9 ponuky a dial\xF3gy +KoreanLanguage=K\xF3rejsk\xE9 ponuky a dial\xF3gy +NorwegianLanguage=N\xF3rske ponuky a dial\xF3gy +PolishLanguage=Po\xBEsk\xE9 ponuky a dial\xF3gy +PortugueseLanguage=Portugalsk\xE9 (Brazilian) ponuky a dial\xF3gy +RussianLanguage=Rusk\xE9 ponuky a dial\xF3gy +SlovakLanguage=Slovensk\xE9 ponuky a dial\xF3gy +SpanishLanguage=\x8Apanielske ponuky a dial\xF3gy +SwedishLanguage=\x8Av\xE9dske ponuky a dial\xF3gy +TurkishLanguage=Tureck\xE9 ponuky a dial\xF3gy ;Tasks -ExplorerContextMenu=&Enable Explorer context menu integration +ExplorerContextMenu=&Zapni integr\xE1ciu do kontextovej ponuky Prieskumn\xEDka IntegrateTortoiseCVS=Integr\xE1cia s &TortoiseCVS IntegrateTortoiseSVN=Integr\xE1cia s T&ortoiseSVN IntegrateClearCase=Integr\xE1cia s Rational &ClearCase @@ -296,14 +298,15 @@ UpdatingCommonControls=Aktualizujem ovl\xE1dacie prvky syst\xE9mu ;Icon Labels -ReadMe=s\xFAbor C\xEDtaj ma! -UsersGuide=Pr\xEDrucka pou\x9E\xEDvatela +ReadMe=s\xFAbor \xC8\xEDtaj ma! +UsersGuide=Pr\xEDru\xE8ka pou\x9E\xEDvate\xBEa UpdatingCommonControls=Aktualizujem ovl\xE1dacie prvky syst\xE9mu -ViewStartMenuFolder=&Zobrazit adres\xE1r WinMerge z ponuky \x8Atart +ViewStartMenuFolder=&Zobrazi\x9D adres\xE1r WinMerge z ponuky \x8Atart PluginsText=Z\xE1suvn\xE9 moduly ;Code Dialogs -DeletePreviousStartMenu=In\x9Atal\xE1tor zistil, \x9Ee ste zmenili umiestnenie v\xE1\x9Aej ponuky \x8Atart z "%s" na "%s". \x8Eel\xE1te si zmazat predch\xE1dzaj\xFAci adres\xE1r ponuky \x8Atart? +DeletePreviousStartMenu=In\x9Atal\xE1tor zistil, \x9Ee ste zmenili umiestnenie v\xE1\x9Aej ponuky \x8Atart z "%s" na "%s". \x8Eel\xE1te si zmaza\x9D predch\xE1dzaj\xFAci adres\xE1r ponuky \x8Atart? ; Project file description ProjectFileDesc=s\xFAbor projektu WinMerge + Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-12-03 10:59:05 UTC (rev 3892) +++ trunk/Src/Changes.txt 2006-12-03 11:18:27 UTC (rev 3893) @@ -5,6 +5,9 @@ 2006-12-03 Kimmo PATCH: [ 1556688 ] Fix maketstring to check for zero-term by MultiByteToWideCha Src: Common/unicoder.cpp + PATCH: [ 1606496 ] Slovak translation (update) + Submitted by Ivan Mas\xE1r + Src/Languages/Slovak: MergeSlovak.rc 2006-12-02 Kimmo Remove commented out code Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc =================================================================== --- trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-12-03 10:59:05 UTC (rev 3892) +++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-12-03 11:18:27 UTC (rev 3893) @@ -112,16 +112,16 @@ MENUITEM "Kop\xEDrova\x9D vpravo", ID_L2R MENUITEM "Kop\xEDrova\x9D v\xBEavo", ID_R2L MENUITEM SEPARATOR - MENUITEM "&Select Line Difference", ID_SELECTLINEDIFF + MENUITEM "&Vyber riadkov\xE9 rozdiely", ID_SELECTLINEDIFF MENUITEM SEPARATOR - MENUITEM "&Sp\xE4\x9D", ID_EDIT_UNDO - MENUITEM "&Znova", ID_EDIT_REDO + MENUITEM "&Vr\xE1ti\x9D", ID_EDIT_UNDO + MENUITEM "&Opakova\x9D", ID_EDIT_REDO MENUITEM SEPARATOR MENUITEM "V&ystrihn\xFA\x9D", ID_EDIT_CUT MENUITEM "&Kop\xEDrova\x9D", ID_EDIT_COPY MENUITEM "V&lo\x9Ei\x9D", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Cho\xEF na...", ID_EDIT_WMGOTO + MENUITEM "&Cho\xEF na...", ID_EDIT_WMGOTO MENUITEM SEPARATOR POPUP "Op&en" BEGIN @@ -204,7 +204,7 @@ BEGIN MENUITEM "O&bsah...\tF1", ID_HELP_CONTENTS MENUITEM "&Index...", ID_HELP_INDEX - MENUITEM "&H\xBEadanie...", ID_HELP_SEARCH + MENUITEM "&H\xBEada\x9D...", ID_HELP_SEARCH MENUITEM SEPARATOR MENUITEM "K&onfigur\xE1cia...", ID_HELP_GETCONFIG MENUITEM "Podpora a&rch\xEDvov vypnut\xE1...", ID_HELP_MERGE7ZMISMATCH @@ -362,8 +362,8 @@ END POPUP "\xDApr&avy" BEGIN - MENUITEM "&Sp\xE4\x9D\tCtrl+Z", ID_EDIT_UNDO - MENUITEM "&Znova\tCtrl+Y", ID_EDIT_REDO + MENUITEM "&Vr\xE1ti\x9D\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&Opakova\x9D\tCtrl+Y", ID_EDIT_REDO MENUITEM SEPARATOR MENUITEM "V&ystrihn\xFA\x9D\tCtrl+X", ID_EDIT_CUT MENUITEM "&Kop\xEDrova\x9D\tCtrl+C", ID_EDIT_COPY @@ -372,12 +372,12 @@ MENUITEM "Ozna\xE8i\x9D roz&diel v riadku\tF4", ID_SELECTLINEDIFF MENUITEM "Ozna\xE8i\x9D &v\x9Aetko\tCtrl+A", ID_EDIT_SELECT_ALL MENUITEM SEPARATOR - MENUITEM "&H\xBEadaj...\tCtrl+F", ID_EDIT_FIND - MENUITEM "Nahra\xEF...\tCtrl+H", ID_EDIT_REPLACE + MENUITEM "&H\xBEada\x9D...\tCtrl+F", ID_EDIT_FIND + MENUITEM "Nahra\xEFi\x9D...\tCtrl+H", ID_EDIT_REPLACE MENUITEM SEPARATOR POPUP "&Skripty" BEGIN - MENUITEM "< Empty >", ID_NO_EDIT_SCRIPTS + MENUITEM "< Pr8zdne >", ID_NO_EDIT_SCRIPTS END MENUITEM SEPARATOR POPUP "Roz\x9A\xEDren\xE9" @@ -413,7 +413,7 @@ MENUITEM "&Panel n\xE1strojov", ID_VIEW_TOOLBAR MENUITEM "&Stavov\xFD riadok", ID_VIEW_STATUS_BAR MENUITEM "&Panel s rozdielom", ID_VIEW_DETAIL_BAR - MENUITEM "Panel &umiestnenia", ID_VIEW_LOCATION_BAR + MENUITEM "&Loka\xE8n\xFD panel", ID_VIEW_LOCATION_BAR MENUITEM SEPARATOR MENUITEM "&Jazyk...", ID_VIEW_LANGUAGE END @@ -461,9 +461,9 @@ POPUP "&Okno" BEGIN MENUITEM "Zavrie\x9D", ID_FILE_CLOSE - MENUITEM "Clo&se All", ID_WINDOW_CLOSEALL + MENUITEM "Zavrie\x9D &v\x9Aetky", ID_WINDOW_CLOSEALL MENUITEM SEPARATOR - MENUITEM "Change &Pane\tF6", ID_WINDOW_CHANGE_PANE + MENUITEM "Prepn\xFA\x9D &panel\tF6", ID_WINDOW_CHANGE_PANE MENUITEM SEPARATOR MENUITEM "Dla\x9Edice &vodorovne", ID_WINDOW_TILE_HORZ MENUITEM "Dla\x9Edice &zvislo", ID_WINDOW_TILE_VERT @@ -561,7 +561,7 @@ POPUP "Nastavenia preprocesora" BEGIN MENUITEM "&Bez preprocesora", ID_PREDIFF_MANUAL - MENUITEM "Auto preprocesor", ID_PREDIFF_AUTO + MENUITEM "&Auto preprocesor", ID_PREDIFF_AUTO END END @@ -741,7 +741,7 @@ 17,206,10 CONTROL "&Nezobrazuj sp\xFA\x9A\x9Dac\xED banner",IDC_DISABLE_SPLASH,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10 - CONTROL "Zat&v\xE1ra\x9D ok\xE1 kl\xE1vesom ESC",IDC_ESC_CLOSES_WINDOW,"Button", + CONTROL "Zat&v\xE1ra\x9D okn\xE1 kl\xE1vesom ESC",IDC_ESC_CLOSES_WINDOW,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10 CONTROL "&Automaticky overova\x9D cestu v dial\xF3gu Otvori\x9D", IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX | @@ -753,9 +753,9 @@ WS_VSCROLL | WS_TABSTOP GROUPBOX "Povo\xBE viacer\xE9 okn\xE1 pre porovnanie",IDC_STATIC,7,100, 221,37 - CONTROL "Porovnanie &adres\xE1rov",IDC_MULTIDOC_DIRCMP, + CONTROL "Porovn\xE1vanie &adres\xE1rov",IDC_MULTIDOC_DIRCMP, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10 - CONTROL "Porovnanie &s\xFAborov",IDC_MULTIDOC_FILECMP, + CONTROL "Porovn\xE1vanie &s\xFAborov",IDC_MULTIDOC_FILECMP, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10 LTEXT "WinMerge umo\x9E\xF2uje zamedzi\x9D zobrazovaniu be\x9En\xFDch spr\xE1v. Stla\xE8en\xEDm tla\xE8idla Reset sa znova spr\xE1vy zobrazia.", IDC_STATIC,7,153,168,31 @@ -853,7 +853,7 @@ IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Riakov\xE9 filtre" +CAPTION "Riadkov\xE9 filtre" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Ignoruj riadky obsahuj\xFAce nasledovn\xE9 vzorky:", @@ -896,7 +896,7 @@ CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - RTEXT "Ignored Difference:",IDC_STATIC,7,69,90,8 + RTEXT "Ignorovan\xFD rozdiel:",IDC_STATIC,7,69,90,8 CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,156,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE @@ -906,7 +906,7 @@ CONTROL "Dif",IDC_MOVEDBLOCK_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,89,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - RTEXT "Moved:",IDC_STATIC,7,89,90,8 + RTEXT "Presunut\xFD:",IDC_STATIC,7,89,90,8 CONTROL "Dif",IDC_MOVEDBLOCK_DELETED_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,156,89,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE @@ -916,21 +916,21 @@ CONTROL "Dif",IDC_SEL_MOVEDBLOCK_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - RTEXT "Selected Moved:",IDC_STATIC,7,109,90,8 + RTEXT "V\xFDbe presunut\xFD:",IDC_STATIC,7,109,90,8 CONTROL "Dif",IDC_SEL_MOVEDBLOCK_DELETED_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,156,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + RTEXT "Rozdiel v slove:",IDC_STATIC,7,129,90,8 CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + RTEXT "Rozdiel vo vybranom slove:",IDC_STATIC,7,149,90,8 CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE @@ -985,18 +985,18 @@ LTEXT "S\xFAbor&1:",IDC_STATIC,7,10,36,8 COMBOBOX IDC_DIFF_FILE1,48,7,230,93,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Preh\xBEad\xE1va\x9D...",IDC_DIFF_BROWSE_FILE1,283,7,50,14 + PUSHBUTTON "&Preh\xBEad\xE1va\x9D",IDC_DIFF_BROWSE_FILE1,283,7,50,14 LTEXT "S\xFAbor&2:",IDC_STATIC,7,27,36,8 COMBOBOX IDC_DIFF_FILE2,48,24,230,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Preh\xBEad\xE1va\x9De...",IDC_DIFF_BROWSE_FILE2,283,24,50,14 + PUSHBUTTON "Preh\xBEad\xE1va\x9D",IDC_DIFF_BROWSE_FILE2,283,24,50,14 PUSHBUTTON "&Vymeni\x9D navz\xE1jom",IDC_DIFF_SWAPFILES,283,41,50,14 CONTROL "&Roz\x9A\xEDri\x9D existuj\xFAci s\xFAbor",IDC_DIFF_APPENDFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,48,51,230,10 LTEXT "&V\xFDsledok:",IDC_STATIC,7,66,37,8 COMBOBOX IDC_DIFF_FILERESULT,48,63,230,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Preh\xBEad\xE1va\x9D...",IDC_DIFF_BROWSE_RESULT,283,63,50,14 + PUSHBUTTON "Preh\xBEad\xE1va\x9D",IDC_DIFF_BROWSE_RESULT,283,63,50,14 GROUPBOX "&Form\xE1t",IDC_STATIC,7,81,142,46 LTEXT "\x8A&t\xFDl:",IDC_STATIC,13,95,46,8 COMBOBOX IDC_DIFF_STYLE,63,92,80,68,CBS_DROPDOWNLIST | WS_VSCROLL | @@ -1005,9 +1005,9 @@ COMBOBOX IDC_DIFF_CONTEXT,63,108,80,65,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP GROUPBOX "&Netla\xE8ite\xBEn\xE9 znaky:",IDC_STATIC,155,81,123,46 - CONTROL "Com&pare",IDC_DIFF_WHITESPACE_COMPARE,"Button", + CONTROL "&Porovna\x9D",IDC_DIFF_WHITESPACE_COMPARE,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,162,92,110,10 - CONTROL "I&gnoruva\x9D zmeny",IDC_DIFF_WHITESPACE_IGNORE,"Button", + CONTROL "I&gnorova\x9D zmeny",IDC_DIFF_WHITESPACE_IGNORE,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,162,102,110,10 CONTROL "Ig&norova\x9D v\x9Aetko",IDC_DIFF_WHITESPACE_IGNOREALL,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,162,112,110,10 @@ -1160,7 +1160,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,7,7,215,10 CONTROL "Automatick\xE9 p&reskenovanie",IDC_AUTOMRESCAN_CHECK,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,17,215,10 - CONTROL "&Preserve original EOL chars",IDC_MIXED_EOL,"Button", + CONTROL "&Zachov\xE1va\x9D p\xF4vodn\xE9 zakon\xE8enie riadkov",IDC_MIXED_EOL,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,27,215,10 GROUPBOX "Tabul\xE1tory",IDC_STATIC,7,44,221,33,WS_GROUP LTEXT "&Nastavenie tabul\xE1torov:",IDC_STATIC,14,58,76,8 @@ -1312,8 +1312,8 @@ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,230,338,1 LTEXT " Kateg\xF3rie",IDC_STATIC,7,7,96,13,SS_CENTERIMAGE | SS_SUNKEN - PUSHBUTTON "Import...",IDC_TREEOPT_IMPORT,7,237,50,14 - PUSHBUTTON "Export...",IDC_TREEOPT_EXPORT,62,237,50,14 + PUSHBUTTON "Importova\x9D...",IDC_TREEOPT_IMPORT,7,237,50,14 + PUSHBUTTON "Exportova\x9D...",IDC_TREEOPT_EXPORT,62,237,50,14 END IDD_PROPPAGE_COLORS_SYNTAX DIALOGEX 0, 0, 235, 214 @@ -1322,7 +1322,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN RTEXT "K\xBE\xFA\xE8ov\xE9 slov\xE1:",IDC_STATIC,0,20,70,8 - RTEXT "N\xE1zvy funkci\xE9:",IDC_STATIC,0,40,70,8 + RTEXT "N\xE1zvy funkci\xED:",IDC_STATIC,0,40,70,8 RTEXT "koment\xE1re:",IDC_STATIC,0,60,70,8 RTEXT "\xC8\xEDsla:",IDC_STATIC,0,80,70,8 RTEXT "Oper\xE1tory:",IDC_STATIC,0,100,70,8 @@ -1570,7 +1570,7 @@ CONTROL "Len na \xE8\xEDt&anie",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10 RTEXT "&Filter:",IDC_STATIC,7,74,40,8 EDITTEXT IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL - PUSHBUTTON "Vybra\x9D...",IDC_PROJ_FILTER_SELECT,265,72,50,14 + PUSHBUTTON "Prehliada\x9D...",IDC_PROJ_FILTER_SELECT,265,72,50,14 CONTROL "&Zahrn\xFA\x9D podadres\xE1re",IDC_PROJ_INC_SUBFOLDERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10 PUSHBUTTON "Otvori\x9D...",IDC_PROJ_OPEN,211,103,50,14 @@ -1734,15 +1734,15 @@ // Generic File menu commands STRINGTABLE BEGIN - ID_FILE_NEW "Vytvori\x9D pr\xE1zdny dokument\nNov\xE9 dokumenty (Ctrl+N)" - ID_FILE_OPEN "Otvori\x9D existuj\xFAci dokument\nOtvor" - ID_FILE_CLOSE "Zatvori\x9D akt\xEDvny dokument\nZatvor" - ID_FILE_SAVE "Ulo\x9Ei\x9D akt\xEDvny dokument\nUlo\x9E" - ID_FILE_SAVE_AS "Ulo\x9Ei\x9D akt\xEDvny dokument pod nov\xFDm menom\nUlo\x9E ako" - ID_FILE_PAGE_SETUP "Zmeni\x9D parametre tla\xE8e\nNastavenie tla\xE8e" - ID_FILE_PRINT_SETUP "Zmeni\x9D tla\xE8iare\xF2 a parametre tla\xE8e\nNastavenie tla\xE8iarne" - ID_FILE_PRINT "Vytla\xE8i\x9D akt\xEDvny dokument\nTla\xE8" - ID_FILE_PRINT_PREVIEW "N\xE1h\xBEad\nN\xE1h\xBEad pred tla\xE8ou" + ID_FILE_NEW "Vytvor\xED pr\xE1zdny dokument\nNov\xE9 dokumenty (Ctrl+N)" + ID_FILE_OPEN "Otvor\xED existuj\xFAci dokument\nOtvor" + ID_FILE_CLOSE "Zatvor\xED akt\xEDvny dokument\nZatvor" + ID_FILE_SAVE "Ulo\x9E\xED akt\xEDvny dokument\nUlo\x9E" + ID_FILE_SAVE_AS "Ulo\x9E\xED akt\xEDvny dokument pod nov\xFDm menom\nUlo\x9E ako" + ID_FILE_PAGE_SETUP "Zmen\xED parametre tla\xE8e\nNastavenie tla\xE8e" + ID_FILE_PRINT_SETUP "Zmen\xED tla\xE8iare\xF2 a parametre tla\xE8e\nNastavenie tla\xE8iarne" + ID_FILE_PRINT "Vytla\xE8\xED akt\xEDvny dokument\nTla\xE8" + ID_FILE_PRINT_PREVIEW "Zobraz\xED n\xE1h\xBEad pred tla\xE8ou\nN\xE1h\xBEad pred tla\xE8ou" END STRINGTABLE @@ -1753,54 +1753,54 @@ // WinMerge Project Files STRINGTABLE BEGIN - ID_FILE_OPENPROJECT "Otvori\x9D s\xFAbor projektu\nS\xFAbor sprojektu (Ctrl+J)" + ID_FILE_OPENPROJECT "Otvor\xED s\xFAbor projektu\nS\xFAbor sprojektu (Ctrl+J)" IDS_UNK_ERROR_READING_PROJECT "Nezn\xE1ma chyba pri pokuse otvori\x9D s\xFAbor projektu" IDS_UNK_ERROR_SAVING_PROJECT "Nezn\xE1ma chyba pri pokuse ulo\x9Ei\x9D s\xFAbor projektu" IDS_PROJFILEDLG_CAPTION "S\xFAbor projektu" IDS_PROJFILE_LOAD_SUCCESS "S\xFAbor projektu \xFAspe\x9Ane na\xE8\xEDtan\xFD." IDS_PROJFILE_SAVE_SUCCESS "S\xFAbor projektu \xFAspe\x9Ane ulo\x9Een\xFD." - ID_FILE_SAVEPROJECT "Ulo\x9Ei\x9D aktu\xE1lne nastavenia a cesty do s\xFAboru projektu\nUlo\x9Ei\x9D S\xFAbor projektu" + ID_FILE_SAVEPROJECT "Ulo\x9E\xED aktu\xE1lne nastavenia a cesty do s\xFAboru projektu\nUlo\x9Ei\x9D S\xFAbor projektu" END STRINGTABLE BEGIN - ID_APP_ABOUT "Zobrazi\x9D inform\xE1cie o programe\nO programe" - ID_APP_EXIT "Ukon\xE8i\x9D program s ot\xE1zkou na ulo\x9Eenie s\xFAborov\nKoniec" + ID_APP_ABOUT "Zobraz\xED inform\xE1cie o programe\nO programe" + ID_APP_EXIT "Ukon\xE8\xED program s ot\xE1zkou na ulo\x9Eenie s\xFAborov\nKoniec" END // MRU list STRINGTABLE BEGIN - ID_FILE_MRU_FILE1 "Otvori\x9D dokument" - ID_FILE_MRU_FILE2 "Otvori\x9D dokument" - ID_FILE_MRU_FILE3 "Otvori\x9D dokument" - ID_FILE_MRU_FILE4 "Otvori\x9D dokument" - ID_FILE_MRU_FILE5 "Otvori\x9D dokument" - ID_FILE_MRU_FILE6 "Otvori\x9D dokument" - ID_FILE_MRU_FILE7 "Otvori\x9D dokument" - ID_FILE_MRU_FILE8 "Otvori\x9D dokument" - ID_FILE_MRU_FILE9 "Otvori\x9D dokument" - ID_FILE_MRU_FILE10 "Otvori\x9D dokument" - ID_FILE_MRU_FILE11 "Otvori\x9D dokument" - ID_FILE_MRU_FILE12 "Otvori\x9D dokument" - ID_FILE_MRU_FILE13 "Otvori\x9D dokument" - ID_FILE_MRU_FILE14 "Otvori\x9D dokument" - ID_FILE_MRU_FILE15 "Otvori\x9D dokument" - ID_FILE_MRU_FILE16 "Otvori\x9D dokument" + ID_FILE_MRU_FILE1 "Otvor\xED dokument" + ID_FILE_MRU_FILE2 "Otvor\xED dokument" + ID_FILE_MRU_FILE3 "Otvor\xED dokument" + ID_FILE_MRU_FILE4 "Otvor\xED dokument" + ID_FILE_MRU_FILE5 "Otvor\xED dokument" + ID_FILE_MRU_FILE6 "Otvor\xED dokument" + ID_FILE_MRU_FILE7 "Otvor\xED dokument" + ID_FILE_MRU_FILE8 "Otvor\xED dokument" + ID_FILE_MRU_FILE9 "Otvor\xED dokument" + ID_FILE_MRU_FILE10 "Otvor\xED dokument" + ID_FILE_MRU_FILE11 "Otvor\xED dokument" + ID_FILE_MRU_FILE12 "Otvor\xED dokument" + ID_FILE_MRU_FILE13 "Otvor\xED dokument" + ID_FILE_MRU_FILE14 "Otvor\xED dokument" + ID_FILE_MRU_FILE15 "Otvor\xED dokument" + ID_FILE_MRU_FILE16 "Otvor\xED dokument" END STRINGTABLE BEGIN - ID_NEXT_PANE "Prepn\xFA\x9D na \xEFal\x9Aie okno\n\xCFal\x9Aie okno" - ID_PREV_PANE "Prepn\xFA\x9D na predch\xE1dzaj\xFAce okno\nPredch\xE1dzaj\xFAce okno" + ID_NEXT_PANE "Prepne na \xEFal\x9Aie okno\n\xCFal\x9Aie okno" + ID_PREV_PANE "Prepne na predch\xE1dzaj\xFAce okno\nPredch\xE1dzaj\xFAce okno" END // Generic window menu commands STRINGTABLE BEGIN - ID_WINDOW_NEW "Otvori\x9D \xEFal\x9Aie okno s aktu\xE1lnym dokumentom\nNov\xE9 okno" - ID_WINDOW_ARRANGE "Usporiada\x9D ikony na spodnom okraji okna\nUsporiadaj ikony" - ID_WINDOW_CASCADE "Kask\xE1da\nKask\xE1da" + ID_WINDOW_NEW "Otvor\xED \xEFal\x9Aie okno s aktu\xE1lnym dokumentom\nNov\xE9 okno" + ID_WINDOW_ARRANGE "Usporiada ikony na spodnom okraji okna\nUsporiadaj ikony" + ID_WINDOW_CASCADE "Usporiada otvoren\xE9 okn\xE1 kask\xE1dovito\nKask\xE1da" ID_WINDOW_TILE_HORZ "Dla\x9Edice vodorovne\nDla\x9Edice" ID_WINDOW_TILE_VERT "Dla\x9Edice zvislo\nDla\x9Edice" ID_WINDOW_SPLIT "Rozdeli\x9D akt\xEDvne okno\nRozdeli\x9D" @@ -1809,17 +1809,17 @@ // Generic Edit commands STRINGTABLE BEGIN - ID_EDIT_CLEAR "Vymaza\x9D ozna\xE8en\xE9\nZmaza\x9D" - ID_EDIT_CLEAR_ALL "Zmaza\x9D v\x9Aetko\nZmaza\x9D v\x9Aetko" - ID_EDIT_COPY "Kop\xEDrova\x9D ozna\xE8en\xE9 do schr\xE1nky\nKop\xEDrova\x9D" - ID_EDIT_CUT "Presun\xFA\x9D ozna\xE8en\xE9 do schr\xE1nky\nVystrihn\xFA\x9D" - ID_EDIT_FIND "N\xE1js\x9D text\nN\xE1jdi" - ID_EDIT_PASTE "Vlo\x9Ei\x9D obsah schr\xE1nky\nVlo\x9Ei\x9D" - ID_EDIT_REPEAT "Opakova\x9D posledn\xFA akciu\nOpakuj" - ID_EDIT_REPLACE "Nahradi\x9D text\nNahradi\x9D" - ID_EDIT_SELECT_ALL "Ozna\xE8i\x9D v\x9Aetko\nOzna\xE8i\x9D v\x9Aetko" - ID_EDIT_UNDO "Vr\xE1ti\x9D posledn\xFA \xE8innos\x9D\nVr\xE1ti\x9D" - ID_EDIT_REDO "Opakova\x9D posledn\xFA odvolan\xFA \xE8innos\x9D\nZnovu" + ID_EDIT_CLEAR "Zma\x9Ee ozna\xE8en\xE9\nZmaza\x9D" + ID_EDIT_CLEAR_ALL "Zma\x9Ee v\x9Aetko\nZmaza\x9D v\x9Aetko" + ID_EDIT_COPY "Skop\xEDruje ozna\xE8en\xE9 do schr\xE1nky\nKop\xEDrova\x9D" + ID_EDIT_CUT "Presununie ozna\xE8en\xE9 do schr\xE1nky\nVystrihn\xFA\x9D" + ID_EDIT_FIND "Vyh\xBEad\xE1 text\nN\xE1jdi" + ID_EDIT_PASTE "Vlo\x9E\xED obsah schr\xE1nky\nVlo\x9Ei\x9D" + ID_EDIT_REPEAT "Zopakuje posledn\xFA akciu\nOpakuj" + ID_EDIT_REPLACE "Nahrad\xED text\nNahradi\x9D" + ID_EDIT_SELECT_ALL "Ozna\xE8\xED v\x9Aetko\nOzna\xE8i\x9D v\x9Aetko" + ID_EDIT_UNDO "Vr\xE1ti posledn\xFA \xE8innos\x9D\nVr\xE1ti\x9D" + ID_EDIT_REDO "Zopakuje posledn\xFA vr\xE1ten\xFA \xE8innos\x9D\nOpakova\x9D" END // View bar commands @@ -1919,7 +1919,7 @@ STRINGTABLE BEGIN IDS_OPTIONSPG_GENERAL "V\x9Aeobecn\xE9" - IDS_OPTIONSPG_COMPARE "Porovnanie" + IDS_OPTIONSPG_COMPARE "Porovn\xE1vanie" IDS_OPTIONSPG_EDITOR "Editor" IDS_OPTIONSPG_COLORS "Farby" IDS_OPTIONSPG_SYNTAXCOLORS "Farby syntaxe" @@ -2040,7 +2040,7 @@ STRINGTABLE BEGIN IDS_DIRECTORY_WINDOW_TITLE "V\xFDsledok porovnania adres\xE1rov" - IDS_FILE_COMPARISON_TITLE "Porovnanie s\xFAborov" + IDS_FILE_COMPARISON_TITLE "Porovn\xE1vanie s\xFAborov" IDS_EMPTY_LEFT_FILE "Nepomenovan\xFD \xBEav\xFD" IDS_EMPTY_RIGHT_FILE "Nepomenovan\xFD prav\xFD" END @@ -2151,8 +2151,8 @@ IDS_VCS_VSS4 "Visual SourceSafe (men\x9Aie ako 5.0)" IDS_VCS_VSS5 "Visual SourceSafe (5.0 a vy\x9A\x9Aie)" IDS_VCS_CLEARCASE "Rational ClearCase" - IDS_BREAK_ON_WHITESPACE "Preru\x9Ai\x9D na bielom znaku" - IDS_BREAK_ON_PUNCTUATION "Preru\x9Ai\x9D na bielom znaku alebo vetnej diakritike" + IDS_BREAK_ON_WHITESPACE "Preru\x9Ai\x9D na netla\xE8ite\xBEnom znaku" + IDS_BREAK_ON_PUNCTUATION "Preru\x9Ai\x9D na netla\xE8ite\xBEnom znaku alebo vetnej diakritike" END // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK) @@ -2415,7 +2415,7 @@ // FILE COMPARE: PANE CAPTIONS STRINGTABLE BEGIN - IDS_LOCBAR_CAPTION "Panel miesta" + IDS_LOCBAR_CAPTION "Loka\xE8n\xFD panel" IDS_DIFFBAR_CAPTION "Panel rozdielu" END @@ -2778,32 +2778,32 @@ // FILE MENU STRINGTABLE BEGIN - ID_FILE_SAVE_LEFT "Ulo\x9Ei\x9D s\xFAbor v\xBEavo" - ID_FILE_SAVE_RIGHT "Ulo\x9Ei\x9D s\xFAbor vpravo" - ID_FILE_SAVEAS_LEFT "Ulo\x9Ei\x9D \xBEav\xFD s\xFAbor pod n\xE1zvom..." - ID_FILE_SAVEAS_RIGHT "Ulo\x9Ei\x9D prav\xFD s\xFAbor pod n\xE1zvom..." - ID_FILE_LEFT_READONLY "Zmeni\x9D stav \xBEav\xE9ho len na \xE8\xEDtanie s\xFAboru/adres\xE1ra" - ID_FILE_RIGHT_READONLY "Zmeni\x9D stav prav\xE9ho len na \xE8\xEDtanie s\xFAboru/adres\xE1ra" - ID_EOL_TO_DOS "Konvertova\x9D koniec riadka na \x9At\xFDl DOS" - ID_EOL_TO_UNIX "Konvertova\x9D koniec riadka na \x9At\xFDl UNIX" - ID_EOL_TO_MAC "Konvertova\x9D koniec riadka na \x9At\xFDl MAC" - ID_FILE_MERGINGMODE "Prepn\xFA\x9D medzi re\x9Eimami upravovania a sp\xE1jania" - ID_FILE_ENCODING "Zobrazi\x9D a nastavi\x9D vlastnosti k\xF3dovania s\xFAborov\nVlastnosti k\xF3dovania s\xFAborov" + ID_FILE_SAVE_LEFT "Ulo\x9E\xED s\xFAbor v\xBEavo" + ID_FILE_SAVE_RIGHT "Ulo\x9E\xED s\xFAbor vpravo" + ID_FILE_SAVEAS_LEFT "Ulo\x9E\xED \xBEav\xFD s\xFAbor pod n\xE1zvom..." + ID_FILE_SAVEAS_RIGHT "Ulo\x9E\xED prav\xFD s\xFAbor pod n\xE1zvom..." + ID_FILE_LEFT_READONLY "Zmen\xED stav \xBEav\xE9ho len na \xE8\xEDtanie s\xFAboru/adres\xE1ra" + ID_FILE_RIGHT_READONLY "Zmen\xED stav prav\xE9ho len na \xE8\xEDtanie s\xFAboru/adres\xE1ra" + ID_EOL_TO_DOS "Skonvertuje koniec riadka na \x9At\xFDl DOS" + ID_EOL_TO_UNIX "Skonvertuje koniec riadka na \x9At\xFDl UNIX" + ID_EOL_TO_MAC "Skonvertuje koniec riadka na \x9At\xFDl MAC" + ID_FILE_MERGINGMODE "Prepne medzi re\x9Eimami upravovania a sp\xE1jania" + ID_FILE_ENCODING "Zobraz\xED a nastav\xED vlastnosti k\xF3dovania s\xFAborov\nVlastnosti k\xF3dovania s\xFAborov" END // EDIT MENU STRINGTABLE BEGIN - ID_SELECTLINEDIFF "Vybra\x9D oblas\x9D rozdielu na aktu\xE1lnom riadku\nRozdiel na aktu\xE1lnom riadku" - ID_EDIT_WMGOTO "Cho\xEF na riadok alebo rozdiel\nCho\xEF na (Ctrl+G)" - ID_OPTIONS "Nastavi\x9D mo\x9Enosti programu\nMo\x9Enosti" - ID_REFRESH "Obnovi\x9D zobrazenie\nObnovi\x9D (F5)" - ID_EDIT_COPY_LINENUMBERS "Skop\xEDrova\x9D vybran\xE9 riadky do schr\xE1nky s pridan\xFDm \xE8\xEDslom riadka na za\xE8iatok" - ID_DIR_RESCAN "Obnovi\x9D zvolen\xE9 polo\x9Eky" - ID_EDIT_TOGGLE_BOOKMARK "Prepn\xFA\x9D z\xE1lo\x9Eku" - ID_EDIT_GOTO_NEXT_BOOKMARK "Cho\xEF na \xEFal\x9Aiu z\xE1lo\x9Eku" - ID_EDIT_GOTO_PREV_BOOKMARK "Cho\xEF na predo\x9Al\xFA z\xE1lo\x9Eku" - ID_EDIT_CLEAR_ALL_BOOKMARKS "Vyma\x9E v\x9Aetky z\xE1lo\x9Eky" + ID_SELECTLINEDIFF "Vyberie oblas\x9D rozdielu na aktu\xE1lnom riadku\nRozdiel na aktu\xE1lnom riadku" + ID_EDIT_WMGOTO "Ide na riadok alebo rozdiel\nCho\xEF na (Ctrl+G)" + ID_OPTIONS "Nastav\xED mo\x9Enosti programu\nMo\x9Enosti" + ID_REFRESH "Obnov\xED zobrazenie\nObnovi\x9D (F5)" + ID_EDIT_COPY_LINENUMBERS "Skop\xEDruje vybran\xE9 riadky do schr\xE1nky s pridan\xFDm \xE8\xEDslom riadka na za\xE8iatok" + ID_DIR_RESCAN "Obnov\xED zvolen\xE9 polo\x9Eky" + ID_EDIT_TOGGLE_BOOKMARK "Prepne z\xE1lo\x9Eku" + ID_EDIT_GOTO_NEXT_BOOKMARK "Ide na \xEFal\x9Aiu z\xE1lo\x9Eku" + ID_EDIT_GOTO_PREV_BOOKMARK "Ide na predo\x9Al\xFA z\xE1lo\x9Eku" + ID_EDIT_CLEAR_ALL_BOOKMARKS "Vyma\x9Ee v\x9Aetky z\xE1lo\x9Eky" END // VIEW MENU (ITEM TYPE) @@ -2820,43 +2820,43 @@ // VIEW MENU STRINGTABLE BEGIN - ID_VIEW_SELECTFONT "Vybra\x9D font pre zobrazenie\nFont pre zobrazenie" - ID_VIEW_USEDEFAULTFONT "N\xE1vrat k pou\x9E\xEDvaniu predvolen\xE9ho syst\xE9mov\xE9ho fontu pre zobrazenie\nPredvolen\xFD font" - ID_VIEW_WHITESPACE "Zobrazuje pr\xE1zdne znaky" - ID_VIEW_DETAIL_BAR "Prepn\xFA\x9D panel rozdielov" - ID_VIEW_LOCATION_BAR "Loka\xE8n\xFD panel zobrazuje celkov\xFD obraz s\xFAborov" - ID_VIEW_DIR_STATISTICS "Zobrazi\x9D dial\xF3g \x9Atatistika porovnania adres\xE1rov" - ID_VIEW_LANGUAGE "Zvoli\x9D jazyk pou\x9E\xEDvate\xBEsk\xE9ho rozhrania\nJazyk" - ID_VIEW_LINEDIFFS "Zobrazuje rozdiely v r\xE1mci riadka odli\x9Anou farbou\nZobrazi\x9D rozdiel v riadku" - ID_VIEW_SWAPPANES "Vymeni\x9D polohu dvoch panelov" + ID_VIEW_SELECTFONT "Vyberie font pre zobrazenie\nFont pre zobrazenie" + ID_VIEW_USEDEFAULTFONT "Vr\xE1ti sa k pou\x9E\xEDvaniu predvolen\xE9ho syst\xE9mov\xE9ho fontu pre zobrazenie\nPredvolen\xFD font" + ID_VIEW_WHITESPACE "Zobraz\xED pr\xE1zdne znaky" + ID_VIEW_DETAIL_BAR "Prepne panel rozdielov" + ID_VIEW_LOCATION_BAR "Loka\xE8n\xFD panel zobraz\xED celkov\xFD obraz s\xFAborov" + ID_VIEW_DIR_STATISTICS "Zobraz\xED dial\xF3g \x9Atatistika porovnania adres\xE1rov" + ID_VIEW_LANGUAGE "Vyber\xE1 jazyk pou\x9E\xEDvate\xBEsk\xE9ho rozhrania\nJazyk" + ID_VIEW_LINEDIFFS "Zobraz\xED rozdiely v r\xE1mci riadka odli\x9Anou farbou\nZobrazi\x9D rozdiel v riadku" + ID_VIEW_SWAPPANES "Vymen\xED polohu dvoch panelov" ID_VIEW_LINENUMBERS "Zobraz\xED \xE8\xEDsla riadkov\nZobrazi\x9D \xE8\xEDsla riadkov" - ID_VIEW_WORDWRAP "Zapn\xFA\x9D zalamovanie riadkov na hranici slov\nZalamova\x9D riadky" + ID_VIEW_WORDWRAP "Zapne zalamovanie riadkov na hranici slov\nZalamova\x9D riadky" END // MERGE MENU STRINGTABLE BEGIN - ID_PREVDIFF "Sko\xE8i\x9D na predch\xE1dzaj\xFAci rozdiel\nPrev Diff (Shift+Tab)" - ID_NEXTDIFF "Sko\xE8i\x9D na \xEFal\x9A\xED rozdiel\nNext Diff (Tab)" - ID_FIRSTDIFF "Presun\xFA\x9D na prv\xFD rozdiel\nFirst Diff (Alt+Home)" - ID_CURDIFF "Presun\xFA\x9D na aktu\xE1lny rozdiel\nCurrent Diff (Alt+Enter)" - ID_LASTDIFF "Presun\xFA\x9D na posledn\xFD rozdiel\nLast Diff (Alt+End)" - ID_L2R "Skop\xEDrova\x9D vybran\xFD text do s\xFAboru vpravo\nKop\xEDruj vpravo (->)" - ID_R2L "Skop\xEDrova\x9D vybran\xFD text do s\xFAboru v\xBEavo\nKop\xEDruj v\xBEavo (<-)" - ID_L2RNEXT "Skop\xEDrova\x9D rozdiel napravo a prejs\x9D na \xEFal\x9A\xED\nSkop\xEDrova\x9D doprava a na \xEFal\x9A\xED (Ctrl+Alt+vpravo)" - ID_R2LNEXT "Skop\xEDrova\x9D rozdiel na\xBEavo a prejs\x9D na \xEFal\x9A\xED\nSkop\xEDrova\x9D do\xBEava a na \xEFal\x9A\xED (Ctrl+Alt+v\xBEavo)" - ID_ALL_RIGHT "Skop\xEDrova\x9D v\x9Aetky rozdiely do s\xFAboru vpravo\nV\x9Aetko vpravo" - ID_ALL_LEFT "Skop\xEDrova\x9D v\x9Aetky rozdiely do s\xFAboru v\xBEavo\nV\x9Aetko v\xBEavo" - ID_MERGE_DELETE "Zmaza\x9D vybran\xE9 polo\x9Eky z oboch adres\xE1rov" - ID_MERGE_COMPARE "Porovna\x9D vybran\xE9 polo\x9Eky (porovna\x9D prv\xFA polo\x9Eku, ak s\xFA zvolen\xE9 viacer\xE9 polo\x9Eky)" + ID_PREVDIFF "Sko\xE8\xED na predch\xE1dzaj\xFAci rozdiel\nPrev Diff (Shift+Tab)" + ID_NEXTDIFF "Sko\xE8\xED na \xEFal\x9A\xED rozdiel\nNext Diff (Tab)" + ID_FIRSTDIFF "Presunie na prv\xFD rozdiel\nFirst Diff (Alt+Home)" + ID_CURDIFF "Presunie na aktu\xE1lny rozdiel\nCurrent Diff (Alt+Enter)" + ID_LASTDIFF "Presunie na posledn\xFD rozdiel\nLast Diff (Alt+End)" + ID_L2R "Skop\xEDruje vybran\xFD text do s\xFAboru vpravo\nKop\xEDruj vpravo (->)" + ID_R2L "Skop\xEDruje vybran\xFD text do s\xFAboru v\xBEavo\nKop\xEDruj v\xBEavo (<-)" + ID_L2RNEXT "Skop\xEDruje rozdiel napravo a prejde na \xEFal\x9A\xED\nSkop\xEDrova\x9D doprava a na \xEFal\x9A\xED (Ctrl+Alt+vpravo)" + ID_R2LNEXT "Skop\xEDruje rozdiel na\xBEavo a prejde na \xEFal\x9A\xED\nSkop\xEDrova\x9D do\xBEava a na \xEFal\x9A\xED (Ctrl+Alt+v\xBEavo)" + ID_ALL_RIGHT "Skop\xEDruje v\x9Aetky rozdiely do s\xFAboru vpravo\nV\x9Aetko vpravo" + ID_ALL_LEFT "Skop\xEDrujde v\x9Aetky rozdiely do s\xFAboru v\xBEavo\nV\x9Aetko v\xBEavo" + ID_MERGE_DELETE "Zma\x9Ee vybran\xE9 polo\x9Eky z oboch adres\xE1rov" + ID_MERGE_COMPARE "Porovn\xE1 vybran\xE9 polo\x9Eky (ak s\xFA zvolen\xE9 viacer\xE9 polo\x9Eky, porovn\xE1 prv\xFA polo\x9Eku)" END // TOOLS MENU STRINGTABLE BEGIN - ID_TOOLS_CUSTOMIZECOLUMNS "Vybra\x9D a zmeni\x9D poradie st\xE5pcov pre porovnanie adres\xE1rov" - ID_TOOLS_GENERATEPATCH "Vytvori\x9D patch s\xFAbor" - ID_TOOLS_FILTERS "Vybra\x9D a modifikova\x9D filtre" + ID_TOOLS_CUSTOMIZECOLUMNS "Vyberie a zmen\xED poradie st\xE5pcov pre porovnanie adres\xE1rov" + ID_TOOLS_GENERATEPATCH "Vytvor\xED patch s\xFAbor" + ID_TOOLS_FILTERS "Vyberie a modifikuje filtre" ID_TOOLS_GENERATEREPORT "Vytvor\xED spr\xE1vu z v\xFDsledkov porovnania" END @@ -2869,7 +2869,7 @@ ID_NO_PREDIFFER "Bez predspracovania (be\x9En\xE9)" ID_SUGGESTED_PLUGINS "Odpor\xFA\xE8an\xE9 z\xE1suvn\xE9 moduly" ID_NOT_SUGGESTED_PLUGINS "In\xE9 z\xE1suvn\xE9 moduly" - ID_RELOAD_PLUGINS "Odobra\x9D z pam\xE4ti v\x9Aetky z\xE1suvn\xE9 moduly a znovu ich na\xE8\xEDta\x9D (pre v\xFDvoj\xE1rov)" + ID_RELOAD_PLUGINS "Odoberie z pam\xE4ti v\x9Aetky z\xE1suvn\xE9 moduly a znovu ich na\xE8\xEDta (pre v\xFDvoj\xE1rov)" END // WINDOW MENU @@ -2882,9 +2882,9 @@ // HELP MENU STRINGTABLE BEGIN - ID_HELP_CONTENTS "Zobrazi\x9D Pomocn\xEDka pre program WinMerge\nPomoc" + ID_HELP_CONTENTS "Zobraz\xE1 Pomocn\xEDka pre program WinMerge\nPomoc" ID_HELP_GETCONFIG "Vyp\xED\x9Ae aktu\xE1lne inform\xE1cie o verzii a konfigur\xE1cii WinMerge do textov\xE9ho s\xFAboru" - ID_HELP_GNULICENSE "Zobrazi\x9D GNU licenciu" + ID_HELP_GNULICENSE "Zobraz\xE1 GNU licenciu" IDS_PRIVATEBUILD_FMT "S\xFAkromn\xE9 zostavenie: %1" ID_HELP_INDEX "Otv\xE1ra Obsah Pomocn\xEDka WinMerge\nObsah Pomocn\xEDka" ID_HELP_SEARCH "Otv\xE1ra Vyh\xBEad\xE1vanie Pomocn\xEDka WinMerge\nVyh\xBEad\xE1vanie Pomocn\xEDka" @@ -2898,25 +2898,25 @@ ID_PREDIFF_AUTO "Preprocessing, ak sa d\xE1" ID_NO_EDIT_SCRIPTS "< Pr\xE1zdne >" ID_NO_SCT_SCRIPTS "WSH nen\xE1jden\xE9 - .sct skripty vypnut\xE9" - IDS_USERCHOICE_NONE "<\x8Eiadne>" + IDS_USERCHOICE_NONE "<\x8Eiadny>" IDS_USERCHOICE_AUTOMATIC "<Automatick\xE9>" END // FILE COMPARE CONTEXT MENU STRINGTABLE BEGIN - ID_FILE_OPEN_REGISTERED "Otvor s\xFAbor registrovanou aplik\xE1ciou" - ID_FILE_OPEN_WITHEDITOR "Otvor s\xFAbor extern\xFDm editorom" - ID_FILE_OPEN_WITH "Otvor s\xFAbor konkr\xE9tnym programom" + ID_FILE_OPEN_REGISTERED "Otvor\xED s\xFAbor registrovanou aplik\xE1ciou" + ID_FILE_OPEN_WITHEDITOR "Otvor\xED s\xFAbor extern\xFDm editorom" + ID_FILE_OPEN_WITH "Otvor\xED s\xFAbor konkr\xE9tnym programom" END // LOCATIONBAR CONTEXT MENU STRINGTABLE BEGIN - ID_DISPLAY_MOVED_NONE "Nezobrazuj presunut\xE9 bloky" - ID_DISPLAY_MOVED_ALL "Zobrazuj v\x9Aetky presunut\xE9 bloky" - ID_DISPLAY_MOVED_FOLLOW_DIFF "Zobrazuj presunut\xE9 bloky iba z aktu\xE1lneho rozdielu" - ID_LOCBAR_GOTODIFF "Cho\xEF na rozdiel, ktor\xFD je pod kurzorom" + ID_DISPLAY_MOVED_NONE "Nezobrazuje presunut\xE9 bloky" + ID_DISPLAY_MOVED_ALL "Zobrazuje v\x9Aetky presunut\xE9 bloky" + ID_DISPLAY_MOVED_FOLLOW_DIFF "Zobrazuje presunut\xE9 bloky iba z aktu\xE1lneho rozdielu" + ID_LOCBAR_GOTODIFF "Ide na rozdiel, ktor\xFD je pod kurzorom" ID_LOCBAR_GOTODIFF_FMT "Ch&o\xEF na rozdiel %1 z %2" ID_LOCBAR_GOTOLINE_FMT "Ch&o\xEF na riadok %1" END @@ -2924,7 +2924,7 @@ // AUTOCOMPLETE COMBOBOX OPTIONS STRINGTABLE BEGIN - IDS_AUTOCOMPLETE_DISABLED "Vypnut\xFD" + IDS_AUTOCOMPLETE_DISABLED "Vypnut\xE9" IDS_AUTOCOMPLETE_FILE_SYS "Zo s\xFAborov\xE9ho syst\xE9mu" IDS_AUTOCOMPLETE_MRU "Zo zoznamu ned\xE1vno pou\x9Eit\xFDch" END This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-12-05 16:46:27
|
Revision: 3917 http://svn.sourceforge.net/winmerge/?rev=3917&view=rev Author: kimmov Date: 2006-12-05 08:46:16 -0800 (Tue, 05 Dec 2006) Log Message: ----------- PATCH: [ 1557295 ] Exclude Source Control files and directories filter - Submitted by Paul Welter Modified Paths: -------------- trunk/Src/Changes.txt Added Paths: ----------- trunk/Filters/SourceControl.flt Added: trunk/Filters/SourceControl.flt =================================================================== --- trunk/Filters/SourceControl.flt (rev 0) +++ trunk/Filters/SourceControl.flt 2006-12-05 16:46:16 UTC (rev 3917) @@ -0,0 +1,20 @@ +## This is a directory/file filter for WinMerge +## This filter lets through only files ASP.NET developers care about +name: Exclude Source Control +desc: Exclude Source Control files and directories + +## This is an inclusive (loose) filter +## (it lets through everything not specified) +def: include + + +## Filters for filenames begin with f: +## Filters for directories begin with d: +## (Inline comments begin with " ##" and extend to the end of the line) + +f: *\.*scc$ ## Visual SourceSafe files +d: \\\.svn$ ## Subversion working copy +d: \\_svn$ ## Subversion working copy ASP.NET Hack +d: \\cvs$ ## CVS control directory + + Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-12-05 16:39:31 UTC (rev 3916) +++ trunk/Src/Changes.txt 2006-12-05 16:46:16 UTC (rev 3917) @@ -6,6 +6,9 @@ PATCH: [ 1608846 ] Create a class for moved blocks Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp MergeDoc.cpp MergeDoc.h Src new files: MovedLines.cpp MovedLines.h + PATCH: [ 1557295 ] Exclude Source Control files and directories filter + Submitted by Paul Welter + Filters new file: SourceControl.flt 2006-12-04 Tim PATCH: [ 1607193 ] INI Syntax Improvements This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-12-05 16:51:59
|
Revision: 3918 http://svn.sourceforge.net/winmerge/?rev=3918&view=rev Author: kimmov Date: 2006-12-05 08:51:54 -0800 (Tue, 05 Dec 2006) Log Message: ----------- Add Peter Welter and Ivan Mas?\195?\161r to contributors Modified Paths: -------------- trunk/Docs/Users/Contributors.txt trunk/Src/Changes.txt Modified: trunk/Docs/Users/Contributors.txt =================================================================== --- trunk/Docs/Users/Contributors.txt 2006-12-05 16:46:16 UTC (rev 3917) +++ trunk/Docs/Users/Contributors.txt 2006-12-05 16:51:54 UTC (rev 3918) @@ -86,6 +86,7 @@ * Slovak: Majvan + Ivan Mas\xE1r * Spanish: Jes\xFAs M. Delgado 'MacK' @@ -120,9 +121,9 @@ * Philippe Verdy * Vikrant * Gilbert Wellisch +* Paul Welter - WinMerge includes code from: * Brent Corkum (BCMenu) * Paul DiLascia (CStaticLink) Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-12-05 16:46:16 UTC (rev 3917) +++ trunk/Src/Changes.txt 2006-12-05 16:51:54 UTC (rev 3918) @@ -9,6 +9,8 @@ PATCH: [ 1557295 ] Exclude Source Control files and directories filter Submitted by Paul Welter Filters new file: SourceControl.flt + Add Peter Welter and Ivan Mas\xE1r to contributors + Docs/Users: Contributors.txt 2006-12-04 Tim PATCH: [ 1607193 ] INI Syntax Improvements This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-12-20 18:17:29
|
Revision: 3988 http://svn.sourceforge.net/winmerge/?rev=3988&view=rev Author: kimmov Date: 2006-12-20 10:17:28 -0800 (Wed, 20 Dec 2006) Log Message: ----------- Bump ShellExtension version to 1.10 Modified Paths: -------------- trunk/ShellExtension/ShellExtension.rc trunk/Src/Changes.txt Modified: trunk/ShellExtension/ShellExtension.rc =================================================================== --- trunk/ShellExtension/ShellExtension.rc 2006-12-20 18:14:15 UTC (rev 3987) +++ trunk/ShellExtension/ShellExtension.rc 2006-12-20 18:17:28 UTC (rev 3988) @@ -224,8 +224,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,9,0,0 - PRODUCTVERSION 1,9,0,0 + FILEVERSION 1,10,0,0 + PRODUCTVERSION 1,10,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -243,7 +243,7 @@ VALUE "Comments", "\0" VALUE "CompanyName", "\0" VALUE "FileDescription", "ShellExtension Module\0" - VALUE "FileVersion", "1.9.0.0\0" + VALUE "FileVersion", "1.10.0.0\0" VALUE "InternalName", "ShellExtension\0" VALUE "LegalCopyright", "Copyright 2003-2006\0" VALUE "LegalTrademarks", "\0" @@ -251,7 +251,7 @@ VALUE "OriginalFilename", "ShellExtension.DLL\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "ShellExtension Module\0" - VALUE "ProductVersion", "1.9.0.0\0" + VALUE "ProductVersion", "1.10.0.0\0" VALUE "SpecialBuild", "\0" END END Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-12-20 18:14:15 UTC (rev 3987) +++ trunk/Src/Changes.txt 2006-12-20 18:17:28 UTC (rev 3988) @@ -6,6 +6,8 @@ BUG: [ 1606583 ] VC6 build is broken Backout of patch [ 1603769 ] Send MergeCmdLineInfo between instances Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h + Bump ShellExtension version to 1.10 + ShellExtension: ShellExtension.rc 2006-12-19 Kimmo PATCH: [ 1618358 ] Fix warning about non-standard extension with enum This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2006-12-20 20:22:55
|
Revision: 3989 http://svn.sourceforge.net/winmerge/?rev=3989&view=rev Author: kimmov Date: 2006-12-20 12:22:51 -0800 (Wed, 20 Dec 2006) Log Message: ----------- BUG: [ 1619689 ] Filefilter: ASP.NET Devel Modified Paths: -------------- trunk/Filters/ASPNET.flt trunk/Src/Changes.txt Modified: trunk/Filters/ASPNET.flt =================================================================== --- trunk/Filters/ASPNET.flt 2006-12-20 18:17:28 UTC (rev 3988) +++ trunk/Filters/ASPNET.flt 2006-12-20 20:22:51 UTC (rev 3989) @@ -12,7 +12,9 @@ ## (Inline comments begin with " ##" and extend to the end of the line) f: \.xml$ -f: \.xlst$ +f: \.xlst$ +f: \.xsl$ +f: \.xslt$ f: \.dtd$ f: \.html$ f: \.htm$ Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-12-20 18:17:28 UTC (rev 3988) +++ trunk/Src/Changes.txt 2006-12-20 20:22:51 UTC (rev 3989) @@ -8,6 +8,8 @@ Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h Bump ShellExtension version to 1.10 ShellExtension: ShellExtension.rc + BUG: [ 1619689 ] Filefilter: ASP.NET Devel + Filters: ASPNET.flt 2006-12-19 Kimmo PATCH: [ 1618358 ] Fix warning about non-standard extension with enum This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2007-01-14 19:40:49
|
Revision: 4041 http://svn.sourceforge.net/winmerge/?rev=4041&view=rev Author: kimmov Date: 2007-01-14 11:40:42 -0800 (Sun, 14 Jan 2007) Log Message: ----------- Update manual URL point to 2.6 version manual in readme.txt Modified Paths: -------------- trunk/Docs/Users/Languages/ReadMe-Bulgarian.txt trunk/Docs/Users/Languages/ReadMe-Catalan.txt trunk/Docs/Users/Languages/ReadMe-Spanish.txt trunk/Docs/Users/Languages/ReadMe-Swedish.txt trunk/Docs/Users/ReadMe.txt trunk/Src/Changes.txt Modified: trunk/Docs/Users/Languages/ReadMe-Bulgarian.txt =================================================================== --- trunk/Docs/Users/Languages/ReadMe-Bulgarian.txt 2007-01-13 14:32:56 UTC (rev 4040) +++ trunk/Docs/Users/Languages/ReadMe-Bulgarian.txt 2007-01-14 19:40:42 UTC (rev 4041) @@ -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://www.winmerge.org/2.4/manual/quickstart.html +http://www.winmerge.org/2.6/manual/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\xF2 \xED\xE0 \xE0\xE4\xF0\xE5\xF1: -http://www.winmerge.org/2.4/manual/ +http://www.winmerge.org/2.6/manual/ \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 \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://www.winmerge.org/ (\xE2\xE8\xE6\xF2\xE5 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0\xF6\xE8\xFF\xF2\xE0) Modified: trunk/Docs/Users/Languages/ReadMe-Catalan.txt =================================================================== --- trunk/Docs/Users/Languages/ReadMe-Catalan.txt 2007-01-13 14:32:56 UTC (rev 4040) +++ trunk/Docs/Users/Languages/ReadMe-Catalan.txt 2007-01-14 19:40:42 UTC (rev 4041) @@ -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://www.winmerge.org/2.4/manual/quickstart.html +http://www.winmerge.org/2.6/manual/quickstart.html Manual HTML: El manual est\xE0 disponible en l\xEDnia a -http://www.winmerge.org/2.4/manual/ +http://www.winmerge.org/2.6/manual/ Possiblement tamb\xE9 estigui instal\xB7lada localment (si aix\xED es va triar) i es pot baixar separadament des de http://www.winmerge.org/ (veieu la documentaci\xF3) Modified: trunk/Docs/Users/Languages/ReadMe-Spanish.txt =================================================================== --- trunk/Docs/Users/Languages/ReadMe-Spanish.txt 2007-01-13 14:32:56 UTC (rev 4040) +++ trunk/Docs/Users/Languages/ReadMe-Spanish.txt 2007-01-14 19:40:42 UTC (rev 4041) @@ -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://www.winmerge.org/2.4/manual/quickstart.html +http://www.winmerge.org/2.6/manual/quickstart.html Manual HTML: el manual est\xE1 disponible online en: -http://www.winmerge.org/2.4/manual/ +http://www.winmerge.org/2.6/manual/ Posiblemente tambi\xE9n est\xE9 instalado (si se eligi\xF3 as\xED) localmente, y se puede descargar por separado desde http://www.winmerge.org/ (ver Documentaci\xF3n) Modified: trunk/Docs/Users/Languages/ReadMe-Swedish.txt =================================================================== --- trunk/Docs/Users/Languages/ReadMe-Swedish.txt 2007-01-13 14:32:56 UTC (rev 4040) +++ trunk/Docs/Users/Languages/ReadMe-Swedish.txt 2007-01-14 19:40:42 UTC (rev 4041) @@ -9,11 +9,11 @@ Snabbstart f\xF6r WinMerge (Quick start to WinMerge): L\xE4s online-manualens Quick start-kapitel f\xF6r att starta med WinMerge: -http://www.winmerge.org/2.4/manual/quickstart.html +http://www.winmerge.org/2.6/manual/quickstart.html HTML Manual: Manual finns tillg\xE4ngling online p\xE5 -http://www.winmerge.org/2.4/manual/ +http://www.winmerge.org/2.6/manual/ det \xE4r ocks\xE5 m\xF6jligtvis installerat (om detta \xE4r valt) lokalt och nerladdningsbart separat fr\xE5n http://www.winmerge.org/ (se dokumentation). Modified: trunk/Docs/Users/ReadMe.txt =================================================================== --- trunk/Docs/Users/ReadMe.txt 2007-01-13 14:32:56 UTC (rev 4040) +++ trunk/Docs/Users/ReadMe.txt 2007-01-14 19:40:42 UTC (rev 4041) @@ -9,11 +9,11 @@ Quick start to WinMerge: Read online-manual Quick-start chapter to get started with WinMerge: -http://www.winmerge.org/2.4/manual/quickstart.html +http://www.winmerge.org/2.6/manual/quickstart.html HTML Manual: Manual is available online at -http://www.winmerge.org/2.4/manual/ +http://www.winmerge.org/2.6/manual/ it is also possibly installed (if choosed so) locally and downloadable separately from http://www.winmerge.org/ (see documentation) Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2007-01-13 14:32:56 UTC (rev 4040) +++ trunk/Src/Changes.txt 2007-01-14 19:40:42 UTC (rev 4041) @@ -2,6 +2,11 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2007-01-14 Kimmo + Update manual URL point to 2.6 version manual in readme.txt + Docs/Users/ReadMe.txt + Docs/Users/Languages/ReadMe-*.txt + 2007-01-11 Gal PATCH: [ 1633194 ] Add editor tab setting to configuration log Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2007-01-14 20:13:37
|
Revision: 4045 http://svn.sourceforge.net/winmerge/?rev=4045&view=rev Author: gerundt Date: 2007-01-14 12:13:33 -0800 (Sun, 14 Jan 2007) Log Message: ----------- PATCH: [ 1633632 ] Plugin to ignore leading line numbers in text files Modified Paths: -------------- trunk/Docs/Users/Manual/Changes.txt trunk/Docs/Users/Manual/Plugins.xml trunk/Plugins/Changes.txt Added Paths: ----------- trunk/Plugins/dlls/IgnoreLeadingLineNumbers.dll trunk/Plugins/src_VB/IgnoreLeadingLineNumbers/ trunk/Plugins/src_VB/IgnoreLeadingLineNumbers/IgnoreLeadingLineNumbers.vbp trunk/Plugins/src_VB/IgnoreLeadingLineNumbers/WinMergeScript.cls Modified: trunk/Docs/Users/Manual/Changes.txt =================================================================== --- trunk/Docs/Users/Manual/Changes.txt 2007-01-14 19:42:28 UTC (rev 4044) +++ trunk/Docs/Users/Manual/Changes.txt 2007-01-14 20:13:33 UTC (rev 4045) @@ -1,3 +1,7 @@ +2007-01-14 Tim + PATCH: [ 1633632 ] Plugin to ignore leading line numbers in text files + Manual: Plugins.xml + 2007-01-10 Kimmo Bump manual revision to 1.3.3, expand copyright to 2007. Manual: WinMerge_help.xml Modified: trunk/Docs/Users/Manual/Plugins.xml =================================================================== --- trunk/Docs/Users/Manual/Plugins.xml 2007-01-14 19:42:28 UTC (rev 4044) +++ trunk/Docs/Users/Manual/Plugins.xml 2007-01-14 20:13:33 UTC (rev 4045) @@ -378,6 +378,24 @@ </para> </sect3> <sect3> + <title><filename>IgnoreLeadingLineNumbers.dll</filename></title> + <para>This plugin ignores the leading line numbers in text files (for example NC and BASIC files).</para> + <para> + <segmentedlist> + <segtitle>Categorie</segtitle> + <segtitle>File filter</segtitle> + <seglistitem> + <seg>Prediffer</seg> + <seg> + <simplelist type="inline"> + <member><filename class="extension">*.nc</filename></member> + </simplelist> + </seg> + </seglistitem> + </segmentedlist> + </para> + </sect3> + <sect3> <title><filename>insert datetime.sct</filename></title> <para>Add two functions to the <menuchoice><guimenu>Edit</guimenu><guisubmenu>Scripts</guisubmenu></menuchoice> menu:</para> <itemizedlist> Modified: trunk/Plugins/Changes.txt =================================================================== --- trunk/Plugins/Changes.txt 2007-01-14 19:42:28 UTC (rev 4044) +++ trunk/Plugins/Changes.txt 2007-01-14 20:13:33 UTC (rev 4045) @@ -6,6 +6,11 @@ PATCH: [ 1633944 ] Fix VB example plugin "IgnoreTwoFirstCharsOrder" Plugins\src_VB\IgnoreTwoFirstCharsOrder: WinMergeScript.cls + PATCH: [ 1633632 ] Plugin to ignore leading line numbers in text files + New file Plugins\dlls: + IgnoreLeadingLineNumbers.dll + New file Plugins\src_VB\IgnoreLeadingLineNumbers: + IgnoreLeadingLineNumbers.vbp WinMergeScript.cls 2007-01-13 Tim The file "Plugins.txt" is unnecessary after patch #1627363 and #1630397 Added: trunk/Plugins/dlls/IgnoreLeadingLineNumbers.dll =================================================================== (Binary files differ) Property changes on: trunk/Plugins/dlls/IgnoreLeadingLineNumbers.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Plugins/src_VB/IgnoreLeadingLineNumbers/IgnoreLeadingLineNumbers.vbp =================================================================== --- trunk/Plugins/src_VB/IgnoreLeadingLineNumbers/IgnoreLeadingLineNumbers.vbp (rev 0) +++ trunk/Plugins/src_VB/IgnoreLeadingLineNumbers/IgnoreLeadingLineNumbers.vbp 2007-01-14 20:13:33 UTC (rev 4045) @@ -0,0 +1,39 @@ +Type=OleDll +Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINNT\system32\stdole2.tlb#OLE Automation +Class=WinMergeScript; WinMergeScript.cls +Startup="(None)" +HelpFile="" +Title="IgnoreLeadingLineNumbers" +ExeName32="IgnoreLeadingLineNumbers.dll" +Command32="" +Name="IgnoreLeadingLineNumbers" +HelpContextID="0" +CompatibleMode="0" +CompatibleEXE32="IgnoreLeadingLineNumbers.dll" +MajorVer=1 +MinorVer=0 +RevisionVer=0 +AutoIncrementVer=0 +ServerSupportFiles=0 +VersionFileDescription="WinMerge plugin to ignore leading line numbers in text files (e.g. NC and BASIC files)." +VersionLegalCopyright="Tim Gerundt" +VersionProductName="IgnoreLeadingLineNumbers" +CompilationType=0 +OptimizationType=0 +FavorPentiumPro(tm)=0 +CodeViewDebugInfo=0 +NoAliasing=0 +BoundsCheck=0 +OverflowCheck=0 +FlPointCheck=0 +FDIVCheck=0 +UnroundedFP=0 +StartMode=1 +Unattended=0 +Retained=0 +ThreadPerObject=0 +MaxNumberOfThreads=1 +DebugStartupOption=0 + +[MS Transaction Server] +AutoRefresh=1 Added: trunk/Plugins/src_VB/IgnoreLeadingLineNumbers/WinMergeScript.cls =================================================================== --- trunk/Plugins/src_VB/IgnoreLeadingLineNumbers/WinMergeScript.cls (rev 0) +++ trunk/Plugins/src_VB/IgnoreLeadingLineNumbers/WinMergeScript.cls 2007-01-14 20:13:33 UTC (rev 4045) @@ -0,0 +1,78 @@ +VERSION 1.0 CLASS +BEGIN + MultiUse = -1 'True + Persistable = 0 'NotPersistable + DataBindingBehavior = 0 'vbNone + DataSourceBehavior = 0 'vbNone + MTSTransactionMode = 0 'NotAnMTSObject +END +Attribute VB_Name = "WinMergeScript" +Attribute VB_GlobalNameSpace = False +Attribute VB_Creatable = True +Attribute VB_PredeclaredId = False +Attribute VB_Exposed = True +'+----------------------------------------------------------------------+ +'| This is a plugin for WinMerge <www.winmerge.org>. | +'| It will ignores leading line numbers in text files. | +'| Copyright (C) 2007 by Tim Gerundt | +'+----------------------------------------------------------------------+ +'| This program is free software; you can redistribute it and/or modify | +'| it under the terms of the GNU General Public License as published by | +'| the Free Software Foundation; either version 2 of the License, or | +'| (at your option) any later version. | +'| | +'| This program is distributed in the hope that it will be useful, | +'| but WITHOUT ANY WARRANTY; without even the implied warranty of | +'| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | +'| GNU General Public License for more details. | +'| | +'| You should have received a copy of the GNU General Public License | +'| along with this program; if not, write to the Free Software | +'| Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | +'+----------------------------------------------------------------------+ +Option Explicit + +Public Property Get PluginEvent() As String + PluginEvent = "BUFFER_PREDIFF" +End Property + +Public Property Get PluginDescription() As String + PluginDescription = "This plugin ignores the leading line numbers in text files (e.g. NC and BASIC files)." +End Property + +Public Property Get PluginFileFilters() As String + PluginFileFilters = "\.nc$" +End Property + +Public Property Get PluginIsAutomatic() As Boolean + PluginIsAutomatic = True +End Property + +Public Function PrediffBufferW(ByRef text As String, ByRef size As Long, ByRef bChanged As Boolean) As Boolean + Dim sTemp As String, bLineHasStarted As Boolean + Dim i As Long, sChar As String + + sTemp = "" + bChanged = False + bLineHasStarted = True + For i = 0 To size - 1 'For all chars... + sChar = Mid(text, i + 1, 1) + Select Case sChar + Case "N", "n", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0" 'N or number... + If (bLineHasStarted = True) Then 'If line has started... + sChar = " " + bChanged = True + End If + Case vbCr, vbLf 'EOL... + bLineHasStarted = True + Case Else + bLineHasStarted = False + End Select + sTemp = sTemp & sChar + Next i + + If (bChanged = True) Then 'If text has changed... + text = sTemp + End If + PrediffBufferW = True +End Function This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2007-01-15 20:40:40
|
Revision: 4052 http://svn.sourceforge.net/winmerge/?rev=4052&view=rev Author: kimmov Date: 2007-01-15 12:40:36 -0800 (Mon, 15 Jan 2007) Log Message: ----------- PATCH: [ 1620076 ] Add Bazaar and Mercurial to SourceControl.flt - Submitted by Ren?\195?\169 Leonhardt Modified Paths: -------------- trunk/Filters/SourceControl.flt trunk/Src/Changes.txt Modified: trunk/Filters/SourceControl.flt =================================================================== --- trunk/Filters/SourceControl.flt 2007-01-15 20:18:16 UTC (rev 4051) +++ trunk/Filters/SourceControl.flt 2007-01-15 20:40:36 UTC (rev 4052) @@ -12,9 +12,15 @@ ## Filters for directories begin with d: ## (Inline comments begin with " ##" and extend to the end of the line) +## f: *\.bzrignore$ ## Bazaar ignore file +## f: *\.cvsignore$ ## CVS ignore file +## f: *\.hgignore$ ## Mercurial ignore file +## f: *\.svnignore$ ## Subversion ignore file + f: *\.*scc$ ## Visual SourceSafe files + d: \\\.svn$ ## Subversion working copy d: \\_svn$ ## Subversion working copy ASP.NET Hack d: \\cvs$ ## CVS control directory - - +d: \\\.bzr$ ## Bazaar branch +d: \\\.hg$ ## Mercurial repository Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2007-01-15 20:18:16 UTC (rev 4051) +++ trunk/Src/Changes.txt 2007-01-15 20:40:36 UTC (rev 4052) @@ -2,6 +2,11 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +3007-01-15 Kimmo + PATCH: [ 1620076 ] Add Bazaar and Mercurial to SourceControl.flt + Submitted by Ren\xE9 Leonhardt + Filters: SourceControl.flt + 2007-01-14 Kimmo Update manual URL point to 2.6 version manual in readme.txt Docs/Users/ReadMe.txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2007-01-15 20:46:51
|
Revision: 4054 http://svn.sourceforge.net/winmerge/?rev=4054&view=rev Author: kimmov Date: 2007-01-15 12:46:46 -0800 (Mon, 15 Jan 2007) Log Message: ----------- Add Ren?\195?\169 Leonhardt to Contributors.txt Modified Paths: -------------- trunk/Docs/Users/Contributors.txt trunk/Src/Changes.txt Modified: trunk/Docs/Users/Contributors.txt =================================================================== --- trunk/Docs/Users/Contributors.txt 2007-01-15 20:42:50 UTC (rev 4053) +++ trunk/Docs/Users/Contributors.txt 2007-01-15 20:46:46 UTC (rev 4054) @@ -109,6 +109,7 @@ * Jan Hryz * Ed_K * Ferenc Kubatovics +* Ren\xE9 Leonhardt * Vladimir Lukianov * David Maisonave * Harry Mckame Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2007-01-15 20:42:50 UTC (rev 4053) +++ trunk/Src/Changes.txt 2007-01-15 20:46:46 UTC (rev 4054) @@ -2,10 +2,12 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) -3007-01-15 Kimmo +2007-01-15 Kimmo PATCH: [ 1620076 ] Add Bazaar and Mercurial to SourceControl.flt Submitted by Ren\xE9 Leonhardt Filters: SourceControl.flt + Add Ren\xE9 Leonhardt to Contributors.txt + Docs/Users: Contributors.txt 2007-01-14 Kimmo Update manual URL point to 2.6 version manual in readme.txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |