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: <jt...@us...> - 2008-01-20 08:48:58
|
Revision: 4932
http://winmerge.svn.sourceforge.net/winmerge/?rev=4932&view=rev
Author: jtuc
Date: 2008-01-20 00:48:53 -0800 (Sun, 20 Jan 2008)
Log Message:
-----------
Fix Bug #1874854
Modified Paths:
--------------
trunk/Src/Common/MessageBoxDialog.cpp
Modified: trunk/Src/Common/MessageBoxDialog.cpp
===================================================================
--- trunk/Src/Common/MessageBoxDialog.cpp 2008-01-19 22:21:56 UTC (rev 4931)
+++ trunk/Src/Common/MessageBoxDialog.cpp 2008-01-20 08:48:53 UTC (rev 4932)
@@ -1238,7 +1238,7 @@
// Draw the text and retrieve the size of the text.
dcDisplay.DrawText(m_strMessage.c_str(), rcMessage, DT_LEFT | DT_NOPREFIX |
- DT_WORDBREAK | DT_CALCRECT);
+ DT_WORDBREAK | DT_EXPANDTABS | DT_CALCRECT);
// Save the size required for the message.
m_sMessage = rcMessage.Size();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-19 22:21:58
|
Revision: 4931
http://winmerge.svn.sourceforge.net/winmerge/?rev=4931&view=rev
Author: kimmov
Date: 2008-01-19 14:21:56 -0800 (Sat, 19 Jan 2008)
Log Message:
-----------
Convert last uses of CString in paths.cpp/paths.h to String.
Modified Paths:
--------------
trunk/Src/FileOrFolderSelect.cpp
trunk/Src/MainFrm.cpp
trunk/Src/Merge.cpp
trunk/Src/PatchDlg.cpp
trunk/Src/paths.cpp
trunk/Src/paths.h
Modified: trunk/Src/FileOrFolderSelect.cpp
===================================================================
--- trunk/Src/FileOrFolderSelect.cpp 2008-01-19 11:38:51 UTC (rev 4930)
+++ trunk/Src/FileOrFolderSelect.cpp 2008-01-19 22:21:56 UTC (rev 4931)
@@ -127,7 +127,7 @@
bRetVal = GetSaveFileName((OPENFILENAME *)&ofn);
// common file dialog populated sSelectedFile variable's buffer
sSelectedFile.ReleaseBuffer();
- SetCurrentDirectory(paths_GetWindowsDirectory()); // Free handle held by GetOpenFileName
+ SetCurrentDirectory(paths_GetWindowsDirectory().c_str()); // Free handle held by GetOpenFileName
if (bRetVal)
path = sSelectedFile;
@@ -254,7 +254,7 @@
BOOL bRetVal = GetOpenFileName((OPENFILENAME *)&ofn);
// common file dialog populated sSelectedFile variable's buffer
sSelectedFile.ReleaseBuffer();
- SetCurrentDirectory(paths_GetWindowsDirectory()); // Free handle held by GetOpenFileName
+ SetCurrentDirectory(paths_GetWindowsDirectory().c_str()); // Free handle held by GetOpenFileName
if (bRetVal)
{
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2008-01-19 11:38:51 UTC (rev 4930)
+++ trunk/Src/MainFrm.cpp 2008-01-19 22:21:56 UTC (rev 4931)
@@ -2174,7 +2174,7 @@
for (UINT i = 0; i < fileCount; i++)
{
// if this was a shortcut, we need to expand it to the target path
- CString expandedFile = ExpandShortcut(files[i]);
+ CString expandedFile = ExpandShortcut((LPCTSTR)files[i]).c_str();
// if that worked, we should have a real file name
if (!expandedFile.IsEmpty())
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2008-01-19 11:38:51 UTC (rev 4930)
+++ trunk/Src/Merge.cpp 2008-01-19 22:21:56 UTC (rev 4931)
@@ -813,7 +813,8 @@
*/
CString CMergeApp::GetDefaultEditor()
{
- CString path = paths_GetWindowsDirectory() + _T("\\NOTEPAD.EXE");
+ CString path = paths_GetWindowsDirectory().c_str();
+ path += _T("\\NOTEPAD.EXE");
return path;
}
@@ -829,7 +830,7 @@
*/
CString CMergeApp::GetDefaultFilterUserPath(BOOL bCreate /*=FALSE*/)
{
- CString pathMyFolders = paths_GetMyDocuments(NULL);
+ CString pathMyFolders = paths_GetMyDocuments(NULL).c_str();
CString pathFilters(pathMyFolders);
if (pathFilters.Right(1) != _T("\\"))
pathFilters += _T("\\");
Modified: trunk/Src/PatchDlg.cpp
===================================================================
--- trunk/Src/PatchDlg.cpp 2008-01-19 11:38:51 UTC (rev 4930)
+++ trunk/Src/PatchDlg.cpp 2008-01-19 22:21:56 UTC (rev 4931)
@@ -134,7 +134,7 @@
}
// Check that result (patch) file is absolute path
- if (!paths_IsPathAbsolute(m_fileResult))
+ if (!paths_IsPathAbsolute((LPCTSTR)m_fileResult))
{
ResMsgBox1(IDS_PATH_NOT_ABSOLUTE, m_fileResult, MB_ICONSTOP);
m_ctlResult.SetFocus();
Modified: trunk/Src/paths.cpp
===================================================================
--- trunk/Src/paths.cpp 2008-01-19 11:38:51 UTC (rev 4930)
+++ trunk/Src/paths.cpp 2008-01-19 22:21:56 UTC (rev 4931)
@@ -13,7 +13,7 @@
#include <shlobj.h>
static bool IsSlash(LPCTSTR pszStart, int nPos);
-static bool GetDirName(const CString & sDir, CString& sName);
+static bool GetDirName(LPCTSTR sDir, String& sName);
/**
* @brief Checks if char in string is slash.
@@ -115,7 +115,7 @@
* @return true if canonical name exists.
* @todo Should we return empty string as sName when returning false?
*/
-static bool GetDirName(LPCTSTR sDir, CString& sName)
+static bool GetDirName(LPCTSTR sDir, String& sName)
{
// FindFirstFile doesn't work for root:
// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/fileio/fs/findfirstfile.asp
@@ -270,7 +270,7 @@
if (*szPath == '\0')
return false;
- CString sTemp;
+ String sTemp;
if (GetDirName(szPath, sTemp))
return true;
@@ -286,7 +286,7 @@
}
// Now fullPath holds our desired path
- CString sLong;
+ String sLong;
TCHAR *ptr = fullPath;
TCHAR *end = NULL;
@@ -318,7 +318,7 @@
// advance to next component (or set ptr==0 to flag end)
ptr = (end ? end+1 : 0);
- CString sNextName;
+ String sNextName;
if (!GetDirName(fullPath, sNextName))
{
// try to create directory, and then double-check its existence
@@ -375,48 +375,48 @@
* @param [in] inFile Shortcut to expand.
* @return Full path or empty string if error happened.
*/
-CString ExpandShortcut(const CString &inFile)
+String ExpandShortcut(const String &inFile)
{
- CString outFile;
+ String outFile;
- // Make sure we have a path
- ASSERT(inFile != _T(""));
+ // Make sure we have a path
+ ASSERT(inFile != _T(""));
- IShellLink* psl;
- HRESULT hres;
+ IShellLink* psl;
+ HRESULT hres;
- // Create instance for shell link
- hres = ::CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
- IID_IShellLink, (LPVOID*) &psl);
- if (SUCCEEDED(hres))
- {
- // Get a pointer to the persist file interface
- IPersistFile* ppf;
- hres = psl->QueryInterface(IID_IPersistFile, (LPVOID*) &ppf);
- if (SUCCEEDED(hres))
- {
- USES_CONVERSION;
- LPCTSTR szFile = inFile;
- // Load shortcut
- hres = ppf->Load(T2CW(szFile), STGM_READ);
+ // Create instance for shell link
+ hres = ::CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
+ IID_IShellLink, (LPVOID*) &psl);
+ if (SUCCEEDED(hres))
+ {
+ // Get a pointer to the persist file interface
+ IPersistFile* ppf;
+ hres = psl->QueryInterface(IID_IPersistFile, (LPVOID*) &ppf);
+ if (SUCCEEDED(hres))
+ {
+ USES_CONVERSION;
+ LPCTSTR szFile = inFile.c_str();
+ // Load shortcut
+ hres = ppf->Load(T2CW(szFile), STGM_READ);
- if (SUCCEEDED(hres)) {
+ if (SUCCEEDED(hres))
+ {
WIN32_FIND_DATA wfd;
// find the path from that
- HRESULT hres = psl->GetPath(outFile.GetBuffer(MAX_PATH),
- MAX_PATH,
- &wfd,
- SLGP_UNCPRIORITY);
+ TCHAR buf[MAX_PATH] = {0};
+ HRESULT hres = psl->GetPath(buf, MAX_PATH, &wfd,
+ SLGP_UNCPRIORITY);
- outFile.ReleaseBuffer();
- }
- ppf->Release();
- }
- psl->Release();
- }
+ outFile = buf;
+ }
+ ppf->Release();
+ }
+ psl->Release();
+ }
// if this fails, outFile == ""
- return outFile;
+ return outFile;
}
/**
@@ -489,26 +489,22 @@
* @param [in] path Original path.
* @return Last subdirectory in path.
*/
-CString paths_GetLastSubdir(const CString & path)
+String paths_GetLastSubdir(const String & path)
{
- CString parentPath(path);
- int len = parentPath.GetLength();
+ String parentPath(path);
+ int len = parentPath.length();
// Remove last '\' from paths
if (parentPath[len - 1] == '\\')
{
- parentPath.Delete(len - 1, 1);
+ parentPath.erase(len - 1, 1);
--len;
}
// Find last part of path
- int pos = parentPath.ReverseFind('\\');
-
+ int pos = parentPath.find_last_of('\\');
if (pos > 2)
- {
- parentPath.Delete(0, pos);
- }
-
+ parentPath.erase(0, pos);
return parentPath;
}
@@ -517,12 +513,12 @@
* @param [in] path Path to check.
* @return TRUE if given path is absolute path.
*/
-BOOL paths_IsPathAbsolute(const CString &path)
+BOOL paths_IsPathAbsolute(const String &path)
{
- if (path.GetLength() < 3)
+ if (path.length() < 3)
return FALSE;
- int pos = path.ReverseFind('\\');
+ int pos = path.find_last_of('\\');
// Absolute path must have "\" and cannot start with it.
// Also "\\blahblah" is invalid.
@@ -568,12 +564,11 @@
* @brief Get Windows directory.
* @return Windows directory.
*/
-CString paths_GetWindowsDirectory()
+String paths_GetWindowsDirectory()
{
- CString str;
- GetWindowsDirectory(str.GetBuffer(MAX_PATH), MAX_PATH);
- str.ReleaseBuffer();
- return str;
+ TCHAR buf[MAX_PATH] = {0};
+ GetWindowsDirectory(buf, MAX_PATH);
+ return buf;
}
/**
@@ -582,16 +577,16 @@
* @param [in] hWindow Parent window.
* @return Full path to My Documents -folder.
*/
-CString paths_GetMyDocuments(HWND hWindow)
+String paths_GetMyDocuments(HWND hWindow)
{
LPITEMIDLIST pidl;
LPMALLOC pMalloc;
- CString path;
- TCHAR szPath[MAX_PATH] = {0};
+ String path;
HRESULT rv = SHGetSpecialFolderLocation(hWindow, CSIDL_PERSONAL, &pidl);
if (rv == S_OK)
{
+ TCHAR szPath[MAX_PATH] = {0};
if (SHGetPathFromIDList(pidl, szPath))
{
path = szPath;
Modified: trunk/Src/paths.h
===================================================================
--- trunk/Src/paths.h 2008-01-19 11:38:51 UTC (rev 4930)
+++ trunk/Src/paths.h 2008-01-19 22:21:56 UTC (rev 4931)
@@ -28,13 +28,13 @@
String paths_GetLongPath(LPCTSTR szPath, BOOL bExpandEnvs = TRUE);
bool paths_CreateIfNeeded(LPCTSTR szPath);
PATH_EXISTENCE GetPairComparability(LPCTSTR pszLeft, LPCTSTR pszRight);
-CString ExpandShortcut(const CString &inFile);
+String ExpandShortcut(const String &inFile);
String paths_ConcatPath(const String & path, const String & subpath);
String paths_GetParentPath(LPCTSTR path);
-CString paths_GetLastSubdir(const CString & path);
-BOOL paths_IsPathAbsolute(const CString & path);
+String paths_GetLastSubdir(const String & path);
+BOOL paths_IsPathAbsolute(const String & path);
String paths_EnsurePathExist(const String & sPath);
-CString paths_GetWindowsDirectory();
-CString paths_GetMyDocuments(HWND hWindow);
+String paths_GetWindowsDirectory();
+String paths_GetMyDocuments(HWND hWindow);
#endif // paths_h_included
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-19 11:38:52
|
Revision: 4930
http://winmerge.svn.sourceforge.net/winmerge/?rev=4930&view=rev
Author: kimmov
Date: 2008-01-19 03:38:51 -0800 (Sat, 19 Jan 2008)
Log Message:
-----------
PATCH: [ 1874084 ] Remove unused binary status error code
Modified Paths:
--------------
trunk/Src/MergeDoc.cpp
trunk/Src/MergeDoc.h
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2008-01-18 20:03:57 UTC (rev 4929)
+++ trunk/Src/MergeDoc.cpp 2008-01-19 11:38:51 UTC (rev 4930)
@@ -593,12 +593,10 @@
* @brief Prints (error) message by rescan status.
*
* @param nRescanResult [in] Resultcocode from rescan().
- * @param bBinary [in] Were files binaries?.
* @param bIdentical [in] Were files identical?.
* @sa CMergeDoc::Rescan()
*/
-void CMergeDoc::ShowRescanError(int nRescanResult,
- BOOL bBinary, BOOL bIdentical)
+void CMergeDoc::ShowRescanError(int nRescanResult, BOOL bIdentical)
{
// Rescan was suppressed, there is no sensible status
if (nRescanResult == RESCAN_SUPPRESSED)
@@ -622,15 +620,6 @@
return;
}
- // Binary files tried to load, this can happen when giving filenames
- // from commandline
- if (bBinary)
- {
- s = theApp.LoadString(IDS_FILEBINARY);
- AfxMessageBox(s.c_str(), MB_ICONINFORMATION);
- return;
- }
-
// Files are not binaries, but they are identical
if (bIdentical)
{
@@ -2124,7 +2113,7 @@
// Show possible error after updating screen
if (nRescanResult != RESCAN_SUPPRESSED)
- ShowRescanError(nRescanResult, bBinary, bIdentical);
+ ShowRescanError(nRescanResult, bIdentical);
}
/**
@@ -2837,7 +2826,6 @@
OPENRESULTS_TYPE CMergeDoc::OpenDocs(FileLocation filelocLeft, FileLocation filelocRight,
BOOL bROLeft, BOOL bRORight)
{
- BOOL bBinary = FALSE;
BOOL bIdentical = FALSE;
int nRescanResult = RESCAN_OK;
@@ -2885,11 +2873,6 @@
if (!FileLoadResult::IsOk(nLeftSuccess) || !FileLoadResult::IsOk(nRightSuccess))
{
OPENRESULTS_TYPE retVal = OPENRESULTS_FAILED_MISC;
- if (FileLoadResult::IsBinary(nLeftSuccess) || FileLoadResult::IsBinary(nRightSuccess))
- {
- CompareBinaries(sLeftFile, sRightFile, nLeftSuccess, nRightSuccess);
- retVal = OPENRESULTS_FAILED_BINARY;
- }
CChildFrame *pFrame = GetParentFrame();
if (pFrame)
{
@@ -2961,11 +2944,12 @@
m_pDirDoc->FetchPluginInfos(m_strBothFilenames.c_str(), &infoUnpacker, &infoPrediffer);
m_diffWrapper.SetPrediffer(infoPrediffer);
m_diffWrapper.SetTextForAutomaticPrediff(m_strBothFilenames);
-
+
+ BOOL bBinary = FALSE;
nRescanResult = Rescan(bBinary, bIdentical);
// Open filed if rescan succeed and files are not binaries
- if (nRescanResult == RESCAN_OK && bBinary == FALSE)
+ if (nRescanResult == RESCAN_OK)
{
// prepare the four views
CMergeEditView * pLeft = GetLeftView();
@@ -3031,7 +3015,7 @@
(m_nBufferType[1] == BUFFER_NORMAL) ||
(m_nBufferType[1] == BUFFER_NORMAL_NAMED)))
{
- ShowRescanError(nRescanResult, bBinary, bIdentical);
+ ShowRescanError(nRescanResult, bIdentical);
}
// scroll to first diff
@@ -3052,9 +3036,9 @@
// or the really arcane case that the temp files couldn't be created,
// which is too obscure to bother reporting if you can't write to
// your temp directory, doing nothing is graceful enough for that).
- ShowRescanError(nRescanResult, bBinary, bIdentical);
+ ShowRescanError(nRescanResult, bIdentical);
GetParentFrame()->DestroyWindow();
- return (bBinary ? OPENRESULTS_FAILED_BINARY: OPENRESULTS_FAILED_MISC);
+ return OPENRESULTS_FAILED_MISC;
}
// Force repaint of location pane to update it in case we had some warning
@@ -3066,60 +3050,6 @@
}
/**
- * @brief Compare binary files and print results to user.
- *
- * @param sLeftFile [in] Full path to left file
- * @param sRightFile [in] Full path to right file
- * @param nLeftSuccess [in] Returnvalue from file load for leftside
- * @param nRightSuccess [in] Returnvalue from file load for rightside
- * @sa CMergeDoc::OpenDocs()
- * @sa CMergeDoc::Rescan()
- */
-void CMergeDoc::CompareBinaries(CString sLeftFile, CString sRightFile, int nLeftSuccess, int nRightSuccess)
-{
- int nRescanResult = RESCAN_OK;
- BOOL bBinary = FALSE;
- BOOL bIdentical = FALSE;
-
- // Compare binary files
- if (FileLoadResult::IsBinary(nLeftSuccess) && FileLoadResult::IsBinary(nRightSuccess))
- {
- bBinary = TRUE; // Compare binary files
- nRescanResult = Rescan(bBinary, bIdentical);
- }
-
- if (nRescanResult == RESCAN_OK)
- {
- // Format message shown to user: both files are binaries
- if (FileLoadResult::IsBinary(nLeftSuccess) && FileLoadResult::IsBinary(nRightSuccess))
- {
- CString msg;
- if (bIdentical)
- LangFormatString2(msg, IDS_BINFILES_IDENTICAL, sLeftFile, sRightFile);
- else
- LangFormatString2(msg, IDS_BINFILES_DIFFERENT, sLeftFile, sRightFile);
- msg += _T("\n\n");
- msg += theApp.LoadString(IDS_FILEBINARY).c_str();
- AfxMessageBox(msg, MB_ICONINFORMATION);
- }
- else if (FileLoadResult::IsBinary(nLeftSuccess) || FileLoadResult::IsBinary(nRightSuccess))
- {
- // Other file binary, other text
- CString msg;
- CString msg2;
- if (FileLoadResult::IsBinary(nLeftSuccess))
- LangFormatString1(msg, IDS_OTHER_IS_BINARY, sLeftFile);
- else
- LangFormatString1(msg, IDS_OTHER_IS_BINARY, sRightFile);
-
- AfxMessageBox(msg, MB_ICONSTOP);
- }
- }
- else
- ShowRescanError(nRescanResult, bBinary, bIdentical);
-}
-
-/**
* @brief Refresh cached options.
*
* For compare speed, we have to cache some frequently needed options,
Modified: trunk/Src/MergeDoc.h
===================================================================
--- trunk/Src/MergeDoc.h 2008-01-18 20:03:57 UTC (rev 4929)
+++ trunk/Src/MergeDoc.h 2008-01-19 11:38:51 UTC (rev 4930)
@@ -230,10 +230,9 @@
void UpdateResources();
OPENRESULTS_TYPE OpenDocs(FileLocation filelocLeft, FileLocation filelocRight,
BOOL bROLeft, BOOL bRORight);
- void CompareBinaries(CString sLeftFile, CString sRightFile, int nLeftSuccess, int nRightSuccess);
void RescanIfNeeded(float timeOutInSecond);
int Rescan(BOOL &bBinary, BOOL &bIdentical, BOOL bForced = FALSE);
- void ShowRescanError(int nRescanResult, BOOL bBinary, BOOL bIdentical);
+ void ShowRescanError(int nRescanResult, BOOL bIdentical);
void AddUndoAction(UINT nBegin, UINT nEnd, UINT nDiff, int nBlanks, BOOL bInsert, CMergeEditView *pList);
BOOL Undo();
void CopyAllList(int srcPane, int dstPane);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-18 20:04:02
|
Revision: 4929
http://winmerge.svn.sourceforge.net/winmerge/?rev=4929&view=rev
Author: kimmov
Date: 2008-01-18 12:03:57 -0800 (Fri, 18 Jan 2008)
Log Message:
-----------
PATCH: [ 1874047 ] Simpler temp file class
Modified Paths:
--------------
trunk/Src/Merge.dsp
trunk/Src/MergeDoc.cpp
trunk/Src/MergeDoc.h
trunk/Src/PathContext.cpp
trunk/Src/PathContext.h
Added Paths:
-----------
trunk/Src/TempFile.cpp
trunk/Src/TempFile.h
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2008-01-17 14:26:05 UTC (rev 4928)
+++ trunk/Src/Merge.dsp 2008-01-18 20:03:57 UTC (rev 4929)
@@ -935,6 +935,10 @@
# End Source File
# Begin Source File
+SOURCE=.\TempFile.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\TestFilterDlg.cpp
# End Source File
# Begin Source File
@@ -1581,6 +1585,10 @@
# End Source File
# Begin Source File
+SOURCE=.\TempFile.h
+# End Source File
+# Begin Source File
+
SOURCE=.\TestFilterDlg.h
# End Source File
# Begin Source File
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2008-01-17 14:26:05 UTC (rev 4928)
+++ trunk/Src/MergeDoc.cpp 2008-01-18 20:03:57 UTC (rev 4929)
@@ -32,7 +32,7 @@
#include "UnicodeString.h"
#include "Merge.h"
#include "MainFrm.h"
-
+#include "Environment.h"
#include "Ucs2Utf8.h"
#include "diffcontext.h" // FILE_SAME
#include "MovedLines.h"
@@ -62,6 +62,7 @@
#include "MergeLineFlags.h"
#include "FileOrFolderSelect.h"
#include "LineFiltersList.h"
+#include "TempFile.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -111,8 +112,7 @@
* @brief Constructor.
*/
CMergeDoc::CMergeDoc()
-: m_pTempFiles(NULL)
-, m_bEnableRescan(TRUE)
+: m_bEnableRescan(TRUE)
, m_nCurDiff(-1)
, m_pDirDoc(NULL)
{
@@ -164,7 +164,6 @@
}
delete m_pInfoUnpacker;
- delete m_pTempFiles;
delete m_pSaveFileInfo[0];
delete m_pSaveFileInfo[1];
delete m_pRescanFileInfo[0];
@@ -181,8 +180,8 @@
CDocument::DeleteContents ();
m_ptBuf[0]->FreeAll ();
m_ptBuf[1]->FreeAll ();
- delete m_pTempFiles;
- m_pTempFiles = NULL;
+ m_tempFiles[0].Delete();
+ m_tempFiles[1].Delete();
}
void CMergeDoc::OnFileEvent (WPARAM /*wEvent*/, LPCTSTR /*pszPathName*/)
@@ -408,25 +407,30 @@
FALSE, 1);
m_LastRescan = COleDateTime::GetCurrentTime();
- // get the desired files to temp locations so we can edit them dynamically
- if (m_pTempFiles == NULL)
+ String temp1 = m_tempFiles[0].GetPath();
+ if (temp1.empty())
{
- m_pTempFiles = new TempFileContext;
- if (m_pTempFiles == NULL)
- return RESCAN_TEMP_ERR;
+ temp1 = m_tempFiles[0].CreateFromFile(m_filePaths.GetLeft().c_str(),
+ _T("lt_wmdoc"));
+ }
+ String temp2 = m_tempFiles[1].GetPath();
+ if (temp2.empty())
+ {
+ temp2 = m_tempFiles[1].CreateFromFile(m_filePaths.GetRight().c_str(),
+ _T("rt_wmdoc"));
+ }
+ if (temp1.empty() || temp2.empty())
+ return RESCAN_TEMP_ERR;
- if (!m_pTempFiles->CreateFiles(m_filePaths))
- return RESCAN_TEMP_ERR;
+ String tempPath = env_GetTempPath(NULL);
+ m_ptBuf[0]->SetTempPath(tempPath);
+ m_ptBuf[1]->SetTempPath(tempPath);
- m_ptBuf[0]->SetTempPath(m_pTempFiles->GetTempPath());
- m_ptBuf[1]->SetTempPath(m_pTempFiles->GetTempPath());
- }
-
// output buffers to temp files (in UTF-8 if TCHAR=wchar_t or buffer was Unicode)
if (bBinary == FALSE)
{
- SaveBuffForDiff(*m_ptBuf[0], m_pTempFiles->GetLeft().c_str());
- SaveBuffForDiff(*m_ptBuf[1], m_pTempFiles->GetRight().c_str());
+ SaveBuffForDiff(*m_ptBuf[0], m_tempFiles[0].GetPath().c_str());
+ SaveBuffForDiff(*m_ptBuf[1], m_tempFiles[1].GetPath().c_str());
}
// Set up DiffWrapper
@@ -441,7 +445,7 @@
m_diffWrapper.GetMovedLines()->Clear();
// Set paths for diffing and run diff
- m_diffWrapper.SetPaths(m_pTempFiles->GetLeft(), m_pTempFiles->GetRight(), TRUE);
+ m_diffWrapper.SetPaths(m_tempFiles[0].GetPath(), m_tempFiles[1].GetPath(), TRUE);
m_diffWrapper.SetCompareFiles(m_filePaths.GetLeft(), m_filePaths.GetRight());
diffSuccess = m_diffWrapper.RunFileDiff();
@@ -1456,7 +1460,7 @@
}
/// Sets path for temporary files
-void CMergeDoc::CDiffTextBuffer::SetTempPath(CString path)
+void CMergeDoc::CDiffTextBuffer::SetTempPath(String path)
{
m_strTempPath = path;
}
@@ -1867,11 +1871,10 @@
}
else
{
- sIntermediateFilename.resize(_MAX_PATH);
- LPTSTR intermedBuffer = &*sIntermediateFilename.begin();
- if (!::GetTempFileName(m_strTempPath, _T("MRG"), 0, intermedBuffer))
+ sIntermediateFilename = env_GetTempFileName(m_strTempPath.c_str(),
+ _T("MRG_"), NULL);
+ if (sIntermediateFilename.empty())
return SAVE_FAILED; //Nothing to do if even tempfile name fails
- sIntermediateFilename.resize(_tcslen(intermedBuffer));
bOpenSuccess = !!file.OpenCreate(sIntermediateFilename.c_str());
}
Modified: trunk/Src/MergeDoc.h
===================================================================
--- trunk/Src/MergeDoc.h 2008-01-17 14:26:05 UTC (rev 4928)
+++ trunk/Src/MergeDoc.h 2008-01-18 20:03:57 UTC (rev 4929)
@@ -34,6 +34,10 @@
#include "DiffList.h"
#include "stringdiffs.h"
+#ifndef _TEMP_FILE_
+#include "TempFile.h"
+#endif
+
#ifndef _PATH_CONTEXT_H_
#include "PathContext.h"
#endif
@@ -135,10 +139,10 @@
{
friend class CMergeDoc;
private :
- CMergeDoc * m_pOwnerDoc;
+ CMergeDoc * m_pOwnerDoc; /**< Merge document owning this buffer. */
int m_nThisPane; /**< Left/Right side */
BOOL FlagIsSet(UINT line, DWORD flag);
- CString m_strTempPath;
+ String m_strTempPath; /**< Temporary files folder. */
int unpackerSubcode;
/*
* @brief Unicode encoding from ucr::UNICODESET
@@ -156,7 +160,7 @@
int NoteCRLFStyleFromBuffer(TCHAR *lpLineBegin, DWORD dwLineLen = 0);
void ReadLineFromBuffer(TCHAR *lpLineBegin, DWORD dwLineNum, DWORD dwLineLen = 0);
public :
- void SetTempPath(CString path);
+ void SetTempPath(String path);
virtual void AddUndoRecord (BOOL bInsert, const CPoint & ptStartPos, const CPoint & ptEndPos,
LPCTSTR pszText, int nLinesToValidate, int nActionType = CE_ACTION_UNKNOWN, CDWordArray *paSavedRevisonNumbers = NULL);
bool curUndoGroup();
@@ -328,7 +332,7 @@
BUFFERTYPE m_nBufferType[2];
BOOL m_bMergingMode; /**< Merging or Edit mode */
BOOL m_bEditAfterRescan[2]; /**< Left/right doc edited after rescanning */
- TempFileContext * m_pTempFiles; /**< Temp files for compared files */
+ TempFile m_tempFiles[2]; /**< Temp files for compared files */
// friend access
friend class RescanSuppress;
Modified: trunk/Src/PathContext.cpp
===================================================================
--- trunk/Src/PathContext.cpp 2008-01-17 14:26:05 UTC (rev 4928)
+++ trunk/Src/PathContext.cpp 2008-01-18 20:03:57 UTC (rev 4929)
@@ -139,125 +139,3 @@
{
m_pathLeft.m_sPath.swap(m_pathRight.m_sPath);
}
-
-/**
- * @brief Destructor, deletes existing temp files.
- */
-TempFileContext::~TempFileContext()
-{
- if (FilesExist())
- DeleteFiles();
-}
-
-/**
- * @brief Create temp files.
- *
- * Creates new temp files. Temp files are named based on
- * PathContext paths given as parameter.
- *
- * @param [in] paths PathContext whose paths are used as basis.
- */
-BOOL TempFileContext::CreateFiles(const PathContext &paths)
-{
- TCHAR strTempPath[MAX_PATH] = {0};
-
- if (!::GetTempPath(MAX_PATH, strTempPath))
- {
- LogErrorString(Fmt(_T("GetTempPath() failed: %s"),
- GetSysError(GetLastError())));
- return FALSE;
- }
-
- m_sTempPath = strTempPath;
-
- if (GetLeft().empty())
- {
- int nerr=0;
- String sTempPath = env_GetTempFileName(strTempPath, _T("_LT"), &nerr);
- if (sTempPath.empty())
- {
- LogErrorString(Fmt(_T("GetTempFileName() for left-side failed: %s"),
- GetSysError(nerr)));
- return FALSE;
- }
- SetLeft(sTempPath.c_str());
-
- if (!paths.GetLeft().empty())
- {
- if (!::CopyFile(paths.GetLeft().c_str(), GetLeft().c_str(), FALSE))
- {
- LogErrorString(Fmt(_T("CopyFile() (copy left-side temp file) failed: %s"),
- GetSysError(GetLastError())));
- return FALSE;
- }
- }
- ::SetFileAttributes(GetLeft().c_str(), FILE_ATTRIBUTE_NORMAL);
- }
-
- if (GetRight().empty())
- {
- TCHAR name[MAX_PATH];
- if (!::GetTempFileName(strTempPath, _T("_RT"), 0, name))
- {
- LogErrorString(Fmt(_T("GetTempFileName() for right-side failed: %s"),
- strTempPath, GetSysError(GetLastError())));
- return FALSE;
- }
- SetRight(name);
-
- if (!paths.GetRight().empty())
- {
- if (!::CopyFile(paths.GetRight().c_str(), GetRight().c_str(), FALSE))
- {
- LogErrorString(Fmt(_T("CopyFile() (copy right-side temp file) failed: %s"),
- GetSysError(GetLastError())));
- return FALSE;
- }
- }
- ::SetFileAttributes(GetRight().c_str(), FILE_ATTRIBUTE_NORMAL);
- }
- return TRUE;
-}
-
-/**
- * @brief Check if temp files exist.
- * @return TRUE if one of temp files exist.
- */
-BOOL TempFileContext::FilesExist() const
-{
- BOOL bLeftExists = FALSE;
- BOOL bRightExists = FALSE;
-
- if (!GetLeft().empty())
- bLeftExists = (paths_DoesPathExist(GetLeft().c_str()) == IS_EXISTING_FILE);
- if (!GetRight().empty())
- bLeftExists = (paths_DoesPathExist(GetRight().c_str()) == IS_EXISTING_FILE);
-
- return bLeftExists || bRightExists;
-}
-
-/**
- * @brief Delete temp files.
- */
-void TempFileContext::DeleteFiles()
-{
- if (!GetLeft().empty())
- {
- if (!::DeleteFile(GetLeft().c_str()))
- {
- LogErrorString(Fmt(_T("DeleteFile(%s) (deleting left-side temp file) failed: %s"),
- GetLeft(), GetSysError(GetLastError())));
- }
- SetLeft(_T(""));
-
- }
- if (!GetRight().empty())
- {
- if (!::DeleteFile(GetRight().c_str()))
- {
- LogErrorString(Fmt(_T("DeleteFile(%s) (deleting right-side temp file) failed: %s"),
- GetRight(), GetSysError(GetLastError())));
- }
- SetRight(_T(""));
- }
-}
Modified: trunk/Src/PathContext.h
===================================================================
--- trunk/Src/PathContext.h 2008-01-17 14:26:05 UTC (rev 4928)
+++ trunk/Src/PathContext.h 2008-01-18 20:03:57 UTC (rev 4929)
@@ -3,7 +3,7 @@
*
* @brief Declarations of PathInfo and PathContext
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
@@ -54,20 +54,4 @@
PathInfo m_pathRight; /**< Second path (right path at start */
};
-/**
- * @brief Temp files for compared files
- */
-class TempFileContext : public PathContext
-{
-public:
- ~TempFileContext();
- BOOL CreateFiles(const PathContext &paths);
- BOOL FilesExist() const;
- void DeleteFiles();
- const CString & GetTempPath() const { return m_sTempPath; }
-
-private:
- CString m_sTempPath;
-};
-
#endif // _PATH_CONTEXT_H_
Added: trunk/Src/TempFile.cpp
===================================================================
--- trunk/Src/TempFile.cpp (rev 0)
+++ trunk/Src/TempFile.cpp 2008-01-18 20:03:57 UTC (rev 4929)
@@ -0,0 +1,110 @@
+/**
+ * @file TempFile.cpp
+ *
+ * @brief Implementation file for TempFile
+ *
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#include "stdafx.h" // Required by paths.cpp :(
+//#include "Windows.h"
+#include "UnicodeString.h"
+#include "TempFile.h"
+#include "paths.h"
+#include "Environment.h"
+
+/**
+ * @brief Delete the temp file when instance is deleted.
+ */
+TempFile::~TempFile()
+{
+ Delete();
+}
+
+/**
+ * @brief Create a temporary file name with default prefix.
+ */
+void TempFile::Create()
+{
+ Create(NULL);
+}
+
+/**
+ * @brief Create a temporary file with given prefix.
+ * @param [in] prefix A prefix for temp file name.
+ * @return Created temp file path.
+ */
+String TempFile::Create(LPCTSTR prefix)
+{
+ String temp = env_GetTempPath(NULL);
+ if (temp.empty())
+ {
+ return _T("");
+ }
+
+ String pref = prefix;
+ if (pref.empty())
+ pref = _T("wmtmp");
+
+ temp = env_GetTempFileName(temp.c_str(), pref.c_str(), NULL);
+ if (!temp.empty())
+ m_path = temp;
+
+ return temp;
+}
+
+/**
+ * @brief Create a temporary file from existing file's contents.
+ * This function creates a temporary file to temp folder and copies
+ * given file's contents to there.
+ * @param [in] filepath Full path to existing file.
+ * @param [in] prefix Prefix for the temporary filename.
+ * @return Full path to the temporary file.
+ */
+String TempFile::CreateFromFile(LPCTSTR filepath, LPCTSTR prefix)
+{
+ String temp = env_GetTempPath(NULL);
+ if (temp.empty())
+ {
+ return _T("");
+ }
+
+ String pref = prefix;
+ if (pref.empty())
+ pref = _T("wmtmp");
+
+ temp = env_GetTempFileName(temp.c_str(), pref.c_str(), NULL);
+ if (!temp.empty())
+ {
+ if (::CopyFile(filepath, temp.c_str(), FALSE))
+ {
+ ::SetFileAttributes(temp.c_str(), FILE_ATTRIBUTE_NORMAL);
+ m_path = temp;
+ }
+ }
+ return temp;
+}
+
+/**
+ * @brief Get temp file path (including filename).
+ * @return Full path to temp file.
+ */
+String TempFile::GetPath()
+{
+ return m_path;
+}
+
+/**
+ * @brief Delete the temporary file, if it exists.
+ * @return true if there was no error.
+ */
+bool TempFile::Delete()
+{
+ BOOL success = true;
+ if (!m_path.empty())
+ success = DeleteFile(m_path.c_str());
+ if (success)
+ m_path = _T("");
+ return !!success;
+}
Property changes on: trunk/Src/TempFile.cpp
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/Src/TempFile.h
===================================================================
--- trunk/Src/TempFile.h (rev 0)
+++ trunk/Src/TempFile.h 2008-01-18 20:03:57 UTC (rev 4929)
@@ -0,0 +1,32 @@
+/**
+ * @file TempFile.h
+ *
+ * @brief Declaration of TempFile
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#ifndef _TEMP_FILE_
+#define _TEMP_FILE_
+
+/**
+ * @brief A simple temporary file holder class.
+ * This class creates and holds temporary file names. When instance
+ * gets destroyed, the temporary file is also deleted.
+ */
+class TempFile
+{
+public:
+ TempFile() {}
+ ~TempFile();
+ void Create();
+ String Create(LPCTSTR prefix = NULL);
+ String CreateFromFile(LPCTSTR filepath, LPCTSTR prefix);
+ String GetPath();
+ bool Delete();
+
+private:
+ String m_path; /**< Temporary file path. */
+};
+
+#endif // _TEMP_FILE_
Property changes on: trunk/Src/TempFile.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-17 14:26:19
|
Revision: 4928
http://winmerge.svn.sourceforge.net/winmerge/?rev=4928&view=rev
Author: kimmov
Date: 2008-01-17 06:26:05 -0800 (Thu, 17 Jan 2008)
Log Message:
-----------
2.6.14 Stable Release (R4928)
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2008-01-17 13:53:55 UTC (rev 4927)
+++ branches/R2_6/Src/Changes.txt 2008-01-17 14:26:05 UTC (rev 4928)
@@ -2,6 +2,8 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2008-01-17 2.6.14 Stable Release (R4928)
+
2008-01-17 Kimmo
Bump ShellExtension version to 1.9.4 and update copyright year to 2008
ShellExtension: ShellExtension.rc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-17 13:54:00
|
Revision: 4927
http://winmerge.svn.sourceforge.net/winmerge/?rev=4927&view=rev
Author: kimmov
Date: 2008-01-17 05:53:55 -0800 (Thu, 17 Jan 2008)
Log Message:
-----------
Bump ShellExtension version to 1.9.4 and update copyright year to 2008
Modified Paths:
--------------
branches/R2_6/ShellExtension/ShellExtension.rc
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/ShellExtension/ShellExtension.rc
===================================================================
--- branches/R2_6/ShellExtension/ShellExtension.rc 2008-01-17 00:15:31 UTC (rev 4926)
+++ branches/R2_6/ShellExtension/ShellExtension.rc 2008-01-17 13:53:55 UTC (rev 4927)
@@ -224,8 +224,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,9,3,0
- PRODUCTVERSION 1,9,3,0
+ FILEVERSION 1,9,4,0
+ PRODUCTVERSION 1,9,4,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -243,15 +243,15 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "\0"
VALUE "FileDescription", "ShellExtension Module\0"
- VALUE "FileVersion", "1.9.3.0\0"
+ VALUE "FileVersion", "1.9.4.0\0"
VALUE "InternalName", "ShellExtension\0"
- VALUE "LegalCopyright", "Copyright 2003-2007\0"
+ VALUE "LegalCopyright", "Copyright 2003-2008\0"
VALUE "LegalTrademarks", "\0"
VALUE "OLESelfRegister", "\0"
VALUE "OriginalFilename", "ShellExtension.DLL\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "ShellExtension Module\0"
- VALUE "ProductVersion", "1.9.3.0\0"
+ VALUE "ProductVersion", "1.9.4.0\0"
VALUE "SpecialBuild", "\0"
END
END
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2008-01-17 00:15:31 UTC (rev 4926)
+++ branches/R2_6/Src/Changes.txt 2008-01-17 13:53:55 UTC (rev 4927)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2008-01-17 Kimmo
+ Bump ShellExtension version to 1.9.4 and update copyright year to 2008
+ ShellExtension: ShellExtension.rc
+
2008-01-15 Tim
BUG: [ 1869621 ] xslt support
Submitted by Joel Paula
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-01-17 00:15:33
|
Revision: 4926
http://winmerge.svn.sourceforge.net/winmerge/?rev=4926&view=rev
Author: gerundt
Date: 2008-01-16 16:15:31 -0800 (Wed, 16 Jan 2008)
Log Message:
-----------
[ 1873267 ] Create PO files only if necessary
Modified Paths:
--------------
trunk/Src/Languages/UpdatePoFilesFromPotFile.vbs
Modified: trunk/Src/Languages/UpdatePoFilesFromPotFile.vbs
===================================================================
--- trunk/Src/Languages/UpdatePoFilesFromPotFile.vbs 2008-01-16 21:48:43 UTC (rev 4925)
+++ trunk/Src/Languages/UpdatePoFilesFromPotFile.vbs 2008-01-17 00:15:31 UTC (rev 4926)
@@ -24,7 +24,7 @@
''
' ...
Sub Main
- Dim oLanguages, oLanguage, sLanguage, sDir
+ Dim oLanguages, oLanguage, sLanguage, sDir, bPotChanged
Dim oEnglishPotContent, oLanguagePoContent
Dim StartTime, EndTime, Seconds
@@ -35,18 +35,22 @@
sDir = oFSO.GetParentFolderName(Wscript.ScriptFullName)
Set oEnglishPotContent = GetContentFromPoFile(sDir & "\English.pot")
If oEnglishPotContent.Count = 0 Then Err.Raise vbObjectError, "Sub Main", "Error reading content from English.pot"
+ bPotChanged = GetArchiveBit("English.pot")
Set oLanguages = Wscript.Arguments
If oLanguages.Count = 0 Then Set oLanguages = oFSO.GetFolder(".").Files
For Each oLanguage In oLanguages 'For all languages...
sLanguage = CStr(oLanguage)
If LCase(oFSO.GetExtensionName(sLanguage)) = "po" Then
- If bRunFromCmd Then 'If run from command line...
- Wscript.Echo oFSO.GetFileName(sLanguage)
+ If bPotChanged Or GetArchiveBit(sLanguage) Then 'If update necessary...
+ If bRunFromCmd Then 'If run from command line...
+ Wscript.Echo oFSO.GetFileName(sLanguage)
+ End If
+ Set oLanguagePoContent = GetContentFromPoFile(sLanguage)
+ If oLanguagePoContent.Count > 0 Then 'If content exists...
+ CreateUpdatedPoFile sLanguage, oEnglishPotContent, oLanguagePoContent
+ End If
+ SetArchiveBit sLanguage, False
End If
- Set oLanguagePoContent = GetContentFromPoFile(sLanguage)
- If oLanguagePoContent.Count > 0 Then 'If content exists...
- CreateUpdatedPoFile sLanguage, oEnglishPotContent, oLanguagePoContent
- End If
End If
Next
@@ -196,3 +200,36 @@
Wscript.Echo sText
End If
End Function
+
+''
+' ...
+Function GetArchiveBit(ByVal sFilePath)
+ Dim oFile
+
+ GetArchiveBit = False
+ If (oFSO.FileExists(sFilePath) = True) Then 'If the file exists...
+ Set oFile = oFSO.GetFile(sFilePath)
+ If (oFile.Attributes AND 32) Then 'If archive bit set...
+ GetArchiveBit = True
+ End If
+ End If
+End Function
+
+''
+' ...
+Sub SetArchiveBit(ByVal sFilePath, ByVal bValue)
+ Dim oFile
+
+ If (oFSO.FileExists(sFilePath) = True) Then 'If the file exists...
+ Set oFile = oFSO.GetFile(sFilePath)
+ If (oFile.Attributes AND 32) Then 'If archive bit set...
+ If (bValue = False) Then
+ oFile.Attributes = oFile.Attributes XOR 32
+ End If
+ Else 'If archive bit NOT set...
+ If (bValue = True) Then
+ oFile.Attributes = oFile.Attributes AND 32
+ End If
+ End If
+ End If
+End Sub
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-16 21:48:50
|
Revision: 4925
http://winmerge.svn.sourceforge.net/winmerge/?rev=4925&view=rev
Author: kimmov
Date: 2008-01-16 13:48:43 -0800 (Wed, 16 Jan 2008)
Log Message:
-----------
Fix a bug that debug builds didn't copy pcre.dll to WinMerge build folder. This is a copy/paste error from my commit to move pcre build files to Build and BuildTmp folders.
Modified Paths:
--------------
trunk/Src/PreLink.bat
Modified: trunk/Src/PreLink.bat
===================================================================
--- trunk/Src/PreLink.bat 2008-01-16 21:45:11 UTC (rev 4924)
+++ trunk/Src/PreLink.bat 2008-01-16 21:48:43 UTC (rev 4925)
@@ -69,7 +69,7 @@
cd %2\..\..\..\Externals\pcre\dll_pcre
%msdev% "pcre.dsp" /make "pcre - Win32 Debug"
%devenv% "pcre.vcproj" /build "Debug"
-cd %2\..\..\expat
+cd %2\..\..\pcre
copy bin\debug\pcre.dll %2\..
goto Common
@@ -94,7 +94,7 @@
cd %2\..\..\..\Externals\pcre\dll_pcre
%msdev% "pcre.dsp" /make "pcre - Win32 Release"
%devenv% "pcre.vcproj" /build "Release"
-cd %2\..\..\expat
+cd %2\..\..\pcre
copy bin\release\pcre.dll %2\..
goto Common
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-01-16 21:45:20
|
Revision: 4924
http://winmerge.svn.sourceforge.net/winmerge/?rev=4924&view=rev
Author: gerundt
Date: 2008-01-16 13:45:11 -0800 (Wed, 16 Jan 2008)
Log Message:
-----------
PATCH: [ 1872453 ] Create POT file only if necessary
Modified Paths:
--------------
trunk/Src/Languages/CreateMasterPotFile.vbs
Modified: trunk/Src/Languages/CreateMasterPotFile.vbs
===================================================================
--- trunk/Src/Languages/CreateMasterPotFile.vbs 2008-01-16 21:37:37 UTC (rev 4923)
+++ trunk/Src/Languages/CreateMasterPotFile.vbs 2008-01-16 21:45:11 UTC (rev 4924)
@@ -33,18 +33,31 @@
Sub Main
Dim oStrings, sCodePage
Dim StartTime, EndTime, Seconds
+ Dim bNecessary
StartTime = Time
InfoBox "Creating POT file from Merge.rc...", 3
- Set oStrings = GetStringsFromRcFile("../Merge.rc", sCodePage)
- CreateMasterPotFile "English.pot", oStrings, sCodePage
+ bNecessary = True
+ If (oFSO.FileExists("English.pot") = True) And (oFSO.FileExists("MergeLang.rc") = True) Then 'If the POT and RC file exists...
+ bNecessary = GetArchiveBit("../Merge.rc") Or GetArchiveBit("English.pot") Or GetArchiveBit("MergeLang.rc") 'RCs or POT file changed?
+ End If
- EndTime = Time
- Seconds = DateDiff("s", StartTime, EndTime)
-
- InfoBox "POT file created, after " & Seconds & " second(s).", 10
+ If (bNecessary = True) Then 'If update necessary...
+ Set oStrings = GetStringsFromRcFile("../Merge.rc", sCodePage)
+ CreateMasterPotFile "English.pot", oStrings, sCodePage
+ SetArchiveBit "../Merge.rc", False
+ SetArchiveBit "English.pot", False
+ SetArchiveBit "MergeLang.rc", False
+
+ EndTime = Time
+ Seconds = DateDiff("s", StartTime, EndTime)
+
+ InfoBox "POT file created, after " & Seconds & " second(s).", 10
+ Else 'If update NOT necessary...
+ InfoBox "POT file already up-to-date.", 10
+ End If
End Sub
''
@@ -315,3 +328,36 @@
Wscript.Echo sText
End If
End Function
+
+''
+' ...
+Function GetArchiveBit(ByVal sFilePath)
+ Dim oFile
+
+ GetArchiveBit = False
+ If (oFSO.FileExists(sFilePath) = True) Then 'If the file exists...
+ Set oFile = oFSO.GetFile(sFilePath)
+ If (oFile.Attributes AND 32) Then 'If archive bit set...
+ GetArchiveBit = True
+ End If
+ End If
+End Function
+
+''
+' ...
+Sub SetArchiveBit(ByVal sFilePath, ByVal bValue)
+ Dim oFile
+
+ If (oFSO.FileExists(sFilePath) = True) Then 'If the file exists...
+ Set oFile = oFSO.GetFile(sFilePath)
+ If (oFile.Attributes AND 32) Then 'If archive bit set...
+ If (bValue = False) Then
+ oFile.Attributes = oFile.Attributes XOR 32
+ End If
+ Else 'If archive bit NOT set...
+ If (bValue = True) Then
+ oFile.Attributes = oFile.Attributes AND 32
+ End If
+ End If
+ End If
+End Sub
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-01-16 21:37:52
|
Revision: 4923
http://winmerge.svn.sourceforge.net/winmerge/?rev=4923&view=rev
Author: gerundt
Date: 2008-01-16 13:37:37 -0800 (Wed, 16 Jan 2008)
Log Message:
-----------
PATCH: [ 1872402 ] Check unused resources script
Modified Paths:
--------------
trunk/Tools/Scripts/ReadMe.txt
Added Paths:
-----------
trunk/Tools/Scripts/CheckUnusedResources.vbs
Added: trunk/Tools/Scripts/CheckUnusedResources.vbs
===================================================================
--- trunk/Tools/Scripts/CheckUnusedResources.vbs (rev 0)
+++ trunk/Tools/Scripts/CheckUnusedResources.vbs 2008-01-16 21:37:37 UTC (rev 4923)
@@ -0,0 +1,204 @@
+Option Explicit
+''
+' This script creates a list of (hopefully) unused resource IDs.
+'
+' Copyright (C) 2008 by Tim Gerundt
+' Released under the "GNU General Public License"
+'
+' ID line follows -- this is updated by SVN
+' $Id$
+
+Const ForReading = 1
+
+Dim oFSO, bRunFromCmd
+
+Set oFSO = CreateObject("Scripting.FileSystemObject")
+
+bRunFromCmd = False
+If LCase(oFSO.GetFileName(Wscript.FullName)) = "cscript.exe" Then
+ bRunFromCmd = True
+End If
+
+Call Main
+
+''
+' ...
+Sub Main
+ Dim oHIds, oRcIds, oRc2Ids, oCppIds, sKey, oTxtFile
+ Dim StartTime, EndTime, Seconds
+
+ StartTime = Time
+
+ InfoBox "Creating list of unused resource IDs...", 3
+
+ Set oHIds = GetIdsFromHeaderFile("..\..\Src\resource.h")
+ Set oRcIds = GetIdsFromResourceFile("..\..\Src\Merge.rc")
+ Set oRc2Ids = GetIdsFromResourceFile("..\..\Src\Merge2.rc")
+
+ Set oCppIds = CreateObject("Scripting.Dictionary")
+ GetIdsFromCppFiles "..\..\Src\", oCppIds
+
+ Set oTxtFile = oFSO.CreateTextFile("UnusedResources.txt", True)
+
+ oTxtFile.WriteLine "----------------------------------------"
+ oTxtFile.WriteLine "ONLY IN RESOURCE.H FILE"
+ oTxtFile.WriteLine "----------------------------------------"
+ For Each sKey In oHIds.Keys 'For all header IDs...
+ If (oRcIds.Exists(sKey) = False) And (oRc2Ids.Exists(sKey) = False) And (oCppIds.Exists(sKey) = False) Then 'If header ID is NOT used...
+ oTxtFile.WriteLine sKey
+ End If
+ Next
+
+ oTxtFile.WriteLine ""
+ oTxtFile.WriteLine "----------------------------------------"
+ oTxtFile.WriteLine "NOT USED IN *.CPP/*.H FILES"
+ oTxtFile.WriteLine "----------------------------------------"
+ For Each sKey In oRcIds.Keys 'For all RC IDs...
+ If (oCppIds.Exists(sKey) = False) Then 'If RC ID is NOT used...
+ oTxtFile.WriteLine sKey
+ End If
+ Next
+ For Each sKey In oRc2Ids.Keys 'For all RC2 IDs...
+ If (oCppIds.Exists(sKey) = False) Then 'If RC2 ID is NOT used...
+ oTxtFile.WriteLine sKey
+ End If
+ Next
+
+ oTxtFile.Close
+
+ EndTime = Time
+ Seconds = DateDiff("s", StartTime, EndTime)
+
+ InfoBox "File ""UnusedResources.txt"" created, after " & Seconds & " second(s).", 10
+End Sub
+
+''
+' ...
+Function GetIdsFromHeaderFile(ByVal sHPath)
+ Dim oIds, oTextFile, sLine
+ Dim reDefineId, oMatch, sId, sResource
+
+ Set oIds = CreateObject("Scripting.Dictionary")
+
+ Set reDefineId = New RegExp
+ reDefineId.Pattern = "^#define (ID\w+)\s+(\d+)$"
+ reDefineId.IgnoreCase = False
+
+ If (oFSO.FileExists(sHPath) = True) Then 'If the Header file exists...
+ Set oTextFile = oFSO.OpenTextFile(sHPath, ForReading)
+ Do Until oTextFile.AtEndOfStream = True 'For all lines...
+ sLine = Trim(oTextFile.ReadLine)
+
+ sId = ""
+ sResource = ""
+ If reDefineId.Test(sLine) Then 'If ID...
+ Set oMatch = reDefineId.Execute(sLine)(0)
+ sId = oMatch.SubMatches(0)
+ sResource = oMatch.SubMatches(1)
+
+ oIds.Add sId, sResource
+ End If
+ Loop
+ oTextFile.Close
+ End If
+ Set GetIdsFromHeaderFile = oIds
+End Function
+
+''
+' ...
+Function GetIdsFromResourceFile(ByVal sRcPath)
+ Dim oIds, oTextFile, sLine, iLine
+ Dim reId, oMatch, sId
+
+ Set oIds = CreateObject("Scripting.Dictionary")
+
+ Set reId = New RegExp
+ reId.Pattern = "(AFX_ID[A-Z]?_\w+|ID[A-Z]?_\w+)"
+ reId.IgnoreCase = False
+
+ If (oFSO.FileExists(sRcPath) = True) Then 'If the RC file exists...
+ iLine = 0
+ Set oTextFile = oFSO.OpenTextFile(sRcPath, ForReading)
+ Do Until oTextFile.AtEndOfStream = True 'For all lines...
+ sLine = Trim(oTextFile.ReadLine)
+ iLine = iLine + 1
+
+ sId = ""
+ If reId.Test(sLine) Then 'If ID...
+ Set oMatch = reId.Execute(sLine)(0)
+ sId = oMatch.SubMatches(0)
+
+ If (oIds.Exists(sId) = True) Then 'If the key is already used...
+ oIds(sId) = oIds(sId) & vbTab & iLine
+ Else 'If the key is NOT already used...
+ oIds.Add sId, iLine
+ End If
+ End If
+ Loop
+ oTextFile.Close
+ End If
+ Set GetIdsFromResourceFile = oIds
+End Function
+
+''
+' ...
+Function GetIdsFromCppFiles(ByVal sFolderPath, ByRef oIds)
+ Dim oFolder, oFile, oSubFolder, sExtension
+ Dim oTextFile, sLine, iLine
+ Dim reId, oMatches, oMatch, sId
+
+ Set reId = New RegExp
+ reId.Pattern = "(AFX_ID[A-Z]?_\w+|ID[A-Z]?_\w+)"
+ reId.IgnoreCase = False
+ reId.Global = True
+
+ If (oFSO.FolderExists(sFolderPath) = True) Then 'If the folder exists...
+ Set oFolder = oFSO.GetFolder(sFolderPath)
+
+ For Each oFile In oFolder.Files 'For all files...
+ sExtension = LCase(oFSO.GetExtensionName(oFile.Name))
+ If (sExtension = "cpp") Or (sExtension = "h") And (oFile.Name <> "resource.h") Then 'If a CPP/H file...
+ iLine = 0
+ Set oTextFile = oFSO.OpenTextFile(oFile.Path, ForReading)
+ Do Until oTextFile.AtEndOfStream = True 'For all lines...
+ sLine = Trim(oTextFile.ReadLine)
+ iLine = iLine + 1
+
+ sId = ""
+ If reId.Test(sLine) Then 'If ID...
+ Set oMatches = reId.Execute(sLine)
+ For Each oMatch In oMatches 'For all results...
+ sId = oMatch.SubMatches(0)
+
+ If (oIds.Exists(sId) = True) Then 'If the key is already used...
+ oIds(sId) = oIds(sId) & vbTab & oFile.Name & ":" & iLine
+ Else 'If the key is NOT already used...
+ oIds.Add sId, oFile.Name & ":" & iLine
+ End If
+ Next
+ End If
+ Loop
+ oTextFile.Close
+ End If
+ Next
+
+ For Each oSubFolder In oFolder.SubFolders 'For all folders...
+ If (oSubFolder.Name <> ".svn") Then 'If NOT a SVN folder...
+ GetIdsFromCppFiles oSubFolder.Path, oIds
+ End If
+ Next
+ End If
+End Function
+
+''
+' ...
+Function InfoBox(ByVal sText, ByVal iSecondsToWait)
+ Dim oShell
+
+ If (bRunFromCmd = False) Then 'If run from command line...
+ Set oShell = Wscript.CreateObject("WScript.Shell")
+ InfoBox = oShell.Popup(sText, iSecondsToWait, Wscript.ScriptName, 64)
+ Else 'If NOT run from command line...
+ Wscript.Echo sText
+ End If
+End Function
Property changes on: trunk/Tools/Scripts/CheckUnusedResources.vbs
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Tools/Scripts/ReadMe.txt
===================================================================
--- trunk/Tools/Scripts/ReadMe.txt 2008-01-16 21:20:33 UTC (rev 4922)
+++ trunk/Tools/Scripts/ReadMe.txt 2008-01-16 21:37:37 UTC (rev 4923)
@@ -21,6 +21,11 @@
-r:n, --revisions:n output log for last n revisions (default is 100)
+CheckUnusedResources.vbs
+------------------------
+Script for creating a list of (hopefully) unused resource IDs.
+
+
create_release.py
-----------------
Script for creating a release. Builds WinMerge components, exports sources,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-16 21:21:07
|
Revision: 4922
http://winmerge.svn.sourceforge.net/winmerge/?rev=4922&view=rev
Author: kimmov
Date: 2008-01-16 13:20:33 -0800 (Wed, 16 Jan 2008)
Log Message:
-----------
Cleanup file loading code by creating couple of helper functions so it doesn't have so much copy/paste for left/right file.
Modified Paths:
--------------
trunk/Src/MergeDoc.cpp
trunk/Src/MergeDoc.h
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2008-01-16 20:20:54 UTC (rev 4921)
+++ trunk/Src/MergeDoc.cpp 2008-01-16 21:20:33 UTC (rev 4922)
@@ -2751,7 +2751,9 @@
}
/**
- * @brief Is specified codepage number valid for use in WinMerge Merge Editor?
+ * @brief Check if specified codepage number is valid for WinMerge Editor.
+ * @param [in] cp Codepage number to check.
+ * @return true if codepage is valid, false otherwise.
*/
bool CMergeDoc::IsValidCodepageForMergeEditor(unsigned cp) const
{
@@ -2764,6 +2766,62 @@
}
/**
+ * @brief Sanity check file's specified codepage.
+ * This function checks if file's specified codepage is valid for WinMerge
+ * editor and if not resets the codepage to default.
+ * @param [in,out] fileinfo Class containing file's codepage.
+ */
+void CMergeDoc::SanityCheckCodepage(FileLocation & fileinfo)
+{
+ if (fileinfo.encoding.m_unicoding == ucr::NONE
+ && !IsValidCodepageForMergeEditor(fileinfo.encoding.m_codepage))
+ {
+ int cp = getDefaultCodepage();
+ if (!IsValidCodepageForMergeEditor(cp))
+ cp = CP_ACP;
+ fileinfo.encoding.SetCodepage(cp);
+ }
+}
+
+/**
+ * @brief Loads one file from disk and updates file infos.
+ * @param [in] index Index of file in internal buffers.
+ * @param [in] filename File's name.
+ * @param [in] readOnly Is file read-only?
+ * @param [in] codepage File's codepage.
+ * @return One of FileLoadResult values.
+ */
+DWORD CMergeDoc::LoadOneFile(int index, String filename, BOOL readOnly,
+ int codepage)
+{
+ DWORD loadSuccess = FileLoadResult::FRESULT_ERROR;;
+
+ if (!filename.empty())
+ {
+ if (GetMainFrame()->m_strDescriptions[index].empty())
+ m_nBufferType[index] = BUFFER_NORMAL;
+ else
+ {
+ m_nBufferType[index] = BUFFER_NORMAL_NAMED;
+ m_strDesc[index] = GetMainFrame()->m_strDescriptions[index];
+ GetMainFrame()->m_strDescriptions[index].erase();
+ }
+ m_pSaveFileInfo[index]->Update(filename);
+ m_pRescanFileInfo[index]->Update(filename);
+
+ loadSuccess = LoadFile(filename.c_str(), index, readOnly, codepage);
+ }
+ else
+ {
+ m_nBufferType[index] = BUFFER_UNNAMED;
+ m_ptBuf[index]->InitNew();
+ m_strDesc[index] = GetMainFrame()->m_strDescriptions[index];
+ loadSuccess = FileLoadResult::FRESULT_OK;
+ }
+ return loadSuccess;
+}
+
+/**
* @brief Loads files and does initial rescan.
* @param filelocLeft [in] File to open to left side (path & encoding info)
* @param fileLocRight [in] File to open to right side (path & encoding info)
@@ -2781,22 +2839,8 @@
int nRescanResult = RESCAN_OK;
// Filter out invalid codepages, or editor will display all blank
- if (filelocLeft.encoding.m_unicoding == ucr::NONE
- && !IsValidCodepageForMergeEditor(filelocLeft.encoding.m_codepage))
- {
- int cp = getDefaultCodepage();
- if (!IsValidCodepageForMergeEditor(cp))
- cp = CP_ACP;
- filelocLeft.encoding.SetCodepage(cp);
- }
- if (filelocRight.encoding.m_unicoding == ucr::NONE
- && !IsValidCodepageForMergeEditor(filelocRight.encoding.m_codepage))
- {
- int cp = getDefaultCodepage();
- if (!IsValidCodepageForMergeEditor(cp))
- cp = CP_ACP;
- filelocRight.encoding.SetCodepage(cp);
- }
+ SanityCheckCodepage(filelocLeft);
+ SanityCheckCodepage(filelocRight);
// clear undo stack
undoTgt.clear();
@@ -2823,63 +2867,12 @@
// build the text being filtered, "|" separates files as it is forbidden in filenames
m_strBothFilenames = sLeftFile + _T("|") + sRightFile;
- // Load left side file
- DWORD nLeftSuccess = FileLoadResult::FRESULT_ERROR;
- if (!sLeftFile.IsEmpty())
- {
- if (GetMainFrame()->m_strDescriptions[0].empty())
- m_nBufferType[0] = BUFFER_NORMAL;
- else
- {
- m_nBufferType[0] = BUFFER_NORMAL_NAMED;
- m_strDesc[0] = GetMainFrame()->m_strDescriptions[0];
- GetMainFrame()->m_strDescriptions[0].erase();
- }
+ // Load files
+ DWORD nLeftSuccess = LoadOneFile(0, (LPCTSTR)sLeftFile, bROLeft,
+ filelocLeft.encoding.m_codepage);
+ DWORD nRightSuccess = LoadOneFile(1, (LPCTSTR)sRightFile, bRORight,
+ filelocRight.encoding.m_codepage);
- m_pSaveFileInfo[0]->Update((LPCTSTR)sLeftFile);
- m_pRescanFileInfo[0]->Update((LPCTSTR)sLeftFile);
-
- // Load left side file
- nLeftSuccess = LoadFile(sLeftFile, 0, bROLeft, filelocLeft.encoding.m_codepage);
- }
- else
- {
- m_nBufferType[0] = BUFFER_UNNAMED;
-
- m_ptBuf[0]->InitNew();
- m_strDesc[0] = GetMainFrame()->m_strDescriptions[0];
- nLeftSuccess = FileLoadResult::FRESULT_OK;
- }
-
- // Load right side only if left side was successfully loaded
- DWORD nRightSuccess = FileLoadResult::FRESULT_ERROR;
- if (!sRightFile.IsEmpty())
- {
- if (GetMainFrame()->m_strDescriptions[1].empty())
- m_nBufferType[1] = BUFFER_NORMAL;
- else
- {
- m_nBufferType[1] = BUFFER_NORMAL_NAMED;
- m_strDesc[1] = GetMainFrame()->m_strDescriptions[1];
- GetMainFrame()->m_strDescriptions[1].erase();
- }
-
- m_pSaveFileInfo[1]->Update((LPCTSTR)sRightFile);
- m_pRescanFileInfo[1]->Update((LPCTSTR)sRightFile);
- if (FileLoadResult::IsOk(nLeftSuccess) || FileLoadResult::IsBinary(nLeftSuccess))
- {
- nRightSuccess = LoadFile(sRightFile, 1, bRORight, filelocRight.encoding.m_codepage);
- }
- }
- else
- {
- m_nBufferType[1] = BUFFER_UNNAMED;
-
- m_ptBuf[1]->InitNew();
- m_strDesc[1] = GetMainFrame()->m_strDescriptions[1];
- nRightSuccess = FileLoadResult::FRESULT_OK;
- }
-
// scratchpad : we don't call LoadFile, so
// we need to initialize the unpacker as a "do nothing" one
if (m_nBufferType[0] == BUFFER_UNNAMED && m_nBufferType[1] == BUFFER_UNNAMED)
Modified: trunk/Src/MergeDoc.h
===================================================================
--- trunk/Src/MergeDoc.h 2008-01-16 20:20:54 UTC (rev 4921)
+++ trunk/Src/MergeDoc.h 2008-01-16 21:20:33 UTC (rev 4922)
@@ -227,7 +227,6 @@
OPENRESULTS_TYPE OpenDocs(FileLocation filelocLeft, FileLocation filelocRight,
BOOL bROLeft, BOOL bRORight);
void CompareBinaries(CString sLeftFile, CString sRightFile, int nLeftSuccess, int nRightSuccess);
- int LoadFile(CString sFileName, int nBuffer, BOOL & readOnly, int codepage);
void RescanIfNeeded(float timeOutInSecond);
int Rescan(BOOL &bBinary, BOOL &bIdentical, BOOL bForced = FALSE);
void ShowRescanError(int nRescanResult, BOOL bBinary, BOOL bIdentical);
@@ -310,6 +309,9 @@
bool GetBreakType() const;
bool GetByteColoringOption() const;
bool IsValidCodepageForMergeEditor(unsigned cp) const;
+ void SanityCheckCodepage(FileLocation & fileinfo);
+ DWORD LoadOneFile(int index, String filename, BOOL readOnly, int codepage);
+ int LoadFile(CString sFileName, int nBuffer, BOOL & readOnly, int codepage);
// Implementation data
protected:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-16 20:20:56
|
Revision: 4921
http://winmerge.svn.sourceforge.net/winmerge/?rev=4921&view=rev
Author: kimmov
Date: 2008-01-16 12:20:54 -0800 (Wed, 16 Jan 2008)
Log Message:
-----------
Convert description texts in CMainFrame to array.
Modified Paths:
--------------
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
trunk/Src/Merge.cpp
trunk/Src/MergeDoc.cpp
trunk/Src/MergeDocEncoding.cpp
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2008-01-16 03:25:34 UTC (rev 4920)
+++ trunk/Src/MainFrm.cpp 2008-01-16 20:20:54 UTC (rev 4921)
@@ -1202,10 +1202,10 @@
pDirDoc->SetReadOnly(TRUE, bROLeft);
pDirDoc->SetReadOnly(FALSE, bRORight);
- pDirDoc->SetDescriptions(m_strLeftDesc, m_strRightDesc);
+ pDirDoc->SetDescriptions(m_strDescriptions[0], m_strDescriptions[1]);
pDirDoc->SetTitle(NULL);
- m_strLeftDesc.erase();
- m_strRightDesc.erase();
+ m_strDescriptions[0].erase();
+ m_strDescriptions[1].erase();
pDirDoc->Rescan();
}
@@ -2513,16 +2513,15 @@
// Load emptyfile descriptors and open empty docs
// Use default codepage
- m_strLeftDesc = theApp.LoadString(IDS_EMPTY_LEFT_FILE);
- m_strRightDesc = theApp.LoadString(IDS_EMPTY_RIGHT_FILE);
+ m_strDescriptions[0] = theApp.LoadString(IDS_EMPTY_LEFT_FILE);
+ m_strDescriptions[1] = theApp.LoadString(IDS_EMPTY_RIGHT_FILE);
FileLocation filelocLeft; // empty, unspecified (so default) encoding
FileLocation filelocRight;
ShowMergeDoc(pDirDoc, filelocLeft, filelocRight, FALSE, FALSE);
-
// Empty descriptors now that docs are open
- m_strLeftDesc.erase();
- m_strRightDesc.erase();
+ m_strDescriptions[0].erase();
+ m_strDescriptions[1].erase();
}
/**
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2008-01-16 03:25:34 UTC (rev 4920)
+++ trunk/Src/MainFrm.h 2008-01-16 20:20:54 UTC (rev 4921)
@@ -187,10 +187,7 @@
* which is more pleasant and informative than temporary paths.
*/
/*@{*/
- /** Left descriptor */
- String m_strLeftDesc;
- /** Right descriptor */
- String m_strRightDesc;
+ String m_strDescriptions[2];
/*@}*/
/** @brief Possible toolbar image sizes. */
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2008-01-16 03:25:34 UTC (rev 4920)
+++ trunk/Src/Merge.cpp 2008-01-16 20:20:54 UTC (rev 4921)
@@ -597,8 +597,8 @@
pMainFrame->m_strSaveAsPath = _T("");
- pMainFrame->m_strLeftDesc = cmdInfo.m_sLeftDesc;
- pMainFrame->m_strRightDesc = cmdInfo.m_sRightDesc;
+ pMainFrame->m_strDescriptions[0] = cmdInfo.m_sLeftDesc;
+ pMainFrame->m_strDescriptions[1] = cmdInfo.m_sRightDesc;
if (cmdInfo.m_nFiles > 2)
{
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2008-01-16 03:25:34 UTC (rev 4920)
+++ trunk/Src/MergeDoc.cpp 2008-01-16 20:20:54 UTC (rev 4921)
@@ -2827,13 +2827,13 @@
DWORD nLeftSuccess = FileLoadResult::FRESULT_ERROR;
if (!sLeftFile.IsEmpty())
{
- if (GetMainFrame()->m_strLeftDesc.empty())
+ if (GetMainFrame()->m_strDescriptions[0].empty())
m_nBufferType[0] = BUFFER_NORMAL;
else
{
m_nBufferType[0] = BUFFER_NORMAL_NAMED;
- m_strDesc[0] = GetMainFrame()->m_strLeftDesc;
- GetMainFrame()->m_strLeftDesc.erase();
+ m_strDesc[0] = GetMainFrame()->m_strDescriptions[0];
+ GetMainFrame()->m_strDescriptions[0].erase();
}
m_pSaveFileInfo[0]->Update((LPCTSTR)sLeftFile);
@@ -2847,7 +2847,7 @@
m_nBufferType[0] = BUFFER_UNNAMED;
m_ptBuf[0]->InitNew();
- m_strDesc[0] = GetMainFrame()->m_strLeftDesc;
+ m_strDesc[0] = GetMainFrame()->m_strDescriptions[0];
nLeftSuccess = FileLoadResult::FRESULT_OK;
}
@@ -2855,13 +2855,13 @@
DWORD nRightSuccess = FileLoadResult::FRESULT_ERROR;
if (!sRightFile.IsEmpty())
{
- if (GetMainFrame()->m_strRightDesc.empty())
+ if (GetMainFrame()->m_strDescriptions[1].empty())
m_nBufferType[1] = BUFFER_NORMAL;
else
{
m_nBufferType[1] = BUFFER_NORMAL_NAMED;
- m_strDesc[1] = GetMainFrame()->m_strRightDesc;
- GetMainFrame()->m_strRightDesc.erase();
+ m_strDesc[1] = GetMainFrame()->m_strDescriptions[1];
+ GetMainFrame()->m_strDescriptions[1].erase();
}
m_pSaveFileInfo[1]->Update((LPCTSTR)sRightFile);
@@ -2876,7 +2876,7 @@
m_nBufferType[1] = BUFFER_UNNAMED;
m_ptBuf[1]->InitNew();
- m_strDesc[1] = GetMainFrame()->m_strRightDesc;
+ m_strDesc[1] = GetMainFrame()->m_strDescriptions[1];
nRightSuccess = FileLoadResult::FRESULT_OK;
}
Modified: trunk/Src/MergeDocEncoding.cpp
===================================================================
--- trunk/Src/MergeDocEncoding.cpp 2008-01-16 03:25:34 UTC (rev 4920)
+++ trunk/Src/MergeDocEncoding.cpp 2008-01-16 20:20:54 UTC (rev 4921)
@@ -24,7 +24,7 @@
* @brief Implementation file for CMergeDoc
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -81,8 +81,8 @@
}
filelocLeft.setPath(m_filePaths.GetLeft().c_str());
filelocRight.setPath(m_filePaths.GetRight().c_str());
- GetMainFrame()->m_strLeftDesc = m_strDesc[0];
- GetMainFrame()->m_strRightDesc = m_strDesc[1];
+ GetMainFrame()->m_strDescriptions[0] = m_strDesc[0];
+ GetMainFrame()->m_strDescriptions[1] = m_strDesc[1];
OpenDocs(filelocLeft, filelocRight, bROLeft, bRORight);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-01-16 03:25:36
|
Revision: 4920
http://winmerge.svn.sourceforge.net/winmerge/?rev=4920&view=rev
Author: sdottaka
Date: 2008-01-15 19:25:34 -0800 (Tue, 15 Jan 2008)
Log Message:
-----------
BUG: [ 1872165 ] Quick Compare issue in 2.7.7.2
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-01-16 03:25:09 UTC (rev 4919)
+++ trunk/Docs/Users/ChangeLog.txt 2008-01-16 03:25:34 UTC (rev 4920)
@@ -2,6 +2,9 @@
Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or
to Subversion revision numbers (rXXXXX).
+WinMerge 2.7.7.3
+ BugFix: Fix Quick Compare regression in 2.7.7.2
+
WinMerge 2.7.7.2 - 2008-01-14 (r4915)
Syntax highlighting for PowerShell files (#1859657)
Syntax highlighting for PO(T) files (#1866221)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-01-16 03:25:12
|
Revision: 4919
http://winmerge.svn.sourceforge.net/winmerge/?rev=4919&view=rev
Author: sdottaka
Date: 2008-01-15 19:25:09 -0800 (Tue, 15 Jan 2008)
Log Message:
-----------
BUG: [ 1872165 ] Quick Compare issue in 2.7.7.2
Modified Paths:
--------------
trunk/Src/CompareEngines/ByteCompare.cpp
Modified: trunk/Src/CompareEngines/ByteCompare.cpp
===================================================================
--- trunk/Src/CompareEngines/ByteCompare.cpp 2008-01-15 22:31:04 UTC (rev 4918)
+++ trunk/Src/CompareEngines/ByteCompare.cpp 2008-01-16 03:25:09 UTC (rev 4919)
@@ -166,7 +166,17 @@
bfend[i] += rtn;
if (guessEncoding)
DiffFileData::GuessEncoding_from_buffer(location[i], buff[i], rtn);
+ if (m_inf[0].desc == m_inf[1].desc)
+ {
+ bfstart[1] = bfstart[0];
+ bfend[1] = bfend[0];
+ eof[1] = eof[0];
+ location[1] = location[0];
+ memcpy(&buff[1][bfend[1] - rtn], &buff[0][bfend[0] - rtn], rtn);
+ break;
+ }
}
+
}
guessEncoding = FALSE;
// where to start comparing right now
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-01-15 22:31:13
|
Revision: 4918
http://winmerge.svn.sourceforge.net/winmerge/?rev=4918&view=rev
Author: gerundt
Date: 2008-01-15 14:31:04 -0800 (Tue, 15 Jan 2008)
Log Message:
-----------
Add link to ChangeLog.txt in ReleaseNotes.html
Modified Paths:
--------------
trunk/Docs/Users/ReleaseNotes.html
Modified: trunk/Docs/Users/ReleaseNotes.html
===================================================================
--- trunk/Docs/Users/ReleaseNotes.html 2008-01-15 20:22:30 UTC (rev 4917)
+++ trunk/Docs/Users/ReleaseNotes.html 2008-01-15 22:31:04 UTC (rev 4918)
@@ -90,8 +90,8 @@
<h3><a name="new276">What Is New in 2.7.6?</a></h3>
<p>
-For a complete changelog, see the <code>ChangeLog.txt</code> in <code>Docs</code>
-folder in WinMerge program folder.
+For a complete changelog, see the <code><a href="ChangeLog.txt">ChangeLog.txt</a></code>
+in <code>Docs</code> folder in WinMerge program folder.
</p>
<h4>New Localization System</h4>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-01-15 20:22:37
|
Revision: 4917
http://winmerge.svn.sourceforge.net/winmerge/?rev=4917&view=rev
Author: gerundt
Date: 2008-01-15 12:22:30 -0800 (Tue, 15 Jan 2008)
Log Message:
-----------
BUG: [ 1869621 ] xslt support
Modified Paths:
--------------
branches/R2_6/Filters/XML_html.flt
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/Filters/XML_html.flt
===================================================================
--- branches/R2_6/Filters/XML_html.flt 2008-01-15 20:20:06 UTC (rev 4916)
+++ branches/R2_6/Filters/XML_html.flt 2008-01-15 20:22:30 UTC (rev 4917)
@@ -12,7 +12,7 @@
## (Inline comments begin with " ##" and extend to the end of the line)
f: \.xml$ ## XML files
-f: \.xlst$
+f: \.xslt$
f: \.dtd$
f: \.html$ ## HTML files
f: \.htm$
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2008-01-15 20:20:06 UTC (rev 4916)
+++ branches/R2_6/Src/Changes.txt 2008-01-15 20:22:30 UTC (rev 4917)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2008-01-15 Tim
+ BUG: [ 1869621 ] xslt support
+ Submitted by Joel Paula
+ Filters: XML_html.flt
+
2008-01-12 Takashi
BUG: [ 1869821 ] Register.bat doesn't work on W98 and Vista
ShellExtension: Register.bat Unregister.bat
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-01-15 20:20:14
|
Revision: 4916
http://winmerge.svn.sourceforge.net/winmerge/?rev=4916&view=rev
Author: gerundt
Date: 2008-01-15 12:20:06 -0800 (Tue, 15 Jan 2008)
Log Message:
-----------
BUG: [ 1869621 ] xslt support
Modified Paths:
--------------
trunk/Filters/XML_html.flt
Modified: trunk/Filters/XML_html.flt
===================================================================
--- trunk/Filters/XML_html.flt 2008-01-14 20:03:54 UTC (rev 4915)
+++ trunk/Filters/XML_html.flt 2008-01-15 20:20:06 UTC (rev 4916)
@@ -12,7 +12,7 @@
## (Inline comments begin with " ##" and extend to the end of the line)
f: \.xml$ ## XML files
-f: \.xlst$
+f: \.xslt$
f: \.dtd$
f: \.html$ ## HTML files
f: \.htm$
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-14 20:03:57
|
Revision: 4915
http://winmerge.svn.sourceforge.net/winmerge/?rev=4915&view=rev
Author: kimmov
Date: 2008-01-14 12:03:54 -0800 (Mon, 14 Jan 2008)
Log Message:
-----------
WinMerge experimental release 2.7.7.2 (SVN revision 4915)
Revision Links:
--------------
http://winmerge.svn.sourceforge.net/winmerge/?rev=4915&view=rev
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-01-14 19:57:14 UTC (rev 4914)
+++ trunk/Docs/Users/ChangeLog.txt 2008-01-14 20:03:54 UTC (rev 4915)
@@ -2,7 +2,7 @@
Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or
to Subversion revision numbers (rXXXXX).
-WinMerge 2.7.7.2
+WinMerge 2.7.7.2 - 2008-01-14 (r4915)
Syntax highlighting for PowerShell files (#1859657)
Syntax highlighting for PO(T) files (#1866221)
Change font size with Ctrl + MouseWheel (#1865795, #1869686)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-14 19:58:13
|
Revision: 4914
http://winmerge.svn.sourceforge.net/winmerge/?rev=4914&view=rev
Author: kimmov
Date: 2008-01-14 11:57:14 -0800 (Mon, 14 Jan 2008)
Log Message:
-----------
Update language PO files.
Modified Paths:
--------------
trunk/Src/Languages/Brazilian.po
trunk/Src/Languages/Bulgarian.po
trunk/Src/Languages/Catalan.po
trunk/Src/Languages/ChineseSimplified.po
trunk/Src/Languages/ChineseTraditional.po
trunk/Src/Languages/Croatian.po
trunk/Src/Languages/Czech.po
trunk/Src/Languages/Danish.po
trunk/Src/Languages/Dutch.po
trunk/Src/Languages/French.po
trunk/Src/Languages/German.po
trunk/Src/Languages/Hungarian.po
trunk/Src/Languages/Italian.po
trunk/Src/Languages/Japanese.po
trunk/Src/Languages/Korean.po
trunk/Src/Languages/Norwegian.po
trunk/Src/Languages/Polish.po
trunk/Src/Languages/Portuguese.po
trunk/Src/Languages/Russian.po
trunk/Src/Languages/Slovak.po
trunk/Src/Languages/Spanish.po
trunk/Src/Languages/Swedish.po
trunk/Src/Languages/Turkish.po
Modified: trunk/Src/Languages/Brazilian.po
===================================================================
--- trunk/Src/Languages/Brazilian.po 2008-01-14 19:48:16 UTC (rev 4913)
+++ trunk/Src/Languages/Brazilian.po 2008-01-14 19:57:14 UTC (rev 4914)
@@ -71,7 +71,7 @@
#: Merge.rc:81
#: Merge.rc:103
-#: Merge.rc:492
+#: Merge.rc:494
#, c-format
msgid "&Copy"
msgstr "&Copiar"
@@ -83,7 +83,7 @@
msgstr "Co&lar"
#: Merge.rc:84
-#: Merge.rc:573
+#: Merge.rc:575
#, c-format
msgid "&Goto..."
msgstr ""
@@ -94,22 +94,22 @@
msgstr ""
#: Merge.rc:88
-#: Merge.rc:515
-#: Merge.rc:521
+#: Merge.rc:517
+#: Merge.rc:523
#, c-format
msgid "with &Registered Application"
msgstr ""
#: Merge.rc:89
-#: Merge.rc:516
-#: Merge.rc:522
+#: Merge.rc:518
+#: Merge.rc:524
#, c-format
msgid "with &External Editor"
msgstr ""
#: Merge.rc:90
-#: Merge.rc:517
-#: Merge.rc:523
+#: Merge.rc:519
+#: Merge.rc:525
#, c-format
msgid "&with..."
msgstr ""
@@ -154,281 +154,281 @@
#: Merge.rc:120
#: Merge.rc:202
-#: Merge.rc:340
+#: Merge.rc:342
#, c-format
msgid "E&xit"
msgstr "&Sair"
#: Merge.rc:122
#: Merge.rc:204
-#: Merge.rc:342
+#: Merge.rc:344
#, c-format
msgid "&Edit"
msgstr "&Editar"
#: Merge.rc:124
#: Merge.rc:208
-#: Merge.rc:376
+#: Merge.rc:378
#, c-format
msgid "&Options..."
msgstr "Op\xE7\xF5e&s..."
#: Merge.rc:126
#: Merge.rc:210
-#: Merge.rc:378
+#: Merge.rc:380
#, c-format
msgid "&View"
msgstr "E&xibir"
#: Merge.rc:128
#: Merge.rc:221
-#: Merge.rc:380
+#: Merge.rc:382
#, c-format
msgid "Select &Font..."
msgstr "Escolher &Fonte..."
#: Merge.rc:129
#: Merge.rc:222
-#: Merge.rc:381
+#: Merge.rc:383
#, c-format
msgid "Use Default F&ont"
msgstr "Usar F&onte Padr\xE3o"
#: Merge.rc:131
#: Merge.rc:224
-#: Merge.rc:398
+#: Merge.rc:400
#, c-format
msgid "&Toolbar"
msgstr ""
#: Merge.rc:133
#: Merge.rc:226
-#: Merge.rc:400
+#: Merge.rc:402
#, c-format
msgid "&None"
msgstr ""
#: Merge.rc:134
#: Merge.rc:227
-#: Merge.rc:401
+#: Merge.rc:403
#, c-format
msgid "&Small"
msgstr ""
#: Merge.rc:135
#: Merge.rc:228
-#: Merge.rc:402
+#: Merge.rc:404
#, c-format
msgid "&Big"
msgstr ""
#: Merge.rc:137
#: Merge.rc:230
-#: Merge.rc:404
+#: Merge.rc:406
#, c-format
msgid "&Status Bar"
msgstr "Barra de &Status"
#: Merge.rc:138
#: Merge.rc:231
-#: Merge.rc:405
+#: Merge.rc:407
#, c-format
msgid "Ta&b Bar"
msgstr ""
#: Merge.rc:140
#: Merge.rc:234
-#: Merge.rc:409
+#: Merge.rc:411
#, c-format
msgid "&Language..."
msgstr "&Idioma..."
#: Merge.rc:142
#: Merge.rc:255
-#: Merge.rc:431
+#: Merge.rc:433
#, c-format
msgid "&Tools"
msgstr ""
#: Merge.rc:144
#: Merge.rc:258
-#: Merge.rc:433
+#: Merge.rc:435
#, c-format
msgid "&Filters..."
msgstr ""
#: Merge.rc:145
#: Merge.rc:259
-#: Merge.rc:434
+#: Merge.rc:436
#, c-format
msgid "&Generate Patch..."
msgstr ""
#: Merge.rc:147
#: Merge.rc:262
-#: Merge.rc:437
+#: Merge.rc:439
#, c-format
msgid "&Plugins"
msgstr ""
#: Merge.rc:149
#: Merge.rc:264
-#: Merge.rc:439
+#: Merge.rc:441
#, c-format
msgid "&Manual Unpacking"
msgstr ""
#: Merge.rc:150
#: Merge.rc:265
-#: Merge.rc:440
+#: Merge.rc:442
#, c-format
msgid "&Automatic Unpacking"
msgstr ""
#: Merge.rc:152
#: Merge.rc:267
-#: Merge.rc:442
+#: Merge.rc:444
#, c-format
msgid "&Edit with Unpacker"
msgstr ""
#: Merge.rc:154
#: Merge.rc:269
-#: Merge.rc:449
+#: Merge.rc:451
#, c-format
msgid "&Reload plugins"
msgstr ""
#: Merge.rc:156
#: Merge.rc:271
-#: Merge.rc:451
+#: Merge.rc:453
#, c-format
msgid "&Debug"
msgstr ""
#: Merge.rc:158
#: Merge.rc:273
-#: Merge.rc:453
+#: Merge.rc:455
#, c-format
msgid "&Load Config..."
msgstr ""
#: Merge.rc:159
#: Merge.rc:274
-#: Merge.rc:454
+#: Merge.rc:456
#, c-format
msgid "&Reset Options"
msgstr ""
#: Merge.rc:161
#: Merge.rc:276
-#: Merge.rc:456
+#: Merge.rc:458
#, c-format
msgid "&Window"
msgstr "Ja&nela"
#: Merge.rc:163
#: Merge.rc:278
-#: Merge.rc:458
+#: Merge.rc:460
#, c-format
msgid "Cl&ose"
msgstr "Fechar"
#: Merge.rc:164
#: Merge.rc:279
-#: Merge.rc:459
+#: Merge.rc:461
#, c-format
msgid "Clo&se All"
msgstr ""
#: Merge.rc:166
#: Merge.rc:281
-#: Merge.rc:461
+#: Merge.rc:463
#, c-format
msgid "Change &Pane\tF6"
msgstr ""
#: Merge.rc:168
#: Merge.rc:283
-#: Merge.rc:463
+#: Merge.rc:465
#, c-format
msgid "Tile &Horizontally"
msgstr "Dividir &Horizontalmente"
#: Merge.rc:169
#: Merge.rc:284
-#: Merge.rc:464
+#: Merge.rc:466
#, c-format
msgid "Tile &Vertically"
msgstr "Dividir &Verticalmente"
#: Merge.rc:170
#: Merge.rc:285
-#: Merge.rc:465
+#: Merge.rc:467
#, c-format
msgid "&Cascade"
msgstr "Em &Cascata"
#: Merge.rc:172
#: Merge.rc:287
-#: Merge.rc:467
-#: Merge.rc:1881
+#: Merge.rc:469
+#: Merge.rc:1883
#, c-format
msgid "&Help"
msgstr "A&juda"
#: Merge.rc:174
#: Merge.rc:289
-#: Merge.rc:469
+#: Merge.rc:471
#, c-format
msgid "&Contents...\tF1"
msgstr "&Conte\xFAdo...\tF1"
#: Merge.rc:175
#: Merge.rc:290
-#: Merge.rc:470
+#: Merge.rc:472
#, c-format
msgid "&Index..."
msgstr ""
#: Merge.rc:176
#: Merge.rc:291
-#: Merge.rc:471
+#: Merge.rc:473
#, c-format
msgid "&Search..."
msgstr ""
#: Merge.rc:178
#: Merge.rc:293
-#: Merge.rc:473
+#: Merge.rc:475
#, c-format
msgid "R&elease Notes"
msgstr ""
#: Merge.rc:179
#: Merge.rc:294
-#: Merge.rc:474
+#: Merge.rc:476
#, c-format
msgid "C&onfiguration..."
msgstr ""
#: Merge.rc:180
#: Merge.rc:295
-#: Merge.rc:475
+#: Merge.rc:477
#, c-format
msgid "A&rchive Support disabled..."
msgstr ""
#: Merge.rc:182
#: Merge.rc:297
-#: Merge.rc:477
+#: Merge.rc:479
#, c-format
msgid "&GNU Public License..."
msgstr "Licen\xE7a P\xFAblica GNU..."
#: Merge.rc:183
#: Merge.rc:298
-#: Merge.rc:478
+#: Merge.rc:480
#, c-format
msgid "&About WinMerge..."
msgstr "&Sobre o WinMerge..."
@@ -457,7 +457,7 @@
msgstr ""
#: Merge.rc:206
-#: Merge.rc:352
+#: Merge.rc:354
#, c-format
msgid "Select &All\tCtrl+A"
msgstr ""
@@ -503,7 +503,7 @@
msgstr ""
#: Merge.rc:236
-#: Merge.rc:411
+#: Merge.rc:413
#, c-format
msgid "Refre&sh\tF5"
msgstr "Atuali&zar\tF5"
@@ -514,7 +514,7 @@
msgstr ""
#: Merge.rc:239
-#: Merge.rc:413
+#: Merge.rc:415
#, c-format
msgid "&Merge"
msgstr ""
@@ -525,43 +525,43 @@
msgstr ""
#: Merge.rc:243
-#: Merge.rc:415
+#: Merge.rc:417
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr "&Pr\xF3xima diferen\xE7a\tAlt+Down"
#: Merge.rc:244
-#: Merge.rc:416
+#: Merge.rc:418
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr "Diferen\xE7a &anterior\tAlt+Up"
#: Merge.rc:246
-#: Merge.rc:418
+#: Merge.rc:420
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr "Primeira &Diferen\xE7a\tAlt+Home"
#: Merge.rc:247
-#: Merge.rc:419
+#: Merge.rc:421
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr "Diferen\xE7a Corre&nte\tAlt+Enter"
#: Merge.rc:248
-#: Merge.rc:420
+#: Merge.rc:422
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr "&Ultima Diferen\xE7a\tAlt+End"
#: Merge.rc:250
-#: Merge.rc:422
+#: Merge.rc:424
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr "Copiar para a &Direita\tAlt+Right"
#: Merge.rc:251
-#: Merge.rc:423
+#: Merge.rc:425
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr "Copiar para a &Esquerda\tAlt+Left"
@@ -572,13 +572,13 @@
msgstr ""
#: Merge.rc:257
-#: Merge.rc:546
+#: Merge.rc:548
#, c-format
msgid "&Customize Columns..."
msgstr ""
#: Merge.rc:260
-#: Merge.rc:435
+#: Merge.rc:437
#, c-format
msgid "Generate &Report..."
msgstr ""
@@ -650,1946 +650,1951 @@
msgid "&Merge Mode\tF9"
msgstr ""
-#: Merge.rc:344
+#: Merge.rc:340
#, c-format
+msgid "&File Encoding..."
+msgstr ""
+
+#: Merge.rc:346
+#, c-format
msgid "&Undo\tCtrl+Z"
msgstr "&Desfazer\tCtrl+Z"
-#: Merge.rc:345
+#: Merge.rc:347
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr "&Refazer\tCtrl+Y"
-#: Merge.rc:347
+#: Merge.rc:349
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr "Cor&tar\tCtrl+X"
-#: Merge.rc:348
+#: Merge.rc:350
#, c-format
msgid "&Copy\tCtrl+C"
msgstr "&Copiar\tCtrl+C"
-#: Merge.rc:349
+#: Merge.rc:351
#, c-format
msgid "&Paste\tCtrl+V"
msgstr "Co&lar\tCtrl+V"
-#: Merge.rc:351
+#: Merge.rc:353
#, c-format
msgid "Select Line &Difference\tF4"
msgstr ""
-#: Merge.rc:354
+#: Merge.rc:356
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "Pr&ocurar...\tCtrl+F"
-#: Merge.rc:355
+#: Merge.rc:357
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr "Al&terar...\tCtrl+H"
-#: Merge.rc:357
+#: Merge.rc:359
#, c-format
msgid "&Scripts"
msgstr ""
-#: Merge.rc:359
-#: Merge.rc:2863
+#: Merge.rc:361
+#: Merge.rc:2865
#, c-format
msgid "< Empty >"
msgstr ""
-#: Merge.rc:362
+#: Merge.rc:364
#, c-format
msgid "Advanced"
msgstr ""
-#: Merge.rc:364
+#: Merge.rc:366
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr ""
-#: Merge.rc:367
+#: Merge.rc:369
#, c-format
msgid "&Bookmarks"
msgstr ""
-#: Merge.rc:369
+#: Merge.rc:371
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr ""
-#: Merge.rc:370
+#: Merge.rc:372
#, c-format
msgid "&Next Bookmark\tF2"
msgstr ""
-#: Merge.rc:371
+#: Merge.rc:373
#, c-format
msgid "&Previous bookmark\tShift+F2"
msgstr ""
-#: Merge.rc:372
+#: Merge.rc:374
#, c-format
msgid "&Clear All Bookmarks"
msgstr ""
-#: Merge.rc:374
+#: Merge.rc:376
#, c-format
msgid "&Go To...\tCtrl+G"
msgstr ""
-#: Merge.rc:382
+#: Merge.rc:384
#, c-format
msgid "Zoom In\tCtrl++"
msgstr ""
-#: Merge.rc:383
+#: Merge.rc:385
#, c-format
msgid "Zoom Out\tCtrl+-"
msgstr ""
-#: Merge.rc:384
+#: Merge.rc:386
#, c-format
msgid "Syntax Highlight"
msgstr ""
-#: Merge.rc:389
+#: Merge.rc:391
#, c-format
msgid "&Lock Panes"
msgstr ""
-#: Merge.rc:390
+#: Merge.rc:392
#, c-format
msgid "&View Whitespace"
msgstr "E&xibir Espa\xE7os"
-#: Merge.rc:391
+#: Merge.rc:393
#, c-format
msgid "Vie&w Line Differences"
msgstr ""
-#: Merge.rc:392
+#: Merge.rc:394
#, c-format
msgid "View Line &Numbers"
msgstr ""
-#: Merge.rc:393
+#: Merge.rc:395
#, c-format
msgid "View &Margins"
msgstr ""
-#: Merge.rc:394
+#: Merge.rc:396
#, c-format
msgid "W&rap Lines"
msgstr ""
-#: Merge.rc:396
+#: Merge.rc:398
#, c-format
msgid "Sw&ap Panes"
msgstr ""
-#: Merge.rc:406
+#: Merge.rc:408
#, c-format
msgid "Diff &Pane"
msgstr ""
-#: Merge.rc:407
+#: Merge.rc:409
#, c-format
msgid "Lo&cation Pane"
msgstr "Location &Pane"
-#: Merge.rc:425
+#: Merge.rc:427
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
msgstr "Copy to Right and Advance\tAlt+Ctrl+Right"
-#: Merge.rc:426
+#: Merge.rc:428
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
msgstr "Copy to Left and Advance\tAlt+Ctrl+Left"
-#: Merge.rc:428
+#: Merge.rc:430
#, c-format
msgid "Copy &All to Right"
msgstr "Copiar tudo para a Direita"
-#: Merge.rc:429
+#: Merge.rc:431
#, c-format
msgid "Cop&y All to Left"
msgstr "Copiar tudo para a Esquerda"
-#: Merge.rc:444
+#: Merge.rc:446
#, c-format
msgid "&Prediffer"
msgstr ""
-#: Merge.rc:486
+#: Merge.rc:488
#, c-format
msgid "Comp&are"
msgstr ""
-#: Merge.rc:487
+#: Merge.rc:489
#, c-format
msgid "Co&mpare Special"
msgstr ""
-#: Merge.rc:489
+#: Merge.rc:491
#, c-format
msgid "&XML"
msgstr ""
-#: Merge.rc:494
+#: Merge.rc:496
#, c-format
msgid "&Left to Right"
msgstr ""
-#: Merge.rc:495
+#: Merge.rc:497
#, c-format
msgid "L&eft to..."
msgstr ""
-#: Merge.rc:496
+#: Merge.rc:498
#, c-format
msgid "&Right to Left"
msgstr ""
-#: Merge.rc:497
+#: Merge.rc:499
#, c-format
msgid "R&ight to..."
msgstr ""
-#: Merge.rc:499
+#: Merge.rc:501
#, c-format
msgid "&Move"
msgstr ""
-#: Merge.rc:501
+#: Merge.rc:503
#, c-format
msgid "&Left to..."
msgstr ""
-#: Merge.rc:502
+#: Merge.rc:504
#, c-format
msgid "&Right to..."
msgstr ""
-#: Merge.rc:504
+#: Merge.rc:506
#, c-format
msgid "&Delete"
msgstr ""
-#: Merge.rc:506
-#: Merge.rc:1118
-#: Merge.rc:1497
+#: Merge.rc:508
+#: Merge.rc:1120
+#: Merge.rc:1499
#, c-format
msgid "&Left"
msgstr ""
-#: Merge.rc:507
-#: Merge.rc:1120
-#: Merge.rc:1500
+#: Merge.rc:509
+#: Merge.rc:1122
+#: Merge.rc:1502
#, c-format
msgid "&Right"
msgstr ""
-#: Merge.rc:508
+#: Merge.rc:510
#, c-format
msgid "&Both"
msgstr ""
-#: Merge.rc:510
+#: Merge.rc:512
#, c-format
msgid "Re&name"
msgstr ""
-#: Merge.rc:511
+#: Merge.rc:513
#, c-format
msgid "&Hide Items"
msgstr ""
-#: Merge.rc:513
+#: Merge.rc:515
#, c-format
msgid "&Open Left"
msgstr ""
-#: Merge.rc:519
+#: Merge.rc:521
#, c-format
msgid "O&pen Right"
msgstr ""
-#: Merge.rc:526
+#: Merge.rc:528
#, c-format
msgid "Cop&y Pathnames"
msgstr ""
-#: Merge.rc:528
+#: Merge.rc:530
#, c-format
msgid "&Left (%1 of %2)"
msgstr ""
-#: Merge.rc:529
+#: Merge.rc:531
#, c-format
msgid "&Right (%1 of %2)"
msgstr ""
-#: Merge.rc:530
+#: Merge.rc:532
#, c-format
msgid "&Both (%1 of %2)"
msgstr ""
-#: Merge.rc:532
+#: Merge.rc:534
#, c-format
msgid "Copy &Filenames"
msgstr ""
-#: Merge.rc:534
+#: Merge.rc:536
#, c-format
msgid "&Zip"
msgstr ""
-#: Merge.rc:536
+#: Merge.rc:538
#, c-format
msgid "&Left... (%1 of %2)"
msgstr ""
-#: Merge.rc:537
+#: Merge.rc:539
#, c-format
msgid "&Right... (%1 of %2)"
msgstr ""
-#: Merge.rc:538
+#: Merge.rc:540
#, c-format
msgid "&Both... (%1 of %2)"
msgstr ""
-#: Merge.rc:539
+#: Merge.rc:541
#, c-format
msgid "&Differences... (%1 of %2)"
msgstr ""
-#: Merge.rc:542
+#: Merge.rc:544
#, c-format
msgid "&Refresh"
msgstr ""
-#: Merge.rc:554
+#: Merge.rc:556
#, c-format
msgid "&Copy Full Path"
msgstr ""
-#: Merge.rc:555
+#: Merge.rc:557
#, c-format
msgid "Copy &Filename"
msgstr ""
-#: Merge.rc:561
+#: Merge.rc:563
#, c-format
msgid "Prediffer Settings"
msgstr ""
-#: Merge.rc:563
+#: Merge.rc:565
#, c-format
msgid "&No prediffer"
msgstr ""
-#: Merge.rc:564
+#: Merge.rc:566
#, c-format
msgid "Auto prediffer"
msgstr ""
-#: Merge.rc:572
+#: Merge.rc:574
#, c-format
msgid "G&oto Diff"
msgstr ""
-#: Merge.rc:575
+#: Merge.rc:577
#, c-format
msgid "&No Moved Blocks"
msgstr ""
-#: Merge.rc:576
+#: Merge.rc:578
#, c-format
msgid "&All Moved Blocks"
msgstr ""
-#: Merge.rc:577
+#: Merge.rc:579
#, c-format
msgid "Moved Block for &Current Diff"
msgstr ""
-#: Merge.rc:645
+#: Merge.rc:647
#, c-format
msgid "About WinMerge"
msgstr "Sobre o WinMerge"
-#: Merge.rc:651
+#: Merge.rc:653
#, c-format
msgid "(Private Build)"
msgstr ""
-#: Merge.rc:652
+#: Merge.rc:654
#, c-format
msgid "All rights reserved."
msgstr "Todos os direitos reservados."
-#: Merge.rc:653
+#: Merge.rc:655
#, c-format
msgid "Visit the WinMerge HomePage!"
msgstr "Visite o site do WinMerge!"
-#: Merge.rc:656
-#: Merge.rc:687
-#: Merge.rc:777
-#: Merge.rc:963
-#: Merge.rc:1037
-#: Merge.rc:1066
-#: Merge.rc:1076
-#: Merge.rc:1239
-#: Merge.rc:1303
-#: Merge.rc:1316
-#: Merge.rc:1408
-#: Merge.rc:1423
+#: Merge.rc:658
+#: Merge.rc:689
+#: Merge.rc:779
+#: Merge.rc:965
+#: Merge.rc:1039
+#: Merge.rc:1068
+#: Merge.rc:1078
+#: Merge.rc:1241
+#: Merge.rc:1305
+#: Merge.rc:1318
+#: Merge.rc:1410
+#: Merge.rc:1425
#, c-format
msgid "OK"
msgstr ""
-#: Merge.rc:657
+#: Merge.rc:659
#, c-format
msgid "Contributors"
msgstr ""
-#: Merge.rc:663
+#: Merge.rc:665
#, c-format
msgid "Select Files or Folders"
msgstr "Selecione Arquivos ou Diret\xF3rios..."
-#: Merge.rc:666
-#: Merge.rc:1574
+#: Merge.rc:668
+#: Merge.rc:1576
#, c-format
msgid "&Left:"
msgstr "&Esquerda:"
-#: Merge.rc:670
-#: Merge.rc:731
-#: Merge.rc:987
-#: Merge.rc:1002
+#: Merge.rc:672
+#: Merge.rc:733
+#: Merge.rc:989
+#: Merge.rc:1004
#, c-format
msgid "&Browse..."
msgstr "&Procurar..."
-#: Merge.rc:671
-#: Merge.rc:1578
+#: Merge.rc:673
+#: Merge.rc:1580
#, c-format
msgid "&Right:"
msgstr "&Direita:"
-#: Merge.rc:675
-#: Merge.rc:1013
+#: Merge.rc:677
+#: Merge.rc:1015
#, c-format
msgid "Bro&wse..."
msgstr "Pro&curar..."
-#: Merge.rc:676
-#: Merge.rc:1582
+#: Merge.rc:678
+#: Merge.rc:1584
#, c-format
msgid "&Filter:"
msgstr ""
-#: Merge.rc:679
-#: Merge.rc:1584
+#: Merge.rc:681
+#: Merge.rc:1586
#, c-format
msgid "Select..."
msgstr ""
-#: Merge.rc:680
+#: Merge.rc:682
#, c-format
msgid "&Unpacker:"
msgstr ""
-#: Merge.rc:683
+#: Merge.rc:685
#, c-format
msgid "&Select..."
msgstr ""
-#: Merge.rc:684
-#: Merge.rc:1585
+#: Merge.rc:686
+#: Merge.rc:1587
#, c-format
msgid "&Include Subfolders"
msgstr ""
-#: Merge.rc:686
+#: Merge.rc:688
#, c-format
msgid "Status:"
msgstr ""
-#: Merge.rc:688
-#: Merge.rc:718
-#: Merge.rc:778
-#: Merge.rc:808
-#: Merge.rc:840
-#: Merge.rc:850
-#: Merge.rc:1038
-#: Merge.rc:1067
-#: Merge.rc:1077
-#: Merge.rc:1128
-#: Merge.rc:1240
-#: Merge.rc:1317
-#: Merge.rc:1409
-#: Merge.rc:1424
+#: Merge.rc:690
+#: Merge.rc:720
+#: Merge.rc:780
+#: Merge.rc:810
+#: Merge.rc:842
+#: Merge.rc:852
+#: Merge.rc:1040
+#: Merge.rc:1069
+#: Merge.rc:1079
+#: Merge.rc:1130
+#: Merge.rc:1242
+#: Merge.rc:1319
+#: Merge.rc:1411
+#: Merge.rc:1426
#, c-format
msgid "Cancel"
msgstr "Cancelar"
-#: Merge.rc:689
-#: Merge.rc:1318
+#: Merge.rc:691
+#: Merge.rc:1320
#, c-format
msgid "Help"
msgstr ""
-#: Merge.rc:690
+#: Merge.rc:692
#, c-format
msgid "Files or Folders to Compare"
msgstr "Arquivos ou Diret\xF3rios a Comparar"
-#: Merge.rc:697
+#: Merge.rc:699
#, c-format
msgid "Visual SourceSafe"
msgstr ""
-#: Merge.rc:702
+#: Merge.rc:704
#, c-format
msgid "Database:"
msgstr ""
-#: Merge.rc:705
+#: Merge.rc:707
#, c-format
msgid "Project:"
msgstr ""
-#: Merge.rc:708
+#: Merge.rc:710
#, c-format
msgid "User:"
msgstr ""
-#: Merge.rc:710
+#: Merge.rc:712
#, c-format
msgid "Password:"
msgstr ""
-#: Merge.rc:712
+#: Merge.rc:714
#, c-format
msgid "Link to Destination VSS project"
msgstr ""
-#: Merge.rc:714
-#: Merge.rc:855
+#: Merge.rc:716
+#: Merge.rc:857
#, c-format
msgid "Apply to all items"
msgstr ""
-#: Merge.rc:716
+#: Merge.rc:718
#, c-format
msgid "Check Out"
msgstr ""
-#: Merge.rc:717
-#: Merge.rc:851
+#: Merge.rc:719
+#: Merge.rc:853
#, c-format
msgid "Save As..."
msgstr "Salvar como..."
-#: Merge.rc:723
+#: Merge.rc:725
#, c-format
msgid "Versioning System"
msgstr "Sistema de Vers\xF5es"
-#: Merge.rc:726
+#: Merge.rc:728
#, c-format
msgid "&Versioning System:"
msgstr "Sistema de &Vers\xF5es:"
-#: Merge.rc:729
+#: Merge.rc:731
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "&Caminho para cleartool.exe:"
-#: Merge.rc:736
-#: Merge.rc:1889
+#: Merge.rc:738
+#: Merge.rc:1891
#, c-format
msgid "General"
msgstr "Geral"
-#: Merge.rc:739
+#: Merge.rc:741
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "Posicionar a&utomaticamente na primeira diferen\xE7a"
-#: Merge.rc:742
+#: Merge.rc:744
#, c-format
msgid "&Disable Splash Screen"
msgstr "&Desabilitar Splash Screen"
-#: Merge.rc:744
+#: Merge.rc:746
#, c-format
msgid "Cl&ose windows with ESC"
msgstr ""
-#: Merge.rc:746
+#: Merge.rc:748
#, c-format
msgid "&Automatically verify paths in Open-dialog"
msgstr ""
-#: Merge.rc:749
+#: Merge.rc:751
#, c-format
msgid "All&ow only one instance to run"
msgstr ""
-#: Merge.rc:751
+#: Merge.rc:753
#, c-format
msgid "As&k when closing multiple windows"
msgstr ""
-#: Merge.rc:753
+#: Merge.rc:755
#, c-format
msgid "&Preserve file time in file compare"
msgstr ""
-#: Merge.rc:756
+#: Merge.rc:758
#, c-format
msgid "O&pen-dialog Auto-Completion:"
msgstr ""
-#: Merge.rc:759
+#: Merge.rc:761
#, c-format
msgid "Enable multiple compare windows for"
msgstr ""
-#: Merge.rc:761
-#: Merge.rc:1597
+#: Merge.rc:763
+#: Merge.rc:1599
#, c-format
msgid "&Folder compare"
msgstr ""
-#: Merge.rc:763
-#: Merge.rc:1599
+#: Merge.rc:765
+#: Merge.rc:1601
#, c-format
msgid "Fil&e compare"
msgstr ""
-#: Merge.rc:765
+#: Merge.rc:767
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr ""
-#: Merge.rc:767
+#: Merge.rc:769
#, c-format
msgid "Reset"
msgstr ""
-#: Merge.rc:774
+#: Merge.rc:776
#, c-format
msgid "Language"
msgstr "Idiomas"
-#: Merge.rc:781
+#: Merge.rc:783
#, c-format
msgid "Available languages:"
msgstr "Idiomas dispon\xEDveis:"
-#: Merge.rc:787
+#: Merge.rc:789
#, c-format
msgid "Find"
msgstr "Localizar"
-#: Merge.rc:790
-#: Merge.rc:817
+#: Merge.rc:792
+#: Merge.rc:819
#, c-format
msgid "Fi&nd what:"
msgstr "&Localizar:"
-#: Merge.rc:793
-#: Merge.rc:823
+#: Merge.rc:795
+#: Merge.rc:825
#, c-format
msgid "Match &whole word only"
msgstr "Somente p&alavras iguais"
-#: Merge.rc:795
-#: Merge.rc:825
+#: Merge.rc:797
+#: Merge.rc:827
#, c-format
msgid "Match &case"
msgstr "&Diferenciar mai\xFAsculas de min\xFAsculas"
-#: Merge.rc:797
-#: Merge.rc:827
+#: Merge.rc:799
+#: Merge.rc:829
#, c-format
msgid "Regular &expression"
msgstr "&Express\xE3o regular"
-#: Merge.rc:799
+#: Merge.rc:801
#, c-format
msgid "D&on't wrap end of file"
msgstr ""
-#: Merge.rc:802
+#: Merge.rc:804
#, c-format
msgid "Direction"
msgstr "Dire\xE7\xE3o"
-#: Merge.rc:803
+#: Merge.rc:805
#, c-format
msgid "&Up"
msgstr "A&cima"
-#: Merge.rc:805
+#: Merge.rc:807
#, c-format
msgid "&Down"
msgstr "A&baixo"
-#: Merge.rc:807
-#: Merge.rc:837
+#: Merge.rc:809
+#: Merge.rc:839
#, c-format
msgid "&Find Next"
msgstr "&Pr\xF3ximo"
-#: Merge.rc:814
+#: Merge.rc:816
#, c-format
msgid "Replace"
msgstr "Localizar e Substituir"
-#: Merge.rc:820
+#: Merge.rc:822
#, c-format
msgid "Re&place with:"
msgstr "Su&bstituir por:"
-#: Merge.rc:829
+#: Merge.rc:831
#, c-format
msgid "&Don't wrap end of file"
msgstr ""
-#: Merge.rc:832
+#: Merge.rc:834
#, c-format
msgid "Replace in"
msgstr "Substituir"
-#: Merge.rc:833
+#: Merge.rc:835
#, c-format
msgid "&Selection"
msgstr "Somente &na sele\xE7\xE3o"
-#: Merge.rc:835
+#: Merge.rc:837
#, c-format
msgid "Wh&ole file"
msgstr "Em todo &documento"
-#: Merge.rc:838
+#: Merge.rc:840
#, c-format
msgid "&Replace"
msgstr "&Substituir"
-#: Merge.rc:839
+#: Merge.rc:841
#, c-format
msgid "Replace &All"
msgstr "&Todos"
-#: Merge.rc:846
-#: Merge.rc:2114
+#: Merge.rc:848
+#: Merge.rc:2116
#, c-format
msgid "Rational ClearCase"
msgstr ""
-#: Merge.rc:849
+#: Merge.rc:851
#, c-format
msgid "CheckOut"
msgstr ""
-#: Merge.rc:854
-#: Merge.rc:1159
+#: Merge.rc:856
+#: Merge.rc:1161
#, c-format
msgid "Comments"
msgstr "Coment\xE1rios"
-#: Merge.rc:857
+#: Merge.rc:859
#, c-format
msgid "CheckIn after checkout"
msgstr ""
-#: Merge.rc:863
+#: Merge.rc:865
#, c-format
msgid "Linefilters"
msgstr ""
-#: Merge.rc:866
+#: Merge.rc:868
#, c-format
msgid "Enable Line Filters"
msgstr ""
-#: Merge.rc:869
+#: Merge.rc:871
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "Express\xF5es (uma por linha):"
-#: Merge.rc:876
+#: Merge.rc:878
#, c-format
msgid "Save"
msgstr ""
-#: Merge.rc:877
+#: Merge.rc:879
#, c-format
msgid "New"
msgstr ""
-#: Merge.rc:878
+#: Merge.rc:880
#, c-format
msgid "Edit"
msgstr ""
-#: Merge.rc:879
+#: Merge.rc:881
#, c-format
msgid "Remove"
msgstr ""
-#: Merge.rc:884
-#: Merge.rc:1892
+#: Merge.rc:886
+#: Merge.rc:1894
#, c-format
msgid "Colors"
msgstr "Cores"
-#: Merge.rc:887
+#: Merge.rc:889
#, c-format
msgid "Difference:"
msgstr "Diferen\xE7a:"
-#: Merge.rc:891
+#: Merge.rc:893
#, c-format
msgid "Selected Difference:"
msgstr "Diferen\xE7a Selecionada:"
-#: Merge.rc:895
-#: Merge.rc:1549
+#: Merge.rc:897
+#: Merge.rc:1551
#, c-format
msgid "Background"
msgstr ""
-#: Merge.rc:896
+#: Merge.rc:898
#, c-format
msgid "Deleted"
msgstr ""
-#: Merge.rc:909
-#: Merge.rc:1344
-#: Merge.rc:1550
+#: Merge.rc:911
+#: Merge.rc:1346
+#: Merge.rc:1552
#, c-format
msgid "Text"
msgstr ""
-#: Merge.rc:913
+#: Merge.rc:915
#, c-format
msgid "Ignored Difference:"
msgstr ""
-#: Merge.rc:923
+#: Merge.rc:925
#, c-format
msgid "Moved:"
msgstr ""
-#: Merge.rc:933
+#: Merge.rc:935
#, c-format
msgid "Selected Moved:"
msgstr ""
-#: Merge.rc:940
+#: Merge.rc:942
#, c-format
msgid "Word Difference:"
msgstr ""
-#: Merge.rc:947
+#: Merge.rc:949
#, c-format
msgid "Selected Word Diff:"
msgstr ""
-#: Merge.rc:954
-#: Merge.rc:1036
-#: Merge.rc:1065
-#: Merge.rc:1162
-#: Merge.rc:1390
+#: Merge.rc:956
+#: Merge.rc:1038
+#: Merge.rc:1067
+#: Merge.rc:1164
+#: Merge.rc:1392
#, c-format
msgid "Defaults"
msgstr ""
-#: Merge.rc:960
-#: Merge.rc:1332
-#: Merge.rc:1538
+#: Merge.rc:962
+#: Merge.rc:1334
+#: Merge.rc:1540
#, c-format
msgid "Dialog"
msgstr "Di\xE1logo"
-#: Merge.rc:970
-#: Merge.rc:1895
+#: Merge.rc:972
+#: Merge.rc:1897
#, c-format
msgid "System"
msgstr ""
-#: Merge.rc:973
+#: Merge.rc:975
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr ""
-#: Merge.rc:975
+#: Merge.rc:977
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr ""
-#: Merge.rc:978
+#: Merge.rc:980
#, c-format
msgid "Integration"
msgstr ""
-#: Merge.rc:979
+#: Merge.rc:981
#, c-format
msgid "&Add to explorer context menu"
msgstr ""
-#: Merge.rc:981
+#: Merge.rc:983
#, c-format
msgid "E&nable advanced menu"
msgstr ""
-#: Merge.rc:983
+#: Merge.rc:985
#, c-format
msgid "In&clude subfolders by default"
msgstr ""
-#: Merge.rc:985
+#: Merge.rc:987
#, c-format
msgid "&External editor:"
msgstr ""
-#: Merge.rc:988
+#: Merge.rc:990
#, c-format
msgid "&Filter folder:"
msgstr ""
-#: Merge.rc:990
-#: Merge.rc:1402
-#: Merge.rc:1576
-#: Merge.rc:1580
-#: Merge.rc:1607
+#: Merge.rc:992
+#: Merge.rc:1404
+#: Merge.rc:1578
+#: Merge.rc:1582
+#: Merge.rc:1609
#, c-format
msgid "Browse..."
msgstr ""
-#: Merge.rc:996
+#: Merge.rc:998
#, c-format
msgid "Patch Generator"
msgstr ""
-#: Merge.rc:999
+#: Merge.rc:1001
#, c-format
msgid "File&1:"
msgstr ""
-#: Merge.rc:1003
+#: Merge.rc:1005
#, c-format
msgid "File&2:"
msgstr ""
-#: Merge.rc:1006
+#: Merge.rc:1008
#, c-format
msgid "Br&owse..."
msgstr ""
-#: Merge.rc:1007
+#: Merge.rc:1009
#, c-format
msgid "&Swap"
msgstr ""
-#: Merge.rc:1008
+#: Merge.rc:1010
#, c-format
msgid "&Append to existing file"
msgstr ""
-#: Merge.rc:1010
+#: Merge.rc:1012
#, c-format
msgid "&Result:"
msgstr ""
-#: Merge.rc:1014
+#: Merge.rc:1016
#, c-format
msgid "&Format"
msgstr ""
-#: Merge.rc:1015
+#: Merge.rc:1017
#, c-format
msgid "St&yle:"
msgstr ""
-#: Merge.rc:1018
+#: Merge.rc:1020
#, c-format
msgid "&Context:"
msgstr ""
-#: Merge.rc:1021
+#: Merge.rc:1023
#, c-format
msgid "W&hitespaces"
msgstr ""
-#: Merge.rc:1022
+#: Merge.rc:1024
#, c-format
msgid "Com&pare"
msgstr ""
-#: Merge.rc:1024
+#: Merge.rc:1026
#, c-format
msgid "I&gnore changes"
msgstr ""
-#: Merge.rc:1026
+#: Merge.rc:1028
#, c-format
msgid "Ig&nore all"
msgstr ""
-#: Merge.rc:1028
+#: Merge.rc:1030
#, c-format
msgid "Ignor&e blank lines"
msgstr ""
-#: Merge.rc:1030
+#: Merge.rc:1032
#, c-format
msgid "Case sensi&tive"
msgstr ""
-#: Merge.rc:1032
+#: Merge.rc:1034
#, c-format
msgid "Inclu&de command line"
msgstr ""
-#: Merge.rc:1034
+#: Merge.rc:1036
#, c-format
msgid "Open to e&xternal editor"
msgstr ""
-#: Merge.rc:1056
+#: Merge.rc:1058
#, c-format
msgid "Display Columns"
msgstr ""
-#: Merge.rc:1062
+#: Merge.rc:1064
#, c-format
msgid "Move &Up"
msgstr ""
-#: Merge.rc:1063
+#: Merge.rc:1065
#, c-format
msgid "Move &Down"
msgstr ""
-#: Merge.rc:1073
+#: Merge.rc:1075
#, c-format
msgid "Select Unpacker"
msgstr ""
-#: Merge.rc:1078
+#: Merge.rc:1080
#, c-format
msgid "File unpacker:"
msgstr ""
-#: Merge.rc:1081
+#: Merge.rc:1083
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr ""
-#: Merge.rc:1084
+#: Merge.rc:1086
#, c-format
msgid "Extensions list:"
msgstr ""
-#: Merge.rc:1085
+#: Merge.rc:1087
#, c-format
msgid "Description:"
msgstr ""
-#: Merge.rc:1096
+#: Merge.rc:1098
#, c-format
msgid " Folder Compare Progress"
msgstr ""
-#: Merge.rc:1099
-#: Merge.rc:1842
+#: Merge.rc:1101
+#: Merge.rc:1844
#, c-format
msgid "Stop"
msgstr ""
-#: Merge.rc:1104
+#: Merge.rc:1106
#, c-format
msgid "Comparing items..."
msgstr ""
-#: Merge.rc:1105
+#: Merge.rc:1107
#, c-format
msgid "Items compared:"
msgstr ""
-#: Merge.rc:1106
+#: Merge.rc:1108
#, c-format
msgid "Items total:"
msgstr ""
-#: Merge.rc:1112
+#: Merge.rc:1114
#, c-format
msgid "Go To"
msgstr ""
-#: Merge.rc:1115
+#: Merge.rc:1117
#, c-format
msgid "G&oto:"
msgstr ""
-#: Merge.rc:1117
+#: Merge.rc:1119
#, c-format
msgid "File"
msgstr ""
-#: Merge.rc:1122
+#: Merge.rc:1124
#, c-format
msgid "Goto what"
msgstr ""
-#: Merge.rc:1123
+#: Merge.rc:1125
#, c-format
msgid "Li&ne"
msgstr ""
-#: Merge.rc:1125
+#: Merge.rc:1127
#, c-format
msgid "&Difference"
msgstr ""
-#: Merge.rc:1127
+#: Merge.rc:1129
#, c-format
msgid "&Go To"
msgstr ""
-#: Merge.rc:1133
-#: Merge.rc:1890
+#: Merge.rc:1135
+#: Merge.rc:1892
#, c-format
msgid "Compare"
msgstr ""
-#: Merge.rc:1136
+#: Merge.rc:1138
#, c-format
msgid "Whitespace"
msgstr ""
-#: Merge.rc:1137
+#: Merge.rc:1139
#, c-format
msgid "&Compare"
msgstr "Comparar e&spa\xE7os em branco"
-#: Merge.rc:1139
+#: Merge.rc:1141
#, c-format
msgid "&Ignore change"
msgstr "&Ignorar mofica\xE7\xF5es nos espa\xE7os em branco"
-#: Merge.rc:1141
+#: Merge.rc:1143
#, c-format
msgid "I&gnore all"
msgstr "Ignora t&odos espa\xE7os em branco"
-#: Merge.rc:1143
+#: Merge.rc:1145
#, c-format
msgid "Ignore blan&k lines"
msgstr "Ignorar linhas em bran&co"
-#: Merge.rc:1145
+#: Merge.rc:1147
#, c-format
msgid "Ignore &case"
msgstr "Ignorar &ma\xEDsculas/min\xFAsculas"
-#: Merge.rc:1147
+#: Merge.rc:1149
#, c-format
msgid "Igno&re carriage return differences (DOS/UNIX/MAC)"
msgstr ""
-#: Merge.rc:1150
+#: Merge.rc:1152
#, c-format
msgid "E&nable moved block detection"
msgstr ""
-#: Merge.rc:1152
+#: Merge.rc:1154
#, c-format
msgid "&Match similar lines"
msgstr ""
-#: Merge.rc:1154
+#: Merge.rc:1156
#, c-format
msgid "&File Compare method:"
msgstr ""
-#: Merge.rc:1157
+#: Merge.rc:1159
#, c-format
msgid "S&top after first difference"
msgstr ""
-#: Merge.rc:1160
+#: Merge.rc:1162
#, c-format
msgid "Filter Comments"
msgstr ""
-#: Merge.rc:1167
-#: Merge.rc:1891
+#: Merge.rc:1169
+#: Merge.rc:1893
#, c-format
msgid "Editor"
msgstr ""
-#: Merge.rc:1170
+#: Merge.rc:1172
#, c-format
msgid "&Highlight syntax"
msgstr "Destacar sintaxe"
-#: Merge.rc:1172
+#: Merge.rc:1174
#, c-format
msgid "&Automatic rescan"
msgstr "&Atualiza\xE7\xE3o autom\xE1tica"
-#: Merge.rc:1174
+#: Merge.rc:1176
#, c-format
msgid "&Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1176
+#: Merge.rc:1178
#, c-format
msgid "Tabs"
msgstr "Tabula\xE7\xE3o"
-#: Merge.rc:1177
+#: Merge.rc:1179
#, c-format
msgid "&Tab size:"
msgstr "Tama&nho da tabula\xE7\xE3o:"
-#: Merge.rc:1180
+#: Merge.rc:1182
#, c-format
msgid "&Insert Tabs"
msgstr ""
-#: Merge.rc:1182
+#: Merge.rc:1184
#, c-format
msgid "Insert &Spaces"
msgstr ""
-#: Merge.rc:1184
+#: Merge.rc:1186
#, c-format
msgid "Line Difference Coloring"
msgstr ""
-#: Merge.rc:1186
+#: Merge.rc:1188
#, c-format
msgid "View line differences"
msgstr ""
-#: Merge.rc:1188
+#: Merge.rc:1190
#, c-format
msgid "&Character level"
msgstr ""
-#: Merge.rc:1190
+#: Merge.rc:1192
#, c-format
msgid "&Word-level:"
msgstr ""
-#: Merge.rc:1205
+#: Merge.rc:1207
#, c-format
msgid "Filefilters"
msgstr ""
-#: Merge.rc:1211
+#: Merge.rc:1213
#, c-format
msgid "Test"
msgstr ""
-#: Merge.rc:1212
+#: Merge.rc:1214
#, c-format
msgid "Install..."
msgstr ""
-#: Merge.rc:1213
+#: Merge.rc:1215
#, c-format
msgid "New..."
msgstr ""
-#: Merge.rc:1214
+#: Merge.rc:1216
#, c-format
msgid "Edit..."
msgstr ""
-#: Merge.rc:1215
+#: Merge.rc:1217
#, c-format
msgid "Delete..."
msgstr ""
-#: Merge.rc:1221
+#: Merge.rc:1223
#, c-format
msgid "Save modified files?"
msgstr ""
-#: Merge.rc:1224
+#: Merge.rc:1226
#, c-format
msgid "Left side file"
msgstr ""
-#: Merge.rc:1227
+#: Merge.rc:1229
#, c-format
msgid "&Save changes"
msgstr ""
-#: Merge.rc:1229
+#: Merge.rc:1231
#, c-format
msgid "&Discard changes"
msgstr ""
-#: Merge.rc:1231
+#: Merge.rc:1233
#, c-format
msgid "Right side file"
msgstr ""
-#: Merge.rc:1234
+#: Merge.rc:1236
#, c-format
msgid "S&ave changes"
msgstr ""
-#: Merge.rc:1236
+#: Merge.rc:1238
#, c-format
msgid "Dis&card changes"
msgstr ""
-#: Merge.rc:1238
+#: Merge.rc:1240
#, c-format
msgid "Discard All"
msgstr ""
-#: Merge.rc:1245
-#: Merge.rc:1493
-#: Merge.rc:1897
+#: Merge.rc:1247
+#: Merge.rc:1495
+#: Merge.rc:1899
#, c-format
msgid "Codepage"
msgstr ""
-#: Merge.rc:1248
+#: Merge.rc:1250
#, c-format
msgid "Default Codepage"
msgstr ""
-#: Merge.rc:1249
+#: Merge.rc:1251
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr ""
-#: Merge.rc:1251
+#: Merge.rc:1253
#, c-format
msgid ""
"Detect codepage info for these files : .html, .rc, .xml \n"
"need to restart session"
msgstr ""
-#: Merge.rc:1254
+#: Merge.rc:1256
#, c-format
msgid "System codepage"
msgstr ""
-#: Merge.rc:1256
+#: Merge.rc:1258
#, c-format
msgid "According to WinMerge User Interface"
msgstr ""
-#: Merge.rc:1258
+#: Merge.rc:1260
#, c-format
msgid "Custom codepage :"
msgstr ""
-#: Merge.rc:1266
+#: Merge.rc:1268
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr ""
-#: Merge.rc:1269
+#: Merge.rc:1271
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr ""
-#: Merge.rc:1272
+#: Merge.rc:1274
#, c-format
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
"essential components to be copied to the program directory for standalone operation."
msgstr ""
-#: Merge.rc:1274
+#: Merge.rc:1276
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr ""
-#: Merge.rc:1276
+#: Merge.rc:1278
#, c-format
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
"versions become available."
msgstr ""
-#: Merge.rc:1278
+#: Merge.rc:1280
#, c-format
msgid "Version"
msgstr ""
-#: Merge.rc:1280
+#: Merge.rc:1282
#, c-format
msgid ""
"Plugin required\n"
"(dllbuild %04u)"
msgstr ""
-#: Merge.rc:1282
+#: Merge.rc:1284
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr ""
-#: Merge.rc:1285
-#: Merge.rc:1288
+#: Merge.rc:1287
+#: Merge.rc:1290
#, c-format
msgid "present"
msgstr ""
-#: Merge.rc:1286
+#: Merge.rc:1288
#, c-format
msgid "Merge7z000U.dll"
msgstr ""
-#: Merge.rc:1289
+#: Merge.rc:1291
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr ""
-#: Merge.rc:1291
-#: Merge.rc:1296
+#: Merge.rc:1293
+#: Merge.rc:1298
#, c-format
msgid "none"
msgstr ""
-#: Merge.rc:1293
+#: Merge.rc:1295
#, c-format
msgid "missing"
msgstr ""
-#: Merge.rc:1294
+#: Merge.rc:1296
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr ""
-#: Merge.rc:1298
+#: Merge.rc:1300
#, c-format
msgid "outdated"
msgstr ""
-#: Merge.rc:1299
+#: Merge.rc:1301
#, c-format
msgid "Plugins on path:"
msgstr ""
-#: Merge.rc:1300
+#: Merge.rc:1302
#, c-format
msgid ""
"Don't display this &message again.\n"
"(You can always recall this message from help menu.)"
msgstr ""
-#: Merge.rc:1304
+#: Merge.rc:1306
#, c-format
msgid "Plugin Download"
msgstr ""
-#: Merge.rc:1313
+#: Merge.rc:1315
#, c-format
msgid "Options"
msgstr ""
-#: Merge.rc:1324
+#: Merge.rc:1326
#, c-format
msgid " Categories"
msgstr ""
-#: Merge.rc:1326
+#: Merge.rc:1328
#, c-format
msgid "Import..."
msgstr ""
-#: Merge.rc:1327
+#: Merge.rc:1329
#, c-format
msgid "Export..."
msgstr ""
-#: Merge.rc:1335
+#: Merge.rc:1337
#, c-format
msgid "Keywords:"
msgstr ""
-#: Merge.rc:1336
+#: Merge.rc:1338
#, c-format
msgid "Function names:"
msgstr ""
-#: Merge.rc:1337
+#: Merge.rc:1339
#, c-format
msgid "Comments:"
msgstr ""
-#: Merge.rc:1338
+#: Merge.rc:1340
#, c-format
msgid "Numbers:"
msgstr ""
-#: Merge.rc:1339
+#: Merge.rc:1341
#, c-format
msgid "Operators:"
msgstr ""
-#: Merge.rc:1340
+#: Merge.rc:1342
#, c-format
msgid "Strings:"
msgstr ""
-#: Merge.rc:1341
+#: Merge.rc:1343
#, c-format
msgid "Preprocessor:"
msgstr ""
-#: Merge.rc:1342
+#: Merge.rc:1344
#, c-format
msgid "User 1:"
msgstr ""
-#: Merge.rc:1343
+#: Merge.rc:1345
#, c-format
msgid "User 2:"
msgstr ""
-#: Merge.rc:1348
-#: Merge.rc:1353
-#: Merge.rc:1358
-#: Merge.rc:1363
-#: Merge.rc:1368
-#: Merge.rc:1373
-#: Merge.rc:1378
-#: Merge.rc:1383
-#: Merge.rc:1388
+#: Merge.rc:1350
+#: Merge.rc:1355
+#: Merge.rc:1360
+#: Merge.rc:1365
+#: Merge.rc:1370
+#: Merge.rc:1375
+#: Merge.rc:1380
+#: Merge.rc:1385
+#: Merge.rc:1390
#, c-format
msgid "Bold"
msgstr ""
-#: Merge.rc:1396
+#: Merge.rc:1398
#, c-format
msgid "Folder Compare Report"
msgstr "Directory Compare Report"
-#: Merge.rc:1399
+#: Merge.rc:1401
#, c-format
msgid "Report &File:"
msgstr ""
-#: Merge.rc:1403
+#: Merge.rc:1405
#, c-format
msgid "&Style:"
msgstr ""
-#: Merge.rc:1406
+#: Merge.rc:1408
#, c-format
msgid "&Copy to Clipboard"
msgstr ""
-#: Merge.rc:1414
+#: Merge.rc:1416
#, c-format
msgid "Shared or Private Filter"
msgstr ""
-#: Merge.rc:1417
+#: Merge.rc:1419
#, c-format
msgid "Which type of filter do you want to create?"
msgstr ""
-#: Merge.rc:1419
+#: Merge.rc:1421
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr ""
-#: Merge.rc:1421
+#: Merge.rc:1423
#, c-format
msgid "Private Filter (only for current user)"
msgstr ""
-#: Merge.rc:1429
-#: Merge.rc:1898
+#: Merge.rc:1431
+#: Merge.rc:1900
#, c-format
msgid "Archive Support"
msgstr ""
-#: Merge.rc:1432
+#: Merge.rc:1434
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr ""
-#: Merge.rc:1434
+#: Merge.rc:1436
#, c-format
msgid "Download 7-zip Plugin"
msgstr ""
-#: Merge.rc:1435
+#: Merge.rc:1437
#, c-format
msgid "&Enable archive file support"
msgstr ""
-#: Merge.rc:1437
+#: Merge.rc:1439
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr ""
-#: Merge.rc:1440
+#: Merge.rc:1442
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr ""
-#: Merge.rc:1442
+#: Merge.rc:1444
#, c-format
msgid "&Detect archive type from file signature"
msgstr ""
-#: Merge.rc:1450
+#: Merge.rc:1452
#, c-format
msgid "Compare Statistics"
msgstr ""
-#: Merge.rc:1453
+#: Merge.rc:1455
#, c-format
msgid "Folders:"
msgstr ""
-#: Merge.rc:1454
+#: Merge.rc:1456
#, c-format
msgid "Files:"
msgstr ""
-#: Merge.rc:1455
-#: Merge.rc:2262
+#: Merge.rc:1457
+#: Merge.rc:2264
#, c-format
msgid "Different"
msgstr ""
-#: Merge.rc:1456
+#: Merge.rc:1458
#, c-format
msgid "Text:"
msgstr ""
-#: Merge.rc:1459
-#: Merge.rc:1478
+#: Merge.rc:1461
+#: Merge.rc:1480
#, c-format
msgid "Binary:"
msgstr ""
-#: Merge.rc:1462
+#: Merge.rc:1464
#, c-format
msgid "Unique"
msgstr ""
-#: Merge.rc:1463
+#: Merge.rc:1465
#, c-format
msgid "Left:"
msgstr ""
-#: Merge.rc:1468
+#: Merge.rc:1470
#, c-format
msgid "Right:"
msgstr ""
-#: Merge.rc:1473
-#: Merge.rc:2257
+#: Merge.rc:1475
+#: Merge.rc:2259
#, c-format
msgid "Identical"
msgstr "Id\xEAnticos"
-#: Merge.rc:1482
+#: Merge.rc:1484
#, c-format
msgid "Total:"
msgstr ""
-#: Merge.rc:1487
+#: Merge.rc:1489
#, c-format
msgid "Close"
msgstr ""
-#: Merge.rc:1496
+#: Merge.rc:1498
#, c-format
msgid "Affects"
msgstr ""
-#: Merge.rc:1499
-#: Merge.rc:1502
+#: Merge.rc:1501
+#: Merge.rc:1504
#, c-format
msgid "(Affects)"
msgstr ""
-#: Merge.rc:1503
+#: Merge.rc:1505
#, c-format
msgid "Select Codepage for"
msgstr ""
-#: Merge.rc:1504
+#: Merge.rc:1506
#, c-format
msgid "&File Loading:"
msgstr ""
-#: Merge.rc:1506
-#: Merge.rc:1509
+#: Merge.rc:1508
+#: Merge.rc:1511
#, c-format
msgid "..."
msgstr ""
-#: Merge.rc:1507
+#: Merge.rc:1509
#, c-format
msgid "File &Saving:"
msgstr ""
-#: Merge.rc:1510
+#: Merge.rc:1512
#, c-format
msgid "&Use same codepage for both"
msgstr ""
-#: Merge.rc:1513
+#: Merge.rc:1515
#, c-format
msgid "&Apply"
msgstr ""
-#: Merge.rc:1514
-#: Merge.rc:1864
+#: Merge.rc:1516
+#: Merge.rc:1866
#, c-format
msgid "&Cancel"
msgstr ""
-#: Merge.rc:1519
+#: Merge.rc:1521
#, c-format
msgid "Test Filter"
msgstr ""
-#: Merge.rc:1522
+#: Merge.rc:1524
#, c-format
msgid "Testing filter ..."
msgstr ""
-#: Merge.rc:1524
+#: Merge.rc:1526
#, c-format
msgid "&Enter text to test:"
msgstr ""
-#: Merge.rc:1526
+#: Merge.rc:1528
#, c-format
msgid "&Folder Name"
msgstr ""
-#: Merge.rc:1528
+#: Merge.rc:1530
#, c-format
msgid "Result:"
msgstr ""
-#: Merge.rc:1532
+#: Merge.rc:1534
#, c-format
msgid "&Test"
msgstr ""
-#: Merge.rc:1533
+#: Merge.rc:1535
#, c-format
msgid "&Close"
msgstr ""
-#: Merge.rc:1541
+#: Merge.rc:1543
#, c-format
msgid "&Use customized text colors"
msgstr ""
-#: Merge.rc:1544
+#: Merge.rc:1546
#, c-format
msgid "Custom text colors"
msgstr ""
-#: Merge.rc:1546
+#: Merge.rc:1548
#, c-format
msgid "Whitespace:"
msgstr ""
-#: Merge.rc:1547
+#: Merge.rc:1549
#, c-format
msgid "Regular text:"
msgstr ""
-#: Merge.rc:1548
+#: Merge.rc:1550
#, c-format
msgid "Selection:"
msgstr ""
-#: Merge.rc:1571
+#: Merge.rc:1573
#, c-format
msgid "Paths"
msgstr ""
-#: Merge.rc:1577
+#: Merge.rc:1579
#, c-format
msgid "R&ead-only"
msgstr ""
-#: Merge.rc:1581
+#: Merge.rc:1583
#, c-format
msgid "Re&ad-only"
msgstr ""
-#: Merge.rc:1587
+#: Merge.rc:1589
#, c-format
msgid "Open..."
msgstr ""
-#: Merge.rc:1588
+#: Merge.rc:1590
#, c-format
msgid "Save..."
msgstr ""
-#: Merge.rc:1593
-#: Merge.rc:1899
+#: Merge.rc:1595
+#: Merge.rc:1901
#, c-format
msgid "Backup Files"
msgstr ""
-#: Merge.rc:1596
+#: Merge.rc:1598
#, c-format
msgid "Create backup files in:"
msgstr ""
-#: Merge.rc:1601
+#: Merge.rc:1603
#, c-format
msgid "Create backup files into:"
msgstr ""
-#: Merge.rc:1602
+#: Merge.rc:1604
#, c-format
msgid "&Original file's folder"
msgstr ""
-#: Merge.rc:1604
+#: Merge.rc:1606
#, c-format
msgid "&Global backup folder:"
msgstr ""
-#: Merge.rc:1608
+#: Merge.rc:1610
#, c-format
msgid "Backup filename:"
msgstr ""
-#: Merge.rc:1609
+#: Merge.rc:1611
#, c-format
msgid "&Append .bak -extension"
msgstr ""
-#: Merge.rc:1611
+#: Merge.rc:1613
#, c-format
msgid "A&ppend timestamp"
msgstr ""
-#: Merge.rc:1618
+#: Merge.rc:1620
#, c-format
msgid "Confirm Copy"
msgstr ""
-#: Merge.rc:1622
+#: Merge.rc:1624
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr ""
-#: Merge.rc:1624
+#: Merge.rc:1626
#, c-format
msgid "From left"
msgstr ""
-#: Merge.rc:1627
+#: Merge.rc:1629
#, c-format
msgid "To right"
msgstr ""
-#: Merge.rc:1630
+#: Merge.rc:1632
#, c-format
msgid "Yes"
msgstr ""
-#: Merge.rc:1631
+#: Merge.rc:1633
#, c-format
msgid "No"
msgstr ""
#. StringFileInfo.Block
-#: Merge.rc:1656
+#: Merge.rc:1658
#, c-format
msgid "040904e4"
msgstr "041604e4"
#. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file!
-#: Merge.rc:1658
+#: Merge.rc:1660
#, c-format
msgid "English translation by developers"
msgstr "Translated by Wender Cris de Souza Firmino & Noreuzis"
#. VarFileInfo.Translation
-#: Merge.rc:1671
+#: Merge.rc:1673
#, c-format
msgid "0x409, 1252"
msgstr "0x416, 1252"
-#: Merge.rc:1686
+#: Merge.rc:1688
#, c-format
msgid "Ready"
msgstr "Pronto"
-#: Merge.rc:1692
+#: Merge.rc:1694
#, c-format
msgid "EXT"
msgstr ""
-#: Merge.rc:1693
+#: Merge.rc:1695
#, c-format
msgid "CAP"
msgstr ""
-#: Merge.rc:1694
+#: Merge.rc:1696
#, c-format
msgid "NUM"
msgstr ""
-#: Merge.rc:1695
+#: Merge.rc:1697
#, c-format
msgid "SCRL"
msgstr ""
-#: Merge.rc:1696
+#: Merge.rc:1698
#, c-format
msgid "OVR"
msgstr ""
-#: Merge.rc:1697
+#: Merge.rc:1699
#, c-format
msgid "REC"
msgstr ""
-#: Merge.rc:1703
+#: Merge.rc:1705
#, c-format
msgid ""
"Create empty documents\n"
"New Documents (Ctrl+N)"
msgstr ""
-#: Merge.rc:1704
+#: Merge.rc:1706
#, c-format
msgid ""
"Open an existing document\n"
@@ -2598,7 +2603,7 @@
"Abrir um documento existente\n"
"Abrir"
-#: Merge.rc:1705
+#: Merge.rc:1707
#, c-format
msgid ""
"Close the active document\n"
@@ -2607,7 +2612,7 @@
"Fechar o documento ativo\n"
"Fechar"
-#: Merge.rc:1706
+#: Merge.rc:1708
#, c-format
msgid ""
"Save the active document\n"
@@ -2616,7 +2621,7 @@
"Salvar o documento ativo\n"
"Salvar"
-#: Merge.rc:1707
+#: Merge.rc:1709
#, c-format
msgid ""
"Save the active document with a new name\n"
@@ -2625,7 +2630,7 @@
"Salvar o documento ativo com um novo nome\n"
"Salvar Como"
-#: Merge.rc:1708
+#: Merge.rc:1710
#, c-format
msgid ""
"Change the printing options\n"
@@ -2634,7 +2639,7 @@
"Alterar as configura\xE7\xF5es de impress\xE3o\n"
"Configurar P\xE1gina"
-#: Merge.rc:1709
+#: Merge.rc:1711
#, c-format
msgid ""
"Change the printer and printing options\n"
@@ -2643,7 +2648,7 @@
"Alterar a impressora e as configura\xE7\xF5es de impress\xE3o\n"
"Configurar impressora"
-#: Merge.rc:1710
+#: Merge.rc:1712
#, c-format
msgid ""
"Print the active document\n"
@@ -2652,7 +2657,7 @@
"Imprimir o documento ativo\n"
"Imprimir"
-#: Merge.rc:1711
+#: Merge.rc:1713
#, c-format
msgid ""
"Display full pages\n"
@@ -2661,51 +2666,51 @@
"Visualizar impress\xE3o\n"
"Visualizar Impress\xE3o"
-#: Merge.rc:1716
+#: Merge.rc:1718
#, c-format
msgid "Make all hidden items visible again"
msgstr ""
-#: Merge.rc:1722
+#: Merge.rc:1724
#, c-format
msgid ""
"Open project file\n"
"Project file (Ctrl+J)"
msgstr ""
-#: Merge.rc:1723
+#: Merge.rc:1725
#, c-format
msgid "Unknown error attempting to open project file"
msgstr ""
-#: Merge.rc:1724
+#: Merge.rc:1726
#, c-format
msgid "Unknown error attempting to save project file"
msgstr ""
-#: Merge.rc:1725
+#: Merge.rc:1727
#, c-format
msgid "Project File"
msgstr ""
-#: Merge.rc:1726
+#: Merge.rc:1728
#, c-format
msgid "Project file successfully loaded."
msgstr ""
-#: Merge.rc:1727
+#: Merge.rc:1729
#, c-format
msgid "Project file successfully saved."
msgstr ""
-#: Merge.rc:1728
+#: Merge.rc:1730
#, c-format
msgid ""
"Save current paths and options to project file\n"
"Save Project File"
msgstr ""
-#: Merge.rc:1733
+#: Merge.rc:1735
#, c-format
msgid ""
"Display program information, version number and copyright\n"
@@ -2714,7 +2719,7 @@
"Exibe informa\xE7\xF5es do programa, n\xFAmero da Vers\xE3o e Copyright\n"
"Sobre"
-#: Merge.rc:1734
+#: Merge.rc:1736
#, c-format
msgid ""
"Quit the application; prompts to save documents\n"
@@ -2723,8 +2728,6 @@
"Sair do programa; pede para salvar documentos\n"
"Sair"
-#: Merge.rc:1740
-#: Merge.rc:1741
#: Merge.rc:1742
#: Merge.rc:1743
#: Merge.rc:1744
@@ -2739,11 +2742,13 @@
#: Merge.rc:1753
#: Merge.rc:1754
#: Merge.rc:1755
+#: Merge.rc:1756
+#: Merge.rc:1757
#, c-format
msgid "Open this document"
msgstr "Abrir este documento"
-#: Merge.rc:1760
+#: Merge.rc:1762
#, c-format
msgid ""
"Switch to the next window pane\n"
@@ -2752,7 +2757,7 @@
"Ativa o pr\xF3ximo painel\n"
"Pr\xF3ximo Painel"
-#: Merge.rc:1761
+#: Merge.rc:1763
#, c-format
msgid ""
"Switch back to the previous window pane\n"
@@ -2761,7 +2766,7 @@
"Ativa o painel anterior\n"
"Painel anterior"
-#: Merge.rc:1767
+#: Merge.rc:1769
#, c-format
msgid ""
"Open another window for the active document\n"
@@ -2770,7 +2775,7 @@
"Abre outra janela para o documento ativo\n"
"Nova Janela"
-#: Merge.rc:1768
+#: Merge.rc:1770
#, c-format
msgid ""
"Arrange icons at the bottom of the window\n"
@@ -2779,7 +2784,7 @@
"Organiza os \xEDcones no fundo da janela\n"
"Organiza os \xEDcones"
-#: Merge.rc:1769
+#: Merge.rc:1771
#, c-format
msgid ""
"Arrange windows so they overlap\n"
@@ -2788,7 +2793,7 @@
"Organiza as janelas de modo que elas se sobreponham\n"
"Organiza em Cascata"
-#: Merge.rc:1770
+#: Merge.rc:1772
#, fuzzy, c-format
msgid ""
"Arrange windows as non-overlapping tiles horizontally\n"
@@ -2797,7 +2802,7 @@
"Organiza as janelas de modo que elas n\xE3o se sobreponham\n"
"Organiza Horizontalmente"
-#: Merge.rc:1771
+#: Merge.rc:1773
#, fuzzy, c-format
msgid ""
"Arrange windows as non-overlapping tiles vertically\n"
@@ -2806,7 +2811,7 @@
"Organiza as janelas de modo que elas n\xE3o se sobreponham\n"
"Organiza Verticalmente"
-#: Merge.rc:1772
+#: Merge.rc:1774
#, c-format
msgid ""
"Split the active window into panes\n"
@@ -2815,7 +2820,7 @@
"Divide a janela ativa em pain\xE9is\n"
"Divide"
-#: Merge.rc:1778
+#: Merge.rc:1780
#, c-format
msgid ""
"Erase the selection\n"
@@ -2824,7 +2829,7 @@
"Apaga o texto selecionado\n"
"Apaga"
-#: Merge.rc:1779
+#: Merge.rc:1781
#, c-format
msgid ""
"Erase everything\n"
@@ -2833,7 +2838,7 @@
"Apaga tudo\n"
"Apaga tudo"
-#: Merge.rc:1780
+#: Merge.rc:1782
#, c-format
msgid ""
"Copy the selection and put it on the Clipboard\n"
@@ -2842,7 +2847,7 @@
"Copia o texto selecionado e p\xF5e na \xE1rea de Transfer\xEAncia\n"
"Copia"
-#: Merge.rc:1781
+#: Merge.rc:1783
#, c-format
msgid ""
"Cut the selection and put it on the Clipboard\n"
@@ -2851,7 +2856,7 @@
"Recorta a sele\xE7\xE3o e p\xF5e na \xE1rea de Transfer\xEAncia\n"
"Recorta"
-#: Merge.rc:1782
+#: Merge.rc:1784
#, c-format
msgid ""
"Find the specified text\n"
@@ -2860,7 +2865,7 @@
"Procura o texto especificado\n"
"Procura"
-#: Merge.rc:1783
+#: Merge.rc:1785
#, c-format
msgid ""
"Insert Clipboard contents\n"
@@ -2869,7 +2874,7 @@
"Insere conte\xFAdo da \xE1rea de Transfer\xEAncia\n"
"Cola"
-#: Merge.rc:1784
+#: Merge.rc:1786
#, c-format
msgid ""
"Repeat the last action\n"
@@ -2878,7 +2883,7 @@
"Repete a \xFAltima a\xE7\xE3o\n"
"Repetir"
-#: Merge.rc:1785
+#: Merge.rc:1787
#, c-format
msgid ""
"Replace specific text with different text\n"
@@ -2887,7 +2892,7 @@
"Substitui o texto especificado por outro\n"
"Substitui"
-#: Merge.rc:1786
+#: Merge.rc:1788
#, c-format
msgid ""
"Select the entire document\n"
@@ -2896,7 +2901,7 @@
"Seleciona o documento inteiro\n"
"Seleciona Tudo"
-#: Merge.rc:1787
+#: Merge.rc:1789
#, c-format
msgid ""
"Undo the last action\n"
@@ -2905,7 +2910,7 @@
"Desfaz a \xFAltima a\xE7\xE3o\n"
"Desfaz"
-#: Merge.rc:1788
+#: Merge.rc:1790
#, c-format
msgid ""
"Redo the previously undone action\n"
@@ -2914,7 +2919,7 @@
"Refaz a \xFAltima a\xE7\xE3o desfeita\n"
"Refaz"
-#: Merge.rc:1794
+#: Merge.rc:1796
#, c-format
msgid ""
"Show or hide the toolbar\n"
@@ -2923,7 +2928,7 @@
"Exibe ou esconde a barra de ferramentas\n"
"Chavea Barra de Ferramentas"
-#: Merge.rc:1795
+#: Merge.rc:1797
#, c-format
msgid ""
"Show or hide the status bar\n"
@@ -2932,69 +2937,69 @@
"Exibe ou esconde a barra de status\n"
"Chavea Barra de Status"
-#: Merge.rc:1796
+#: Merge.rc:1798
#, c-format
msgid ""
"Show or hide the tab bar\n"
"Toggle TabBar"
msgstr ""
-#: Merge.rc:1797
+#: Merge.rc:1799
#, c-format
msgid "Automatically resize panes\nLock Panes"
msgstr ""
-#: Merge.rc:1803
+#: Merge.rc:1805
#, c-format
msgid "Change the window size"
msgstr "Altera o tamanho da janela"
-#: Merge.rc:1804
+#: Merge.rc:1806
#, c-format
msgid "Change the window position"
msgstr "Altera a posi\xE7\xE3o da janela"
-#: Merge.rc:1805
+#: Merge.rc:1807
#, c-format
msgid "Reduce the window to an icon"
msgstr "Reduz a janela a um \xEDcone"
-#: Merge.rc:1806
+#: Merge.rc:1808
#, c-format
msgid "Enlarge the window to full size"
msgstr "Aumenta o tamnho da janela ao m\xE1ximo"
-#: Merge.rc:1807
+#: Merge.rc:1809
#, c-format
msgid "Switch to the next document window"
msgstr "Ativa a pr\xF3xima janela"
-#: Merge.rc:1808
+#: Merge.rc:1810
#, c-format
msgid "Switch to the previous document window"
msgstr "Ativa a janela anterior"
-#: Merge.rc:1809
+#: Merge.rc:1811
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr "Fecha a janela ativa e pede para salvar os documentos"
-#: Merge.rc:1814
+#: Merge.rc:1816
#, c-format
msgid "Restore the window to normal size"
msgstr "Restaurar o tamanho normal da janela"
-#: Merge.rc:1815
+#: Merge.rc:1817
#, c-format
msgid "Activate Task List"
msgstr "Ativar Lista de Tarefas"
-#: Merge.rc:1816
+#: Merge.rc:1818
#, c-format
msgid "Activate this window"
msgstr "Ativar esta janela"
-#: Merge.rc:1822
+#: Merge.rc:1824
#, c-format
msgid ""
"Close print preview mode\n"
@@ -3003,7 +3008,7 @@
"Fechar a visualiza\xE7\xE3o de impress\xE3o\n"
"Cancelar Preview"
-#: Merge.rc:1829
+#: Merge.rc:1831
#, c-format
msgid ""
"\n"
@@ -3015,175 +3020,175 @@
"WinMerge Document"
msgstr ""
-#: Merge.rc:1836
+#: Merge.rc:1838
#, c-format
msgid "Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1843
+#: Merge.rc:1845
#, c-format
msgid "Press any key"
msgstr ""
-#: Merge.rc:1849
-#: Merge.rc:1850
+#: Merge.rc:1851
+#: Merge.rc:1852
#, c-format
msgid "Right click on the path to copy"
msgstr ""
-#: Merge.rc:1856
+#: Merge.rc:1858
#, c-format
msgid ""
"Developers:\n"
"Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"
msgstr ""
-#: Merge.rc:1857
+#: Merge.rc:1859
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU Public License in the Help menu for details."
msgstr ""
-#: Merge.rc:1863
+#: Merge.rc:1865
#, c-format
msgid "&Ok"
msgstr ""
-#: Merge.rc:1865
+#: Merge.rc:1867
#, c-format
msgid "&Abort"
msgstr ""
-#: Merge.rc:1866
+#: Merge.rc:1868
#, c-format
msgid "&Retry"
msgstr ""
-#: Merge.rc:1867
+#: Merge.rc:1869
#, c-format
msgid "&Ignore"
msgstr ""
-#: Merge.rc:1868
+#: Merge.rc:1870
#, c-format
msgid "Ignore &all"
msgstr ""
-#: Merge.rc:1869
+#: Merge.rc:1871
#, c-format
msgid "&Yes"
msgstr ""
-#: Merge.rc:1875
+#: Merge.rc:1877
#, c-format
msgid "Yes to &all"
msgstr ""
-#: Merge.rc:1876
+#: Merge.rc:1878
#, c-format
msgid "&No"
msgstr ""
-#: Merge.rc:1877
+#: Merge.rc:1879
#, c-format
msgid "No to a&ll"
msgstr ""
-#: Merge.rc:1878
+#: Merge.rc:1880
#, c-format
msgid "&Continue"
msgstr ""
-#: Merge.rc:1879
+#: Merge.rc:1881
#, c-format
msgid "&Skip"
msgstr ""
-#: Merge.rc:1880
+#: Merge.rc:1882
#, c-format
msgid "Skip &all"
msgstr ""
-#: Merge.rc:1882
+#: Merge.rc:1884
#, c-format
msgid "Don't display this &message again."
msgstr ""
-#: Merge.rc:1883
+#: Merge.rc:1885
#, c-format
msgid "Don't ask this &question again."
msgstr ""
-#: Merge.rc:1893
+#: Merge.rc:1895
#, c-format
msgid "Syntax colors"
msgstr ""
-#: Merge.rc:1894
+#: Merge.rc:1896
#, c-format
msgid "Text Colors"
msgstr ""
-#: Merge.rc:1896
+#: Merge.rc:1898
#, c-format
msgid "Version Control"
msgstr ""
-#: Merge.rc:1906
+#: Merge.rc:1908
#, c-format
msgid "To:"
msgstr ""
-#: Merge.rc:1907
+#: Merge.rc:1909
#, c-format
msgid "From left:"
msgstr ""
-#: Merge.rc:1908
+#: Merge.rc:1910
#, c-format
msgid "To left:"
msgstr ""
-#: Merge.rc:1909
+#: Merge.rc:1911
#, c-format
msgid "From right:"
msgstr ""
-#: Merge.rc:1910
+#: Merge.rc:1912
#, c-format
msgid "To right:"
msgstr ""
-#: Merge.rc:1916
+#: Merge.rc:1918
#, c-format
msgid "Version %1"
msgstr "Vers\xE3o %1 - Portugu\xE8s"
-#: Merge.rc:1917
+#: Merge.rc:1919
#, c-format
msgid "Unicode"
msgstr ""
-#: Merge.rc:1923
+#: Merge.rc:1925
#, c-format
msgid "Options (%1)"
msgstr "Op\xE7\xF5es (%1)"
-#: Merge.rc:1924
+#: Merge.rc:1926
#, c-format
msgid "All message boxes are now displayed again."
msgstr ""
-#: Merge.rc:1925
+#: Merge.rc:1927
#, c-format
msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
msgstr "Altera\xE7\xF5es foram feitas no arquivo corrente nesta sess\xE3o de compara\xE7\xE3o. Alguns ajustes podem n\xE3o acontecer at\xE9 que a compara\xE7\xE3o ao atual arquivo seja reiniciada."
-#: Merge.rc:1926
+#: Merge.rc:1928
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr "A altera\xE7\xE3o da fonte n\xE3o ser\xE1 aplicada a nenhuma das janelas que j\xE1 estejam abertas."
-#: Merge.rc:1928
+#: Merge.rc:1930
#, c-format
msgid ""
"Value in Tab size -field is not in range WinMerge accepts.\n"
@@ -3191,7 +3196,7 @@
"Please use values 1 - %1."
msgstr ""
-#: Merge.rc:1930
+#: Merge.rc:1932
#, c-format
msgid ""
"Are you sure you want to reset all WinMerge options to default values?\n"
@@ -3199,107 +3204,107 @@
"Please re-start WinMerge after the reset."
msgstr ""
-#: Merge.rc:1936
+#: Merge.rc:1938
#, c-format
msgid "Open"
msgstr "Abrir"
-#: Merge.rc:1937
+#: Merge.rc:1939
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1938
+#: Merge.rc:1940
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Todos Arquivos (*.*)|*.*||"
-#: Merge.rc:1939
+#: Merge.rc:1941
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr ""
-#: Merge.rc:1941
+#: Merge.rc:1943
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1947
+#: Merge.rc:1949
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1948
+#: Merge.rc:1950
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1949
+#: Merge.rc:1951
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1955
+#: Merge.rc:1957
#, c-format
msgid "Full Contents"
msgstr ""
-#: Merge.rc:1956
+#: Merge.rc:1958
#, c-format
msgid "Quick Contents"
msgstr ""
-#: Merge.rc:1957
+#: Merge.rc:1959
#, c-format
msgid "Modified Date"
msgstr ""
-#: Merge.rc:1958
+#: Merge.rc:1960
#, c-format
msgid "Modified Date and Size"
msgstr ""
-#: Merge.rc:1959
+#: Merge.rc:1961
#, c-format
msgid "Size"
msgstr ""
-#: Merge.rc:1965
+#: Merge.rc:1967
#, c-format
msgid "Name"
msgstr ""
-#: Merge.rc:1966
+#: Merge.rc:1968
#, c-format
msgid "Location"
msgstr ""
-#: Merge.rc:1967
+#: Merge.rc:1969
#, c-format
msgid "Filters"
msgstr ""
-#: Merge.rc:1968
+#: Merge.rc:1970
#, c-format
msgid "[F] "
msgstr ""
-#: Merge.rc:1969
+#: Merge.rc:1971
#, c-format
msgid "Description"
msgstr ""
-#: Merge.rc:1970
+#: Merge.rc:1972
#, c-format
msgid "Select filename for new filter"
msgstr ""
-#: Merge.rc:1971
+#: Merge.rc:1973
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1973
+#: Merge.rc:1975
#, c-format
msgid...
[truncated message content] |
|
From: <sdo...@us...> - 2008-01-14 19:48:19
|
Revision: 4913
http://winmerge.svn.sourceforge.net/winmerge/?rev=4913&view=rev
Author: sdottaka
Date: 2008-01-14 11:48:16 -0800 (Mon, 14 Jan 2008)
Log Message:
-----------
PATCH: [ 1871079 ] File Encoding dialog for MergeDoc
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/English.pot
trunk/Src/Merge.rc
trunk/Src/MergeDoc.cpp
trunk/Src/MergeDocEncoding.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-01-14 19:24:56 UTC (rev 4912)
+++ trunk/Docs/Users/ChangeLog.txt 2008-01-14 19:48:16 UTC (rev 4913)
@@ -14,6 +14,7 @@
Manual: Clarify file filters folder name matching (#1867212)
Improve file compare margin icons location (#1718699)
Enable file compare to open binary files (#1869647)
+ File encoding dialog for file compare (#1871079)
BugFix: Crash when using TrackPoint middle-button scrolling (#1864040)
BugFix: WinMerge didn't show the contents of the symbolic link target (#1864978)
BugFix: Unused registry key HKCU\Thingamahoochie\WinMerge was created
Modified: trunk/Src/Languages/English.pot
===================================================================
--- trunk/Src/Languages/English.pot 2008-01-14 19:24:56 UTC (rev 4912)
+++ trunk/Src/Languages/English.pot 2008-01-14 19:48:16 UTC (rev 4913)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2008-01-12 12:24+0000\n"
+"POT-Creation-Date: 2008-01-14 23:13+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -68,7 +68,7 @@
#: Merge.rc:81
#: Merge.rc:103
-#: Merge.rc:492
+#: Merge.rc:494
#, c-format
msgid "&Copy"
msgstr ""
@@ -80,7 +80,7 @@
msgstr ""
#: Merge.rc:84
-#: Merge.rc:573
+#: Merge.rc:575
#, c-format
msgid "&Goto..."
msgstr ""
@@ -91,22 +91,22 @@
msgstr ""
#: Merge.rc:88
-#: Merge.rc:515
-#: Merge.rc:521
+#: Merge.rc:517
+#: Merge.rc:523
#, c-format
msgid "with &Registered Application"
msgstr ""
#: Merge.rc:89
-#: Merge.rc:516
-#: Merge.rc:522
+#: Merge.rc:518
+#: Merge.rc:524
#, c-format
msgid "with &External Editor"
msgstr ""
#: Merge.rc:90
-#: Merge.rc:517
-#: Merge.rc:523
+#: Merge.rc:519
+#: Merge.rc:525
#, c-format
msgid "&with..."
msgstr ""
@@ -151,281 +151,281 @@
#: Merge.rc:120
#: Merge.rc:202
-#: Merge.rc:340
+#: Merge.rc:342
#, c-format
msgid "E&xit"
msgstr ""
#: Merge.rc:122
#: Merge.rc:204
-#: Merge.rc:342
+#: Merge.rc:344
#, c-format
msgid "&Edit"
msgstr ""
#: Merge.rc:124
#: Merge.rc:208
-#: Merge.rc:376
+#: Merge.rc:378
#, c-format
msgid "&Options..."
msgstr ""
#: Merge.rc:126
#: Merge.rc:210
-#: Merge.rc:378
+#: Merge.rc:380
#, c-format
msgid "&View"
msgstr ""
#: Merge.rc:128
#: Merge.rc:221
-#: Merge.rc:380
+#: Merge.rc:382
#, c-format
msgid "Select &Font..."
msgstr ""
#: Merge.rc:129
#: Merge.rc:222
-#: Merge.rc:381
+#: Merge.rc:383
#, c-format
msgid "Use Default F&ont"
msgstr ""
#: Merge.rc:131
#: Merge.rc:224
-#: Merge.rc:398
+#: Merge.rc:400
#, c-format
msgid "&Toolbar"
msgstr ""
#: Merge.rc:133
#: Merge.rc:226
-#: Merge.rc:400
+#: Merge.rc:402
#, c-format
msgid "&None"
msgstr ""
#: Merge.rc:134
#: Merge.rc:227
-#: Merge.rc:401
+#: Merge.rc:403
#, c-format
msgid "&Small"
msgstr ""
#: Merge.rc:135
#: Merge.rc:228
-#: Merge.rc:402
+#: Merge.rc:404
#, c-format
msgid "&Big"
msgstr ""
#: Merge.rc:137
#: Merge.rc:230
-#: Merge.rc:404
+#: Merge.rc:406
#, c-format
msgid "&Status Bar"
msgstr ""
#: Merge.rc:138
#: Merge.rc:231
-#: Merge.rc:405
+#: Merge.rc:407
#, c-format
msgid "Ta&b Bar"
msgstr ""
#: Merge.rc:140
#: Merge.rc:234
-#: Merge.rc:409
+#: Merge.rc:411
#, c-format
msgid "&Language..."
msgstr ""
#: Merge.rc:142
#: Merge.rc:255
-#: Merge.rc:431
+#: Merge.rc:433
#, c-format
msgid "&Tools"
msgstr ""
#: Merge.rc:144
#: Merge.rc:258
-#: Merge.rc:433
+#: Merge.rc:435
#, c-format
msgid "&Filters..."
msgstr ""
#: Merge.rc:145
#: Merge.rc:259
-#: Merge.rc:434
+#: Merge.rc:436
#, c-format
msgid "&Generate Patch..."
msgstr ""
#: Merge.rc:147
#: Merge.rc:262
-#: Merge.rc:437
+#: Merge.rc:439
#, c-format
msgid "&Plugins"
msgstr ""
#: Merge.rc:149
#: Merge.rc:264
-#: Merge.rc:439
+#: Merge.rc:441
#, c-format
msgid "&Manual Unpacking"
msgstr ""
#: Merge.rc:150
#: Merge.rc:265
-#: Merge.rc:440
+#: Merge.rc:442
#, c-format
msgid "&Automatic Unpacking"
msgstr ""
#: Merge.rc:152
#: Merge.rc:267
-#: Merge.rc:442
+#: Merge.rc:444
#, c-format
msgid "&Edit with Unpacker"
msgstr ""
#: Merge.rc:154
#: Merge.rc:269
-#: Merge.rc:449
+#: Merge.rc:451
#, c-format
msgid "&Reload plugins"
msgstr ""
#: Merge.rc:156
#: Merge.rc:271
-#: Merge.rc:451
+#: Merge.rc:453
#, c-format
msgid "&Debug"
msgstr ""
#: Merge.rc:158
#: Merge.rc:273
-#: Merge.rc:453
+#: Merge.rc:455
#, c-format
msgid "&Load Config..."
msgstr ""
#: Merge.rc:159
#: Merge.rc:274
-#: Merge.rc:454
+#: Merge.rc:456
#, c-format
msgid "&Reset Options"
msgstr ""
#: Merge.rc:161
#: Merge.rc:276
-#: Merge.rc:456
+#: Merge.rc:458
#, c-format
msgid "&Window"
msgstr ""
#: Merge.rc:163
#: Merge.rc:278
-#: Merge.rc:458
+#: Merge.rc:460
#, c-format
msgid "Cl&ose"
msgstr ""
#: Merge.rc:164
#: Merge.rc:279
-#: Merge.rc:459
+#: Merge.rc:461
#, c-format
msgid "Clo&se All"
msgstr ""
#: Merge.rc:166
#: Merge.rc:281
-#: Merge.rc:461
+#: Merge.rc:463
#, c-format
msgid "Change &Pane\tF6"
msgstr ""
#: Merge.rc:168
#: Merge.rc:283
-#: Merge.rc:463
+#: Merge.rc:465
#, c-format
msgid "Tile &Horizontally"
msgstr ""
#: Merge.rc:169
#: Merge.rc:284
-#: Merge.rc:464
+#: Merge.rc:466
#, c-format
msgid "Tile &Vertically"
msgstr ""
#: Merge.rc:170
#: Merge.rc:285
-#: Merge.rc:465
+#: Merge.rc:467
#, c-format
msgid "&Cascade"
msgstr ""
#: Merge.rc:172
#: Merge.rc:287
-#: Merge.rc:467
-#: Merge.rc:1881
+#: Merge.rc:469
+#: Merge.rc:1883
#, c-format
msgid "&Help"
msgstr ""
#: Merge.rc:174
#: Merge.rc:289
-#: Merge.rc:469
+#: Merge.rc:471
#, c-format
msgid "&Contents...\tF1"
msgstr ""
#: Merge.rc:175
#: Merge.rc:290
-#: Merge.rc:470
+#: Merge.rc:472
#, c-format
msgid "&Index..."
msgstr ""
#: Merge.rc:176
#: Merge.rc:291
-#: Merge.rc:471
+#: Merge.rc:473
#, c-format
msgid "&Search..."
msgstr ""
#: Merge.rc:178
#: Merge.rc:293
-#: Merge.rc:473
+#: Merge.rc:475
#, c-format
msgid "R&elease Notes"
msgstr ""
#: Merge.rc:179
#: Merge.rc:294
-#: Merge.rc:474
+#: Merge.rc:476
#, c-format
msgid "C&onfiguration..."
msgstr ""
#: Merge.rc:180
#: Merge.rc:295
-#: Merge.rc:475
+#: Merge.rc:477
#, c-format
msgid "A&rchive Support disabled..."
msgstr ""
#: Merge.rc:182
#: Merge.rc:297
-#: Merge.rc:477
+#: Merge.rc:479
#, c-format
msgid "&GNU Public License..."
msgstr ""
#: Merge.rc:183
#: Merge.rc:298
-#: Merge.rc:478
+#: Merge.rc:480
#, c-format
msgid "&About WinMerge..."
msgstr ""
@@ -454,7 +454,7 @@
msgstr ""
#: Merge.rc:206
-#: Merge.rc:352
+#: Merge.rc:354
#, c-format
msgid "Select &All\tCtrl+A"
msgstr ""
@@ -500,7 +500,7 @@
msgstr ""
#: Merge.rc:236
-#: Merge.rc:411
+#: Merge.rc:413
#, c-format
msgid "Refre&sh\tF5"
msgstr ""
@@ -511,7 +511,7 @@
msgstr ""
#: Merge.rc:239
-#: Merge.rc:413
+#: Merge.rc:415
#, c-format
msgid "&Merge"
msgstr ""
@@ -522,43 +522,43 @@
msgstr ""
#: Merge.rc:243
-#: Merge.rc:415
+#: Merge.rc:417
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr ""
#: Merge.rc:244
-#: Merge.rc:416
+#: Merge.rc:418
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr ""
#: Merge.rc:246
-#: Merge.rc:418
+#: Merge.rc:420
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr ""
#: Merge.rc:247
-#: Merge.rc:419
+#: Merge.rc:421
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr ""
#: Merge.rc:248
-#: Merge.rc:420
+#: Merge.rc:422
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr ""
#: Merge.rc:250
-#: Merge.rc:422
+#: Merge.rc:424
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr ""
#: Merge.rc:251
-#: Merge.rc:423
+#: Merge.rc:425
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr ""
@@ -569,13 +569,13 @@
msgstr ""
#: Merge.rc:257
-#: Merge.rc:546
+#: Merge.rc:548
#, c-format
msgid "&Customize Columns..."
msgstr ""
#: Merge.rc:260
-#: Merge.rc:435
+#: Merge.rc:437
#, c-format
msgid "Generate &Report..."
msgstr ""
@@ -647,2025 +647,2028 @@
msgid "&Merge Mode\tF9"
msgstr ""
-#: Merge.rc:344
+#: Merge.rc:340
#, c-format
+msgid "&File Encoding..."
+msgstr ""
+
+#: Merge.rc:346
+#, c-format
msgid "&Undo\tCtrl+Z"
msgstr ""
-#: Merge.rc:345
+#: Merge.rc:347
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr ""
-#: Merge.rc:347
+#: Merge.rc:349
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr ""
-#: Merge.rc:348
+#: Merge.rc:350
#, c-format
msgid "&Copy\tCtrl+C"
msgstr ""
-#: Merge.rc:349
+#: Merge.rc:351
#, c-format
msgid "&Paste\tCtrl+V"
msgstr ""
-#: Merge.rc:351
+#: Merge.rc:353
#, c-format
msgid "Select Line &Difference\tF4"
msgstr ""
-#: Merge.rc:354
+#: Merge.rc:356
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr ""
-#: Merge.rc:355
+#: Merge.rc:357
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr ""
-#: Merge.rc:357
+#: Merge.rc:359
#, c-format
msgid "&Scripts"
msgstr ""
-#: Merge.rc:359
-#: Merge.rc:2863
+#: Merge.rc:361
+#: Merge.rc:2865
#, c-format
msgid "< Empty >"
msgstr ""
-#: Merge.rc:362
+#: Merge.rc:364
#, c-format
msgid "Advanced"
msgstr ""
-#: Merge.rc:364
+#: Merge.rc:366
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr ""
-#: Merge.rc:367
+#: Merge.rc:369
#, c-format
msgid "&Bookmarks"
msgstr ""
-#: Merge.rc:369
+#: Merge.rc:371
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr ""
-#: Merge.rc:370
+#: Merge.rc:372
#, c-format
msgid "&Next Bookmark\tF2"
msgstr ""
-#: Merge.rc:371
+#: Merge.rc:373
#, c-format
msgid "&Previous bookmark\tShift+F2"
msgstr ""
-#: Merge.rc:372
+#: Merge.rc:374
#, c-format
msgid "&Clear All Bookmarks"
msgstr ""
-#: Merge.rc:374
+#: Merge.rc:376
#, c-format
msgid "&Go To...\tCtrl+G"
msgstr ""
-#: Merge.rc:382
+#: Merge.rc:384
#, c-format
msgid "Zoom In\tCtrl++"
msgstr ""
-#: Merge.rc:383
+#: Merge.rc:385
#, c-format
msgid "Zoom Out\tCtrl+-"
msgstr ""
-#: Merge.rc:384
+#: Merge.rc:386
#, c-format
msgid "Syntax Highlight"
msgstr ""
-#: Merge.rc:389
+#: Merge.rc:391
#, c-format
msgid "&Lock Panes"
msgstr ""
-#: Merge.rc:390
+#: Merge.rc:392
#, c-format
msgid "&View Whitespace"
msgstr ""
-#: Merge.rc:391
+#: Merge.rc:393
#, c-format
msgid "Vie&w Line Differences"
msgstr ""
-#: Merge.rc:392
+#: Merge.rc:394
#, c-format
msgid "View Line &Numbers"
msgstr ""
-#: Merge.rc:393
+#: Merge.rc:395
#, c-format
msgid "View &Margins"
msgstr ""
-#: Merge.rc:394
+#: Merge.rc:396
#, c-format
msgid "W&rap Lines"
msgstr ""
-#: Merge.rc:396
+#: Merge.rc:398
#, c-format
msgid "Sw&ap Panes"
msgstr ""
-#: Merge.rc:406
+#: Merge.rc:408
#, c-format
msgid "Diff &Pane"
msgstr ""
-#: Merge.rc:407
+#: Merge.rc:409
#, c-format
msgid "Lo&cation Pane"
msgstr ""
-#: Merge.rc:425
+#: Merge.rc:427
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
msgstr ""
-#: Merge.rc:426
+#: Merge.rc:428
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
msgstr ""
-#: Merge.rc:428
+#: Merge.rc:430
#, c-format
msgid "Copy &All to Right"
msgstr ""
-#: Merge.rc:429
+#: Merge.rc:431
#, c-format
msgid "Cop&y All to Left"
msgstr ""
-#: Merge.rc:444
+#: Merge.rc:446
#, c-format
msgid "&Prediffer"
msgstr ""
-#: Merge.rc:486
+#: Merge.rc:488
#, c-format
msgid "Comp&are"
msgstr ""
-#: Merge.rc:487
+#: Merge.rc:489
#, c-format
msgid "Co&mpare Special"
msgstr ""
-#: Merge.rc:489
+#: Merge.rc:491
#, c-format
msgid "&XML"
msgstr ""
-#: Merge.rc:494
+#: Merge.rc:496
#, c-format
msgid "&Left to Right"
msgstr ""
-#: Merge.rc:495
+#: Merge.rc:497
#, c-format
msgid "L&eft to..."
msgstr ""
-#: Merge.rc:496
+#: Merge.rc:498
#, c-format
msgid "&Right to Left"
msgstr ""
-#: Merge.rc:497
+#: Merge.rc:499
#, c-format
msgid "R&ight to..."
msgstr ""
-#: Merge.rc:499
+#: Merge.rc:501
#, c-format
msgid "&Move"
msgstr ""
-#: Merge.rc:501
+#: Merge.rc:503
#, c-format
msgid "&Left to..."
msgstr ""
-#: Merge.rc:502
+#: Merge.rc:504
#, c-format
msgid "&Right to..."
msgstr ""
-#: Merge.rc:504
+#: Merge.rc:506
#, c-format
msgid "&Delete"
msgstr ""
-#: Merge.rc:506
-#: Merge.rc:1118
-#: Merge.rc:1497
+#: Merge.rc:508
+#: Merge.rc:1120
+#: Merge.rc:1499
#, c-format
msgid "&Left"
msgstr ""
-#: Merge.rc:507
-#: Merge.rc:1120
-#: Merge.rc:1500
+#: Merge.rc:509
+#: Merge.rc:1122
+#: Merge.rc:1502
#, c-format
msgid "&Right"
msgstr ""
-#: Merge.rc:508
+#: Merge.rc:510
#, c-format
msgid "&Both"
msgstr ""
-#: Merge.rc:510
+#: Merge.rc:512
#, c-format
msgid "Re&name"
msgstr ""
-#: Merge.rc:511
+#: Merge.rc:513
#, c-format
msgid "&Hide Items"
msgstr ""
-#: Merge.rc:513
+#: Merge.rc:515
#, c-format
msgid "&Open Left"
msgstr ""
-#: Merge.rc:519
+#: Merge.rc:521
#, c-format
msgid "O&pen Right"
msgstr ""
-#: Merge.rc:526
+#: Merge.rc:528
#, c-format
msgid "Cop&y Pathnames"
msgstr ""
-#: Merge.rc:528
+#: Merge.rc:530
#, c-format
msgid "&Left (%1 of %2)"
msgstr ""
-#: Merge.rc:529
+#: Merge.rc:531
#, c-format
msgid "&Right (%1 of %2)"
msgstr ""
-#: Merge.rc:530
+#: Merge.rc:532
#, c-format
msgid "&Both (%1 of %2)"
msgstr ""
-#: Merge.rc:532
+#: Merge.rc:534
#, c-format
msgid "Copy &Filenames"
msgstr ""
-#: Merge.rc:534
+#: Merge.rc:536
#, c-format
msgid "&Zip"
msgstr ""
-#: Merge.rc:536
+#: Merge.rc:538
#, c-format
msgid "&Left... (%1 of %2)"
msgstr ""
-#: Merge.rc:537
+#: Merge.rc:539
#, c-format
msgid "&Right... (%1 of %2)"
msgstr ""
-#: Merge.rc:538
+#: Merge.rc:540
#, c-format
msgid "&Both... (%1 of %2)"
msgstr ""
-#: Merge.rc:539
+#: Merge.rc:541
#, c-format
msgid "&Differences... (%1 of %2)"
msgstr ""
-#: Merge.rc:542
+#: Merge.rc:544
#, c-format
msgid "&Refresh"
msgstr ""
-#: Merge.rc:554
+#: Merge.rc:556
#, c-format
msgid "&Copy Full Path"
msgstr ""
-#: Merge.rc:555
+#: Merge.rc:557
#, c-format
msgid "Copy &Filename"
msgstr ""
-#: Merge.rc:561
+#: Merge.rc:563
#, c-format
msgid "Prediffer Settings"
msgstr ""
-#: Merge.rc:563
+#: Merge.rc:565
#, c-format
msgid "&No prediffer"
msgstr ""
-#: Merge.rc:564
+#: Merge.rc:566
#, c-format
msgid "Auto prediffer"
msgstr ""
-#: Merge.rc:572
+#: Merge.rc:574
#, c-format
msgid "G&oto Diff"
msgstr ""
-#: Merge.rc:575
+#: Merge.rc:577
#, c-format
msgid "&No Moved Blocks"
msgstr ""
-#: Merge.rc:576
+#: Merge.rc:578
#, c-format
msgid "&All Moved Blocks"
msgstr ""
-#: Merge.rc:577
+#: Merge.rc:579
#, c-format
msgid "Moved Block for &Current Diff"
msgstr ""
-#: Merge.rc:645
+#: Merge.rc:647
#, c-format
msgid "About WinMerge"
msgstr ""
-#: Merge.rc:651
+#: Merge.rc:653
#, c-format
msgid "(Private Build)"
msgstr ""
-#: Merge.rc:652
+#: Merge.rc:654
#, c-format
msgid "All rights reserved."
msgstr ""
-#: Merge.rc:653
+#: Merge.rc:655
#, c-format
msgid "Visit the WinMerge HomePage!"
msgstr ""
-#: Merge.rc:656
-#: Merge.rc:687
-#: Merge.rc:777
-#: Merge.rc:963
-#: Merge.rc:1037
-#: Merge.rc:1066
-#: Merge.rc:1076
-#: Merge.rc:1239
-#: Merge.rc:1303
-#: Merge.rc:1316
-#: Merge.rc:1408
-#: Merge.rc:1423
+#: Merge.rc:658
+#: Merge.rc:689
+#: Merge.rc:779
+#: Merge.rc:965
+#: Merge.rc:1039
+#: Merge.rc:1068
+#: Merge.rc:1078
+#: Merge.rc:1241
+#: Merge.rc:1305
+#: Merge.rc:1318
+#: Merge.rc:1410
+#: Merge.rc:1425
#, c-format
msgid "OK"
msgstr ""
-#: Merge.rc:657
+#: Merge.rc:659
#, c-format
msgid "Contributors"
msgstr ""
-#: Merge.rc:663
+#: Merge.rc:665
#, c-format
msgid "Select Files or Folders"
msgstr ""
-#: Merge.rc:666
-#: Merge.rc:1574
+#: Merge.rc:668
+#: Merge.rc:1576
#, c-format
msgid "&Left:"
msgstr ""
-#: Merge.rc:670
-#: Merge.rc:731
-#: Merge.rc:987
-#: Merge.rc:1002
+#: Merge.rc:672
+#: Merge.rc:733
+#: Merge.rc:989
+#: Merge.rc:1004
#, c-format
msgid "&Browse..."
msgstr ""
-#: Merge.rc:671
-#: Merge.rc:1578
+#: Merge.rc:673
+#: Merge.rc:1580
#, c-format
msgid "&Right:"
msgstr ""
-#: Merge.rc:675
-#: Merge.rc:1013
+#: Merge.rc:677
+#: Merge.rc:1015
#, c-format
msgid "Bro&wse..."
msgstr ""
-#: Merge.rc:676
-#: Merge.rc:1582
+#: Merge.rc:678
+#: Merge.rc:1584
#, c-format
msgid "&Filter:"
msgstr ""
-#: Merge.rc:679
-#: Merge.rc:1584
+#: Merge.rc:681
+#: Merge.rc:1586
#, c-format
msgid "Select..."
msgstr ""
-#: Merge.rc:680
+#: Merge.rc:682
#, c-format
msgid "&Unpacker:"
msgstr ""
-#: Merge.rc:683
+#: Merge.rc:685
#, c-format
msgid "&Select..."
msgstr ""
-#: Merge.rc:684
-#: Merge.rc:1585
+#: Merge.rc:686
+#: Merge.rc:1587
#, c-format
msgid "&Include Subfolders"
msgstr ""
-#: Merge.rc:686
+#: Merge.rc:688
#, c-format
msgid "Status:"
msgstr ""
-#: Merge.rc:688
-#: Merge.rc:718
-#: Merge.rc:778
-#: Merge.rc:808
-#: Merge.rc:840
-#: Merge.rc:850
-#: Merge.rc:1038
-#: Merge.rc:1067
-#: Merge.rc:1077
-#: Merge.rc:1128
-#: Merge.rc:1240
-#: Merge.rc:1317
-#: Merge.rc:1409
-#: Merge.rc:1424
+#: Merge.rc:690
+#: Merge.rc:720
+#: Merge.rc:780
+#: Merge.rc:810
+#: Merge.rc:842
+#: Merge.rc:852
+#: Merge.rc:1040
+#: Merge.rc:1069
+#: Merge.rc:1079
+#: Merge.rc:1130
+#: Merge.rc:1242
+#: Merge.rc:1319
+#: Merge.rc:1411
+#: Merge.rc:1426
#, c-format
msgid "Cancel"
msgstr ""
-#: Merge.rc:689
-#: Merge.rc:1318
+#: Merge.rc:691
+#: Merge.rc:1320
#, c-format
msgid "Help"
msgstr ""
-#: Merge.rc:690
+#: Merge.rc:692
#, c-format
msgid "Files or Folders to Compare"
msgstr ""
-#: Merge.rc:697
+#: Merge.rc:699
#, c-format
msgid "Visual SourceSafe"
msgstr ""
-#: Merge.rc:702
+#: Merge.rc:704
#, c-format
msgid "Database:"
msgstr ""
-#: Merge.rc:705
+#: Merge.rc:707
#, c-format
msgid "Project:"
msgstr ""
-#: Merge.rc:708
+#: Merge.rc:710
#, c-format
msgid "User:"
msgstr ""
-#: Merge.rc:710
+#: Merge.rc:712
#, c-format
msgid "Password:"
msgstr ""
-#: Merge.rc:712
+#: Merge.rc:714
#, c-format
msgid "Link to Destination VSS project"
msgstr ""
-#: Merge.rc:714
-#: Merge.rc:855
+#: Merge.rc:716
+#: Merge.rc:857
#, c-format
msgid "Apply to all items"
msgstr ""
-#: Merge.rc:716
+#: Merge.rc:718
#, c-format
msgid "Check Out"
msgstr ""
-#: Merge.rc:717
-#: Merge.rc:851
+#: Merge.rc:719
+#: Merge.rc:853
#, c-format
msgid "Save As..."
msgstr ""
-#: Merge.rc:723
+#: Merge.rc:725
#, c-format
msgid "Versioning System"
msgstr ""
-#: Merge.rc:726
+#: Merge.rc:728
#, c-format
msgid "&Versioning System:"
msgstr ""
-#: Merge.rc:729
+#: Merge.rc:731
#, c-format
msgid "&Path to cleartool.exe:"
msgstr ""
-#: Merge.rc:736
-#: Merge.rc:1889
+#: Merge.rc:738
+#: Merge.rc:1891
#, c-format
msgid "General"
msgstr ""
-#: Merge.rc:739
+#: Merge.rc:741
#, c-format
msgid "Automatically &scroll to first difference"
msgstr ""
-#: Merge.rc:742
+#: Merge.rc:744
#, c-format
msgid "&Disable Splash Screen"
msgstr ""
-#: Merge.rc:744
+#: Merge.rc:746
#, c-format
msgid "Cl&ose windows with ESC"
msgstr ""
-#: Merge.rc:746
+#: Merge.rc:748
#, c-format
msgid "&Automatically verify paths in Open-dialog"
msgstr ""
-#: Merge.rc:749
+#: Merge.rc:751
#, c-format
msgid "All&ow only one instance to run"
msgstr ""
-#: Merge.rc:751
+#: Merge.rc:753
#, c-format
msgid "As&k when closing multiple windows"
msgstr ""
-#: Merge.rc:753
+#: Merge.rc:755
#, c-format
msgid "&Preserve file time in file compare"
msgstr ""
-#: Merge.rc:756
+#: Merge.rc:758
#, c-format
msgid "O&pen-dialog Auto-Completion:"
msgstr ""
-#: Merge.rc:759
+#: Merge.rc:761
#, c-format
msgid "Enable multiple compare windows for"
msgstr ""
-#: Merge.rc:761
-#: Merge.rc:1597
+#: Merge.rc:763
+#: Merge.rc:1599
#, c-format
msgid "&Folder compare"
msgstr ""
-#: Merge.rc:763
-#: Merge.rc:1599
+#: Merge.rc:765
+#: Merge.rc:1601
#, c-format
msgid "Fil&e compare"
msgstr ""
-#: Merge.rc:765
+#: Merge.rc:767
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr ""
-#: Merge.rc:767
+#: Merge.rc:769
#, c-format
msgid "Reset"
msgstr ""
-#: Merge.rc:774
+#: Merge.rc:776
#, c-format
msgid "Language"
msgstr ""
-#: Merge.rc:781
+#: Merge.rc:783
#, c-format
msgid "Available languages:"
msgstr ""
-#: Merge.rc:787
+#: Merge.rc:789
#, c-format
msgid "Find"
msgstr ""
-#: Merge.rc:790
-#: Merge.rc:817
+#: Merge.rc:792
+#: Merge.rc:819
#, c-format
msgid "Fi&nd what:"
msgstr ""
-#: Merge.rc:793
-#: Merge.rc:823
+#: Merge.rc:795
+#: Merge.rc:825
#, c-format
msgid "Match &whole word only"
msgstr ""
-#: Merge.rc:795
-#: Merge.rc:825
+#: Merge.rc:797
+#: Merge.rc:827
#, c-format
msgid "Match &case"
msgstr ""
-#: Merge.rc:797
-#: Merge.rc:827
+#: Merge.rc:799
+#: Merge.rc:829
#, c-format
msgid "Regular &expression"
msgstr ""
-#: Merge.rc:799
+#: Merge.rc:801
#, c-format
msgid "D&on't wrap end of file"
msgstr ""
-#: Merge.rc:802
+#: Merge.rc:804
#, c-format
msgid "Direction"
msgstr ""
-#: Merge.rc:803
+#: Merge.rc:805
#, c-format
msgid "&Up"
msgstr ""
-#: Merge.rc:805
+#: Merge.rc:807
#, c-format
msgid "&Down"
msgstr ""
-#: Merge.rc:807
-#: Merge.rc:837
+#: Merge.rc:809
+#: Merge.rc:839
#, c-format
msgid "&Find Next"
msgstr ""
-#: Merge.rc:814
+#: Merge.rc:816
#, c-format
msgid "Replace"
msgstr ""
-#: Merge.rc:820
+#: Merge.rc:822
#, c-format
msgid "Re&place with:"
msgstr ""
-#: Merge.rc:829
+#: Merge.rc:831
#, c-format
msgid "&Don't wrap end of file"
msgstr ""
-#: Merge.rc:832
+#: Merge.rc:834
#, c-format
msgid "Replace in"
msgstr ""
-#: Merge.rc:833
+#: Merge.rc:835
#, c-format
msgid "&Selection"
msgstr ""
-#: Merge.rc:835
+#: Merge.rc:837
#, c-format
msgid "Wh&ole file"
msgstr ""
-#: Merge.rc:838
+#: Merge.rc:840
#, c-format
msgid "&Replace"
msgstr ""
-#: Merge.rc:839
+#: Merge.rc:841
#, c-format
msgid "Replace &All"
msgstr ""
-#: Merge.rc:846
-#: Merge.rc:2114
+#: Merge.rc:848
+#: Merge.rc:2116
#, c-format
msgid "Rational ClearCase"
msgstr ""
-#: Merge.rc:849
+#: Merge.rc:851
#, c-format
msgid "CheckOut"
msgstr ""
-#: Merge.rc:854
-#: Merge.rc:1159
+#: Merge.rc:856
+#: Merge.rc:1161
#, c-format
msgid "Comments"
msgstr ""
-#: Merge.rc:857
+#: Merge.rc:859
#, c-format
msgid "CheckIn after checkout"
msgstr ""
-#: Merge.rc:863
+#: Merge.rc:865
#, c-format
msgid "Linefilters"
msgstr ""
-#: Merge.rc:866
+#: Merge.rc:868
#, c-format
msgid "Enable Line Filters"
msgstr ""
-#: Merge.rc:869
+#: Merge.rc:871
#, c-format
msgid "Regular Expressions (one per line):"
msgstr ""
-#: Merge.rc:876
+#: Merge.rc:878
#, c-format
msgid "Save"
msgstr ""
-#: Merge.rc:877
+#: Merge.rc:879
#, c-format
msgid "New"
msgstr ""
-#: Merge.rc:878
+#: Merge.rc:880
#, c-format
msgid "Edit"
msgstr ""
-#: Merge.rc:879
+#: Merge.rc:881
#, c-format
msgid "Remove"
msgstr ""
-#: Merge.rc:884
-#: Merge.rc:1892
+#: Merge.rc:886
+#: Merge.rc:1894
#, c-format
msgid "Colors"
msgstr ""
-#: Merge.rc:887
+#: Merge.rc:889
#, c-format
msgid "Difference:"
msgstr ""
-#: Merge.rc:891
+#: Merge.rc:893
#, c-format
msgid "Selected Difference:"
msgstr ""
-#: Merge.rc:895
-#: Merge.rc:1549
+#: Merge.rc:897
+#: Merge.rc:1551
#, c-format
msgid "Background"
msgstr ""
-#: Merge.rc:896
+#: Merge.rc:898
#, c-format
msgid "Deleted"
msgstr ""
-#: Merge.rc:909
-#: Merge.rc:1344
-#: Merge.rc:1550
+#: Merge.rc:911
+#: Merge.rc:1346
+#: Merge.rc:1552
#, c-format
msgid "Text"
msgstr ""
-#: Merge.rc:913
+#: Merge.rc:915
#, c-format
msgid "Ignored Difference:"
msgstr ""
-#: Merge.rc:923
+#: Merge.rc:925
#, c-format
msgid "Moved:"
msgstr ""
-#: Merge.rc:933
+#: Merge.rc:935
#, c-format
msgid "Selected Moved:"
msgstr ""
-#: Merge.rc:940
+#: Merge.rc:942
#, c-format
msgid "Word Difference:"
msgstr ""
-#: Merge.rc:947
+#: Merge.rc:949
#, c-format
msgid "Selected Word Diff:"
msgstr ""
-#: Merge.rc:954
-#: Merge.rc:1036
-#: Merge.rc:1065
-#: Merge.rc:1162
-#: Merge.rc:1390
+#: Merge.rc:956
+#: Merge.rc:1038
+#: Merge.rc:1067
+#: Merge.rc:1164
+#: Merge.rc:1392
#, c-format
msgid "Defaults"
msgstr ""
-#: Merge.rc:960
-#: Merge.rc:1332
-#: Merge.rc:1538
+#: Merge.rc:962
+#: Merge.rc:1334
+#: Merge.rc:1540
#, c-format
msgid "Dialog"
msgstr ""
-#: Merge.rc:970
-#: Merge.rc:1895
+#: Merge.rc:972
+#: Merge.rc:1897
#, c-format
msgid "System"
msgstr ""
-#: Merge.rc:973
+#: Merge.rc:975
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr ""
-#: Merge.rc:975
+#: Merge.rc:977
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr ""
-#: Merge.rc:978
+#: Merge.rc:980
#, c-format
msgid "Integration"
msgstr ""
-#: Merge.rc:979
+#: Merge.rc:981
#, c-format
msgid "&Add to explorer context menu"
msgstr ""
-#: Merge.rc:981
+#: Merge.rc:983
#, c-format
msgid "E&nable advanced menu"
msgstr ""
-#: Merge.rc:983
+#: Merge.rc:985
#, c-format
msgid "In&clude subfolders by default"
msgstr ""
-#: Merge.rc:985
+#: Merge.rc:987
#, c-format
msgid "&External editor:"
msgstr ""
-#: Merge.rc:988
+#: Merge.rc:990
#, c-format
msgid "&Filter folder:"
msgstr ""
-#: Merge.rc:990
-#: Merge.rc:1402
-#: Merge.rc:1576
-#: Merge.rc:1580
-#: Merge.rc:1607
+#: Merge.rc:992
+#: Merge.rc:1404
+#: Merge.rc:1578
+#: Merge.rc:1582
+#: Merge.rc:1609
#, c-format
msgid "Browse..."
msgstr ""
-#: Merge.rc:996
+#: Merge.rc:998
#, c-format
msgid "Patch Generator"
msgstr ""
-#: Merge.rc:999
+#: Merge.rc:1001
#, c-format
msgid "File&1:"
msgstr ""
-#: Merge.rc:1003
+#: Merge.rc:1005
#, c-format
msgid "File&2:"
msgstr ""
-#: Merge.rc:1006
+#: Merge.rc:1008
#, c-format
msgid "Br&owse..."
msgstr ""
-#: Merge.rc:1007
+#: Merge.rc:1009
#, c-format
msgid "&Swap"
msgstr ""
-#: Merge.rc:1008
+#: Merge.rc:1010
#, c-format
msgid "&Append to existing file"
msgstr ""
-#: Merge.rc:1010
+#: Merge.rc:1012
#, c-format
msgid "&Result:"
msgstr ""
-#: Merge.rc:1014
+#: Merge.rc:1016
#, c-format
msgid "&Format"
msgstr ""
-#: Merge.rc:1015
+#: Merge.rc:1017
#, c-format
msgid "St&yle:"
msgstr ""
-#: Merge.rc:1018
+#: Merge.rc:1020
#, c-format
msgid "&Context:"
msgstr ""
-#: Merge.rc:1021
+#: Merge.rc:1023
#, c-format
msgid "W&hitespaces"
msgstr ""
-#: Merge.rc:1022
+#: Merge.rc:1024
#, c-format
msgid "Com&pare"
msgstr ""
-#: Merge.rc:1024
+#: Merge.rc:1026
#, c-format
msgid "I&gnore changes"
msgstr ""
-#: Merge.rc:1026
+#: Merge.rc:1028
#, c-format
msgid "Ig&nore all"
msgstr ""
-#: Merge.rc:1028
+#: Merge.rc:1030
#, c-format
msgid "Ignor&e blank lines"
msgstr ""
-#: Merge.rc:1030
+#: Merge.rc:1032
#, c-format
msgid "Case sensi&tive"
msgstr ""
-#: Merge.rc:1032
+#: Merge.rc:1034
#, c-format
msgid "Inclu&de command line"
msgstr ""
-#: Merge.rc:1034
+#: Merge.rc:1036
#, c-format
msgid "Open to e&xternal editor"
msgstr ""
-#: Merge.rc:1056
+#: Merge.rc:1058
#, c-format
msgid "Display Columns"
msgstr ""
-#: Merge.rc:1062
+#: Merge.rc:1064
#, c-format
msgid "Move &Up"
msgstr ""
-#: Merge.rc:1063
+#: Merge.rc:1065
#, c-format
msgid "Move &Down"
msgstr ""
-#: Merge.rc:1073
+#: Merge.rc:1075
#, c-format
msgid "Select Unpacker"
msgstr ""
-#: Merge.rc:1078
+#: Merge.rc:1080
#, c-format
msgid "File unpacker:"
msgstr ""
-#: Merge.rc:1081
+#: Merge.rc:1083
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr ""
-#: Merge.rc:1084
+#: Merge.rc:1086
#, c-format
msgid "Extensions list:"
msgstr ""
-#: Merge.rc:1085
+#: Merge.rc:1087
#, c-format
msgid "Description:"
msgstr ""
-#: Merge.rc:1096
+#: Merge.rc:1098
#, c-format
msgid " Folder Compare Progress"
msgstr ""
-#: Merge.rc:1099
-#: Merge.rc:1842
+#: Merge.rc:1101
+#: Merge.rc:1844
#, c-format
msgid "Stop"
msgstr ""
-#: Merge.rc:1104
+#: Merge.rc:1106
#, c-format
msgid "Comparing items..."
msgstr ""
-#: Merge.rc:1105
+#: Merge.rc:1107
#, c-format
msgid "Items compared:"
msgstr ""
-#: Merge.rc:1106
+#: Merge.rc:1108
#, c-format
msgid "Items total:"
msgstr ""
-#: Merge.rc:1112
+#: Merge.rc:1114
#, c-format
msgid "Go To"
msgstr ""
-#: Merge.rc:1115
+#: Merge.rc:1117
#, c-format
msgid "G&oto:"
msgstr ""
-#: Merge.rc:1117
+#: Merge.rc:1119
#, c-format
msgid "File"
msgstr ""
-#: Merge.rc:1122
+#: Merge.rc:1124
#, c-format
msgid "Goto what"
msgstr ""
-#: Merge.rc:1123
+#: Merge.rc:1125
#, c-format
msgid "Li&ne"
msgstr ""
-#: Merge.rc:1125
+#: Merge.rc:1127
#, c-format
msgid "&Difference"
msgstr ""
-#: Merge.rc:1127
+#: Merge.rc:1129
#, c-format
msgid "&Go To"
msgstr ""
-#: Merge.rc:1133
-#: Merge.rc:1890
+#: Merge.rc:1135
+#: Merge.rc:1892
#, c-format
msgid "Compare"
msgstr ""
-#: Merge.rc:1136
+#: Merge.rc:1138
#, c-format
msgid "Whitespace"
msgstr ""
-#: Merge.rc:1137
+#: Merge.rc:1139
#, c-format
msgid "&Compare"
msgstr ""
-#: Merge.rc:1139
+#: Merge.rc:1141
#, c-format
msgid "&Ignore change"
msgstr ""
-#: Merge.rc:1141
+#: Merge.rc:1143
#, c-format
msgid "I&gnore all"
msgstr ""
-#: Merge.rc:1143
+#: Merge.rc:1145
#, c-format
msgid "Ignore blan&k lines"
msgstr ""
-#: Merge.rc:1145
+#: Merge.rc:1147
#, c-format
msgid "Ignore &case"
msgstr ""
-#: Merge.rc:1147
+#: Merge.rc:1149
#, c-format
msgid "Igno&re carriage return differences (DOS/UNIX/MAC)"
msgstr ""
-#: Merge.rc:1150
+#: Merge.rc:1152
#, c-format
msgid "E&nable moved block detection"
msgstr ""
-#: Merge.rc:1152
+#: Merge.rc:1154
#, c-format
msgid "&Match similar lines"
msgstr ""
-#: Merge.rc:1154
+#: Merge.rc:1156
#, c-format
msgid "&File Compare method:"
msgstr ""
-#: Merge.rc:1157
+#: Merge.rc:1159
#, c-format
msgid "S&top after first difference"
msgstr ""
-#: Merge.rc:1160
+#: Merge.rc:1162
#, c-format
msgid "Filter Comments"
msgstr ""
-#: Merge.rc:1167
-#: Merge.rc:1891
+#: Merge.rc:1169
+#: Merge.rc:1893
#, c-format
msgid "Editor"
msgstr ""
-#: Merge.rc:1170
+#: Merge.rc:1172
#, c-format
msgid "&Highlight syntax"
msgstr ""
-#: Merge.rc:1172
+#: Merge.rc:1174
#, c-format
msgid "&Automatic rescan"
msgstr ""
-#: Merge.rc:1174
+#: Merge.rc:1176
#, c-format
msgid "&Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1176
+#: Merge.rc:1178
#, c-format
msgid "Tabs"
msgstr ""
-#: Merge.rc:1177
+#: Merge.rc:1179
#, c-format
msgid "&Tab size:"
msgstr ""
-#: Merge.rc:1180
+#: Merge.rc:1182
#, c-format
msgid "&Insert Tabs"
msgstr ""
-#: Merge.rc:1182
+#: Merge.rc:1184
#, c-format
msgid "Insert &Spaces"
msgstr ""
-#: Merge.rc:1184
+#: Merge.rc:1186
#, c-format
msgid "Line Difference Coloring"
msgstr ""
-#: Merge.rc:1186
+#: Merge.rc:1188
#, c-format
msgid "View line differences"
msgstr ""
-#: Merge.rc:1188
+#: Merge.rc:1190
#, c-format
msgid "&Character level"
msgstr ""
-#: Merge.rc:1190
+#: Merge.rc:1192
#, c-format
msgid "&Word-level:"
msgstr ""
-#: Merge.rc:1205
+#: Merge.rc:1207
#, c-format
msgid "Filefilters"
msgstr ""
-#: Merge.rc:1211
+#: Merge.rc:1213
#, c-format
msgid "Test"
msgstr ""
-#: Merge.rc:1212
+#: Merge.rc:1214
#, c-format
msgid "Install..."
msgstr ""
-#: Merge.rc:1213
+#: Merge.rc:1215
#, c-format
msgid "New..."
msgstr ""
-#: Merge.rc:1214
+#: Merge.rc:1216
#, c-format
msgid "Edit..."
msgstr ""
-#: Merge.rc:1215
+#: Merge.rc:1217
#, c-format
msgid "Delete..."
msgstr ""
-#: Merge.rc:1221
+#: Merge.rc:1223
#, c-format
msgid "Save modified files?"
msgstr ""
-#: Merge.rc:1224
+#: Merge.rc:1226
#, c-format
msgid "Left side file"
msgstr ""
-#: Merge.rc:1227
+#: Merge.rc:1229
#, c-format
msgid "&Save changes"
msgstr ""
-#: Merge.rc:1229
+#: Merge.rc:1231
#, c-format
msgid "&Discard changes"
msgstr ""
-#: Merge.rc:1231
+#: Merge.rc:1233
#, c-format
msgid "Right side file"
msgstr ""
-#: Merge.rc:1234
+#: Merge.rc:1236
#, c-format
msgid "S&ave changes"
msgstr ""
-#: Merge.rc:1236
+#: Merge.rc:1238
#, c-format
msgid "Dis&card changes"
msgstr ""
-#: Merge.rc:1238
+#: Merge.rc:1240
#, c-format
msgid "Discard All"
msgstr ""
-#: Merge.rc:1245
-#: Merge.rc:1493
-#: Merge.rc:1897
+#: Merge.rc:1247
+#: Merge.rc:1495
+#: Merge.rc:1899
#, c-format
msgid "Codepage"
msgstr ""
-#: Merge.rc:1248
+#: Merge.rc:1250
#, c-format
msgid "Default Codepage"
msgstr ""
-#: Merge.rc:1249
+#: Merge.rc:1251
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr ""
-#: Merge.rc:1251
+#: Merge.rc:1253
#, c-format
msgid "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session"
msgstr ""
-#: Merge.rc:1254
+#: Merge.rc:1256
#, c-format
msgid "System codepage"
msgstr ""
-#: Merge.rc:1256
+#: Merge.rc:1258
#, c-format
msgid "According to WinMerge User Interface"
msgstr ""
-#: Merge.rc:1258
+#: Merge.rc:1260
#, c-format
msgid "Custom codepage :"
msgstr ""
-#: Merge.rc:1266
+#: Merge.rc:1268
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr ""
-#: Merge.rc:1269
+#: Merge.rc:1271
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr ""
-#: Merge.rc:1272
+#: Merge.rc:1274
#, c-format
msgid "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation."
msgstr ""
-#: Merge.rc:1274
+#: Merge.rc:1276
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr ""
-#: Merge.rc:1276
+#: Merge.rc:1278
#, c-format
msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available."
msgstr ""
-#: Merge.rc:1278
+#: Merge.rc:1280
#, c-format
msgid "Version"
msgstr ""
-#: Merge.rc:1280
+#: Merge.rc:1282
#, c-format
msgid "Plugin required\n(dllbuild %04u)"
msgstr ""
-#: Merge.rc:1282
+#: Merge.rc:1284
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr ""
-#: Merge.rc:1285
-#: Merge.rc:1288
+#: Merge.rc:1287
+#: Merge.rc:1290
#, c-format
msgid "present"
msgstr ""
-#: Merge.rc:1286
+#: Merge.rc:1288
#, c-format
msgid "Merge7z000U.dll"
msgstr ""
-#: Merge.rc:1289
+#: Merge.rc:1291
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr ""
-#: Merge.rc:1291
-#: Merge.rc:1296
+#: Merge.rc:1293
+#: Merge.rc:1298
#, c-format
msgid "none"
msgstr ""
-#: Merge.rc:1293
+#: Merge.rc:1295
#, c-format
msgid "missing"
msgstr ""
-#: Merge.rc:1294
+#: Merge.rc:1296
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr ""
-#: Merge.rc:1298
+#: Merge.rc:1300
#, c-format
msgid "outdated"
msgstr ""
-#: Merge.rc:1299
+#: Merge.rc:1301
#, c-format
msgid "Plugins on path:"
msgstr ""
-#: Merge.rc:1300
+#: Merge.rc:1302
#, c-format
msgid "Don't display this &message again.\n(You can always recall this message from help menu.)"
msgstr ""
-#: Merge.rc:1304
+#: Merge.rc:1306
#, c-format
msgid "Plugin Download"
msgstr ""
-#: Merge.rc:1313
+#: Merge.rc:1315
#, c-format
msgid "Options"
msgstr ""
-#: Merge.rc:1324
+#: Merge.rc:1326
#, c-format
msgid " Categories"
msgstr ""
-#: Merge.rc:1326
+#: Merge.rc:1328
#, c-format
msgid "Import..."
msgstr ""
-#: Merge.rc:1327
+#: Merge.rc:1329
#, c-format
msgid "Export..."
msgstr ""
-#: Merge.rc:1335
+#: Merge.rc:1337
#, c-format
msgid "Keywords:"
msgstr ""
-#: Merge.rc:1336
+#: Merge.rc:1338
#, c-format
msgid "Function names:"
msgstr ""
-#: Merge.rc:1337
+#: Merge.rc:1339
#, c-format
msgid "Comments:"
msgstr ""
-#: Merge.rc:1338
+#: Merge.rc:1340
#, c-format
msgid "Numbers:"
msgstr ""
-#: Merge.rc:1339
+#: Merge.rc:1341
#, c-format
msgid "Operators:"
msgstr ""
-#: Merge.rc:1340
+#: Merge.rc:1342
#, c-format
msgid "Strings:"
msgstr ""
-#: Merge.rc:1341
+#: Merge.rc:1343
#, c-format
msgid "Preprocessor:"
msgstr ""
-#: Merge.rc:1342
+#: Merge.rc:1344
#, c-format
msgid "User 1:"
msgstr ""
-#: Merge.rc:1343
+#: Merge.rc:1345
#, c-format
msgid "User 2:"
msgstr ""
-#: Merge.rc:1348
-#: Merge.rc:1353
-#: Merge.rc:1358
-#: Merge.rc:1363
-#: Merge.rc:1368
-#: Merge.rc:1373
-#: Merge.rc:1378
-#: Merge.rc:1383
-#: Merge.rc:1388
+#: Merge.rc:1350
+#: Merge.rc:1355
+#: Merge.rc:1360
+#: Merge.rc:1365
+#: Merge.rc:1370
+#: Merge.rc:1375
+#: Merge.rc:1380
+#: Merge.rc:1385
+#: Merge.rc:1390
#, c-format
msgid "Bold"
msgstr ""
-#: Merge.rc:1396
+#: Merge.rc:1398
#, c-format
msgid "Folder Compare Report"
msgstr ""
-#: Merge.rc:1399
+#: Merge.rc:1401
#, c-format
msgid "Report &File:"
msgstr ""
-#: Merge.rc:1403
+#: Merge.rc:1405
#, c-format
msgid "&Style:"
msgstr ""
-#: Merge.rc:1406
+#: Merge.rc:1408
#, c-format
msgid "&Copy to Clipboard"
msgstr ""
-#: Merge.rc:1414
+#: Merge.rc:1416
#, c-format
msgid "Shared or Private Filter"
msgstr ""
-#: Merge.rc:1417
+#: Merge.rc:1419
#, c-format
msgid "Which type of filter do you want to create?"
msgstr ""
-#: Merge.rc:1419
+#: Merge.rc:1421
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr ""
-#: Merge.rc:1421
+#: Merge.rc:1423
#, c-format
msgid "Private Filter (only for current user)"
msgstr ""
-#: Merge.rc:1429
-#: Merge.rc:1898
+#: Merge.rc:1431
+#: Merge.rc:1900
#, c-format
msgid "Archive Support"
msgstr ""
-#: Merge.rc:1432
+#: Merge.rc:1434
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr ""
-#: Merge.rc:1434
+#: Merge.rc:1436
#, c-format
msgid "Download 7-zip Plugin"
msgstr ""
-#: Merge.rc:1435
+#: Merge.rc:1437
#, c-format
msgid "&Enable archive file support"
msgstr ""
-#: Merge.rc:1437
+#: Merge.rc:1439
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr ""
-#: Merge.rc:1440
+#: Merge.rc:1442
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr ""
-#: Merge.rc:1442
+#: Merge.rc:1444
#, c-format
msgid "&Detect archive type from file signature"
msgstr ""
-#: Merge.rc:1450
+#: Merge.rc:1452
#, c-format
msgid "Compare Statistics"
msgstr ""
-#: Merge.rc:1453
+#: Merge.rc:1455
#, c-format
msgid "Folders:"
msgstr ""
-#: Merge.rc:1454
+#: Merge.rc:1456
#, c-format
msgid "Files:"
msgstr ""
-#: Merge.rc:1455
-#: Merge.rc:2262
+#: Merge.rc:1457
+#: Merge.rc:2264
#, c-format
msgid "Different"
msgstr ""
-#: Merge.rc:1456
+#: Merge.rc:1458
#, c-format
msgid "Text:"
msgstr ""
-#: Merge.rc:1459
-#: Merge.rc:1478
+#: Merge.rc:1461
+#: Merge.rc:1480
#, c-format
msgid "Binary:"
msgstr ""
-#: Merge.rc:1462
+#: Merge.rc:1464
#, c-format
msgid "Unique"
msgstr ""
-#: Merge.rc:1463
+#: Merge.rc:1465
#, c-format
msgid "Left:"
msgstr ""
-#: Merge.rc:1468
+#: Merge.rc:1470
#, c-format
msgid "Right:"
msgstr ""
-#: Merge.rc:1473
-#: Merge.rc:2257
+#: Merge.rc:1475
+#: Merge.rc:2259
#, c-format
msgid "Identical"
msgstr ""
-#: Merge.rc:1482
+#: Merge.rc:1484
#, c-format
msgid "Total:"
msgstr ""
-#: Merge.rc:1487
+#: Merge.rc:1489
#, c-format
msgid "Close"
msgstr ""
-#: Merge.rc:1496
+#: Merge.rc:1498
#, c-format
msgid "Affects"
msgstr ""
-#: Merge.rc:1499
-#: Merge.rc:1502
+#: Merge.rc:1501
+#: Merge.rc:1504
#, c-format
msgid "(Affects)"
msgstr ""
-#: Merge.rc:1503
+#: Merge.rc:1505
#, c-format
msgid "Select Codepage for"
msgstr ""
-#: Merge.rc:1504
+#: Merge.rc:1506
#, c-format
msgid "&File Loading:"
msgstr ""
-#: Merge.rc:1506
-#: Merge.rc:1509
+#: Merge.rc:1508
+#: Merge.rc:1511
#, c-format
msgid "..."
msgstr ""
-#: Merge.rc:1507
+#: Merge.rc:1509
#, c-format
msgid "File &Saving:"
msgstr ""
-#: Merge.rc:1510
+#: Merge.rc:1512
#, c-format
msgid "&Use same codepage for both"
msgstr ""
-#: Merge.rc:1513
+#: Merge.rc:1515
#, c-format
msgid "&Apply"
msgstr ""
-#: Merge.rc:1514
-#: Merge.rc:1864
+#: Merge.rc:1516
+#: Merge.rc:1866
#, c-format
msgid "&Cancel"
msgstr ""
-#: Merge.rc:1519
+#: Merge.rc:1521
#, c-format
msgid "Test Filter"
msgstr ""
-#: Merge.rc:1522
+#: Merge.rc:1524
#, c-format
msgid "Testing filter ..."
msgstr ""
-#: Merge.rc:1524
+#: Merge.rc:1526
#, c-format
msgid "&Enter text to test:"
msgstr ""
-#: Merge.rc:1526
+#: Merge.rc:1528
#, c-format
msgid "&Folder Name"
msgstr ""
-#: Merge.rc:1528
+#: Merge.rc:1530
#, c-format
msgid "Result:"
msgstr ""
-#: Merge.rc:1532
+#: Merge.rc:1534
#, c-format
msgid "&Test"
msgstr ""
-#: Merge.rc:1533
+#: Merge.rc:1535
#, c-format
msgid "&Close"
msgstr ""
-#: Merge.rc:1541
+#: Merge.rc:1543
#, c-format
msgid "&Use customized text colors"
msgstr ""
-#: Merge.rc:1544
+#: Merge.rc:1546
#, c-format
msgid "Custom text colors"
msgstr ""
-#: Merge.rc:1546
+#: Merge.rc:1548
#, c-format
msgid "Whitespace:"
msgstr ""
-#: Merge.rc:1547
+#: Merge.rc:1549
#, c-format
msgid "Regular text:"
msgstr ""
-#: Merge.rc:1548
+#: Merge.rc:1550
#, c-format
msgid "Selection:"
msgstr ""
-#: Merge.rc:1571
+#: Merge.rc:1573
#, c-format
msgid "Paths"
msgstr ""
-#: Merge.rc:1577
+#: Merge.rc:1579
#, c-format
msgid "R&ead-only"
msgstr ""
-#: Merge.rc:1581
+#: Merge.rc:1583
#, c-format
msgid "Re&ad-only"
msgstr ""
-#: Merge.rc:1587
+#: Merge.rc:1589
#, c-format
msgid "Open..."
msgstr ""
-#: Merge.rc:1588
+#: Merge.rc:1590
#, c-format
msgid "Save..."
msgstr ""
-#: Merge.rc:1593
-#: Merge.rc:1899
+#: Merge.rc:1595
+#: Merge.rc:1901
#, c-format
msgid "Backup Files"
msgstr ""
-#: Merge.rc:1596
+#: Merge.rc:1598
#, c-format
msgid "Create backup files in:"
msgstr ""
-#: Merge.rc:1601
+#: Merge.rc:1603
#, c-format
msgid "Create backup files into:"
msgstr ""
-#: Merge.rc:1602
+#: Merge.rc:1604
#, c-format
msgid "&Original file's folder"
msgstr ""
-#: Merge.rc:1604
+#: Merge.rc:1606
#, c-format
msgid "&Global backup folder:"
msgstr ""
-#: Merge.rc:1608
+#: Merge.rc:1610
#, c-format
msgid "Backup filename:"
msgstr ""
-#: Merge.rc:1609
+#: Merge.rc:1611
#, c-format
msgid "&Append .bak -extension"
msgstr ""
-#: Merge.rc:1611
+#: Merge.rc:1613
#, c-format
msgid "A&ppend timestamp"
msgstr ""
-#: Merge.rc:1618
+#: Merge.rc:1620
#, c-format
msgid "Confirm Copy"
msgstr ""
-#: Merge.rc:1622
+#: Merge.rc:1624
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr ""
-#: Merge.rc:1624
+#: Merge.rc:1626
#, c-format
msgid "From left"
msgstr ""
-#: Merge.rc:1627
+#: Merge.rc:1629
#, c-format
msgid "To right"
msgstr ""
-#: Merge.rc:1630
+#: Merge.rc:1632
#, c-format
msgid "Yes"
msgstr ""
-#: Merge.rc:1631
+#: Merge.rc:1633
#, c-format
msgid "No"
msgstr ""
#. StringFileInfo.Block
-#: Merge.rc:1656
+#: Merge.rc:1658
#, c-format
msgid "040904e4"
msgstr ""
#. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file!
-#: Merge.rc:1658
+#: Merge.rc:1660
#, c-format
msgid "English translation by developers"
msgstr ""
#. VarFileInfo.Translation
-#: Merge.rc:1671
+#: Merge.rc:1673
#, c-format
msgid "0x409, 1252"
msgstr ""
-#: Merge.rc:1686
+#: Merge.rc:1688
#, c-format
msgid "Ready"
msgstr ""
-#: Merge.rc:1692
+#: Merge.rc:1694
#, c-format
msgid "EXT"
msgstr ""
-#: Merge.rc:1693
+#: Merge.rc:1695
#, c-format
msgid "CAP"
msgstr ""
-#: Merge.rc:1694
+#: Merge.rc:1696
#, c-format
msgid "NUM"
msgstr ""
-#: Merge.rc:1695
+#: Merge.rc:1697
#, c-format
msgid "SCRL"
msgstr ""
-#: Merge.rc:1696
+#: Merge.rc:1698
#, c-format
msgid "OVR"
msgstr ""
-#: Merge.rc:1697
+#: Merge.rc:1699
#, c-format
msgid "REC"
msgstr ""
-#: Merge.rc:1703
+#: Merge.rc:1705
#, c-format
msgid "Create empty documents\nNew Documents (Ctrl+N)"
msgstr ""
-#: Merge.rc:1704
+#: Merge.rc:1706
#, c-format
msgid "Open an existing document\nOpen (Ctrl+O)"
msgstr ""
-#: Merge.rc:1705
+#: Merge.rc:1707
#, c-format
msgid "Close the active document\nClose"
msgstr ""
-#: Merge.rc:1706
+#: Merge.rc:1708
#, c-format
msgid "Save the active document\nSave (Ctrl+S)"
msgstr ""
-#: Merge.rc:1707
+#: Merge.rc:1709
#, c-format
msgid "Save the active document with a new name\nSave As"
msgstr ""
-#: Merge.rc:1708
+#: Merge.rc:1710
#, c-format
msgid "Change the printing options\nPage Setup"
msgstr ""
-#: Merge.rc:1709
+#: Merge.rc:1711
#, c-format
msgid "Change the printer and printing options\nPrint Setup"
msgstr ""
-#: Merge.rc:1710
+#: Merge.rc:1712
#, c-format
msgid "Print the active document\nPrint"
msgstr ""
-#: Merge.rc:1711
+#: Merge.rc:1713
#, c-format
msgid "Display full pages\nPrint Preview"
msgstr ""
-#: Merge.rc:1716
+#: Merge.rc:1718
#, c-format
msgid "Make all hidden items visible again"
msgstr ""
-#: Merge.rc:1722
+#: Merge.rc:1724
#, c-format
msgid "Open project file\nProject file (Ctrl+J)"
msgstr ""
-#: Merge.rc:1723
+#: Merge.rc:1725
#, c-format
msgid "Unknown error attempting to open project file"
msgstr ""
-#: Merge.rc:1724
+#: Merge.rc:1726
#, c-format
msgid "Unknown error attempting to save project file"
msgstr ""
-#: Merge.rc:1725
+#: Merge.rc:1727
#, c-format
msgid "Project File"
msgstr ""
-#: Merge.rc:1726
+#: Merge.rc:1728
#, c-format
msgid "Project file successfully loaded."
msgstr ""
-#: Merge.rc:1727
+#: Merge.rc:1729
#, c-format
msgid "Project file successfully saved."
msgstr ""
-#: Merge.rc:1728
+#: Merge.rc:1730
#, c-format
msgid "Save current paths and options to project file\nSave Project File"
msgstr ""
-#: Merge.rc:1733
+#: Merge.rc:1735
#, c-format
msgid "Display program information, version number and copyright\nAbout"
msgstr ""
-#: Merge.rc:1734
+#: Merge.rc:1736
#, c-format
msgid "Quit the application; prompts to save documents\nExit"
msgstr ""
-#: Merge.rc:1740
-#: Merge.rc:1741
#: Merge.rc:1742
#: Merge.rc:1743
#: Merge.rc:1744
@@ -2680,3417 +2683,3419 @@
#: Merge.rc:1753
#: Merge.rc:1754
#: Merge.rc:1755
+#: Merge.rc:1756
+#: Merge.rc:1757
#, c-format
msgid "Open this document"
msgstr ""
-#: Merge.rc:1760
+#: Merge.rc:1762
#, c-format
msgid "Switch to the next window pane\nNext Pane"
msgstr ""
-#: Merge.rc:1761
+#: Merge.rc:1763
#, c-format
msgid "Switch back to the previous window pane\nPrevious Pane"
msgstr ""
-#: Merge.rc:1767
+#: Merge.rc:1769
#, c-format
msgid "Open another window for the active document\nNew Window"
msgstr ""
-#: Merge.rc:1768
+#: Merge.rc:1770
#, c-format
msgid "Arrange icons at the bottom of the window\nArrange Icons"
msgstr ""
-#: Merge.rc:1769
+#: Merge.rc:1771
#, c-format
msgid "Arrange windows so they overlap\nCascade Windows"
msgstr ""
-#: Merge.rc:1770
+#: Merge.rc:1772
#, c-format
msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally"
msgstr ""
-#: Merge.rc:1771
+#: Merge.rc:1773
#, c-format
msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically"
msgstr ""
-#: Merge.rc:1772
+#: Merge.rc:1774
#, c-format
msgid "Split the active window into panes\nSplit"
msgstr ""
-#: Merge.rc:1778
+#: Merge.rc:1780
#, c-format
msgid "Erase the selection\nErase"
msgstr ""
-#: Merge.rc:1779
+#: Merge.rc:1781
#, c-format
msgid "Erase everything\nErase All"
msgstr ""
-#: Merge.rc:1780
+#: Merge.rc:1782
#, c-format
msgid "Copy the selection and put it on the Clipboard\nCopy"
msgstr ""
-#: Merge.rc:1781
+#: Merge.rc:1783
#, c-format
msgid "Cut the selection and put it on the Clipboard\nCut"
msgstr ""
-#: Merge.rc:1782
+#: Merge.rc:1784
#, c-format
msgid "Find the specified text\nFind"
msgstr ""
-#: Merge.rc:1783
+#: Merge.rc:1785
#, c-format
msgid "Insert Clipboard contents\nPaste"
msgstr ""
-#: Merge.rc:1784
+#: Merge.rc:1786
#, c-format
msgid "Repeat the last action\nRepeat"
msgstr ""
-#: Merge.rc:1785
+#: Merge.rc:1787
#, c-format
msgid "Replace specific text with different text\nReplace"
msgstr ""
-#: Merge.rc:1786
+#: Merge.rc:1788
#, c-format
msgid "Select the entire document\nSelect All"
msgstr ""
-#: Merge.rc:1787
+#: Merge.rc:1789
#, c-format
msgid "Undo the last action\nUndo (Ctrl+Z)"
msgstr ""
-#: Merge.rc:1788
+#: Merge.rc:1790
#, c-format
msgid "Redo the previously undone action\nRedo (Ctrl+Y)"
msgstr ""
-#: Merge.rc:1794
+#: Merge.rc:1796
#, c-format
msgid "Show or hide the toolbar\nToggle ToolBar"
msgstr ""
-#: Merge.rc:1795
+#: Merge.rc:1797
#, c-format
msgid "Show or hide the status bar\nToggle StatusBar"
msgstr ""
-#: Merge.rc:1796
+#: Merge.rc:1798
#, c-format
msgid "Show or hide the tab bar\nToggle TabBar"
msgstr ""
-#: Merge.rc:1797
+#: Merge.rc:1799
#, c-format
msgid "Automatically resize panes\nLock Panes"
msgstr ""
-#: Merge.rc:1803
+#: Merge.rc:1805
#, c-format
msgid "Change the window size"
msgstr ""
-#: Merge.rc:1804
+#: Merge.rc:1806
#, c-format
msgid "Change the window position"
msgstr ""
-#: Merge.rc:1805
+#: Merge.rc:1807
#, c-format
msgid "Reduce the window to an icon"
msgstr ""
-#: Merge.rc:1806
+#: Merge.rc:1808
#, c-format
msgid "Enlarge the window to full size"
msgstr ""
-#: Merge.rc:1807
+#: Merge.rc:1809
#, c-format
msgid "Switch to the next document window"
msgstr ""
-#: Merge.rc:1808
+#: Merge.rc:1810
#, c-format
msgid "Switch to the previous document window"
msgstr ""
-#: Merge.rc:1809
+#: Merge.rc:1811
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr ""
-#: Merge.rc:1814
+#: Merge.rc:1816
#, c-format
msgid "Restore the window to normal size"
msgstr ""
-#: Merge.rc:1815
+#: Merge.rc:1817
#, c-format
msgid "Activate Task List"
msgstr ""
-#: Merge.rc:1816
+#: Merge.rc:1818
#, c-format
msgid "Activate this window"
msgstr ""
-#: Merge.rc:1822
+#: Merge.rc:1824
#, c-format
msgid "Close print preview mode\nCancel Preview"
msgstr ""
-#: Merge.rc:1829
+#: Merge.rc:1831
#, c-format
msgid "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
msgstr ""
-#: Merge.rc:1836
+#: Merge.rc:1838
#, c-format
msgid "Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1843
+#: Merge.rc:1845
#, c-format
msgid "Press any key"
msgstr ""
-#: Merge.rc:1849
-#: Merge.rc:1850
+#: Merge.rc:1851
+#: Merge.rc:1852
#, c-format
msgid "Right click on the path to copy"
msgstr ""
-#: Merge.rc:1856
+#: Merge.rc:1858
#, c-format
msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"
msgstr ""
-#: Merge.rc:1857
+#: Merge.rc:1859
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU Public License in the Help menu for details."
msgstr ""
-#: Merge.rc:1863
+#: Merge.rc:1865
#, c-format
msgid "&Ok"
msgstr ""
-#: Merge.rc:1865
+#: Merge.rc:1867
#, c-format
msgid "&Abort"
msgstr ""
-#: Merge.rc:1866
+#: Merge.rc:1868
#, c-format
msgid "&Retry"
msgstr ""
-#: Merge.rc:1867
+#: Merge.rc:1869
#, c-format
msgid "&Ignore"
msgstr ""
-#: Merge.rc:1868
+#: Merge.rc:1870
#, c-format
msgid "Ignore &all"
msgstr ""
-#: Merge.rc:1869
+#: Merge.rc:1871
#, c-format
msgid "&Yes"
msgstr ""
-#: Merge.rc:1875
+#: Merge.rc:1877
#, c-format
msgid "Yes to &all"
msgstr ""
-#: Merge.rc:1876
+#: Merge.rc:1878
#, c-format
msgid "&No"
msgstr ""
-#: Merge.rc:1877
+#: Merge.rc:1879
#, c-format
msgid "No to a&ll"
msgstr ""
-#: Merge.rc:1878
+#: Merge.rc:1880
#, c-format
msgid "&Continue"
msgstr ""
-#: Merge.rc:1879
+#: Merge.rc:1881
#, c-format
msgid "&Skip"
msgstr ""
-#: Merge.rc:1880
+#: Merge.rc:1882
#, c-format
msgid "Skip &all"
msgstr ""
-#: Merge.rc:1882
+#: Merge.rc:1884
#, c-format
msgid "Don't display this &message again."
msgstr ""
-#: Merge.rc:1883
+#: Merge.rc:1885
#, c-format
msgid "Don't ask this &question again."
msgstr ""
-#: Merge.rc:1893
+#: Merge.rc:1895
#, c-format
msgid "Syntax colors"
msgstr ""
-#: Merge.rc:1894
+#: Merge.rc:1896
#, c-format
msgid "Text Colors"
msgstr ""
-#: Merge.rc:1896
+#: Merge.rc:1898
#, c-format
msgid "Version Control"
msgstr ""
-#: Merge.rc:1906
+#: Merge.rc:1908
#, c-format
msgid "To:"
msgstr ""
-#: Merge.rc:1907
+#: Merge.rc:1909
#, c-format
msgid "From left:"
msgstr ""
-#: Merge.rc:1908
+#: Merge.rc:1910
#, c-format
msgid "To left:"
msgstr ""
-#: Merge.rc:1909
+#: Merge.rc:1911
#, c-format
msgid "From right:"
msgstr ""
-#: Merge.rc:1910
+#: Merge.rc:1912
#, c-format
msgid "To right:"
msgstr ""
-#: Merge.rc:1916
+#: Merge.rc:1918
#, c-format
msgid "Version %1"
msgstr ""
-#: Merge.rc:1917
+#: Merge.rc:1919
#, c-format
msgid "Unicode"
msgstr ""
-#: Merge.rc:1923
+#: Merge.rc:1925
#, c-format
msgid "Options (%1)"
msgstr ""
-#: Merge.rc:1924
+#: Merge.rc:1926
#, c-format
msgid "All message boxes are now displayed again."
msgstr ""
-#: Merge.rc:1925
+#: Merge.rc:1927
#, c-format
msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
msgstr ""
-#: Merge.rc:1926
+#: Merge.rc:1928
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr ""
-#: Merge.rc:1928
+#: Merge.rc:1930
#, c-format
msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
msgstr ""
-#: Merge.rc:1930
+#: Merge.rc:1932
#, c-format
msgid "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
msgstr ""
-#: Merge.rc:1936
+#: Merge.rc:1938
#, c-format
msgid "Open"
msgstr ""
-#: Merge.rc:1937
+#: Merge.rc:1939
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1938
+#: Merge.rc:1940
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1939
+#: Merge.rc:1941
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr ""
-#: Merge.rc:1941
+#: Merge.rc:1943
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1947
+#: Merge.rc:1949
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1948
+#: Merge.rc:1950
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1949
+#: Merge.rc:1951
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1955
+#: Merge.rc:1957
#, c-format
msgid "Full Contents"
msgstr ""
-#: Merge.rc:1956
+#: Merge.rc:1958
#, c-format
msgid "Quick Contents"
msgstr ""
-#: Merge.rc:1957
+#: Merge.rc:1959
#, c-format
msgid "Modified Date"
msgstr ""
-#: Merge.rc:1958
+#: Merge.rc:1960
#, c-format
msgid "Modified Date and Size"
msgstr ""
-#: Merge.rc:1959
+#: Merge.rc:1961
#, c-format
msgid "Size"
msgstr ""
-#: Merge.rc:1965
+#: Merge.rc:1967
#, c-format
msgid "Name"
msgstr ""
-#: Merge.rc:1966
+#: Merge.rc:1968
#, c-format
msgid "Location"
msgstr ""
-#: Merge.rc:1967
+#: Merge.rc:1969
#, c-format
msgid "Filters"
msgstr ""
-#: Merge.rc:1968
+#: Merge.rc:1970
#, c-format
msgid "[F] "
msgstr ""
-#: Merge.rc:1969
+#: Merge.rc:1971
#, c-format
msgid "Description"
msgstr ""
-#: Merge.rc:1970
+#: Merge.rc:1972
#, c-format
msgid "Select filename for new filter"
msgstr ""
-#: Merge.rc:1971
+#: Merge.rc:1973
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1973
+#: Merge.rc:1975
#, c-format
msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2."
msgstr ""
-#: Merge.rc:1975
+#: Merge.rc:1977
#, c-format
msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable."
msgstr ""
-#: Merge.rc:1977
+#: Merge.rc:1979
#, c-format
msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System."
msgstr ""
-#: Merge.rc:1979
+#: Merge.rc:1981
#, c-format
msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
msgstr ""
-#: Merge.rc:1980
+#: Merge.rc:1982
#, c-format
msgid "Locate filter file to install"
msgstr ""
-#: Merge.rc:1982
+#: Merge.rc:1984
#, c-format
msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
msgstr ""
-#: Merge.rc:1984
+#: Merge.rc:1986
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr ""
-#: Merge.rc:1990
+#: Merge.rc:1992
#, c-format
msgid "Regular expression"
msgstr ""
-#: Merge.rc:1996
+#: Merge.rc:1998
#, c-format
msgid "&Path to cleartool.exe :"
msgstr ""
-#: Merge.rc:1997
+#: Merge.rc:1999
#, c-format
msgid "&Path to SS.EXE :"
msgstr ""
-#: Merge.rc:2003
+#: Merge.rc:2005
#, c-format
msgid "Folder Comparison Results"
msgstr ""
-#: Merge.rc:2004
+#: Merge.rc:2006
#, c-format
msgid "File Comparison"
msgstr ""
-#: Merge.rc:2005
+#: Merge.rc:2007
#, c-format
msgid "Untitled left"
msgstr ""
-#: Merge.rc:2006
+#: Merge.rc:2008
#, c-format
msgid "Untitled right"
msgstr ""
-#: Merge.rc:2012
+#: Merge.rc:2014
#, c-format
msgid "Scanning files..."
msgstr ""
-#: Merge.rc:2013
+#: Merge.rc:2015
#, c-format
msgid "Opening selection"
msgstr ""
-#: Merge.rc:2014
+#: Merge.rc:2016
#, c-format
msgid "Copying Left to Right"
msgstr ""
-#: Merge.rc:2015
+#: Merge.rc:2017
#, c-format
msgid "Copying Right to Left"
msgstr ""
-#: Merge.rc:2016
+#: Merge.rc:2018
#, c-format
msgid "Copying All to Left"
msgstr ""
-#: Merge.rc:2017
+#: Merge.rc:2019
#, c-format
msgid "Copying All to Right"
msgstr ""
-#: Merge.rc:2018
+#: Merge.rc:2020
#, c-format
msgid "Copying files..."
msgstr ""
-#: Merge.rc:2019
+#: Merge.rc:2021
#, c-format
msgid "Deleting files..."
msgstr ""
-#: Merge.rc:2020
+#: Merge.rc:2022
#, c-format
msgid "Moving files..."
msgstr ""
-#: Merge.rc:2021
+#: Merge.rc:2023
#, c-format
msgid "Creating the report..."
msgstr ""
-#: Merge.rc:2027
+#: Merge.rc:2029
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
-#: Merge.rc:2028
+#: Merge.rc:2030
#, c-format
msgid "Line: %s"
msgstr ""
-#: Merge.rc:2029
+#: Merge.rc:2031
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
-#: Merge.rc:2030
+#: Merge.rc:2032
#, c-format
msgid "Merge"
msgstr ""
-#: Merge.rc:2031
+#: Merge.rc:2033
#, c-format
msgid "Difference %1 of %2"
msgstr ""
-#: Merge.rc:2032
+#: Merge.rc:2034
#, c-format
msgid "%1 Differences Found"
msgstr ""
-#: Merge.rc:2033
+#: Merge.rc:2035
#, c-format
msgid "1 Difference Found"
msgstr ""
#. Abbreviation from "Read Only"
-#: Merge.rc:2034
+#: Merge.rc:2036
#, c-format
msgid "RO"
msgstr ""
-#: Merge.rc:2040
+#: Merge.rc:2042
#, c-format
msgid "Item %1 of %2"
msgstr ""
-#: Merge.rc:2041
+#: Merge.rc:2043
#, c-format
msgid "Items: %1"
msgstr ""
-#: Merge.rc:2047
+#: Merge.rc:2049
#, c-format
msgid "Select two existing folders or files to compare"
msgstr ""
-#: Merge.rc:2048
+#: Merge.rc:2050
#, c-format
msgid "Folder Selection"
msgstr ""
-#: Merge.rc:2049
+#: Merge.rc:2051
#, c-format
msgid "Select two folders or two files to compare."
msgstr ""
-#: Merge.rc:2050
+#: Merge.rc:2052
#, c-format
msgid "Left path is invalid!"
msgstr ""
-#: Merge.rc:2051
+#: Merge.rc:2053
#, c-format
msgid "Right path is invalid!"
msgstr ""
-#: Merge.rc:2052
+#: Merge.rc:2054
#, c-format
msgid "Both paths are invalid!"
msgstr ""
-#: Merge.rc:2053
+#: Merge.rc:2055
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr ""
-#: Merge.rc:2054
+#: Merge.rc:2056
#, c-format
msgid "Cannot compare file and folder!"
msgstr ""
-#: Merge.rc:2060
+#: Merge.rc:2062
#, c-format
msgid "File not found: %1"
msgstr ""
-#: Merge.rc:2061
+#: Merge.rc:2063
#, c-format
msg...
[truncated message content] |
|
From: <sdo...@us...> - 2008-01-14 19:25:05
|
Revision: 4912
http://winmerge.svn.sourceforge.net/winmerge/?rev=4912&view=rev
Author: sdottaka
Date: 2008-01-14 11:24:56 -0800 (Mon, 14 Jan 2008)
Log Message:
-----------
Patch #1869647 (2)
Modified Paths:
--------------
trunk/Src/Common/UniFile.cpp
Modified: trunk/Src/Common/UniFile.cpp
===================================================================
--- trunk/Src/Common/UniFile.cpp 2008-01-14 17:01:47 UTC (rev 4911)
+++ trunk/Src/Common/UniFile.cpp 2008-01-14 19:24:56 UTC (rev 4912)
@@ -583,7 +583,6 @@
}
else if (!ch)
{
- doneline = true;
int offset = (m_current - m_base);
RecordZero(m_txtstats, offset);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-14 17:01:48
|
Revision: 4911
http://winmerge.svn.sourceforge.net/winmerge/?rev=4911&view=rev
Author: kimmov
Date: 2008-01-14 09:01:47 -0800 (Mon, 14 Jan 2008)
Log Message:
-----------
Changelog: Enable file compare to open binary files (#1869647)
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-01-14 16:18:36 UTC (rev 4910)
+++ trunk/Docs/Users/ChangeLog.txt 2008-01-14 17:01:47 UTC (rev 4911)
@@ -13,6 +13,7 @@
Add index.html for documentation folders (#1866183)
Manual: Clarify file filters folder name matching (#1867212)
Improve file compare margin icons location (#1718699)
+ Enable file compare to open binary files (#1869647)
BugFix: Crash when using TrackPoint middle-button scrolling (#1864040)
BugFix: WinMerge didn't show the contents of the symbolic link target (#1864978)
BugFix: Unused registry key HKCU\Thingamahoochie\WinMerge was created
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-14 16:19:00
|
Revision: 4910
http://winmerge.svn.sourceforge.net/winmerge/?rev=4910&view=rev
Author: kimmov
Date: 2008-01-14 08:18:36 -0800 (Mon, 14 Jan 2008)
Log Message:
-----------
Docs: small fixes (typos, wrong links) to index.html files.
Modified Paths:
--------------
trunk/Docs/Developers/index.html
trunk/Docs/Users/index.html
trunk/Docs/index.html
Modified: trunk/Docs/Developers/index.html
===================================================================
--- trunk/Docs/Developers/index.html 2008-01-13 21:48:12 UTC (rev 4909)
+++ trunk/Docs/Developers/index.html 2008-01-14 16:18:36 UTC (rev 4910)
@@ -47,7 +47,7 @@
</style>
</head>
<body>
-<h2>WinMerge Documentation</h2>
+<h2>WinMerge Developer Documentation</h2>
<p>This folder contains WinMerge's developer-documentation.</p>
Modified: trunk/Docs/Users/index.html
===================================================================
--- trunk/Docs/Users/index.html 2008-01-13 21:48:12 UTC (rev 4909)
+++ trunk/Docs/Users/index.html 2008-01-14 16:18:36 UTC (rev 4910)
@@ -60,8 +60,8 @@
<p><b>User's Manual:</b><br>
User's manual is not directly readable from our source tree. It must be first
-converted to HTML or HTML help. See <a href="../Developers">Developer-documentation</a>
-for instructions how to do it.
+converted to HTML or HTML help. See <a href="../Developers/index.html">
+Developer-documentation</a> for instructions how to do it.
<p><b>Other files in user documentation:</b>
<ul>
Modified: trunk/Docs/index.html
===================================================================
--- trunk/Docs/index.html 2008-01-13 21:48:12 UTC (rev 4909)
+++ trunk/Docs/index.html 2008-01-14 16:18:36 UTC (rev 4910)
@@ -52,7 +52,7 @@
<p>This folder contains WinMerge's user- and developer-documentation.</p>
<h3>User Documentation</h3>
-<p>User documentation is in <code><a href="Users/">Users</a>-subfolder</code>.
+<p>User documentation is in <code><a href="Users/index.html">Users</a>-subfolder</code>.
</p>
<p><b>Important files in user documentation:</b>
@@ -65,7 +65,7 @@
</ul></p>
<h3>Developer Documentation</h3>
-<p>Developer documentation is in <code><a href="Develoepers/">Developers</a>-subfolder</code>.
+<p>Developer documentation is in <code><a href="Developers/index.html">Developers</a>-subfolder</code>.
</p>
<p><b>Important files in user documentation:</b>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-13 21:48:15
|
Revision: 4909
http://winmerge.svn.sourceforge.net/winmerge/?rev=4909&view=rev
Author: kimmov
Date: 2008-01-13 13:48:12 -0800 (Sun, 13 Jan 2008)
Log Message:
-----------
BUG: [ 1814184 ] Right mouse button clears text selection
- backout previous patch and fix as suggested by Dmitry, just checking if there is existing selection before moving caret.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/editlib/ccrystaltextview.cpp
trunk/Src/editlib/ccrystaltextview.h
trunk/Src/editlib/ccrystaltextview2.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-01-13 20:57:58 UTC (rev 4908)
+++ trunk/Docs/Users/ChangeLog.txt 2008-01-13 21:48:12 UTC (rev 4909)
@@ -19,6 +19,7 @@
(#1865202)
BugFix: Register.bat didn't work on Windows 98 and Vista (#1869821)
BugFix: Open-dialog was not displayed on Windows 98 (#1866442, #1869858)
+ BugFix: Right mouse button didn't move cursor to new place (#1814184)
Translation updates:
- Spanish (#1867234)
- Swedish (#1867765, #1867844)
Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2008-01-13 20:57:58 UTC (rev 4908)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2008-01-13 21:48:12 UTC (rev 4909)
@@ -168,6 +168,7 @@
ON_UPDATE_COMMAND_UI (ID_EDIT_COPY, OnUpdateEditCopy)
ON_COMMAND (ID_EDIT_SELECT_ALL, OnEditSelectAll)
ON_UPDATE_COMMAND_UI (ID_EDIT_SELECT_ALL, OnUpdateEditSelectAll)
+ON_WM_RBUTTONDOWN ()
ON_WM_SYSCOLORCHANGE ()
ON_WM_CREATE ()
ON_COMMAND (ID_EDIT_FIND, OnEditFind)
Modified: trunk/Src/editlib/ccrystaltextview.h
===================================================================
--- trunk/Src/editlib/ccrystaltextview.h 2008-01-13 20:57:58 UTC (rev 4908)
+++ trunk/Src/editlib/ccrystaltextview.h 2008-01-13 21:48:12 UTC (rev 4909)
@@ -28,7 +28,7 @@
*
* @brief Declaration file for CCrystalTextView
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#if !defined(AFX_CCRYSTALTEXTVIEW_H__AD7F2F41_6CB3_11D2_8C32_0080ADB86836__INCLUDED_)
@@ -876,6 +876,7 @@
afx_msg void OnUpdateEditCopy (CCmdUI * pCmdUI);
afx_msg void OnEditSelectAll ();
afx_msg void OnUpdateEditSelectAll (CCmdUI * pCmdUI);
+ afx_msg void OnRButtonDown (UINT nFlags, CPoint point);
afx_msg void OnSysColorChange ();
afx_msg int OnCreate (LPCREATESTRUCT lpCreateStruct);
afx_msg void OnEditFind ();
Modified: trunk/Src/editlib/ccrystaltextview2.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview2.cpp 2008-01-13 20:57:58 UTC (rev 4908)
+++ trunk/Src/editlib/ccrystaltextview2.cpp 2008-01-13 21:48:12 UTC (rev 4909)
@@ -41,7 +41,7 @@
*
* @brief More functions for CCrystalTextView class.
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -1137,6 +1137,25 @@
pCmdUI->Enable (TRUE);
}
+void CCrystalTextView::
+OnRButtonDown (UINT nFlags, CPoint point)
+{
+ CPoint pt = point;
+ AdjustTextPoint (pt);
+ pt = ClientToText (pt);
+
+ // If there is selection, dont' clear it
+ if (!IsSelection())
+ {
+ m_ptAnchor = m_ptCursorPos = pt;
+ SetSelection (m_ptCursorPos, m_ptCursorPos);
+ EnsureVisible (m_ptCursorPos);
+ UpdateCaret ();
+ }
+
+ CView::OnRButtonDown (nFlags, point);
+}
+
BOOL CCrystalTextView::
IsSelection ()
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-13 20:58:07
|
Revision: 4908
http://winmerge.svn.sourceforge.net/winmerge/?rev=4908&view=rev
Author: kimmov
Date: 2008-01-13 12:57:58 -0800 (Sun, 13 Jan 2008)
Log Message:
-----------
Build: Modify pcre project file to use WinMerge's Build and BuildTmp folders. This avoids polluting source tree with build files.
Modified Paths:
--------------
trunk/Externals/pcre/Changes.txt
trunk/Externals/pcre/config_pcre/config_pcre.dsp
trunk/Externals/pcre/config_pcre/configure.mak
trunk/Externals/pcre/dll_pcre/pcre.dsp
trunk/Externals/pcre/lib_pcre/lib_pcre.dsp
trunk/Externals/pcre/lib_pcreposix/lib_pcreposix.dsp
trunk/Externals/pcre/pcre-6.7/pcre_internal.h
trunk/Externals/pcre/pcretest/pcretest.dsp
trunk/Src/PreLink.bat
Modified: trunk/Externals/pcre/Changes.txt
===================================================================
--- trunk/Externals/pcre/Changes.txt 2008-01-13 19:12:43 UTC (rev 4907)
+++ trunk/Externals/pcre/Changes.txt 2008-01-13 20:57:58 UTC (rev 4908)
@@ -1,3 +1,7 @@
+2008-01-13 Kimmo
+ Modify PCRE project files to build into WinMerge's /Build and /BuildTmp folders
+ Modify pcre_internal.h to find created file from WinMerge's build folder
+
2006-11-07 Kimmo
Add PCRE to /Externals/pcre
New folder: /Externals/pcre
Modified: trunk/Externals/pcre/config_pcre/config_pcre.dsp
===================================================================
--- trunk/Externals/pcre/config_pcre/config_pcre.dsp 2008-01-13 19:12:43 UTC (rev 4907)
+++ trunk/Externals/pcre/config_pcre/config_pcre.dsp 2008-01-13 20:57:58 UTC (rev 4908)
@@ -27,19 +27,19 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Configure"
-# PROP BASE Intermediate_Dir "Configure"
+# PROP BASE Intermediate_Dir "..\..\..\BuildTmp\pcre\Configure"
# PROP BASE Cmd_Line "nmake /f "configure.mak""
# PROP BASE Rebuild_Opt "/a rebuild"
-# PROP BASE Target_File "..\bin\pcre_chartables.c"
+# PROP BASE Target_File "..\..\..\Build\pcre\bin\pcre_chartables.c"
# PROP BASE Bsc_Name ""
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\bin"
-# PROP Intermediate_Dir "."
+# PROP Output_Dir "..\..\..\Build\pcre\bin"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\pcre\"
# PROP Cmd_Line "nmake /f "configure.mak""
# PROP Rebuild_Opt "/a rebuild"
-# PROP Target_File "..\bin\pcre_chartables.c"
+# PROP Target_File "..\..\..\Build\pcre\bin\pcre_chartables.c"
# PROP Bsc_Name ""
# PROP Target_Dir ""
# Begin Target
Modified: trunk/Externals/pcre/config_pcre/configure.mak
===================================================================
--- trunk/Externals/pcre/config_pcre/configure.mak 2008-01-13 19:12:43 UTC (rev 4907)
+++ trunk/Externals/pcre/config_pcre/configure.mak 2008-01-13 20:57:58 UTC (rev 4908)
@@ -2,7 +2,7 @@
# Initial configuration for Win32
#
-BIN = ..\bin
+BIN = ..\..\..\Build\pcre\bin
SOURCES = ..\pcre-6.7
H_config = $(BIN)\config.h
Modified: trunk/Externals/pcre/dll_pcre/pcre.dsp
===================================================================
--- trunk/Externals/pcre/dll_pcre/pcre.dsp 2008-01-13 19:12:43 UTC (rev 4907)
+++ trunk/Externals/pcre/dll_pcre/pcre.dsp 2008-01-13 20:57:58 UTC (rev 4908)
@@ -38,8 +38,8 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\bin\release"
-# PROP Intermediate_Dir "o\release"
+# PROP Output_Dir "..\..\..\Build\pcre\bin\release"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\pcre\release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PCRE_EXPORTS" /YX /FD /c
@@ -57,7 +57,7 @@
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Cmds=mkdir ..\..\..\Build\pcre Copy ..\bin\release\pcre.lib ..\..\..\Build\pcre Copy ..\bin\release\pcre.dll ..\..\..\Build\pcre
+PostBuild_Cmds=mkdir ..\..\..\Build\pcre Copy ..\..\..\Build\pcre\bin\release\pcre.lib ..\..\..\Build\pcre Copy ..\..\..\Build\pcre\bin\release\pcre.dll ..\..\..\Build\pcre
# End Special Build Tool
!ELSEIF "$(CFG)" == "pcre - Win32 Debug"
@@ -69,8 +69,8 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\bin\debug"
-# PROP Intermediate_Dir "o\debug"
+# PROP Output_Dir "..\..\..\Build\pcre\bin\debug"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\pcre\debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PCRE_EXPORTS" /YX /FD /GZ /c
@@ -88,6 +88,7 @@
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# Begin Special Build Tool
SOURCE="$(InputPath)"
+PostBuild_Cmds=copy ..\..\..\Build\pcre\bin\debug\pcre.dll ..\..\..\Build\pcre copy ..\..\..\Build\pcre\bin\debug\pcre.lib ..\..\..\Build\pcre
# End Special Build Tool
!ENDIF
@@ -102,7 +103,7 @@
# End Source File
# Begin Source File
-SOURCE=..\bin\pcre_chartables.c
+SOURCE=..\..\..\Build\pcre\bin\pcre_chartables.c
# End Source File
# Begin Source File
Modified: trunk/Externals/pcre/lib_pcre/lib_pcre.dsp
===================================================================
--- trunk/Externals/pcre/lib_pcre/lib_pcre.dsp 2008-01-13 19:12:43 UTC (rev 4907)
+++ trunk/Externals/pcre/lib_pcre/lib_pcre.dsp 2008-01-13 20:57:58 UTC (rev 4908)
@@ -37,8 +37,8 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\bin\release"
-# PROP Intermediate_Dir "o\release"
+# PROP Output_Dir "..\..\..\Build\pcre\bin\release"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\pcre\release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "..\bin" /D "NDEBUG" /D "_LIB" /D "PCRE_STATIC" /FD /c
@@ -61,8 +61,8 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\bin\debug"
-# PROP Intermediate_Dir "o\debug"
+# PROP Output_Dir "..\..\..\Build\pcre\bin\debug"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\pcre\debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\bin" /D "_DEBUG" /D "_LIB" /D "PCRE_STATIC" /FR /FD /GZ /c
@@ -84,7 +84,7 @@
# Name "lib_pcre - Win32 Debug"
# Begin Source File
-SOURCE=..\bin\pcre_chartables.c
+SOURCE=..\..\..\Build\pcre\bin\pcre_chartables.c
# End Source File
# Begin Source File
Modified: trunk/Externals/pcre/lib_pcreposix/lib_pcreposix.dsp
===================================================================
--- trunk/Externals/pcre/lib_pcreposix/lib_pcreposix.dsp 2008-01-13 19:12:43 UTC (rev 4907)
+++ trunk/Externals/pcre/lib_pcreposix/lib_pcreposix.dsp 2008-01-13 20:57:58 UTC (rev 4908)
@@ -37,8 +37,8 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\bin\release"
-# PROP Intermediate_Dir "o\release"
+# PROP Output_Dir "..\..\..\Build\pcre\bin\release"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\pcre\release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "..\bin" /D "NDEBUG" /D "_LIB" /D "PCRE_STATIC" /FD /c
@@ -61,11 +61,11 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\bin\debug"
-# PROP Intermediate_Dir "o\debug"
+# PROP Output_Dir "..\..\..\Build\pcre\bin\debug"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\pcre\debug"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\bin" /D "_DEBUG" /D "_LIB" /D "PCRE_STATIC" /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\bin" /D "_DEBUG" /D "_LIB" /D "PCRE_STATIC" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
Modified: trunk/Externals/pcre/pcre-6.7/pcre_internal.h
===================================================================
--- trunk/Externals/pcre/pcre-6.7/pcre_internal.h 2008-01-13 19:12:43 UTC (rev 4907)
+++ trunk/Externals/pcre/pcre-6.7/pcre_internal.h 2008-01-13 20:57:58 UTC (rev 4908)
@@ -65,7 +65,7 @@
/* Get the definitions provided by running "configure" */
-#include "config.h"
+#include "..\..\..\Build\pcre\bin\config.h"
/* Standard C headers plus the external interface definition. The only time
setjmp and stdarg are used is when NO_RECURSE is set. */
Modified: trunk/Externals/pcre/pcretest/pcretest.dsp
===================================================================
--- trunk/Externals/pcre/pcretest/pcretest.dsp 2008-01-13 19:12:43 UTC (rev 4907)
+++ trunk/Externals/pcre/pcretest/pcretest.dsp 2008-01-13 20:57:58 UTC (rev 4908)
@@ -37,8 +37,8 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\bin\release"
-# PROP Intermediate_Dir "o\release"
+# PROP Output_Dir "..\..\..\Build\pcre\bin\release"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\pcre\release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
@@ -50,8 +50,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "pcretest - Win32 Debug"
@@ -62,12 +62,12 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\bin\debug"
-# PROP Intermediate_Dir "o\debug"
+# PROP Output_Dir "..\..\..\Build\pcre\bin\debug"
+# PROP Intermediate_Dir "..\..\..\BuildTmp\pcre\debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\bin" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "PCRE_STATIC" /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\bin" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "PCRE_STATIC" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -75,8 +75,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# SUBTRACT LINK32 /verbose
!ENDIF
Modified: trunk/Src/PreLink.bat
===================================================================
--- trunk/Src/PreLink.bat 2008-01-13 19:12:43 UTC (rev 4907)
+++ trunk/Src/PreLink.bat 2008-01-13 20:57:58 UTC (rev 4908)
@@ -69,8 +69,8 @@
cd %2\..\..\..\Externals\pcre\dll_pcre
%msdev% "pcre.dsp" /make "pcre - Win32 Debug"
%devenv% "pcre.vcproj" /build "Debug"
-copy ..\bin\debug\pcre.lib %2\..\..\..\Build\pcre
-copy ..\bin\debug\pcre.dll %2\..
+cd %2\..\..\expat
+copy bin\debug\pcre.dll %2\..
goto Common
:Release
@@ -94,8 +94,8 @@
cd %2\..\..\..\Externals\pcre\dll_pcre
%msdev% "pcre.dsp" /make "pcre - Win32 Release"
%devenv% "pcre.vcproj" /build "Release"
-copy ..\bin\release\pcre.lib %2\..\..\..\Build\pcre
-copy ..\bin\release\pcre.dll %2\..
+cd %2\..\..\expat
+copy bin\release\pcre.dll %2\..
goto Common
:Common
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
