You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(148) |
Oct
(84) |
Nov
(130) |
Dec
(121) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(89) |
Feb
(50) |
Mar
(81) |
Apr
(45) |
May
(42) |
Jun
(46) |
Jul
(40) |
Aug
(98) |
Sep
(80) |
Oct
(101) |
Nov
(128) |
Dec
(46) |
| 2008 |
Jan
(132) |
Feb
(117) |
Mar
(118) |
Apr
(112) |
May
(69) |
Jun
(140) |
Jul
(164) |
Aug
(159) |
Sep
(115) |
Oct
(65) |
Nov
(80) |
Dec
(128) |
| 2009 |
Jan
(145) |
Feb
(97) |
Mar
(118) |
Apr
(87) |
May
(96) |
Jun
(83) |
Jul
(50) |
Aug
(42) |
Sep
(18) |
Oct
(32) |
Nov
(12) |
Dec
(35) |
| 2010 |
Jan
(38) |
Feb
(8) |
Mar
(5) |
Apr
(19) |
May
(23) |
Jun
(39) |
Jul
(16) |
Aug
(4) |
Sep
(60) |
Oct
(100) |
Nov
(57) |
Dec
(43) |
| 2011 |
Jan
(25) |
Feb
(1) |
Mar
(3) |
Apr
|
May
(13) |
Jun
(19) |
Jul
|
Aug
(6) |
Sep
(5) |
Oct
(6) |
Nov
|
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ki...@us...> - 2006-09-21 17:11:20
|
Revision: 3598
http://svn.sourceforge.net/winmerge/?rev=3598&view=rev
Author: kimmov
Date: 2006-09-21 10:11:10 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
Fix 64-bit pointer truncation in SetWindowLongPtr call (the last I hope)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/ChildFrm.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-21 17:09:31 UTC (rev 3597)
+++ trunk/Src/Changes.txt 2006-09-21 17:11:10 UTC (rev 3598)
@@ -9,6 +9,8 @@
ShellExtension: ShellExtension.rc
Fix 64-bit typecast warning
Src: GhostTextBuffer.h
+ Fix 64-bit pointer truncation in SetWindowLongPtr call (the last I hope)
+ Src: ChildFrm.cpp
2006-09-20 Kimmo
PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
Modified: trunk/Src/ChildFrm.cpp
===================================================================
--- trunk/Src/ChildFrm.cpp 2006-09-21 17:09:31 UTC (rev 3597)
+++ trunk/Src/ChildFrm.cpp 2006-09-21 17:11:10 UTC (rev 3598)
@@ -361,7 +361,7 @@
EnumChildWindows(hwnd, EnumChildProc, FALSE);
- pfnOldWndProc = (WNDPROC)SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG)WndProc);
+ pfnOldWndProc = (WNDPROC)SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)WndProc);
SetProp(hwnd, _T("OldWndProc"), (HANDLE)pfnOldWndProc);
return TRUE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-21 17:09:38
|
Revision: 3597
http://svn.sourceforge.net/winmerge/?rev=3597&view=rev
Author: kimmov
Date: 2006-09-21 10:09:31 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
Fix 64-bit typecast warning
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/GhostTextBuffer.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-21 16:49:15 UTC (rev 3596)
+++ trunk/Src/Changes.txt 2006-09-21 17:09:31 UTC (rev 3597)
@@ -7,6 +7,8 @@
Src: Splash.cpp
Bump ShellExtension version to 1.9.0 (first 64-bit Windows version)
ShellExtension: ShellExtension.rc
+ Fix 64-bit typecast warning
+ Src: GhostTextBuffer.h
2006-09-20 Kimmo
PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
Modified: trunk/Src/GhostTextBuffer.h
===================================================================
--- trunk/Src/GhostTextBuffer.h 2006-09-21 16:49:15 UTC (rev 3596)
+++ trunk/Src/GhostTextBuffer.h 2006-09-21 17:09:31 UTC (rev 3597)
@@ -156,10 +156,10 @@
m_nRealLinesCreated = src.m_nRealLinesCreated;
m_nRealLinesInDeletedBlock = src.m_nRealLinesInDeletedBlock;
SetText(src.GetText());
- int size = src.m_paSavedRevisonNumbers->GetSize();
+ INT_PTR size = src.m_paSavedRevisonNumbers->GetSize();
m_paSavedRevisonNumbers = new CDWordArray();
m_paSavedRevisonNumbers->SetSize(size);
- int i;
+ INT_PTR i;
for (i = 0; i < size; i++)
(*m_paSavedRevisonNumbers)[i] = (*src.m_paSavedRevisonNumbers)[i];
return *this;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-21 16:49:23
|
Revision: 3596
http://svn.sourceforge.net/winmerge/?rev=3596&view=rev
Author: kimmov
Date: 2006-09-21 09:49:15 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
Bump ShellExtension version to 1.9.0 (first 64-bit Windows version)
Modified Paths:
--------------
trunk/ShellExtension/ShellExtension.rc
trunk/Src/Changes.txt
Modified: trunk/ShellExtension/ShellExtension.rc
===================================================================
--- trunk/ShellExtension/ShellExtension.rc 2006-09-21 16:45:44 UTC (rev 3595)
+++ trunk/ShellExtension/ShellExtension.rc 2006-09-21 16:49:15 UTC (rev 3596)
@@ -224,8 +224,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,8,1,0
- PRODUCTVERSION 1,8,1,0
+ FILEVERSION 1,9,0,0
+ PRODUCTVERSION 1,9,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -243,7 +243,7 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "\0"
VALUE "FileDescription", "ShellExtension Module\0"
- VALUE "FileVersion", "1.8.1.0\0"
+ VALUE "FileVersion", "1.9.0.0\0"
VALUE "InternalName", "ShellExtension\0"
VALUE "LegalCopyright", "Copyright 2003-2006\0"
VALUE "LegalTrademarks", "\0"
@@ -251,7 +251,7 @@
VALUE "OriginalFilename", "ShellExtension.DLL\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "ShellExtension Module\0"
- VALUE "ProductVersion", "1.8.1.0\0"
+ VALUE "ProductVersion", "1.9.0.0\0"
VALUE "SpecialBuild", "\0"
END
END
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-21 16:45:44 UTC (rev 3595)
+++ trunk/Src/Changes.txt 2006-09-21 16:49:15 UTC (rev 3596)
@@ -5,6 +5,8 @@
2006-09-21 Kimmo
PATCH: [ 1558213 ] Tweak text positions in splash screen
Src: Splash.cpp
+ Bump ShellExtension version to 1.9.0 (first 64-bit Windows version)
+ ShellExtension: ShellExtension.rc
2006-09-20 Kimmo
PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-21 16:45:52
|
Revision: 3595
http://svn.sourceforge.net/winmerge/?rev=3595&view=rev
Author: kimmov
Date: 2006-09-21 09:45:44 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
PATCH: [ 1558213 ] Tweak text positions in splash screen
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Splash.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-21 16:32:34 UTC (rev 3594)
+++ trunk/Src/Changes.txt 2006-09-21 16:45:44 UTC (rev 3595)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-09-21 Kimmo
+ PATCH: [ 1558213 ] Tweak text positions in splash screen
+ Src: Splash.cpp
+
2006-09-20 Kimmo
PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
Src/Common: UniFile.cpp
Modified: trunk/Src/Splash.cpp
===================================================================
--- trunk/Src/Splash.cpp 2006-09-21 16:32:34 UTC (rev 3594)
+++ trunk/Src/Splash.cpp 2006-09-21 16:45:44 UTC (rev 3595)
@@ -47,15 +47,11 @@
*/
static const CRect VersionTextArea(255, 5, 469, 20);
-/**
- * @brief Area for developers list.
- */
-static const CRect DevelopersArea(20, 93, 190, 210);
+/** @brief Area for developers list. */
+static const CRect DevelopersArea(20, 88, 190, 210);
-/**
- * @brief Area for copyright text.
- */
-static const CRect CopyrightArea(20, 215, 190, 330);
+/** @brief Area for copyright text. */
+static const CRect CopyrightArea(20, 210, 190, 330);
/////////////////////////////////////////////////////////////////////////////
// Splash Screen class
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-21 16:32:42
|
Revision: 3594
http://svn.sourceforge.net/winmerge/?rev=3594&view=rev
Author: kimmov
Date: 2006-09-21 09:32:34 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
PATCH: [ 1561668 ] Install translated readme texts
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-09-20 20:12:10 UTC (rev 3593)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-09-21 16:32:34 UTC (rev 3594)
@@ -1,3 +1,7 @@
+2006-09-21 Kimmo
+ PATCH: [ 1561668 ] Install translated readme texts
+ InnoSetup: WinMerge.iss
+
2006-09-20 Gal
PATCH: [ 1552248 ] Install as a ClearCase diff tool
InnoSetup: WinMerge.iss
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2006-09-20 20:12:10 UTC (rev 3593)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2006-09-21 16:32:34 UTC (rev 3594)
@@ -340,7 +340,9 @@
Source: ..\..\Build\ShellExtensionX64\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64
Source: ..\..\Build\Languages\MergeBulgarian.lang; DestDir: {app}\Languages; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp
+Source: ..\..\Docs\Users\Languages\ReadMe-Bulgarian.txt; DestDir: {app}\Docs; Components: Languages\Bulgarian
Source: ..\..\Build\Languages\MergeCatalan.lang; DestDir: {app}\Languages; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp
+Source: ..\..\Docs\Users\Languages\ReadMe-Catalan.txt; DestDir: {app}\Docs; Components: Languages\Catalan
Source: ..\..\Build\Languages\MergeChineseSimplified.lang; DestDir: {app}\Languages; Components: Languages\Chinese_Simplified; Flags: ignoreversion comparetimestamp
Source: ..\..\Build\Languages\MergeChineseTraditional.lang; DestDir: {app}\Languages; Components: Languages\Chinese_Traditional; Flags: ignoreversion comparetimestamp
Source: ..\..\Build\Languages\MergeCzech.lang; DestDir: {app}\Languages; Components: Languages\Czech; Flags: ignoreversion comparetimestamp
@@ -358,7 +360,9 @@
Source: ..\..\Build\Languages\MergeRussian.lang; DestDir: {app}\Languages; Components: Languages\Russian; Flags: ignoreversion comparetimestamp
Source: ..\..\Build\Languages\MergeSlovak.lang; DestDir: {app}\Languages; Components: Languages\Slovak; Flags: ignoreversion comparetimestamp
Source: ..\..\Build\Languages\MergeSpanish.lang; DestDir: {app}\Languages; Components: Languages\Spanish; Flags: ignoreversion comparetimestamp
+Source: ..\..\Docs\Users\Languages\ReadMe-Spanish.txt; DestDir: {app}\Docs; Components: Languages\Spanish
Source: ..\..\Build\Languages\MergeSwedish.lang; DestDir: {app}\Languages; Components: Languages\Swedish; Flags: ignoreversion comparetimestamp
+Source: ..\..\Docs\Users\Languages\ReadMe-Swedish.txt; DestDir: {app}\Docs; Components: Languages\Swedish
Source: ..\..\Build\Languages\MergeTurkish.lang; DestDir: {app}\Languages; Components: Languages\Turkish; Flags: ignoreversion comparetimestamp
Source: ..\..\Filters\*.flt; DestDir: {app}\Filters; Flags: sortfilesbyextension comparetimestamp ignoreversion; Components: filters
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-20 20:12:18
|
Revision: 3593
http://svn.sourceforge.net/winmerge/?rev=3593&view=rev
Author: kimmov
Date: 2006-09-20 13:12:10 -0700 (Wed, 20 Sep 2006)
Log Message:
-----------
Fix 64-bit pointer truncation in SetWindowLongPtr call
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/ChildFrm.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-20 19:01:09 UTC (rev 3592)
+++ trunk/Src/Changes.txt 2006-09-20 20:12:10 UTC (rev 3593)
@@ -17,6 +17,8 @@
Src: Merge.cpp
Fix hex number used instead of INVALID_HANDLE_VALUE
Src/Common: sinstance.cpp
+ Fix 64-bit pointer truncation in SetWindowLongPtr call
+ Src: ChildFrm.cpp
2006-09-19 Kimmo
PATCH: [ 1561001 ] Fix FileActionScript type in running actions
Modified: trunk/Src/ChildFrm.cpp
===================================================================
--- trunk/Src/ChildFrm.cpp 2006-09-20 19:01:09 UTC (rev 3592)
+++ trunk/Src/ChildFrm.cpp 2006-09-20 20:12:10 UTC (rev 3593)
@@ -373,7 +373,7 @@
{
WNDPROC pfnOldWndProc = (WNDPROC)RemoveProp(hwnd, _T("OldWndProc"));
if (pfnOldWndProc)
- SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG)pfnOldWndProc);
+ SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)pfnOldWndProc);
EnumChildWindows(hwnd, EnumChildProc, TRUE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-20 19:01:21
|
Revision: 3592
http://svn.sourceforge.net/winmerge/?rev=3592&view=rev
Author: kimmov
Date: 2006-09-20 12:01:09 -0700 (Wed, 20 Sep 2006)
Log Message:
-----------
Fix hex number used instead of INVALID_HANDLE_VALUE
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/sinstance.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-20 16:58:55 UTC (rev 3591)
+++ trunk/Src/Changes.txt 2006-09-20 19:01:09 UTC (rev 3592)
@@ -15,6 +15,8 @@
Src new files: FilterCommentsManager.cpp FilterCommentsManager.h
Fix 64-bit compile warning by casting last SendMessage() param to LPARAM
Src: Merge.cpp
+ Fix hex number used instead of INVALID_HANDLE_VALUE
+ Src/Common: sinstance.cpp
2006-09-19 Kimmo
PATCH: [ 1561001 ] Fix FileActionScript type in running actions
Modified: trunk/Src/Common/sinstance.cpp
===================================================================
--- trunk/Src/Common/sinstance.cpp 2006-09-20 16:58:55 UTC (rev 3591)
+++ trunk/Src/Common/sinstance.cpp 2006-09-20 19:01:09 UTC (rev 3592)
@@ -161,7 +161,7 @@
//First create the MMF
int nMMFSize = sizeof(CWindowInstance);
- instanceData.hInstanceData = ::CreateFileMapping((HANDLE)0xFFFFFFFF, NULL, PAGE_READWRITE, 0, nMMFSize, GetMMFFilename());
+ instanceData.hInstanceData = ::CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, nMMFSize, GetMMFFilename());
if (instanceData.hInstanceData == NULL)
{
TRACE(_T("Failed to create the MMF even though this is the first instance, you might want to consider overriding GetMMFFilename()\n"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-20 16:59:09
|
Revision: 3591
http://svn.sourceforge.net/winmerge/?rev=3591&view=rev
Author: kimmov
Date: 2006-09-20 09:58:55 -0700 (Wed, 20 Sep 2006)
Log Message:
-----------
Fix 64-bit compile warning by casting last SendMessage() param to LPARAM
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Merge.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-20 14:38:13 UTC (rev 3590)
+++ trunk/Src/Changes.txt 2006-09-20 16:58:55 UTC (rev 3591)
@@ -13,6 +13,8 @@
PATCH: [ 1561650 ] Separate FilterCommentsManager code from DiffWrapper
Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp
Src new files: FilterCommentsManager.cpp FilterCommentsManager.h
+ Fix 64-bit compile warning by casting last SendMessage() param to LPARAM
+ Src: Merge.cpp
2006-09-19 Kimmo
PATCH: [ 1561001 ] Fix FileActionScript type in running actions
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2006-09-20 14:38:13 UTC (rev 3590)
+++ trunk/Src/Merge.cpp 2006-09-20 16:58:55 UTC (rev 3591)
@@ -237,7 +237,7 @@
data.cbData = (DWORD)(p - pszArgs) * sizeof(WCHAR);
data.lpData = pszArgs;
data.dwData = __argc;
- SendMessage(hWnd, WM_COPYDATA, NULL, (LONG)&data);
+ SendMessage(hWnd, WM_COPYDATA, NULL, (LPARAM)&data);
delete[] pszArgs;
ReleaseMutex(hMutex);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-20 14:38:31
|
Revision: 3590
http://svn.sourceforge.net/winmerge/?rev=3590&view=rev
Author: kimmov
Date: 2006-09-20 07:38:13 -0700 (Wed, 20 Sep 2006)
Log Message:
-----------
PATCH: [ 1561650 ] Separate FilterCommentsManager code from DiffWrapper
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DiffWrapper.cpp
trunk/Src/DiffWrapper.h
trunk/Src/Merge.dsp
Added Paths:
-----------
trunk/Src/FilterCommentsManager.cpp
trunk/Src/FilterCommentsManager.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-20 14:32:50 UTC (rev 3589)
+++ trunk/Src/Changes.txt 2006-09-20 14:38:13 UTC (rev 3590)
@@ -10,6 +10,9 @@
Src/Common: CSubclass.cpp sizecbar.cpp
BUG: [ 1561781 ] 64-bit compile errors from 7zCommon.cpp
Src: 7zCommon.cpp
+ PATCH: [ 1561650 ] Separate FilterCommentsManager code from DiffWrapper
+ Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp
+ Src new files: FilterCommentsManager.cpp FilterCommentsManager.h
2006-09-19 Kimmo
PATCH: [ 1561001 ] Fix FileActionScript type in running actions
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2006-09-20 14:32:50 UTC (rev 3589)
+++ trunk/Src/DiffWrapper.cpp 2006-09-20 14:38:13 UTC (rev 3590)
@@ -39,6 +39,7 @@
#include "CompareOptions.h"
#include "FileTextStats.h"
#include "DiffFileData.h"
+#include "FilterCommentsManager.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -53,150 +54,23 @@
static void CopyTextStats(const file_data * inf, FileTextStats * myTextStats);
static void CopyDiffutilTextStats(file_data *inf, DiffFileData * diffData);
-//Should move FilterComments classes and global functions to it's own *.cpp & *.h file
-//IngnoreComment logic developed by David Maisonave AKA (Axter)
-/**
-@struct FilterCommentsSet
-@brief FilterCommentsSet holds search strings used to find comments in compared files.
- This data is used to find blocks that can be ignored when comparing to files.
-@note
- The ignore-comment logic can only use ANSI strings, because the search buffer is
- char* type.
- Therefore, the data members should not be replaced with CString type, and should
- remain std::string, or other non-unicode type string.
-*/
-struct FilterCommentsSet
-{
- std::string StartMarker;
- std::string EndMarker;
- std::string InlineMarker;
-};
+// Postfiltering
+static bool IsTrivialBytes(const char* Start, const char* End,
+ const FilterCommentsSet& filtercommentsset);
+static bool IsTrivialLine(const std::string &Line, const char * StartOfComment,
+ const char * EndOfComment, const char * InLineComment,
+ const FilterCommentsSet& filtercommentsset);
+static bool PostFilter(int StartPos, int EndPos, int Direction,
+ int QtyLinesInBlock, int &Op, int FileNo,
+ const FilterCommentsSet& filtercommentsset);
+static void PostFilterSingleLine(const char* LineStr, int &Op,
+ const FilterCommentsSet& filtercommentsset, bool PartOfMultiLineCheck);
+static void PostFilter(int LineNumberLeft, int QtyLinesLeft, int LineNumberRight,
+ int QtyLinesRight, int &Op, const FilterCommentsManager &filtercommentsmanager,
+ const TCHAR *FileNameExt);
/**
-@class FilterCommentsManager
-@brief FilterCommentsManager reads language comment start and end marker strings from
- an INI file, and stores it in the map member variable m_FilterCommentsSetByFileType.
- Each set of comment markers have a list of file types that can be used with
- the file markers.
-@note
-The ignore-comment logic can only use ANSI strings, because the search buffer is
-char* type.
-FilterCommentsManager uses _T logic, only so-as to allow UNICODE file names to be
-used for the INI file, or INI file base directory.
-After retrieving data from INI file, the data is converted to ANSI.
-If no INI file exist, or the INI file is empty, then a default INI file is
-created with default values that are assoicated with most commen languages.
-*/
-class FilterCommentsManager
-{
-public:
- /**
- @brief FilterCommentsManager constructor, which reads the INI file data
- and populates the mapped member variable m_FilterCommentsSetByFileType.
- @param[in] Optional full INI file name, to include path.
- */
- FilterCommentsManager(const TCHAR* IniFileName = _T("")) : m_IniFileName(IniFileName)
- {
- USES_CONVERSION;
-
- int SectionNo = 0;
- TCHAR SectionName[99];
- TCHAR buffer[1024];
- if (m_IniFileName.IsEmpty())
- {
- m_IniFileName = GetModulePath() + _T("\\IgnoreSectionMarkers.ini");
- }
- for(SectionNo = 0;;++SectionNo)
- {//Get each set of markers
- FilterCommentsSet filtercommentsset;
- _sntprintf(SectionName, sizeof(SectionName)/sizeof(SectionName[0]), _T("set%i"), SectionNo);
- GetPrivateProfileString(SectionName, _T("StartMarker"), _T(""), buffer,sizeof(buffer), m_IniFileName);
- filtercommentsset.StartMarker = T2CA(buffer);
- GetPrivateProfileString(SectionName, _T("EndMarker"), _T(""), buffer,sizeof(buffer), m_IniFileName);
- filtercommentsset.EndMarker = T2CA(buffer);
- GetPrivateProfileString(SectionName, _T("InlineMarker"), _T(""), buffer,sizeof(buffer), m_IniFileName);
- filtercommentsset.InlineMarker = T2CA(buffer);
- if (filtercommentsset.StartMarker.empty() &&
- filtercommentsset.EndMarker.empty() &&
- filtercommentsset.InlineMarker.empty())
- {
- break;
- }
- int FileTypeNo = 0;
- TCHAR FileTypeFieldName[99];
- for(FileTypeNo = 0;;++FileTypeNo)
- {//Get each file type associated with current set of markers
- _sntprintf(FileTypeFieldName, sizeof(FileTypeFieldName)/sizeof(FileTypeFieldName[0]), _T("FileType%i"), FileTypeNo);
- GetPrivateProfileString(SectionName, FileTypeFieldName, _T(""), buffer,sizeof(buffer), m_IniFileName);
- CString FileTypeExtensionName = buffer;
- if (FileTypeExtensionName.IsEmpty())
- break;
- m_FilterCommentsSetByFileType[FileTypeExtensionName] = filtercommentsset;
- }
- }
-
- if (!SectionNo)
- {//If no markers were found, then initialize default markers
- CreateDefaultMarkers();
- }
- }
-
- /**
- @brief Get comment markers that are associated with this file type.
- If there are no comment markers associated with this file type,
- then return an empty set.
- @param[in] The file name extension. Example:("cpp", "java", "c", "h")
- Must be lower case.
- */
- FilterCommentsSet GetSetForFileType(const CString& FileTypeName) const
- {
- std::map <CString, FilterCommentsSet> :: const_iterator pSet =
- m_FilterCommentsSetByFileType.find(FileTypeName);
- if (pSet == m_FilterCommentsSetByFileType.end())
- return FilterCommentsSet();
- return pSet->second;
- }
-private:
- FilterCommentsManager(const FilterCommentsManager&); //Don't allow copy
- FilterCommentsManager& operator=(const FilterCommentsManager&);//Don't allow assignment
- /**
- @brief Create default comment marker strings
- @note
- Currently, only have C/C++/Java type markers.
- */
- void CreateDefaultMarkers()
- {
- USES_CONVERSION;
- int SectionNo = 0;
- TCHAR SectionName[99];
- FilterCommentsSet filtercommentsset;
- filtercommentsset.StartMarker = "/*";
- filtercommentsset.EndMarker = "*/";
- filtercommentsset.InlineMarker = "//";
- TCHAR CommonFileTypes1[][9] = {_T("java"), _T("cs"), _T("cpp"), _T("c"), _T("h"), _T("cxx"), _T("cc"), _T("js"), _T("jsl"), _T("tli"), _T("tlh"), _T("rc")};
- _sntprintf(SectionName, sizeof(SectionName)/sizeof(SectionName[0]), _T("set%i"), SectionNo);
- ++SectionNo;
- WritePrivateProfileString(SectionName, _T("StartMarker"), A2CT(filtercommentsset.StartMarker.c_str()), m_IniFileName);
- WritePrivateProfileString(SectionName, _T("EndMarker"), A2CT(filtercommentsset.EndMarker.c_str()), m_IniFileName);
- WritePrivateProfileString(SectionName, _T("InlineMarker"), A2CT(filtercommentsset.InlineMarker.c_str()), m_IniFileName);
- int FileTypeNo = 0;
- for(int i = 0;i < sizeof(CommonFileTypes1)/sizeof(CommonFileTypes1[0]);++i)
- {
- m_FilterCommentsSetByFileType[CommonFileTypes1[i]] = filtercommentsset;
- TCHAR FileTypeFieldName[99];
- _sntprintf(FileTypeFieldName, sizeof(FileTypeFieldName)/sizeof(FileTypeFieldName[0]), _T("FileType%i"), FileTypeNo);
- ++FileTypeNo;
- WritePrivateProfileString(SectionName, FileTypeFieldName, CommonFileTypes1[i], m_IniFileName);
- }
- }
-
- //Use CString instead of std::string, so as to allow UNICODE file extensions
- std::map<CString, FilterCommentsSet> m_FilterCommentsSetByFileType;
- CString m_IniFileName;
-};
-
-/**
* @brief Default constructor.
* Initializes members and creates new FilterCommentsManager.
*/
@@ -353,7 +227,8 @@
* @param [in] filtercommentsset - For future use to determine trivial bytes
* @return Returns true if all characters are trivial
*/
-bool IsTrivialBytes(const char* Start, const char* End, const FilterCommentsSet& filtercommentsset)
+static bool IsTrivialBytes(const char* Start, const char* End,
+ const FilterCommentsSet& filtercommentsset)
{
std::string testdata(Start, End);
//@TODO: Need to replace the following trivial string with a user specified string
@@ -370,7 +245,7 @@
* @param [in] filtercommentsset - Comment marker set used to indicate comment blocks.
* @return Returns true if entire line is trivial
*/
-bool IsTrivialLine(const std::string &Line,
+static bool IsTrivialLine(const std::string &Line,
const char * StartOfComment,
const char * EndOfComment,
const char * InLineComment,
@@ -421,7 +296,9 @@
@return Always returns true in reverse direction.
In forward direction, returns false if none trivial data is found within QtyLinesInBlock
*/
-bool PostFilter(int StartPos, int EndPos, int Direction, int QtyLinesInBlock, int &Op, int FileNo, const FilterCommentsSet& filtercommentsset)
+static bool PostFilter(int StartPos, int EndPos, int Direction,
+ int QtyLinesInBlock, int &Op, int FileNo,
+ const FilterCommentsSet& filtercommentsset)
{
const char* EolIndicators = "\r\n"; //List of characters used as EOL
if (Op == OP_TRIVIAL) //If already set to trivial, then exit.
@@ -546,7 +423,8 @@
@param[in] filtercommentsset - Comment marker set used to indicate comment blocks.
@param[in] PartOfMultiLineCheck- Set to true, if this block is a multiple line block
*/
-void PostFilterSingleLine(const char* LineStr, int &Op, const FilterCommentsSet& filtercommentsset, bool PartOfMultiLineCheck)
+static void PostFilterSingleLine(const char* LineStr, int &Op,
+ const FilterCommentsSet& filtercommentsset, bool PartOfMultiLineCheck)
{
if (Op == OP_TRIVIAL)
return;
@@ -587,7 +465,9 @@
@param[in] filtercommentsset - Comment marker set used to indicate comment blocks.
@param[in] FileNameExt - The file name extension. Needs to be lower case string ("cpp", "java", "c")
*/
-void PostFilter(int LineNumberLeft, int QtyLinesLeft, int LineNumberRight, int QtyLinesRight, int &Op, const FilterCommentsManager &filtercommentsmanager, const TCHAR *FileNameExt)
+static void PostFilter(int LineNumberLeft, int QtyLinesLeft, int LineNumberRight,
+ int QtyLinesRight, int &Op, const FilterCommentsManager &filtercommentsmanager,
+ const TCHAR *FileNameExt)
{
if (Op == OP_TRIVIAL)
return;
Modified: trunk/Src/DiffWrapper.h
===================================================================
--- trunk/Src/DiffWrapper.h 2006-09-20 14:32:50 UTC (rev 3589)
+++ trunk/Src/DiffWrapper.h 2006-09-20 14:38:13 UTC (rev 3590)
@@ -39,6 +39,8 @@
class DiffList;
struct DiffFileData;
struct file_data;
+class FilterCommentsManager;
+struct FilterCommentsSet;
/** @enum COMPARE_TYPE
* @brief Different foldercompare methods.
Added: trunk/Src/FilterCommentsManager.cpp
===================================================================
--- trunk/Src/FilterCommentsManager.cpp (rev 0)
+++ trunk/Src/FilterCommentsManager.cpp 2006-09-20 14:38:13 UTC (rev 3590)
@@ -0,0 +1,122 @@
+/////////////////////////////////////////////////////////////////////////////
+// License (GPLv2+):
+// 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.
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file FilterCommentsManager.cpp
+ *
+ * @brief FilterCommentsManager class implementation.
+ */
+
+#include "stdafx.h"
+#include <string>
+#include <map>
+
+#include "coretools.h"
+#include "FilterCommentsManager.h"
+
+/**
+@brief FilterCommentsManager constructor, which reads the INI file data
+ and populates the mapped member variable m_FilterCommentsSetByFileType.
+@param[in] Optional full INI file name, to include path.
+*/
+FilterCommentsManager::FilterCommentsManager(const TCHAR* IniFileName /*= _T("")*/)
+ : m_IniFileName(IniFileName)
+{
+ USES_CONVERSION;
+
+ int SectionNo = 0;
+ TCHAR SectionName[99];
+ TCHAR buffer[1024];
+ if (m_IniFileName.IsEmpty())
+ {
+ m_IniFileName = GetModulePath() + _T("\\IgnoreSectionMarkers.ini");
+ }
+ for(SectionNo = 0;;++SectionNo)
+ {//Get each set of markers
+ FilterCommentsSet filtercommentsset;
+ _sntprintf(SectionName, sizeof(SectionName)/sizeof(SectionName[0]), _T("set%i"), SectionNo);
+ GetPrivateProfileString(SectionName, _T("StartMarker"), _T(""), buffer,sizeof(buffer), m_IniFileName);
+ filtercommentsset.StartMarker = T2CA(buffer);
+ GetPrivateProfileString(SectionName, _T("EndMarker"), _T(""), buffer,sizeof(buffer), m_IniFileName);
+ filtercommentsset.EndMarker = T2CA(buffer);
+ GetPrivateProfileString(SectionName, _T("InlineMarker"), _T(""), buffer,sizeof(buffer), m_IniFileName);
+ filtercommentsset.InlineMarker = T2CA(buffer);
+ if (filtercommentsset.StartMarker.empty() &&
+ filtercommentsset.EndMarker.empty() &&
+ filtercommentsset.InlineMarker.empty())
+ {
+ break;
+ }
+ int FileTypeNo = 0;
+ TCHAR FileTypeFieldName[99];
+ for(FileTypeNo = 0;;++FileTypeNo)
+ {//Get each file type associated with current set of markers
+ _sntprintf(FileTypeFieldName, sizeof(FileTypeFieldName)/sizeof(FileTypeFieldName[0]), _T("FileType%i"), FileTypeNo);
+ GetPrivateProfileString(SectionName, FileTypeFieldName, _T(""), buffer,sizeof(buffer), m_IniFileName);
+ CString FileTypeExtensionName = buffer;
+ if (FileTypeExtensionName.IsEmpty())
+ break;
+ m_FilterCommentsSetByFileType[FileTypeExtensionName] = filtercommentsset;
+ }
+ }
+
+ if (!SectionNo)
+ {//If no markers were found, then initialize default markers
+ CreateDefaultMarkers();
+ }
+}
+
+/**
+ @brief Get comment markers that are associated with this file type.
+ If there are no comment markers associated with this file type,
+ then return an empty set.
+ @param[in] The file name extension. Example:("cpp", "java", "c", "h")
+ Must be lower case.
+*/
+FilterCommentsSet FilterCommentsManager::GetSetForFileType(const CString& FileTypeName) const
+{
+ std::map <CString, FilterCommentsSet> :: const_iterator pSet =
+ m_FilterCommentsSetByFileType.find(FileTypeName);
+ if (pSet == m_FilterCommentsSetByFileType.end())
+ return FilterCommentsSet();
+ return pSet->second;
+}
+
+void FilterCommentsManager::CreateDefaultMarkers()
+{
+ USES_CONVERSION;
+ int SectionNo = 0;
+ TCHAR SectionName[99];
+ FilterCommentsSet filtercommentsset;
+ filtercommentsset.StartMarker = "/*";
+ filtercommentsset.EndMarker = "*/";
+ filtercommentsset.InlineMarker = "//";
+ TCHAR CommonFileTypes1[][9] = {_T("java"), _T("cs"), _T("cpp"), _T("c"), _T("h"), _T("cxx"), _T("cc"), _T("js"), _T("jsl"), _T("tli"), _T("tlh"), _T("rc")};
+ _sntprintf(SectionName, sizeof(SectionName)/sizeof(SectionName[0]), _T("set%i"), SectionNo);
+ ++SectionNo;
+ WritePrivateProfileString(SectionName, _T("StartMarker"), A2CT(filtercommentsset.StartMarker.c_str()), m_IniFileName);
+ WritePrivateProfileString(SectionName, _T("EndMarker"), A2CT(filtercommentsset.EndMarker.c_str()), m_IniFileName);
+ WritePrivateProfileString(SectionName, _T("InlineMarker"), A2CT(filtercommentsset.InlineMarker.c_str()), m_IniFileName);
+ int FileTypeNo = 0;
+ for(int i = 0;i < sizeof(CommonFileTypes1)/sizeof(CommonFileTypes1[0]);++i)
+ {
+ m_FilterCommentsSetByFileType[CommonFileTypes1[i]] = filtercommentsset;
+ TCHAR FileTypeFieldName[99];
+ _sntprintf(FileTypeFieldName, sizeof(FileTypeFieldName)/sizeof(FileTypeFieldName[0]), _T("FileType%i"), FileTypeNo);
+ ++FileTypeNo;
+ WritePrivateProfileString(SectionName, FileTypeFieldName, CommonFileTypes1[i], m_IniFileName);
+ }
+}
Added: trunk/Src/FilterCommentsManager.h
===================================================================
--- trunk/Src/FilterCommentsManager.h (rev 0)
+++ trunk/Src/FilterCommentsManager.h 2006-09-20 14:38:13 UTC (rev 3590)
@@ -0,0 +1,78 @@
+/////////////////////////////////////////////////////////////////////////////
+// License (GPLv2+):
+// 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.
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file FilterCommentsManager.h
+ *
+ * @brief FilterCommentsManager class declaration.
+ */
+
+//#include <string>
+//#include <map>
+
+#ifndef _FILTERCOMMENTSMANAGER_H_
+#define _FILTERCOMMENTSMANAGER_H_
+
+//IngnoreComment logic developed by David Maisonave AKA (Axter)
+/**
+@struct FilterCommentsSet
+@brief FilterCommentsSet holds search strings used to find comments in compared files.
+ This data is used to find blocks that can be ignored when comparing to files.
+@note
+ The ignore-comment logic can only use ANSI strings, because the search buffer is
+ char* type.
+ Therefore, the data members should not be replaced with CString type, and should
+ remain std::string, or other non-unicode type string.
+*/
+struct FilterCommentsSet
+{
+ std::string StartMarker;
+ std::string EndMarker;
+ std::string InlineMarker;
+};
+
+/**
+@class FilterCommentsManager
+@brief FilterCommentsManager reads language comment start and end marker strings from
+ an INI file, and stores it in the map member variable m_FilterCommentsSetByFileType.
+ Each set of comment markers have a list of file types that can be used with
+ the file markers.
+@note
+The ignore-comment logic can only use ANSI strings, because the search buffer is
+char* type.
+FilterCommentsManager uses _T logic, only so-as to allow UNICODE file names to be
+used for the INI file, or INI file base directory.
+After retrieving data from INI file, the data is converted to ANSI.
+If no INI file exist, or the INI file is empty, then a default INI file is
+created with default values that are assoicated with most commen languages.
+*/
+class FilterCommentsManager
+{
+public:
+ FilterCommentsManager(const TCHAR* IniFileName = _T(""));
+ FilterCommentsSet GetSetForFileType(const CString& FileTypeName) const;
+
+private:
+ FilterCommentsManager(const FilterCommentsManager&); //Don't allow copy
+ FilterCommentsManager& operator=(const FilterCommentsManager&);//Don't allow assignment
+ void CreateDefaultMarkers();
+
+ //Use CString instead of std::string, so as to allow UNICODE file extensions
+ std::map<CString, FilterCommentsSet> m_FilterCommentsSetByFileType;
+ CString m_IniFileName;
+};
+
+#endif // _FILTERCOMMENTSMANAGER_H_
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2006-09-20 14:32:50 UTC (rev 3589)
+++ trunk/Src/Merge.dsp 2006-09-20 14:38:13 UTC (rev 3590)
@@ -437,6 +437,10 @@
# End Source File
# Begin Source File
+SOURCE=.\FilterCommentsManager.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\GhostTextBuffer.cpp
# End Source File
# Begin Source File
@@ -1161,6 +1165,10 @@
# End Source File
# Begin Source File
+SOURCE=.\FilterCommentsManager.h
+# End Source File
+# Begin Source File
+
SOURCE=.\GhostTextBuffer.h
# End Source File
# Begin Source File
@@ -2412,10 +2420,10 @@
# End Group
# End Target
# End Project
-# Section Merge : {00312E6C-0754-0055-90BD-550078075500}
-# 1:19:IDR_POPUP_ABOUT_DLG:104
-# End Section
# Section Merge : {6F747475-446E-6C62-436C-6B0000003100}
# 1:10:IDB_SPLASH:103
# 2:21:SplashScreenInsertKey:4.0
# End Section
+# Section Merge : {00312E6C-0754-0055-90BD-550078075500}
+# 1:19:IDR_POPUP_ABOUT_DLG:104
+# End Section
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-20 14:32:56
|
Revision: 3589
http://svn.sourceforge.net/winmerge/?rev=3589&view=rev
Author: kimmov
Date: 2006-09-20 07:32:50 -0700 (Wed, 20 Sep 2006)
Log Message:
-----------
BUG: [ 1561781 ] 64-bit compile errors from 7zCommon.cpp
Modified Paths:
--------------
trunk/Src/7zCommon.cpp
trunk/Src/Changes.txt
Modified: trunk/Src/7zCommon.cpp
===================================================================
--- trunk/Src/7zCommon.cpp 2006-09-20 14:25:17 UTC (rev 3588)
+++ trunk/Src/7zCommon.cpp 2006-09-20 14:32:50 UTC (rev 3589)
@@ -199,7 +199,7 @@
static const DWORD m_dwVer7zRecommended;
static const TCHAR m_strRegistryKey[];
static const TCHAR m_strDownloadURL[];
- static BOOL CALLBACK DlgProc(HWND, UINT, WPARAM, LPARAM);
+ static INT_PTR CALLBACK DlgProc(HWND, UINT, WPARAM, LPARAM);
static DWORD FormatVersion(LPTSTR, LPTSTR, DWORD);
};
@@ -363,7 +363,7 @@
/**
* @brief DLGPROC for C7ZipMismatchException's ReportError() popup.
*/
-BOOL CALLBACK C7ZipMismatchException::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK C7ZipMismatchException::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
{
@@ -522,7 +522,7 @@
*/
int C7ZipMismatchException::ReportError(UINT nType, UINT nMessageID)
{
- short response = -1;
+ UINT_PTR response = -1;
m_bShowAllways = nMessageID;
if (!m_bShowAllways)
{
@@ -658,7 +658,7 @@
/**
* @brief Callback to pass to EnumResourceLanguages.
*/
-BOOL CALLBACK FindNextResLang(HMODULE hModule, LPCTSTR lpType, LPCTSTR lpName, WORD wLanguage, LONG lParam)
+BOOL CALLBACK FindNextResLang(HANDLE hModule, LPCTSTR lpType, LPCTSTR lpName, WORD wLanguage, LONG_PTR lParam)
{
LPWORD pwLanguage = (LPWORD)lParam;
WORD wPrevious = *pwLanguage;
@@ -736,7 +736,7 @@
if (HINSTANCE hinstLang = AfxGetResourceHandle())
{
WORD wLangID = 0;
- if (EnumResourceLanguages(hinstLang, RT_VERSION, MAKEINTRESOURCE(VS_VERSION_INFO), FindNextResLang, (LPARAM)&wLangID) == 0)
+ if (EnumResourceLanguages(hinstLang, RT_VERSION, MAKEINTRESOURCE(VS_VERSION_INFO), (ENUMRESLANGPROC)FindNextResLang, (LPARAM)&wLangID) == 0)
{
flags |= wLangID << 16;
}
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-20 14:25:17 UTC (rev 3588)
+++ trunk/Src/Changes.txt 2006-09-20 14:32:50 UTC (rev 3589)
@@ -8,6 +8,8 @@
PATCH: [ 1561796 ] Get/SetWindowLong not supported in 64-bit Windows
Src: 7zCommon.cpp ChildFrm.cpp
Src/Common: CSubclass.cpp sizecbar.cpp
+ BUG: [ 1561781 ] 64-bit compile errors from 7zCommon.cpp
+ Src: 7zCommon.cpp
2006-09-19 Kimmo
PATCH: [ 1561001 ] Fix FileActionScript type in running actions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-20 14:25:27
|
Revision: 3588
http://svn.sourceforge.net/winmerge/?rev=3588&view=rev
Author: kimmov
Date: 2006-09-20 07:25:17 -0700 (Wed, 20 Sep 2006)
Log Message:
-----------
PATCH: [ 1561796 ] Get/SetWindowLong not supported in 64-bit Windows
Modified Paths:
--------------
trunk/Src/7zCommon.cpp
trunk/Src/Changes.txt
trunk/Src/ChildFrm.cpp
trunk/Src/Common/CSubclass.cpp
trunk/Src/Common/PropertyPageHost.cpp
trunk/Src/Common/sizecbar.cpp
Modified: trunk/Src/7zCommon.cpp
===================================================================
--- trunk/Src/7zCommon.cpp 2006-09-20 14:18:18 UTC (rev 3587)
+++ trunk/Src/7zCommon.cpp 2006-09-20 14:25:17 UTC (rev 3588)
@@ -483,7 +483,7 @@
if (hCursor)
{
SetCursor(hCursor);
- SetWindowLong(hWnd, DWL_MSGRESULT, 1);
+ SetWindowLongPtr(hWnd, DWLP_MSGRESULT, 1);
return TRUE;
}
} return FALSE;
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-20 14:18:18 UTC (rev 3587)
+++ trunk/Src/Changes.txt 2006-09-20 14:25:17 UTC (rev 3588)
@@ -5,6 +5,9 @@
2006-09-20 Kimmo
PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
Src/Common: UniFile.cpp
+ PATCH: [ 1561796 ] Get/SetWindowLong not supported in 64-bit Windows
+ Src: 7zCommon.cpp ChildFrm.cpp
+ Src/Common: CSubclass.cpp sizecbar.cpp
2006-09-19 Kimmo
PATCH: [ 1561001 ] Fix FileActionScript type in running actions
Modified: trunk/Src/ChildFrm.cpp
===================================================================
--- trunk/Src/ChildFrm.cpp 2006-09-20 14:18:18 UTC (rev 3587)
+++ trunk/Src/ChildFrm.cpp 2006-09-20 14:25:17 UTC (rev 3588)
@@ -361,7 +361,7 @@
EnumChildWindows(hwnd, EnumChildProc, FALSE);
- pfnOldWndProc = (WNDPROC)SetWindowLong(hwnd, GWL_WNDPROC, (LONG)WndProc);
+ pfnOldWndProc = (WNDPROC)SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG)WndProc);
SetProp(hwnd, _T("OldWndProc"), (HANDLE)pfnOldWndProc);
return TRUE;
}
@@ -373,7 +373,7 @@
{
WNDPROC pfnOldWndProc = (WNDPROC)RemoveProp(hwnd, _T("OldWndProc"));
if (pfnOldWndProc)
- SetWindowLong(hwnd, GWL_WNDPROC, (LONG)pfnOldWndProc);
+ SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG)pfnOldWndProc);
EnumChildWindows(hwnd, EnumChildProc, TRUE);
Modified: trunk/Src/Common/CSubclass.cpp
===================================================================
--- trunk/Src/Common/CSubclass.cpp 2006-09-20 14:18:18 UTC (rev 3587)
+++ trunk/Src/Common/CSubclass.cpp 2006-09-20 14:25:17 UTC (rev 3588)
@@ -2,7 +2,7 @@
\file CSubclass.cpp
\author Perry Rapp, Creator, 1998-2003
\date Created: 1998
- \date Edited: 2001/12/12 PR
+ \date Edited: 2006/09/20 Kimmo Varis: use Get/SetWindowLongPtr().
\brief Implementation of CSubclass
@@ -83,7 +83,7 @@
SubclassRec sdata;
sdata.m_data = data;
sdata.m_newproc = wndproc;
- sdata.m_oldproc = (WNDPROC) GetWindowLong(hwnd, GWL_WNDPROC);
+ sdata.m_oldproc = (WNDPROC) GetWindowLongPtr(hwnd, GWLP_WNDPROC);
sdata.m_suppressing = false;
if (unsubclassSucceeded)
sdata.m_succeededMsg = *unsubclassSucceeded;
@@ -93,7 +93,7 @@
sdata.m_failedMsg = *unsubclassFailed;
else
sdata.m_failedMsg.msg = 0;
- SetWindowLong(hwnd, GWL_WNDPROC, (LPARAM)(WNDPROC)wndproc);
+ SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LPARAM)(WNDPROC)wndproc);
pList->AddHead(sdata);
return true;
}
@@ -114,12 +114,12 @@
SubclassRec srec = pList->GetNext(pos);
if (srec.m_newproc == id)
{ // we're the latest subclass
- WNDPROC curproc = (WNDPROC) GetWindowLong(hwnd, GWL_WNDPROC);
+ WNDPROC curproc = (WNDPROC) GetWindowLongPtr(hwnd, GWLP_WNDPROC);
if (id != curproc)
// We're not the current wndproc, so we can't safely unhook
return false;
ASSERT(srec.m_oldproc); // internal error
- SetWindowLong(hwnd, GWL_WNDPROC, (LPARAM)(WNDPROC)srec.m_oldproc);
+ SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LPARAM)(WNDPROC)srec.m_oldproc);
pList->RemoveHead();
// fall thru to garbage collect list
}
Modified: trunk/Src/Common/PropertyPageHost.cpp
===================================================================
--- trunk/Src/Common/PropertyPageHost.cpp 2006-09-20 14:18:18 UTC (rev 3587)
+++ trunk/Src/Common/PropertyPageHost.cpp 2006-09-20 14:25:17 UTC (rev 3588)
@@ -12,7 +12,11 @@
#include "PropertyPageHost.h"
#if _MSC_VER > 1200
+#ifdef _WIN64
+# include <../src/mfc/occimpl.h>
+#else // _WIN64
# include <afxocc.h>
+#endif // _WIN64
#else
# include <..\src\occimpl.h>
#endif
Modified: trunk/Src/Common/sizecbar.cpp
===================================================================
--- trunk/Src/Common/sizecbar.cpp 2006-09-20 14:18:18 UTC (rev 3587)
+++ trunk/Src/Common/sizecbar.cpp 2006-09-20 14:25:17 UTC (rev 3588)
@@ -534,7 +534,7 @@
// erase the NC background
mdc.FillRect(rcDraw, CBrush::FromHandle(
- (HBRUSH) GetClassLong(m_hWnd, GCL_HBRBACKGROUND)));
+ (HBRUSH) GetClassLongPtr(m_hWnd, GCLP_HBRBACKGROUND)));
if (m_dwSCBStyle & SCBS_SHOWEDGES)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-20 14:18:26
|
Revision: 3587
http://svn.sourceforge.net/winmerge/?rev=3587&view=rev
Author: kimmov
Date: 2006-09-20 07:18:18 -0700 (Wed, 20 Sep 2006)
Log Message:
-----------
PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/UniFile.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-20 06:06:36 UTC (rev 3586)
+++ trunk/Src/Changes.txt 2006-09-20 14:18:18 UTC (rev 3587)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-09-20 Kimmo
+ PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
+ Src/Common: UniFile.cpp
+
2006-09-19 Kimmo
PATCH: [ 1561001 ] Fix FileActionScript type in running actions
Src: FileActionScript.cpp
Modified: trunk/Src/Common/UniFile.cpp
===================================================================
--- trunk/Src/Common/UniFile.cpp 2006-09-20 06:06:36 UTC (rev 3586)
+++ trunk/Src/Common/UniFile.cpp 2006-09-20 14:18:18 UTC (rev 3587)
@@ -118,8 +118,12 @@
// MSVC6
CFile file((HFILE)handle);
#else
- // MSVC7 (VC.NET)
+#ifdef _WIN64
+ CFile file((HFILE)handle);
+#else // _WIN64
+ // MSVC7 (VC.NET)
CFile file(handle);
+#endif // _WIN64
#endif
CFileStatus status;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-09-20 06:07:08
|
Revision: 3586
http://svn.sourceforge.net/winmerge/?rev=3586&view=rev
Author: galh
Date: 2006-09-19 23:06:36 -0700 (Tue, 19 Sep 2006)
Log Message:
-----------
PATCH: [ 1552248 ] Install as a ClearCase diff tool
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
trunk/Installer/InnoSetup/Languages/Bulgarian.isl
trunk/Installer/InnoSetup/Languages/Catalan.isl
trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl
trunk/Installer/InnoSetup/Languages/Czech.isl
trunk/Installer/InnoSetup/Languages/Danish.isl
trunk/Installer/InnoSetup/Languages/Dutch.isl
trunk/Installer/InnoSetup/Languages/English.isl
trunk/Installer/InnoSetup/Languages/French.isl
trunk/Installer/InnoSetup/Languages/German.isl
trunk/Installer/InnoSetup/Languages/Hungarian.isl
trunk/Installer/InnoSetup/Languages/Italian.isl
trunk/Installer/InnoSetup/Languages/Japanese.isl
trunk/Installer/InnoSetup/Languages/Korean.isl
trunk/Installer/InnoSetup/Languages/Norwegian.isl
trunk/Installer/InnoSetup/Languages/Polish.isl
trunk/Installer/InnoSetup/Languages/Russian.isl
trunk/Installer/InnoSetup/Languages/Slovak.isl
trunk/Installer/InnoSetup/Languages/Spanish.isl
trunk/Installer/InnoSetup/Languages/Swedish.isl
trunk/Installer/InnoSetup/Languages/Turkish.isl
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-09-20 06:06:36 UTC (rev 3586)
@@ -1,3 +1,8 @@
+2006-09-20 Gal
+ PATCH: [ 1552248 ] Install as a ClearCase diff tool
+ InnoSetup: WinMerge.iss
+ InnoSetup/Languages: *.isl
+
2006-09-20 Kimmo
PATCH: [ 1560904 ] Install 64-bit ShellExtension
InnoSetup: WinMerge.iss
@@ -95,4 +100,4 @@
InnoSetup: WinMerge.iss
2005-10-20 Kimmo
- Previous change history is in file readme.txt
\ No newline at end of file
+ Previous change history is in file readme.txt
Modified: trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -369,6 +369,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Bulgarian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Bulgarian.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Bulgarian.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -364,6 +364,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Catalan.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Catalan.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Catalan.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -347,6 +347,7 @@
ExplorerContextMenu=&Habilita la integraci\xF3 del men\xFA de contexte a l'Explorador
IntegrateTortoiseCVS=Integra amb el &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Suport per a fitxers binaris del Borland\xAE Delphi &4
UpdatingCommonControls=Actualitzant els Controls Comuns del Sistema
Modified: trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -354,6 +354,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -361,6 +361,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Czech.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Czech.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Czech.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -362,6 +362,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Danish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Danish.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Danish.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -363,6 +363,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Dutch.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Dutch.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Dutch.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -341,6 +341,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/English.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/English.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/English.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -361,6 +361,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/French.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/French.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/French.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -356,6 +356,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/German.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/German.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/German.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -354,6 +354,7 @@
ExplorerContextMenu=&Explorer Kontextmen\xFC-Integration aktivieren
IntegrateTortoiseCVS=Integrieren in &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Bin\xE4rdatei-Unterst\xFCtzung
UpdatingCommonControls=Aktualisieren der System-Komponenten
Modified: trunk/Installer/InnoSetup/Languages/Hungarian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Hungarian.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Hungarian.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -374,7 +374,8 @@
;Tasks
ExplorerContextMenu=Integr\xE1l\xE1s az Int\xE9z\xF5 &context-men\xFCj\xE9hez
IntegrateTortoiseCVS=Integr\xE1l\xE1s a &TortoiseCVS programmal
-IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateTortoiseSVN=Integr\xE1l\xE1s a T&ortoiseSVN programmal
+IntegrateClearCase=Integr\xE1l\xE1s a Rational &ClearCase programmal
IntegrateDelphi4=Borland\xAE Delphi &4 bin\xE1ris f\xE1jl t\xE1mogat\xE1s
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Italian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Italian.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Italian.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -365,7 +365,8 @@
;Tasks
ExplorerContextMenu=&Attiva l'integrazione con il menu contestuale di Explorer
IntegrateTortoiseCVS=Integrazione con &TortoiseCVS
-IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateTortoiseSVN=Integrazione con T&ortoiseSVN
+IntegrateClearCase=Integrazione con Rational &ClearCase
IntegrateDelphi4=Supporto per i file binari di Borland\xAE Delphi &4
UpdatingCommonControls=Aggiornamento dei controlli comuni del sistema in corso...
Modified: trunk/Installer/InnoSetup/Languages/Japanese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Japanese.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Japanese.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -356,6 +356,7 @@
ExplorerContextMenu=\x83G\x83N\x83X\x83v\x83\x8D\x81[\x83\x89\x82̃R\x83\x93\x83e\x83L\x83X\x83g\x83\x81\x83j\x83\x85\x81[\x82ɒlj\xC1(&E)
IntegrateTortoiseCVS=TortoiseCVS\x82Ƃ̘A\x8Cg(&T)
IntegrateTortoiseSVN=TortoiseSVN\x82Ƃ̘A\x8Cg(&O)
+IntegrateClearCase=Rational ClearCase\x82Ƃ̘A\x8Cg(&C)
IntegrateDelphi4=Borland Delphi 4 \x83o\x83C\x83i\x83\x8A\x83t\x83@\x83C\x83\x8B\x83T\x83|\x81[\x83g(&4)
UpdatingCommonControls=\x83V\x83X\x83e\x83\x80\x82̃R\x83\x82\x83\x93\x83R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x82\xF0\x83A\x83b\x83v\x83f\x81[\x83g\x82\xB5\x82܂\xB7
Modified: trunk/Installer/InnoSetup/Languages/Korean.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Korean.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Korean.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -369,6 +369,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Norwegian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Norwegian.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Norwegian.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -358,7 +358,8 @@
;Tasks
ExplorerContextMenu=&Aktiver integrasjon i Windows utforsker sin kontekstmeny
IntegrateTortoiseCVS=Integrer med &TortoiseCVS
-IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateTortoiseSVN=Integrer med T&ortoiseSVN
+IntegrateClearCase=Integrer med Rational &ClearCase
IntegrateDelphi4=St\xF8tte for Borland\xAE Delphi &4 bin\xE6re file
UpdatingCommonControls=Oppdater systemets felles kontrollelement
Modified: trunk/Installer/InnoSetup/Languages/Polish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Polish.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Polish.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -352,7 +352,8 @@
;Tasks
ExplorerContextMenu=&Wlacz integracje z menu Eksploratora
IntegrateTortoiseCVS=Integracja z &TortoiseCVS
-IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateTortoiseSVN=Integracja z T&ortoiseSVN
+IntegrateClearCase=Integracja z Rational &ClearCase
IntegrateDelphi4=Obsluga plik\xF3w binarnych Borland\xAE Delphi &4
UpdatingCommonControls=Aktualizacja wsp\xF3lnych kontrolek systemowych SCC
Modified: trunk/Installer/InnoSetup/Languages/Russian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Russian.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Russian.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -351,6 +351,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Slovak.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Slovak.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Slovak.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -291,6 +291,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Spanish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Spanish.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Spanish.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -360,6 +360,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/Languages/Swedish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Swedish.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Swedish.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -354,6 +354,7 @@
ExplorerContextMenu=&M\xF6jligg\xF6r integration med Explorers menyer
IntegrateTortoiseCVS=Integrera med &TortoiseCVS
IntegrateTortoiseSVN=Integrera med T&ortoiseSVN
+IntegrateClearCase=Integrera med Rational &ClearCase
IntegrateDelphi4=St\xF6d Borland\xAE Delphi4 Bin\xE4ra filer
UpdatingCommonControls=Uppdatera Systemets Vanliga Kontroller
Modified: trunk/Installer/InnoSetup/Languages/Turkish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Turkish.isl 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/Languages/Turkish.isl 2006-09-20 06:06:36 UTC (rev 3586)
@@ -362,6 +362,7 @@
ExplorerContextMenu=&Enable Explorer context menu integration
IntegrateTortoiseCVS=Integrate with &TortoiseCVS
IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
UpdatingCommonControls=Updating the System's Common Controls
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2006-09-19 19:30:39 UTC (rev 3585)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2006-09-20 06:06:36 UTC (rev 3586)
@@ -233,6 +233,7 @@
Name: ShellExtension; Description: {cm:ExplorerContextMenu}; GroupDescription: {cm:OptionalFeatures}
Name: TortoiseCVS; Description: {cm:IntegrateTortoiseCVS}; GroupDescription: {cm:OptionalFeatures}; Check: TortoiseCVSInstalled
Name: TortoiseSVN; Description: {cm:IntegrateTortoiseSVN}; GroupDescription: {cm:OptionalFeatures}; Check: TortoiseSVNInstalled; MinVersion: 0,5.0.2195sp3
+Name: ClearCase; Description: {cm:IntegrateClearCase}; GroupDescription: {cm:OptionalFeatures}; Check: ClearCaseInstalled
Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}
@@ -927,3 +928,61 @@
Else
result := False;
End;
+
+{Returns ClearCase external tools configuration file name}
+Function ClearCaseMapFile(): string;
+Begin
+ if not RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Rational Software\', 'RSINSTALLDIR', Result) then
+ begin
+ Result := 'C:\Program Files\Rational\';
+ end;
+ Result := Result + 'ClearCase\lib\mgrs\map';
+End;
+
+{Determines whether or not Rational ClearCase is installed}
+Function ClearCaseInstalled(): boolean;
+Begin
+ Result := FileExists(ClearCaseMapFile());
+End;
+
+{Intergrate WinMerge as ClearCase external diff tool}
+Procedure IntegrateClearCase();
+Var
+ MapFile: TStringList;
+ Unused: String;
+ I: Integer;
+
+Begin
+ MapFile := TStringList.Create();
+ {Read the entire map file to a string list}
+ MapFile.LoadFromFile(ClearCaseMapFile());
+ if MapFile.Count > 0 then
+ begin
+ for I := 0 to MapFile.Count do
+ begin
+ {Search for the 'text_file_delta xcompare ...' line}
+ if (MapFile.Strings[I][1] <> ';') and (Pos('text_file_delta', MapFile.Strings[I]) > 0) and (Pos('xcompare', MapFile.Strings[I]) > 0) then
+ begin
+ {Comment-out the current line}
+ MapFile.Strings[I] := ';' + MapFile.Strings[I];
+ {Insert a line below with WinMerge as the diff tool}
+ MapFile.Insert(I + 1, 'text_file_delta xcompare '+ ExpandConstant('{app}\') + ExeName(Unused));
+ break;
+ end;
+ end;
+ { Save the modified file. }
+ MapFile.SaveToFile('C:\Program Files\Rational\ClearCase\lib\mgrs\map');
+ end;
+End;
+
+procedure CurStepChanged(CurStep: TSetupStep);
+Begin
+ if CurStep = ssPostInstall then
+ begin
+ if IsTaskSelected('ClearCase') then
+ begin
+ IntegrateClearCase();
+ end;
+ end;
+End;
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-19 19:30:45
|
Revision: 3585
http://svn.sourceforge.net/winmerge/?rev=3585&view=rev
Author: kimmov
Date: 2006-09-19 12:30:39 -0700 (Tue, 19 Sep 2006)
Log Message:
-----------
Update Doxygen config file for new ArchiveSupport folder, also create docs in subfolder
Modified Paths:
--------------
trunk/Docs/Developers/Changes.txt
trunk/Docs/Developers/doxygen.cfg
Modified: trunk/Docs/Developers/Changes.txt
===================================================================
--- trunk/Docs/Developers/Changes.txt 2006-09-19 16:35:48 UTC (rev 3584)
+++ trunk/Docs/Developers/Changes.txt 2006-09-19 19:30:39 UTC (rev 3585)
@@ -1,6 +1,8 @@
2006-09-19 Kimmo
Add ShellExtensionX64.dll to installer doc
Developers: readme-InnoSetup.html
+ Update Doxygen config file for new ArchiveSupport folder, also create docs in subfolder
+ Developers: doxygen.cfg
2006-09-16 Kimmo
PATCH: [ 1559614 ] Readme: building 64-bit shellextension
Modified: trunk/Docs/Developers/doxygen.cfg
===================================================================
--- trunk/Docs/Developers/doxygen.cfg 2006-09-19 16:35:48 UTC (rev 3584)
+++ trunk/Docs/Developers/doxygen.cfg 2006-09-19 19:30:39 UTC (rev 3585)
@@ -1,11 +1,11 @@
-# Doxyfile 1.4.6
+# Doxyfile 1.4.7
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
PROJECT_NAME = WinMerge
-PROJECT_NUMBER = 2.5.4.0
-OUTPUT_DIRECTORY =
+PROJECT_NUMBER = 2.6.0
+OUTPUT_DIRECTORY = doxygen
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
USE_WINDOWS_ENCODING = YES
@@ -74,7 +74,7 @@
#---------------------------------------------------------------------------
INPUT = ../../Src \
../../ShellExtension \
- ../../Merge7z
+ ../../ArchiveSupport/Merge7z
FILE_PATTERNS =
RECURSIVE = YES
EXCLUDE =
@@ -95,6 +95,7 @@
STRIP_CODE_COMMENTS = YES
REFERENCED_BY_RELATION = YES
REFERENCES_RELATION = YES
+REFERENCES_LINK_SOURCE = YES
USE_HTAGS = NO
VERBATIM_HEADERS = YES
#---------------------------------------------------------------------------
@@ -207,6 +208,7 @@
INCLUDE_GRAPH = YES
INCLUDED_BY_GRAPH = YES
CALL_GRAPH = NO
+CALLER_GRAPH = NO
GRAPHICAL_HIERARCHY = YES
DIRECTORY_GRAPH = YES
DOT_IMAGE_FORMAT = png
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-19 16:36:02
|
Revision: 3584
http://svn.sourceforge.net/winmerge/?rev=3584&view=rev
Author: kimmov
Date: 2006-09-19 09:35:48 -0700 (Tue, 19 Sep 2006)
Log Message:
-----------
PATCH: [ 1561080 ] Cleanup for loglevel definition
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/LogFile.cpp
trunk/Src/Common/LogFile.h
trunk/Src/DirDoc.cpp
trunk/Src/DirScan.cpp
trunk/Src/MainFrm.cpp
trunk/Src/Plugins.cpp
trunk/Src/StdAfx.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-19 16:24:01 UTC (rev 3583)
+++ trunk/Src/Changes.txt 2006-09-19 16:35:48 UTC (rev 3584)
@@ -7,6 +7,9 @@
Src: FileActionScript.cpp
PATCH: [ 1561008 ] Warning fix for FileActionScript
Src: DirDoc.cpp
+ PATCH: [ 1561080 ] Cleanup for loglevel definition
+ Src: DirDoc.cpp DirScan.cpp MainFrm.cpp Plugins.cpp StdAfx.cpp
+ Src/Common: LogFile.cpp LogFile.h
2006-09-18 Kimmo
Cleanup 64-bit ShellExtension projectfile, add a debug target
Modified: trunk/Src/Common/LogFile.cpp
===================================================================
--- trunk/Src/Common/LogFile.cpp 2006-09-19 16:24:01 UTC (rev 3583)
+++ trunk/Src/Common/LogFile.cpp 2006-09-19 16:35:48 UTC (rev 3584)
@@ -37,8 +37,8 @@
LPCTSTR szLogPath /*= NULL*/, BOOL bDeleteExisting /*=FALSE*/)
: m_nMaxSize(MEGA)
, m_bEnabled(FALSE)
- , m_nDefaultLevel(LOGLEVEL::LMSG)
- , m_nMaskLevel(LOGLEVEL::LALL)
+ , m_nDefaultLevel(LMSG)
+ , m_nMaskLevel(LALL)
{
SetFile(szLogName, szLogPath, bDeleteExisting);
m_hLogMutex = CreateMutex(NULL, FALSE, MutexName);
@@ -162,7 +162,7 @@
WriteV(m_nDefaultLevel, pszFormat, arglist);
va_end(arglist);
}
- return m_nMaskLevel & LOGLEVEL::LSILENTVERIFY;
+ return m_nMaskLevel & LSILENTVERIFY;
}
/**
@@ -183,7 +183,7 @@
WriteV(m_nDefaultLevel, strFormat, arglist);
va_end(arglist);
}
- return m_nMaskLevel & LOGLEVEL::LSILENTVERIFY;
+ return m_nMaskLevel & LSILENTVERIFY;
}
/**
@@ -201,7 +201,7 @@
WriteV(level, pszFormat, arglist);
va_end(arglist);
}
- return m_nMaskLevel & LOGLEVEL::LSILENTVERIFY;
+ return m_nMaskLevel & LSILENTVERIFY;
}
/**
@@ -221,7 +221,7 @@
WriteV(level, strFormat, arglist);
va_end(arglist);
}
- return m_nMaskLevel & LOGLEVEL::LSILENTVERIFY;
+ return m_nMaskLevel & LSILENTVERIFY;
}
/**
@@ -235,7 +235,7 @@
CString msg;
msg.FormatV(pszFormat, arglist);
msg.Insert(0, GetPrefix(level));
- if (level & LOGLEVEL::LOSERROR)
+ if (level & LOSERROR)
{
TCHAR cause[5120];
CInternetException(GetLastError()).GetErrorMessage(cause, countof(cause));
@@ -244,7 +244,7 @@
msg.TrimRight(_T("\r\n"));
msg += _T("\n");
WriteRaw(msg);
- if (level & LOGLEVEL::LDEBUG)
+ if (level & LDEBUG)
{
OutputDebugString(msg);
}
@@ -312,21 +312,21 @@
LPCTSTR str = _T("");
switch (level & 0x0FFF)
{
- case LOGLEVEL::LERROR:
+ case LERROR:
str = _T("ERROR: ");
break;
- case LOGLEVEL::LWARNING:
+ case LWARNING:
str = _T("WARNING: ");
break;
- case LOGLEVEL::LNOTICE:
+ case LNOTICE:
str = _T("NOTICE: ");
break;
- case LOGLEVEL::LMSG:
+ case LMSG:
break;
- case LOGLEVEL::LCODEFLOW:
+ case LCODEFLOW:
str = _T("FLOW: ");
break;
- case LOGLEVEL::LCOMPAREDATA:
+ case LCOMPAREDATA:
str = _T("COMPARE: ");
break;
default:
Modified: trunk/Src/Common/LogFile.h
===================================================================
--- trunk/Src/Common/LogFile.h 2006-09-19 16:24:01 UTC (rev 3583)
+++ trunk/Src/Common/LogFile.h 2006-09-19 16:35:48 UTC (rev 3584)
@@ -11,28 +11,6 @@
#define AFX_LOGFILE_H__803A3641_FE03_11D0_95CD_444553540000__INCLUDED_
/**
- * @brief Messagelevels for log writing.
- */
-struct LOGLEVEL
-{
- enum
- {
- LALL = -1, /**< All messages written */
- LERROR = 0x1, /**< Error messages */
- LWARNING = 0x2, /**< Warning messages */
- LNOTICE = 0x4, /**< Important messages */
- LMSG = 0x8, /**< Normal messages */
- LCODEFLOW = 0x10, /**< Code flow messages */
- LCOMPAREDATA = 0x20, /**< Compare data (dump) */
-
- /* These flags are not loglevels, but have special meaning */
- LOSERROR = 0x1000, /**< Append description of last error */
- LSILENTVERIFY = 0x2000, /**< No VERIFY popup, please */
- LDEBUG = 0x4000, /**< Append message to debug window as well */
- };
-};
-
-/**
* @brief Class for writing log files.
*
* Allows setting masks and levels for messages. They are used for
@@ -54,6 +32,23 @@
class CLogFile
{
public:
+ /** @brief Messagelevels for log writing. */
+ enum
+ {
+ LALL = -1, /**< All messages written */
+ LERROR = 0x1, /**< Error messages */
+ LWARNING = 0x2, /**< Warning messages */
+ LNOTICE = 0x4, /**< Important messages */
+ LMSG = 0x8, /**< Normal messages */
+ LCODEFLOW = 0x10, /**< Code flow messages */
+ LCOMPAREDATA = 0x20, /**< Compare data (dump) */
+
+ /* These flags are not loglevels, but have special meaning */
+ LOSERROR = 0x1000, /**< Append description of last error */
+ LSILENTVERIFY = 0x2000, /**< No VERIFY popup, please */
+ LDEBUG = 0x4000, /**< Append message to debug window as well */
+ };
+
CLogFile(LPCTSTR szLogName = NULL, LPCTSTR szLogPath = NULL,
BOOL bDeleteExisting = FALSE);
virtual ~CLogFile();
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2006-09-19 16:24:01 UTC (rev 3583)
+++ trunk/Src/DirDoc.cpp 2006-09-19 16:35:48 UTC (rev 3584)
@@ -283,7 +283,7 @@
m_statusCursor = new CustomStatusCursor(0, IDC_APPSTARTING, LoadResString(IDS_STATUS_RESCANNING));
- gLog.Write(LOGLEVEL::LNOTICE, _T("Starting directory scan:\n\tLeft: %s\n\tRight: %s\n"),
+ gLog.Write(CLogFile::LNOTICE, _T("Starting directory scan:\n\tLeft: %s\n\tRight: %s\n"),
m_pCtxt->GetLeftPath(), m_pCtxt->GetRightPath());
m_pCompareStats->Reset();
m_pDirView->StartCompare(m_pCompareStats);
@@ -676,7 +676,7 @@
*/
void CDirDoc::CompareReady()
{
- gLog.Write(LOGLEVEL::LNOTICE, _T("Directory scan complete\n"));
+ gLog.Write(CLogFile::LNOTICE, _T("Directory scan complete\n"));
// finish the cursor (the hourglass/pointer combo) we had open during display
delete m_statusCursor;
@@ -829,7 +829,7 @@
*/
void CDirDoc::AbortCurrentScan()
{
- gLog.Write(LOGLEVEL::LNOTICE, _T("Dircompare aborted!"));
+ gLog.Write(CLogFile::LNOTICE, _T("Dircompare aborted!"));
m_diffThread.Abort();
}
Modified: trunk/Src/DirScan.cpp
===================================================================
--- trunk/Src/DirScan.cpp 2006-09-19 16:24:01 UTC (rev 3583)
+++ trunk/Src/DirScan.cpp 2006-09-19 16:35:48 UTC (rev 3584)
@@ -577,7 +577,7 @@
gLog.Write
(
- LOGLEVEL::LCOMPAREDATA, _T("name=<%s>, leftdir=<%s>, rightdir=<%s>, code=%d"),
+ CLogFile::LCOMPAREDATA, _T("name=<%s>, leftdir=<%s>, rightdir=<%s>, code=%d"),
(LPCTSTR)di.sLeftFilename, (LPCTSTR)_T("di.left.spath"), (LPCTSTR)_T("di.right.spath"), di.diffcode
);
pCtxt->AddDiff(di);
@@ -633,7 +633,7 @@
gLog.Write
(
- LOGLEVEL::LCOMPAREDATA, _T("name=<%s>, leftdir=<%s>, rightdir=<%s>, code=%d"),
+ CLogFile::LCOMPAREDATA, _T("name=<%s>, leftdir=<%s>, rightdir=<%s>, code=%d"),
(LPCTSTR)di.sLeftFilename, (LPCTSTR)_T("di.left.spath"), (LPCTSTR)_T("di.right.spath"), code
);
pCtxt->m_pCompareStats->IncreaseTotalItems();
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-09-19 16:24:01 UTC (rev 3583)
+++ trunk/Src/MainFrm.cpp 2006-09-19 16:35:48 UTC (rev 3584)
@@ -228,9 +228,9 @@
gLog.SetFile(_T("WinMerge.log"));
if (logging == 1)
- gLog.SetMaskLevel(LOGLEVEL::LALL);
+ gLog.SetMaskLevel(CLogFile::LALL);
else if (logging == 2)
- gLog.SetMaskLevel(LOGLEVEL::LERROR | LOGLEVEL::LWARNING);
+ gLog.SetMaskLevel(CLogFile::LERROR | CLogFile::LWARNING);
}
m_pSyntaxColors = new SyntaxColors();
@@ -1188,7 +1188,7 @@
// Anything that can go wrong inside InitCompare() will yield an
// exception. There is no point in checking return value.
pDirDoc->InitCompare(paths, bRecurse, pTempPathContext);
- gLog.Write(LOGLEVEL::LNOTICE, _T("Open dirs: Left: %s\n\tRight: %s."),
+ gLog.Write(CLogFile::LNOTICE, _T("Open dirs: Left: %s\n\tRight: %s."),
strLeft, strRight);
pDirDoc->SetReadOnly(TRUE, bROLeft);
@@ -1203,7 +1203,7 @@
}
else
{
- gLog.Write(LOGLEVEL::LNOTICE, _T("Open files: Left: %s\n\tRight: %s."),
+ gLog.Write(CLogFile::LNOTICE, _T("Open files: Left: %s\n\tRight: %s."),
strLeft, strRight);
FileLocation filelocLeft(strLeft);
@@ -2172,7 +2172,7 @@
files[1] = files[0];
}
- gLog.Write(LOGLEVEL::LNOTICE, _T("D&D open: Left: %s\n\tRight: %s."),
+ gLog.Write(CLogFile::LNOTICE, _T("D&D open: Left: %s\n\tRight: %s."),
files[0], files[1]);
// Check if they dropped a project file
Modified: trunk/Src/Plugins.cpp
===================================================================
--- trunk/Src/Plugins.cpp 2006-09-19 16:24:01 UTC (rev 3583)
+++ trunk/Src/Plugins.cpp 2006-09-19 16:35:48 UTC (rev 3584)
@@ -558,7 +558,7 @@
if (IsWindowsScriptThere())
GetScriptletsAt(path, _T(".sct"), theScriptletList ); // VBS/JVS scriptlet
else
- gLog.Write(LOGLEVEL::LWARNING, _T("\n .sct plugins disabled (Windows Script Host not found)"));
+ gLog.Write(CLogFile::LWARNING, _T("\n .sct plugins disabled (Windows Script Host not found)"));
GetScriptletsAt(path, _T(".ocx"), theScriptletList ); // VB COM object
GetScriptletsAt(path, _T(".dll"), theScriptletList ); // VC++ COM object
scriptletsLoaded = true;
Modified: trunk/Src/StdAfx.cpp
===================================================================
--- trunk/Src/StdAfx.cpp 2006-09-19 16:24:01 UTC (rev 3583)
+++ trunk/Src/StdAfx.cpp 2006-09-19 16:35:48 UTC (rev 3584)
@@ -34,7 +34,7 @@
/** @brief Report DeleteFile() failure to gLog */
UINT gLog::DeleteFileFailed(LPCTSTR path)
{
- return::gLog.Write(LOGLEVEL::LERROR|LOGLEVEL::LOSERROR|LOGLEVEL::LDEBUG, _T("DeleteFile(%s) failed: "), path);
+ return::gLog.Write(CLogFile::LERROR|CLogFile::LOSERROR|CLogFile::LDEBUG, _T("DeleteFile(%s) failed: "), path);
}
// Convert any negative inputs to negative char equivalents
@@ -133,7 +133,7 @@
TRACE(_T("%s: %s\n"), (LPCTSTR)now, sz);
#if defined (_DEBUG) || defined (ENABLE_LOG)
- gLog.Write(LOGLEVEL::LERROR, sz);
+ gLog.Write(CLogFile::LERROR, sz);
#endif
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-19 16:24:07
|
Revision: 3583
http://svn.sourceforge.net/winmerge/?rev=3583&view=rev
Author: kimmov
Date: 2006-09-19 09:24:01 -0700 (Tue, 19 Sep 2006)
Log Message:
-----------
PATCH: [ 1561008 ] Warning fix for FileActionScript
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirDoc.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-19 15:21:49 UTC (rev 3582)
+++ trunk/Src/Changes.txt 2006-09-19 16:24:01 UTC (rev 3583)
@@ -4,7 +4,9 @@
2006-09-19 Kimmo
PATCH: [ 1561001 ] Fix FileActionScript type in running actions
- Src: FileActionScript.cpp
+ Src: FileActionScript.cpp
+ PATCH: [ 1561008 ] Warning fix for FileActionScript
+ Src: DirDoc.cpp
2006-09-18 Kimmo
Cleanup 64-bit ShellExtension projectfile, add a debug target
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2006-09-19 15:21:49 UTC (rev 3582)
+++ trunk/Src/DirDoc.cpp 2006-09-19 16:24:01 UTC (rev 3583)
@@ -927,7 +927,7 @@
// Use FileActionItem types for simplicity for now.
// Better would be to use FileAction contained, since it is not
// UI dependent.
- switch (act.atype)
+ switch (act.UIResult)
{
case FileActionItem::UI_SYNC:
SetDiffSide(DIFFCODE::BOTH, act.context);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-19 15:28:49
|
Revision: 3582
http://svn.sourceforge.net/winmerge/?rev=3582&view=rev
Author: kimmov
Date: 2006-09-19 08:21:49 -0700 (Tue, 19 Sep 2006)
Log Message:
-----------
Add ShellExtensionX64.dll to installer doc
Modified Paths:
--------------
trunk/Docs/Developers/Changes.txt
trunk/Docs/Developers/readme-InnoSetup.html
Modified: trunk/Docs/Developers/Changes.txt
===================================================================
--- trunk/Docs/Developers/Changes.txt 2006-09-19 14:52:33 UTC (rev 3581)
+++ trunk/Docs/Developers/Changes.txt 2006-09-19 15:21:49 UTC (rev 3582)
@@ -1,3 +1,7 @@
+2006-09-19 Kimmo
+ Add ShellExtensionX64.dll to installer doc
+ Developers: readme-InnoSetup.html
+
2006-09-16 Kimmo
PATCH: [ 1559614 ] Readme: building 64-bit shellextension
Developers: readme-developers.html
Modified: trunk/Docs/Developers/readme-InnoSetup.html
===================================================================
--- trunk/Docs/Developers/readme-InnoSetup.html 2006-09-19 14:52:33 UTC (rev 3581)
+++ trunk/Docs/Developers/readme-InnoSetup.html 2006-09-19 15:21:49 UTC (rev 3582)
@@ -91,6 +91,12 @@
<li><code>WinMergeU.exe.Manifest</code></li>
</ul>
</li>
+ <li>
+ <code>ShellExtensionX64/</code>
+ <ul>
+ <li><code>ShellExtensionX64.dll</code></li>
+ </ul>
+ </li>
</ul>
</li>
<li>
@@ -119,6 +125,14 @@
</li>
</ul>
+<p><strong>NOTE</strong><br>
+If you don't need or can't compile <code>ShellExtensionX64.dll</code> component,
+comment or remove line:<pre>
+; 64-bit version of ShellExtension
+Source: ..\..\Build\ShellExtensionX64\ShellExtensionX64.dll; [...]
+</pre>
+from <code>WinMerge.iss</code></p>
+
<h3>Running Inno Setup to create installer</h3>
<p><code>WinMerge.iss</code> (in <code>InnoSetup</code> folder)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-19 14:52:39
|
Revision: 3581
http://svn.sourceforge.net/winmerge/?rev=3581&view=rev
Author: kimmov
Date: 2006-09-19 07:52:33 -0700 (Tue, 19 Sep 2006)
Log Message:
-----------
PATCH: [ 1561001 ] Fix FileActionScript type in running actions
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/FileActionScript.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-19 14:49:21 UTC (rev 3580)
+++ trunk/Src/Changes.txt 2006-09-19 14:52:33 UTC (rev 3581)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-09-19 Kimmo
+ PATCH: [ 1561001 ] Fix FileActionScript type in running actions
+ Src: FileActionScript.cpp
+
2006-09-18 Kimmo
Cleanup 64-bit ShellExtension projectfile, add a debug target
ShellExtension: ShellExtensionX64.vcproj
Modified: trunk/Src/FileActionScript.cpp
===================================================================
--- trunk/Src/FileActionScript.cpp 2006-09-19 14:49:21 UTC (rev 3580)
+++ trunk/Src/FileActionScript.cpp 2006-09-19 14:52:33 UTC (rev 3581)
@@ -124,7 +124,7 @@
int FileActionScript::CreateOperationsScripts()
{
UINT operation = 0;
- UINT operFlags = 0;
+ FILEOP_FLAGS operFlags = 0;
BOOL bApplyToAll = FALSE;
BOOL bContinue = TRUE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-19 14:49:38
|
Revision: 3580
http://svn.sourceforge.net/winmerge/?rev=3580&view=rev
Author: kimmov
Date: 2006-09-19 07:49:21 -0700 (Tue, 19 Sep 2006)
Log Message:
-----------
PATCH: [ 1560904 ] Install 64-bit ShellExtension
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-09-18 20:18:03 UTC (rev 3579)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-09-19 14:49:21 UTC (rev 3580)
@@ -1,3 +1,7 @@
+2006-09-20 Kimmo
+ PATCH: [ 1560904 ] Install 64-bit ShellExtension
+ InnoSetup: WinMerge.iss
+
2006-09-18 Kimmo
Synchronize language files from upstream (http://www.jrsoftware.org/files/istrans/)
InnoSetup/Languages: Bulgarian.isl Catalan.isl Czech.isl Italian.isl Japanese.isl
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2006-09-18 20:18:03 UTC (rev 3579)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2006-09-19 14:49:21 UTC (rev 3580)
@@ -3,42 +3,29 @@
;
; Programmed by: Christian Blackburn, Christian List, Kimmo Varis
; Purpose: The is the Inno Setup installation script for distributing our WinmMerge application.
-; Tools Needed To Compile: Inno Setup 5.1.4+ (http://www.jrsoftware.org/isdl.php), Inno Setup QuickStart Pack 5.1.4+(http://www.jrsoftware.org/isdl.php)
+; Tools Needed To Compile: Inno Setup 5.1.7+ (http://www.jrsoftware.org/isdl.php), Inno Setup QuickStart Pack 5.1.7+(http://www.jrsoftware.org/isdl.php)
; note: the versions of Inno Setup and the QuickStart Pack should be identical to ensure proper function
;Directly Dependant Files: Because this is an installer. It would be difficult to list and maintain each of the files referenced
-; throughout the script in the header. If you search this plain text script for a particular file in our CVS and it
+; throughout the script in the header. If you search this plain text script for a particular file in our Subversio repository and it
; doesn't appear then this script is not directly dependant on that file.
;Compilation Instructions: 1. Open this file in Inno Setup or ISTool
; 2. Make sure Compression=LZMA/Ultra, InternalCompressLevel=Ultra, and SolidCompression=True these values are lowered during
; development to speed up compilation, however at release we want the intaller to be as strong as possible.
-; 3. Compile the script:
+; 3. Check all files are present:
+; -From ISTool Click
+; 4. Compile the script: "Project" --> "Verify Files..."
; -From Inno Setup "Click "Build" --> "Compile"
; -From ISTool Click "Project" --> "Compile Setup"
-; 4. The compiled installer will appear in the \InnoSetup\Output\ directory at currently should be around 1.5MBs in size.
+; 5. The compiled installer will appear in the \InnoSetup\Output\ directory at currently should be around 1.5MBs in size.
;
; Installer To Do List:
-; Localization
-; # Create instructions and a sample language file using the Inno Setup Translator Tool (http://www2.arnes.si/~sopjsimo/translator.html)
-; # Seier will need to apply this {#AppVersion} directive to all localizations:
-; English.SetupAppTitle=Setup - WinMerge {#AppVersion}
-;
-; Bugs & Other Priority Items:
-; # Add the Windows Scripting Host if the user chooses the plugins (*.SCT)
; # We need to unregister, and delete the ShellExtension Dll if the user doesn't want it, during installation
; # When Explorer.exe is restarted we should record what windows were present before hand and restore them afterwards.
; # Display integration options in gray rather than hiding them if the user doesn't have the application in question installed
-; # Distribute AppHelp.dll since it's required by WinMerge.exe, ShellExtension.dll, Merge7zU311.zip
-; # Only display TortoiseCVS option if the user has it installed
; # We need to ask those that have the RCLLocalization.dll in their plugins folder if they actually want it, their answer will need to be stored in the registry
; # Write code to detect "\Programs\WinMerge\WinMerge" type start menu installs
;
-; # Application Integration:
-; # We need to backup the previously integrated viewer in TortoiseCVS, at uninstallation ([UninstallRun] Regedit -S Tortoise.reg)
-; or when the user deselects it this will need to be uninstalled
-; # We need to add support for Tortoises' SubVersion program mimicking our support settings for TortoiseCVS if possible
-; # We need to determine if our application can cooperate with WinCVS and if so how
-;
; Things that make the user's life easier:
; # Create instructions and a sample language file using the Inno Setup Translator Tool (http://www2.arnes.si/~sopjsimo/translator.html)
; # Add "WinMerge is running would you like to close it now?" support with programmatic termination
@@ -325,11 +312,11 @@
[Files]
;The MinVersion forces Inno Setup to only copy the following file if the user is running a WinNT platform system
Source: ..\..\Build\MergeUnicodeRelease\WinMergeU.exe; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 4; Components: Core
-Source: ..\..\Build\MergeRelease\WinMerge.exe; DestDir: {app}; Flags: promptifolder; Components: Core
+Source: ..\..\Build\MergeRelease\WinMerge.exe; DestDir: {app}; Flags: promptifolder; Components: Core; Check: not IsWin64
;The MinVersion forces Inno Setup to only copy the following file if the user is running a WinNT platform system
Source: WinMergeU.exe.manifest; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 5.01; Components: Core
-Source: WinMerge.exe.manifest; DestDir: {app}; Flags: promptifolder; Components: Core; MinVersion: 0,5.01
+Source: WinMerge.exe.manifest; DestDir: {app}; Flags: promptifolder; Components: Core; MinVersion: 0,5.01; Check: not IsWin64
; Icon for projectfiles
Source: MergeProject.ico; DestDir: {app}; Flags: promptifolder; Components: Core
@@ -346,8 +333,10 @@
Source: Runtimes\msvcp71.dll; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Core
; end VC system files
-Source: ..\..\Build\MergeRelease\ShellExtension.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 4, 0
-Source: ..\..\Build\MergeUnicodeRelease\ShellExtensionU.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 0, 4
+Source: ..\..\Build\MergeRelease\ShellExtension.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 4, 0; Check: not IsWin64
+Source: ..\..\Build\MergeUnicodeRelease\ShellExtensionU.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 0, 4; Check: not IsWin64
+; 64-bit version of ShellExtension
+Source: ..\..\Build\ShellExtensionX64\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64
Source: ..\..\Build\Languages\MergeBulgarian.lang; DestDir: {app}\Languages; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp
Source: ..\..\Build\Languages\MergeCatalan.lang; DestDir: {app}\Languages; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-18 20:18:15
|
Revision: 3579
http://svn.sourceforge.net/winmerge/?rev=3579&view=rev
Author: kimmov
Date: 2006-09-18 13:18:03 -0700 (Mon, 18 Sep 2006)
Log Message:
-----------
Cleanup 64-bit ShellExtension projectfile, add a debug target
Modified Paths:
--------------
trunk/ShellExtension/ShellExtensionX64.vcproj
trunk/Src/Changes.txt
Modified: trunk/ShellExtension/ShellExtensionX64.vcproj
===================================================================
--- trunk/ShellExtension/ShellExtensionX64.vcproj 2006-09-18 19:58:38 UTC (rev 3578)
+++ trunk/ShellExtension/ShellExtensionX64.vcproj 2006-09-18 20:18:03 UTC (rev 3579)
@@ -13,29 +13,33 @@
</Platforms>
<Configurations>
<Configuration
- Name="Unicode Debug|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeDebug"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeDebug"
+ Name="Debug X64|Win32"
+ OutputDirectory=".\..\BuildTmp\ShellExtensionX64Debug"
+ IntermediateDirectory=".\..\BuildTmp\ShellExtensionX64Debug"
ConfigurationType="2"
UseOfMFC="2"
+ UseOfATL="1"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../src/common"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- BasicRuntimeChecks="3"
+ PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
+ BasicRuntimeChecks="0"
+ SmallerTypeCheck="FALSE"
RuntimeLibrary="3"
+ BufferSecurityCheck="TRUE"
UsePrecompiledHeader="3"
PrecompiledHeaderThrough="stdafx.h"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
- ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtensionX64Debug/"
+ ObjectFile=".\..\BuildTmp\ShellExtensionX64Debug/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtensionX64Debug/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"
@@ -52,14 +56,17 @@
Outputs="$(OutDir)\regsvr32.trg"/>
<Tool
Name="VCLinkerTool"
- OutputFile="..\Build\MergeUnicodeDebug\ShellExtensionU.dll"
+ AdditionalOptions="/machine:AMD64"
+ AdditionalDependencies="bufferoverflowU.lib"
+ OutputFile="..\Build\ShellExtensionX64Debug\ShellExtensionX64.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
- ModuleDefinitionFile=".\ShellExtensionU.def"
+ ModuleDefinitionFile=".\ShellExtensionX64.def"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.pdb"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtensionU.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.lib"
+ OptimizeForWindows98="1"
+ ImportLibrary=".\..\BuildTmp\ShellExtensionX64Debug/ShellExtensionU.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
@@ -87,365 +94,9 @@
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
- Name="Unicode Release MinSize|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize"
- ConfigurationType="2"
- UseOfMFC="2"
- UseOfATL="2"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="1">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../src/common"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="TRUE"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="3"
- PrecompiledHeaderThrough="stdafx.h"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
- ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="if "%OS%"=="" goto NOTNT
-if not "%OS%"=="Windows_NT" goto NOTNT
-regsvr32 /s /c "$(TargetPath)"
-echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
-goto end
-:NOTNT
-echo Warning : Cannot register Unicode DLL on Windows 95
-:end
-"
- Outputs="$(OutDir)\regsvr32.trg"/>
- <Tool
- Name="VCLinkerTool"
- OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- ModuleDefinitionFile=".\ShellExtensionU.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.pdb"
- SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Unicode Release MinDependency|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency"
- ConfigurationType="2"
- UseOfMFC="2"
- UseOfATL="1"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="1">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../src/common"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="TRUE"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="3"
- PrecompiledHeaderThrough="stdafx.h"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
- ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="if "%OS%"=="" goto NOTNT
-if not "%OS%"=="Windows_NT" goto NOTNT
-regsvr32 /s /c "$(TargetPath)"
-echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
-goto end
-:NOTNT
-echo Warning : Cannot register Unicode DLL on Windows 95
-:end
-"
- Outputs="$(OutDir)\regsvr32.trg"/>
- <Tool
- Name="VCLinkerTool"
- OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- ModuleDefinitionFile=".\ShellExtensionU.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.pdb"
- SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release MinDependency|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinDependency"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinDependency"
- ConfigurationType="2"
- UseOfMFC="2"
- UseOfATL="1"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../src/common"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="TRUE"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="3"
- PrecompiledHeaderThrough="stdafx.h"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
- ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="regsvr32 /s /c "$(TargetPath)"
-echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
-"
- Outputs="$(OutDir)\regsvr32.trg"/>
- <Tool
- Name="VCLinkerTool"
- OutputFile="..\Build\MergeRelease\ShellExtension.dll"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- ModuleDefinitionFile=".\ShellExtension.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pdb"
- SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release MinSize|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinSize"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinSize"
- ConfigurationType="2"
- UseOfMFC="2"
- UseOfATL="2"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../src/common"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="TRUE"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="3"
- PrecompiledHeaderThrough="stdafx.h"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
- ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="regsvr32 /s /c "$(TargetPath)"
-echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
-"
- Outputs="$(OutDir)\regsvr32.trg"/>
- <Tool
- Name="VCLinkerTool"
- OutputFile="..\Build\MergeRelease\ShellExtension.dll"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- ModuleDefinitionFile=".\ShellExtension.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pdb"
- SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__Debug"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__Debug"
- ConfigurationType="2"
- UseOfMFC="2"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../src/common"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="3"
- PrecompiledHeaderThrough="stdafx.h"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__Debug/"
- ObjectFile=".\..\BuildTmp\ShellExtension__Debug/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__Debug/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="regsvr32 /s /c "$(TargetPath)"
-echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
-"
- Outputs="$(OutDir)\regsvr32.trg"/>
- <Tool
- Name="VCLinkerTool"
- OutputFile="..\Build\MergeDebug\ShellExtension.dll"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- ModuleDefinitionFile=".\ShellExtension.def"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pdb"
- SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
Name="Release X64|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory=".\..\BuildTmp\ShellExtensionX64/"
+ IntermediateDirectory=".\..\BuildTmp\ShellExtensionX64/"
ConfigurationType="2"
UseOfMFC="2"
UseOfATL="1"
@@ -458,7 +109,7 @@
AdditionalIncludeDirectories="../src/common"
PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
StringPooling="TRUE"
- ExceptionHandling="FALSE"
+ ExceptionHandling="TRUE"
RuntimeLibrary="2"
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="TRUE"
@@ -533,7 +184,7 @@
<File
RelativePath="..\src\common\coretools.cpp">
<FileConfiguration
- Name="Unicode Debug|Win32">
+ Name="Debug X64|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -542,47 +193,6 @@
BasicRuntimeChecks="3"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32">
<Tool
Name="VCCLCompilerTool"
@@ -594,7 +204,7 @@
<File
RelativePath="..\src\common\RegKey.cpp">
<FileConfiguration
- Name="Unicode Debug|Win32">
+ Name="Debug X64|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -603,47 +213,6 @@
BasicRuntimeChecks="3"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32">
<Tool
Name="VCCLCompilerTool"
@@ -655,7 +224,7 @@
<File
RelativePath="ShellExtension.cpp">
<FileConfiguration
- Name="Unicode Debug|Win32">
+ Name="Debug X64|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -664,47 +233,6 @@
BasicRuntimeChecks="3"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32">
<Tool
Name="VCCLCompilerTool"
@@ -716,24 +244,12 @@
<File
RelativePath="ShellExtension.def">
<FileConfiguration
- Name="Unicode Debug|Win32"
+ Name="Debug X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCustomBuildTool"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCustomBuildTool"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCustomBuildTool"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
@@ -743,7 +259,7 @@
<File
RelativePath="ShellExtension.idl">
<FileConfiguration
- Name="Unicode Debug|Win32">
+ Name="Debug X64|Win32">
<Tool
Name="VCMIDLTool"
GenerateStublessProxies="TRUE"
@@ -752,51 +268,6 @@
InterfaceIdentifierFileName="ShellExtension_i.c"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32">
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="TRUE"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32">
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="TRUE"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32">
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="TRUE"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32">
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="TRUE"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCMIDLTool"
- GenerateStublessProxies="TRUE"
- TypeLibraryName=".\ShellExtension.tlb"
- HeaderFileName="ShellExtension.h"
- InterfaceIdentifierFileName="ShellExtension_i.c"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32">
<Tool
Name="VCMIDLTool"
@@ -808,29 +279,11 @@
</File>
<File
RelativePath="ShellExtensionU.def">
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCustomBuildTool"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCustomBuildTool"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCustomBuildTool"/>
- </FileConfiguration>
</File>
<File
RelativePath="StdAfx.cpp">
<FileConfiguration
- Name="Unicode Debug|Win32">
+ Name="Debug X64|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -840,52 +293,6 @@
UsePrecompiledHeader="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
- UsePrecompiledHeader="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
- UsePrecompiledHeader="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- UsePrecompiledHeader="1"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32">
<Tool
Name="VCCLCompilerTool"
@@ -898,7 +305,7 @@
<File
RelativePath="WinMergeShell.cpp">
<FileConfiguration
- Name="Unicode Debug|Win32">
+ Name="Debug X64|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
@@ -907,47 +314,6 @@
BasicRuntimeChecks="3"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_AFXDLL;_USRDLL;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32">
<Tool
Name="VCCLCompilerTool"
@@ -982,48 +348,13 @@
<File
RelativePath="ShellExtension.rc">
<FileConfiguration
- Name="Unicode Debug|Win32">
+ Name="Debug X64|Win32">
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)"
AdditionalIncludeDirectories="$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32">
<Tool
Name="VCResourceCompilerTool"
@@ -1034,7 +365,7 @@
<File
RelativePath="Languages\ShellExtensionBrazilian.rc">
<FileConfiguration
- Name="Unicode Debug|Win32"
+ Name="Debug X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCResourceCompilerTool"
@@ -1042,46 +373,6 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
@@ -1093,7 +384,7 @@
<File
RelativePath="Languages\ShellExtensionBulgarian.rc">
<FileConfiguration
- Name="Unicode Debug|Win32"
+ Name="Debug X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCResourceCompilerTool"
@@ -1101,46 +392,6 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
@@ -1152,7 +403,7 @@
<File
RelativePath="Languages\ShellExtensionCatalan.rc">
<FileConfiguration
- Name="Unicode Debug|Win32"
+ Name="Debug X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCResourceCompilerTool"
@@ -1160,46 +411,6 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
@@ -1211,7 +422,7 @@
<File
RelativePath="Languages\ShellExtensionChineseSimplified.rc">
<FileConfiguration
- Name="Unicode Debug|Win32"
+ Name="Debug X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCResourceCompilerTool"
@@ -1219,46 +430,6 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
@@ -1270,7 +441,7 @@
<File
RelativePath="Languages\ShellExtensionChineseTraditional.rc">
<FileConfiguration
- Name="Unicode Debug|Win32"
+ Name="Debug X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCResourceCompilerTool"
@@ -1278,46 +449,6 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
@@ -1329,7 +460,7 @@
<File
RelativePath="Languages\ShellExtensionCzech.rc">
<FileConfiguration
- Name="Unicode Debug|Win32"
+ Name="Debug X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCResourceCompilerTool"
@@ -1337,46 +468,6 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
@@ -1388,7 +479,7 @@
<File
RelativePath="Languages\ShellExtensionDanish.rc">
<FileConfiguration
- Name="Unicode Debug|Win32"
+ Name="Debug X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCResourceCompilerTool"
@@ -1396,46 +487,6 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
@@ -1447,7 +498,7 @@
<File
RelativePath="Languages\ShellExtensionDutch.rc">
<FileConfiguration
- Name="Unicode Debug|Win32"
+ Name="Debug X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCResourceCompilerTool"
@@ -1455,46 +506,6 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
@@ -1506,7 +517,7 @@
<File
RelativePath="Languages\ShellExtensionFrench.rc">
<FileConfiguration
- Name="Unicode Debug|Win32"
+ Name="Debug X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCResourceCompilerTool"
@@ -1514,46 +525,6 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
@@ -1565,7 +536,7 @@
<File
RelativePath="Languages\ShellExtensionGerman.rc">
<FileConfiguration
- Name="Unicode Debug|Win32"
+ Name="Debug X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCResourceCompilerTool"
@@ -1573,46 +544,6 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
@@ -1624,7 +555,7 @@
<File
RelativePath="Languages\ShellExtensionHungarian.rc">
<FileConfiguration
- Name="Unicode Debug|Win32"
+ Name="Debug X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCResourceCompilerTool"
@@ -1632,46 +563,6 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
@@ -1683,7 +574,7 @@
<File
RelativePath="Languages\ShellExtensionItalian.rc">
<FileConfiguration
- Name="Unicode Debug|Win32"
+ Name="Debug X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCResourceCompilerTool"
@@ -1691,46 +582,6 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
@@ -1742,7 +593,7 @@
<File
RelativePath="Languages\ShellExtensionJapanese.rc">
<FileConfiguration
- Name="Unicode Debug|Win32"
+ Name="Debug X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCResourceCompilerTool"
@@ -1750,46 +601,6 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
@@ -1801,7 +612,7 @@
<File
RelativePath="Languages\ShellExtensionKorean.rc">
<FileConfiguration
- Name="Unicode Debug|Win32"
+ Name="Debug X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCResourceCompilerTool"
@@ -1809,46 +620,6 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
@@ -1860,7 +631,7 @@
<File
RelativePath="Languages\ShellExtensionNorwegian.rc">
<FileConfiguration
- Name="Unicode Debug|Win32"
+ Name="Debug X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCResourceCompilerTool"
@@ -1868,46 +639,6 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
@@ -1919,7 +650,7 @@
<File
RelativePath="Languages\ShellExtensionPolish.rc">
<FileConfiguration
- Name="Unicode Debug|Win32"
+ Name="Debug X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCResourceCompilerTool"
@@ -1927,46 +658,6 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Unicode Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinDependency|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
- </FileConfiguration>
- <FileConfiguration
Name="Release X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
@@ -1978,7 +669,7 @@
<File
RelativePath="Languages\ShellExtensionRussian.rc">
<FileConfiguration
- Name="Unicode Debug|Win32"
+ Name="Debug X64|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCResourceCompilerTool"
@@ -1986,46 +677,6 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- AdditionalInclu...
[truncated message content] |
|
From: <ge...@us...> - 2006-09-18 19:58:49
|
Revision: 3578
http://svn.sourceforge.net/winmerge/?rev=3578&view=rev
Author: gerundt
Date: 2006-09-18 12:58:38 -0700 (Mon, 18 Sep 2006)
Log Message:
-----------
PATCH: [ 1559508 ] Change kimmov's email address
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/developers.xml
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-09-18 19:35:24 UTC (rev 3577)
+++ trunk/Web/Changes.txt 2006-09-18 19:58:38 UTC (rev 3578)
@@ -1,3 +1,7 @@
+2006-09-18 Tim
+ PATCH: [ 1559508 ] Change kimmov's email address
+ Web\developer: developers.xml
+
2006-09-16 Christian
PATCH: [ 1543687 ] Google AdSense setup
Re-inserted the ads, after change to our own site
Modified: trunk/Web/developer/developers.xml
===================================================================
--- trunk/Web/developer/developers.xml 2006-09-18 19:35:24 UTC (rev 3577)
+++ trunk/Web/developer/developers.xml 2006-09-18 19:58:38 UTC (rev 3578)
@@ -53,7 +53,7 @@
<name>Kimmo Varis</name>
<username>kimmov</username>
<role>2</role>
- <email>kimmov at users.sourceforge.net</email>
+ <email>kimmov at winmerge.org</email>
</developer>
<developer inactive="1">
<name>Laurent Ganier</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-18 19:35:30
|
Revision: 3577
http://svn.sourceforge.net/winmerge/?rev=3577&view=rev
Author: kimmov
Date: 2006-09-18 12:35:24 -0700 (Mon, 18 Sep 2006)
Log Message:
-----------
Synchronize language files from upstream (http://www.jrsoftware.org/files/istrans/) (Forgotten Changes.txt)
Modified Paths:
--------------
trunk/Installer/InnoSetup/Changes.txt
Modified: trunk/Installer/InnoSetup/Changes.txt
===================================================================
--- trunk/Installer/InnoSetup/Changes.txt 2006-09-18 19:34:24 UTC (rev 3576)
+++ trunk/Installer/InnoSetup/Changes.txt 2006-09-18 19:35:24 UTC (rev 3577)
@@ -1,3 +1,8 @@
+2006-09-18 Kimmo
+ Synchronize language files from upstream (http://www.jrsoftware.org/files/istrans/)
+ InnoSetup/Languages: Bulgarian.isl Catalan.isl Czech.isl Italian.isl Japanese.isl
+ Slovak.isl Spanish.isl Turkish.isl
+
2006-09-13 Kimmo
PATCH: [ 1557892 ] Updated Swedish.isl InnoSetup translation
Submitted by Hans Eriksson
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-18 19:34:39
|
Revision: 3576
http://svn.sourceforge.net/winmerge/?rev=3576&view=rev
Author: kimmov
Date: 2006-09-18 12:34:24 -0700 (Mon, 18 Sep 2006)
Log Message:
-----------
Synchronize language files from upstream (http://www.jrsoftware.org/files/istrans/)
Modified Paths:
--------------
trunk/Installer/InnoSetup/Languages/Bulgarian.isl
trunk/Installer/InnoSetup/Languages/Catalan.isl
trunk/Installer/InnoSetup/Languages/Czech.isl
trunk/Installer/InnoSetup/Languages/Italian.isl
trunk/Installer/InnoSetup/Languages/Japanese.isl
trunk/Installer/InnoSetup/Languages/Slovak.isl
trunk/Installer/InnoSetup/Languages/Spanish.isl
trunk/Installer/InnoSetup/Languages/Turkish.isl
Modified: trunk/Installer/InnoSetup/Languages/Bulgarian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Bulgarian.isl 2006-09-16 14:41:13 UTC (rev 3575)
+++ trunk/Installer/InnoSetup/Languages/Bulgarian.isl 2006-09-18 19:34:24 UTC (rev 3576)
@@ -303,8 +303,9 @@
WizardUninstalling=\xD5\xEE\xE4 \xED\xE0 \xE4\xE5\xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xED\xE5\xF2\xEE
StatusUninstalling=%1 \xF1\xE5 \xE4\xE5\xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0...
-; The custom messages below aren't used by Setup itself, but if you make
-; use of them in your scripts, you'll want to translate them.
+; \xCF\xEE\xF2\xF0\xE5\xE1\xE8\xF2\xE5\xEB\xF1\xEA\xE8\xF2\xE5 \xF1\xFA\xEE\xE1\xF9\xE5\xED\xE8\xFF \xEF\xEE-\xE4\xEE\xEB\xF3 \xED\xE5 \xF1\xE5 \xEF\xEE\xEB\xE7\xE2\xE0\xF2 \xEE\xF2 \xF1\xE0\xEC\xE8\xFF \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF2\xEE\xF0, \xED\xEE
+; \xE0\xEA\xEE \xEF\xEE\xEB\xE7\xE2\xE0\xF2\xE5 \xF2\xE0\xEA\xE8\xE2\xE0 \xE2\xFA\xE2 \xE2\xE0\xF8\xE8 \xF1\xEA\xF0\xE8\xEF\xF2\xEE\xE2\xE5, \xE2\xE5\xF0\xEE\xFF\xF2\xED\xEE \xE1\xE8\xF5\xF2\xE5 \xE8\xF1\xEA\xE0\xEB\xE8 \xE4\xE0 \xE3\xE8
+; \xEF\xF0\xE5\xE2\xE5\xE4\xE5\xF2\xE5.
[CustomMessages]
;Inno Setup Built-in Custom Messages
Modified: trunk/Installer/InnoSetup/Languages/Catalan.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Catalan.isl 2006-09-16 14:41:13 UTC (rev 3575)
+++ trunk/Installer/InnoSetup/Languages/Catalan.isl 2006-09-18 19:34:24 UTC (rev 3576)
@@ -1,8 +1,8 @@
; *** Inno Setup 5.1.0+ Catalan messages ***
;
-; Translated by Carles Millan (in...@ca...)
+; Translated by Carles Millan (email: carles at carlesmillan.cat)
;
-; $jrsoftware: issrc/Files/Languages/Catalan.isl,v 1.10 2005/03/24 10:34:27 carles Exp $
+; $jrsoftware: issrc/Files/Languages/Catalan.isl,v 1.12 2006/09/11 19:13:58 carles Exp $
[LangOptions]
@@ -16,7 +16,7 @@
SetupAppTitle=Instal\xB7laci\xF3
SetupWindowTitle=Instal\xB7laci\xF3 - %1
UninstallAppTitle=Desinstal\xB7laci\xF3
-UninstallAppFullTitle=Desinstal\xB7lar %1
+UninstallAppFullTitle=Desinstal\xB7la %1
; *** Misc. common
InformationTitle=Informaci\xF3
@@ -41,48 +41,48 @@
WinVersionTooHighError=Aquest programa no pot ser instal\xB7lat sota %1 versi\xF3 %2 o posterior.
AdminPrivilegesRequired=Cal que tingueu privilegis d'administrador per poder instal\xB7lar aquest programa.
PowerUserPrivilegesRequired=Cal que accediu com a administrador o com a membre del grup Power Users en instal\xB7lar aquest programa.
-SetupAppRunningError=El programa d'instal\xB7laci\xF3 ha detectat que %1 s'est\xE0 executant actualment.%n%nSi us plau, tanqueu el programa i premeu Acceptar per a continuar o Cancel\xB7lar per a sortir.
-UninstallAppRunningError=El programa de desinstal\xB7laci\xF3 ha detectat que %1 s'est\xE0 executant en aquest moment.%n%nSi us plau, tanqueu el programa i premeu Acceptar per a continuar o Cancel\xB7lar per a sortir.
+SetupAppRunningError=El programa d'instal\xB7laci\xF3 ha detectat que %1 s'est\xE0 executant actualment.%n%nSi us plau, tanqueu el programa i premeu Accepta per a continuar o Cancel\xB7la per a sortir.
+UninstallAppRunningError=El programa de desinstal\xB7laci\xF3 ha detectat que %1 s'est\xE0 executant en aquest moment.%n%nSi us plau, tanqueu el programa i premeu Accepta per a continuar o Cancel\xB7la per a sortir.
; *** Misc. errors
ErrorCreatingDir=El programa d'instal\xB7laci\xF3 no ha pogut crear la carpeta "%1"
ErrorTooManyFilesInDir=No s'ha pogut crear un fitxer a la carpeta "%1" perqu\xE8 cont\xE9 massa fitxers
; *** Setup common messages
-ExitSetupTitle=Sortir
+ExitSetupTitle=Surt
ExitSetupMessage=La instal\xB7laci\xF3 no s'ha completat. Si sortiu ara, el programa no ser\xE0 instal\xB7lat.%n%nPer a completar-la podreu tornar a executar el programa d'instal\xB7laci\xF3 quan vulgueu.%n%nVoleu sortir-ne?
AboutSetupMenuItem=&Sobre la instal\xB7laci\xF3...
AboutSetupTitle=Sobre la instal\xB7laci\xF3
AboutSetupMessage=%1 versi\xF3 %2%n%3%n%nP\xE0gina web de %1:%n%4
AboutSetupNote=
-TranslatorNote=Catalan translation by Carles Millan (in...@ca...)
+TranslatorNote=Catalan translation by Carles Millan (carles at carlesmillan.cat)
; *** Buttons
ButtonBack=< &Enrera
ButtonNext=&Seg\xFCent >
-ButtonInstall=&Instal\xB7lar
-ButtonOK=Acceptar
-ButtonCancel=Cancel\xB7lar
+ButtonInstall=&Instal\xB7la
+ButtonOK=Accepta
+ButtonCancel=Cancel\xB7la
ButtonYes=&S\xED
ButtonYesToAll=S\xED a &tot
ButtonNo=&No
ButtonNoToAll=N&o a tot
-ButtonFinish=&Finalitzar
-ButtonBrowse=&Explorar...
-ButtonWizardBrowse=&Cercar...
-ButtonNewFolder=Crear &nova carpeta
+ButtonFinish=&Finalitza
+ButtonBrowse=&Explora...
+ButtonWizardBrowse=&Cerca...
+ButtonNewFolder=Crea &nova carpeta
; *** "Select Language" dialog messages
SelectLanguageTitle=Trieu idioma
SelectLanguageLabel=Trieu idioma a emprar durant la instal\xB7laci\xF3:
; *** Common wizard text
-ClickNext=Premeu Seg\xFCent per a continuar o Cancel\xB7lar per a abandonar la instal\xB7laci\xF3.
+ClickNext=Premeu Seg\xFCent per a continuar o Cancel\xB7la per a abandonar la instal\xB7laci\xF3.
BeveledLabel=
; *** "Welcome" wizard page
BrowseDialogTitle=Trieu una carpeta
-BrowseDialogLabel=Trieu la carpeta de destinaci\xF3 i premeu Acceptar.
+BrowseDialogLabel=Trieu la carpeta de destinaci\xF3 i premeu Accepta.
NewFolderName=Nova carpeta
WelcomeLabel1=Benvingut a l'assistent d'instal\xB7laci\xF3 de [name]
WelcomeLabel2=Aquest programa instal\xB7lar\xE0 [name/ver] al vostre ordinador.%n%n\xC9s molt recomanable que abans de continuar tanqueu tots els altres programes oberts, per tal d'evitar conflictes durant el proc\xE9s d'instal\xB7laci\xF3.
@@ -121,7 +121,7 @@
WizardSelectDir=Trieu Carpeta de Destinaci\xF3
SelectDirDesc=On s'ha d'instal\xB7lar [name]?
SelectDirLabel3=El programa d'instal\xB7laci\xF3 instal\xB7lar\xE0 [name] a la carpeta seg\xFCent.
-SelectDirBrowseLabel=Per a continuar, premeu Seg\xFCent. Si desitgeu triar una altra capeta, premeu Cercar.
+SelectDirBrowseLabel=Per a continuar, premeu Seg\xFCent. Si desitgeu triar una altra capeta, premeu Cerca.
DiskSpaceMBLabel=Aquest programa necessita un m\xEDnim de [mb] MB d'espai a disc.
ToUNCPathname=La instal\xB7laci\xF3 no pot instal\xB7lar el programa en una carpeta UNC. Si esteu provant d'instal\xB7lar-lo en xarxa, haureu d'assignar una lletra (D:, E:, etc...) al disc de destinaci\xF3.
InvalidPath=Cal donar una ruta completa amb lletra d'unitat, per exemple:%n%nC:\Aplicaci\xF3%n%no b\xE9 una ruta UNC en la forma:%n%n\\servidor\compartit
@@ -159,18 +159,18 @@
WizardSelectProgramGroup=Trieu la carpeta del Men\xFA Inici
SelectStartMenuFolderDesc=On cal situar els enlla\xE7os del programa?
SelectStartMenuFolderLabel3=El programa d'instal\xB7laci\xF3 crear\xE0 l'acc\xE9s directe al programa a la seg\xFCent carpeta del men\xFA d'Inici.
-SelectStartMenuFolderBrowseLabel=Per a continuar, premeu Seg\xFCent. Si desitgeu triar una altra carpeta, premeu Cercar.
+SelectStartMenuFolderBrowseLabel=Per a continuar, premeu Seg\xFCent. Si desitgeu triar una altra carpeta, premeu Cerca.
MustEnterGroupName=Cal que hi entreu un nom de carpeta.
GroupNameTooLong=El nom de la carpeta o de la ruta \xE9s massa llarg.
InvalidGroupName=El nom de la carpeta no \xE9s v\xE0lid.
BadGroupName=El nom del grup no pot contenir cap dels car\xE0cters seg\xFCents:%n%n%1
-NoProgramGroupCheck2=&No crear una carpeta al Men\xFA Inici
+NoProgramGroupCheck2=&No cre\xEFs una carpeta al Men\xFA Inici
; *** "Ready to Install" wizard page
WizardReady=Preparat per a instal\xB7lar
ReadyLabel1=El programa d'instal\xB7laci\xF3 est\xE0 preparat per a iniciar la instal\xB7laci\xF3 de [name] al vostre ordinador.
-ReadyLabel2a=Premeu Instal\xB7lar per a continuar amb la instal\xB7laci\xF3, o Enrera si voleu revisar o modificar les opcions d'instal\xB7laci\xF3.
-ReadyLabel2b=Premeu Instal\xB7lar per a continuar amb la instal\xB7laci\xF3.
+ReadyLabel2a=Premeu Instal\xB7la per a continuar amb la instal\xB7laci\xF3, o Enrera si voleu revisar o modificar les opcions d'instal\xB7laci\xF3.
+ReadyLabel2b=Premeu Instal\xB7la per a continuar amb la instal\xB7laci\xF3.
ReadyMemoUserInfo=Informaci\xF3 de l'usuari:
ReadyMemoDir=Carpeta de destinaci\xF3:
ReadyMemoType=Tipus d'instal\xB7laci\xF3:
@@ -182,7 +182,7 @@
WizardPreparing=Preparant la instal\xB7laci\xF3
PreparingDesc=Preparant la instal\xB7laci\xF3 de [name] al vostre ordinador.
PreviousInstallNotCompleted=La instal\xB7laci\xF3 o desinstal\xB7laci\xF3 anterior no s'ha dut a terme. Caldr\xE0 que reinicieu l'ordinador per a finalitzar aquesta instal\xB7laci\xF3.%n%nDespr\xE9s de reiniciar l'ordinador, executeu aquest programa de nou per completar la instal\xB7laci\xF3 de [name].
-CannotContinue=La instal\xB7laci\xF3 no pot continuar. Si us plau, premeu Cancel\xB7lar per a sortir.
+CannotContinue=La instal\xB7laci\xF3 no pot continuar. Si us plau, premeu Cancel\xB7la per a sortir.
; *** "Installing" wizard page
WizardInstalling=Instal\xB7lant
@@ -192,20 +192,20 @@
FinishedHeadingLabel=Completant l'assistent d'instal\xB7laci\xF3 de [name]
FinishedLabelNoIcons=El programa ha finalitzat la instal\xB7laci\xF3 de [name] al vostre ordinador.
FinishedLabel=El programa ha finalitzat la instal\xB7laci\xF3 de [name] al vostre ordinador. L'aplicaci\xF3 pot ser iniciada seleccionant les icones instal\xB7lades.
-ClickFinish=Premeu Finalitzar per a sortir de la instal\xB7laci\xF3.
+ClickFinish=Premeu Finalitza per a sortir de la instal\xB7laci\xF3.
FinishedRestartLabel=Per a completar la instal\xB7laci\xF3 de [name] cal reiniciar l'ordinador. Voleu fer-ho ara?
FinishedRestartMessage=Per a completar la instal\xB7laci\xF3 de [name] cal reiniciar l'ordinador. Voleu fer-ho ara?
ShowReadmeCheck=S\xED, vull visualitzar el fitxer LLEGIUME.TXT
YesRadio=&S\xED, reiniciar l'ordinador ara
NoRadio=&No, reiniciar\xE9 l'ordinador m\xE9s tard
; used for example as 'Run MyProg.exe'
-RunEntryExec=Executar %1
+RunEntryExec=Executa %1
; used for example as 'View Readme.txt'
-RunEntryShellExec=Visualitzar %1
+RunEntryShellExec=Visualitza %1
; *** "Setup Needs the Next Disk" stuff
ChangeDiskTitle=El programa d'instal\xB7laci\xF3 necessita el disc seg\xFCent
-SelectDiskLabel2=Si us plau, introduiu el disc %1 i premeu Continuar.%n%nSi els fitxers d'aquest disc es poden trobar en una carpeta diferent de la indicada tot seguit, entreu-ne la ruta correcta o b\xE9 premeu Explorar.
+SelectDiskLabel2=Si us plau, introduiu el disc %1 i premeu Continua.%n%nSi els fitxers d'aquest disc es poden trobar en una carpeta diferent de la indicada tot seguit, entreu-ne la ruta correcta o b\xE9 premeu Explora.
PathLabel=&Ruta:
FileNotInDir2=El fitxer "%1" no s'ha pogut trobar a "%2". Si us plau, introdu\xEFu el disc correcte o trieu una altra carpeta.
SelectDirectoryLabel=Si us plau, indiqueu on es troba el disc seg\xFCent.
@@ -254,7 +254,7 @@
ErrorReadingSource=Hi ha hagut un error en llegir el fitxer d'origen:
ErrorCopying=Hi ha hagut un error en copiar un fitxer:
ErrorReplacingExistingFile=Hi ha hagut un error en reempla\xE7ar el fitxer existent:
-ErrorRestartReplace=Ha fallar reempla\xE7ar:
+ErrorRestartReplace=Ha fallat reempla\xE7ar:
ErrorRenamingTemp=Hi ha hagut un error en reanomenar un fitxer a la carpeta de destinaci\xF3:
ErrorRegisterServer=No s'ha pogut registrar el DLL/OCX: %1
ErrorRegisterServerMissingExport=No s'ha trobat l'exportador DllRegisterServer
@@ -297,9 +297,9 @@
CreateDesktopIcon=Crear una icona a l'&Escriptori
CreateQuickLaunchIcon=Crear una icona a la &Barra de tasques
ProgramOnTheWeb=%1 a Internet
-UninstallProgram=Desinstal\xB7lar %1
-LaunchProgram=Obrir %1
-AssocFileExtension=&Associar %1 amb l'extensi\xF3 de fitxer %2
+UninstallProgram=Desinstal\xB7la %1
+LaunchProgram=Obre %1
+AssocFileExtension=&Associa %1 amb l'extensi\xF3 de fitxer %2
AssocingFileExtension=Associant %1 amb l'extensi\xF3 de fitxer %2...
;Things we can also localize
Modified: trunk/Installer/InnoSetup/Languages/Czech.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Czech.isl 2006-09-16 14:41:13 UTC (rev 3575)
+++ trunk/Installer/InnoSetup/Languages/Czech.isl 2006-09-18 19:34:24 UTC (rev 3576)
@@ -1,18 +1,25 @@
-; ******************************************************
-; *** ***
-; *** Inno Setup version 5.1.0+ Czech messages ***
-; *** ***
-; *** Original Author: ***
-; *** ***
-; *** Ing. Ivo Bauer (ba...@oz...) ***
-; *** ***
-; *** Contributors: ***
-; *** ***
-; *** Lubos Stanek (lu...@us...) ***
-; *** ***
-; ******************************************************
+; *******************************************************
+; *** ***
+; *** Inno Setup version 5.1.0+ Czech messages ***
+; *** ***
+; *** Original Author: ***
+; *** ***
+; *** Ivo Bauer (ba...@oz...) ***
+; *** ***
+; *** Contributors: ***
+; *** ***
+; *** Lubos Stanek (lu...@us...) ***
+; *** Vitezslav Svejdar (vit...@cu...) ***
+; *** ***
+; *******************************************************
;
-; $jrsoftware: issrc/Files/Languages/Czech.isl,v 1.16 2005/02/28 14:18:39 ibauer Exp $
+; Copyright (C) 1997-2005 Jordan Russell. All rights reserved.
+; Translations (C) 2002-2006 Original Author and Contributors. All rights reserved.
+;
+; The contents of this file are subject to the Inno Setup License (the "License").
+; You may obtain a copy of the License at http://www.jrsoftware.org/files/is/license.txt
+;
+; $jrsoftware: issrc/Files/Languages/Czech.isl,v 1.17 2006/05/04 09:50:07 mlaan Exp $
[LangOptions]
LanguageName=<010C>e<0161>tina
@@ -39,9 +46,9 @@
; *** Startup error messages
LastErrorMessage=%1.%n%nChyba %2: %3
-SetupFileMissing=Instala\xE8n\xED slo\x9Eka neobsahuje soubor %1. Opravte pros\xEDm tuto chybu nebo si po\xF8i\xEFte novou kopii tohoto produktu.
-SetupFileCorrupt=Soubory pr\xF9vodce instalac\xED jsou po\x9Akozeny. Po\xF8i\xEFte si pros\xEDm novou kopii tohoto produktu.
-SetupFileCorruptOrWrongVer=Soubory pr\xF9vodce instalac\xED jsou po\x9Akozeny nebo se neslu\xE8uj\xED s touto verz\xED pr\xF9vodce instalac\xED. Opravte pros\xEDm tuto chybu nebo si po\xF8i\xEFte novou kopii tohoto produktu.
+SetupFileMissing=Instala\xE8n\xED slo\x9Eka neobsahuje soubor %1. Opravte pros\xEDm tuto chybu nebo si opat\xF8ete novou kopii tohoto produktu.
+SetupFileCorrupt=Soubory pr\xF9vodce instalac\xED jsou po\x9Akozeny. Opat\xF8ete si pros\xEDm novou kopii tohoto produktu.
+SetupFileCorruptOrWrongVer=Soubory pr\xF9vodce instalac\xED jsou po\x9Akozeny nebo se neslu\xE8uj\xED s touto verz\xED pr\xF9vodce instalac\xED. Opravte pros\xEDm tuto chybu nebo si opat\xF8ete novou kopii tohoto produktu.
NotOnThisPlatform=Tento produkt nelze spustit ve %1.
OnlyOnThisPlatform=Tento produkt mus\xED b\xFDt spu\x9At\xECn ve %1.
OnlyOnTheseArchitectures=Tento produkt lze nainstalovat pouze ve verz\xEDch MS Windows s podporou architektury procesor\xF9:%n%n%1
@@ -59,12 +66,12 @@
; *** Setup common messages
ExitSetupTitle=Ukon\xE8it pr\xF9vodce instalac\xED
-ExitSetupMessage=Instalace nebyla zcela dokon\xE8ena. Jestli\x9Ee nyn\xED ukon\xE8\xEDte pr\xF9vodce instalac\xED, produkt nebude nainstalov\xE1n.%n%nPr\xF9vodce instalac\xED m\xF9\x9Eete znovu spustit kdykoliv jindy a dokon\xE8it instalaci.%n%nChcete ukon\xE8it pr\xF9vodce instalac\xED?
+ExitSetupMessage=Instalace nebyla zcela dokon\xE8ena. Jestli\x9Ee nyn\xED pr\xF9vodce instalac\xED ukon\xE8\xEDte, produkt nebude nainstalov\xE1n.%n%nPr\xF9vodce instalac\xED m\xF9\x9Eete znovu spustit kdykoliv jindy a instalaci dokon\xE8it.%n%nChcete pr\xF9vodce instalac\xED ukon\xE8it?
AboutSetupMenuItem=&O pr\xF9vodci instalac\xED...
AboutSetupTitle=O pr\xF9vodci instalac\xED
AboutSetupMessage=%1 verze %2%n%3%n%n%1 domovsk\xE1 str\xE1nka:%n%4
AboutSetupNote=
-TranslatorNote=Czech translation maintained by Ing. Ivo Bauer (ba...@oz...) and Lubos Stanek (lu...@us...)
+TranslatorNote=Czech translation maintained by Ivo Bauer (ba...@oz...), Lubos Stanek (lu...@us...) and Vitezslav Svejdar (vit...@cu...)
; *** Buttons
ButtonBack=< &Zp\xECt
@@ -162,7 +169,7 @@
; *** "Select Additional Tasks" wizard page
WizardSelectTasks=Zvolte dal\x9A\xED \xFAlohy
SelectTasksDesc=Kter\xE9 dal\x9A\xED \xFAlohy maj\xED b\xFDt provedeny?
-SelectTasksLabel2=Zvolte dal\x9A\xED \xFAlohy, kter\xE9 maj\xED b\xFDt provedeny v pr\xF9b\xEChu instalace produktu [name] a pokra\xE8ujte klepnut\xEDm na tla\xE8\xEDtko Dal\x9A\xED.
+SelectTasksLabel2=Zvolte dal\x9A\xED \xFAlohy, kter\xE9 maj\xED b\xFDt provedeny v pr\xF9b\xEChu instalace produktu [name], a pak pokra\xE8ujte klepnut\xEDm na tla\xE8\xEDtko Dal\x9A\xED.
; *** "Select Start Menu Folder" wizard page
WizardSelectProgramGroup=Vyberte slo\x9Eku v nab\xEDdce Start
@@ -190,7 +197,7 @@
; *** "Preparing to Install" wizard page
WizardPreparing=P\xF8\xEDprava k instalaci
PreparingDesc=Pr\xF9vodce instalac\xED p\xF8ipravuje instalaci produktu [name] na V\xE1\x9A po\xE8\xEDta\xE8.
-PreviousInstallNotCompleted=Instalace/odinstalace p\xF8edchoz\xEDho produktu nebyla zcela dokon\xE8ena. Dokon\xE8en\xED tohoto procesu vy\x9Eaduje restart tohoto po\xE8\xEDta\xE8e.%n%nPo restartov\xE1n\xED po\xE8\xEDta\xE8e spus\x9Dte znovu tohoto pr\xF9vodce instalac\xED, aby bylo mo\x9En\xE9 dokon\xE8it instalaci produktu [name].
+PreviousInstallNotCompleted=Instalace/odinstalace p\xF8edchoz\xEDho produktu nebyla zcela dokon\xE8ena. Aby mohla b\xFDt dokon\xE8ena, mus\xEDte restartovat V\xE1\x9A po\xE8\xEDta\xE8.%n%nPo restartov\xE1n\xED Va\x9Aeho po\xE8\xEDta\xE8e spus\x9Dte znovu pr\xF9vodce instalac\xED, aby bylo mo\x9En\xE9 dokon\xE8it instalaci produktu [name].
CannotContinue=Pr\xF9vodce instalac\xED nem\xF9\x9Ee pokra\xE8ovat. Ukon\xE8ete pros\xEDm pr\xF9vodce instalac\xED klepnut\xEDm na tla\xE8\xEDtko Storno.
; *** "Installing" wizard page
@@ -214,14 +221,14 @@
; *** "Setup Needs the Next Disk" stuff
ChangeDiskTitle=Pr\xF9vodce instalac\xED vy\x9Eaduje dal\x9A\xED disk
-SelectDiskLabel2=Vlo\x9Ete pros\xEDm disk %1 a klepn\xECte na OK.%n%nPokud se soubory na tomto disku nach\xE1zej\xED v jin\xE9 slo\x9Ece, ne\x9E v t\xE9, kter\xE1 je zobrazena n\xED\x9Ee, pak zadejte spr\xE1vnou cestu nebo ji zvolte klepnut\xEDm na tla\xE8\xEDtko Proch\xE1zet.
+SelectDiskLabel2=Vlo\x9Ete pros\xEDm disk %1 a klepn\xECte na OK.%n%nPokud se soubory na tomto disku nach\xE1zej\xED v jin\xE9 slo\x9Ece ne\x9E v t\xE9, kter\xE1 je zobrazena n\xED\x9Ee, pak zadejte spr\xE1vnou cestu nebo ji zvolte klepnut\xEDm na tla\xE8\xEDtko Proch\xE1zet.
PathLabel=&Cesta:
FileNotInDir2=Soubor "%1" nelze naj\xEDt v "%2". Vlo\x9Ete pros\xEDm spr\xE1vn\xFD disk nebo zvolte jinou slo\x9Eku.
SelectDirectoryLabel=Specifikujte pros\xEDm um\xEDst\xECn\xED dal\x9A\xEDho disku.
; *** Installation phase messages
SetupAborted=Instalace nebyla zcela dokon\xE8ena.%n%nOpravte pros\xEDm chybu a spus\x9Dte pr\xF9vodce instalac\xED znovu.
-EntryAbortRetryIgnore=Akci zopakujete klepnut\xEDm na tla\xE8\xEDtko Opakovat. Akci vynech\xE1te klepnut\xEDm na tla\xE8\xEDtko P\xF8esko\xE8it. Instalaci stornujete klepnut\xEDm na tla\xE8\xEDtko P\xF8eru\x9Ait.
+EntryAbortRetryIgnore=Akci zopakujete klepnut\xEDm na tla\xE8\xEDtko Opakovat. Tento krok vynech\xE1te klepnut\xEDm na tla\xE8\xEDtko P\xF8esko\xE8it. Instalaci stornujete klepnut\xEDm na tla\xE8\xEDtko P\xF8eru\x9Ait.
; *** Installation status messages
StatusCreateDirs=Vytv\xE1\xF8ej\xED se slo\x9Eky...
@@ -276,14 +283,14 @@
; *** Uninstaller messages
UninstallNotFound=Soubor "%1" neexistuje. Produkt nelze odinstalovat.
UninstallOpenError=Soubor "%1" nelze otev\xF8\xEDt. Produkt nelze odinstalovat.
-UninstallUnsupportedVer=Pr\xF9vodci odinstalac\xED se nepoda\xF8ilo rozpoznat form\xE1t souboru obsahuj\xEDc\xEDho informace k odinstalaci produktu "%1". Produkt nelze odinstalovat
+UninstallUnsupportedVer=Form\xE1t souboru se z\xE1znamy k odinstalaci produktu "%1" nebyl touto verz\xED pr\xF9vodce odinstalac\xED rozpozn\xE1n. Produkt nelze odinstalovat
UninstallUnknownEntry=V souboru obsahuj\xEDc\xEDm informace k odinstalaci produktu byla zji\x9At\xECna nezn\xE1m\xE1 polo\x9Eka (%1)
-ConfirmUninstall=Jste si opravdu jisti, \x9Ee chcete odinstalovat produkt %1 a v\x9Aechny jeho sou\xE8\xE1sti?
+ConfirmUninstall=Jste si opravdu jisti, \x9Ee chcete produkt %1 a v\x9Aechny jeho sou\xE8\xE1sti odinstalovat?
UninstallOnlyOnWin64=Tento produkt lze odinstalovat pouze v 64-bitov\xFDch verz\xEDch MS Windows.
OnlyAdminCanUninstall=K odinstalaci tohoto produktu mus\xEDte b\xFDt p\xF8ihl\xE1\x9Aeni s pr\xE1vy administr\xE1tora.
UninstallStatusLabel=\xC8ekejte pros\xEDm dokud produkt %1 nebude odinstalov\xE1n z Va\x9Aeho po\xE8\xEDta\xE8e.
-UninstalledAll=Produkt %1 byl \xFAsp\xEC\x9An\xEC odinstalov\xE1n z Va\x9Aeho po\xE8\xEDta\xE8e.
-UninstalledMost=Produkt %1 byl odinstalov\xE1n z Va\x9Aeho po\xE8\xEDta\xE8e.%n%nN\xECkter\xE9 jeho sou\xE8\xE1sti se v\x9Aak nepoda\xF8ilo odinstalovat. Ty lze odstranit ru\xE8n\xEC.
+UninstalledAll=Produkt %1 byl z Va\x9Aeho po\xE8\xEDta\xE8e \xFAsp\xEC\x9An\xEC odinstalov\xE1n.
+UninstalledMost=Produkt %1 byl odinstalov\xE1n.%n%nN\xECkter\xE9 jeho sou\xE8\xE1sti se odinstalovat nepoda\xF8ilo. M\xF9\x9Eete je v\x9Aak odstranit ru\xE8n\xEC.
UninstalledAndNeedsRestart=K dokon\xE8en\xED odinstalace produktu %1 je nezbytn\xE9, aby pr\xF9vodce odinstalac\xED restartoval V\xE1\x9A po\xE8\xEDta\xE8.%n%nChcete jej nyn\xED restartovat?
UninstallDataCorrupted=Soubor "%1" je po\x9Akozen. Produkt nelze odinstalovat
Modified: trunk/Installer/InnoSetup/Languages/Italian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Italian.isl 2006-09-16 14:41:13 UTC (rev 3575)
+++ trunk/Installer/InnoSetup/Languages/Italian.isl 2006-09-18 19:34:24 UTC (rev 3576)
@@ -8,11 +8,10 @@
; Setup adds the periods automatically (appending a period would result in
; two periods being displayed).
;
-; $jrsoftware: issrc/Files/Default.isl,v 1.67 2005/03/30 08:32:47 mlaan Exp $
-; Italian.isl revisione 27 - 2005/04/03
+; Italian.isl revisione 30 - 2006/06/11 (Basato su Default.isl 1.68)
;
-; Tradotto da ale5000 - al...@ti... - http://digilander.libero.it/kazaaita/
-; Segnalatemi via e-mail eventuali errori o suggerimenti
+; Tradotto da ale5000 - e-mail: ale5000 AT tiscali DOT it
+; Segnalatemi via e-mail eventuali errori o suggerimenti.
[LangOptions]
; The following three entries are very important. Be sure to read and
@@ -45,7 +44,7 @@
ErrorTitle=Errore
; *** SetupLdr messages
-SetupLdrStartupMessage=Questa \xE8 l'installazione di %1. Vuoi continuare?
+SetupLdrStartupMessage=Questa \xE8 l'installazione di %1. Si desidera continuare?
LdrCannotCreateTemp=Impossibile creare un file temporaneo. Installazione annullata
LdrCannotExecTemp=Impossibile eseguire un file nella cartella temporanea. Installazione annullata
@@ -57,11 +56,11 @@
NotOnThisPlatform=Questo programma non \xE8 compatibile con %1.
OnlyOnThisPlatform=Questo programma richiede %1.
OnlyOnTheseArchitectures=Questo programma pu\xF2 essere installato solo su versioni di Windows progettate per le seguenti architetture del processore:%n%n%1
-MissingWOW64APIs=La versione di Windows che stai utilizzando non include la funzionalit\xE0 richiesta dal programma di installazione per realizzare un'installazione a 64-bit. Per correggere questo problema, installa il Service Pack %1.
+MissingWOW64APIs=La versione di Windows utilizzata non include la funzionalit\xE0 richiesta dal programma di installazione per realizzare un'installazione a 64-bit. Per correggere questo problema, installare il Service Pack %1.
WinVersionTooLowError=Questo programma richiede %1 versione %2 o successiva.
WinVersionTooHighError=Questo programma non pu\xF2 essere installato su %1 versione %2 o successiva.
-AdminPrivilegesRequired=Devi accedere come amministratore per installare questo programma.
-PowerUserPrivilegesRequired=Devi accedere come amministratore o come membro del gruppo Power Users per poter installare questo programma.
+AdminPrivilegesRequired=Sono richiesti privilegi di amministratore per installare questo programma.
+PowerUserPrivilegesRequired=Sono richiesti privilegi di amministratore o di Power Users per poter installare questo programma.
SetupAppRunningError=%1 \xE8 attualmente in esecuzione.%n%nChiudere adesso tutte le istanze del programma e poi premere OK, oppure premere Annulla per uscire.
UninstallAppRunningError=%1 \xE8 attualmente in esecuzione.%n%nChiudere adesso tutte le istanze del programma e poi premere OK, oppure premere Annulla per uscire.
@@ -111,7 +110,7 @@
; *** "Password" wizard page
WizardPassword=Password
PasswordLabel1=Questa installazione \xE8 protetta da password.
-PasswordLabel3=Inserire la password, poi premere Avanti per continuare. Le password sono case-sensitive.
+PasswordLabel3=Inserire la password, poi premere Avanti per continuare. Le password sono sensibili alle maiuscole/minuscole.
PasswordEditLabel=&Password:
IncorrectPassword=La password inserita non \xE8 corretta, riprovare.
@@ -125,10 +124,10 @@
; *** "Information" wizard pages
WizardInfoBefore=Informazioni
InfoBeforeLabel=Leggere le importanti informazioni che seguono prima di procedere.
-InfoBeforeClickLabel=Quando sei pronto per proseguire, premi Avanti.
+InfoBeforeClickLabel=Quando si \xE8 pronti per proseguire, premere Avanti.
WizardInfoAfter=Informazioni
InfoAfterLabel=Leggere le importanti informazioni che seguono prima di procedere.
-InfoAfterClickLabel=Quando sei pronto per proseguire, premi Avanti.
+InfoAfterClickLabel=Quando si \xE8 pronti per proseguire, premere Avanti.
; *** "User Information" wizard page
WizardUserInfo=Informazioni utente
@@ -140,48 +139,48 @@
; *** "Select Destination Location" wizard page
WizardSelectDir=Selezione della cartella di installazione
-SelectDirDesc=Dove vuoi installare [name]?
+SelectDirDesc=Dove si vuole installare [name]?
SelectDirLabel3=[name] sar\xE0 installato nella seguente cartella.
SelectDirBrowseLabel=Per continuare, premere Avanti. Per scegliere un'altra cartella, premere Sfoglia.
DiskSpaceMBLabel=Sono richiesti almeno [mb] MB di spazio sul disco.
-ToUNCPathname=Non \xE8 possiblie installare su un percorso UNC. Se stai installando attraverso una rete, devi connettere la risorsa come una unit\xE0 di rete.
-InvalidPath=Devi inserire un percorso completo di lettera di unit\xE0; per esempio:%n%nC:\APP%n%no un percorso UNC nella forma:%n%n\\server\condivisione
-InvalidDrive=L'unit\xE0 o il percorso UNC selezionato non esiste o non \xE8 accessibile. Selezionarne un'altro.
+ToUNCPathname=Non \xE8 possiblie installare su un percorso di rete. Se si sta installando attraverso una rete, si deve connettere la risorsa come una unit\xE0 di rete.
+InvalidPath=Si deve inserire un percorso completo di lettera di unit\xE0; per esempio:%n%nC:\APP%n%no un percorso di rete nella forma:%n%n\\server\condivisione
+InvalidDrive=L'unit\xE0 o il percorso di rete selezionato non esiste o non \xE8 accessibile. Selezionarne un'altro.
DiskSpaceWarningTitle=Spazio su disco insufficiente
-DiskSpaceWarning=L'installazione richiede almeno %1 KB di spazio libero per eseguire l'installazione, ma l'unit\xE0 selezionata ha solo %2 KB disponibili.%n%nVuoi continuare comunque?
+DiskSpaceWarning=L'installazione richiede almeno %1 KB di spazio libero per eseguire l'installazione, ma l'unit\xE0 selezionata ha solo %2 KB disponibili.%n%nSi desidera continuare comunque?
DirNameTooLong=Il nome della cartella o il percorso sono troppo lunghi.
InvalidDirName=Il nome della cartella non \xE8 valido.
BadDirName32=Il nome della cartella non pu\xF2 includere nessuno dei caratteri seguenti:%n%n%1
DirExistsTitle=Cartella gi\xE0 esistente
-DirExists=La cartella:%n%n%1 esiste gi\xE0.%n%nVuoi utilizzarla comunque?
+DirExists=La cartella:%n%n%1 esiste gi\xE0.%n%nSi desidera utilizzarla comunque?
DirDoesntExistTitle=Cartella inesistente
-DirDoesntExist=La cartella:%n%n%1 non esiste.%n%nVuoi crearla?
+DirDoesntExist=La cartella:%n%n%1 non esiste.%n%nSi desidera crearla?
; *** "Select Components" wizard page
WizardSelectComponents=Selezione componenti
SelectComponentsDesc=Quali componenti devono essere installati?
-SelectComponentsLabel2=Selezionare i componenti da installare, deselezionare quelli che non vuoi installare. Premere Avanti per continuare.
+SelectComponentsLabel2=Selezionare i componenti da installare, deselezionare quelli che non si desidera installare. Premere Avanti per continuare.
FullInstallation=Installazione completa
; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
CompactInstallation=Installazione compatta
CustomInstallation=Installazione personalizzata
NoUninstallWarningTitle=Componente esistente
-NoUninstallWarning=I seguenti componenti sono gi\xE0 installati sul computer:%n%n%1%n%nDeselezionando questi componenti non verranno disinstallati.%n%nVuoi continuare comunque?
+NoUninstallWarning=I seguenti componenti sono gi\xE0 installati sul computer:%n%n%1%n%nDeselezionando questi componenti non verranno disinstallati.%n%nSi desidera continuare comunque?
ComponentSize1=%1 KB
ComponentSize2=%1 MB
ComponentsDiskSpaceMBLabel=La selezione corrente richiede almeno [mb] MB di spazio su disco.
; *** "Select Additional Tasks" wizard page
WizardSelectTasks=Selezione processi addizionali
-SelectTasksDesc=Quali processi aggiuntivi vuoi avviare?
+SelectTasksDesc=Quali processi aggiuntivi si vogliono avviare?
SelectTasksLabel2=Selezionare i processi aggiuntivi che verranno eseguiti durante l'installazione di [name], poi premere Avanti.
; *** "Select Start Menu Folder" wizard page
WizardSelectProgramGroup=Selezione della cartella nel Menu Avvio/Start
-SelectStartMenuFolderDesc=Dove vuoi che l'installazione inserisca i collegamenti al programma?
+SelectStartMenuFolderDesc=Dove si vuole inserire i collegamenti al programma?
SelectStartMenuFolderLabel3=Saranno creati i collegamenti al programma nella seguente cartella del Menu Avvio/Start.
SelectStartMenuFolderBrowseLabel=Per continuare, premere Avanti. Per selezionare un'altra cartella, premere Sfoglia.
-MustEnterGroupName=Devi inserire il nome della cartella.
+MustEnterGroupName=Si deve inserire il nome della cartella.
GroupNameTooLong=Il nome della cartella o il percorso sono troppo lunghi.
InvalidGroupName=Il nome della cartella non \xE8 valido.
BadGroupName=Il nome della cartella non pu\xF2 includere nessuno dei caratteri seguenti:%n%n%1
@@ -214,8 +213,8 @@
FinishedLabelNoIcons=L'installazione di [name] \xE8 stata completata con successo.
FinishedLabel=L'installazione di [name] \xE8 stata completata con successo. L'applicazione pu\xF2 essere eseguita selezionando le relative icone.
ClickFinish=Premere Fine per uscire dall'installazione.
-FinishedRestartLabel=Per completare l'installazione di [name], \xE8 necessario riavviare il sistema. Vuoi riavviare ora?
-FinishedRestartMessage=Per completare l'installazione di [name], \xE8 necessario riavviare il sistema.%n%nVuoi riavviare ora?
+FinishedRestartLabel=Per completare l'installazione di [name], \xE8 necessario riavviare il sistema. Si desidera riavviare adesso?
+FinishedRestartMessage=Per completare l'installazione di [name], \xE8 necessario riavviare il sistema.%n%nSi desidera riavviare adesso?
ShowReadmeCheck=Si, desidero vedere il file LEGGIMI adesso
YesRadio=&Si, riavvia il sistema adesso
NoRadio=&No, riavvia il sistema pi\xF9 tardi
@@ -269,7 +268,7 @@
ExistingFileReadOnly=Il file esistente ha l'attributo di sola lettura.%n%nPremere Riprova per rimuovere l'attributo di sola lettura e ritentare, Ignora per saltare questo file, o Interrompi per terminare l'installazione.
ErrorReadingExistingDest=Si \xE8 verificato un errore durante la lettura del file esistente:
FileExists=Il file esiste gi\xE0.%n%nDesideri sovrascriverlo?
-ExistingFileNewer=Il file esistente \xE8 pi\xF9 recente di quello che si st\xE0 installando. Si raccomanda di mantenere il file esistente.%n%nVuoi mantenere il file esistente?
+ExistingFileNewer=Il file esistente \xE8 pi\xF9 recente di quello che si st\xE0 installando. Si raccomanda di mantenere il file esistente.%n%nSi desidera mantenere il file esistente?
ErrorChangingAttr=Si \xE8 verificato un errore durante il tentativo di modifica dell'attributo del file esistente:
ErrorCreatingTemp=Si \xE8 verificato un errore durante la creazione di un file nella cartella di installazione:
ErrorReadingSource=Si \xE8 verificato un errore durante la lettura del file sorgente:
@@ -290,18 +289,18 @@
UninstallOpenError=Il file "%1" non pu\xF2 essere aperto. Impossibile disinstallare
UninstallUnsupportedVer=Il file log di disinstallazione "%1" \xE8 in un formato non riconosciuto da questa versione del programma di disinstallazione. Impossibile disinstallare
UninstallUnknownEntry=Trovata una voce sconosciuta (%1) nel file di log della disinstallazione
-ConfirmUninstall=Sei sicuro di voler rimuovere completamente %1 e tutti i suoi componenti?
+ConfirmUninstall=Si desidera rimuovere completamente %1 e tutti i suoi componenti?
UninstallOnlyOnWin64=Questo programma pu\xF2 essere disinstallato solo su Windows a 64-bit.
-OnlyAdminCanUninstall=Questa applicazione pu\xF2 essere disinstallata solo da un utente con privilegi di Amministratore.
+OnlyAdminCanUninstall=Questa applicazione pu\xF2 essere disinstallata solo da un utente con privilegi di amministratore.
UninstallStatusLabel=Attendere fino a che %1 \xE8 stato rimosso dal computer.
UninstalledAll=%1 \xE8 stato rimosso con successo dal computer.
UninstalledMost=Disinstallazione di %1 completata.%n%nAlcuni elementi non possono essere rimossi. Dovranno essere rimossi manualmente.
-UninstalledAndNeedsRestart=Per completare la disinstallazione di %1, \xE8 necessario riavviare il sistema.%n%nVuoi riavviare adesso?
+UninstalledAndNeedsRestart=Per completare la disinstallazione di %1, \xE8 necessario riavviare il sistema.%n%nSi desidera riavviare adesso?
UninstallDataCorrupted=Il file "%1" \xE8 danneggiato. Impossibile disinstallare
; *** Uninstallation phase messages
ConfirmDeleteSharedFileTitle=Rimuovere il file condiviso?
-ConfirmDeleteSharedFile2=Il sistema indica che il seguente file condiviso non \xE8 pi\xF9 usato da nessun programma. Vuoi rimuovere questo file condiviso?%n%nSe qualche programma usasse questo file, potrebbe non funzionare pi\xF9 correttamente. Se non sei sicuro, scegli No. Lasciare il file nel sistema non pu\xF2 causare danni.
+ConfirmDeleteSharedFile2=Il sistema indica che il seguente file condiviso non \xE8 pi\xF9 usato da nessun programma. Rimuovere questo file condiviso?%n%nSe qualche programma usasse questo file, potrebbe non funzionare pi\xF9 correttamente. Se non si \xE8 sicuri, scegliere No. Lasciare il file nel sistema non pu\xF2 causare danni.
SharedFileNameLabel=Nome del file:
SharedFileLocationLabel=Percorso:
WizardUninstalling=Stato della disinstallazione
Modified: trunk/Installer/InnoSetup/Languages/Japanese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Japanese.isl 2006-09-16 14:41:13 UTC (rev 3575)
+++ trunk/Installer/InnoSetup/Languages/Japanese.isl 2006-09-18 19:34:24 UTC (rev 3576)
@@ -1,6 +1,7 @@
; *** Inno Setup version 5.1.0+ Japanese messages ***
;
; Translated by Ryou Minakami (ryo...@ya...)
+; Fix: Koichi Shirasuka (shi...@eu...)
;
; $jrsoftware: issrc/Files/Default.isl,v 1.66 2005/02/25 20:23:48 mlaan Exp $
@@ -8,10 +9,14 @@
LanguageName=Japanese
LanguageID=$0411
LanguageCodePage=932
+
+; If you don't need to support Windows 9x, commenting the following 4 lines gives better looking (banners not stretched).
DialogFontName=\x82l\x82r \x82o\x83S\x83V\x83b\x83N
DialogFontSize=9
TitleFontName=\x82l\x82r \x82o\x83S\x83V\x83b\x83N
TitleFontSize=29
+
+; Required for Win2K/older to display the welcome message with correct font.
WelcomeFontName=\x82l\x82r \x82o\x83S\x83V\x83b\x83N
WelcomeFontSize=12
@@ -280,7 +285,7 @@
UninstallStatusLabel=\x82\xB2\x8Eg\x97p\x82̃R\x83\x93\x83s\x83\x85\x81[\x83^\x82\xA9\x82\xE7 %1 \x82\xF0\x8D폜\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B\x82\xB5\x82炭\x82\xA8\x91҂\xBF\x82\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
UninstalledAll=%1 \x82͂\xB2\x8Eg\x97p\x82̃R\x83\x93\x83s\x83\x85\x81[\x83^\x82\xA9\x82琳\x8F\xED\x82ɍ폜\x82\xB3\x82\xEA\x82܂\xB5\x82\xBD\x81B
UninstalledMost=%1 \x82̃A\x83\x93\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xAA\x8A\xAE\x97\xB9\x82\xB5\x82܂\xB5\x82\xBD\x81B%n%n\x82\xA2\x82\xAD\x82\xA9\x82̍\x80\x96ڂ\xAA\x8D폜\x82ł\xAB\x82܂\xB9\x82\xF1\x82ł\xB5\x82\xBD\x81B\x8E蓮\x82ō폜\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-UninstalledAndNeedsRestart=[name] \x82̍폜\x82\xF0\x8A\xAE\x97\xB9\x82\xB7\x82邽\x82߂ɂ́A\x83R\x83\x93\x83s\x83\x85\x81[\x83^\x82\xF0\x8DċN\x93\xAE\x82\xB7\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B\x82\xB7\x82\xAE\x82ɍċN\x93\xAE\x82\xB5\x82܂\xB7\x82\xA9\x81H
+UninstalledAndNeedsRestart=%1 \x82̍폜\x82\xF0\x8A\xAE\x97\xB9\x82\xB7\x82邽\x82߂ɂ́A\x83R\x83\x93\x83s\x83\x85\x81[\x83^\x82\xF0\x8DċN\x93\xAE\x82\xB7\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B\x82\xB7\x82\xAE\x82ɍċN\x93\xAE\x82\xB5\x82܂\xB7\x82\xA9\x81H
UninstallDataCorrupted=\x83t\x83@\x83C\x83\x8B "%1" \x82\xAA\x89\xF3\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B\x83A\x83\x93\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xF0\x8E\xC0\x8Ds\x82ł\xAB\x82܂\xB9\x82\xF1\x81B
; *** Uninstallation phase messages
Modified: trunk/Installer/InnoSetup/Languages/Slovak.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Slovak.isl 2006-09-16 14:41:13 UTC (rev 3575)
+++ trunk/Installer/InnoSetup/Languages/Slovak.isl 2006-09-18 19:34:24 UTC (rev 3576)
@@ -4,12 +4,16 @@
; *** ***
; *** Original Author: ***
; *** ***
-; *** Milan Potancok (mi...@by...) ***
+; *** Milan Potancok (mil...@gm...) ***
; *** ***
; *** Contributors: ***
; *** ***
+; *** Ivo Bauer (ba...@oz...) ***
+; *** ***
; *** Tomas Falb (to...@po...) ***
; *** ***
+; *** Update: 13.10.2005 ***
+; *** ***
; ******************************************************
;
;
@@ -22,8 +26,8 @@
[Messages]
SetupAppTitle=Sprievodca in\x9Atal\xE1ciou
SetupWindowTitle=Sprievodca in\x9Atal\xE1ciou - %1
-UninstallAppTitle=Sprievodca odobran\xEDm
-UninstallAppFullTitle=Sprievodca odobran\xEDm - %1
+UninstallAppTitle=Sprievodca odin\x9Atal\xE1ciou
+UninstallAppFullTitle=Sprievodca odin\x9Atal\xE1ciou - %1
InformationTitle=Inform\xE1cie
ConfirmTitle=Potvrdenie
ErrorTitle=Chyba
@@ -36,23 +40,23 @@
SetupFileCorruptOrWrongVer=S\xFAbory sprievodcu in\x9Atal\xE1ciou s\xFA po\x9Akoden\xE9 alebo sa nezhoduj\xFA s touto verziou sprievodcu instal\xE1ciou. Opravte, pros\xEDm, t\xFAto chybu alebo si zaobstarajte nov\xFA k\xF3piu tohto produktu.
NotOnThisPlatform=Tento produkt sa ned\xE1 spusti\x9D v %1.
OnlyOnThisPlatform=Tento produkt mus\xED by\x9D spusten\xFD v %1.
-;OnlyOnTheseArchitectures=Tento produkt je mo\x9En\xE9 nain\x9Atalovat iba vo verzi\xE1ch MS Windows s podporou architekt\xFAry procesorov:%n%n%1
-;MissingWOW64APIs=Aktu\xE1lna verzia MS Windows neobsahuje funkcie, ktor\xE9 vy\x9Eaduje sprievodca in\x9Atal\xE1ciou pre 64-bitov\xFA in\x9Atal\xE1ciu. Opravte pros\xEDm t\xFAto chybu nain\x9Atalovan\xEDm aktualiz\xE1cie Service Pack %1.
+OnlyOnTheseArchitectures=Tento produkt je mo\x9En\xE9 nain\x9Atalovat iba vo verzi\xE1ch MS Windows s podporou architekt\xFAry procesorov:%n%n%1
+MissingWOW64APIs=Aktu\xE1lna verzia MS Windows neobsahuje funkcie, ktor\xE9 vy\x9Eaduje sprievodca in\x9Atal\xE1ciou pre 64-bitov\xFA in\x9Atal\xE1ciu. Opravte pros\xEDm t\xFAto chybu nain\x9Atalovan\xEDm aktualiz\xE1cie Service Pack %1.
WinVersionTooLowError=Tento produkt vy\x9Eaduje %1 verzie %2 alebo vy\x9A\x9Aej.
WinVersionTooHighError=Tento produkt sa ned\xE1 nain\x9Atalova\x9D vo %1 verzie %2 alebo vy\x9A\x9Aej.
AdminPrivilegesRequired=Na in\x9Atal\xE1ciu tohto produktu mus\xEDte by\x9D prihl\xE1sen\xFD s pr\xE1vami administr\xE1tora.
PowerUserPrivilegesRequired=Na in\x9Atal\xE1ciu tohto produktu mus\xEDte by\x9D prihl\xE1sen\xFD s pr\xE1vami administr\xE1tora alebo \xE8lena skupiny Power Users.
-SetupAppRunningError=Sprievodca in\x9Atal\xE1ciou zistil, \x9Ee %1 je teraz spusten\xFD.%n%nUkon\xE8ite, pros\xEDm, v\x9Aetky spusten\xE9 in\x9Atancie tohto produktu a kliknite na OK pre pokra\xE8ovanie alebo na Storno pre ukon\xE8enie.
-UninstallAppRunningError=Sprievodca odin\x9Atalovan\xEDm zistil, \x9Ee %1 je teraz spusten\xFD.%n%nUkon\xE8ite, pros\xEDm, v\x9Aetky spusten\xE9 in\x9Atancie tohto produktu a kliknite na OK pre pokra\xE8ovanie alebo na Storno pre ukon\xE8enie.
+SetupAppRunningError=Sprievodca in\x9Atal\xE1ciou zistil, \x9Ee produkt %1 je teraz spusten\xFD.%n%nUkon\xE8ite, pros\xEDm, v\x9Aetky spusten\xE9 in\x9Atancie tohto produktu a pokra\xE8ujte kliknut\xEDm na tla\xE8idlo OK alebo ukon\xE8ite in\x9Atal\xE1ciu tla\xE8idlom Zru\x9Ai\x9D.
+UninstallAppRunningError=Sprievodca odin\x9Atal\xE1ciou zistil, \x9Ee produkt %1 je teraz spusten\xFD.%n%nUkon\xE8ite, pros\xEDm, v\x9Aetky spusten\xE9 in\x9Atancie tohto produktu a pokra\xE8ujte kliknut\xEDm na tla\xE8idlo OK alebo ukon\xE8ite in\x9Atal\xE1ciu tla\xE8idlom Zru\x9Ai\x9D.
ErrorCreatingDir=Sprievodca in\x9Atal\xE1ciou nemohol vytvori\x9D adres\xE1r "%1"
-ErrorTooManyFilesInDir=Ned\xE1 sa vytvori\x9D s\xFAbor v adres\xE1ri "%1", preto\x9Ee tento adres\xE1r u\x9E obsahuje pr\xEDli\x9A ve\xBEa s\xFAborou
+ErrorTooManyFilesInDir=Ned\xE1 sa vytvori\x9D s\xFAbor v adres\xE1ri "%1", preto\x9Ee tento adres\xE1r u\x9E obsahuje pr\xEDli\x9A ve\xBEa s\xFAborov
ExitSetupTitle=Ukon\xE8i\x9D sprievodcu in\x9Atal\xE1ciou
ExitSetupMessage=In\x9Atal\xE1cia nebola celkom dokon\xE8en\xE1. Ak teraz ukon\xE8\xEDte sprievodcu in\x9Atal\xE1ciou, produkt nebude nain\x9Atalovan\xFD.%n%nSprievodcu in\x9Atal\xE1ciou m\xF4\x9Eete znovu spusti\x9D nesk\xF4r a dokon\xE8i\x9D tak in\x9Atal\xE1ciu.%n%nUkon\xE8i\x9D sprievodcu in\x9Atal\xE1ciou?
AboutSetupMenuItem=&O sprievodcovi in\x9Atal\xE1cie...
AboutSetupTitle=O sprievodcovi in\x9Atal\xE1cie
AboutSetupMessage=%1 verzia %2%n%3%n%n%1 domovsk\xE1 str\xE1nka:%n%4
AboutSetupNote=
-;TranslatorNote=
+TranslatorNote=Slovak translation maintained by Milan Potancok (mil...@gm...), Ivo Bauer (ba...@oz...) and Tomas Falb (to...@po...)
ButtonBack=< &Sp\xE4\x9D
ButtonNext=&\xCFalej >
ButtonInstall=&In\x9Atalova\x9D
@@ -68,7 +72,7 @@
ButtonNewFolder=&Vytvori\x9D nov\xFD adres\xE1r
SelectLanguageTitle=V\xFDber jazyka sprievodcu in\x9Atal\xE1ciou
SelectLanguageLabel=Zvo\xBEte jazyk, ktor\xFD sa m\xE1 pou\x9Ei\x9D pri in\x9Atal\xE1cii:
-ClickNext=Pokra\xE8ujte kliknut\xEDm na tla\xE8idlo \xCFalej alebo ukon\xE8ite sprievodcu in\x9Atal\xE1ciou tla\xE8idlom Zru\x9Ai\x9D .
+ClickNext=Pokra\xE8ujte kliknut\xEDm na tla\xE8idlo \xCFalej alebo ukon\xE8ite sprievodcu in\x9Atal\xE1ciou tla\xE8idlom Zru\x9Ai\x9D.
BeveledLabel=
BrowseDialogTitle=N\xE1js\x9D adres\xE1r
BrowseDialogLabel=Z dole uveden\xE9ho zoznamu vyberte adres\xE1r a kliknite na OK.
@@ -77,34 +81,34 @@
WelcomeLabel2=Produkt [name/ver] bude nain\x9Atalovan\xFD na V\xE1\x9A po\xE8\xEDta\xE8.%n%nSk\xF4r, ako budete pokra\xE8ova\x9D, odpor\xFA\xE8ame V\xE1m ukon\xE8i\x9D v\x9Aetky spusten\xE9 aplik\xE1cie.
WizardPassword=Heslo
PasswordLabel1=T\xE1to in\x9Atal\xE1cia je chr\xE1nen\xE1 heslom.
-PasswordLabel3=Pros\xEDm, zadajte heslo a pokra\xE8ujte kliknut\xEDm na tla\xE8idlo \xCFal\x9A\xED. Pri zad\xE1v\xE1n\xED hesla rozli\x9Aujte mal\xE9 a ve\xBEk\xE9 p\xEDsmen\xE1.
+PasswordLabel3=Zadajte, pros\xEDm, heslo a pokra\xE8ujte kliknut\xEDm na tla\xE8idlo \xCFalej. Pri zad\xE1v\xE1n\xED hesla rozli\x9Aujte mal\xE9 a ve\xBEk\xE9 p\xEDsmen\xE1.
PasswordEditLabel=&Heslo:
-IncorrectPassword=Zadan\xE9 heslo nie je spr\xE1vne. Pros\xEDm, zk\xFAste to e\x9Ate raz.
-WizardLicense=Licen\xE8n\xE1 dohoda
-LicenseLabel=Sk\xF4r, ako budete pokra\xE8ova\x9D, pre\xE8\xEDtajte si pozorne tieto d\xF4le\x9Eit\xE9 inform\xE1cie.
-LicenseLabel3=Pros\xEDm, pre\xE8\xEDtajte si t\xFAto Licen\xE8n\xFA zmluvu. Aby mohol in\x9Atala\xE8n\xFD proces pokra\xE8ova\x9D, mus\xEDte s\xFAhlasi\x9D s podmienkami tejto zmluvy.
+IncorrectPassword=Zadan\xE9 heslo nie je spr\xE1vne. Zk\xFAste to, pros\xEDm, e\x9Ate raz.
+WizardLicense=Licen\xE8n\xE1 zmluva
+LicenseLabel=Sk\xF4r, ako budete pokra\xE8ova\x9D, pre\xE8\xEDtajte si, pros\xEDm, tieto d\xF4le\x9Eit\xE9 inform\xE1cie.
+LicenseLabel3=Pre\xE8\xEDtajte si, pros\xEDm, t\xFAto Licen\xE8n\xFA zmluvu. Aby mohla in\x9Atal\xE1cia pokra\xE8ova\x9D, mus\xEDte s\xFAhlasi\x9D s podmienkami tejto zmluvy.
LicenseAccepted=&S\xFAhlas\xEDm s podmienkami Licen\xE8nej zmluvy
LicenseNotAccepted=&Nes\xFAhlas\xEDm s podmienkami Licen\xE8nej zmluvy
WizardInfoBefore=Inform\xE1cie
-InfoBeforeLabel=Sk\xF4r, ako budete pokra\xE8ova\x9D, pre\xE8\xEDtajte si pozorne tieto d\xF4le\x9Eit\xE9 inform\xE1cie.
-InfoBeforeClickLabel=Pokra\xE8ujte v in\x9Atala\xE8nom procese kliknut\xEDm na tla\xE8idlo \xCFalej.
+InfoBeforeLabel=Sk\xF4r, ako budete pokra\xE8ova\x9D, pre\xE8\xEDtajte si, pros\xEDm, tieto d\xF4le\x9Eit\xE9 inform\xE1cie.
+InfoBeforeClickLabel=Pokra\xE8ujte v in\x9Atal\xE1cii kliknut\xEDm na tla\xE8idlo \xCFalej.
WizardInfoAfter=Inform\xE1cie
-InfoAfterLabel=Sk\xF4r, ako budete pokra\xE8ova\x9D, pre\xE8\xEDtajte si pozorne tieto d\xF4le\x9Eit\xE9 inform\xE1cie.
-InfoAfterClickLabel=Pokra\xE8ujte v in\x9Atala\xE8nom procese kliknut\xEDm na tla\xE8idlo \xCFalej.
+InfoAfterLabel=Sk\xF4r, ako budete pokra\xE8ova\x9D, pre\xE8\xEDtajte si, pros\xEDm, tieto d\xF4le\x9Eit\xE9 inform\xE1cie.
+InfoAfterClickLabel=Pokra\xE8ujte v in\x9Atal\xE1cii kliknut\xEDm na tla\xE8idlo \xCFalej.
WizardUserInfo=Inform\xE1cie o pou\x9E\xEDvate\xBEovi
-UserInfoDesc=Pros\xEDm, zadajte po\x9Eadovan\xE9 inform\xE1cie.
+UserInfoDesc=Zadajte, pros\xEDm, po\x9Eadovan\xE9 inform\xE1cie.
UserInfoName=&Pou\x9E\xEDvate\xBEsk\xE9 meno:
UserInfoOrg=&Organiz\xE1cia:
UserInfoSerial=&S\xE9riove \xE8\xEDslo:
UserInfoNameRequired=Pou\x9E\xEDvate\xBEsk\xE9 meno mus\xED by\x9D zadan\xE9.
WizardSelectDir=Vyberte cie\xBEov\xFD adres\xE1r
-SelectDirDesc=Kam m\xE1 by\x9D [name] nain\x9Atalovan\xFD?
+SelectDirDesc=Kam m\xE1 by\x9D produkt [name] nain\x9Atalovan\xFD?
SelectDirLabel3=Sprievodca nain\x9Ataluje produkt [name] do nasleduj\xFAceho adres\xE1ra.
-SelectDirBrowseLabel=Pokra\xE8ujte kliknut\xEDm na tla\xE8idlo \xCFal\x9A\xED. Ak chcete vybra\x9D in\xFD adres\xE1r, kliknite na tla\xE8idlo Prech\xE1dza\x9D.
-DiskSpaceMBLabel=Tento produkt vy\x9Eaduje najmenej [mb] MB miesta na disku.
+SelectDirBrowseLabel=Pokra\xE8ujte kliknut\xEDm na tla\xE8idlo \xCFalej. Ak chcete vybra\x9D in\xFD adres\xE1r, kliknite na tla\xE8idlo Prech\xE1dza\x9D.
+DiskSpaceMBLabel=In\x9Atal\xE1cia vy\x9Eaduje najmenej [mb] MB miesta na disku.
ToUNCPathname=Sprevodca in\x9Atal\xE1ciou nem\xF4\x9Ee in\x9Atalova\x9D do cesty UNC. Ak sa pok\xFA\x9Aate in\x9Atalova\x9D po sieti, mus\xEDte pou\x9Ei\x9D niektor\xFA z dostupn\xFDch sie\x9Dov\xFDch jednotiek.
InvalidPath=Mus\xEDte zadat \xFApln\xFA cestu vr\xE1tane p\xEDsmena jednotky; napr\xEDklad:%n%nC:\Aplik\xE1cia%n%nalebo cestu UNC v tvare:%n%n\\server\zdie\xBEan\xFD adres\xE1r
-InvalidDrive=Vami vybran\xE1 jednotka alebo cesta UNC neexistuje alebo nie je dostupn\xE1. Pros\xEDm, vyberte in\xE9 umiestnenie.
+InvalidDrive=Vami vybran\xE1 jednotka alebo cesta UNC neexistuje alebo nie je dostupn\xE1. Vyberte, pros\xEDm, in\xE9 umiestnenie.
DiskSpaceWarningTitle=Nedostatok miesta na disku
DiskSpaceWarning=Sprievodca in\x9Atal\xE1ciou vy\x9Eaduje najmenej %1 KB vo\xBEn\xE9ho miesta na in\x9Atal\xE1ciu produktu, ale na vybranej jednotke je dostupn\xFDch len %2 KB.%n%nPrajete si napriek tomu pokra\xE8ova\x9D?
DirNameTooLong=N\xE1zov adres\xE1ra alebo cesta s\xFA pr\xEDli\x9A dlh\xE9.
@@ -113,7 +117,7 @@
DirExistsTitle=Adres\xE1r existuje
DirExists=Adres\xE1r:%n%n%1%n%nu\x9E existuje. M\xE1 sa napriek tomu in\x9Atalova\x9D do tohto adres\xE1ra?
DirDoesntExistTitle=Adres\xE1r neexistuje
-DirDoesntExist=Adres\xE1r:%n%n%1%n%ne\x9Ate neexistuje. M\xE1 sa vytvori\x9D?
+DirDoesntExist=Adres\xE1r:%n%n%1%n%ne\x9Ate neexistuje. M\xE1 sa tento adres\xE1r vytvori\x9D?
WizardSelectComponents=Vyberte komponenty
SelectComponentsDesc=Ak\xE9 komponenty maj\xFA by\x9D nain\x9Atalovan\xE9?
SelectComponentsLabel2=Za\x9Akrtnite komponenty, ktor\xE9 maj\xFA by\x9D nain\x9Atalovan\xE9; komponenty, ktor\xE9 se nemaj\xFA in\x9Atalova\x9D, nechajte neza\x9Akrtnut\xE9. Pokra\xE8ujte kliknut\xEDm na tla\xE8idlo \xCFalej.
@@ -127,19 +131,18 @@
ComponentsDiskSpaceMBLabel=Vybran\xE9 komponenty vy\x9Eaduj\xFA najmenej [mb] MB miesta na disku.
WizardSelectTasks=Vyberte \xEFal\x9Aie \xFAlohy
SelectTasksDesc=Ktor\xE9 \xEFal\x9Aie \xFAlohy maj\xFA by\x9D vykonan\xE9?
-SelectTasksLabel2=Vyberte \xEFal\x9Aie \xFAlohy, ktor\xE9 maj\xFA by\x9D vykonan\xE9 v priebehu in\x9Atal\xE1cie produktu [name] a pokra\xE8ujte kliknut\xEDm na \xCFalej.
+SelectTasksLabel2=Vyberte \xEFal\x9Aie \xFAlohy, ktor\xE9 maj\xFA by\x9D vykonan\xE9 v priebehu in\x9Atal\xE1cie produktu [name] a pokra\xE8ujte kliknut\xEDm na tla\xE8idlo \xCFalej.
WizardSelectProgramGroup=Vyberte skupinu v ponuke \x8Atart
-SelectStartMenuFolderDesc=Kam m\xE1 sprievodca in\x9Atal\xE1cie umiestni\x9D z\xE1stupcu aplik\xE1cie?
-SelectStartMenuFolderLabel3=Sprievodca in\x9Atal\xE1ciou vytvor\xED z\xE1stupcu aplik\xE1cie v nasleduj\xFAcom adresari ponuky \x8Atart.
-SelectStartMenuFolderBrowseLabel=Pokra\xE8ujte kliknut\xEDm na tla\xE8idlo Dalej. Ak chcete zvoli\x9D in\xFD adres\xE1r, kliknite na tla\xE8idlo Prech\xE1dza\x9D.
-NoIconsCheck=&Nevytv\xE1ra\x9D \x9Eiadne ikony
+SelectStartMenuFolderDesc=Kam m\xE1 sprievodca in\x9Atal\xE1cie umiestni\x9D z\xE1stupcov aplik\xE1cie?
+SelectStartMenuFolderLabel3=Sprievodca in\x9Atal\xE1ciou vytvor\xED z\xE1stupcov aplik\xE1cie v nasleduj\xFAcom adres\xE1ri ponuky \x8Atart.
+SelectStartMenuFolderBrowseLabel=Pokra\xE8ujte kliknut\xEDm na tla\xE8idlo \xCFalej. Ak chcete zvoli\x9D in\xFD adres\xE1r, kliknite na tla\xE8idlo Prech\xE1dza\x9D.
MustEnterGroupName=Mus\xEDte zada\x9D n\xE1zov skupiny.
GroupNameTooLong=N\xE1zov adres\xE1ra alebo cesta s\xFA pr\xEDli\x9A dlh\xE9.
InvalidGroupName=N\xE1zov adres\xE1ra nie je platn\xFD.
BadGroupName=N\xE1zov skupiny nesmie obsahova\x9D \x9Eiadny z nasleduj\xFAcich znakov:%n%n%1
NoProgramGroupCheck2=&Nevytv\xE1ra\x9D skupinu v ponuke \x8Atart
-WizardReady=In\x9Atal\xE1cia pripraven\xE1
-ReadyLabel1=Sprievodca in\x9Atal\xE1ciou je teraz pripraven\xFD nain\x9Atalova\x9D [name] na V\xE1\x9A po\xE8\xEDta\xE8.
+WizardReady=In\x9Atal\xE1cia je pripraven\xE1
+ReadyLabel1=Sprievodca in\x9Atal\xE1ciou je teraz pripraven\xFD nain\x9Atalova\x9D produkt [name] na V\xE1\x9A po\xE8\xEDta\xE8.
ReadyLabel2a=Pokra\xE8ujte v in\x9Atal\xE1cii kliknut\xEDm na tla\xE8idlo In\x9Atalova\x9D. Ak si prajete zmeni\x9D niektor\xE9 nastavenia in\x9Atal\xE1cie, kliknite na tla\xE8idlo Sp\xE4\x9D.
ReadyLabel2b=Pokra\xE8ujte v in\x9Atal\xE1cii kliknut\xEDm na tla\xE8idlo In\x9Atalova\x9D.
ReadyMemoUserInfo=Inform\xE1cie o pou\x9E\xEDvate\xBEovi:
@@ -150,15 +153,15 @@
ReadyMemoTasks=\xCFal\x9Aie \xFAlohy:
WizardPreparing=Pr\xEDprava in\x9Atal\xE1cie
PreparingDesc=Sprievodca in\x9Atal\xE1ciou pripravuje in\x9Atal\xE1ciu produktu [name] na V\xE1\x9A po\xE8\xEDta\xE8.
-PreviousInstallNotCompleted=Proces in\x9Atal\xE1cie/odin\x9Atal\xE1cie predo\x9Al\xE9ho produktu nebol \xFAplne dokon\xE8en\xFD. Pre dokon\xE8enie tohto procesu je nutn\xE9 re\x9Atartova\x9D tento po\xE8\xEDta\xE8.%n%nPo prevedenom re\x9Atarte po\xE8\xEDta\xE8a spustite znovu tohto sprievodcu in\x9Atal\xE1ciou, aby bolo mo\x9En\xE9 dokon\xE8i\x9D in\x9Atal\xE1ciu produktu [name].
-CannotContinue=Sprievodca in\x9Atal\xE1ciou nem\xF4\x9Ee pokra\xE8ova\x9D. Pros\xEDm, ukon\xE8ite sprievodcu in\x9Atal\xE1ciou kliknut\xEDm na tla\xE8idlo Zru\x9Ai\x9D.
+PreviousInstallNotCompleted=In\x9Atal\xE1cia/odin\x9Atal\xE1cia predo\x9Al\xE9ho produktu nebola \xFAplne dokon\xE8en\xE1. Dokon\xE8enie tohto procesu vy\x9Eaduje re\x9Atart po\xE8\xEDta\xE8a.%n%nPo re\x9Atartovan\xED po\xE8\xEDta\xE8a spustite znovu sprievodcu in\x9Atal\xE1ciou, aby bolo mo\x9En\xE9 dokon\xE8i\x9D in\x9Atal\xE1ciu produktu [name].
+CannotContinue=Sprievodca in\x9Atal\xE1ciou nem\xF4\x9Ee pokra\xE8ova\x9D. Ukon\xE8ite, pros\xEDm, sprievodcu in\x9Atal\xE1ciou kliknut\xEDm na tla\xE8idlo Zru\x9Ai\x9D.
WizardInstalling=In\x9Atalujem
InstallingLabel=Po\xE8kajte pros\xEDm, k\xFDm sprievodca in\x9Atal\xE1ciou nedokon\xE8\xED in\x9Atal\xE1ciu produktu [name] na V\xE1\x9A po\xE8\xEDta\xE8.
FinishedHeadingLabel=Dokon\xE8uje sa in\x9Atal\xE1cia produktu [name]
FinishedLabelNoIcons=Sprievodca in\x9Atal\xE1ciou dokon\xE8il in\x9Atal\xE1ciu produktu [name] na V\xE1\x9A po\xE8\xEDta\xE8.
FinishedLabel=Sprievodca in\x9Atal\xE1ciou dokon\xE8il in\x9Atal\xE1ciu produktu [name] na V\xE1\x9A po\xE8\xEDta\xE8. Produkt je mo\x9En\xE9 spusti\x9D pomocou nain\x9Atalovan\xFDch ikon a z\xE1stupcov.
-ClickFinish=Ukon\xE8ite sprievodcu in\x9Atal\xE1ciu kliknut\xEDm na tla\xE8idlo Dokon\xE8i\x9D.
-FinishedRestartLabel=Na dokon\xE8enie in\x9Atal\xE1cie produktu [name] je nevyhnutn\xE9 re\x9Atartova\x9D V\xE1\x9A po\xE8\xEDta\xE8. Prajete si teraz re\x9Atartova\x9D V\xE1\x9A po\xE8\xEDta\xE8?
+ClickFinish=Ukon\xE8ite sprievodcu in\x9Atal\xE1ciou kliknut\xEDm na tla\xE8idlo Dokon\xE8i\x9D.
+FinishedRestartLabel=Na dokon\xE8enie in\x9Atal\xE1cie produktu [name] je nutn\xE9 re\x9Atartova\x9D V\xE1\x9A po\xE8\xEDta\xE8. Prajete si teraz re\x9Atartova\x9D V\xE1\x9A po\xE8\xEDta\xE8?
FinishedRestartMessage=Na dokon\xE8enie in\x9Atal\xE1cie produktu [name] je nutn\xE9 re\x9Atartova\x9D V\xE1\x9A po\xE8\xEDta\xE8.%n%nPrajete si teraz re\x9Atartova\x9D V\xE1\x9A po\xE8\xEDta\xE8?
ShowReadmeCheck=\xC1no, chcem zobrazi\x9D dokument "\xC8ITAJMA"
YesRadio=&\xC1no, chcem teraz re\x9Atartova\x9D po\xE8\xEDta\xE8
@@ -166,17 +169,17 @@
RunEntryExec=Spusti\x9D %1
RunEntryShellExec=Zobrazi\x9D %1
ChangeDiskTitle=Sprievodca in\x9Atal\xE1ciou vy\x9Eaduje \xEFal\x9A\xED disk
-SelectDiskLabel2=Pros\xEDm, vlo\x9Ete disk %1 a kliknite na OK.%n%nAk sa s\xFAbory na tomto disku nach\xE1dzaj\xFA v inom adres\xE1ri, ako v tom, ktor\xFD je zobrazen\xFD ni\x9E\x9Aie, zadejte spr\xE1vnu cestu alebo kliknite na Prech\xE1dza\x9D.
+SelectDiskLabel2=Vlo\x9Ete, pros\xEDm, disk %1 a kliknite na tla\xE8idlo OK.%n%nAk sa s\xFAbory na tomto disku nach\xE1dzaj\xFA v inom adres\xE1ri, ako v tom, ktor\xFD je zobrazen\xFD ni\x9E\x9Aie, zadejte spr\xE1vnu cestu alebo kliknite na tla\xE8idlo Prech\xE1dza\x9D.
PathLabel=&Cesta:
-FileNotInDir2=S\xFAbor "%1" sa ned\xE1 n\xE1js\x9D v "%2". Pros\xEDm vlo\x9Ete spr\xE1vny disk alebo zvo\xBEte in\xFD adres\xE1r.
-SelectDirectoryLabel=Pros\xEDm, \x9Apecifikujte umiestnenie \xEFal\x9Aieho disku.
-SetupAborted=In\x9Atal\xE1cia nebola \xFAplne dokon\xE8en\xE1.%n%nPros\xEDm, opravte chybu a spustite sprievodcu in\x9Atal\xE1ciou znova.
+FileNotInDir2=S\xFAbor "%1" sa ned\xE1 n\xE1js\x9D v "%2". Vlo\x9Ete, pros\xEDm, spr\xE1vny disk alebo zvo\xBEte in\xFD adres\xE1r.
+SelectDirectoryLabel=\x8Apecifikujte,pros\xEDm, umiestnenie \xEFal\x9Aieho disku.
+SetupAborted=In\x9Atal\xE1cia nebola \xFAplne dokon\xE8en\xE1.%n%nOpravte, pros\xEDm, chybu a spustite sprievodcu in\x9Atal\xE1ciou znova.
EntryAbortRetryIgnore=Akciu zopakujete kliknut\xEDm na tla\xE8idlo Opakova\x9D. Akciu vynech\xE1te kliknut\xEDm na tla\xE8idlo Presko\xE8i\x9D. In\x9Atal\xE1ciu preru\x9A\xEDte kliknut\xEDm na tla\xE8idlo Preru\x9Ai\x9D.
StatusCreateDirs=Vytv\xE1raj\xFA sa adres\xE1re...
StatusExtractFiles=Rozba\xBEuj\xFA sa s\xFAbory...
StatusCreateIcons=Vytv\xE1raj\xFA sa ikony a z\xE1stupcovia...
StatusCreateIniEntries=Vytv\xE1raj\xFA sa z\xE1znamy v konfigura\xE8n\xFDch s\xFAboroch...
-StatusCreateRegistryEntries=Vytv\xE1raj\xFA sa z\xE1znamy v syst\xE9mov\xFDch registroch...
+StatusCreateRegistryEntries=Vytv\xE1raj\xFA sa z\xE1znamy v syst\xE9movom registri...
StatusRegisterFiles=Registruj\xFA sa s\xFAbory...
StatusSavingUninstall=Ukladaj\xFA sa inform\xE1cie potrebn\xE9 pre neskor\x9Aie odin\x9Atalovanie produktu...
StatusRunProgram=Dokon\xE8uje sa in\x9Atal\xE1cia...
@@ -190,15 +193,15 @@
ErrorRegCreateKey=Do\x9Alo k chybe pri vytv\xE1ran\xED k\xBE\xFA\xE8a syst\xE9mov\xE9ho registra:%n%1\%2
ErrorRegWriteKey=Do\x9Alo k chybe pri z\xE1pise do k\xBE\xFA\xE8a syst\xE9mov\xE9ho registra:%n%1\%2
ErrorIniEntry=Do\x9Alo k chybe pri vytv\xE1ran\xED z\xE1znamu v konfigura\xE8nom s\xFAbore "%1".
-FileAbortRetryIgnore=Akciu zopakujete kliknut\xEDm na tla\xE8idlo Opakova\x9D. S\xFAbor presko\xE8\xEDte kliknut\xEDm na tla\xE8idlo Presko\xE8i\x9D (neodpor\xFA\xE8a sa). In\x9Atal\xE1ciu preru\x9A\xEDte tla\xE8idlom Preru\x9Ai\x9D.
-FileAbortRetryIgnore2=Akciu zopakujete kliknut\xEDm na tla\xE8idlo Opakova\x9D. S\xFAbor presko\xE8\xEDte kliknut\xEDm na tla\xE8idlo Presko\xE8i\x9D (neodpor\xFA\xE8a sa). In\x9Atal\xE1ciu preru\x9A\xEDte tla\xE8idlom Preru\x9Ai\x9D.
+FileAbortRetryIgnore=Akciu zopakujete kliknut\xEDm na tla\xE8idlo Opakova\x9D. Tento s\xFAbor presko\xE8\xEDte kliknut\xEDm na tla\xE8idlo Presko\xE8i\x9D (neodpor\xFA\xE8a sa). In\x9Atal\xE1ciu preru\x9A\xEDte tla\xE8idlom Preru\x9Ai\x9D.
+FileAbortRetryIgnore2=Akciu zopakujete kliknut\xEDm na tla\xE8idlo Opakova\x9D. Pokra\xE8ujete kliknut\xEDm na tla\xE8idlo Presko\xE8i\x9D (neodpor\xFA\xE8a sa). In\x9Atal\xE1ciu preru\x9A\xEDte tla\xE8idlom Preru\x9Ai\x9D.
SourceIsCorrupted=Zdrojov\xFD s\xFAbor je po\x9Akoden\xFD
SourceDoesntExist=Zdrojov\xFD s\xFAbor "%1" neexistuje
ExistingFileReadOnly=Existuj\xFAci s\xFAbor je ur\xE8en\xFD len na \xE8\xEDtanie.%n%nAtrib\xFAt "Iba na \xE8\xEDtanie" odstr\xE1nite a akciu zopakujete kliknut\xEDm na tla\xE8idlo Opakova\x9D. S\xFAbor presko\xE8\xEDte kliknut\xEDm na tla\xE8idlo Presko\xE8i\x9D. In\x9Atal\xE1ciu preru\x9A\xEDte kliknut\xEDm na tla\xE8idlo Preru\x9Ai\x9D.
ErrorReadingExistingDest=Do\x9Alo k chybe pri pokuse o \xE8\xEDtanie existuj\xFAceho s\xFAboru:
FileExists=S\xFAbor u\x9E existuje.%n%nM\xE1 ho sprievodca in\x9Atal\xE1cie prep\xEDsa\x9D?
ExistingFileNewer=Existuj\xFAci s\xFAbor je nov\x9A\xED ako ten, ktor\xFD sa sprievodca in\x9Atal\xE1ciou pok\xFA\x9Aa nain\x9Atalova\x9D. Odpor\xFA\xE8a sa ponecha\x9D existuj\xFAci s\xFAbor.%n%nPrajete si ponechat existuj\xFAci s\xFAbor?
-ErrorChangingAttr=Do\x9Alo k chybe pri pokuse o modifik\xE1ciu atrib\xFAtu existuj\xFAceho s\xFAboru:
+ErrorCh...
[truncated message content] |
|
From: <ki...@us...> - 2006-09-16 07:50:21
|
Revision: 3573
http://svn.sourceforge.net/winmerge/?rev=3573&view=rev
Author: kimmov
Date: 2006-09-16 00:50:15 -0700 (Sat, 16 Sep 2006)
Log Message:
-----------
Remove unused variable
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/FileFiltersDlg.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-16 07:48:38 UTC (rev 3572)
+++ trunk/Src/Changes.txt 2006-09-16 07:50:15 UTC (rev 3573)
@@ -13,6 +13,8 @@
Src: locality.cpp locality.h MergeDoc.cpp
Remove unused variable
Src: FileActionScript.cpp
+ Remove unused variable
+ Src: FileFiltersDlg.cpp
2006-09-15 Kimmo
BUG: [ 1558839 ] ShellExtension does not compile as 64-bit
Modified: trunk/Src/FileFiltersDlg.cpp
===================================================================
--- trunk/Src/FileFiltersDlg.cpp 2006-09-16 07:48:38 UTC (rev 3572)
+++ trunk/Src/FileFiltersDlg.cpp 2006-09-16 07:50:15 UTC (rev 3573)
@@ -499,7 +499,6 @@
void FileFiltersDlg::UpdateFiltersList()
{
int count = m_Filters->GetSize();
- int listItems = m_listFilters.GetItemCount();
m_listFilters.DeleteAllItems();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-16 07:48:46
|
Revision: 3572
http://svn.sourceforge.net/winmerge/?rev=3572&view=rev
Author: kimmov
Date: 2006-09-16 00:48:38 -0700 (Sat, 16 Sep 2006)
Log Message:
-----------
Remove unused variable
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/FileActionScript.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-16 07:38:48 UTC (rev 3571)
+++ trunk/Src/Changes.txt 2006-09-16 07:48:38 UTC (rev 3572)
@@ -11,6 +11,8 @@
Src: OpenDlg.cpp
Fix typecasting warnings
Src: locality.cpp locality.h MergeDoc.cpp
+ Remove unused variable
+ Src: FileActionScript.cpp
2006-09-15 Kimmo
BUG: [ 1558839 ] ShellExtension does not compile as 64-bit
Modified: trunk/Src/FileActionScript.cpp
===================================================================
--- trunk/Src/FileActionScript.cpp 2006-09-16 07:38:48 UTC (rev 3571)
+++ trunk/Src/FileActionScript.cpp 2006-09-16 07:48:38 UTC (rev 3572)
@@ -87,7 +87,6 @@
*/
int FileActionScript::VCSCheckOut(const CString &path, BOOL &bApplyToAll)
{
- CMainFrame *pMf = dynamic_cast<CMainFrame*>(AfxGetMainWnd());
CString strErr;
int retVal = SCRIPT_SUCCESS;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
