|
From: <ki...@us...> - 2006-09-21 18:44:01
|
Revision: 3603
http://svn.sourceforge.net/winmerge/?rev=3603&view=rev
Author: kimmov
Date: 2006-09-21 11:43:52 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
We don't need a trunk folder in branch folder.
Added Paths:
-----------
branches/R2_6/ArchiveSupport/
Removed Paths:
-------------
branches/R2_6/trunk/ArchiveSupport/
Copied: branches/R2_6/ArchiveSupport (from rev 3602, branches/R2_6/trunk/ArchiveSupport)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-21 18:45:11
|
Revision: 3604
http://svn.sourceforge.net/winmerge/?rev=3604&view=rev
Author: kimmov
Date: 2006-09-21 11:45:03 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
We don't need a trunk folder in branch folder.
Added Paths:
-----------
branches/R2_6/Tools/
Removed Paths:
-------------
branches/R2_6/trunk/Tools/
Copied: branches/R2_6/Tools (from rev 3603, branches/R2_6/trunk/Tools)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-21 18:48:26
|
Revision: 3605
http://svn.sourceforge.net/winmerge/?rev=3605&view=rev
Author: kimmov
Date: 2006-09-21 11:48:10 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
We don't need a trunk folder in branch folder.
Added Paths:
-----------
branches/R2_6/Docs/
Removed Paths:
-------------
branches/R2_6/trunk/Docs/
Copied: branches/R2_6/Docs (from rev 3604, branches/R2_6/trunk/Docs)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-21 18:49:07
|
Revision: 3606
http://svn.sourceforge.net/winmerge/?rev=3606&view=rev
Author: kimmov
Date: 2006-09-21 11:48:54 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
We don't need a trunk folder in branch folder.
Added Paths:
-----------
branches/R2_6/Installer/
Removed Paths:
-------------
branches/R2_6/trunk/Installer/
Copied: branches/R2_6/Installer (from rev 3605, branches/R2_6/trunk/Installer)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-21 18:49:40
|
Revision: 3607
http://svn.sourceforge.net/winmerge/?rev=3607&view=rev
Author: kimmov
Date: 2006-09-21 11:49:31 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
We don't need a trunk folder in branch folder.
Added Paths:
-----------
branches/R2_6/Filters/
Removed Paths:
-------------
branches/R2_6/trunk/Filters/
Copied: branches/R2_6/Filters (from rev 3606, branches/R2_6/trunk/Filters)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-21 18:50:23
|
Revision: 3608
http://svn.sourceforge.net/winmerge/?rev=3608&view=rev
Author: kimmov
Date: 2006-09-21 11:50:12 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
We don't need a trunk folder in branch folder.
Added Paths:
-----------
branches/R2_6/Plugins/
Removed Paths:
-------------
branches/R2_6/trunk/Plugins/
Copied: branches/R2_6/Plugins (from rev 3607, branches/R2_6/trunk/Plugins)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-21 18:51:06
|
Revision: 3609
http://svn.sourceforge.net/winmerge/?rev=3609&view=rev
Author: kimmov
Date: 2006-09-21 11:50:57 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
We don't need a trunk folder in branch folder.
Added Paths:
-----------
branches/R2_6/ShellExtension/
Removed Paths:
-------------
branches/R2_6/trunk/ShellExtension/
Copied: branches/R2_6/ShellExtension (from rev 3608, branches/R2_6/trunk/ShellExtension)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-21 18:51:40
|
Revision: 3610
http://svn.sourceforge.net/winmerge/?rev=3610&view=rev
Author: kimmov
Date: 2006-09-21 11:51:30 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
We don't need a trunk folder in branch folder.
Added Paths:
-----------
branches/R2_6/Src/
Removed Paths:
-------------
branches/R2_6/trunk/Src/
Copied: branches/R2_6/Src (from rev 3609, branches/R2_6/trunk/Src)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-21 18:52:17
|
Revision: 3611
http://svn.sourceforge.net/winmerge/?rev=3611&view=rev
Author: kimmov
Date: 2006-09-21 11:52:08 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
We don't need a trunk folder in branch folder.
Added Paths:
-----------
branches/R2_6/Testing/
Removed Paths:
-------------
branches/R2_6/trunk/Testing/
Copied: branches/R2_6/Testing (from rev 3610, branches/R2_6/trunk/Testing)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-21 18:52:50
|
Revision: 3612
http://svn.sourceforge.net/winmerge/?rev=3612&view=rev
Author: kimmov
Date: 2006-09-21 11:52:41 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
We don't need a trunk folder in branch folder.
Added Paths:
-----------
branches/R2_6/Web/
Removed Paths:
-------------
branches/R2_6/trunk/Web/
Copied: branches/R2_6/Web (from rev 3611, branches/R2_6/trunk/Web)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-21 18:53:26
|
Revision: 3613
http://svn.sourceforge.net/winmerge/?rev=3613&view=rev
Author: kimmov
Date: 2006-09-21 11:53:13 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
We don't need a trunk folder in branch folder.
Added Paths:
-----------
branches/R2_6/readme.txt
Removed Paths:
-------------
branches/R2_6/trunk/readme.txt
Copied: branches/R2_6/readme.txt (from rev 3612, branches/R2_6/trunk/readme.txt)
===================================================================
--- branches/R2_6/readme.txt (rev 0)
+++ branches/R2_6/readme.txt 2006-09-21 18:53:13 UTC (rev 3613)
@@ -0,0 +1,50 @@
+WinMerge\readme.txt
+
+Source code for the WinMerge program, its plugins, filters, setup program,
+and various utilities are all kept in the WinMerge module directory, in
+various subdirectories.
+
+Generally, look for a file "readme.txt" to explain the purpose of a directory,
+and a file "Changes.txt" to hold the historical changelog; sometimes the
+"Changes.txt" file is located at a higher level -- eg, the WinMerge\Src\Changes.txt
+includes all changes to all subdirectories located under WinMerge\Src.
+
+Subdirectories include:
+
+ - Docs
+ both user and developer documentation, in different subdirectories
+
+ - Src
+ source code to the WinMerge program itself
+
+ - Plugins
+ source code and binaries for WinMerge runtime plugin dlls & scripts
+
+ - Filters
+ WinMerge file filters which are shipped with the distribution
+
+ - ArchiveSupport
+ source code for the Merge7z dlls, which connect WinMerge with 7-Zip
+ Also this directory is required to compile WinMerge(U).exe. There
+ is also standalone installer for Merge7z dlls.
+
+ - Installer
+ Installer for WinMerge
+
+ - Tools
+ Various utilities used by WinMerge developers; see readme files in each
+
+ - ShellExtension
+ Windows shell (Explorer) integration. Adds menuitems to Explorer context
+ menu for comparing files and folders.
+
+ - Testing
+ A suite of test diff files and a script to run them and report the results
+
+ - Build
+ This (non-cvs) directory is where WinMerge(U).exe and plugin binaries are
+ compiled.
+
+ - BuildTmp
+ This (non-cvs) directory is for obj and such-like temporary compiler files
+ used in compiling binaries.
Deleted: branches/R2_6/trunk/readme.txt
===================================================================
--- branches/R2_6/trunk/readme.txt 2006-09-21 18:52:41 UTC (rev 3612)
+++ branches/R2_6/trunk/readme.txt 2006-09-21 18:53:13 UTC (rev 3613)
@@ -1,50 +0,0 @@
-WinMerge\readme.txt
-
-Source code for the WinMerge program, its plugins, filters, setup program,
-and various utilities are all kept in the WinMerge module directory, in
-various subdirectories.
-
-Generally, look for a file "readme.txt" to explain the purpose of a directory,
-and a file "Changes.txt" to hold the historical changelog; sometimes the
-"Changes.txt" file is located at a higher level -- eg, the WinMerge\Src\Changes.txt
-includes all changes to all subdirectories located under WinMerge\Src.
-
-Subdirectories include:
-
- - Docs
- both user and developer documentation, in different subdirectories
-
- - Src
- source code to the WinMerge program itself
-
- - Plugins
- source code and binaries for WinMerge runtime plugin dlls & scripts
-
- - Filters
- WinMerge file filters which are shipped with the distribution
-
- - ArchiveSupport
- source code for the Merge7z dlls, which connect WinMerge with 7-Zip
- Also this directory is required to compile WinMerge(U).exe. There
- is also standalone installer for Merge7z dlls.
-
- - Installer
- Installer for WinMerge
-
- - Tools
- Various utilities used by WinMerge developers; see readme files in each
-
- - ShellExtension
- Windows shell (Explorer) integration. Adds menuitems to Explorer context
- menu for comparing files and folders.
-
- - Testing
- A suite of test diff files and a script to run them and report the results
-
- - Build
- This (non-cvs) directory is where WinMerge(U).exe and plugin binaries are
- compiled.
-
- - BuildTmp
- This (non-cvs) directory is for obj and such-like temporary compiler files
- used in compiling binaries.
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:29:47
|
Revision: 3651
http://svn.sourceforge.net/winmerge/?rev=3651&view=rev
Author: kimmov
Date: 2006-09-27 07:29:37 -0700 (Wed, 27 Sep 2006)
Log Message:
-----------
PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows
Modified Paths:
--------------
branches/R2_6/ShellExtension/Register.bat
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/ShellExtension/Register.bat
===================================================================
--- branches/R2_6/ShellExtension/Register.bat 2006-09-27 14:22:28 UTC (rev 3650)
+++ branches/R2_6/ShellExtension/Register.bat 2006-09-27 14:29:37 UTC (rev 3651)
@@ -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: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-09-27 14:22:28 UTC (rev 3650)
+++ branches/R2_6/Src/Changes.txt 2006-09-27 14:29:37 UTC (rev 3651)
@@ -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:16:21
|
Revision: 3689
http://svn.sourceforge.net/winmerge/?rev=3689&view=rev
Author: kimmov
Date: 2006-10-08 03:16:09 -0700 (Sun, 08 Oct 2006)
Log Message:
-----------
PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt
Modified Paths:
--------------
branches/R2_6/Docs/Users/Contributors.txt
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_6/Docs/Users/Contributors.txt 2006-10-08 10:14:34 UTC (rev 3688)
+++ branches/R2_6/Docs/Users/Contributors.txt 2006-10-08 10:16:09 UTC (rev 3689)
@@ -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: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-10-08 10:14:34 UTC (rev 3688)
+++ branches/R2_6/Src/Changes.txt 2006-10-08 10:16:09 UTC (rev 3689)
@@ -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-11-02 17:49:12
|
Revision: 3758
http://svn.sourceforge.net/winmerge/?rev=3758&view=rev
Author: kimmov
Date: 2006-11-02 09:48:14 -0800 (Thu, 02 Nov 2006)
Log Message:
-----------
PATCH: [ 1588212 ] Add manifest file to resource file
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc
branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc
branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc
branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
branches/R2_6/Src/Languages/Czech/MergeCzech.rc
branches/R2_6/Src/Languages/Danish/MergeDanish.rc
branches/R2_6/Src/Languages/Dutch/MergeDutch.rc
branches/R2_6/Src/Languages/French/MergeFrench.rc
branches/R2_6/Src/Languages/German/MergeGerman.rc
branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc
branches/R2_6/Src/Languages/Italian/MergeItalian.rc
branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc
branches/R2_6/Src/Languages/Korean/MergeKorean.rc
branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc
branches/R2_6/Src/Languages/Polish/MergePolish.rc
branches/R2_6/Src/Languages/Russian/MergeRussian.rc
branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc
branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc
branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc
branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc
branches/R2_6/Src/Merge.rc
Added Paths:
-----------
branches/R2_6/Src/res/WinMerge.exe.manifest
branches/R2_6/Src/res/WinMergeU.exe.manifest
Removed Paths:
-------------
branches/R2_6/Installer/InnoSetup/WinMerge.exe.manifest
branches/R2_6/Installer/InnoSetup/WinMergeU.exe.manifest
Deleted: branches/R2_6/Installer/InnoSetup/WinMerge.exe.manifest
===================================================================
--- branches/R2_6/Installer/InnoSetup/WinMerge.exe.manifest 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Installer/InnoSetup/WinMerge.exe.manifest 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Installer/InnoSetup/WinMergeU.exe.manifest
===================================================================
--- branches/R2_6/Installer/InnoSetup/WinMergeU.exe.manifest 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Installer/InnoSetup/WinMergeU.exe.manifest 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Changes.txt 2006-11-02 17:48:14 UTC (rev 3758)
@@ -2,6 +2,13 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-02 Kimmo
+ 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
Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
Modified: branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- branches/R2_6/Src/Languages/Czech/MergeCzech.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Czech/MergeCzech.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- branches/R2_6/Src/Languages/Danish/MergeDanish.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Danish/MergeDanish.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- branches/R2_6/Src/Languages/Dutch/MergeDutch.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Dutch/MergeDutch.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/French/MergeFrench.rc
===================================================================
--- branches/R2_6/Src/Languages/French/MergeFrench.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/French/MergeFrench.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/German/MergeGerman.rc
===================================================================
--- branches/R2_6/Src/Languages/German/MergeGerman.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/German/MergeGerman.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- branches/R2_6/Src/Languages/Italian/MergeItalian.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Italian/MergeItalian.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- branches/R2_6/Src/Languages/Korean/MergeKorean.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Korean/MergeKorean.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/Polish/MergePolish.rc
===================================================================
--- branches/R2_6/Src/Languages/Polish/MergePolish.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Polish/MergePolish.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- branches/R2_6/Src/Languages/Russian/MergeRussian.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Russian/MergeRussian.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/Merge.rc
===================================================================
--- branches/R2_6/Src/Merge.rc 2006-11-01 21:28:14 UTC (rev 3757)
+++ branches/R2_6/Src/Merge.rc 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/res/WinMerge.exe.manifest (from rev 3757, branches/R2_6/Installer/InnoSetup/WinMerge.exe.manifest)
===================================================================
--- branches/R2_6/Src/res/WinMerge.exe.manifest (rev 0)
+++ branches/R2_6/Src/res/WinMerge.exe.manifest 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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: branches/R2_6/Src/res/WinMergeU.exe.manifest (from rev 3757, branches/R2_6/Installer/InnoSetup/WinMergeU.exe.manifest)
===================================================================
--- branches/R2_6/Src/res/WinMergeU.exe.manifest (rev 0)
+++ branches/R2_6/Src/res/WinMergeU.exe.manifest 2006-11-02 17:48:14 UTC (rev 3758)
@@ -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:26:15
|
Revision: 3775
http://svn.sourceforge.net/winmerge/?rev=3775&view=rev
Author: sdottaka
Date: 2006-11-06 09:25:47 -0800 (Mon, 06 Nov 2006)
Log Message:
-----------
PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/screenshots/equal.gif
branches/R2_6/Docs/Users/Manual/screenshots/fileskip.gif
branches/R2_6/Docs/Users/Manual/screenshots/foldercomp1.png
branches/R2_6/Docs/Users/Manual/screenshots/lfile.gif
branches/R2_6/Docs/Users/Manual/screenshots/notequal.gif
branches/R2_6/Docs/Users/Manual/screenshots/rfile.gif
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/res/equalfile.ico
branches/R2_6/Src/res/fileskip.ico
branches/R2_6/Src/res/lfile.ico
branches/R2_6/Src/res/notequalfile.ico
branches/R2_6/Src/res/rfile.ico
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-06 17:24:58 UTC (rev 3774)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-11-06 17:25:47 UTC (rev 3775)
@@ -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: branches/R2_6/Docs/Users/Manual/screenshots/equal.gif
===================================================================
(Binary files differ)
Modified: branches/R2_6/Docs/Users/Manual/screenshots/fileskip.gif
===================================================================
(Binary files differ)
Modified: branches/R2_6/Docs/Users/Manual/screenshots/foldercomp1.png
===================================================================
(Binary files differ)
Modified: branches/R2_6/Docs/Users/Manual/screenshots/lfile.gif
===================================================================
(Binary files differ)
Modified: branches/R2_6/Docs/Users/Manual/screenshots/notequal.gif
===================================================================
(Binary files differ)
Modified: branches/R2_6/Docs/Users/Manual/screenshots/rfile.gif
===================================================================
(Binary files differ)
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-11-06 17:24:58 UTC (rev 3774)
+++ branches/R2_6/Src/Changes.txt 2006-11-06 17:25:47 UTC (rev 3775)
@@ -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-03 Kimmo
PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog
Src: MainFrm.cpp
Modified: branches/R2_6/Src/res/equalfile.ico
===================================================================
(Binary files differ)
Modified: branches/R2_6/Src/res/fileskip.ico
===================================================================
(Binary files differ)
Modified: branches/R2_6/Src/res/lfile.ico
===================================================================
(Binary files differ)
Modified: branches/R2_6/Src/res/notequalfile.ico
===================================================================
(Binary files differ)
Modified: branches/R2_6/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: <sdo...@us...> - 2006-12-02 13:18:23
|
Revision: 3886
http://svn.sourceforge.net/winmerge/?rev=3886&view=rev
Author: sdottaka
Date: 2006-12-02 05:18:21 -0800 (Sat, 02 Dec 2006)
Log Message:
-----------
BUG: [ 1603077 ] Doesn't filter the file vc60.idb using "Merge_VC_loose.flt"
Modified Paths:
--------------
branches/R2_6/Filters/Merge_VC_loose.flt
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/Filters/Merge_VC_loose.flt
===================================================================
--- branches/R2_6/Filters/Merge_VC_loose.flt 2006-12-02 13:17:50 UTC (rev 3885)
+++ branches/R2_6/Filters/Merge_VC_loose.flt 2006-12-02 13:18:21 UTC (rev 3886)
@@ -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: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-12-02 13:17:50 UTC (rev 3885)
+++ branches/R2_6/Src/Changes.txt 2006-12-02 13:18:21 UTC (rev 3886)
@@ -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-12 14:59:35
|
Revision: 3949
http://svn.sourceforge.net/winmerge/?rev=3949&view=rev
Author: kimmov
Date: 2006-12-12 06:59:31 -0800 (Tue, 12 Dec 2006)
Log Message:
-----------
PATCH: [ 1606496 ] Slovak translation
-Submitted by Ivan Mas?\195?\161r
Modified Paths:
--------------
branches/R2_6/ShellExtension/Languages/ShellExtensionSlovak.rc
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc
Modified: branches/R2_6/ShellExtension/Languages/ShellExtensionSlovak.rc
===================================================================
--- branches/R2_6/ShellExtension/Languages/ShellExtensionSlovak.rc 2006-12-11 22:30:16 UTC (rev 3948)
+++ branches/R2_6/ShellExtension/Languages/ShellExtensionSlovak.rc 2006-12-12 14:59:31 UTC (rev 3949)
@@ -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: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-12-11 22:30:16 UTC (rev 3948)
+++ branches/R2_6/Src/Changes.txt 2006-12-12 14:59:31 UTC (rev 3949)
@@ -2,6 +2,12 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-12 Kimmo
+ PATCH: [ 1606496 ] Slovak translation
+ Submitted by Ivan Mas\xE1r
+ ShellExtension/Languages: ShellExtensionSlovak.rc
+ Src/Languages/Slovak: MergeSlovak.rc
+
2006-12-11 Kimmo
PATCH: [ 1610442 ] Make time getting faster for files
Src: DirScan.cpp FileInfo.cpp
Modified: branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc 2006-12-11 22:30:16 UTC (rev 3948)
+++ branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc 2006-12-12 14:59:31 UTC (rev 3949)
@@ -103,22 +103,22 @@
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 "&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
@@ -127,12 +127,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
@@ -140,17 +140,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
@@ -162,30 +162,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
@@ -195,13 +195,13 @@
BEGIN
MENUITEM "O&bsah...\tF1", ID_HELP_CONTENTS
MENUITEM "&Index...", ID_HELP_INDEX
- MENUITEM "&Search...", ID_HELP_SEARCH
+ MENUITEM "&H\xBEada\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
+ MENUITEM "&O aplik\xE1cii...", ID_APP_ABOUT
END
END
@@ -209,53 +209,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
@@ -265,34 +265,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
@@ -302,13 +302,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
@@ -319,96 +319,96 @@
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
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
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 "&H\xBEada\x9D...\tCtrl+F", ID_EDIT_FIND
+ MENUITEM "Nahra\xEFi\x9D...\tCtrl+H", ID_EDIT_REPLACE
MENUITEM SEPARATOR
- POPUP "&Scripts"
+ POPUP "&Skripty"
BEGIN
- MENUITEM "< Empty >", ID_NO_EDIT_SCRIPTS
+ MENUITEM "< Pr8zdne >", 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 "&Loka\xE8n\xFD panel", 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
@@ -420,41 +420,41 @@
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
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
@@ -464,10 +464,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
@@ -478,63 +478,63 @@
BEGIN
POPUP "_ITEM_POPUP_"
BEGIN
- MENUITEM "Comp&are", ID_MERGE_COMPARE
+ MENUITEM "Porovn&a\x9D", ID_MERGE_COMPARE
MENUITEM SEPARATOR
- POPUP "&Copy"
+ POPUP "&Kop\xEDrova\x9D"
BEGIN
- MENUITEM "&Left to Right", ID_DIR_COPY_LEFT_TO_RIGHT
- MENUITEM "L&eft to...", ID_DIR_COPY_LEFT_TO_BROWSE
- MENUITEM "&Right to Left", ID_DIR_COPY_RIGHT_TO_LEFT
- MENUITEM "R&ight to...", ID_DIR_COPY_RIGHT_TO_BROWSE
+ MENUITEM "&\xBCav\xFD s prav\xFDm", ID_DIR_COPY_LEFT_TO_RIGHT
+ MENUITEM "\xBCa&v\xFD s...", ID_DIR_COPY_LEFT_TO_BROWSE
+ MENUITEM "&Prav\xFD s \xBEav\xFDm", ID_DIR_COPY_RIGHT_TO_LEFT
+ MENUITEM "P&av\xFD s...", ID_DIR_COPY_RIGHT_TO_BROWSE
END
- POPUP "&Move"
+ POPUP "&presun\xFA\x9D"
BEGIN
- MENUITEM "&Left to...", ID_DIR_MOVE_LEFT_TO_BROWSE
- MENUITEM "&Right to...", ID_DIR_MOVE_RIGHT_TO_BROWSE
+ MENUITEM "\xBC&av\xFD do...", ID_DIR_MOVE_LEFT_TO_BROWSE
+ MENUITEM "&prav\xFD do...", ID_DIR_MOVE_RIGHT_TO_BROWSE
END
- POPUP "&Delete"
+ POPUP "&Zmaza\x9D"
BEGIN
- MENUITEM "&Left", ID_DIR_DEL_LEFT
- MENUITEM "&Right", ID_DIR_DEL_RIGHT
- MENUITEM "&Both", ID_DIR_DEL_BOTH
+ MENUITEM "\xBC&av\xFD", ID_DIR_DEL_LEFT
+ MENUITEM "&prav\xFD", ID_DIR_DEL_RIGHT
+ MENUITEM "&Oba", ID_DIR_DEL_BOTH
END
- MENUITEM "Re&name", ID_DIR_ITEM_RENAME
- MENUITEM "&Hide Items", ID_DIR_HIDE_FILENAMES
+ MENUITEM "Preme&nova\x9D", ID_DIR_ITEM_RENAME
+ MENUITEM "&Skry\x9D polo\x9Eky", ID_DIR_HIDE_FILENAMES
MENUITEM SEPARATOR
- POPUP "&Open Left"
+ POPUP "&Otvori\x9D \xBEav\xFD"
BEGIN
- MENUITEM "with &Registered Application", ID_DIR_OPEN_LEFT
- MENUITEM "with &External Editor", ID_DIR_OPEN_LEFT_WITHEDITOR
- MENUITEM "&with...", ID_DIR_OPEN_LEFT_WITH
+ MENUITEM "®istrovanou aplik\xE1ciou", ID_DIR_OPEN_LEFT
+ MENUITEM "&extern\xFDm editorom", ID_DIR_OPEN_LEFT_WITHEDITOR
+ MENUITEM "\xE8\xED&m...", ID_DIR_OPEN_LEFT_WITH
END
- POPUP "O&pen Right"
+ POPUP "O&tvori\x9D prav\xFD"
BEGIN
- MENUITEM "with &Registered Application", ID_DIR_OPEN_RIGHT
- MENUITEM "with &External Editor", ID_DIR_OPEN_RIGHT_WITHEDITOR
- MENUITEM "&with...", ID_DIR_OPEN_RIGHT_WITH
+ MENUITEM "®istrovanou aplik\xE1ciou", ID_DIR_OPEN_RIGHT
+ MENUITEM "&extern\xFDm editorom", ID_DIR_OPEN_RIGHT_WITHEDITOR
+ MENUITEM "\xE8\xED&m...", ID_DIR_OPEN_RIGHT_WITH
END
MENUITEM SEPARATOR
- POPUP "Cop&y Pathnames"
+ POPUP "Skop\xEDrova\x9D n\xE1zvy &ciest"
BEGIN
- MENUITEM "&Left (%1 of %2)", ID_DIR_COPY_PATHNAMES_LEFT
- MENUITEM "&Right (%1 of %2)", ID_DIR_COPY_PATHNAMES_RIGHT
- MENUITEM "&Both (%1 of %2)", ID_DIR_COPY_PATHNAMES_BOTH
+ MENUITEM "&\xBCav\xFD (%1 z %2)", ID_DIR_COPY_PATHNAMES_LEFT
+ MENUITEM "&prav\xFD (%1 z %2)", ID_DIR_COPY_PATHNAMES_RIGHT
+ MENUITEM "&Oba (%1 z %2)", ID_DIR_COPY_PATHNAMES_BOTH
END
- MENUITEM "Copy &Filenames", ID_DIR_COPY_FILENAMES
+ MENUITEM "Skop\xEDrova\x9D n\xE1zvy &s\xFAborov", ID_DIR_COPY_FILENAMES
MENUITEM SEPARATOR
- POPUP "&Zip"
+ POPUP "&Zipova\x9D"
BEGIN
- MENUITEM "&Left... (%1 of %2)", ID_DIR_ZIP_LEFT
- MENUITEM "&Right... (%1 of %2)", ID_DIR_ZIP_RIGHT
- MENUITEM "&Both... (%1 of %2)", ID_DIR_ZIP_BOTH
- MENUITEM "&Differences... (%1 of %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
+ MENUITEM "&\xBCav\xFD... (%1 of %2)", ID_DIR_ZIP_LEFT
+ MENUITEM "&prav\xFD... (%1 of %2)", ID_DIR_ZIP_RIGHT
+ MENUITEM "&Oba... (%1 of %2)", ID_DIR_ZIP_BOTH
+ MENUITEM "&Rozdiely... (%1 of %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
MENUITEM SEPARATOR
- MENUITEM "&Refresh", ID_DIR_RESCAN
+ MENUITEM "&Obnovi\x9D", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
- MENUITEM "&Customize Columns...", ID_TOOLS_CUSTOMIZECOLUMNS
+ MENUITEM "&Prisp\xF4sobi\x9D st\xE5pce...", ID_TOOLS_CUSTOMIZECOLUMNS
END
END
@@ -542,17 +542,17 @@
BEGIN
POPUP "_POPUP_"
BEGIN
- MENUITEM "&Copy Full Path", ID_EDITOR_COPY_PATH
- MENUITEM "Copy &Filename", ID_EDITOR_COPY_FILENAME
+ MENUITEM "&Kop\xEDrova\x9D pln\xFA cestu", ID_EDITOR_COPY_PATH
+ MENUITEM "Kop\xEDrova\x9D n\xE1zov &s\xFAboru", ID_EDITOR_COPY_FILENAME
END
END
IDR_POPUP_PLUGINS_SETTINGS MENU
BEGIN
- POPUP "Prediffer Settings"
+ POPUP "Nastavenia preprocesora"
BEGIN
- MENUITEM "&No prediffer", ID_PREDIFF_MANUAL
- MENUITEM "Auto prediffer", ID_PREDIFF_AUTO
+ MENUITEM "&Bez preprocesora", ID_PREDIFF_MANUAL
+ MENUITEM "&Auto preprocesor", ID_PREDIFF_AUTO
END
END
@@ -560,12 +560,12 @@
BEGIN
POPUP "_POPUP_"
BEGIN
- MENUITEM "G&oto Diff", ID_LOCBAR_GOTODIFF
- MENUITEM "&Goto...", ID_EDIT_WMGOTO
+ MENUITEM "Ch&o\xEF na rozdiel", ID_LOCBAR_GOTODIFF
+ MENUITEM "&Cho\xEF...", ID_EDIT_WMGOTO
MENUITEM SEPARATOR
- MENUITEM "&No Moved Blocks", ID_DISPLAY_MOVED_NONE
- MENUITEM "&All Moved Blocks", ID_DISPLAY_MOVED_ALL
- MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
+ MENUITEM "&Bez presunt\xFDch blokov", ID_DISPLAY_MOVED_NONE
+ MENUITEM "&V\x9Aetky presunut\xE9 bloky", ID_DISPLAY_MOVED_ALL
+ MENUITEM "Presunut\xFD blok pre &aktu\xE1lny rozdiel", ID_DISPLAY_MOVED_FOLLOW_DIFF
END
END
@@ -631,19 +631,19 @@
IDD_ABOUTBOX DIALOGEX 0, 0, 223, 124
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "O programe"
+CAPTION "O aplik\xE1cii"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20
LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX
LTEXT "Verzia 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX
- LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
+ LTEXT "(S\xFAkromn\xE9 zostavenie)",IDC_PRIVATEBUILD,63,33,153,8
LTEXT "V\x9Aetky pr\xE1va vyhraden\xE9.",IDC_STATIC,7,60,170,8
LTEXT "Nav\x9At\xEDvte www str\xE1nku programu WinMerge!",IDC_WWW,7,79,209,8
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,95,209,1
LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
DEFPUSHBUTTON "OK",IDOK,166,103,50,14
- PUSHBUTTON "Contributors",IDC_OPEN_CONTRIBUTORS,7,103,65,14
+ PUSHBUTTON "Prispievatelia",IDC_OPEN_CONTRIBUTORS,7,103,65,14
END
IDD_OPEN DIALOGEX 0, 0, 374, 126
@@ -661,21 +661,21 @@
COMBOBOX IDC_RIGHT_COMBO,81,38,167,95,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,
WS_EX_ACCEPTFILES
- PUSHBUTTON "Pr&ech\xE1dza\x9D...",IDC_RIGHT_BUTTON,252,38,50,14
+ PUSHBUTTON "&Prech\xE1dza\x9D...",IDC_RIGHT_BUTTON,252,38,50,14
RTEXT "Pr&\xEDpony:",IDC_STATIC,13,56,65,8
COMBOBOX IDC_EXT_COMBO,81,54,167,95,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "Select...",IDC_SELECT_FILTER,252,54,50,14
- RTEXT "&Unpacker:",IDC_STATIC,13,72,65,8
+ PUSHBUTTON "&Vybra\x9D...",IDC_SELECT_FILTER,252,54,50,14
+ RTEXT "&Rozba\xBEovac\xED program:",IDC_STATIC,13,72,65,8
EDITTEXT IDC_UNPACKER_EDIT,81,70,167,12,ES_AUTOHSCROLL |
ES_READONLY
- PUSHBUTTON "&Select...",IDC_SELECT_UNPACKER,252,70,50,14
- CONTROL "&Include Subfolders",IDC_RECURS_CHECK,"Button",
+ PUSHBUTTON "&Vybra\x9D...",IDC_SELECT_UNPACKER,252,70,50,14
+ CONTROL "&Zahrn\xFA\x9D podadres\xE1re",IDC_RECURS_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,81,86,167,10
LTEXT "Status:",IDC_OPEN_STATUS,15,102,192,8
DEFPUSHBUTTON "OK",IDOK,316,11,50,14
- PUSHBUTTON "Storno",IDCANCEL,316,28,50,14
- PUSHBUTTON "Help",ID_HELP,316,45,50,14
+ PUSHBUTTON "Zru\x9Ai\x9D",IDCANCEL,316,28,50,14
+ PUSHBUTTON "Pomoc",ID_HELP,316,45,50,14
GROUPBOX "S\xFAbory alebo adres\xE1re pre porovnanie",IDC_FILES_DIRS_GROUP,7,
7,302,111
END
@@ -688,31 +688,31 @@
BEGIN
LTEXT "",IDC_STATIC,7,7,243,47,SS_SUNKEN
LTEXT "IDS_SAVEVSS_FMT",IDC_MESSAGE,14,13,231,34
- LTEXT "Database:",IDC_STATIC,7,64,36,8
+ LTEXT "Datab\xE1za:",IDC_STATIC,7,64,36,8
COMBOBOX IDC_DATABASE_LIST,48,63,202,114,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- LTEXT "Project:",IDC_STATIC,7,81,36,8
+ LTEXT "Projekt:",IDC_STATIC,7,81,36,8
COMBOBOX IDC_PROJECT_COMBO,48,78,202,114,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- LTEXT "User:",IDC_STATIC,7,99,36,8
+ LTEXT "Pou\x9E\xEDvate\xBE:",IDC_STATIC,7,99,36,8
EDITTEXT IDC_USER,48,96,70,14,ES_AUTOHSCROLL
- RTEXT "Password:",IDC_STATIC,122,99,55,8
+ RTEXT "Heslo:",IDC_STATIC,122,99,55,8
EDITTEXT IDC_PASSWORD,180,96,70,14,ES_PASSWORD | ES_AUTOHSCROLL
- CONTROL "Link to Destination VSS project",IDC_VCPROJ_SYNC,"Button",
+ CONTROL "Odkaz na Cie\xBEov\xFD VSS projekt",IDC_VCPROJ_SYNC,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,115,235,8
- CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button",
+ CONTROL "Pou\x9Ei\x9D na v\x9Aetky polo\x9Eky",IDC_MULTI_CHECKOUT,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,125,235,8
DEFPUSHBUTTON "Check Out",IDOK,91,145,50,14
- PUSHBUTTON "Save As...",IDC_SAVE_AS,145,145,50,14
- PUSHBUTTON "Cancel",IDCANCEL,200,145,50,14
+ PUSHBUTTON "Ulo\x9Ei\x9D ako...",IDC_SAVE_AS,145,145,50,14
+ PUSHBUTTON "Zru\x9Ai\x9D",IDCANCEL,200,145,50,14
END
IDD_PROP_VSS DIALOGEX 0, 0, 235, 157
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
-CAPTION "Syst\xE9m verzi\xED"
+CAPTION "Syst\xE9m pre sp\xE1vu verzi\xED"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "Syst\xE9m &verzi\xED:",IDC_STATIC,7,7,221,10
+ LTEXT "Syst\xE9m pre spr\xE1vu &verzi\xED:",IDC_STATIC,7,7,221,10
COMBOBOX IDC_VER_SYS,7,18,166,98,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
LTEXT "&Cesta ku cleartool.exe:",IDC_VSS_L1,7,37,221,10
@@ -732,23 +732,23 @@
17,206,10
CONTROL "&Nezobrazuj sp\xFA\x9A\x9Dac\xED banner",IDC_DISABLE_SPLASH,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
- CONTROL "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button",
+ CONTROL "Zat&v\xE1ra\x9D okn\xE1 kl\xE1vesom ESC",IDC_ESC_CLOSES_WINDOW,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
- CONTROL "&Automatically verify paths in Open-dialog",
+ CONTROL "&Automaticky overova\x9D cestu v dial\xF3gu Otvori\x9D",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,47,206,10
- CONTROL "All&ow only one instance to run",IDC_SINGLE_INSTANCE,
+ CONTROL "Um&o\x9Eni beh iba jednej in\x9Atancie",IDC_SINGLE_INSTANCE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
+ LTEXT "A&utomatick\xE9 dop\xE5\xF2anie v dial\xF3gu Otvori\x9D:",IDC_STATIC,19,72,125,8
COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100,
+ GROUPBOX "Povo\xBE viacer\xE9 okn\xE1 pre porovnanie",IDC_STATIC,7,100,
221,37
- CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP,
+ CONTROL "Porovn\xE1vanie &adres\xE1rov",IDC_MULTIDOC_DIRCMP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
- CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP,
+ CONTROL "Porovn\xE1vanie &s\xFAborov",IDC_MULTIDOC_FILECMP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
- LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
+ LTEXT "WinMerge umo\x9E\xF2uje zamedzi\x9D zobrazovaniu be\x9En\xFDch spr\xE1v. Stla\xE8en\xEDm tla\xE8idla Reset sa znova spr\xE1vy zobrazia.",
IDC_STATIC,7,153,168,31
PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
WS_TABSTOP
@@ -761,7 +761,7 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
PUSHBUTTON "OK",IDOK,47,123,52,14
- PUSHBUTTON "Storno",IDCANCEL,115,123,52,14
+ PUSHBUTTON "Zru\x9Ai\x9D",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,7,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
LTEXT "Dostupn\xE9 jazyky:",IDC_STATIC,7,7,140,8
@@ -770,10 +770,10 @@
IDD_EDIT_FIND DIALOGEX 30, 73, 283, 74
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "N\xE1jdi"
+CAPTION "H\xBEada\x9D"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "&H\xBEadaj:",IDC_STATIC,7,9,50,8
+ LTEXT "&H\xBEada\x9D:",IDC_STATIC,7,9,50,8
COMBOBOX IDC_EDIT_FINDTEXT,59,7,160,65,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
CONTROL "Iba cel\xE9 &slov\xE1",IDC_EDIT_WHOLE_WORD,"Button",
@@ -782,24 +782,24 @@
BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10
CONTROL "&Regul\xE1rny v\xFDraz",IDC_EDIT_REGEXP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10
- CONTROL "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button",
+ CONTROL "&Nezalamova\x9D koniec s\xFAboru",IDC_FINDDLG_DONTWRAP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,57,135,10
- GROUPBOX "Smer h\xBEadania",IDC_STATIC,148,23,70,36,WS_GROUP
+ GROUPBOX "S&mer h\xBEadania",IDC_STATIC,148,23,70,36,WS_GROUP
CONTROL "&Nahor",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,154,34,57,10
CONTROL "Na&dol",IDC_EDIT_DIRECTION_DOWN,"Button",
BS_AUTORADIOBUTTON,154,44,57,10
DEFPUSHBUTTON "&N\xE1jdi \xEFal\x9A\xED",IDOK,226,7,50,14,WS_GROUP
- PUSHBUTTON "Storno",IDCANCEL,226,24,50,14
+ PUSHBUTTON "Zru\x9Ai\x9D",IDCANCEL,226,24,50,14
END
IDD_EDIT_REPLACE DIALOGEX 36, 44, 306, 90
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Nahra?"
+CAPTION "Nahradi\x9D"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "&H\xBEadaj:",IDC_STATIC,7,9,65,8
+ LTEXT "&H\xBEada\x9D:",IDC_STATIC,7,9,65,8
COMBOBOX IDC_EDIT_FINDTEXT,75,7,165,66,CBS_DROPDOWN |
CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
LTEXT "Nahradi\x9D:",IDC_STATIC,7,24,65,8
@@ -821,7 +821,7 @@
DEFPUSHBUTTON "N\xE1jdi \xEFal\x9A\xED",IDC_EDIT_SKIP,247,7,52,14,WS_GROUP
PUSHBUTTON "Nahra\xEF",IDC_EDIT_REPLACE,247,24,52,14
PUSHBUTTON "Nahra\xEF v\x9Aetko",IDC_EDIT_REPLACE_ALL,247,41,52,14
- PUSHBUTTON "Storno",IDCANCEL,247,58,52,14
+ PUSHBUTTON "Zru\x9Ai\x9D",IDCANCEL,247,58,52,14
END
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
@@ -831,23 +831,23 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "CheckOut",IDOK,169,115,50,14
- PUSHBUTTON "Cancel",IDCANCEL,223,115,50,14
- PUSHBUTTON "Save As...",IDC_SAVE_AS,169,115,50,14,NOT WS_VISIBLE
+ PUSHBUTTON "Zru\x9Ai\x9D",IDCANCEL,223,115,50,14
+ PUSHBUTTON "Ulo\x9Ei\x9D ako...",IDC_SAVE_AS,169,115,50,14,NOT WS_VISIBLE
EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL |
ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
- LTEXT "Comments",IDC_STATIC,18,7,80,10
- CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button",
+ LTEXT "Koment\xE1re",IDC_STATIC,18,7,80,10
+ CONTROL "Pou\x9Ei\x9D na v\x9Aetky polo\x9Eky",IDC_MULTI_CHECKOUT,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,83,235,8
- CONTROL "CheckIn after checkout",IDC_CHECKIN,"Button",
+ CONTROL "Check in po checkout-e",IDC_CHECKIN,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Linefilters"
+CAPTION "Riadkov\xE9 filtre"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "Ignoruj riadky obsahuj\xFAce nasledovn\xE9 vzorky (patterns):",
+ CONTROL "Ignoruj riadky obsahuj\xFAce nasledovn\xE9 vzorky:",
IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
7,221,15
LTEXT "Regul\xE1rne v\xFDrazy (jeden na riadok):",IDC_STATIC,7,28,
@@ -869,8 +869,8 @@
CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
WS_TABSTOP,113,49,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CTEXT "Background",IDC_STATIC,96,15,50,8
- CTEXT "Deleted",IDC_STATIC,145,15,38,8
+ CTEXT "Pozadie",IDC_STATIC,96,15,50,8
+ CTEXT "Zmazan\xE9",IDC_STATIC,145,15,38,8
CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW |
WS_TABSTOP,156,29,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
@@ -887,7 +887,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
@@ -897,7 +897,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
@@ -907,28 +907,28 @@
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
CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button",
BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,170,50,14
+ PUSHBUTTON "Predvolen\xE9",IDC_COLORDEFAULTS_BTN,166,170,50,14
END
IDD_OUTPUT DIALOGEX 0, 0, 278, 157
@@ -944,75 +944,75 @@
IDD_PROPPAGE_REGISTRY DIALOGEX 0, 0, 235, 220
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
-CAPTION "System"
+CAPTION "Syst\xE9m"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Send deleted files to Recycle Bin",IDC_USE_RECYCLE_BIN,
+ CONTROL "&Posiela\x9D zmazan\xE9 s\xFAbory do ko\x9Aa",IDC_USE_RECYCLE_BIN,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,222,10
- CONTROL "Ign&ore time differences less than 3 seconds",
+ CONTROL "Ign&oruj \xE8asov\xE9 rozdiely men\x9Aie ako 3 sekundy",
IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,17,222,10
- GROUPBOX "Integration",IDC_STATIC,7,30,218,46
- CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+ GROUPBOX "Integr\xE1cia",IDC_STATIC,7,30,218,46
+ CONTROL "&Prida\x9D do kontextov\xE9ho menu Prieskumn\xEDka",IDC_EXPLORER_CONTEXT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,200,10
- CONTROL "E&nable advanced menu",IDC_EXPLORER_ADVANCED,"Button",
+ CONTROL "Zap&n\xFA\x9D roz\x9A\xEDren\xE9 menu",IDC_EXPLORER_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,51,200,10
- CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS,
+ CONTROL "Za&h\xE0\xF2a\x9D \x9Atandardne aj podadres\xE1re",IDC_EXPLORER_SUBFOLDERS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,61,200,10
- LTEXT "&External editor:",IDC_STATIC,7,83,222,8
+ LTEXT "&Extern\xFD editor:",IDC_STATIC,7,83,222,8
EDITTEXT IDC_EXT_EDITOR_PATH,7,93,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "&Browse...",IDC_EXT_EDITOR_BROWSE,179,93,50,14
- LTEXT "&Filter folder:",IDC_STATIC,7,111,166,8
+ PUSHBUTTON "&Preh\xBEad\xE1va\x9D...",IDC_EXT_EDITOR_BROWSE,179,93,50,14
+ LTEXT "Adres\xE1r s &filtrami:",IDC_STATIC,7,111,166,8
EDITTEXT IDC_FILTER_USER_PATH,7,121,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_FILTER_USER_BROWSE,179,121,50,14
+ PUSHBUTTON "Preh\xBEad\xE1va\x9D...",IDC_FILTER_USER_BROWSE,179,121,50,14
END
IDD_GENERATE_PATCH DIALOGEX 0, 0, 340, 180
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Patch Generator"
+CAPTION "Gener\xE1tor patchov"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "File&1:",IDC_STATIC,7,10,36,8
+ LTEXT "S\xFAbor&1:",IDC_STATIC,7,10,36,8
COMBOBOX IDC_DIFF_FILE1,48,7,230,93,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "&Browse...",IDC_DIFF_BROWSE_FILE1,283,7,50,14
- LTEXT "File&2:",IDC_STATIC,7,27,36,8
+ PUSHBUTTON "&Preh\xBEad\xE1va\x9D",IDC_DIFF_BROWSE_FILE1,283,7,50,14
+ LTEXT "S\xFAbor&2:",IDC_STATIC,7,27,36,8
COMBOBOX IDC_DIFF_FILE2,48,24,230,96,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "Br&owse...",IDC_DIFF_BROWSE_FILE2,283,24,50,14
- PUSHBUTTON "&Swap",IDC_DIFF_SWAPFILES,283,41,50,14
- CONTROL "&Append to existing file",IDC_DIFF_APPENDFILE,"Button",
+ PUSHBUTTON "Preh\xBEad\xE1va\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 "&Result:",IDC_STATIC,7,66,37,8
+ LTEXT "&V\xFDsledok:",IDC_STATIC,7,66,37,8
COMBOBOX IDC_DIFF_FILERESULT,48,63,230,96,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "Bro&wse...",IDC_DIFF_BROWSE_RESULT,283,63,50,14
- GROUPBOX "&Format",IDC_STATIC,7,81,142,46
- LTEXT "St&yle:",IDC_STATIC,13,95,46,8
+ PUSHBUTTON "Preh\xBEad\xE1va\x9D",IDC_DIFF_BROWSE_RESULT,283,63,50,14
+ GROUPBOX "&Form\xE1t",IDC_STATIC,7,81,142,46
+ LTEXT "\x8A&t\xFDl:",IDC_STATIC,13,95,46,8
COMBOBOX IDC_DIFF_STYLE,63,92,80,68,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
- LTEXT "&Context:",IDC_STATIC,13,109,46,8
+ LTEXT "&Kontext:",IDC_STATIC,13,109,46,8
COMBOBOX IDC_DIFF_CONTEXT,63,108,80,65,CBS_DROPDOWNLIST |
WS_DISABLED | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "W&hitespaces",IDC_STATIC,155,81,123,46
- CONTROL "Com&pare",IDC_DIFF_WHITESPACE_COMPARE,"Button",
+ GROUPBOX "&Netla\xE8ite\xBEn\xE9 znaky:",IDC_STATIC,155,81,123,46
+ CONTROL "&Porovna\x9D",IDC_DIFF_WHITESPACE_COMPARE,"Button",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,162,92,110,10
- CONTROL "I&gnore changes",IDC_DIFF_WHITESPACE_IGNORE,"Button",
+ CONTROL "I&gnorova\x9D zmeny",IDC_DIFF_WHITESPACE_IGNORE,"Button",
BS_AUTORADIOBUTTON | WS_TABSTOP,162,102,110,10
- CONTROL "Ig&nore all",IDC_DIFF_WHITESPACE_IGNOREALL,"Button",
+ CONTROL "Ig&norova\x9D v\x9Aetko",IDC_DIFF_WHITESPACE_IGNOREALL,"Button",
BS_AUTORADIOBUTTON | WS_TABSTOP,162,112,110,10
- CONTROL "Ignor&e blank lines",IDC_DIFF_WHITESPACE_IGNOREBLANKS,
+ CONTROL "Ignor&ova\x9D pr\xE1zdne riadky",IDC_DIFF_WHITESPACE_IGNOREBLANKS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,134,142,10
- CONTROL "Case sensi&tive",IDC_DIFF_CASESENSITIVE,"Button",
+ CONTROL "&Zoh\xBEadn\xF2ova\x9D ve\xBEkos\x9D p\xEDsmen",IDC_DIFF_CASESENSITIVE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,145,142,10
- CONTROL "Inclu&de command line",IDC_DIFF_INCLCMDLINE,"Button",
+ CONTROL "Zahrn\xFA\x9D pr\xEDkazov\xFD ria&dok",IDC_DIFF_INCLCMDLINE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,155,134,170,10
- CONTROL "Open to e&xternal editor",IDC_DIFF_OPENTOEDITOR,"Button",
+ CONTROL "Otvori\x9D v e&xternom editore",IDC_DIFF_OPENTOEDITOR,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,155,145,170,10
- PUSHBUTTON "Defaults",IDC_DIFF_DEFAULTS,7,159,50,14
+ PUSHBUTTON "Predvolen\xE9",IDC_DIFF_DEFAULTS,7,159,50,14
DEFPUSHBUTTON "OK",IDOK,230,159,50,14
- PUSHBUTTON "Cancel",IDCANCEL,283,159,50,14
+ PUSHBUTTON "Zru\x9Ai\x9D",IDCANCEL,283,159,50,14
END
IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12
@@ -1030,41 +1030,41 @@
IDD_DIRCOLS DIALOGEX 0, 0, 307, 163
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Display Columns"
+CAPTION "Zobrazova\x9D st\xE5pce"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "Show columns",IDC_GROUP_SHOW,7,7,145,102
+ GROUPBOX "Zobrazova\x9D st\xE5pce",IDC_GROUP_SHOW,7,7,145,102
LISTBOX IDC_LIST_SHOW,52,18,92,83,LBS_NOINTEGRALHEIGHT |
LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "&Up",IDC_UP,15,45,30,14
- PUSHBUTTON "&Down",IDC_DOWN,15,63,30,14
- GROUPBOX "Hide columns",IDC_GROUP_HIDE,193,7,108,102
+ PUSHBUTTON "&Hore",IDC_UP,15,45,30,14
+ PUSHBUTTON "&Dolu",IDC_DOWN,15,63,30,14
+ GROUPBOX "Skry\x9D st\xE5pce",IDC_GROUP_HIDE,193,7,108,102
LISTBOX IDC_LIST_HIDE,201,18,92,83,LBS_NOINTEGRALHEIGHT |
LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
PUSHBUTTON "<<",IDC_ADD,159,45,27,14
PUSHBUTTON ">>",IDC_REMOVE,159,63,27,14
EDITTEXT IDC_COLDLG_DESC,7,115,294,22,ES_MULTILINE | ES_READONLY
- PUSHBUTTON "Defaults",IDC_COLDLG_DEFAULTS,7,143,50,14
+ PUSHBUTTON "Predvolen\xE9",IDC_COLDLG_DEFAULTS,7,143,50,14
DEFPUSHBUTTON "OK",IDOK,197,143,50,14
- PUSHBUTTON "Cancel",IDCANCEL,251,143,50,14
+ PUSHBUTTON "Zru\x9Ai\x9D",IDCANCEL,251,143,50,14
END
IDD_SELECTUNPACKER DIALOGEX 0, 0, 278, 102
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Select Unpacker"
+CAPTION "Vyber rozba\xBEovac\xED program"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,168,81,50,14
- PUSHBUTTON "Cancel",IDCANCEL,222,81,50,14
- LTEXT "File unpacker:",IDC_STATIC,7,9,63,8
+ PUSHBUTTON "Zru\x9Ai\x9D",IDCANCEL,222,81,50,14
+ LTEXT "Rozba\xBEovac\xED program:",IDC_STATIC,7,9,63,8
COMBOBOX IDC_UNPACKER_NAME,72,7,200,54,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- CONTROL "Display all unpackers, don't check the extension",
+ CONTROL "Zobraz v\x9Aetky rozba\xBEovacie programy, nekontroluj pr\xEDponu",
IDC_UNPACKER_ALLOW_ALL,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,72,66,200,10
- LTEXT "Extensions list:",IDC_STATIC,7,26,63,8
- LTEXT "Description:",IDC_STATIC,7,43,63,8
+ LTEXT "Zoznam pr\xEDpon:",IDC_STATIC,7,26,63,8
+ LTEXT "Popis:",IDC_STATIC,7,43,63,8
EDITTEXT IDC_UNPACKER_SUPPORTED_EXTENSIONS,72,24,200,12,
ES_AUTOHSCROLL | ES_READONLY
EDITTEXT IDC_UNPACKER_DESCRIPTION,72,41,200,20,ES_MULTILINE | ES_AUTOVSCROLL |
@@ -1075,7 +1075,7 @@
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
WS_CAPTION
EXSTYLE WS_EX_TOOLWINDOW
-CAPTION " Folder Compare Progress"
+CAPTION " Priebeh porovnania adres\xE1rov"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,167,15,83,14
@@ -1083,63 +1083,63 @@
44,241,9
RTEXT "0",IDC_ITEMSCOMPARED,95,29,30,8
RTEXT "0",IDC_ITEMSTOTAL,95,19,30,8
- LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
- LTEXT "Items compared:",IDC_STATIC,7,29,85,8
- LTEXT "Items total:",IDC_STATIC,7,19,85,8
+ LTEXT "Porovn\xE1vam polo\x9Eky...",IDC_STATIC,7,7,150,8
+ LTEXT "Porovnan\xFDch polo\x9Eiek:",IDC_STATIC,7,29,85,8
+ LTEXT "Polo\x9Eiek celkom:",IDC_STATIC,7,19,85,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Go To"
+CAPTION "Cho\xEF na"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "G&oto:",IDC_STATIC,7,9,36,8
+ LTEXT "Ch&o\xEF na:",IDC_STATIC,7,9,36,8
EDITTEXT IDC_WMGOTO_PARAM,45,7,102,14,ES_AUTOHSCROLL | ES_NUMBER
- GROUPBOX "File",IDC_STATIC,7,27,57,35
- CONTROL "&Left",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ GROUPBOX "S\xFAbor",IDC_STATIC,7,27,57,35
+ CONTROL "\xBC&av\xFD",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,13,38,48,10
- CONTROL "&Right",IDC_WMGOTO_FILERIGHT,"Button",
+ CONTROL "&Prav\xFD",IDC_WMGOTO_FILERIGHT,"Button",
BS_AUTORADIOBUTTON,13,48,47,10
- GROUPBOX ...
[truncated message content] |
|
From: <ki...@us...> - 2006-12-12 15:04:35
|
Revision: 3951
http://svn.sourceforge.net/winmerge/?rev=3951&view=rev
Author: kimmov
Date: 2006-12-12 07:04:29 -0800 (Tue, 12 Dec 2006)
Log Message:
-----------
PATCH: [ 1557295 ] Exclude Source Control files and directories filter
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
Added Paths:
-----------
branches/R2_6/Filters/SourceControl.flt
Added: branches/R2_6/Filters/SourceControl.flt
===================================================================
--- branches/R2_6/Filters/SourceControl.flt (rev 0)
+++ branches/R2_6/Filters/SourceControl.flt 2006-12-12 15:04:29 UTC (rev 3951)
@@ -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: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-12-12 15:01:10 UTC (rev 3950)
+++ branches/R2_6/Src/Changes.txt 2006-12-12 15:04:29 UTC (rev 3951)
@@ -7,6 +7,9 @@
Submitted by Ivan Mas\xE1r
ShellExtension/Languages: ShellExtensionSlovak.rc
Src/Languages/Slovak: MergeSlovak.rc
+ PATCH: [ 1557295 ] Exclude Source Control files and directories filter
+ Submitted by Paul Welter
+ Filters new file: SourceControl.flt
2006-12-11 Kimmo
PATCH: [ 1610442 ] Make time getting faster for files
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-12 15:08:56
|
Revision: 3952
http://svn.sourceforge.net/winmerge/?rev=3952&view=rev
Author: kimmov
Date: 2006-12-12 07:08:54 -0800 (Tue, 12 Dec 2006)
Log Message:
-----------
Add Peter Welter and Ivan Mas?\195?\161r to contributors
Modified Paths:
--------------
branches/R2_6/Docs/Users/Contributors.txt
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_6/Docs/Users/Contributors.txt 2006-12-12 15:04:29 UTC (rev 3951)
+++ branches/R2_6/Docs/Users/Contributors.txt 2006-12-12 15:08:54 UTC (rev 3952)
@@ -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: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-12-12 15:04:29 UTC (rev 3951)
+++ branches/R2_6/Src/Changes.txt 2006-12-12 15:08:54 UTC (rev 3952)
@@ -10,6 +10,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-11 Kimmo
PATCH: [ 1610442 ] Make time getting faster for files
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-12 15:36:23
|
Revision: 3954
http://svn.sourceforge.net/winmerge/?rev=3954&view=rev
Author: kimmov
Date: 2006-12-12 07:36:19 -0800 (Tue, 12 Dec 2006)
Log Message:
-----------
Update shellextension version number to 1.9.1
Modified Paths:
--------------
branches/R2_6/ShellExtension/ShellExtension.rc
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/ShellExtension/ShellExtension.rc
===================================================================
--- branches/R2_6/ShellExtension/ShellExtension.rc 2006-12-12 15:33:23 UTC (rev 3953)
+++ branches/R2_6/ShellExtension/ShellExtension.rc 2006-12-12 15:36:19 UTC (rev 3954)
@@ -224,8 +224,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,9,0,0
- PRODUCTVERSION 1,9,0,0
+ FILEVERSION 1,9,1,0
+ PRODUCTVERSION 1,9,1,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.9.1.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.9.1.0\0"
VALUE "SpecialBuild", "\0"
END
END
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-12-12 15:33:23 UTC (rev 3953)
+++ branches/R2_6/Src/Changes.txt 2006-12-12 15:36:19 UTC (rev 3954)
@@ -12,6 +12,8 @@
Filters new file: SourceControl.flt
Add Peter Welter and Ivan Mas\xE1r to contributors
Docs/Users: Contributors.txt
+ Update shellextension version number to 1.9.1
+ ShellExtension: ShellExtension.rc
2006-12-11 Kimmo
PATCH: [ 1610442 ] Make time getting faster for files
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:25:57
|
Revision: 3990
http://svn.sourceforge.net/winmerge/?rev=3990&view=rev
Author: kimmov
Date: 2006-12-20 12:25:56 -0800 (Wed, 20 Dec 2006)
Log Message:
-----------
BUG: [ 1619689 ] Filefilter: ASP.NET Devel
Modified Paths:
--------------
branches/R2_6/Filters/ASPNET.flt
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/Filters/ASPNET.flt
===================================================================
--- branches/R2_6/Filters/ASPNET.flt 2006-12-20 20:22:51 UTC (rev 3989)
+++ branches/R2_6/Filters/ASPNET.flt 2006-12-20 20:25:56 UTC (rev 3990)
@@ -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: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-12-20 20:22:51 UTC (rev 3989)
+++ branches/R2_6/Src/Changes.txt 2006-12-20 20:25:56 UTC (rev 3990)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-20 Kimmo
+ BUG: [ 1619689 ] Filefilter: ASP.NET Devel
+ Filters: ASPNET.flt
+
2006-12-18 Kimmo
BUG: [ 1602219 ] Crappy save of project files
Src: MainFrm.cpp ProjectFilePathsDlg.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2007-01-11 13:57:39
|
Revision: 4034
http://svn.sourceforge.net/winmerge/?rev=4034&view=rev
Author: galh
Date: 2007-01-11 05:57:37 -0800 (Thu, 11 Jan 2007)
Log Message:
-----------
BUG: [ 1602313 ] WinMerge stays in tasklist after closing
Modified Paths:
--------------
branches/R2_6/Docs/Users/Contributors.txt
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/MainFrm.cpp
branches/R2_6/Src/MainFrm.h
Modified: branches/R2_6/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_6/Docs/Users/Contributors.txt 2007-01-11 13:51:19 UTC (rev 4033)
+++ branches/R2_6/Docs/Users/Contributors.txt 2007-01-11 13:57:37 UTC (rev 4034)
@@ -117,6 +117,7 @@
* Tim Musschoot
* Vincent Osele
* Michael Richter
+* Fanny Ricour
* Markus Rollmann
* Philippe Verdy
* Vikrant
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-01-11 13:51:19 UTC (rev 4033)
+++ branches/R2_6/Src/Changes.txt 2007-01-11 13:57:37 UTC (rev 4034)
@@ -2,6 +2,12 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-11 Gal
+ BUG: [ 1602313 ] WinMerge stays in tasklist after closing
+ Src: MainFrm.cpp MainFrm.h
+ Add Fanny Ricour to contributors list
+ Docs/Users: Contributors.txt
+
2007-01-10 Takashi
BUG: [ 1631613 ] WinMerge crashes when editing code files
Src/editlib: ccrystaleditview.cpp
Modified: branches/R2_6/Src/MainFrm.cpp
===================================================================
--- branches/R2_6/Src/MainFrm.cpp 2007-01-11 13:51:19 UTC (rev 4033)
+++ branches/R2_6/Src/MainFrm.cpp 2007-01-11 13:57:37 UTC (rev 4034)
@@ -155,7 +155,8 @@
ON_COMMAND(ID_FILE_SAVEPROJECT, OnSaveProject)
ON_WM_TIMER()
ON_WM_ACTIVATE()
- //}}AFX_MSG_MAP
+ ON_WM_NCDESTROY()
+ //}}AFX_MSG_MAP
END_MESSAGE_MAP()
/**
@@ -3089,6 +3090,15 @@
}
}
+void CMainFrame::OnNcDestroy()
+{
+ CMDIFrameWnd::OnNcDestroy();
+
+ // A temporary patch which double-post the WM_QUIT message until we'll
+ // figure who is "eating" the first message.
+ AfxPostQuitMessage(0);
+}
+
BOOL CMainFrame::CreateToobar()
{
if (!m_wndToolBar.Create(this, WS_CHILD|WS_VISIBLE|CBRS_GRIPPER|CBRS_TOP|CBRS_TOOLTIPS|CBRS_FLYBY|CBRS_SIZE_DYNAMIC) ||
Modified: branches/R2_6/Src/MainFrm.h
===================================================================
--- branches/R2_6/Src/MainFrm.h 2007-01-11 13:51:19 UTC (rev 4033)
+++ branches/R2_6/Src/MainFrm.h 2007-01-11 13:57:37 UTC (rev 4034)
@@ -278,6 +278,7 @@
afx_msg void OnUpdateWindowCloseAll(CCmdUI* pCmdUI);
afx_msg void OnSaveProject();
afx_msg void OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized);
+ afx_msg void OnNcDestroy();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
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:42:02
|
Revision: 4043
http://svn.sourceforge.net/winmerge/?rev=4043&view=rev
Author: kimmov
Date: 2007-01-14 11:41:55 -0800 (Sun, 14 Jan 2007)
Log Message:
-----------
Update manual URL point to 2.6 version manual in readme.txt
Modified Paths:
--------------
branches/R2_6/Docs/Users/Languages/ReadMe-Bulgarian.txt
branches/R2_6/Docs/Users/Languages/ReadMe-Catalan.txt
branches/R2_6/Docs/Users/Languages/ReadMe-Spanish.txt
branches/R2_6/Docs/Users/Languages/ReadMe-Swedish.txt
branches/R2_6/Docs/Users/ReadMe.txt
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/Docs/Users/Languages/ReadMe-Bulgarian.txt
===================================================================
--- branches/R2_6/Docs/Users/Languages/ReadMe-Bulgarian.txt 2007-01-14 19:41:44 UTC (rev 4042)
+++ branches/R2_6/Docs/Users/Languages/ReadMe-Bulgarian.txt 2007-01-14 19:41:55 UTC (rev 4043)
@@ -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: branches/R2_6/Docs/Users/Languages/ReadMe-Catalan.txt
===================================================================
--- branches/R2_6/Docs/Users/Languages/ReadMe-Catalan.txt 2007-01-14 19:41:44 UTC (rev 4042)
+++ branches/R2_6/Docs/Users/Languages/ReadMe-Catalan.txt 2007-01-14 19:41:55 UTC (rev 4043)
@@ -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: branches/R2_6/Docs/Users/Languages/ReadMe-Spanish.txt
===================================================================
--- branches/R2_6/Docs/Users/Languages/ReadMe-Spanish.txt 2007-01-14 19:41:44 UTC (rev 4042)
+++ branches/R2_6/Docs/Users/Languages/ReadMe-Spanish.txt 2007-01-14 19:41:55 UTC (rev 4043)
@@ -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: branches/R2_6/Docs/Users/Languages/ReadMe-Swedish.txt
===================================================================
--- branches/R2_6/Docs/Users/Languages/ReadMe-Swedish.txt 2007-01-14 19:41:44 UTC (rev 4042)
+++ branches/R2_6/Docs/Users/Languages/ReadMe-Swedish.txt 2007-01-14 19:41:55 UTC (rev 4043)
@@ -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: branches/R2_6/Docs/Users/ReadMe.txt
===================================================================
--- branches/R2_6/Docs/Users/ReadMe.txt 2007-01-14 19:41:44 UTC (rev 4042)
+++ branches/R2_6/Docs/Users/ReadMe.txt 2007-01-14 19:41:55 UTC (rev 4043)
@@ -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: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-01-14 19:41:44 UTC (rev 4042)
+++ branches/R2_6/Src/Changes.txt 2007-01-14 19:41:55 UTC (rev 4043)
@@ -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-12 Takashi
BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly(2)
Src: FileActionScript.cpp DirActions.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:14:42
|
Revision: 4046
http://svn.sourceforge.net/winmerge/?rev=4046&view=rev
Author: gerundt
Date: 2007-01-14 12:14:37 -0800 (Sun, 14 Jan 2007)
Log Message:
-----------
PATCH: [ 1633632 ] Plugin to ignore leading line numbers in text files
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Plugins.xml
branches/R2_6/Plugins/Changes.txt
Added Paths:
-----------
branches/R2_6/Plugins/dlls/IgnoreLeadingLineNumbers.dll
branches/R2_6/Plugins/src_VB/IgnoreLeadingLineNumbers/
branches/R2_6/Plugins/src_VB/IgnoreLeadingLineNumbers/IgnoreLeadingLineNumbers.vbp
branches/R2_6/Plugins/src_VB/IgnoreLeadingLineNumbers/WinMergeScript.cls
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2007-01-14 20:13:33 UTC (rev 4045)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2007-01-14 20:14:37 UTC (rev 4046)
@@ -1,3 +1,7 @@
+2007-01-14 Tim
+ PATCH: [ 1633632 ] Plugin to ignore leading line numbers in text files
+ Manual: Plugins.xml
+
2007-01-04 Tim
PATCH: [ 1626464 ] Manual: Highlight examples with CSS
Manual/css: all.css help.css print.css
Modified: branches/R2_6/Docs/Users/Manual/Plugins.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Plugins.xml 2007-01-14 20:13:33 UTC (rev 4045)
+++ branches/R2_6/Docs/Users/Manual/Plugins.xml 2007-01-14 20:14:37 UTC (rev 4046)
@@ -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: branches/R2_6/Plugins/Changes.txt
===================================================================
--- branches/R2_6/Plugins/Changes.txt 2007-01-14 20:13:33 UTC (rev 4045)
+++ branches/R2_6/Plugins/Changes.txt 2007-01-14 20:14:37 UTC (rev 4046)
@@ -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: branches/R2_6/Plugins/dlls/IgnoreLeadingLineNumbers.dll
===================================================================
(Binary files differ)
Property changes on: branches/R2_6/Plugins/dlls/IgnoreLeadingLineNumbers.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/R2_6/Plugins/src_VB/IgnoreLeadingLineNumbers/IgnoreLeadingLineNumbers.vbp
===================================================================
--- branches/R2_6/Plugins/src_VB/IgnoreLeadingLineNumbers/IgnoreLeadingLineNumbers.vbp (rev 0)
+++ branches/R2_6/Plugins/src_VB/IgnoreLeadingLineNumbers/IgnoreLeadingLineNumbers.vbp 2007-01-14 20:14:37 UTC (rev 4046)
@@ -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: branches/R2_6/Plugins/src_VB/IgnoreLeadingLineNumbers/WinMergeScript.cls
===================================================================
--- branches/R2_6/Plugins/src_VB/IgnoreLeadingLineNumbers/WinMergeScript.cls (rev 0)
+++ branches/R2_6/Plugins/src_VB/IgnoreLeadingLineNumbers/WinMergeScript.cls 2007-01-14 20:14:37 UTC (rev 4046)
@@ -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:42:55
|
Revision: 4053
http://svn.sourceforge.net/winmerge/?rev=4053&view=rev
Author: kimmov
Date: 2007-01-15 12:42:50 -0800 (Mon, 15 Jan 2007)
Log Message:
-----------
PATCH: [ 1620076 ] Add Bazaar and Mercurial to SourceControl.flt
- Submitted by Ren?\195?\169 Leonhardt
Modified Paths:
--------------
branches/R2_6/Filters/SourceControl.flt
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/Filters/SourceControl.flt
===================================================================
--- branches/R2_6/Filters/SourceControl.flt 2007-01-15 20:40:36 UTC (rev 4052)
+++ branches/R2_6/Filters/SourceControl.flt 2007-01-15 20:42:50 UTC (rev 4053)
@@ -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: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-01-15 20:40:36 UTC (rev 4052)
+++ branches/R2_6/Src/Changes.txt 2007-01-15 20:42:50 UTC (rev 4053)
@@ -6,6 +6,9 @@
Revert regexp uppercasing patches as they seem to cause different problems
Backs out patches: bug #1616838 Directory filter broken?
patch #1607343 Fix filefilter regexp uppercasing for 2.6 branch
+ 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
