|
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
+ ...
[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"
- ...
[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/cppuni...
[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...
[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
+ ...
[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 "Konverto...
[truncated message content] |
|
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.
|
