Thread: [Winmerge-svn] SF.net SVN: winmerge:[5641] branches/R2_10
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
Menu
▾
▴
winmerge-svn
|
From: <ki...@us...> - 2008-07-19 17:27:07
|
Revision: 5641
http://winmerge.svn.sourceforge.net/winmerge/?rev=5641&view=rev
Author: kimmov
Date: 2008-07-19 17:23:48 +0000 (Sat, 19 Jul 2008)
Log Message:
-----------
BUG: [ 2010463 ] False warning: about to close several compare windows
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/MainFrm.cpp
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-19 17:14:25 UTC (rev 5640)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-19 17:23:48 UTC (rev 5641)
@@ -12,6 +12,8 @@
BugFix: ANSI build crash in folder compare (#2010053)
BugFix: Add insert/overtype mode indicator to statusbar (#2015174)
BugFix: Detected UTF-8 encoding shown as 65001 (#2012377)
+ Bugfix: Don't warn about closing multiple windows when only one
+ window is open (#2010463)
WinMerge 2.10.x (R2_10) branch created (r5561)
Modified: branches/R2_10/Src/MainFrm.cpp
===================================================================
--- branches/R2_10/Src/MainFrm.cpp 2008-07-19 17:14:25 UTC (rev 5640)
+++ branches/R2_10/Src/MainFrm.cpp 2008-07-19 17:23:48 UTC (rev 5641)
@@ -3343,6 +3343,14 @@
const int count = dirdocs.GetCount() + mergedocs.GetCount();
if (count > 1)
{
+ // Check that we don't have one empty dirdoc + mergedoc situation.
+ // That happens since we open "hidden" dirdoc for every file compare.
+ if (dirdocs.GetCount() == 1)
+ {
+ CDirDoc *pDoc = dirdocs.GetHead();
+ if (!pDoc->HasDiffs())
+ return true;
+ }
ret = LangMessageBox(IDS_CLOSEALL_WINDOWS, MB_YESNO | MB_ICONWARNING);
}
return (ret == IDYES);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-07-21 09:43:38
|
Revision: 5647
http://winmerge.svn.sourceforge.net/winmerge/?rev=5647&view=rev
Author: kimmov
Date: 2008-07-21 09:41:45 +0000 (Mon, 21 Jul 2008)
Log Message:
-----------
PATCH: [ 2013845 ] Add option to enable plugins (disabled by default)
PATCH: [ 2021722 ] Add dialog listing available plugins
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/ConfigLog.cpp
branches/R2_10/Src/ConfigLog.h
branches/R2_10/Src/DiffContext.cpp
branches/R2_10/Src/DiffContext.h
branches/R2_10/Src/DiffWrapper.cpp
branches/R2_10/Src/DiffWrapper.h
branches/R2_10/Src/DirDoc.cpp
branches/R2_10/Src/DirView.cpp
branches/R2_10/Src/DirView.h
branches/R2_10/Src/FolderCmp.cpp
branches/R2_10/Src/Languages/English.pot
branches/R2_10/Src/MainFrm.cpp
branches/R2_10/Src/MainFrm.h
branches/R2_10/Src/Merge.rc
branches/R2_10/Src/Merge.vcproj
branches/R2_10/Src/MergeDoc.cpp
branches/R2_10/Src/MergeEditView.cpp
branches/R2_10/Src/MergeEditView.h
branches/R2_10/Src/OptionsDef.h
branches/R2_10/Src/OptionsInit.cpp
branches/R2_10/Src/resource.h
Added Paths:
-----------
branches/R2_10/Src/PluginsListDlg.cpp
branches/R2_10/Src/PluginsListDlg.h
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-20 16:22:24 UTC (rev 5646)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-21 09:41:45 UTC (rev 5647)
@@ -8,6 +8,8 @@
Manual: Reorganize structure (#2011924)
Add ShellExtension menu for drive letters (root folders) (#2011602)
Remove buildall.bat (#2013576)
+ New option to enable plugins (disabled by default) (#2013845)
+ Add dialog listing available plugins (#2021722)
BugFix: Use system codepage for paths (#1979429, #2008581)
BugFix: ANSI build crash in folder compare (#2010053)
BugFix: Add insert/overtype mode indicator to statusbar (#2015174)
Modified: branches/R2_10/Src/ConfigLog.cpp
===================================================================
--- branches/R2_10/Src/ConfigLog.cpp 2008-07-20 16:22:24 UTC (rev 5646)
+++ branches/R2_10/Src/ConfigLog.cpp 2008-07-21 09:41:45 UTC (rev 5647)
@@ -508,12 +508,13 @@
WriteLocaleSettings(m_file, LOCALE_SYSTEM_DEFAULT, _T("Locale (System)"));
// Codepage settings
- WriteItemYesNo(0, _T("Detect codepage automatically for RC and HTML files"), &m_cpSettings.bDetectCodepage);
+ WriteItemYesNo(1, _T("Detect codepage automatically for RC and HTML files"), &m_cpSettings.bDetectCodepage);
WriteItem(m_file, 1, _T("unicoder codepage"), getDefaultCodepage());
// Plugins
- FileWriteString(_T("\nPlugins: "));
- FileWriteString(_T("\n Unpackers: "));
+ FileWriteString(_T("\nPlugins:\n"));
+ WriteItemYesNo(1, _T("Plugins enabled"), &m_miscSettings.bPluginsEnabled);
+ FileWriteString(_T(" Unpackers: "));
WritePluginsInLogFile(L"FILE_PACK_UNPACK", m_file);
WritePluginsInLogFile(L"BUFFER_PACK_UNPACK", m_file);
FileWriteString(_T("\n Prediffers: "));
Modified: branches/R2_10/Src/ConfigLog.h
===================================================================
--- branches/R2_10/Src/ConfigLog.h 2008-07-20 16:22:24 UTC (rev 5646)
+++ branches/R2_10/Src/ConfigLog.h 2008-07-21 09:41:45 UTC (rev 5647)
@@ -67,6 +67,7 @@
BOOL bSyntaxHighlight;
BOOL bInsertTabs;
INT nTabSize;
+ BOOL bPluginsEnabled;
};
/**
Modified: branches/R2_10/Src/DiffContext.cpp
===================================================================
--- branches/R2_10/Src/DiffContext.cpp 2008-07-20 16:22:24 UTC (rev 5646)
+++ branches/R2_10/Src/DiffContext.cpp 2008-07-21 09:41:45 UTC (rev 5647)
@@ -70,6 +70,7 @@
, m_pFilterList(NULL)
, m_pCompareOptions(NULL)
, m_pOptions(NULL)
+, m_bPluginsEnabled(false)
{
m_paths.SetLeft(pszLeft);
m_paths.SetRight(pszRight);
Modified: branches/R2_10/Src/DiffContext.h
===================================================================
--- branches/R2_10/Src/DiffContext.h 2008-07-20 16:22:24 UTC (rev 5646)
+++ branches/R2_10/Src/DiffContext.h 2008-07-21 09:41:45 UTC (rev 5647)
@@ -152,6 +152,7 @@
* cannot compare large files. And large files are usually binary files.
*/
int m_nQuickCompareLimit;
+ bool m_bPluginsEnabled; /**< Are plugins enabled? */
FilterList * m_pFilterList; /**< Filter list for line filters */
private:
Modified: branches/R2_10/Src/DiffWrapper.cpp
===================================================================
--- branches/R2_10/Src/DiffWrapper.cpp 2008-07-20 16:22:24 UTC (rev 5646)
+++ branches/R2_10/Src/DiffWrapper.cpp 2008-07-21 09:41:45 UTC (rev 5647)
@@ -91,6 +91,7 @@
, m_bPathsAreTemp(FALSE)
, m_pMovedLines(NULL)
, m_pFilterList(NULL)
+, m_bPluginsEnabled(false)
{
ZeroMemory(&m_status, sizeof(DIFFSTATUS));
// character that ends a line. Currently this is always `\n'
@@ -109,6 +110,15 @@
}
/**
+ * @brief Set plugins enabled/disabled.
+ * @param [in] enable if true plugins are enabled.
+ */
+void CDiffWrapper::EnablePlugins(bool enable)
+{
+ m_bPluginsEnabled = enable;
+}
+
+/**
* @brief Enables/disables patch-file creation and sets filename.
* This function enables or disables patch file creation. When
* @p filename is empty, patch files are disabled.
@@ -663,34 +673,53 @@
replace_char(&*filepath2.begin(), '/', '\\');
BOOL bRet = TRUE;
- String strFile1Temp = filepath1;
- String strFile2Temp = filepath2;
+ String strFile1Temp(filepath1);
+ String strFile2Temp(filepath2);
m_options.SetToDiffUtils();
if (m_bUseDiffList)
m_nDiffs = m_pDiffList->GetSize();
- // Do the preprocessing now, overwrite the temp files
- // NOTE: FileTransform_UCS2ToUTF8() may create new temp
- // files and return new names, those created temp files
- // are deleted in end of function.
- if (m_infoPrediffer->bToBeScanned)
+ if (m_bPluginsEnabled)
{
- // this can only fail if the data can not be saved back (no more
- // place on disk ???) What to do then ??
- FileTransform_Prediffing(strFile1Temp, m_sToFindPrediffer.c_str(), m_infoPrediffer,
- m_bPathsAreTemp);
- }
- else
- {
- // This can fail if the prediffer has a problem
- if (FileTransform_Prediffing(strFile1Temp, *m_infoPrediffer,
+ // Do the preprocessing now, overwrite the temp files
+ // NOTE: FileTransform_UCS2ToUTF8() may create new temp
+ // files and return new names, those created temp files
+ // are deleted in end of function.
+ if (m_infoPrediffer->bToBeScanned)
+ {
+ // this can only fail if the data can not be saved back (no more
+ // place on disk ???) What to do then ??
+ FileTransform_Prediffing(strFile1Temp, m_sToFindPrediffer.c_str(), m_infoPrediffer,
+ m_bPathsAreTemp);
+ }
+ else
+ {
+ // This can fail if the prediffer has a problem
+ if (FileTransform_Prediffing(strFile1Temp, *m_infoPrediffer,
+ m_bPathsAreTemp) == FALSE)
+ {
+ // display a message box
+ CString sError;
+ LangFormatString2(sError, IDS_PREDIFFER_ERROR, strFile1Temp.c_str(),
+ m_infoPrediffer->pluginName.c_str());
+ AfxMessageBox(sError, MB_OK | MB_ICONSTOP);
+ // don't use any more this prediffer
+ m_infoPrediffer->bToBeScanned = FALSE;
+ m_infoPrediffer->pluginName.erase();
+ }
+ }
+
+ // We use the same plugin for both files, so it must be defined before
+ // second file
+ ASSERT(m_infoPrediffer->bToBeScanned == FALSE);
+ if (FileTransform_Prediffing(strFile2Temp, *m_infoPrediffer,
m_bPathsAreTemp) == FALSE)
{
// display a message box
CString sError;
- LangFormatString2(sError, IDS_PREDIFFER_ERROR, strFile1Temp.c_str(),
+ LangFormatString2(sError, IDS_PREDIFFER_ERROR, strFile2Temp.c_str(),
m_infoPrediffer->pluginName.c_str());
AfxMessageBox(sError, MB_OK | MB_ICONSTOP);
// don't use any more this prediffer
@@ -699,22 +728,11 @@
}
}
+ // Comparing UTF-8 files seems to require this conversion?
+ // I'm still very confused about why, as what the functions
+ // document doing is UCS2 to UTF-8 conversion, nothing else.
+ // Something is wrong here. - Kimmo
FileTransform_UCS2ToUTF8(strFile1Temp, m_bPathsAreTemp);
- // We use the same plugin for both files, so it must be defined before
- // second file
- ASSERT(m_infoPrediffer->bToBeScanned == FALSE);
- if (FileTransform_Prediffing(strFile2Temp, *m_infoPrediffer,
- m_bPathsAreTemp) == FALSE)
- {
- // display a message box
- CString sError;
- LangFormatString2(sError, IDS_PREDIFFER_ERROR, strFile2Temp.c_str(),
- m_infoPrediffer->pluginName.c_str());
- AfxMessageBox(sError, MB_OK | MB_ICONSTOP);
- // don't use any more this prediffer
- m_infoPrediffer->bToBeScanned = FALSE;
- m_infoPrediffer->pluginName.erase();
- }
FileTransform_UCS2ToUTF8(strFile2Temp, m_bPathsAreTemp);
DiffFileData diffdata;
@@ -793,26 +811,28 @@
// Done with diffutils filedata
diffdata.Close();
- // Delete temp files transformation functions possibly created
- if (lstrcmpi(filepath1.c_str(), strFile1Temp.c_str()) != 0)
+ if (m_bPluginsEnabled)
{
- if (!::DeleteFile(strFile1Temp.c_str()))
+ // Delete temp files transformation functions possibly created
+ if (lstrcmpi(filepath1.c_str(), strFile1Temp.c_str()) != 0)
{
- LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- strFile1Temp.c_str(), GetSysError(GetLastError())));
+ if (!::DeleteFile(strFile1Temp.c_str()))
+ {
+ LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
+ strFile1Temp.c_str(), GetSysError(GetLastError())));
+ }
+ strFile1Temp.erase();
}
- strFile1Temp.erase();
- }
- if (lstrcmpi(filepath2.c_str(), strFile2Temp.c_str()) != 0)
- {
- if (!::DeleteFile(strFile2Temp.c_str()))
+ if (lstrcmpi(filepath2.c_str(), strFile2Temp.c_str()) != 0)
{
- LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- strFile2Temp.c_str(), GetSysError(GetLastError())));
+ if (!::DeleteFile(strFile2Temp.c_str()))
+ {
+ LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
+ strFile2Temp.c_str(), GetSysError(GetLastError())));
+ }
+ strFile2Temp.erase();
}
- strFile2Temp.erase();
}
-
return bRet;
}
Modified: branches/R2_10/Src/DiffWrapper.h
===================================================================
--- branches/R2_10/Src/DiffWrapper.h 2008-07-20 16:22:24 UTC (rev 5646)
+++ branches/R2_10/Src/DiffWrapper.h 2008-07-21 09:41:45 UTC (rev 5647)
@@ -168,6 +168,7 @@
MovedLines * GetMovedLines() { return m_pMovedLines; }
void SetCompareFiles(const String &OriginalFile1, const String &OriginalFile2);
void SetFilterList(LPCTSTR filterStr);
+ void EnablePlugins(bool enable);
protected:
String FormatSwitchString();
@@ -202,6 +203,7 @@
DiffList *m_pDiffList; /**< Pointer to external DiffList */
MovedLines * m_pMovedLines;
FilterCommentsManager * m_FilterCommentsManager; /**< Comments filtering manager */
+ bool m_bPluginsEnabled; /**< Are plugins enabled? */
};
Modified: branches/R2_10/Src/DirDoc.cpp
===================================================================
--- branches/R2_10/Src/DirDoc.cpp 2008-07-20 16:22:24 UTC (rev 5646)
+++ branches/R2_10/Src/DirDoc.cpp 2008-07-21 09:41:45 UTC (rev 5647)
@@ -343,6 +343,7 @@
m_pCtxt->m_bIgnoreSmallTimeDiff = GetOptionsMgr()->GetBool(OPT_IGNORE_SMALL_FILETIME);
m_pCtxt->m_bStopAfterFirstDiff = GetOptionsMgr()->GetBool(OPT_CMP_STOP_AFTER_FIRST);
m_pCtxt->m_nQuickCompareLimit = GetOptionsMgr()->GetInt(OPT_CMP_QUICK_LIMIT);
+ m_pCtxt->m_bPluginsEnabled = GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED);
m_pCtxt->m_pCompareStats = m_pCompareStats;
// Set total items count since we don't collect items
Modified: branches/R2_10/Src/DirView.cpp
===================================================================
--- branches/R2_10/Src/DirView.cpp 2008-07-20 16:22:24 UTC (rev 5646)
+++ branches/R2_10/Src/DirView.cpp 2008-07-21 09:41:45 UTC (rev 5647)
@@ -47,6 +47,7 @@
#include "DirCmpReport.h"
#include "DirCompProgressDlg.h"
#include "CompareStatisticsDlg.h"
+#include "PluginsListDlg.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -222,6 +223,7 @@
ON_COMMAND(ID_EDIT_PASTE, OnEditPaste)
ON_COMMAND(ID_EDIT_UNDO, OnEditUndo)
ON_UPDATE_COMMAND_UI(ID_EDIT_UNDO, OnUpdateEditUndo)
+ ON_COMMAND(ID_PLUGINS_LIST, &CDirView::OnPluginsList)
//}}AFX_MSG_MAP
ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick)
ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, OnItemChanged)
@@ -3210,3 +3212,12 @@
pCmdUI->Enable(FALSE);
}
}
+
+/**
+ * @brief Show the plugins list dialog.
+ */
+void CDirView::OnPluginsList()
+{
+ PluginsListDlg dlg;
+ dlg.DoModal();
+}
Modified: branches/R2_10/Src/DirView.h
===================================================================
--- branches/R2_10/Src/DirView.h 2008-07-20 16:22:24 UTC (rev 5646)
+++ branches/R2_10/Src/DirView.h 2008-07-21 09:41:45 UTC (rev 5647)
@@ -373,13 +373,14 @@
afx_msg void OnEditPaste();
afx_msg void OnEditUndo();
afx_msg void OnUpdateEditUndo(CCmdUI* pCmdUI);
+ afx_msg void OnItemChanged(NMHDR* pNMHDR, LRESULT* pResult);
+ afx_msg void OnBeginLabelEdit(NMHDR* pNMHDR, LRESULT* pResult);
+ afx_msg void OnEndLabelEdit(NMHDR* pNMHDR, LRESULT* pResult);
+ afx_msg void OnPluginsList();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
BOOL OnHeaderBeginDrag(LPNMHEADER hdr, LRESULT* pResult);
BOOL OnHeaderEndDrag(LPNMHEADER hdr, LRESULT* pResult);
- afx_msg void OnItemChanged(NMHDR* pNMHDR, LRESULT* pResult);
- afx_msg void OnBeginLabelEdit(NMHDR* pNMHDR, LRESULT* pResult);
- afx_msg void OnEndLabelEdit(NMHDR* pNMHDR, LRESULT* pResult);
private:
void OpenSelection(PackingInfo * infoUnpacker = NULL);
Modified: branches/R2_10/Src/FolderCmp.cpp
===================================================================
--- branches/R2_10/Src/FolderCmp.cpp 2008-07-20 16:22:24 UTC (rev 5646)
+++ branches/R2_10/Src/FolderCmp.cpp 2008-07-21 09:41:45 UTC (rev 5647)
@@ -83,8 +83,6 @@
// Unpacked files will be deleted at end of this function.
plugCtxt->filepathTransformed1 = plugCtxt->filepathUnpacked1;
plugCtxt->filepathTransformed2 = plugCtxt->filepathUnpacked2;
- m_diffFileData.SetDisplayFilepaths(plugCtxt->origFileName1.c_str(),
- plugCtxt->origFileName2.c_str()); // store true names for diff utils patch file
if (!m_diffFileData.OpenFiles(plugCtxt->filepathTransformed1.c_str(),
plugCtxt->filepathTransformed2.c_str()))
{
@@ -92,9 +90,6 @@
return false;
}
- GuessCodepageEncoding(m_diffFileData.m_FileLocation[0].filepath.c_str(),
- &m_diffFileData.m_FileLocation[0].encoding, pCtxt->m_bGuessEncoding);
-
// Invoke prediff'ing plugins
if (!m_diffFileData.Filepath_Transform(m_diffFileData.m_FileLocation[0],
plugCtxt->filepathUnpacked1, plugCtxt->filepathTransformed1,
@@ -107,9 +102,6 @@
// we use the same plugins for both files, so they must be defined before second file
ASSERT(plugCtxt->infoPrediffer->bToBeScanned == FALSE);
- GuessCodepageEncoding(m_diffFileData.m_FileLocation[1].filepath.c_str(),
- &m_diffFileData.m_FileLocation[1].encoding, pCtxt->m_bGuessEncoding);
-
if (!m_diffFileData.Filepath_Transform(m_diffFileData.m_FileLocation[1],
plugCtxt->filepathUnpacked2, plugCtxt->filepathTransformed2,
filteredFilenames.c_str(), plugCtxt->infoPrediffer))
@@ -140,7 +132,6 @@
void FolderCmp::CleanupAfterPlugins(PluginsContext *plugCtxt)
{
- m_diffFileData.Reset();
// delete the temp files after comparison
if (plugCtxt->filepathTransformed1 != plugCtxt->filepathUnpacked1)
VERIFY(::DeleteFile(plugCtxt->filepathTransformed1.c_str()) ||
@@ -176,21 +167,42 @@
UINT code = DIFFCODE::FILE | DIFFCODE::CMPERR;
- // Run plugins
if (pCtxt->m_nCompMethod == CMP_CONTENT ||
pCtxt->m_nCompMethod == CMP_QUICK_CONTENT)
{
GetComparePaths(pCtxt, di, plugCtxt.origFileName1, plugCtxt.origFileName2);
- CString errStr;
- bool pluginsOk = RunPlugins(pCtxt, &plugCtxt, errStr);
- if (!pluginsOk)
+ m_diffFileData.SetDisplayFilepaths(plugCtxt.origFileName1.c_str(),
+ plugCtxt.origFileName2.c_str()); // store true names for diff utils patch file
+
+ // Run plugins
+ if (pCtxt->m_bPluginsEnabled)
{
- di.errorDesc = errStr;
- CleanupAfterPlugins(&plugCtxt);
- return code;
+ CString errStr;
+ bool pluginsOk = RunPlugins(pCtxt, &plugCtxt, errStr);
+ if (!pluginsOk)
+ {
+ di.errorDesc = errStr;
+ CleanupAfterPlugins(&plugCtxt);
+ return code;
+ }
}
+ else
+ {
+ if (!m_diffFileData.OpenFiles(plugCtxt.origFileName1.c_str(),
+ plugCtxt.origFileName2.c_str()))
+ {
+ di.errorDesc = _T("Error opening compared files");
+ return false;
+ }
+ }
+
+ GuessCodepageEncoding(m_diffFileData.m_FileLocation[0].filepath.c_str(),
+ &m_diffFileData.m_FileLocation[0].encoding, pCtxt->m_bGuessEncoding);
+ GuessCodepageEncoding(m_diffFileData.m_FileLocation[1].filepath.c_str(),
+ &m_diffFileData.m_FileLocation[1].encoding, pCtxt->m_bGuessEncoding);
}
+
// If either file is larger than limit compare files by quick contents
// This allows us to (faster) compare big binary files
if (pCtxt->m_nCompMethod == CMP_CONTENT &&
@@ -321,8 +333,9 @@
di.errorDesc = _T("Bad compare type");
}
- if (pCtxt->m_nCompMethod == CMP_CONTENT ||
- pCtxt->m_nCompMethod == CMP_QUICK_CONTENT)
+ m_diffFileData.Reset();
+ if (pCtxt->m_bPluginsEnabled && (pCtxt->m_nCompMethod == CMP_CONTENT ||
+ pCtxt->m_nCompMethod == CMP_QUICK_CONTENT))
{
CleanupAfterPlugins(&plugCtxt);
}
Modified: branches/R2_10/Src/Languages/English.pot
===================================================================
--- branches/R2_10/Src/Languages/English.pot 2008-07-20 16:22:24 UTC (rev 5646)
+++ branches/R2_10/Src/Languages/English.pot 2008-07-21 09:41:45 UTC (rev 5647)
@@ -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-06-29 21:16+0000\n"
+"POT-Creation-Date: 2008-07-21 12:26+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:496
+#: Merge.rc:502
#, c-format
msgid "&Copy"
msgstr ""
@@ -80,7 +80,7 @@
msgstr ""
#: Merge.rc:84
-#: Merge.rc:577
+#: Merge.rc:583
#, c-format
msgid "&Goto..."
msgstr ""
@@ -91,43 +91,43 @@
msgstr ""
#: Merge.rc:88
-#: Merge.rc:519
#: Merge.rc:525
+#: Merge.rc:531
#, c-format
msgid "with &Registered Application"
msgstr ""
#: Merge.rc:89
-#: Merge.rc:520
#: Merge.rc:526
+#: Merge.rc:532
#, c-format
msgid "with &External Editor"
msgstr ""
#: Merge.rc:90
-#: Merge.rc:521
#: Merge.rc:527
+#: Merge.rc:533
#, c-format
msgid "&with..."
msgstr ""
#: Merge.rc:110
-#: Merge.rc:189
-#: Merge.rc:303
+#: Merge.rc:191
+#: Merge.rc:307
#, c-format
msgid "&File"
msgstr ""
#: Merge.rc:112
-#: Merge.rc:191
-#: Merge.rc:305
+#: Merge.rc:193
+#: Merge.rc:309
#, c-format
msgid "&New\tCtrl+N"
msgstr ""
#: Merge.rc:113
-#: Merge.rc:192
-#: Merge.rc:306
+#: Merge.rc:194
+#: Merge.rc:310
#, c-format
msgid "&Open...\tCtrl+O"
msgstr ""
@@ -138,15 +138,15 @@
msgstr ""
#: Merge.rc:116
-#: Merge.rc:194
-#: Merge.rc:308
+#: Merge.rc:196
+#: Merge.rc:312
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr ""
#: Merge.rc:117
-#: Merge.rc:195
-#: Merge.rc:309
+#: Merge.rc:197
+#: Merge.rc:313
#, c-format
msgid "Sa&ve Project..."
msgstr ""
@@ -157,5310 +157,5356 @@
msgstr ""
#: Merge.rc:121
-#: Merge.rc:202
-#: Merge.rc:341
+#: Merge.rc:204
+#: Merge.rc:345
#, c-format
msgid "E&xit"
msgstr ""
#: Merge.rc:123
-#: Merge.rc:204
-#: Merge.rc:343
+#: Merge.rc:206
+#: Merge.rc:347
#, c-format
msgid "&Edit"
msgstr ""
#: Merge.rc:125
-#: Merge.rc:208
-#: Merge.rc:377
+#: Merge.rc:210
+#: Merge.rc:381
#, c-format
msgid "&Options..."
msgstr ""
#: Merge.rc:127
-#: Merge.rc:210
-#: Merge.rc:379
+#: Merge.rc:212
+#: Merge.rc:383
#, c-format
msgid "&View"
msgstr ""
#: Merge.rc:129
-#: Merge.rc:221
-#: Merge.rc:381
+#: Merge.rc:223
+#: Merge.rc:385
#, c-format
msgid "Select &Font..."
msgstr ""
#: Merge.rc:130
-#: Merge.rc:222
-#: Merge.rc:382
+#: Merge.rc:224
+#: Merge.rc:386
#, c-format
msgid "Use Default F&ont"
msgstr ""
#: Merge.rc:132
-#: Merge.rc:224
-#: Merge.rc:403
+#: Merge.rc:226
+#: Merge.rc:407
#, c-format
msgid "&Toolbar"
msgstr ""
#: Merge.rc:134
-#: Merge.rc:226
-#: Merge.rc:405
+#: Merge.rc:228
+#: Merge.rc:409
#, c-format
msgid "&None"
msgstr ""
#: Merge.rc:135
-#: Merge.rc:227
-#: Merge.rc:406
+#: Merge.rc:229
+#: Merge.rc:410
#, c-format
msgid "&Small"
msgstr ""
#: Merge.rc:136
-#: Merge.rc:228
-#: Merge.rc:407
+#: Merge.rc:230
+#: Merge.rc:411
#, c-format
msgid "&Big"
msgstr ""
#: Merge.rc:138
-#: Merge.rc:230
-#: Merge.rc:409
+#: Merge.rc:232
+#: Merge.rc:413
#, c-format
msgid "&Status Bar"
msgstr ""
#: Merge.rc:139
-#: Merge.rc:231
-#: Merge.rc:410
+#: Merge.rc:233
+#: Merge.rc:414
#, c-format
msgid "Ta&b Bar"
msgstr ""
#: Merge.rc:141
-#: Merge.rc:234
-#: Merge.rc:414
+#: Merge.rc:236
+#: Merge.rc:418
#, c-format
msgid "&Language..."
msgstr ""
#: Merge.rc:143
-#: Merge.rc:255
-#: Merge.rc:436
+#: Merge.rc:257
+#: Merge.rc:440
#, c-format
msgid "&Tools"
msgstr ""
#: Merge.rc:145
-#: Merge.rc:258
-#: Merge.rc:438
+#: Merge.rc:260
+#: Merge.rc:442
#, c-format
msgid "&Filters..."
msgstr ""
#: Merge.rc:146
-#: Merge.rc:259
-#: Merge.rc:439
+#: Merge.rc:261
+#: Merge.rc:443
#, c-format
msgid "&Generate Patch..."
msgstr ""
#: Merge.rc:148
-#: Merge.rc:262
-#: Merge.rc:442
+#: Merge.rc:264
+#: Merge.rc:446
#, c-format
msgid "&Plugins"
msgstr ""
#: Merge.rc:150
-#: Merge.rc:264
-#: Merge.rc:444
+#: Merge.rc:266
+#: Merge.rc:448
#, c-format
+msgid "&List..."
+msgstr ""
+
+#: Merge.rc:152
+#: Merge.rc:268
+#: Merge.rc:450
+#, c-format
msgid "&Manual Unpacking"
msgstr ""
-#: Merge.rc:151
-#: Merge.rc:265
-#: Merge.rc:445
+#: Merge.rc:153
+#: Merge.rc:269
+#: Merge.rc:451
#, c-format
msgid "&Automatic Unpacking"
msgstr ""
-#: Merge.rc:153
-#: Merge.rc:267
-#: Merge.rc:447
+#: Merge.rc:155
+#: Merge.rc:271
+#: Merge.rc:453
#, c-format
msgid "&Edit with Unpacker"
msgstr ""
-#: Merge.rc:155
-#: Merge.rc:269
-#: Merge.rc:454
+#: Merge.rc:157
+#: Merge.rc:273
+#: Merge.rc:460
#, c-format
msgid "&Reload plugins"
msgstr ""
-#: Merge.rc:157
-#: Merge.rc:271
-#: Merge.rc:456
+#: Merge.rc:159
+#: Merge.rc:275
+#: Merge.rc:462
#, c-format
msgid "&Debug"
msgstr ""
-#: Merge.rc:159
-#: Merge.rc:273
-#: Merge.rc:458
+#: Merge.rc:161
+#: Merge.rc:277
+#: Merge.rc:464
#, c-format
msgid "&Load Config..."
msgstr ""
-#: Merge.rc:160
-#: Merge.rc:274
-#: Merge.rc:459
+#: Merge.rc:162
+#: Merge.rc:278
+#: Merge.rc:465
#, c-format
msgid "&Reset Options"
msgstr ""
-#: Merge.rc:162
-#: Merge.rc:276
-#: Merge.rc:461
+#: Merge.rc:164
+#: Merge.rc:280
+#: Merge.rc:467
#, c-format
msgid "&Window"
msgstr ""
-#: Merge.rc:164
-#: Merge.rc:278
-#: Merge.rc:463
+#: Merge.rc:166
+#: Merge.rc:282
+#: Merge.rc:469
#, c-format
msgid "Cl&ose"
msgstr ""
-#: Merge.rc:165
-#: Merge.rc:279
-#: Merge.rc:464
+#: Merge.rc:167
+#: Merge.rc:283
+#: Merge.rc:470
#, c-format
msgid "Clo&se All"
msgstr ""
-#: Merge.rc:167
-#: Merge.rc:281
-#: Merge.rc:466
+#: Merge.rc:169
+#: Merge.rc:285
+#: Merge.rc:472
#, c-format
msgid "Change &Pane\tF6"
msgstr ""
-#: Merge.rc:169
-#: Merge.rc:283
-#: Merge.rc:468
+#: Merge.rc:171
+#: Merge.rc:287
+#: Merge.rc:474
#, c-format
msgid "Tile &Horizontally"
msgstr ""
-#: Merge.rc:170
-#: Merge.rc:284
-#: Merge.rc:469
+#: Merge.rc:172
+#: Merge.rc:288
+#: Merge.rc:475
#, c-format
msgid "Tile &Vertically"
msgstr ""
-#: Merge.rc:171
-#: Merge.rc:285
-#: Merge.rc:470
+#: Merge.rc:173
+#: Merge.rc:289
+#: Merge.rc:476
#, c-format
msgid "&Cascade"
msgstr ""
-#: Merge.rc:173
-#: Merge.rc:287
-#: Merge.rc:472
-#: Merge.rc:1891
+#: Merge.rc:175
+#: Merge.rc:291
+#: Merge.rc:478
+#: Merge.rc:1911
#, c-format
msgid "&Help"
msgstr ""
-#: Merge.rc:175
-#: Merge.rc:289
-#: Merge.rc:474
+#: Merge.rc:177
+#: Merge.rc:293
+#: Merge.rc:480
#, c-format
msgid "&WinMerge Help\tF1"
msgstr ""
-#: Merge.rc:177
-#: Merge.rc:291
-#: Merge.rc:476
+#: Merge.rc:179
+#: Merge.rc:295
+#: Merge.rc:482
#, c-format
msgid "R&elease Notes"
msgstr ""
-#: Merge.rc:178
-#: Merge.rc:292
-#: Merge.rc:477
+#: Merge.rc:180
+#: Merge.rc:296
+#: Merge.rc:483
#, c-format
msgid "&Translations"
msgstr ""
-#: Merge.rc:179
-#: Merge.rc:293
-#: Merge.rc:478
+#: Merge.rc:181
+#: Merge.rc:297
+#: Merge.rc:484
#, c-format
msgid "C&onfiguration"
msgstr ""
-#: Merge.rc:180
-#: Merge.rc:294
-#: Merge.rc:479
+#: Merge.rc:182
+#: Merge.rc:298
+#: Merge.rc:485
#, c-format
msgid "A&rchive Support disabled..."
msgstr ""
-#: Merge.rc:182
-#: Merge.rc:296
-#: Merge.rc:481
+#: Merge.rc:184
+#: Merge.rc:300
+#: Merge.rc:487
#, c-format
msgid "&GNU General Public License"
msgstr ""
-#: Merge.rc:183
-#: Merge.rc:297
-#: Merge.rc:482
+#: Merge.rc:185
+#: Merge.rc:301
+#: Merge.rc:488
#, c-format
msgid "&About WinMerge..."
msgstr ""
-#: Merge.rc:197
-#: Merge.rc:327
+#: Merge.rc:199
+#: Merge.rc:331
#, c-format
msgid "L&eft Read-only"
msgstr ""
-#: Merge.rc:198
-#: Merge.rc:328
+#: Merge.rc:200
+#: Merge.rc:332
#, c-format
msgid "Ri&ght Read-only"
msgstr ""
-#: Merge.rc:200
+#: Merge.rc:202
#, c-format
msgid "File En&coding"
msgstr ""
-#: Merge.rc:206
-#: Merge.rc:353
+#: Merge.rc:208
+#: Merge.rc:357
#, c-format
msgid "Select &All\tCtrl+A"
msgstr ""
-#: Merge.rc:212
+#: Merge.rc:214
#, c-format
msgid "Show &Identical Items"
msgstr ""
-#: Merge.rc:213
+#: Merge.rc:215
#, c-format
msgid "Show &Different Items"
msgstr ""
-#: Merge.rc:214
+#: Merge.rc:216
#, c-format
msgid "Show L&eft Unique Items"
msgstr ""
-#: Merge.rc:215
+#: Merge.rc:217
#, c-format
msgid "Show Ri&ght Unique Items"
msgstr ""
-#: Merge.rc:216
+#: Merge.rc:218
#, c-format
msgid "Show S&kipped Items"
msgstr ""
-#: Merge.rc:217
+#: Merge.rc:219
#, c-format
msgid "S&how Binary Files"
msgstr ""
-#: Merge.rc:219
+#: Merge.rc:221
#, c-format
msgid "Show Hidd&en Items"
msgstr ""
-#: Merge.rc:232
+#: Merge.rc:234
#, c-format
msgid "Compa&re Statistics"
msgstr ""
-#: Merge.rc:236
-#: Merge.rc:416
+#: Merge.rc:238
+#: Merge.rc:420
#, c-format
msgid "Refre&sh\tF5"
msgstr ""
-#: Merge.rc:237
+#: Merge.rc:239
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr ""
-#: Merge.rc:239
-#: Merge.rc:418
+#: Merge.rc:241
+#: Merge.rc:422
#, c-format
msgid "&Merge"
msgstr ""
-#: Merge.rc:241
+#: Merge.rc:243
#, c-format
msgid "Co&mpare\tEnter"
msgstr ""
-#: Merge.rc:243
-#: Merge.rc:420
+#: Merge.rc:245
+#: Merge.rc:424
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr ""
-#: Merge.rc:244
-#: Merge.rc:421
+#: Merge.rc:246
+#: Merge.rc:425
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr ""
-#: Merge.rc:246
-#: Merge.rc:423
+#: Merge.rc:248
+#: Merge.rc:427
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr ""
-#: Merge.rc:247
-#: Merge.rc:424
+#: Merge.rc:249
+#: Merge.rc:428
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr ""
-#: Merge.rc:248
-#: Merge.rc:425
+#: Merge.rc:250
+#: Merge.rc:429
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr ""
-#: Merge.rc:250
-#: Merge.rc:427
+#: Merge.rc:252
+#: Merge.rc:431
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr ""
-#: Merge.rc:251
-#: Merge.rc:428
+#: Merge.rc:253
+#: Merge.rc:432
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr ""
-#: Merge.rc:253
+#: Merge.rc:255
#, c-format
msgid "&Delete\tDel"
msgstr ""
-#: Merge.rc:257
-#: Merge.rc:550
+#: Merge.rc:259
+#: Merge.rc:556
#, c-format
msgid "&Customize Columns..."
msgstr ""
-#: Merge.rc:260
-#: Merge.rc:440
+#: Merge.rc:262
+#: Merge.rc:444
#, c-format
msgid "Generate &Report..."
msgstr ""
-#: Merge.rc:311
+#: Merge.rc:315
#, c-format
msgid "&Save\tCtrl+S"
msgstr ""
-#: Merge.rc:312
+#: Merge.rc:316
#, c-format
msgid "Save &Left"
msgstr ""
-#: Merge.rc:314
-#: Merge.rc:319
+#: Merge.rc:318
+#: Merge.rc:323
#, c-format
msgid "&Save"
msgstr ""
-#: Merge.rc:315
-#: Merge.rc:320
+#: Merge.rc:319
+#: Merge.rc:324
#, c-format
msgid "Save &As..."
msgstr ""
-#: Merge.rc:317
+#: Merge.rc:321
#, c-format
msgid "Save &Right"
msgstr ""
-#: Merge.rc:323
+#: Merge.rc:327
#, c-format
msgid "&Print..."
msgstr ""
-#: Merge.rc:324
+#: Merge.rc:328
#, c-format
msgid "Page Se&tup"
msgstr ""
-#: Merge.rc:325
+#: Merge.rc:329
#, c-format
msgid "Print Previe&w"
msgstr ""
-#: Merge.rc:330
+#: Merge.rc:334
#, c-format
msgid "&Convert Line Endings to"
msgstr ""
-#: Merge.rc:332
+#: Merge.rc:336
#, c-format
msgid "&Windows (CRLF)"
msgstr ""
-#: Merge.rc:333
+#: Merge.rc:337
#, c-format
msgid "&Unix (LF)"
msgstr ""
-#: Merge.rc:334
+#: Merge.rc:338
#, c-format
msgid "&Mac (CR)"
msgstr ""
-#: Merge.rc:337
+#: Merge.rc:341
#, c-format
msgid "&Merge Mode\tF9"
msgstr ""
-#: Merge.rc:339
+#: Merge.rc:343
#, c-format
msgid "&File Encoding..."
msgstr ""
-#: Merge.rc:345
+#: Merge.rc:349
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr ""
-#: Merge.rc:346
+#: Merge.rc:350
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr ""
-#: Merge.rc:348
+#: Merge.rc:352
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr ""
-#: Merge.rc:349
+#: Merge.rc:353
#, c-format
msgid "&Copy\tCtrl+C"
msgstr ""
-#: Merge.rc:350
+#: Merge.rc:354
#, c-format
msgid "&Paste\tCtrl+V"
msgstr ""
-#: Merge.rc:352
+#: Merge.rc:356
#, c-format
msgid "Select Line &Difference\tF4"
msgstr ""
-#: Merge.rc:355
+#: Merge.rc:359
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr ""
-#: Merge.rc:356
+#: Merge.rc:360
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr ""
-#: Merge.rc:358
+#: Merge.rc:362
#, c-format
msgid "&Scripts"
msgstr ""
-#: Merge.rc:360
-#: Merge.rc:2707
+#: Merge.rc:364
+#: Merge.rc:2738
#, c-format
msgid "< Empty >"
msgstr ""
-#: Merge.rc:363
+#: Merge.rc:367
#, c-format
msgid "Advanced"
msgstr ""
-#: Merge.rc:365
+#: Merge.rc:369
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr ""
-#: Merge.rc:368
+#: Merge.rc:372
#, c-format
msgid "&Bookmarks"
msgstr ""
-#: Merge.rc:370
+#: Merge.rc:374
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr ""
-#: Merge.rc:371
+#: Merge.rc:375
#, c-format
msgid "&Next Bookmark\tF2"
msgstr ""
-#: Merge.rc:372
+#: Merge.rc:376
#, c-format
msgid "&Previous bookmark\tShift+F2"
msgstr ""
-#: Merge.rc:373
+#: Merge.rc:377
#, c-format
msgid "&Clear All Bookmarks"
msgstr ""
-#: Merge.rc:375
+#: Merge.rc:379
#, c-format
msgid "&Go To...\tCtrl+G"
msgstr ""
-#: Merge.rc:383
+#: Merge.rc:387
#, c-format
msgid "&Zoom"
msgstr ""
-#: Merge.rc:385
+#: Merge.rc:389
#, c-format
msgid "Zoom &In\tCtrl++"
msgstr ""
-#: Merge.rc:386
+#: Merge.rc:390
#, c-format
msgid "Zoom &Out\tCtrl+-"
msgstr ""
#. Zoom to normal
-#: Merge.rc:387
+#: Merge.rc:391
#, c-format
msgid "&Normal\tCtrl+*"
msgstr ""
-#: Merge.rc:389
+#: Merge.rc:393
#, c-format
msgid "Syntax Highlight"
msgstr ""
-#: Merge.rc:394
+#: Merge.rc:398
#, c-format
msgid "&Lock Panes"
msgstr ""
-#: Merge.rc:395
+#: Merge.rc:399
#, c-format
msgid "&View Whitespace"
msgstr ""
-#: Merge.rc:396
+#: Merge.rc:400
#, c-format
msgid "Vie&w Line Differences"
msgstr ""
-#: Merge.rc:397
+#: Merge.rc:401
#, c-format
msgid "View Line &Numbers"
msgstr ""
-#: Merge.rc:398
+#: Merge.rc:402
#, c-format
msgid "View &Margins"
msgstr ""
-#: Merge.rc:399
+#: Merge.rc:403
#, c-format
msgid "W&rap Lines"
msgstr ""
-#: Merge.rc:401
+#: Merge.rc:405
#, c-format
msgid "Sw&ap Panes"
msgstr ""
-#: Merge.rc:411
+#: Merge.rc:415
#, c-format
msgid "Diff &Pane"
msgstr ""
-#: Merge.rc:412
+#: Merge.rc:416
#, c-format
msgid "Lo&cation Pane"
msgstr ""
-#: Merge.rc:430
+#: Merge.rc:434
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
msgstr ""
-#: Merge.rc:431
+#: Merge.rc:435
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
msgstr ""
-#: Merge.rc:433
+#: Merge.rc:437
#, c-format
msgid "Copy &All to Right"
msgstr ""
-#: Merge.rc:434
+#: Merge.rc:438
#, c-format
msgid "Cop&y All to Left"
msgstr ""
-#: Merge.rc:449
+#: Merge.rc:455
#, c-format
msgid "&Prediffer"
msgstr ""
-#: Merge.rc:490
+#: Merge.rc:496
#, c-format
msgid "Comp&are"
msgstr ""
-#: Merge.rc:491
+#: Merge.rc:497
#, c-format
msgid "Co&mpare Special"
msgstr ""
-#: Merge.rc:493
+#: Merge.rc:499
#, c-format
msgid "&XML"
msgstr ""
-#: Merge.rc:498
+#: Merge.rc:504
#, c-format
msgid "&Left to Right"
msgstr ""
-#: Merge.rc:499
+#: Merge.rc:505
#, c-format
msgid "L&eft to..."
msgstr ""
-#: Merge.rc:500
+#: Merge.rc:506
#, c-format
msgid "&Right to Left"
msgstr ""
-#: Merge.rc:501
+#: Merge.rc:507
#, c-format
msgid "R&ight to..."
msgstr ""
-#: Merge.rc:503
+#: Merge.rc:509
#, c-format
msgid "&Move"
msgstr ""
-#: Merge.rc:505
+#: Merge.rc:511
#, c-format
msgid "&Left to..."
msgstr ""
-#: Merge.rc:506
+#: Merge.rc:512
#, c-format
msgid "&Right to..."
msgstr ""
-#: Merge.rc:508
+#: Merge.rc:514
#, c-format
msgid "&Delete"
msgstr ""
-#: Merge.rc:510
-#: Merge.rc:1128
-#: Merge.rc:1510
+#: Merge.rc:516
+#: Merge.rc:1134
+#: Merge.rc:1516
#, c-format
msgid "&Left"
msgstr ""
-#: Merge.rc:511
-#: Merge.rc:1130
-#: Merge.rc:1513
+#: Merge.rc:517
+#: Merge.rc:1136
+#: Merge.rc:1519
#, c-format
msgid "&Right"
msgstr ""
-#: Merge.rc:512
+#: Merge.rc:518
#, c-format
msgid "&Both"
msgstr ""
-#: Merge.rc:514
+#: Merge.rc:520
#, c-format
msgid "Re&name"
msgstr ""
-#: Merge.rc:515
+#: Merge.rc:521
#, c-format
msgid "&Hide Items"
msgstr ""
-#: Merge.rc:517
+#: Merge.rc:523
#, c-format
msgid "&Open Left"
msgstr ""
-#: Merge.rc:523
+#: Merge.rc:529
#, c-format
msgid "O&pen Right"
msgstr ""
-#: Merge.rc:530
+#: Merge.rc:536
#, c-format
msgid "Cop&y Pathnames"
msgstr ""
-#: Merge.rc:532
+#: Merge.rc:538
#, c-format
msgid "&Left (%1 of %2)"
msgstr ""
-#: Merge.rc:533
+#: Merge.rc:539
#, c-format
msgid "&Right (%1 of %2)"
msgstr ""
-#: Merge.rc:534
+#: Merge.rc:540
#, c-format
msgid "&Both (%1 of %2)"
msgstr ""
-#: Merge.rc:536
+#: Merge.rc:542
#, c-format
msgid "Copy &Filenames"
msgstr ""
-#: Merge.rc:538
+#: Merge.rc:544
#, c-format
msgid "&Zip"
msgstr ""
-#: Merge.rc:540
+#: Merge.rc:546
#, c-format
msgid "&Left... (%1 of %2)"
msgstr ""
-#: Merge.rc:541
+#: Merge.rc:547
#, c-format
msgid "&Right... (%1 of %2)"
msgstr ""
-#: Merge.rc:542
+#: Merge.rc:548
#, c-format
msgid "&Both... (%1 of %2)"
msgstr ""
-#: Merge.rc:543
+#: Merge.rc:549
#, c-format
msgid "&Differences... (%1 of %2)"
msgstr ""
-#: Merge.rc:546
+#: Merge.rc:552
#, c-format
msgid "&Refresh"
msgstr ""
-#: Merge.rc:558
+#: Merge.rc:564
#, c-format
msgid "&Copy Full Path"
msgstr ""
-#: Merge.rc:559
+#: Merge.rc:565
#, c-format
msgid "Copy &Filename"
msgstr ""
-#: Merge.rc:565
+#: Merge.rc:571
#, c-format
msgid "Prediffer Settings"
msgstr ""
-#: Merge.rc:567
+#: Merge.rc:573
#, c-format
msgid "&No prediffer"
msgstr ""
-#: Merge.rc:568
+#: Merge.rc:574
#, c-format
msgid "Auto prediffer"
msgstr ""
-#: Merge.rc:576
+#: Merge.rc:582
#, c-format
msgid "G&oto Diff"
msgstr ""
-#: Merge.rc:579
+#: Merge.rc:585
#, c-format
msgid "&No Moved Blocks"
msgstr ""
-#: Merge.rc:580
+#: Merge.rc:586
#, c-format
msgid "&All Moved Blocks"
msgstr ""
-#: Merge.rc:581
+#: Merge.rc:587
#, c-format
msgid "Moved Block for &Current Diff"
msgstr ""
-#: Merge.rc:650
+#: Merge.rc:656
#, c-format
msgid "About WinMerge"
msgstr ""
-#: Merge.rc:656
+#: Merge.rc:662
#, c-format
msgid "(Private Build)"
msgstr ""
-#: Merge.rc:657
+#: Merge.rc:663
#, c-format
msgid "All rights reserved."
msgstr ""
-#: Merge.rc:658
+#: Merge.rc:664
#, c-format
msgid "Visit the WinMerge HomePage!"
msgstr ""
-#: Merge.rc:661
-#: Merge.rc:693
-#: Merge.rc:783
-#: Merge.rc:969
-#: Merge.rc:1047
-#: Merge.rc:1076
-#: Merge.rc:1086
-#: Merge.rc:1252
-#: Merge.rc:1316
-#: Merge.rc:1329
-#: Merge.rc:1421
-#: Merge.rc:1436
+#: Merge.rc:667
+#: Merge.rc:699
+#: Merge.rc:789
+#: Merge.rc:975
+#: Merge.rc:1053
+#: Merge.rc:1082
+#: Merge.rc:1092
+#: Merge.rc:1258
+#: Merge.rc:1322
+#: Merge.rc:1335
+#: Merge.rc:1427
+#: Merge.rc:1442
+#: Merge.rc:1664
#, c-format
msgid "OK"
msgstr ""
-#: Merge.rc:662
+#: Merge.rc:668
#, c-format
msgid "Contributors"
msgstr ""
-#: Merge.rc:669
+#: Merge.rc:675
#, c-format
msgid "Select Files or Folders"
msgstr ""
-#: Merge.rc:672
-#: Merge.rc:1587
+#: Merge.rc:678
+#: Merge.rc:1593
#, c-format
msgid "&Left:"
msgstr ""
-#: Merge.rc:676
-#: Merge.rc:737
-#: Merge.rc:990
-#: Merge.rc:1012
+#: Merge.rc:682
+#: Merge.rc:743
+#: Merge.rc:996
+#: Merge.rc:1018
#, c-format
msgid "&Browse..."
msgstr ""
-#: Merge.rc:677
-#: Merge.rc:1591
+#: Merge.rc:683
+#: Merge.rc:1597
#, c-format
msgid "&Right:"
msgstr ""
-#: Merge.rc:681
-#: Merge.rc:1023
+#: Merge.rc:687
+#: Merge.rc:1029
#, c-format
msgid "Bro&wse..."
msgstr ""
-#: Merge.rc:682
-#: Merge.rc:1595
+#: Merge.rc:688
+#: Merge.rc:1601
#, c-format
msgid "&Filter:"
msgstr ""
-#: Merge.rc:685
-#: Merge.rc:1597
+#: Merge.rc:691
+#: Merge.rc:1603
#, c-format
msgid "Select..."
msgstr ""
-#: Merge.rc:686
+#: Merge.rc:692
#, c-format
msgid "&Unpacker:"
msgstr ""
-#: Merge.rc:689
+#: Merge.rc:695
#, c-format
msgid "&Select..."
msgstr ""
-#: Merge.rc:690
-#: Merge.rc:1598
+#: Merge.rc:696
+#: Merge.rc:1604
#, c-format
msgid "&Include Subfolders"
msgstr ""
-#: Merge.rc:692
+#: Merge.rc:698
#, c-format
msgid "Status:"
msgstr ""
-#: Merge.rc:694
-#: Merge.rc:724
-#: Merge.rc:784
-#: Merge.rc:814
-#: Merge.rc:846
-#: Merge.rc:856
-#: Merge.rc:1048
-#: Merge.rc:1077
-#: Merge.rc:1087
-#: Merge.rc:1138
-#: Merge.rc:1253
-#: Merge.rc:1330
-#: Merge.rc:1422
-#: Merge.rc:1437
+#: Merge.rc:700
+#: Merge.rc:730
+#: Merge.rc:790
+#: Merge.rc:820
+#: Merge.rc:852
+#: Merge.rc:862
+#: Merge.rc:1054
+#: Merge.rc:1083
+#: Merge.rc:1093
+#: Merge.rc:1144
+#: Merge.rc:1259
+#: Merge.rc:1336
+#: Merge.rc:1428
+#: Merge.rc:1443
+#: Merge.rc:1665
#, c-format
msgid "Cancel"
msgstr ""
-#: Merge.rc:695
-#: Merge.rc:1331
+#: Merge.rc:701
+#: Merge.rc:1337
#, c-format
msgid "Help"
msgstr ""
-#: Merge.rc:696
+#: Merge.rc:702
#, c-format
msgid "Files or Folders to Compare"
msgstr ""
-#: Merge.rc:703
+#: Merge.rc:709
#, c-format
msgid "Visual SourceSafe"
msgstr ""
-#: Merge.rc:708
+#: Merge.rc:714
#, c-format
msgid "Database:"
msgstr ""
-#: Merge.rc:711
+#: Merge.rc:717
#, c-format
msgid "Project:"
msgstr ""
-#: Merge.rc:714
+#: Merge.rc:720
#, c-format
msgid "User:"
msgstr ""
-#: Merge.rc:716
+#: Merge.rc:722
#, c-format
msgid "Password:"
msgstr ""
-#: Merge.rc:718
+#: Merge.rc:724
#, c-format
msgid "Link to Destination VSS project"
msgstr ""
-#: Merge.rc:720
-#: Merge.rc:861
+#: Merge.rc:726
+#: Merge.rc:867
#, c-format
msgid "Apply to all items"
msgstr ""
-#: Merge.rc:722
+#: Merge.rc:728
#, c-format
msgid "Check Out"
msgstr ""
-#: Merge.rc:723
-#: Merge.rc:857
+#: Merge.rc:729
+#: Merge.rc:863
#, c-format
msgid "Save As..."
msgstr ""
-#: Merge.rc:729
+#: Merge.rc:735
#, c-format
msgid "Versioning System"
msgstr ""
-#: Merge.rc:732
+#: Merge.rc:738
#, c-format
msgid "&Versioning System:"
msgstr ""
-#: Merge.rc:735
+#: Merge.rc:741
#, c-format
msgid "&Path to cleartool.exe:"
msgstr ""
-#: Merge.rc:742
-#: Merge.rc:1899
+#: Merge.rc:748
+#: Merge.rc:1919
#, c-format
msgid "General"
msgstr ""
-#: Merge.rc:745
+#: Merge.rc:751
#, c-format
msgid "Automatically &scroll to first difference"
msgstr ""
-#: Merge.rc:748
+#: Merge.rc:754
#, c-format
msgid "&Disable Splash Screen"
msgstr ""
-#: Merge.rc:750
+#: Merge.rc:756
#, c-format
msgid "Cl&ose windows with ESC"
msgstr ""
-#: Merge.rc:752
+#: Merge.rc:758
#, c-format
msgid "&Automatically verify paths in Open-dialog"
msgstr ""
-#: Merge.rc:755
+#: Merge.rc:761
#, c-format
msgid "All&ow only one instance to run"
msgstr ""
-#: Merge.rc:757
+#: Merge.rc:763
#, c-format
msgid "As&k when closing multiple windows"
msgstr ""
-#: Merge.rc:759
+#: Merge.rc:765
#, c-format
msgid "&Preserve file time in file compare"
msgstr ""
-#: Merge.rc:762
+#: Merge.rc:768
#, c-format
msgid "O&pen-dialog Auto-Completion:"
msgstr ""
-#: Merge.rc:765
+#: Merge.rc:771
#, c-format
msgid "Enable multiple compare windows for"
msgstr ""
-#: Merge.rc:767
-#: Merge.rc:1610
+#: Merge.rc:773
+#: Merge.rc:1616
#, c-format
msgid "&Folder compare"
msgstr ""
-#: Merge.rc:769
-#: Merge.rc:1612
+#: Merge.rc:775
+#: Merge.rc:1618
#, c-format
msgid "Fil&e compare"
msgstr ""
-#: Merge.rc:771
+#: Merge.rc:777
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr ""
-#: Merge.rc:773
+#: Merge.rc:779
#, c-format
msgid "Reset"
msgstr ""
-#: Merge.rc:780
+#: Merge.rc:786
#, c-format
msgid "Language"
msgstr ""
-#: Merge.rc:787
+#: Merge.rc:793
#, c-format
msgid "Available languages:"
msgstr ""
-#: Merge.rc:793
+#: Merge.rc:799
#, c-format
msgid "Find"
msgstr ""
-#: Merge.rc:796
-#: Merge.rc:823
+#: Merge.rc:802
+#: Merge.rc:829
#, c-format
msgid "Fi&nd what:"
msgstr ""
-#: Merge.rc:799
-#: Merge.rc:829
+#: Merge.rc:805
+#: Merge.rc:835
#, c-format
msgid "Match &whole word only"
msgstr ""
-#: Merge.rc:801
-#: Merge.rc:831
+#: Merge.rc:807
+#: Merge.rc:837
#, c-format
msgid "Match &case"
msgstr ""
-#: Merge.rc:803
-#: Merge.rc:833
+#: Merge.rc:809
+#: Merge.rc:839
#, c-format
msgid "Regular &expression"
msgstr ""
-#: Merge.rc:805
+#: Merge.rc:811
#, c-format
msgid "D&on't wrap end of file"
msgstr ""
-#: Merge.rc:808
+#: Merge.rc:814
#, c-format
msgid "Direction"
msgstr ""
-#: Merge.rc:809
+#: Merge.rc:815
#, c-format
msgid "&Up"
msgstr ""
-#: Merge.rc:811
+#: Merge.rc:817
#, c-format
msgid "&Down"
msgstr ""
-#: Merge.rc:813
-#: Merge.rc:843
+#: Merge.rc:819
+#: Merge.rc:849
#, c-format
msgid "&Find Next"
msgstr ""
-#: Merge.rc:820
+#: Merge.rc:826
#, c-format
msgid "Replace"
msgstr ""
-#: Merge.rc:826
+#: Merge.rc:832
#, c-format
msgid "Re&place with:"
msgstr ""
-#: Merge.rc:835
+#: Merge.rc:841
#, c-format
msgid "&Don't wrap end of file"
msgstr ""
-#: Merge.rc:838
+#: Merge.rc:844
#, c-format
msgid "Replace in"
msgstr ""
-#: Merge.rc:839
+#: Merge.rc:845
#, c-format
msgid "&Selection"
msgstr ""
-#: Merge.rc:841
+#: Merge.rc:847
#, c-format
msgid "Wh&ole file"
msgstr ""
-#: Merge.rc:844
+#: Merge.rc:850
#, c-format
msgid "&Replace"
msgstr ""
-#: Merge.rc:845
+#: Merge.rc:851
#, c-format
msgid "Replace &All"
msgstr ""
-#: Merge.rc:852
-#: Merge.rc:2134
+#: Merge.rc:858
+#: Merge.rc:2154
#, c-format
msgid "Rational ClearCase"
msgstr ""
-#: Merge.rc:855
+#: Merge.rc:861
#, c-format
msgid "CheckOut"
msgstr ""
-#: Merge.rc:860
-#: Merge.rc:1172
+#: Merge.rc:866
+#: Merge.rc:1178
#, c-format
msgid "Comments"
msgstr ""
-#: Merge.rc:863
+#: Merge.rc:869
#, c-format
msgid "CheckIn after checkout"
msgstr ""
-#: Merge.rc:869
+#: Merge.rc:875
#, c-format
msgid "Linefilters"
msgstr ""
-#: Merge.rc:872
+#: Merge.rc:878
#, c-format
msgid "Enable Line Filters"
msgstr ""
-#: Merge.rc:875
+#: Merge.rc:881
#, c-format
msgid "Regular Expressions (one per line):"
msgstr ""
-#: Merge.rc:882
+#: Merge.rc:888
#, c-format
msgid "Save"
msgstr ""
-#: Merge.rc:883
+#: Merge.rc:889
#, c-format
msgid "New"
msgstr ""
-#: Merge.rc:884
+#: Merge.rc:890
#, c-format
msgid "Edit"
msgstr ""
-#: Merge.rc:885
+#: Merge.rc:891
#, c-format
msgid "Remove"
msgstr ""
-#: Merge.rc:890
-#: Merge.rc:1902
+#: Merge.rc:896
+#: Merge.rc:1922
#, c-format
msgid "Colors"
msgstr ""
-#: Merge.rc:893
+#: Merge.rc:899
#, c-format
msgid "Difference:"
msgstr ""
-#: Merge.rc:897
+#: Merge.rc:903
#, c-format
msgid "Selected Difference:"
msgstr ""
-#: Merge.rc:901
-#: Merge.rc:1562
+#: Merge.rc:907
+#: Merge.rc:1568
#, c-format
msgid "Background"
msgstr ""
-#: Merge.rc:902
+#: Merge.rc:908
#, c-format
msgid "Deleted"
msgstr ""
-#: Merge.rc:915
-#: Merge.rc:1357
-#: Merge.rc:1563
+#: Merge.rc:921
+#: Merge.rc:1363
+#: Merge.rc:1569
#, c-format
msgid "Text"
msgstr ""
-#: Merge.rc:919
+#: Merge.rc:925
#, c-format
msgid "Ignored Difference:"
msgstr ""
-#: Merge.rc:929
+#: Merge.rc:935
#, c-format
msgid "Moved:"
msgstr ""
-#: Merge.rc:939
+#: Merge.rc:945
#, c-format
msgid "Selected Moved:"
msgstr ""
-#: Merge.rc:946
+#: Merge.rc:952
#, c-format
msgid "Word Difference:"
msgstr ""
-#: Merge.rc:953
+#: Merge.rc:959
#, c-format
msgid "Selected Word Diff:"
msgstr ""
-#: Merge.rc:960
-#: Merge.rc:1046
-#: Merge.rc:1075
-#: Merge.rc:1175
-#: Merge.rc:1403
+#: Merge.rc:966
+#: Merge.rc:1052
+#: Merge.rc:1081
+#: Merge.rc:1181
+#: Merge.rc:1409
#, c-format
msgid "Defaults"
msgstr ""
-#: Merge.rc:966
-#: Merge.rc:1345
-#: Merge.rc:1551
+#: Merge.rc:972
+#: Merge.rc:1351
+#: Merge.rc:1557
#, c-format
msgid "Dialog"
msgstr ""
-#: Merge.rc:976
-#: Merge.rc:1905
+#: Merge.rc:982
+#: Merge.rc:1925
#, c-format
msgid "System"
msgstr ""
-#: Merge.rc:979
+#: Merge.rc:985
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr ""
-#: Merge.rc:981
+#: Merge.rc:987
#, c-format
msgid "Integration"
msgstr ""
-#: Merge.rc:982
+#: Merge.rc:988
#, c-format
msgid "&Add to explorer context menu"
msgstr ""
-#: Merge.rc:984
+#: Merge.rc:990
#, c-format
msgid "E&nable advanced menu"
msgstr ""
-#: Merge.rc:986
+#: Merge.rc:992
#, c-format
msgid "In&clude subfolders by default"
msgstr ""
-#: Merge.rc:988
+#: Merge.rc:994
#, c-format
msgid "&External editor:"
msgstr ""
-#: Merge.rc:991
+#: Merge.rc:997
#, c-format
msgid "&Filter folder:"
msgstr ""
-#: Merge.rc:993
+#: Merge.rc:999
#, c-format
msgid "B&rowse..."
msgstr ""
-#: Merge.rc:994
+#: Merge.rc:1000
#, c-format
msgid "Temporary files folder"
msgstr ""
-#: Merge.rc:995
+#: Merge.rc:1001
#, c-format
msgid "S&ystem's temp folder"
msgstr ""
-#: Merge.rc:997
+#: Merge.rc:1003
#, c-format
msgid "C&ustom folder:"
msgstr ""
-#: Merge.rc:1000
-#: Merge.rc:1016
+#: Merge.rc:1006
+#: Merge.rc:1022
#, c-format
msgid "Br&owse..."
msgstr ""
-#: Merge.rc:1006
+#: Merge.rc:1012
#, c-format
msgid "Patch Generator"
msgstr ""
-#: Merge.rc:1009
+#: Merge.rc:1015
#, c-format
msgid "File&1:"
msgstr ""
-#: Merge.rc:1013
+#: Merge.rc:1019
#, c-format
msgid "File&2:"
msgstr ""
-#: Merge.rc:1017
+#: Merge.rc:1023
#, c-format
msgid "&Swap"
msgstr ""
-#: Merge.rc:1018
+#: Merge.rc:1024
#, c-format
msgid "&Append to existing file"
msgstr ""
-#: Merge.rc:1020
+#: Merge.rc:1026
#, c-format
msgid "&Result:"
msgstr ""
-#: Merge.rc:1024
+#: Merge.rc:1030
#, c-format
msgid "&Format"
msgstr ""
-#: Merge.rc:1025
+#: Merge.rc:1031
#, c-format
msgid "St&yle:"
msgstr ""
-#: Merge.rc:1028
+#: Merge.rc:1034
#, c-format
msgid "&Context:"
msgstr ""
-#: Merge.rc:1031
+#: Merge.rc:1037
#, c-format
msgid "W&hitespaces"
msgstr ""
-#: Merge.rc:1032
+#: Merge.rc:1038
#, c-format
msgid "Com&pare"
msgstr ""
-#: Merge.rc:1034
+#: Merge.rc:1040
#, c-format
msgid "I&gnore changes"
msgstr ""
-#: Merge.rc:1036
+#: Merge.rc:1042
#, c-format
msgid "Ig&nore all"
msgstr ""
-#: Merge.rc:1038
+#: Merge.rc:1044
#, c-format
msgid "Ignor&e blank lines"
msgstr ""
-#: Merge.rc:1040
+#: Merge.rc:1046
#, c-format
msgid "Case sensi&tive"
msgstr ""
-#: Merge.rc:1042
+#: Merge.rc:1048
#, c-format
msgid "Inclu&de command line"
msgstr ""
-#: Merge.rc:1044
+#: Merge.rc:1050
#, c-format
msgid "Open to e&xternal editor"
msgstr ""
-#: Merge.rc:1066
+#: Merge.rc:1072
#, c-format
msgid "Display Columns"
msgstr ""
-#: Merge.rc:1072
+#: Merge.rc:1078
#, c-format
msgid "Move &Up"
msgstr ""
-#: Merge.rc:1073
+#: Merge.rc:1079
#, c-format
msgid "Move &Down"
msgstr ""
-#: Merge.rc:1083
+#: Merge.rc:1089
#, c-format
msgid "Select Unpacker"
msgstr ""
-#: Merge.rc:1088
+#: Merge.rc:1094
#, c-format
msgid "File unpacker:"
msgstr ""
-#: Merge.rc:1091
+#: Merge.rc:1097
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr ""
-#: Merge.rc:1094
+#: Merge.rc:1100
#, c-format
msgid "Extensions list:"
msgstr ""
-#: Merge.rc:1095
+#: Merge.rc:1101
#, c-format
msgid "Description:"
msgstr ""
-#: Merge.rc:1106
+#: Merge.rc:1112
#, c-format
msgid " Folder Compare Progress"
msgstr ""
-#: Merge.rc:1109
-#: Merge.rc:1852
+#: Merge.rc:1115
+#: Merge.rc:1872
#, c-format
msgid "Stop"
msgstr ""
-#: Merge.rc:1114
+#: Merge.rc:1120
#, c-format
msgid "Comparing items..."
msgstr ""
-#: Merge.rc:1115
+#: Merge.rc:1121
#, c-format
msgid "Items compared:"
msgstr ""
-#: Merge.rc:1116
+#: Merge.rc:1122
#, c-format
msgid "Items total:"
msgstr ""
-#: Merge.rc:1122
+#: Merge.rc:1128
#, c-format
msgid "Go To"
msgstr ""
-#: Merge.rc:1125
+#: Merge.rc:1131
#, c-format
msgid "G&oto:"
msgstr ""
-#: Merge.rc:1127
+#: Merge.rc:1133
#, c-format
msgid "File"
msgstr ""
-#: Merge.rc:1132
+#: Merge.rc:1138
#, c-format
msgid "Goto what"
msgstr ""
-#: Merge.rc:1133
+#: Merge.rc:1139
#, c-format
msgid "Li&ne"
msgstr ""
-#: Merge.rc:1135
+#: Merge.rc:1141
#, c-format
msgid "&Difference"
msgstr ""
-#: Merge.rc:1137
+#: Merge.rc:1143
#, c-format
msgid "&Go To"
msgstr ""
-#: Merge.rc:1143
-#: Merge.rc:1900
+#: Merge.rc:1149
+#: Merge.rc:1920
#, c-format
msgid "Compare"
msgstr ""
-#: Merge.rc:1146
+#: Merge.rc:1152
#, c-format
msgid "Whitespace"
msgstr ""
-#: Merge.rc:1147
+#: Merge.rc:1153
#, c-format
msgid "&Compare"
msgstr ""
-#: Merge.rc:1149
+#: Merge.rc:1155
#, c-format
msgid "&Ignore change"
msgstr ""
-#: Merge.rc:1151
+#: Merge.rc:1157
#, c-format
msgid "I&gnore all"
msgstr ""
-#: Merge.rc:1153
+#: Merge.rc:1159
#, c-format
msgid "Ignore blan&k lines"
msgstr ""
-#: Merge.rc:1155
+#: Merge.rc:1161
#, c-format
msgid "Ignore &case"
msgstr ""
-#: Merge.rc:1157
+#: Merge.rc:1163
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr ""
-#: Merge.rc:1160
+#: Merge.rc:1166
#, c-format
msgid "E&nable moved block detection"
msgstr ""
-#: Merge.rc:1162
+#: Merge.rc:1168
#, c-format
msgid "&Match similar lines"
msgstr ""
-#: Merge.rc:1164
+#: Merge.rc:1170
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr ""
-#: Merge.rc:1167
+#: Merge.rc:1173
#, c-format
msgid "&File Compare method:"
msgstr ""
-#: Merge.rc:1170
+#: Merge.rc:1176
#, c-format
msgid "S&top after first difference"
msgstr ""
-#: Merge.rc:1173
+#: Merge.rc:1179
#, c-format
msgid "Filter Comments"
msgstr ""
-#: Merge.rc:1180
-#: Merge.rc:1901
+#: Merge.rc:1186
+#: Merge.rc:1921
#, c-format
msgid "Editor"
msgstr ""
-#: Merge.rc:1183
+#: Merge.rc:1189
#, c-format
msgid "&Highlight syntax"
msgstr ""
-#: Merge.rc:1185
+#: Merge.rc:1191
#, c-format
msgid "&Automatic rescan"
msgstr ""
-#: Merge.rc:1187
+#: Merge.rc:1193
#, c-format
msgid "&Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1189
+#: Merge.rc:1195
#, c-format
msgid "Tabs"
msgstr ""
-#: Merge.rc:1190
+#: Merge.rc:1196
#, c-format
msgid "&Tab size:"
msgstr ""
-#: Merge.rc:1193
+#: Merge.rc:1199
#, c-format
msgid "&Insert Tabs"
msgstr ""
-#: Merge.rc:1195
+#: Merge.rc:1201
#, c-format
msgid "Insert &Spaces"
msgstr ""
-#: Merge.rc:1197
+#: Merge.rc:1203
#, c-format
msgid "Line Difference Coloring"
msgstr ""
-#: Merge.rc:1199
+#: Merge.rc:1205
#, c-format
msgid "View line differences"
msgstr ""
-#: Merge.rc:1201
+#: Merge.rc:1207
#, c-format
msgid "&Character level"
msgstr ""
-#: Merge.rc:1203
+#: Merge.rc:1209
#, c-format
msgid "&Word-level:"
msgstr ""
-#: Merge.rc:1218
+#: Merge.rc:1224
#, c-format
msgid "Filefilters"
msgstr ""
-#: Merge.rc:1224
+#: Merge.rc:1230
#, c-format
msgid "Test"
msgstr ""
-#: Merge.rc:1225
+#: Merge.rc:1231
#, c-format
msgid "Install..."
msgstr ""
-#: Merge.rc:1226
+#: Merge.rc:1232
#, c-format
msgid "New..."
msgstr ""
-#: Merge.rc:1227
+#: Merge.rc:1233
#, c-format
msgid "Edit..."
msgstr ""
-#: Merge.rc:1228
+#: Merge.rc:1234
#, c-format
msgid "Delete..."
msgstr ""
-#: Merge.rc:1234
+#: Merge.rc:1240
#, c-format
msgid "Save modified files?"
msgstr ""
-#: Merge.rc:1237
+#: Merge.rc:1243
#, c-format
msgid "Left side file"
msgstr ""
-#: Merge.rc:1240
+#: Merge.rc:1246
#, c-format
msgid "&Save changes"
msgstr ""
-#: Merge.rc:1242
+#: Merge.rc:1248
#, c-format
msgid "&Discard changes"
msgstr ""
-#: Merge.rc:1244
+#: Merge.rc:1250
#, c-format
msgid "Right side file"
msgstr ""
-#: Merge.rc:1247
+#: Merge.rc:1253
#, c-format
msgid "S&ave changes"
msgstr ""
-#: Merge.rc:1249
+#: Merge.rc:1255
#, c-format
msgid "Dis&card changes"
msgstr ""
-#: Merge.rc:1251
+#: Merge.rc:1257
#, c-format
msgid "Discard All"
msgstr ""
-#: Merge.rc:1258
-#: Merge.rc:1506
-#: Merge.rc:1907
+#: Merge.rc:1264
+#: Merge.rc:1512
+#: Merge.rc:1927
#, c-format
msgid "Codepage"
msgstr ""
-#: Merge.rc:1261
+#: Merge.rc:1267
#, c-format
msgid "Default Codepage"
msgstr ""
-#: Merge.rc:1262
+#: Merge.rc:1268
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr ""
-#: Merge.rc:1264
+#: Merge.rc:1270
#, c-format
msgid "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session"
msgstr ""
-#: Merge.rc:1267
+#: Merge.rc:1273
#, c-format
msgid "System codepage"
msgstr ""
-#: Merge.rc:1269
+#: Merge.rc:1275
#, c-format
msgid "According to WinMerge User Interface"
msgstr ""
-#: Merge.rc:1271
+#: Merge.rc:1277
#, c-format
msgid "Custom codepage :"
msgstr ""
-#: Merge.rc:1279
+#: Merge.rc:1285
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr ""
-#: Merge.rc:1282
+#: Merge.rc:1288
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr ""
-#: Merge.rc:1285
+#: Merge.rc:1291
#, 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:1287
+#: Merge.rc:1293
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr ""
-#: Merge.rc:1289
+#: Merge.rc:1295
#, c-format
msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available."
msgstr ""
-#: Merge.rc:1291
+#: Merge.rc:1297
#, c-format
msgid "Version"
msgstr ""
-#: Merge.rc:1293
+#: Merge.rc:1299
#, c-format
msgid "Plugin required\n(dllbuild %04u)"
msgstr ""
-#: Merge.rc:1295
+#: Merge.rc:1301
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr ""
-#: Merge.rc:1298
-#: Merge.rc:1301
+#: Merge.rc:1304
+#: Merge.rc:1307
#, c-format
msgid "present"
msgstr ""
-#: Merge.rc:1299
+#: Merge.rc:1305
#, c-format
msgid "Merge7z000U.dll"
msgstr ""
-#: Merge.rc:1302
+#: Merge.rc:1308
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr ""
-#: Merge.rc:1304
-#: Merge.rc:1309
+#: Merge.rc:1310
+#: Merge.rc:1315
#, c-format
msgid "none"
msgstr ""
-#: Merge.rc:1306
+#: Merge.rc:1312
#, c-format
msgid "missing"
msgstr ""
-#: Merge.rc:1307
+#: Merge.rc:1313
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr ""
-#: Merge.rc:1311
+#: Merge.rc:1317
#, c-format
msgid "outdated"
msgstr ""
-#: Merge.rc:1312
+#: Merge.rc:1318
#, c-format
msgid "Plugins on path:"
msgstr ""
-#: Merge.rc:1313
+#: Merge.rc:1319
#, c-format
msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
msgstr ""
-#: Merge.rc:1317
+#: Merge.rc:1323
#, c-format
msgid "Plugin Download"
msgstr ""
-#: Merge.rc:1326
+#: Merge.rc:1332
#, c-format
msgid "Options"
msgstr ""
-#: Merge.rc:1337
+#: Merge.rc:1343
#, c-format
msgid " Categories"
msgstr ""
-#: Merge.rc:1339
+#: Merge.rc:1345
#, c-format
msgid "Import..."
msgstr ""
-#: Merge.rc:1340
+#: Merge.rc:1346
#, c-format
msgid "Export..."
msgstr ""
-#: Merge.rc:1348
+#: Merge.rc:1354
#, c-format
msgid "Keywords:"
msgstr ""
-#: Merge.rc:1349
+#: Merge.rc:1355
#, c-format
msgid "Function names:"
msgstr ""
-#: Merge.rc:1350
+#: Merge.rc:1356
#, c-format
msgid "Comments:"
msgstr ""
-#: Merge.rc:1351
+#: Merge.rc:1357
#, c-format
msgid "Numbers:"
msgstr ""
-#: Merge.rc:1352
+#: Merge.rc:1358
#, c-format
msgid "Operators:"
msgstr ""
-#: Merge.rc:1353
+#: Merge.rc:1359
#, c-format
msgid "Strings:"
msgstr ""
-#: Merge.rc:1354
+#: Merge.rc:1360
#, c-format
msgid "Preprocessor:"
msgstr ""
-#: Merge.rc:1355
+#: Merge.rc:1361
#, c-format
msgid "User 1:"
msgstr ""
-#: Merge.rc:1356
+#: Merge.rc:1362
#, c-format
msgid "User 2:"
msgstr ""
-#: Merge.rc:1361
-#: Merge.rc:1366
-#: Merge.rc:1371
-#: Merge.rc:1376
-#: Merge.rc:1381
-#: Merge.rc:1386
-#: Merge.rc:1391
-#: Merge.rc:1396
-#: Merge.rc:1401
+#: Merge.rc:1367
+#: Merge.rc:1372
+#: Merge.rc:1377
+#: Merge.rc:1382
+#: Merge.rc:1387
+#: Merge.rc:1392
+#: Merge.rc:1397
+#: Merge.rc:1402
+#: Merge.rc:1407
#, c-format
msgid "Bold"
msgstr ""
-#: Merge.rc:1409
+#: Merge.rc:1415
#, c-format
msgid "Folder Compare Report"
msgstr ""
-#: Merge.rc:1412
+#: Merge.rc:1418
#, c-format
msgid "Report &File:"
msgstr ""
-#: Merge.rc:1415
-#: Merge.rc:1589
-#: Merge.rc:1593
-#: Merge.rc:1620
+#: Merge.rc:1421
+#: Merge.rc:1595
+#: Merge.rc:1599
+#: Merge.rc:1626
#, c-format
msgid "Browse..."
msgstr ""
-#: Merge.rc:1416
+#: Merge.rc:1422
#, c-format
msgid "&Style:"
msgstr ""
-#: Merge.rc:1419
+#: Merge.rc:1425
#, c-format
msgid "&Copy to Clipboard"
msgstr ""
-#: Merge.rc:1427
+#: Merge.rc:1433
#, c-format
msgid "Shared or Private Filter"
msgstr ""
-#: Merge.rc:1430
+#: Merge.rc:1436
#, c-format
msgid "Which type of filter do you want to create?"
msgstr ""
-#: Merge.rc:1432
+#: Merge.rc:1438
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr ""
-#: Merge.rc:1434
+#: Merge.rc:1440
#, c-format
msgid "Private Filter (only for current user)"
msgstr ""
-#: Merge.rc:1442
-#: Merge.rc:1908
+#: Merge.rc:1448
+#: Merge.rc:1928
#, c-format
msgid "Archive Support"
msgstr ""
-#: Merge.rc:1445
+#: Merge.rc:1451
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr ""
-#: Merge.rc:1447
+#: Merge.rc:1453
#, c-format
msgid "Download 7-zip Plugin"
msgstr ""
-#: Merge.rc:1448
+#: Merge.rc:1454
#, c-format
msgid "&Enable archive file support"
msgstr ""
-#: Merge.rc:1450
+#: Merge.rc:1456
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr ""
-#: Merge.rc:1453
+#: Merge.rc:1459
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr ""
-#: Merge.rc:1455
+#: Merge.rc:1461
#, c-format
msgid "&Detect archive type from file signature"
msgstr ""
-#: Merge.rc:1463
+#: Merge.rc:1469
#, c-format
msgid "Compare Statistics"
msgstr ""
-#: Merge.rc:1466
+#: Merge.rc:1472
#, c-format
msgid "Folders:"
msgstr ""
-#: Merge.rc:1467
+#: Merge.rc:1473
#, c-format
msgid "Files:"
msgstr ""
-#: Merge.rc:1468
-#: Merge.rc:2276
+#: Merge.rc:1474
+#: Merge.rc:2296
#, c-format
msgid "Different"
msgstr ""
-#: Merge.rc:1469
+#: Merge.rc:1475
#, c-format
msgid "Text:"
msgstr ""
-#: Merge.rc:1472
-#: Merge.rc:1491
+#: Merge.rc:1478
+#: Merge.rc:1497
#, c-format
msgid "Binary:"
msgstr ""
-#: Merge.rc:1475
+#: Merge.rc:1481
#, c-format
msgid "Unique"
msgstr ""
-#: Merge.rc:1476
+#: Merge.rc:1482
#, c-format
msgid "Left:"
msgstr ""
-#: Merge.rc:1481
+#: Merge.rc:1487
#, c-format
msgid "Right:"
msgstr ""
-#: Merge.rc:1486
-#: Merge.rc:2271
+#: Merge.rc:1492
+#: Merge.rc:2291
#, c-format
msgid "Identical"
msgstr ""
-#: Merge.rc:1495
+#: Merge.rc:1501
#, c-format
msgid "Total:"
msgstr ""
-#: Merge.rc:1500
+#: Merge.rc:1506
#, c-format
msgid "Close"
msgstr ""
-#: Merge.rc:1509
+#: Merge.rc:1515
#, c-format
msgid "Affects"
msgstr ""
-#: Merge.rc:1512
-#: Merge.rc:1515
+#: Merge.rc:151...
[truncated message content] |
|
From: <ki...@us...> - 2008-07-21 19:28:51
|
Revision: 5653
http://winmerge.svn.sourceforge.net/winmerge/?rev=5653&view=rev
Author: kimmov
Date: 2008-07-21 19:28:48 +0000 (Mon, 21 Jul 2008)
Log Message:
-----------
PATCH: [ 2017426 ] Rescan after filter change
Also included trunk r5613 - Add method for getting frame type (folder/file compare).
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/Languages/English.pot
branches/R2_10/Src/LineFiltersList.cpp
branches/R2_10/Src/LineFiltersList.h
branches/R2_10/Src/MainFrm.cpp
branches/R2_10/Src/MainFrm.h
branches/R2_10/Src/Merge.rc
branches/R2_10/Src/resource.h
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-21 16:16:54 UTC (rev 5652)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-21 19:28:48 UTC (rev 5653)
@@ -10,6 +10,7 @@
Remove buildall.bat (#2013576)
New option to enable plugins (disabled by default) (#2013845)
Add dialog listing available plugins (#2021722)
+ Refresh compare after changing filter (#2017426)
BugFix: Use system codepage for paths (#1979429, #2008581)
BugFix: ANSI build crash in folder compare (#2010053)
BugFix: Add insert/overtype mode indicator to statusbar (#2015174)
Modified: branches/R2_10/Src/Languages/English.pot
===================================================================
--- branches/R2_10/Src/Languages/English.pot 2008-07-21 16:16:54 UTC (rev 5652)
+++ branches/R2_10/Src/Languages/English.pot 2008-07-21 19:28:48 UTC (rev 5653)
@@ -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-07-21 12:26+0000\n"
+"POT-Creation-Date: 2008-07-21 22:22+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -699,7 +699,7 @@
msgstr ""
#: Merge.rc:364
-#: Merge.rc:2738
+#: Merge.rc:2744
#, c-format
msgid "< Empty >"
msgstr ""
@@ -1411,7 +1411,7 @@
msgstr ""
#: Merge.rc:858
-#: Merge.rc:2154
+#: Merge.rc:2160
#, c-format
msgid "Rational ClearCase"
msgstr ""
@@ -2304,7 +2304,7 @@
msgstr ""
#: Merge.rc:1474
-#: Merge.rc:2296
+#: Merge.rc:2302
#, c-format
msgid "Different"
msgstr ""
@@ -2336,7 +2336,7 @@
msgstr ""
#: Merge.rc:1492
-#: Merge.rc:2291
+#: Merge.rc:2297
#, c-format
msgid "Identical"
msgstr ""
@@ -3144,7 +3144,7 @@
msgstr ""
#: Merge.rc:2004
-#: Merge.rc:2602
+#: Merge.rc:2608
#, c-format
msgid "Name"
msgstr ""
@@ -3165,7 +3165,7 @@
msgstr ""
#: Merge.rc:2008
-#: Merge.rc:2604
+#: Merge.rc:2610
#, c-format
msgid "Description"
msgstr ""
@@ -3222,2291 +3222,2296 @@
#: Merge.rc:2035
#, c-format
+msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
+msgstr ""
+
+#: Merge.rc:2041
+#, c-format
msgid "&Path to cleartool.exe :"
msgstr ""
-#: Merge.rc:2036
+#: Merge.rc:2042
#, c-format
msgid "&Path to SS.EXE :"
msgstr ""
-#: Merge.rc:2042
+#: Merge.rc:2048
#, c-format
msgid "Folder Comparison Results"
msgstr ""
-#: Merge.rc:2043
+#: Merge.rc:2049
#, c-format
msgid "File Comparison"
msgstr ""
-#: Merge.rc:2044
+#: Merge.rc:2050
#, c-format
msgid "Untitled left"
msgstr ""
-#: Merge.rc:2045
+#: Merge.rc:2051
#, c-format
msgid "Untitled right"
msgstr ""
-#: Merge.rc:2046
+#: Merge.rc:2052
#, c-format
msgid "Theirs File"
msgstr ""
-#: Merge.rc:2047
+#: Merge.rc:2053
#, c-format
msgid "Mine File"
msgstr ""
-#: Merge.rc:2053
+#: Merge.rc:2059
#, c-format
msgid "Scanning files..."
msgstr ""
-#: Merge.rc:2054
+#: Merge.rc:2060
#, c-format
msgid "Opening selection"
msgstr ""
-#: Merge.rc:2055
+#: Merge.rc:2061
#, c-format
msgid "Copying Left to Right"
msgstr ""
-#: Merge.rc:2056
+#: Merge.rc:2062
#, c-format
msgid "Copying Right to Left"
msgstr ""
-#: Merge.rc:2057
+#: Merge.rc:2063
#, c-format
msgid "Copying All to Left"
msgstr ""
-#: Merge.rc:2058
+#: Merge.rc:2064
#, c-format
msgid "Copying All to Right"
msgstr ""
-#: Merge.rc:2059
+#: Merge.rc:2065
#, c-format
msgid "Copying files..."
msgstr ""
-#: Merge.rc:2060
+#: Merge.rc:2066
#, c-format
msgid "Deleting files..."
msgstr ""
-#: Merge.rc:2061
+#: Merge.rc:2067
#, c-format
msgid "Moving files..."
msgstr ""
-#: Merge.rc:2062
+#: Merge.rc:2068
#, c-format
msgid "Creating the report..."
msgstr ""
-#: Merge.rc:2068
+#: Merge.rc:2074
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
-#: Merge.rc:2069
+#: Merge.rc:2075
#, c-format
msgid "Line: %s"
msgstr ""
-#: Merge.rc:2070
+#: Merge.rc:2076
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
-#: Merge.rc:2071
+#: Merge.rc:2077
#, c-format
msgid "Merge"
msgstr ""
-#: Merge.rc:2072
+#: Merge.rc:2078
#, c-format
msgid "Difference %1 of %2"
msgstr ""
-#: Merge.rc:2073
+#: Merge.rc:2079
#, c-format
msgid "%1 Differences Found"
msgstr ""
-#: Merge.rc:2074
+#: Merge.rc:2080
#, c-format
msgid "1 Difference Found"
msgstr ""
#. Abbreviation from "Read Only"
-#: Merge.rc:2075
+#: Merge.rc:2081
#, c-format
msgid "RO"
msgstr ""
-#: Merge.rc:2081
+#: Merge.rc:2087
#, c-format
msgid "Item %1 of %2"
msgstr ""
-#: Merge.rc:2082
+#: Merge.rc:2088
#, c-format
msgid "Items: %1"
msgstr ""
-#: Merge.rc:2088
+#: Merge.rc:2094
#, c-format
msgid "Select two existing folders or files to compare"
msgstr ""
-#: Merge.rc:2089
+#: Merge.rc:2095
#, c-format
msgid "Folder Selection"
msgstr ""
-#: Merge.rc:2090
+#: Merge.rc:2096
#, c-format
msgid "Select two folders or two files to compare."
msgstr ""
-#: Merge.rc:2091
+#: Merge.rc:2097
#, c-format
msgid "Left path is invalid!"
msgstr ""
-#: Merge.rc:2092
+#: Merge.rc:2098
#, c-format
msgid "Right path is invalid!"
msgstr ""
-#: Merge.rc:2093
+#: Merge.rc:2099
#, c-format
msgid "Both paths are invalid!"
msgstr ""
-#: Merge.rc:2094
+#: Merge.rc:2100
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr ""
-#: Merge.rc:2095
+#: Merge.rc:2101
#, c-format
msgid "Cannot compare file and folder!"
msgstr ""
-#: Merge.rc:2101
+#: Merge.rc:2107
#, c-format
msgid "File not found: %1"
msgstr ""
-#: Merge.rc:2102
+#: Merge.rc:2108
#, c-format
msgid "File not unpacked: %1"
msgstr ""
-#: Merge.rc:2103
+#: Merge.rc:2109
#, c-format
msgid "Cannot open file\n%1\n\n%2"
msgstr ""
-#: Merge.rc:2104
+#: Merge.rc:2110
#, c-format
msgid "Failed to parse conflict file."
msgstr ""
-#: Merge.rc:2105
+#: Merge.rc:2111
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
-#: Merge.rc:2111
+#: Merge.rc:2117
#, c-format
msgid "Save As"
msgstr ""
-#: Merge.rc:2112
+#: Merge.rc:2118
#, c-format
msgid "Save changes to %1?"
msgstr ""
-#: Merge.rc:2113
+#: Merge.rc:2119
#, c-format
msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
msgstr ""
-#: Merge.rc:2114
+#: Merge.rc:2120
#, c-format
msgid "Error checking destination writeability"
msgstr ""
-#: Merge.rc:2115
+#: Merge.rc:2121
#, c-format
msgid "Error backing up file"
msgstr ""
-#: Merge.rc:2117
+#: Merge.rc:2123
#, c-format
msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
msgstr ""
-#: Merge.rc:2118
+#: Merge.rc:2124
#, c-format
msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
msgstr ""
-#: Merge.rc:2119
+#: Merge.rc:2125
#, c-format
msgid "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
msgstr ""
-#: Merge.rc:2120
+#: Merge.rc:2126
#, c-format
msgid "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
msgstr ""
-#: Merge.rc:2121
+#: Merge.rc:2127
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?"
msgstr ""
-#: Merge.rc:2122
+#: Merge.rc:2128
#, c-format
msgid "%1\nis marked read-only. Would you like to override the read-only item?"
msgstr ""
-#: Merge.rc:2123
+#: Merge.rc:2129
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nIf you want to refresh files close current file compare and load files again."
msgstr ""
-#: Merge.rc:2124
+#: Merge.rc:2130
#, c-format
msgid "Save Left File As"
msgstr ""
-#: Merge.rc:2125
+#: Merge.rc:2131
#, c-format
msgid "Save Right File As"
msgstr ""
-#: Merge.rc:2131
+#: Merge.rc:2137
#, c-format
msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
msgstr ""
-#: Merge.rc:2137
+#: Merge.rc:2143
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
msgstr ""
-#: Merge.rc:2138
+#: Merge.rc:2144
#, c-format
msgid "Checkout files from VSS..."
msgstr ""
-#: Merge.rc:2139
+#: Merge.rc:2145
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
msgstr ""
-#: Merge.rc:2140
+#: Merge.rc:2146
#, c-format
msgid "Error executing versioning system command."
msgstr ""
-#: Merge.rc:2141
+#: Merge.rc:2147
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
msgstr ""
-#: Merge.rc:2142
+#: Merge.rc:2148
#, c-format
msgid "No VSS database(s) found!"
msgstr ""
-#: Merge.rc:2143
+#: Merge.rc:2149
#, c-format
msgid "Error from VSS:"
msgstr ""
-#: Merge.rc:2144
+#: Merge.rc:2150
#, c-format
msgid "Versioning System returned an error while attempting to check in the file.\n Please, check config spec of used view.\n Undo checkout operation?"
msgstr ""
-#: Merge.rc:2145
+#: Merge.rc:2151
#, c-format
msgid "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. "
msgstr ""
-#: Merge.rc:2151
-#: Merge.rc:2586
-#: Merge.rc:2774
+#: Merge.rc:2157
+#: Merge.rc:2592
+#: Merge.rc:2780
#, c-format
msgid "None"
msgstr ""
-#: Merge.rc:2152
+#: Merge.rc:2158
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
msgstr ""
-#: Merge.rc:2153
+#: Merge.rc:2159
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
msgstr ""
-#: Merge.rc:2155
+#: Merge.rc:2161
#, c-format
msgid "Break at whitespace"
msgstr ""
-#: Merge.rc:2156
+#: Merge.rc:2162
#, c-format
msgid "Break at whitespace or punctuation"
msgstr ""
-#: Merge.rc:2162
-#: Merge.rc:2164
+#: Merge.rc:2168
+#: Merge.rc:2170
#, c-format
msgid "Copy selected item to named directory"
msgstr ""
-#: Merge.rc:2163
-#: Merge.rc:2165
+#: Merge.rc:2169
+#: Merge.rc:2171
#, c-format
msgid "Copy selected item to custom directory"
msgstr ""
-#: Merge.rc:2166
+#: Merge.rc:2172
#, c-format
msgid "Delete selected item on left"
msgstr ""
-#: Merge.rc:2167
+#: Merge.rc:2173
#, c-format
msgid "Delete selected item on right"
msgstr ""
-#: Merge.rc:2168
+#: Merge.rc:2174
#, c-format
msgid "Delete selected item(s) on both sides"
msgstr ""
-#: Merge.rc:2169
+#: Merge.rc:2175
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
msgstr ""
-#: Merge.rc:2170
+#: Merge.rc:2176
#, c-format
msgid "Rename selected item on both sides"
msgstr ""
-#: Merge.rc:2171
+#: Merge.rc:2177
#, c-format
msgid "Right to Left (%1)"
msgstr ""
-#: Merge.rc:2172
+#: Merge.rc:2178
#, c-format
msgid "Left to Right (%1)"
msgstr ""
-#: Merge.rc:2173
+#: Merge.rc:2179
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr ""
-#: Merge.rc:2174
+#: Merge.rc:2180
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr ""
-#: Merge.rc:2175
-#: Merge.rc:2191
+#: Merge.rc:2181
+#: Merge.rc:2197
#, c-format
msgid "Left to... (%1)"
msgstr ""
-#: Merge.rc:2176
-#: Merge.rc:2192
+#: Merge.rc:2182
+#: Merge.rc:2198
#, c-format
msgid "Right to... (%1)"
msgstr ""
-#: Merge.rc:2177
-#: Merge.rc:2193
+#: Merge.rc:2183
+#: Merge.rc:2199
#, c-format
msgid "Left to... (%1 of %2)"
msgstr ""
-#: Merge.rc:2178
-#: Merge.rc:2194
+#: Merge.rc:2184
+#: Merge.rc:2200
#, c-format
msgid "Right to... (%1 of %2)"
msgstr ""
-#: Merge.rc:2184
+#: Merge.rc:2190
#, c-format
msgid "Left (%1)"
msgstr ""
-#: Merge.rc:2185
+#: Merge.rc:2191
#, c-format
msgid "Right (%1)"
msgstr ""
-#: Merge.rc:2186
+#: Merge.rc:2192
#, c-format
msgid "Both (%1)"
msgstr ""
-#: Merge.rc:2187
+#: Merge.rc:2193
#, c-format
msgid "Left (%1 of %2)"
msgstr ""
-#: Merge.rc:2188
+#: Merge.rc:2194
#, c-format
msgid "Right (%1 of %2)"
msgstr ""
-#: Merge.rc:2189
+#: Merge.rc:2195
#, c-format
msgid "Both (%1 of %2)"
msgstr ""
-#: Merge.rc:2190
+#: Merge.rc:2196
#, c-format
msgid "Select destination folder"
msgstr ""
-#: Merge.rc:2195
+#: Merge.rc:2201
#, c-format
msgid "Left side - select destination folder:"
msgstr ""
-#: Merge.rc:2196
+#: Merge.rc:2202
#, c-format
msgid "Right side - select destination folder:"
msgstr ""
-#: Merge.rc:2197
+#: Merge.rc:2203
#, c-format
msgid "(%1 Files Affected)"
msgstr ""
-#: Merge.rc:2198
+#: Merge.rc:2204
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr ""
-#: Merge.rc:2204
+#: Merge.rc:2210
#, c-format
msgid "Are you sure you want to delete\n\n%1 ?"
msgstr ""
-#: Merge.rc:2205
+#: Merge.rc:2211
#, c-format
msgid "Are you sure you want to copy:"
msgstr ""
-#: Merge.rc:2206
+#: Merge.rc:2212
#, c-format
msgid "Are you sure you want to copy %d items:"
msgstr ""
-#: Merge.rc:2207
+#: Merge.rc:2213
#, c-format
msgid "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare."
msgstr ""
-#: Merge.rc:2213
+#: Merge.rc:2219
#, c-format
msgid "Open left file"
msgstr ""
-#: Merge.rc:2214
+#: Merge.rc:2220
#, c-format
msgid "Open the left file to external editor"
msgstr ""
-#: Merge.rc:2215
+#: Merge.rc:2221
#, c-format
msgid "Open left file with ..."
msgstr ""
-#: Merge.rc:2216
+#: Merge.rc:2222
#, c-format
msgid "Open right file"
msgstr ""
-#: Merge.rc:2217
+#: Merge.rc:2223
#, c-format
msgid "Open the right file to external editor"
msgstr ""
-#: Merge.rc:2218
+#: Merge.rc:2224
#, c-format
msgid "Open right file with..."
msgstr ""
-#: Merge.rc:2219
+#: Merge.rc:2225
#, c-format
msgid "Failed to execute external editor: %1"
msgstr ""
-#: Merge.rc:2220
+#: Merge.rc:2226
#, c-format
msgid "Unknown extension on external editor: %1"
msgstr ""
-#: Merge.rc:2221
+#: Merge.rc:2227
#, c-format
msgid "Copy filenames to clipboard"
msgstr ""
-#: Merge.rc:2222
+#: Merge.rc:2228
#, c-format
msgid "Copy left side pathnames to clipboard"
msgstr ""
-#: Merge.rc:2223
+#: Merge.rc:2229
#, c-format
msgid "Copy right side pathnames to clipboard"
msgstr ""
-#: Merge.rc:2224
+#: Merge.rc:2230
#, c-format
msgid "Copy both sides pathnames to clipboard"
msgstr ""
-#: Merge.rc:2230
+#: Merge.rc:2236
#, c-format
msgid "Unknown archive format"
msgstr ""
-#: Merge.rc:2231
+#: Merge.rc:2237
#, c-format
msgid "Add items from left side to archive"
msgstr ""
-#: Merge.rc:2232
+#: Merge.rc:2238
#, c-format
msgid "Add items from right side to archive"
msgstr ""
-#: Merge.rc:2233
+#: Merge.rc:2239
#, c-format
msgid "Add items from both sides to archive"
msgstr ""
-#: Merge.rc:2234
+#: Merge.rc:2240
#, c-format
msgid "Add different items to archive (both sides)"
msgstr ""
-#: Merge.rc:2236
+#: Merge.rc:2242
#, c-format
msgid "Move selected file on left to custom directory"
msgstr ""
-#: Merge.rc:2238
+#: Merge.rc:2244
#, c-format
msgid "Move selected file on right to custom directory"
msgstr ""
-#: Merge.rc:2244
+#: Merge.rc:2250
#, c-format
msgid "Filename"
msgstr ""
-#: Merge.rc:2245
+#: Merge.rc:2251
#, c-format
msgid "Folder"
msgstr ""
-#: Merge.rc:2246
+#: Merge.rc:2252
#, c-format
msgid "Comparison result"
msgstr ""
-#: Merge.rc:2247
+#: Merge.rc:2253
#, c-format
msgid "Left Date"
msgstr ""
-#: Merge.rc:2248
+#: Merge.rc:2254
#, c-format
msgid "Right Date"
msgstr ""
-#: Merge.rc:2249
+#: Merge.rc:2255
#, c-format
msgid "Extension"
msgstr ""
-#: Merge.rc:2250
+#: Merge.rc:2256
#, c-format
msgid "Left Size"
msgstr ""
-#: Merge.rc:2251
+#: Merge.rc:2257
#, c-format
msgid "Right Size"
msgstr ""
-#: Merge.rc:2252
+#: Merge.rc:2258
#, c-format
msgid "Right Size (Short)"
msgstr ""
-#: Merge.rc:2253
+#: Merge.rc:2259
#, c-format
msgid "Left Size (Short)"
msgstr ""
-#: Merge.rc:2259
+#: Merge.rc:2265
#, c-format
msgid "Left Creation Time"
msgstr ""
-#: Merge.rc:2260
+#: Merge.rc:2266
#, c-format
msgid "Right Creation Time"
msgstr ""
-#: Merge.rc:2261
+#: Merge.rc:2267
#, c-format
msgid "Newer File"
msgstr ""
-#: Merge.rc:2262
+#: Merge.rc:2268
#, c-format
msgid "Left File Version"
msgstr ""
-#: Merge.rc:2263
+#: Merge.rc:2269
#, c-format
msgid "Right File Version"
msgstr ""
-#: Merge.rc:2264
+#: Merge.rc:2270
#, c-format
msgid "Short Result"
msgstr ""
-#: Merge.rc:2265
+#: Merge.rc:2271
#, c-format
msgid "Left Attributes"
msgstr ""
-#: Merge.rc:2266
+#: Merge.rc:2272
#, c-format
msgid "Right Attributes"
msgstr ""
-#: Merge.rc:2267
+#: Merge.rc:2273
#, c-format
msgid "Left EOL"
msgstr ""
-#: Merge.rc:2268
+#: Merge.rc:2274
#, c-format
msgid "Right EOL"
msgstr ""
-#: Merge.rc:2274
+#: Merge.rc:2280
#, c-format
msgid "Left Encoding"
msgstr ""
-#: Merge.rc:2275
+#: Merge.rc:2281
#, c-format
msgid "Right Encoding"
msgstr ""
-#: Merge.rc:2276
+#: Merge.rc:2282
#, c-format
msgid "Ignored Diff."
msgstr ""
-#: Merge.rc:2277
+#: Merge.rc:2283
#, c-format
msgid "Differences"
msgstr ""
-#: Merge.rc:2278
-#: Merge.rc:2582
+#: Merge.rc:2284
+#: Merge.rc:2588
#, c-format
msgid "Binary"
msgstr ""
-#: Merge.rc:2284
+#: Merge.rc:2290
#, c-format
msgid "Unable to compare files"
msgstr ""
-#: Merge.rc:2285
+#: Merge.rc:2291
#, c-format
msgid "Item aborted"
msgstr ""
-#: Merge.rc:2286
+#: Merge.rc:2292
#, c-format
msgid "File skipped"
msgstr ""
-#: Merge.rc:2287
+#: Merge.rc:2293
#, c-format
msgid "Folder skipped"
msgstr ""
-#: Merge.rc:2288
+#: Merge.rc:2294
#, c-format
msgid "Left only: %1"
msgstr ""
-#: Merge.rc:2289
+#: Merge.rc:2295
#, c-format
msgid "Right only: %1"
msgstr ""
-#: Merge.rc:2290
+#: Merge.rc:2296
#, c-format
msgid "Binary files are identical"
msgstr ""
-#: Merge.rc:2292
+#: Merge.rc:2298
#, c-format
msgid "Binary files are different"
msgstr ""
-#: Merge.rc:2293
+#: Merge.rc:2299
#, c-format
msgid "Files are different"
msgstr ""
-#: Merge.rc:2294
+#: Merge.rc:2300
#, c-format
msgid "Left Only"
msgstr ""
-#: Merge.rc:2295
+#: Merge.rc:2301
#, c-format
msgid "Right Only"
msgstr ""
-#: Merge.rc:2297
+#: Merge.rc:2303
#, c-format
msgid "Error"
msgstr ""
-#: Merge.rc:2303
+#: Merge.rc:2309
#, c-format
msgid "Elapsed time: %ld ms"
msgstr ""
-#: Merge.rc:2304
+#: Merge.rc:2310
#, c-format
msgid "1 item selected"
msgstr ""
-#: Merge.rc:2305
+#: Merge.rc:2311
#, c-format
msgid "%1 items selected"
msgstr ""
-#: Merge.rc:2311
+#: Merge.rc:2317
#, c-format
msgid "Filename or folder name."
msgstr ""
-#: Merge.rc:2312
+#: Merge.rc:2318
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr ""
-#: Merge.rc:2313
+#: Merge.rc:2319
#, c-format
msgid "Comparison result, long form."
msgstr ""
-#: Merge.rc:2314
+#: Merge.rc:2320
#, c-format
msgid "Left side modification date."
msgstr ""
-#: Merge.rc:2315
+#: Merge.rc:2321
#, c-format
msgid "Right side modification date."
msgstr ""
-#: Merge.rc:2316
+#: Merge.rc:2322
#, c-format
msgid "File's extension."
msgstr ""
-#: Merge.rc:2317
+#: Merge.rc:2323
#, c-format
msgid "Left file size in bytes."
msgstr ""
-#: Merge.rc:2318
+#: Merge.rc:2324
#, c-format
msgid "Right file size in bytes."
msgstr ""
-#: Merge.rc:2319
+#: Merge.rc:2325
#, c-format
msgid "Left file size abbreviated."
msgstr ""
-#: Merge.rc:2320
+#: Merge.rc:2326
#, c-format
msgid "Right file size abbreviated."
msgstr ""
-#: Merge.rc:2326
+#: Merge.rc:2332
#, c-format
msgid "Left side creation time."
msgstr ""
-#: Merge.rc:2327
+#: Merge.rc:2333
#, c-format
msgid "Right side creation time."
msgstr ""
-#: Merge.rc:2328
+#: Merge.rc:2334
#, c-format
msgid "Tells which side has newer modification date."
msgstr ""
-#: Merge.rc:2329
+#: Merge.rc:2335
#, c-format
msgid "Left side file version, only for some filetypes."
msgstr ""
-#: Merge.rc:2330
+#: Merge.rc:2336
#, c-format
msgid "Right side file version, only for some filetypes."
msgstr ""
-#: Merge.rc:2331
+#: Merge.rc:2337
#, c-format
msgid "Short comparison result."
msgstr ""
-#: Merge.rc:2332
+#: Merge.rc:2338
#, c-format
msgid "Left side attributes."
msgstr ""
-#: Merge.rc:2333
+#: Merge.rc:2339
#, c-format
msgid "Right side attributes."
msgstr ""
-#: Merge.rc:2334
+#: Merge.rc:2340
#, c-format
msgid "Left side file EOL type"
msgstr ""
-#: Merge.rc:2335
+#: Merge.rc:2341
#, c-format
msgid "Right side file EOL type"
msgstr ""
-#: Merge.rc:2341
+#: Merge.rc:2347
#, c-format
msgid "Left side encoding."
msgstr ""
-#: Merge.rc:2342
+#: Merge.rc:2348
#, c-format
msgid "Right side encoding."
msgstr ""
-#: Merge.rc:2343
+#: Merge.rc:2349
#, c-format
msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
msgstr ""
-#: Merge.rc:2344
+#: Merge.rc:2350
#, c-format
msgid "Number of differences in file. This number does not include ignored differences."
msgstr ""
-#: Merge.rc:2345
+#: Merge.rc:2351
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr ""
-#: Merge.rc:2351
+#: Merge.rc:2357
#, c-format
msgid "Compare %1 with %2"
msgstr ""
-#: Merge.rc:2352
+#: Merge.rc:2358
#, c-format
msgid "Comma-separated list"
msgstr ""
-#: Merge.rc:2353
+#: Merge.rc:2359
#, c-format
msgid "Tab-separated list"
msgstr ""
-#: Merge.rc:2354
+#: Merge.rc:2360
#, c-format
msgid "Simple HTML"
msgstr ""
-#: Merge.rc:2355
+#: Merge.rc:2361
#, c-format
msgid "Simple XML"
msgstr ""
-#: Merge.rc:2357
+#: Merge.rc:2363
#, c-format
msgid "The report file already exists. Do you want to overwrite existing file?"
msgstr ""
-#: Merge.rc:2358
+#: Merge.rc:2364
#, c-format
msgid "Error creating the report:\n%1"
msgstr ""
-#: Merge.rc:2359
+#: Merge.rc:2365
#, c-format
msgid "The report has been created successfully."
msgstr ""
-#: Merge.rc:2365
+#: Merge.rc:2371
#, c-format
msgid "The same file is opened in both panels."
msgstr ""
-#: Merge.rc:2366
+#: Merge.rc:2372
#, c-format
msgid "The selected files are identical."
msgstr ""
-#: Merge.rc:2367
+#: Merge.rc:2373
#, c-format
msgid "An error occurred while comparing the files."
msgstr ""
-#: Merge.rc:2368
+#: Merge.rc:2374
#, c-format
msgid "Temporary files could not be created. Check your temporary path settings."
msgstr ""
-#: Merge.rc:2369
+#: Merge.rc:2375
#, c-format
msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)."
msgstr ""
-#: Merge.rc:2370
+#: Merge.rc:2376
#, c-format
msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
msgstr ""
-#: Merge.rc:2371
+#: Merge.rc:2377
#, c-format
msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
msgstr ""
-#: Merge.rc:2372
+#: Merge.rc:2378
#, c-format
msgid "The selected folder is invalid."
msgstr ""
-#: Merge.rc:2373
+#: Merge.rc:2379
#, c-format
msgid "Cannot open a binary file to editor."
msgstr ""
-#: Merge.rc:2374
+#: Merge.rc:2380
#, c-format
msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"
msgstr ""
-#: Merge.rc:2380
+#: Merge.rc:2386
#, c-format
msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?"
msgstr ""
-#: Merge.rc:2381
+#: Merge.rc:2387
#, c-format
msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
msgstr ""
-#: Merge.rc:2382
+#: Merge.rc:2388
#, c-format
msgid "Information lost due to encoding errors: both files"
msgstr ""
-#: Merge.rc:2383
+#: Merge.rc:2389
#, c-format
msgid "Information lost due to encoding errors: right file"
msgstr ""
-#: Merge.rc:2384
+#: Merge.rc:2390
#, c-format
msgid "Information lost due to encoding errors: left file"
msgstr ""
-#: Merge.rc:2390
+#: Merge.rc:2396
#, c-format
msgid "No difference"
msgstr ""
-#: Merge.rc:2391
+#: Merge.rc:2397
#, c-format
msgid "Line difference"
msgstr ""
-#: Merge.rc:2397
+#: Merge.rc:2403
#, c-format
msgid "Replaced %1 string(s)."
msgstr ""
-#: Merge.rc:2398
+#: Merge.rc:2404
#, c-format
msgid "Cannot find string \"%s\""
msgstr ""
-#: Merge.rc:2404
+#: Merge.rc:2410
#, c-format
msgid "Copy Full Path"
msgstr ""
-#: Merge.rc:2405
+#: Merge.rc:2411
#, c-format
msgid "Copy Filename"
msgstr ""
-#: Merge.rc:2411
+#: Merge.rc:2417
#, c-format
msgid "Location Pane"
msgstr ""
-#: Merge.rc:2412
+#: Merge.rc:2418
#, c-format
msgid "Diff Pane"
msgstr ""
-#: Merge.rc:2418
+#: Merge.rc:2424
#, c-format
msgid "Patch file successfully written."
msgstr ""
-#: Merge.rc:2419
+#: Merge.rc:2425
#, c-format
msgid "1. item is not found or is directory!"
msgstr ""
-#: Merge.rc:2420
+#: Merge.rc:2426
#, c-format
msgid "2. item is not found or is directory!"
msgstr ""
-#: Merge.rc:2421
+#: Merge.rc:2427
#, c-format
msgid "The patch file already exists. Do you want to overwrite it?"
msgstr ""
-#: Merge.rc:2422
+#: Merge.rc:2428
#, c-format
msgid "[%1 files selected]"
msgstr ""
-#: Merge.rc:2423
+#: Merge.rc:2429
#, c-format
msgid "Normal"
msgstr ""
-#: Merge.rc:2424
+#: Merge.rc:2430
#, c-format
msgid "Context"
msgstr ""
-#: Merge.rc:2425
+#: Merge.rc:2431
#, c-format
msgid "Unified"
msgstr ""
-#: Merge.rc:2426
+#: Merge.rc:2432
#, c-format
msgid "Could not write to file %1."
msgstr ""
-#: Merge.rc:2427
+#: Merge.rc:2433
#, c-format
msgid "The specified output path is not an absolute path: %1"
msgstr ""
-#: Merge.rc:2428
+#: Merge.rc:2434
#, c-format
msgid "Specify an output file"
msgstr ""
-#: Merge.rc:2429
+#: Merge.rc:2435
#, c-format
msgid "Cannot create a patch file from binary files."
msgstr ""
-#: Merge.rc:2430
+#: Merge.rc:2436
#, c-format
msgid "Cannot create a patch file from directories."
msgstr ""
-#: Merge.rc:2431
+#: Merge.rc:2437
#, c-format
msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files."
msgstr ""
-#: Merge.rc:2432
+#: Merge.rc:2438
#, c-format
msgid "Folder does not exist."
msgstr ""
-#: Merge.rc:2437
+#: Merge.rc:2443
#, c-format
msgid "Current directory comparison results will be cleared."
msgstr ""
-#: Merge.rc:2438
+#: Merge.rc:2444
#, c-format
msgid "Archive support is not enabled.\nAll needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\nSee manual for more info about archive support and how to enable it."
msgstr ""
-#: Merge.rc:2439
+#: Merge.rc:2445
#, c-format
msgid "\nNote: 7-Zip integration is disabled in WinMerge settings."
msgstr ""
-#: Merge.rc:2440
+#: Merge.rc:2446
#, c-format
msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings."
msgstr ""
-#: Merge.rc:2441
+#: Merge.rc:2447
#, c-format
msgid "Select file for export"
msgstr ""
-#: Merge.rc:2442
+#: Merge.rc:2448
#, c-format
msgid "Select file for import"
msgstr ""
-#: Merge.rc:2443
+#: Merge.rc:2449
#, c-format
msgid "Options imported from the file."
msgstr ""
-#: Merge.rc:2444
+#: Merge.rc:2450
#, c-format
msgid "Options exported to the file."
msgstr ""
-#: Merge.rc:2445
+#: Merge.rc:2451
#, c-format
msgid "Failed to import options from the file."
msgstr ""
-#: Merge.rc:2446
+#: Merge.rc:2452
#, c-format
msgid "Failed to write options to the file."
msgstr ""
-#: Merge.rc:2447
+#: Merge.rc:2453
#, c-format
msgid "You are about to close several compare windows.\n\nDo you want to continue?"
msgstr ""
-#: Merge.rc:2453
+#: Merge.rc:2459
#, c-format
msgid "Regular expression error"
msgstr ""
-#: Merge.rc:2454
+#: Merge.rc:2460
#, c-format
msgid "No match"
msgstr ""
-#: Merge.rc:2455
+#: Merge.rc:2461
#, c-format
msgid "Invalid regular expression"
msgstr ""
-#: Merge.rc:2456
+#: Merge.rc:2462
#, c-format
msgid "Invalid collation character"
msgstr ""
-#: Merge.rc:2457
+#: Merge.rc:2463
#, c-format
msgid "Invalid character class name"
msgstr ""
-#: Merge.rc:2458
+#: Merge.rc:2464
#, c-format
msgid "Trailing backslash"
msgstr ""
-#: Merge.rc:2459
+#: Merge.rc:2465
#, c-format
msgid "Invalid back reference"
msgstr ""
-#: Merge.rc:2460
+#: Merge.rc:2466
#, c-format
msgid "Unmatched [ or [^"
msgstr ""
-#: Merge.rc:2461
+#: Merge.rc:2467
#, c-format
msgid "Unmatched ( or \\("
msgstr ""
-#: Merge.rc:2462
+#: Merge.rc:2468
#, c-format
msgid "Unmatched \\{"
msgstr ""
-#: Merge.rc:2463
+#: Merge.rc:2469
#, c-format
msgid "Invalid content of \\{\\}"
msgstr ""
-#: Merge.rc:2464
+#: Merge.rc:2470
#, c-format
msgid "Invalid range end"
msgstr ""
-#: Merge.rc:2465
+#: Merge.rc:2471
#, c-format
msgid "Out of memory"
msgstr ""
-#: Merge.rc:2466
+#: Merge.rc:2472
#, c-format
msgid "Invalid preceding regular expression"
msgstr ""
-#: Merge.rc:2467
+#: Merge.rc:2473
#, c-format
msgid "Premature end of regular expression"
msgstr ""
-#: Merge.rc:2468
+#: Merge.rc:2474
#, c-format
msgid "Regular expression too big"
msgstr ""
-#: Merge.rc:2473
+#: Merge.rc:2479
#, c-format
msgid "Unmatched ) or \\)"
msgstr ""
-#: Merge.rc:2479
+#: Merge.rc:2485
#, c-format
msgid "Western European"
msgstr ""
-#: Merge.rc:2480
+#: Merge.rc:2486
#, c-format
msgid "Eastern European"
msgstr ""
-#: Merge.rc:2481
+#: Merge.rc:2487
#, c-format
msgid "East Asian"
msgstr ""
-#: Merge.rc:2482
+#: Merge.rc:2488
#, c-format
msgid "SE & SW Asian"
msgstr ""
-#: Merge.rc:2483
+#: Merge.rc:2489
#, c-format
msgid "Middle Eastern"
msgstr ""
-#: Merge.rc:2484
-#: Merge.rc:2494
+#: Merge.rc:2490
+#: Merge.rc:2500
#, c-format
msgid "Not applicable"
msgstr ""
-#: Merge.rc:2490
+#: Merge.rc:2496
#, c-format
msgid "MS-Windows"
msgstr ""
-#: Merge.rc:2491
+#: Merge.rc:2497
#, c-format
msgid "MS-DOS"
msgstr ""
-#: Merge.rc:2492
+#: Merge.rc:2498
#, c-format
msgid "Macintosh"
msgstr ""
-#: Merge.rc:2493
+#: Merge.rc:2499
#, c-format
msgid "IBM"
msgstr ""
-#: Merge.rc:2500
+#: Merge.rc:2506
#, c-format
msgid "EBCDIC"
msgstr ""
-#: Merge.rc:2501
+#: Merge.rc:2507
#, c-format
msgid "IBM EBCDIC Cyrillic"
msgstr ""
-#: Merge.rc:2507
+#: Merge.rc:2513
#, c-format
msgid "MS-DOS Latin US"
msgstr ""
-#: Merge.rc:2508
+#: Merge.rc:2514
#, c-format
msgid "MS-DOS Arabic"
msgstr ""
-#: Merge.rc:2509
+#: Merge.rc:2515
#, c-format
msgid "MS-DOS Greek"
msgstr ""
-#: Merge.rc:2510
+#: Merge.rc:2516
#, c-format
msgid "MS-DOS Baltic Rim"
msgstr ""
-#: Merge.rc:2511
+#: Merge.rc:2517
#, c-format
msgid "MS-DOS Latin 1"
msgstr ""
-#: Merge.rc:2512
+#: Merge.rc:2518
#, c-format
msgid "MS-DOS Greek 1"
msgstr ""
-#: Merge.rc:2513
+#: Merge.rc:2519
#, c-format
msgid "MS-DOS Latin 2"
msgstr ""
-#: Merge.rc:2514
+#: Merge.rc:2520
#, c-format
msgid "MS-DOS Cyrillic"
msgstr ""
-#: Merge.rc:2515
+#: Merge.rc:2521
#, c-format
msgid "MS-DOS Turkish"
msgstr ""
-#: Merge.rc:2516
+#: Merge.rc:2522
#, c-format
msgid "MS-DOS Portuguese"
msgstr ""
-#: Merge.rc:2522
+#: Merge.rc:2528
#, c-format
msgid "MS-DOS Icelandic"
msgstr ""
-#: Merge.rc:2523
+#: Merge.rc:2529
#, c-format
msgid "MS-DOS Hebrew"
msgstr ""
-#: Merge.rc:2524
+#: Merge.rc:2530
#, c-format
msgid "MS-DOS French Canada"
msgstr ""
-#: Merge.rc:2525
+#: Merge.rc:2531
#, c-format
msgid "MS-DOS Nordic"
msgstr ""
-#: Merge.rc:2526
+#: Merge.rc:2532
#, c-format
msgid "MS-DOS Cyrillic CIS 1"
msgstr ""
-#: Merge.rc:2527
+#: Merge.rc:2533
#, c-format
msgid "MS-DOS Greek 2"
msgstr ""
-#: Merge.rc:2533
+#: Merge.rc:2539
#, c-format
msgid "Windows Thai"
msgstr ""
-#: Merge.rc:2534
+#: Merge.rc:2540
#, c-format
msgid "Windows Japanese"
msgstr ""
-#: Merge.rc:2535
+#: Merge.rc:2541
#, c-format
msgid "Windows Simplified Chinese"
msgstr ""
-#: Merge.rc:2536
+#: Merge.rc:2542
#, c-format
msgid "Windows Korean"
msgstr ""
-#: Merge.rc:2537
+#: Merge.rc:2543
#, c-format
msgid "Windows Traditional Chinese"
msgstr ""
-#: Merge.rc:2538
+#: Merge.rc:2544
#, c-format
msgid "Windows Latin 2"
msgstr ""
-#: Merge.rc:2539
+#: Merge.rc:2545
#, c-format
msgid "Windows Cyrillic (Slavic)"
msgstr ""
-#: Merge.rc:2540
+#: Merge.rc:2546
#, c-format
msgid "Windows Latin 1"
msgstr ""
-#: Merge.rc:2541
+#: Merge.rc:2547
#, c-format
msgid "Windows Greek"
msgstr ""
-#: Merge.rc:2542
+#: Merge.rc:2548
#, c-format
msgid "Windows Latin 5 (Turkish)"
msgstr ""
-#: Merge.rc:2543
+#: Merge.rc:2549
#, c-format
msgid "Windows Hebrew"
msgstr ""
-#: Merge.rc:2544
+#: Merge.rc:2550
#, c-format
msgid "Windows Arabic"
msgstr ""
-#: Merge.rc:2545
+#: Merge.rc:2551
#, c-format
msgid "Windows Baltic Rim"
msgstr ""
-#: Merge.rc:2546
+#: Merge.rc:2552
#, c-format
msgid "Windows Vietnamese"
msgstr ""
-#: Merge.rc:2552
+#: Merge.rc:2558
#, c-format
msgid "Macintosh Roman"
msgstr ""
-#: Merge.rc:2553
+#: Merge.rc:2559
#, c-format
msgid "Macintosh Greek"
msgstr ""
-#: Merge.rc:2554
+#: Merge.rc:2560
#, c-format
msgid "Macintosh Cyrillic"
msgstr ""
-#: Merge.rc:2555
+#: Merge.rc:2561
#, c-format
msgid "Macintosh "
msgstr ""
-#: Merge.rc:2556
+#: Merge.rc:2562
#, c-format
msgid "Macintosh Central Europe"
msgstr ""
-#: Merge.rc:2557
+#: Merge.rc:2563
#, c-format
msgid "Macintosh Turkish"
msgstr ""
-#: Merge.rc:2566
+#: Merge.rc:2572
#, c-format
msgid "Approximates ISO-8859-2"
msgstr ""
-#: Merge.rc:2569
+#: Merge.rc:2575
#, c-format
msgid "Approximates ISO-8859-1"
msgstr ""
-#: Merge.rc:2570
+#: Merge.rc:2576
#, c-format
msgid "Approximates ISO-8859-7"
msgstr ""
-#: Merge.rc:2571
+#: Merge.rc:2577
#, c-format
msgid "Approximates ISO-8859-9"
msgstr ""
-#: Merge.rc:2572
+#: Merge.rc:2578
#, c-format
msgid "Approximates ISO-8859-8"
msgstr ""
-#: Merge.rc:2578
+#: Merge.rc:2584
#, c-format
msgid "Win"
msgstr ""
-#: Merge.rc:2579
+#: Merge.rc:2585
#, c-format
msgid "Mac"
msgstr ""
-#: Merge.rc:2580
+#: Merge.rc:2586
#, c-format
msgid "Unix"
msgstr ""
-#: Merge.rc:2581
+#: Merge.rc:2587
#, c-format
msgid "Mixed"
msgstr ""
-#: Merge.rc:2583
+#: Merge.rc:2589
#, c-format
msgid "LF"
msgstr ""
-#: Merge.rc:2584
+#: Merge.rc:2590
#, c-format
msgid "CR"
msgstr ""
-#: Merge.rc:2585
+#: Merge.rc:2591
#, c-format
msgid "CRLF"
msgstr ""
-#: Merge.rc:2592
+#: Merge.rc:2598
#, c-format
msgid " B"
msgstr ""
-#: Merge.rc:2593
+#: Merge.rc:2599
#, c-format
msgid " KB"
msgstr ""
-#: Merge.rc:2594
+#: Merge.rc:2600
#, c-format
msgid " MB"
msgstr ""
-#: Merge.rc:2595
+#: Merge.rc:2601
#, c-format
msgid " GB"
msgstr ""
-#: Merge.rc:2596
+#: Merge.rc:2602
#, c-format
msgid " TB"
msgstr ""
-#: Merge.rc:2597
+#: Merge.rc:2603
#, c-format
msgid " PB"
msgstr ""
-#: Merge.rc:2603
+#: Merge.rc:2609
#, c-format
msgid "Type"
msgstr ""
-#: Merge.rc:2605
+#: Merge.rc:2611
#, c-format
msgid "Unpacker"
msgstr ""
-#: Merge.rc:2606
+#: Merge.rc:2612
#, c-format
msgid "Prediffer"
msgstr ""
-#: Merge.rc:2607
+#: Merge.rc:2613
#, c-format
msgid "Editor script"
msgstr ""
-#: Merge.rc:2614
+#: Merge.rc:2620
#, c-format
msgid "Save the left file"
msgstr ""
-#: Merge.rc:2615
+#: Merge.rc:2621
#, c-format
msgid "Save the right file"
msgstr ""
-#: Merge.rc:2616
+#: Merge.rc:2622
#, c-format
msgid "Save the left file with name..."
msgstr ""
-#: Merge.rc:2617
+#: Merge.rc:2623
#, c-format
msgid "Save the right file with name..."
msgstr ""
-#: Merge.rc:2618
+#: Merge.rc:2624
#, c-format
msgid "Change left file/dir read-only status"
msgstr ""
-#: Merge.rc:2619
+#: Merge.rc:2625
#, c-format
msgid "Change right file/dir read-only status"
msgstr ""
-#: Merge.rc:2620
+#: Merge.rc:2626
#, c-format
msgid "Convert EOL to Windows mode"
msgstr ""
-#: Merge.rc:2621
+#: Merge.rc:2627
#, c-format
msgid "Convert EOL to Unix mode"
msgstr ""
-#: Merge.rc:2622
+#: Merge.rc:2628
#, c-format
msgid "Convert EOL to Mac mode"
msgstr ""
-#: Merge.rc:2623
+#: Merge.rc:2629
#, c-format
msgid "Switch between editing and merging modes"
msgstr ""
-#: Merge.rc:2624
+#: Merge.rc:2630
#, c-format
msgid "View and adjust file encoding properties\nFile encoding properties"
msgstr ""
-#: Merge.rc:2625
+#: Merge.rc:2631
#, c-format
msgid "Open and resolve conflict file"
msgstr ""
-#: Merge.rc:2631
+#: Merge.rc:2637
#, c-format
msgid "Select difference area in the current line\nDifference in the Current Line"
msgstr ""
-#: Merge.rc:2632
+#: Merge.rc:2638
#, c-format
msgid "Go to line or difference\nGo to (Ctrl+G)"
msgstr ""
-#: Merge.rc:2633
+#: Merge.rc:2639
#, c-format
msgid "Set program options\nOptions"
msgstr ""
-#: Merge.rc:2634
+#: Merge.rc:2640
#, c-format
msgid "Refresh display\nRefresh (F5)"
msgstr ""
-#: Merge.rc:2635
+#: Merge.rc:2641
#, c-format
msgid "Copy selected lines to clipboard adding linenumbers to line begin"
msgstr ""
-#: Merge.rc:2636
+#: Merge.rc:2642
#, c-format
msgid "Refresh selected items"
msgstr ""
-#: Merge.rc:2637
+#: Merge.rc:2643
#, c-format
msgid "Toggle bookmark"
msgstr ""
-#: Merge.rc:2638
+#: Merge.rc:2644
#, c-format
msgid "Go to next bookmark"
msgstr ""
-#: Merge.rc:2639
+#: Merge.rc:2645
#, c-format
msgid "Go to previous bookmark"
msgstr ""
-#: Merge.rc:2640
+#: Merge.rc:2646
#, c-format
msgid "Clear all bookmarks"
msgstr ""
-#: Merge.rc:2646
+#: Merge.rc:2652
#, c-format
msgid "Displays items that are exactly the same\nShow Identical Items"
msgstr ""
-#: Merge.rc:2647
+#: Merge.rc:2653
#, c-format
msgid "Displays items that have differences\nShow Different Items"
msgstr ""
-#: Merge.rc:2648
+#: Merge.rc:2654
#, c-format
msgid "Displays items that exist in only on the left side\nShow Left Unique Items"
msgstr ""
-#: Merge.rc:2649
+#: Merge.rc:2655
#, c-format
msgid "Displays items that exist in only on the right side\nShow Right Unique Items"
msgstr ""
-#: Merge.rc:2650
+#: Merge.rc:2656
#, c-format
msgid "Displays binary files\nShow Binary Files"
msgstr ""
-#: Merge.rc:2651
+#: Merge.rc:2657
#, c-format
msgid "Displays skipped items\nShow Skipped Items"
msgstr ""
-#: Merge.rc:2657
+#: Merge.rc:2663
#, c-format
msgid "Select the font for the view\nSelect View Font"
msgstr ""
-#: Merge.rc:2658
+#: Merge.rc:2664
#, c-format
msgid "Revert to using the default system font for view\nDefault Font"
msgstr ""
-#: Merge.rc:2659
+#: Merge.rc:2665
#, c-format
msgid "Shows whitespace characters"
msgstr ""
-#: Merge.rc:2660
+#: Merge.rc:2666
#, c-format
msgid "Toggle Diff Pane"
msgstr ""
-#: Merge.rc:2661
+#: Merge.rc:2667
#, c-format
msgid "Location pane shows overall picture from files"
msgstr ""
-#: Merge.rc:2662
+#: Merge.rc:2668
#, c-format
msgid "Show folder compare statistics dialog"
msgstr ""
-#: Merge.rc:2663
+#: Merge.rc:2669
#, c-format
msgid "Select the current user interface language\nLanguage"
msgstr ""
-#: Merge.rc:2664
+#: Merge.rc:2670
#, c-format
msgid "Shows differences inside lines with different colors\nShow Line Difference"
msgstr ""
-#: Merge.rc:2665
+#: Merge.rc:2671
#, c-format
msgid "Swap the positions of the two panes"
msgstr ""
-#: Merge.rc:2666
+#: Merge.rc:2672
#, c-format
msgid "Shows line numbers\nShow Line Numbers"
msgstr ""
-#: Merge.rc:2667
+#: Merge.rc:2673
#, c-format
msgid "Enable word wrap\nWrap Lines"
msgstr ""
-#: Merge.rc:2668
+#: Merge.rc:2674
#, c-format
msgid "Shows selection margins for both panes\nShow Selection Margins"
msgstr ""
-#: Merge.rc:2669
+#: Merge.rc:2675
#, c-format
msgid "Increase text size"
msgstr ""
-#: Merge.rc:2670
+#: Merge.rc:2676
#, c-format
msgid "Decrease text size"
msgstr ""
-#: Merge.rc:2671
+#: Merge.rc:2677
#, c-format
msgid "Reset text zoom to default size"
msgstr ""
-#: Merge.rc:2677
+#: Merge.rc:2683
#, c-format
msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
msgstr ""
-#: Merge.rc:2678
+#: Merge.rc:2684
#, c-format
msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
msgstr ""
-#: Merge.rc:2679
+#: Merge.rc:2685
#, c-format
msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
msgstr ""
-#: Merge.rc:2680
+#: Merge.rc:2686
#, c-format
msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
msgstr ""
-#: Merge.rc:2681
+#: Merge.rc:2687
#, c-format
msgid "Scroll to the last difference\nLast Difference (Alt+End)"
msgstr ""
-#: Merge.rc:2682
+#: Merge.rc:2688
#, c-format
msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)"
msgstr ""
-#: Merge.rc:2683
+#: Merge.rc:2689
#, c-format
msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)"
msgstr ""
-#: Merge.rc:2684
+#: Merge.rc:2690
#, c-format
msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)"
msgstr ""
-#: Merge.rc:2685
+#: Merge.rc:2691
#, c-format
msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)"
msgstr ""
-#: Merge.rc:2686
+#: Merge.rc:2692
#, c-format
msgid "Copy all differences to the right file\nAll Right"
msgstr ""
-#: Merge.rc:2687
+#: Merge.rc:2693
#, c-format
msgid "Copy all differences to the left file\nAll Left"
msgstr ""
-#: Merge.rc:2688
+#: Merge.rc:2694
#, c-format
msgid "Delete selected items from both directories"
msgstr ""
-#: Merge.rc:2689
+#: Merge.rc:2695
#, c-format
msgid "Compare selected item (compare first item if multiple items selected)"
msgstr ""
-#: Merge.rc:2695
+#: Merge.rc:2701
#, c-format
msgid "Select and reorder directory compare columns"
msgstr ""
-#: Merge.rc:2696
+#: Merge.rc:2702
#, c-format
msgid "Generate a patch-file"
msgstr ""
-#: Merge.rc:2697
+#: Merge.rc:2703
#, c-format
msgid "Select and modify filters"
msgstr ""
-#: Merge.rc:2698
+#: Merge.rc:2704
#, c-format
msgid "Generates a report from compare results"
msgstr ""
-#: Merge.rc:2704
+#: Merge.rc:2710
#, c-format
msgid "Shows a list of available plugins"
msgstr ""
-#: Merge.rc:2705
+#: Merge.rc:2711
#, c-format
msgid "The user selects the unpacker (no unpacking when comparing dir)"
msgstr ""
-#: Merge.rc:2706
+#: Merge.rc:2712
#, c-format
msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
msgstr ""
-#: Merge.rc:2707
+#: Merge.rc:2713
#, c-format
msgid "Select an unpacker to edit this file"
msgstr ""
-#: Merge.rc:2708
+#: Merge.rc:2714
#, c-format
msgid "No prediffer (normal)"
msgstr ""
-#: Merge.rc:2709
+#: Merge.rc:2715
#, c-format
msgid "Suggested plugins"
msgstr ""
-#: Merge.rc:2710
+#: Merge.rc:2716
#, c-format
msgid "Other plugins"
msgstr ""
-#: Merge.rc:2711
+#: Merge.rc:2717
#, c-format
msgid "Unload all plugins and reload them (for developers)"
msgstr ""
-#: Merge.rc:2717
+#: Merge.rc:2723
#, c-format
msgid "Activates next visible file\nActivate next File"
msgstr ""
-#: Merge.rc:2718
+#: Merge.rc:2724
#, c-format
msgid "Closes all open windows"
msgstr ""
-#: Merge.rc:2724
+#: Merge.rc:2730
#, c-format
msgid "Opens the WinMerge Help\nWinMerge Help"
msgstr ""
-#: Merge.rc:2725
+#: Merge.rc:2731
#, c-format
msgid "Outputs current WinMerge version info and configuration to text file"
msgstr ""
-#: Merge.rc:2726
+#: Merge.rc:2732
#, c-format
msgid "Display the GNU General Public License"
msgstr ""
-#: Merge.rc:2727
+#: Merge.rc:2733
#, c-format
msgid "Private Build: %1"
msgstr ""
-#: Merge.rc:2728
+#: Merge.rc:2734
#, c-format
msgid "Opens the release notes document\nRelease Notes"
msgstr ""
-#: Merge.rc:2729
+#: Merge.rc:2735
#, c-format
msgid "Opens the translations website\nTranslations"
msgstr ""
-#: Merge.rc:2735
+#: Merge.rc:2741
#, c-format
msgid "Plugin Settings"
msgstr ""
-#: Merge.rc:2736
+#: Merge.rc:2742
#, c-format
msgid "No prediffer"
msgstr ""
-#: Merge.rc:2737
+#: Merge.rc:2743
#, c-format
msgid "Prediff if possible"
msgstr ""
-#: Merge.rc:2739
+#: Merge.rc:2745
#, c-format
msgid "WSH not found - .sct scripts disabled"
msgstr ""
-#: Merge.rc:2740
+#: Merge.rc:2746
#, c-format
msgid "<None>"
msgstr ""
-#: Merge.rc:2741
+#: Merge.rc:2747
#, c-format
msgid "<Automatic>"
msgstr ""
-#: Merge.rc:2747
+#: Merge.rc:2753
#, c-format
msgid "Open the file with registered application"
msgstr ""
-#: Merge.rc:2748
+#: Merge.rc:2754
#, c-format
msgid "Open the file with external editor"
msgstr ""
-#: Merge.rc:2749
+#: Merge.rc:2755
#, c-format
msgid "Open the file with a particular program"
msgstr ""
-#: Merge.rc:2755
+#: Merge.rc:2761
#, c-format
msgid "Do not display moved blocks"
msgstr ""
-#: Merge.rc:2756
+#: Merge.rc:2762
#, c-format
msgid "Display all moved blocks"
msgstr ""
-#: Merge.rc:2757
+#: Merge.rc:2763
#, c-format
msgid "Display moved blocks only from current diff"
msgstr ""
-#: Merge.rc:2758
+#: Merge.rc:2764
#, c-format
msgid "Go to diff under cursor"
msgstr ""
-#: Merge.rc:2759
+#: Merge.rc:2765
#, c-format
msgid "G&oto Diff %1 of %2"
msgstr ""
-#: Merge.rc:2760
+#: Merge.rc:2766
#, c-format
msgid "G&oto Line %1"
msgstr ""
-#: Merge.rc:2766
+#: Merge.rc:2772
#, c-format
msgid "Disabled"
msgstr ""
-#: Merge.rc:2767
+#: Merge.rc:2773
#, c-format
msgid "From file system"
msgstr ""
-#: Merge.rc:2768
+#: Merge.rc:2774
#, c-format
msgid "From MRU list"
msgstr ""
-#: Merge.rc:2775
+#: Merge.rc:2781
#, c-format
msgid "ASP"
msgstr ""
-#: Merge.rc:2776
+#: Merge.rc:2782
#, c-format
msgid "Basic"
msgstr ""
-#: Merge.rc:2777
+#: Merge.rc:2783
#, c-format
msgid "Batch"
msgstr ""
-#: Merge.rc:2778
+#: Merge.rc:2784
#, c-format
msgid "C/C++"
msgstr ""
-#: Merge.rc:2779
+#: Merge.rc:2785
#, c-format
msgid "C#"
msgstr ""
-#: Merge.rc:2780
+#: Merge.rc:2786
#, c-format
msgid "CSS"
msgstr ""
-#: Merge.rc:2781
+#: Merge.rc:2787
#, c-format
msgid "DCL"
msgstr ""
-#: Merge.rc:2782
+#: Merge.rc:2788
#, c-format
msgid "Fortran"
msgstr ""
-#: Merge.rc:2783
+#: Merge.rc:2789
#, c-format
msgid "HTML"
msgstr ""
-#: Merge.rc:2784
+#: Merge.rc:2790
#, c-format
msgid "INI"
msgstr ""
-#: Merge.rc:2785
+#: Merge.rc:2791
#, c-format
msgid "InnoSetup"
msgstr ""
-#: Merge.rc:2786
+#: Merge.rc:2792
#, c-format
msgid "InstallShield"
msgstr ""
-#: Merge.rc:2787
+#: Merge.rc:2793
#, c-format
msgid "Java"
msgstr ""
-#: Merge.rc:2788
+#: Merge.rc:2794
#, c-format
msgid "AutoLISP"
msgstr ""
-#: Merge.rc:2789
+#: Merge.rc:2795
#, c-format
msgid "NSIS"
msgstr ""
-#: Merge.rc:2790
+#: Merge.rc:2796
#, c-format
msgid "Pascal"
msgstr ""
-#: Merge.rc:2791
+#: Merge.rc:2797
#, c-format
msgid "Perl"
msgstr ""
-#: Merge.rc:2792
+#: Merge.rc:2798
#, c-format
msgid "PHP"
msgstr ""
-#: Merge.rc:2793
+#: Merge.rc:2799
#, c-format
msgid "Portable Object"
msgstr ""
-#: Merge.rc:2794
+#: Merge.rc:2800
#, c-format
msgid "PowerShell"
msgstr ""
-#: Merge.rc:2795
+#: Merge.rc:2801
#, c-format
msgid "Python"
msgstr ""
-#: Merge.rc:2796
+#: Merge.rc:2802
#, c-format
msgid "REXX"
msgstr ""
-#: Merge.rc:2797
+#: Merge.rc:2803
#, c-format
msgid "Resources"
msgstr ""
-#: Merge.rc:2798
+#: Merge.rc:2804
#, c-format
msgid "Ruby"
msgstr ""
-#: Merge.rc:2799
+#: Merge.rc:2805
#, c-format
msgid "SGML"
msgstr ""
-#: Merge.rc:2800
+#: Merge.rc:2806
#, c-format
msgid "Shell"
msgstr ""
-#: Merge.rc:2801
+#: Merge.rc:2807
#, c-format
msgid "SIOD"
msgstr ""
-#: Merge.rc:2802
+#: Merge.rc:2808
#, c-format
msgid "SQL"
msgstr ""
-#: Merge.rc:2803
+#: Merge.rc:2809
#, c-format
msgid "TCL"
msgstr ""
-#: Merge.rc:2804
+#: Merge.rc:2810
#, c-format
msgid "TEX"
msgstr ""
-#: Merge.rc:2805
+#: Merge.rc:2811
#, c-format
msgid "XML"
msgstr ""
-#: Merge.rc:2810
+#: Merge.rc:2816
#, c-format
msgid "Hide the toolbar"
msgstr ""
-#: Merge.rc:2811
+#: Merge.rc:2817
#, c-format
msgid "Show small toolbar"
msgstr ""
-#: Merge.rc:2812
+#: Merge.rc:2818
#, c-format
msgid "Show big toolbar"
msgstr ""
Modified: branches/R2_10/Src/LineFiltersList.cpp
===================================================================
--- branches/R2_10/Src/LineFiltersList.cpp 2008-07-21 16:16:54 UTC (rev 5652)
+++ branches/R2_10/Src/LineFiltersList.cpp 2008-07-21 19:28:48 UTC (rev 5653)
@@ -101,7 +101,7 @@
* @return Filter item from the index. If the index is beyond table limit,
* return the last item in the list.
*/
-const LineFilterItem & LineFiltersList::GetAt(int ind)
+const LineFilterItem & LineFiltersList::GetAt(int ind) const
{
if (ind < m_items.size())
return *m_items[ind];
@@ -115,7 +115,7 @@
* list are removed and new items added from the given list.
* @param [in] list List to clone.
*/
-void LineFiltersList::CloneFrom(LineFiltersList *list)
+void LineFiltersList::CloneFrom(const LineFiltersList *list)
{
Empty();
int count = list->GetCount();
@@ -128,6 +128,30 @@
}
/**
+ * @brief Compare filter lists.
+ * @param [in] list List to compare.
+ * @return true if lists are identical, false otherwise.
+ */
+bool LineFiltersList::Compare(const LineFiltersList *list) const
+{
+ if (list->GetCount() != GetCount())
+ return false;
+
+ for (int i = 0; i < GetCount(); i++)
+ {
+ const LineFilterItem &item1 = list->GetAt(i);
+ const LineFilterItem &item2 = GetAt(i);
+
+ if (item1.enabled != item2.enabled)
+ return false;
+
+ if (item1.filterStr != item2.filterStr)
+ return false;
+ }
+ return true;
+}
+
+/**
* @brief Read filter list from the options system.
* @param [in] pOptionsMgr Pointer to options system.
*/
Modified: branches/R2_10/Src/LineFiltersList.h
===================================================================
--- branches/R2_10/Src/LineFiltersList.h 2008-07-21 16:16:54 UTC (rev 5652)
+++ branches/R2_10/Src/LineFiltersList.h 2008-07-21 19:28:48 UTC (rev 5653)
@@ -36,8 +36,9 @@
int GetCount() const;
void Empty();
String GetAsString() const;
- const LineFilterItem & GetAt(int ind);
- void CloneFrom(LineFiltersList *list);
+ const LineFilterItem & GetAt(int ind) const;
+ void CloneFrom(const LineFiltersList *list);
+ bool Compare(const LineFiltersList *list) const;
void Initialize(COptionsMgr *pOptionsMgr);
void SaveFilters();
Modified: branches/R2_10/Src/MainFrm.cpp
===================================================================
--- branches/R2_10/Src/MainFrm.cpp 2008-07-21 16:16:54 UTC (rev 5652)
+++ branches/R2_10/Src/MainFrm.cpp 2008-07-21 19:28:48 UTC (rev 5653)
@@ -1421,20 +1421,18 @@
*/
void CMainFrame::OnViewSelectfont()
{
- CFrameWnd * pFrame = GetActiveFrame();
- BOOL bDirFrame = pFrame->IsKindOf(RUNTIME_CLASS(CDirFrame));
-
+ FRAMETYPE frame = GetFrameType(GetActiveFrame());
CHOOSEFONT cf;
LOGFONT *lf = NULL;
ZeroMemory(&cf, sizeof(CHOOSEFONT));
cf.lStructSize = sizeof(CHOOSEFONT);
cf.Flags = CF_INITTOLOGFONTSTRUCT|CF_FORCEFONTEXIST|CF_SCREENFONTS;
- if (!bDirFrame)
+ if (frame == FRAME_FILE)
cf.Flags |= CF_FIXEDPITCHONLY; // Only fixed-width fonts for merge view
// CF_FIXEDPITCHONLY = 0x00004000L
// in case you are a developer and want to disable it to test with, eg, a Chinese capable font
- if (bDirFrame)
+ if (frame == FRAME_FOLDER)
lf = &m_lfDir;
else
lf = &m_lfDiff;
@@ -1443,7 +1441,7 @@
if (ChooseFont(&cf))
{
- if (bDirFrame)
+ if (frame == FRAME_FOLDER)
{
GetOptionsMgr()->SaveOption(OPT_FONT_DIRCMP_USECUSTOM, true);
GetOptionsMgr()->SaveOption(OPT_FONT_DIRCMP_HEIGHT, lf->lfHeight);
@@ -1480,7 +1478,7 @@
GetOptionsMgr()->SaveOption(OPT_FONT_FILECMP_FACENAME, lf->lfFaceName);
}
- if (bDirFrame)
+ if (frame == FRAME_FOLDER)
m_lfDir = *lf;
else
m_lfDiff = *lf;
@@ -1566,10 +1564,9 @@
*/
void CMainFrame::OnViewUsedefaultfont()
{
- CFrameWnd * pFrame = GetActiveFrame();
- BOOL bDirFrame = pFrame->IsKindOf(RUNTIME_CLASS(CDirFrame));
+ FRAMETYPE frame = GetFrameType(GetActiveFrame());
- if (bDirFrame)
+ if (frame == FRAME_FOLDER)
{
GetOptionsMgr()->SaveOption(OPT_FONT_DIRCMP_USECUSTOM, false);
@@ -1968,10 +1965,11 @@
{
CPatchTool patcher;
CFrameWnd * pFrame = GetActiveFrame();
+ FRAMETYPE frame = GetFrameType(pFrame);
BOOL bOpenDialog = TRUE;
// Mergedoc active?
- if (pFrame->IsKindOf(RUNTIME_CLASS(CChildFrame)))
+ if (frame == FRAME_FILE)
{
CMergeDoc * pMergeDoc = (CMergeDoc *) pFrame->GetActiveDocument();
// If there are changes in files, tell user to save them first
@@ -1987,7 +1985,7 @@
}
}
// Dirview active
- else if (pFrame->IsKindOf(RUNTIME_CLASS(CDirFrame)))
+ else if (frame == FRAME_FOLDER)
{
CDirDoc * pDoc = (CDirDoc*)pFrame->GetActiveDocument();
CDirView *pView = pDoc->GetMainView();
@@ -2468,6 +2466,7 @@
FILEFILTER_INFOLIST fileFilters;
LineFiltersList * lineFilters = new LineFiltersList();
CString selectedFilter;
+ const CString origFilter = theApp.m_globalFileFilter.GetFilterNameOrMask();
sht.AddPage(&fileFiltersDlg);
sht.AddPage(&lineFiltersDlg);
sht.m_psh.dwFlags |= PSH_NOAPPLYNOW; // Hide 'Apply' button since we don't need it
@@ -2478,7 +2477,8 @@
theApp.m_globalFileFilter.GetFileFilters(&fileFilters, selectedFilter);
fileFiltersDlg.SetFilterArray(&fileFilters);
fileFiltersDlg.SetSelected(selectedFilter);
- lineFiltersDlg.m_bIgnoreRegExp = GetOptionsMgr()->GetBool(OPT_LINEFILTER_ENABLED);
+ const BOOL lineFiltersEnabledOrig = GetOptionsMgr()->GetBool(OPT_LINEFILTER_ENABLED);
+ lineFiltersDlg.m_bIgnoreRegExp = lineFiltersEnabledOrig;
lineFilters->CloneFrom(m_pLineFilters);
lineFiltersDlg.SetList(lineFilters);
@@ -2504,10 +2504,58 @@
CString sFilter = theApp.m_globalFileFilter.GetFilterNameOrMask();
GetOptionsMgr()->SaveOption(OPT_FILEFILTER_CURRENT, sFilter);
}
- GetOptionsMgr()->SaveOption(OPT_LINEFILTER_ENABLED, lineFiltersDlg.m_bIgnoreRegExp == TRUE);
+ BOOL linefiltersEnabled = lineFiltersDlg.m_bIgnoreRegExp;
+ GetOptionsMgr()->SaveOption(OPT_LINEFILTER_ENABLED, linefiltersEnabled == TRUE);
+ // Check if compare documents need rescanning
+ BOOL bFileCompareRescan = FALSE;
+ BOOL bFolderCompareRescan = FALSE;
+ CFrameWnd * pFrame = GetActiveFrame();
+ FRAMETYPE frame = GetFrameType(pFrame);
+ if (frame == FRAME_FILE)
+ {
+ if (lineFiltersEnabledOrig != linefiltersEnabled ||
+ !m_pLineFilters->Compare(lineFilters))
+ {
+ bFileCompareRescan = TRUE;
+ }
+ }
+ else if (frame == FRAME_FOLDER)
+ {
+ const CString newFilter = theApp.m_globalFileFilter.GetFilterNameOrMask();
+ if (lineFiltersEnabledOrig != linefiltersEnabled ||
+ !m_pLineFilters->Compare(lineFilters) || origFilter != newFilter)
+ {
+ int res = LangMessageBox(IDS_FILTERCHANGED, MB_ICONWARNING | MB_YESNO);
+ if (res == IDYES)
+ bFolderCompareRescan = TRUE;
+ }
+ }
+
+ // Save new filters before (possibly) rescanning
m_pLineFilters->CloneFrom(lineFilters);
m_pLineFilters->SaveFilters();
+
+ if (bFileCompareRescan)
+ {
+ const MergeDocList &docs = GetAllMergeDocs();
+ POSITION pos = docs.GetHeadPosition();
+ while (pos)
+ {
+ CMergeDoc * pMergeDoc = docs.GetNext(pos);
+ pMergeDoc->FlushAndRescan(TRUE);
+ }
+ }
+ else if (bFolderCompareRescan)
+ {
+ const DirDocList &dirDocs = GetAllDirDocs();
+ POSITION pos = dirDocs.GetHeadPosition();
+ while (pos)
+ {
+ CDirDoc * pDirDoc = dirDocs.GetNext(pos);
+ pDirDoc->Rescan();
+ }
+ }
}
delete lineFilters;
}
@@ -3027,10 +3075,9 @@
String left;
String right;
CFrameWnd * pFrame = GetActiveFrame();
- BOOL bMergeFrame = pFrame->IsKindOf(RUNTIME_CLASS(CChildFrame));
- BOOL bDirFrame = pFrame->IsKindOf(RUNTIME_CLASS(CDirFrame));
+ FRAMETYPE frame = GetFrameType(pFrame);
- if (bMergeFrame)
+ if (frame == FRAME_FILE)
{
CMergeDoc * pMergeDoc = (CMergeDoc *) pFrame->GetActiveDocument();
left = pMergeDoc->m_filePaths.GetLeft();
@@ -3039,7 +3086,7 @@
pathsDlg.m_bLeftPathReadOnly = pMergeDoc->m_ptBuf[0]->GetReadOnly();
pathsDlg.m_bRightPathReadOnly = pMergeDoc->m_ptBuf[1]->GetReadOnly();
}
- else if (bDirFrame)
+ else if (frame == FRAME_FOLDER)
{
// Get paths currently in compare
CDirDoc * pDoc = (CDirDoc*)pFrame->GetActiveDocument();
@@ -3456,6 +3503,24 @@
}
/**
+ * @brief Get type of frame (File/Folder compare).
+ * @param [in] pFrame Pointer to frame to check.
+ * @return FRAMETYPE of the given frame.
+*/
+FRAMETYPE CMainFrame::GetFrameType(const CFrameWnd * pFrame) const
+{
+ BOOL bMergeFrame = pFrame->IsKindOf(RUNTIME_CLASS(CChildFrame));
+ BOOL bDirFrame = pFrame->IsKindOf(RUNTIME_CLASS(CDirFrame));
+
+ if (bMergeFrame)
+ return FRAME_FILE;
+ else if (bDirFrame)
+ return FRAME_FOLDER;
+ else
+ return FRAME_OTHER;
+}
+
+/**
* @brief Show the plugins list dialog.
*/
void CMainFrame::OnPluginsList()
Modified: branches/R2_10/Src/MainFrm.h
===================================================================
--- branches/R2_10/Src/MainFrm.h 2008-07-21 16:16:54 UTC (rev 5652)
+++ branches/R2_10/Src/MainFrm.h 2008-07-21 19:28:48 UTC (rev 5653)
@@ -62,6 +62,16 @@
VCS_CLEARCASE,
};
+/**
+ * @brief Frame/View/Document types.
+ */
+enum FRAMETYPE
+{
+ FRAME_FOLDER, /**< Folder compare frame. */
+ FRAME_FILE, /**< File compare frame. */
+ FRAME_OTHER, /**< No frame? */
+};
+
enum { WM_NONINTERACTIVE = 888 }; // timer value
class BCMenu;
@@ -132,6 +142,7 @@
void StartFlashing();
bool AskCloseConfirmation();
BOOL DoOpenConflict(LPCTSTR conflictFile, bool checked = false);
+ FRAMETYPE GetFrameType(const CFrameWnd * pFrame) const;
// Overrides
virtual void GetMessageString(UINT nID, CString& rMessage) const;
Modified: branches/R2_10/Src/Merge.rc
===================================================================
--- branches/R2_10/Src/Merge.rc 2008-07-21 16:16:54 UTC (rev 5652)
+++ branches/R2_10/Src/Merge.rc 2008-07-21 19:28:48 UTC (rev 5653)
@@ -2029,6 +2029,12 @@
IDS_FILTERLINE_REGEXP "Regular expression"
END
+// GENERAL FILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERCHANGED "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: branches/R2_10/Src/resource.h
===================================================================
--- branches/R2_10/Src/resource.h 2008-07-21 16:16:54 UTC (rev 5652)
+++ branches/R2_10/Src/resource.h 2008-07-21 19:28:48 UTC (rev 5653)
@@ -519,6 +519,7 @@
#define IDS_FILEFILTER_INSTALLFAIL 16460
#define IDS_FILEFILTER_OVERWRITE 16461
#define IDS_FILTERLINE_REGEXP 16480
+#define IDS_FILTERCHANGED ...
[truncated message content] |
|
From: <ki...@us...> - 2008-07-25 11:04:34
|
Revision: 5675
http://winmerge.svn.sourceforge.net/winmerge/?rev=5675&view=rev
Author: kimmov
Date: 2008-07-25 11:04:29 +0000 (Fri, 25 Jul 2008)
Log Message:
-----------
BUG: [ 2023734 ] Errors Moving Files - v.2.4.8.0 Unicode
Disable moving protected items.
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/DirView.cpp
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-24 22:06:02 UTC (rev 5674)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-25 11:04:29 UTC (rev 5675)
@@ -17,6 +17,7 @@
BugFix: Detected UTF-8 encoding shown as 65001 (#2012377)
Bugfix: Don't warn about closing multiple windows when only one
window is open (#2010463)
+ BugFix: Moving was allowed for protected items (#2023734)
WinMerge 2.10.x (R2_10) branch created (r5561)
Modified: branches/R2_10/Src/DirView.cpp
===================================================================
--- branches/R2_10/Src/DirView.cpp 2008-07-24 22:06:02 UTC (rev 5674)
+++ branches/R2_10/Src/DirView.cpp 2008-07-25 11:04:29 UTC (rev 5675)
@@ -2885,7 +2885,14 @@
*/
void CDirView::OnUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI)
{
- DoUpdateCtxtDirMoveRightTo(pCmdUI);
+ // Because move deletes original item, origin side
+ // cannot be read-only
+ if (GetDocument()->GetReadOnly(FALSE))
+ pCmdUI->Enable(FALSE);
+ else
+ {
+ DoUpdateCtxtDirMoveRightTo(pCmdUI);
+ }
}
/**
@@ -2893,7 +2900,14 @@
*/
void CDirView::OnUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI)
{
- DoUpdateCtxtDirMoveLeftTo(pCmdUI);
+ // Because move deletes original item, origin side
+ // cannot be read-only
+ if (GetDocument()->GetReadOnly(TRUE))
+ pCmdUI->Enable(FALSE);
+ else
+ {
+ DoUpdateCtxtDirMoveLeftTo(pCmdUI);
+ }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-07-25 11:15:26
|
Revision: 5677
http://winmerge.svn.sourceforge.net/winmerge/?rev=5677&view=rev
Author: kimmov
Date: 2008-07-25 11:15:23 +0000 (Fri, 25 Jul 2008)
Log Message:
-----------
PATCH: [ 2025781 ] Disable changing EOL for protected file
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/MergeEditView.cpp
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-25 11:06:29 UTC (rev 5676)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-25 11:15:23 UTC (rev 5677)
@@ -18,6 +18,7 @@
Bugfix: Don't warn about closing multiple windows when only one
window is open (#2010463)
BugFix: Moving was allowed for protected items (#2023734)
+ BugFix: Could change EOL style for protected file (#2025781)
WinMerge 2.10.x (R2_10) branch created (r5561)
Modified: branches/R2_10/Src/MergeEditView.cpp
===================================================================
--- branches/R2_10/Src/MergeEditView.cpp 2008-07-25 11:06:29 UTC (rev 5676)
+++ branches/R2_10/Src/MergeEditView.cpp 2008-07-25 11:15:23 UTC (rev 5677)
@@ -2152,6 +2152,10 @@
nStyle != m_pTextBuffer->GetCRLFMode())
{
pCmdUI->SetRadio(FALSE);
+
+ // Don't allow selecting other EOL style for protected pane
+ if (IsReadOnly(m_nThisPane))
+ pCmdUI->Enable(FALSE);
}
else
pCmdUI->SetRadio(TRUE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-07-25 11:48:37
|
Revision: 5679
http://winmerge.svn.sourceforge.net/winmerge/?rev=5679&view=rev
Author: kimmov
Date: 2008-07-25 11:48:35 +0000 (Fri, 25 Jul 2008)
Log Message:
-----------
PATCH: [ 2025472 ] Add Conflict Open to all menus
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/Languages/English.pot
branches/R2_10/Src/Merge.rc
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-25 11:16:52 UTC (rev 5678)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-25 11:48:35 UTC (rev 5679)
@@ -11,6 +11,7 @@
New option to enable plugins (disabled by default) (#2013845)
Add dialog listing available plugins (#2021722)
Refresh compare after changing filter (#2017426)
+ Add "Open Conflict" for file/folder compare menus (#2025472)
BugFix: Use system codepage for paths (#1979429, #2008581)
BugFix: ANSI build crash in folder compare (#2010053)
BugFix: Add insert/overtype mode indicator to statusbar (#2015174)
Modified: branches/R2_10/Src/Languages/English.pot
===================================================================
--- branches/R2_10/Src/Languages/English.pot 2008-07-25 11:16:52 UTC (rev 5678)
+++ branches/R2_10/Src/Languages/English.pot 2008-07-25 11:48:35 UTC (rev 5679)
@@ -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-07-21 22:22+0000\n"
+"POT-Creation-Date: 2008-07-25 14:47+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:502
+#: Merge.rc:504
#, c-format
msgid "&Copy"
msgstr ""
@@ -80,7 +80,7 @@
msgstr ""
#: Merge.rc:84
-#: Merge.rc:583
+#: Merge.rc:585
#, c-format
msgid "&Goto..."
msgstr ""
@@ -91,62 +91,64 @@
msgstr ""
#: Merge.rc:88
-#: Merge.rc:525
-#: Merge.rc:531
+#: Merge.rc:527
+#: Merge.rc:533
#, c-format
msgid "with &Registered Application"
msgstr ""
#: Merge.rc:89
-#: Merge.rc:526
-#: Merge.rc:532
+#: Merge.rc:528
+#: Merge.rc:534
#, c-format
msgid "with &External Editor"
msgstr ""
#: Merge.rc:90
-#: Merge.rc:527
-#: Merge.rc:533
+#: Merge.rc:529
+#: Merge.rc:535
#, c-format
msgid "&with..."
msgstr ""
#: Merge.rc:110
#: Merge.rc:191
-#: Merge.rc:307
+#: Merge.rc:308
#, c-format
msgid "&File"
msgstr ""
#: Merge.rc:112
#: Merge.rc:193
-#: Merge.rc:309
+#: Merge.rc:310
#, c-format
msgid "&New\tCtrl+N"
msgstr ""
#: Merge.rc:113
#: Merge.rc:194
-#: Merge.rc:310
+#: Merge.rc:311
#, c-format
msgid "&Open...\tCtrl+O"
msgstr ""
#: Merge.rc:114
+#: Merge.rc:195
+#: Merge.rc:312
#, c-format
msgid "Op&en Conflict File..."
msgstr ""
#: Merge.rc:116
-#: Merge.rc:196
-#: Merge.rc:312
+#: Merge.rc:197
+#: Merge.rc:314
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr ""
#: Merge.rc:117
-#: Merge.rc:197
-#: Merge.rc:313
+#: Merge.rc:198
+#: Merge.rc:315
#, c-format
msgid "Sa&ve Project..."
msgstr ""
@@ -157,2558 +159,2556 @@
msgstr ""
#: Merge.rc:121
-#: Merge.rc:204
-#: Merge.rc:345
+#: Merge.rc:205
+#: Merge.rc:347
#, c-format
msgid "E&xit"
msgstr ""
#: Merge.rc:123
-#: Merge.rc:206
-#: Merge.rc:347
+#: Merge.rc:207
+#: Merge.rc:349
#, c-format
msgid "&Edit"
msgstr ""
#: Merge.rc:125
-#: Merge.rc:210
-#: Merge.rc:381
+#: Merge.rc:211
+#: Merge.rc:383
#, c-format
msgid "&Options..."
msgstr ""
#: Merge.rc:127
-#: Merge.rc:212
-#: Merge.rc:383
+#: Merge.rc:213
+#: Merge.rc:385
#, c-format
msgid "&View"
msgstr ""
#: Merge.rc:129
-#: Merge.rc:223
-#: Merge.rc:385
+#: Merge.rc:224
+#: Merge.rc:387
#, c-format
msgid "Select &Font..."
msgstr ""
#: Merge.rc:130
-#: Merge.rc:224
-#: Merge.rc:386
+#: Merge.rc:225
+#: Merge.rc:388
#, c-format
msgid "Use Default F&ont"
msgstr ""
#: Merge.rc:132
-#: Merge.rc:226
-#: Merge.rc:407
+#: Merge.rc:227
+#: Merge.rc:409
#, c-format
msgid "&Toolbar"
msgstr ""
#: Merge.rc:134
-#: Merge.rc:228
-#: Merge.rc:409
+#: Merge.rc:229
+#: Merge.rc:411
#, c-format
msgid "&None"
msgstr ""
#: Merge.rc:135
-#: Merge.rc:229
-#: Merge.rc:410
+#: Merge.rc:230
+#: Merge.rc:412
#, c-format
msgid "&Small"
msgstr ""
#: Merge.rc:136
-#: Merge.rc:230
-#: Merge.rc:411
+#: Merge.rc:231
+#: Merge.rc:413
#, c-format
msgid "&Big"
msgstr ""
#: Merge.rc:138
-#: Merge.rc:232
-#: Merge.rc:413
+#: Merge.rc:233
+#: Merge.rc:415
#, c-format
msgid "&Status Bar"
msgstr ""
#: Merge.rc:139
-#: Merge.rc:233
-#: Merge.rc:414
+#: Merge.rc:234
+#: Merge.rc:416
#, c-format
msgid "Ta&b Bar"
msgstr ""
#: Merge.rc:141
-#: Merge.rc:236
-#: Merge.rc:418
+#: Merge.rc:237
+#: Merge.rc:420
#, c-format
msgid "&Language..."
msgstr ""
#: Merge.rc:143
-#: Merge.rc:257
-#: Merge.rc:440
+#: Merge.rc:258
+#: Merge.rc:442
#, c-format
msgid "&Tools"
msgstr ""
#: Merge.rc:145
-#: Merge.rc:260
-#: Merge.rc:442
+#: Merge.rc:261
+#: Merge.rc:444
#, c-format
msgid "&Filters..."
msgstr ""
#: Merge.rc:146
-#: Merge.rc:261
-#: Merge.rc:443
+#: Merge.rc:262
+#: Merge.rc:445
#, c-format
msgid "&Generate Patch..."
msgstr ""
#: Merge.rc:148
-#: Merge.rc:264
-#: Merge.rc:446
+#: Merge.rc:265
+#: Merge.rc:448
#, c-format
msgid "&Plugins"
msgstr ""
#: Merge.rc:150
-#: Merge.rc:266
-#: Merge.rc:448
+#: Merge.rc:267
+#: Merge.rc:450
#, c-format
msgid "&List..."
msgstr ""
#: Merge.rc:152
-#: Merge.rc:268
-#: Merge.rc:450
+#: Merge.rc:269
+#: Merge.rc:452
#, c-format
msgid "&Manual Unpacking"
msgstr ""
#: Merge.rc:153
-#: Merge.rc:269
-#: Merge.rc:451
+#: Merge.rc:270
+#: Merge.rc:453
#, c-format
msgid "&Automatic Unpacking"
msgstr ""
#: Merge.rc:155
-#: Merge.rc:271
-#: Merge.rc:453
+#: Merge.rc:272
+#: Merge.rc:455
#, c-format
msgid "&Edit with Unpacker"
msgstr ""
#: Merge.rc:157
-#: Merge.rc:273
-#: Merge.rc:460
+#: Merge.rc:274
+#: Merge.rc:462
#, c-format
msgid "&Reload plugins"
msgstr ""
#: Merge.rc:159
-#: Merge.rc:275
-#: Merge.rc:462
+#: Merge.rc:276
+#: Merge.rc:464
#, c-format
msgid "&Debug"
msgstr ""
#: Merge.rc:161
-#: Merge.rc:277
-#: Merge.rc:464
+#: Merge.rc:278
+#: Merge.rc:466
#, c-format
msgid "&Load Config..."
msgstr ""
#: Merge.rc:162
-#: Merge.rc:278
-#: Merge.rc:465
+#: Merge.rc:279
+#: Merge.rc:467
#, c-format
msgid "&Reset Options"
msgstr ""
#: Merge.rc:164
-#: Merge.rc:280
-#: Merge.rc:467
+#: Merge.rc:281
+#: Merge.rc:469
#, c-format
msgid "&Window"
msgstr ""
#: Merge.rc:166
-#: Merge.rc:282
-#: Merge.rc:469
+#: Merge.rc:283
+#: Merge.rc:471
#, c-format
msgid "Cl&ose"
msgstr ""
#: Merge.rc:167
-#: Merge.rc:283
-#: Merge.rc:470
+#: Merge.rc:284
+#: Merge.rc:472
#, c-format
msgid "Clo&se All"
msgstr ""
#: Merge.rc:169
-#: Merge.rc:285
-#: Merge.rc:472
+#: Merge.rc:286
+#: Merge.rc:474
#, c-format
msgid "Change &Pane\tF6"
msgstr ""
#: Merge.rc:171
-#: Merge.rc:287
-#: Merge.rc:474
+#: Merge.rc:288
+#: Merge.rc:476
#, c-format
msgid "Tile &Horizontally"
msgstr ""
#: Merge.rc:172
-#: Merge.rc:288
-#: Merge.rc:475
+#: Merge.rc:289
+#: Merge.rc:477
#, c-format
msgid "Tile &Vertically"
msgstr ""
#: Merge.rc:173
-#: Merge.rc:289
-#: Merge.rc:476
+#: Merge.rc:290
+#: Merge.rc:478
#, c-format
msgid "&Cascade"
msgstr ""
#: Merge.rc:175
-#: Merge.rc:291
-#: Merge.rc:478
-#: Merge.rc:1911
+#: Merge.rc:292
+#: Merge.rc:480
+#: Merge.rc:1913
#, c-format
msgid "&Help"
msgstr ""
#: Merge.rc:177
-#: Merge.rc:293
-#: Merge.rc:480
+#: Merge.rc:294
+#: Merge.rc:482
#, c-format
msgid "&WinMerge Help\tF1"
msgstr ""
#: Merge.rc:179
-#: Merge.rc:295
-#: Merge.rc:482
+#: Merge.rc:296
+#: Merge.rc:484
#, c-format
msgid "R&elease Notes"
msgstr ""
#: Merge.rc:180
-#: Merge.rc:296
-#: Merge.rc:483
+#: Merge.rc:297
+#: Merge.rc:485
#, c-format
msgid "&Translations"
msgstr ""
#: Merge.rc:181
-#: Merge.rc:297
-#: Merge.rc:484
+#: Merge.rc:298
+#: Merge.rc:486
#, c-format
msgid "C&onfiguration"
msgstr ""
#: Merge.rc:182
-#: Merge.rc:298
-#: Merge.rc:485
+#: Merge.rc:299
+#: Merge.rc:487
#, c-format
msgid "A&rchive Support disabled..."
msgstr ""
#: Merge.rc:184
-#: Merge.rc:300
-#: Merge.rc:487
+#: Merge.rc:301
+#: Merge.rc:489
#, c-format
msgid "&GNU General Public License"
msgstr ""
#: Merge.rc:185
-#: Merge.rc:301
-#: Merge.rc:488
+#: Merge.rc:302
+#: Merge.rc:490
#, c-format
msgid "&About WinMerge..."
msgstr ""
-#: Merge.rc:199
-#: Merge.rc:331
+#: Merge.rc:200
+#: Merge.rc:333
#, c-format
msgid "L&eft Read-only"
msgstr ""
-#: Merge.rc:200
-#: Merge.rc:332
+#: Merge.rc:201
+#: Merge.rc:334
#, c-format
msgid "Ri&ght Read-only"
msgstr ""
-#: Merge.rc:202
+#: Merge.rc:203
#, c-format
msgid "File En&coding"
msgstr ""
-#: Merge.rc:208
-#: Merge.rc:357
+#: Merge.rc:209
+#: Merge.rc:359
#, c-format
msgid "Select &All\tCtrl+A"
msgstr ""
-#: Merge.rc:214
+#: Merge.rc:215
#, c-format
msgid "Show &Identical Items"
msgstr ""
-#: Merge.rc:215
+#: Merge.rc:216
#, c-format
msgid "Show &Different Items"
msgstr ""
-#: Merge.rc:216
+#: Merge.rc:217
#, c-format
msgid "Show L&eft Unique Items"
msgstr ""
-#: Merge.rc:217
+#: Merge.rc:218
#, c-format
msgid "Show Ri&ght Unique Items"
msgstr ""
-#: Merge.rc:218
+#: Merge.rc:219
#, c-format
msgid "Show S&kipped Items"
msgstr ""
-#: Merge.rc:219
+#: Merge.rc:220
#, c-format
msgid "S&how Binary Files"
msgstr ""
-#: Merge.rc:221
+#: Merge.rc:222
#, c-format
msgid "Show Hidd&en Items"
msgstr ""
-#: Merge.rc:234
+#: Merge.rc:235
#, c-format
msgid "Compa&re Statistics"
msgstr ""
-#: Merge.rc:238
-#: Merge.rc:420
+#: Merge.rc:239
+#: Merge.rc:422
#, c-format
msgid "Refre&sh\tF5"
msgstr ""
-#: Merge.rc:239
+#: Merge.rc:240
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr ""
-#: Merge.rc:241
-#: Merge.rc:422
+#: Merge.rc:242
+#: Merge.rc:424
#, c-format
msgid "&Merge"
msgstr ""
-#: Merge.rc:243
+#: Merge.rc:244
#, c-format
msgid "Co&mpare\tEnter"
msgstr ""
-#: Merge.rc:245
-#: Merge.rc:424
+#: Merge.rc:246
+#: Merge.rc:426
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr ""
-#: Merge.rc:246
-#: Merge.rc:425
+#: Merge.rc:247
+#: Merge.rc:427
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr ""
-#: Merge.rc:248
-#: Merge.rc:427
+#: Merge.rc:249
+#: Merge.rc:429
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr ""
-#: Merge.rc:249
-#: Merge.rc:428
+#: Merge.rc:250
+#: Merge.rc:430
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr ""
-#: Merge.rc:250
-#: Merge.rc:429
+#: Merge.rc:251
+#: Merge.rc:431
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr ""
-#: Merge.rc:252
-#: Merge.rc:431
+#: Merge.rc:253
+#: Merge.rc:433
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr ""
-#: Merge.rc:253
-#: Merge.rc:432
+#: Merge.rc:254
+#: Merge.rc:434
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr ""
-#: Merge.rc:255
+#: Merge.rc:256
#, c-format
msgid "&Delete\tDel"
msgstr ""
-#: Merge.rc:259
-#: Merge.rc:556
+#: Merge.rc:260
+#: Merge.rc:558
#, c-format
msgid "&Customize Columns..."
msgstr ""
-#: Merge.rc:262
-#: Merge.rc:444
+#: Merge.rc:263
+#: Merge.rc:446
#, c-format
msgid "Generate &Report..."
msgstr ""
-#: Merge.rc:315
+#: Merge.rc:317
#, c-format
msgid "&Save\tCtrl+S"
msgstr ""
-#: Merge.rc:316
+#: Merge.rc:318
#, c-format
msgid "Save &Left"
msgstr ""
-#: Merge.rc:318
-#: Merge.rc:323
+#: Merge.rc:320
+#: Merge.rc:325
#, c-format
msgid "&Save"
msgstr ""
-#: Merge.rc:319
-#: Merge.rc:324
+#: Merge.rc:321
+#: Merge.rc:326
#, c-format
msgid "Save &As..."
msgstr ""
-#: Merge.rc:321
+#: Merge.rc:323
#, c-format
msgid "Save &Right"
msgstr ""
-#: Merge.rc:327
+#: Merge.rc:329
#, c-format
msgid "&Print..."
msgstr ""
-#: Merge.rc:328
+#: Merge.rc:330
#, c-format
msgid "Page Se&tup"
msgstr ""
-#: Merge.rc:329
+#: Merge.rc:331
#, c-format
msgid "Print Previe&w"
msgstr ""
-#: Merge.rc:334
+#: Merge.rc:336
#, c-format
msgid "&Convert Line Endings to"
msgstr ""
-#: Merge.rc:336
+#: Merge.rc:338
#, c-format
msgid "&Windows (CRLF)"
msgstr ""
-#: Merge.rc:337
+#: Merge.rc:339
#, c-format
msgid "&Unix (LF)"
msgstr ""
-#: Merge.rc:338
+#: Merge.rc:340
#, c-format
msgid "&Mac (CR)"
msgstr ""
-#: Merge.rc:341
+#: Merge.rc:343
#, c-format
msgid "&Merge Mode\tF9"
msgstr ""
-#: Merge.rc:343
+#: Merge.rc:345
#, c-format
msgid "&File Encoding..."
msgstr ""
-#: Merge.rc:349
+#: Merge.rc:351
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr ""
-#: Merge.rc:350
+#: Merge.rc:352
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr ""
-#: Merge.rc:352
+#: Merge.rc:354
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr ""
-#: Merge.rc:353
+#: Merge.rc:355
#, c-format
msgid "&Copy\tCtrl+C"
msgstr ""
-#: Merge.rc:354
+#: Merge.rc:356
#, c-format
msgid "&Paste\tCtrl+V"
msgstr ""
-#: Merge.rc:356
+#: Merge.rc:358
#, c-format
msgid "Select Line &Difference\tF4"
msgstr ""
-#: Merge.rc:359
+#: Merge.rc:361
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr ""
-#: Merge.rc:360
+#: Merge.rc:362
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr ""
-#: Merge.rc:362
+#: Merge.rc:364
#, c-format
msgid "&Scripts"
msgstr ""
-#: Merge.rc:364
-#: Merge.rc:2744
+#: Merge.rc:366
+#: Merge.rc:2746
#, c-format
msgid "< Empty >"
msgstr ""
-#: Merge.rc:367
+#: Merge.rc:369
#, c-format
msgid "Advanced"
msgstr ""
-#: Merge.rc:369
+#: Merge.rc:371
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr ""
-#: Merge.rc:372
+#: Merge.rc:374
#, c-format
msgid "&Bookmarks"
msgstr ""
-#: Merge.rc:374
+#: Merge.rc:376
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr ""
-#: Merge.rc:375
+#: Merge.rc:377
#, c-format
msgid "&Next Bookmark\tF2"
msgstr ""
-#: Merge.rc:376
+#: Merge.rc:378
#, c-format
msgid "&Previous bookmark\tShift+F2"
msgstr ""
-#: Merge.rc:377
+#: Merge.rc:379
#, c-format
msgid "&Clear All Bookmarks"
msgstr ""
-#: Merge.rc:379
+#: Merge.rc:381
#, c-format
msgid "&Go To...\tCtrl+G"
msgstr ""
-#: Merge.rc:387
+#: Merge.rc:389
#, c-format
msgid "&Zoom"
msgstr ""
-#: Merge.rc:389
+#: Merge.rc:391
#, c-format
msgid "Zoom &In\tCtrl++"
msgstr ""
-#: Merge.rc:390
+#: Merge.rc:392
#, c-format
msgid "Zoom &Out\tCtrl+-"
msgstr ""
#. Zoom to normal
-#: Merge.rc:391
+#: Merge.rc:393
#, c-format
msgid "&Normal\tCtrl+*"
msgstr ""
-#: Merge.rc:393
+#: Merge.rc:395
#, c-format
msgid "Syntax Highlight"
msgstr ""
-#: Merge.rc:398
+#: Merge.rc:400
#, c-format
msgid "&Lock Panes"
msgstr ""
-#: Merge.rc:399
+#: Merge.rc:401
#, c-format
msgid "&View Whitespace"
msgstr ""
-#: Merge.rc:400
+#: Merge.rc:402
#, c-format
msgid "Vie&w Line Differences"
msgstr ""
-#: Merge.rc:401
+#: Merge.rc:403
#, c-format
msgid "View Line &Numbers"
msgstr ""
-#: Merge.rc:402
+#: Merge.rc:404
#, c-format
msgid "View &Margins"
msgstr ""
-#: Merge.rc:403
+#: Merge.rc:405
#, c-format
msgid "W&rap Lines"
msgstr ""
-#: Merge.rc:405
+#: Merge.rc:407
#, c-format
msgid "Sw&ap Panes"
msgstr ""
-#: Merge.rc:415
+#: Merge.rc:417
#, c-format
msgid "Diff &Pane"
msgstr ""
-#: Merge.rc:416
+#: Merge.rc:418
#, c-format
msgid "Lo&cation Pane"
msgstr ""
-#: Merge.rc:434
+#: Merge.rc:436
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
msgstr ""
-#: Merge.rc:435
+#: Merge.rc:437
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
msgstr ""
-#: Merge.rc:437
+#: Merge.rc:439
#, c-format
msgid "Copy &All to Right"
msgstr ""
-#: Merge.rc:438
+#: Merge.rc:440
#, c-format
msgid "Cop&y All to Left"
msgstr ""
-#: Merge.rc:455
+#: Merge.rc:457
#, c-format
msgid "&Prediffer"
msgstr ""
-#: Merge.rc:496
+#: Merge.rc:498
#, c-format
msgid "Comp&are"
msgstr ""
-#: Merge.rc:497
+#: Merge.rc:499
#, c-format
msgid "Co&mpare Special"
msgstr ""
-#: Merge.rc:499
+#: Merge.rc:501
#, c-format
msgid "&XML"
msgstr ""
-#: Merge.rc:504
+#: Merge.rc:506
#, c-format
msgid "&Left to Right"
msgstr ""
-#: Merge.rc:505
+#: Merge.rc:507
#, c-format
msgid "L&eft to..."
msgstr ""
-#: Merge.rc:506
+#: Merge.rc:508
#, c-format
msgid "&Right to Left"
msgstr ""
-#: Merge.rc:507
+#: Merge.rc:509
#, c-format
msgid "R&ight to..."
msgstr ""
-#: Merge.rc:509
+#: Merge.rc:511
#, c-format
msgid "&Move"
msgstr ""
-#: Merge.rc:511
+#: Merge.rc:513
#, c-format
msgid "&Left to..."
msgstr ""
-#: Merge.rc:512
+#: Merge.rc:514
#, c-format
msgid "&Right to..."
msgstr ""
-#: Merge.rc:514
+#: Merge.rc:516
#, c-format
msgid "&Delete"
msgstr ""
-#: Merge.rc:516
-#: Merge.rc:1134
-#: Merge.rc:1516
+#: Merge.rc:518
+#: Merge.rc:1136
+#: Merge.rc:1518
#, c-format
msgid "&Left"
msgstr ""
-#: Merge.rc:517
-#: Merge.rc:1136
-#: Merge.rc:1519
+#: Merge.rc:519
+#: Merge.rc:1138
+#: Merge.rc:1521
#, c-format
msgid "&Right"
msgstr ""
-#: Merge.rc:518
+#: Merge.rc:520
#, c-format
msgid "&Both"
msgstr ""
-#: Merge.rc:520
+#: Merge.rc:522
#, c-format
msgid "Re&name"
msgstr ""
-#: Merge.rc:521
+#: Merge.rc:523
#, c-format
msgid "&Hide Items"
msgstr ""
-#: Merge.rc:523
+#: Merge.rc:525
#, c-format
msgid "&Open Left"
msgstr ""
-#: Merge.rc:529
+#: Merge.rc:531
#, c-format
msgid "O&pen Right"
msgstr ""
-#: Merge.rc:536
+#: Merge.rc:538
#, c-format
msgid "Cop&y Pathnames"
msgstr ""
-#: Merge.rc:538
+#: Merge.rc:540
#, c-format
msgid "&Left (%1 of %2)"
msgstr ""
-#: Merge.rc:539
+#: Merge.rc:541
#, c-format
msgid "&Right (%1 of %2)"
msgstr ""
-#: Merge.rc:540
+#: Merge.rc:542
#, c-format
msgid "&Both (%1 of %2)"
msgstr ""
-#: Merge.rc:542
+#: Merge.rc:544
#, c-format
msgid "Copy &Filenames"
msgstr ""
-#: Merge.rc:544
+#: Merge.rc:546
#, c-format
msgid "&Zip"
msgstr ""
-#: Merge.rc:546
+#: Merge.rc:548
#, c-format
msgid "&Left... (%1 of %2)"
msgstr ""
-#: Merge.rc:547
+#: Merge.rc:549
#, c-format
msgid "&Right... (%1 of %2)"
msgstr ""
-#: Merge.rc:548
+#: Merge.rc:550
#, c-format
msgid "&Both... (%1 of %2)"
msgstr ""
-#: Merge.rc:549
+#: Merge.rc:551
#, c-format
msgid "&Differences... (%1 of %2)"
msgstr ""
-#: Merge.rc:552
+#: Merge.rc:554
#, c-format
msgid "&Refresh"
msgstr ""
-#: Merge.rc:564
+#: Merge.rc:566
#, c-format
msgid "&Copy Full Path"
msgstr ""
-#: Merge.rc:565
+#: Merge.rc:567
#, c-format
msgid "Copy &Filename"
msgstr ""
-#: Merge.rc:571
+#: Merge.rc:573
#, c-format
msgid "Prediffer Settings"
msgstr ""
-#: Merge.rc:573
+#: Merge.rc:575
#, c-format
msgid "&No prediffer"
msgstr ""
-#: Merge.rc:574
+#: Merge.rc:576
#, c-format
msgid "Auto prediffer"
msgstr ""
-#: Merge.rc:582
+#: Merge.rc:584
#, c-format
msgid "G&oto Diff"
msgstr ""
-#: Merge.rc:585
+#: Merge.rc:587
#, c-format
msgid "&No Moved Blocks"
msgstr ""
-#: Merge.rc:586
+#: Merge.rc:588
#, c-format
msgid "&All Moved Blocks"
msgstr ""
-#: Merge.rc:587
+#: Merge.rc:589
#, c-format
msgid "Moved Block for &Current Diff"
msgstr ""
-#: Merge.rc:656
+#: Merge.rc:658
#, c-format
msgid "About WinMerge"
msgstr ""
-#: Merge.rc:662
+#: Merge.rc:664
#, c-format
msgid "(Private Build)"
msgstr ""
-#: Merge.rc:663
+#: Merge.rc:665
#, c-format
msgid "All rights reserved."
msgstr ""
-#: Merge.rc:664
+#: Merge.rc:666
#, c-format
msgid "Visit the WinMerge HomePage!"
msgstr ""
-#: Merge.rc:667
-#: Merge.rc:699
-#: Merge.rc:789
-#: Merge.rc:975
-#: Merge.rc:1053
-#: Merge.rc:1082
-#: Merge.rc:1092
-#: Merge.rc:1258
-#: Merge.rc:1322
-#: Merge.rc:1335
-#: Merge.rc:1427
-#: Merge.rc:1442
-#: Merge.rc:1664
+#: Merge.rc:669
+#: Merge.rc:701
+#: Merge.rc:791
+#: Merge.rc:977
+#: Merge.rc:1055
+#: Merge.rc:1084
+#: Merge.rc:1094
+#: Merge.rc:1260
+#: Merge.rc:1324
+#: Merge.rc:1337
+#: Merge.rc:1429
+#: Merge.rc:1444
+#: Merge.rc:1666
#, c-format
msgid "OK"
msgstr ""
-#: Merge.rc:668
+#: Merge.rc:670
#, c-format
msgid "Contributors"
msgstr ""
-#: Merge.rc:675
+#: Merge.rc:677
#, c-format
msgid "Select Files or Folders"
msgstr ""
-#: Merge.rc:678
-#: Merge.rc:1593
+#: Merge.rc:680
+#: Merge.rc:1595
#, c-format
msgid "&Left:"
msgstr ""
-#: Merge.rc:682
-#: Merge.rc:743
-#: Merge.rc:996
-#: Merge.rc:1018
+#: Merge.rc:684
+#: Merge.rc:745
+#: Merge.rc:998
+#: Merge.rc:1020
#, c-format
msgid "&Browse..."
msgstr ""
-#: Merge.rc:683
-#: Merge.rc:1597
+#: Merge.rc:685
+#: Merge.rc:1599
#, c-format
msgid "&Right:"
msgstr ""
-#: Merge.rc:687
-#: Merge.rc:1029
+#: Merge.rc:689
+#: Merge.rc:1031
#, c-format
msgid "Bro&wse..."
msgstr ""
-#: Merge.rc:688
-#: Merge.rc:1601
+#: Merge.rc:690
+#: Merge.rc:1603
#, c-format
msgid "&Filter:"
msgstr ""
-#: Merge.rc:691
-#: Merge.rc:1603
+#: Merge.rc:693
+#: Merge.rc:1605
#, c-format
msgid "Select..."
msgstr ""
-#: Merge.rc:692
+#: Merge.rc:694
#, c-format
msgid "&Unpacker:"
msgstr ""
-#: Merge.rc:695
+#: Merge.rc:697
#, c-format
msgid "&Select..."
msgstr ""
-#: Merge.rc:696
-#: Merge.rc:1604
+#: Merge.rc:698
+#: Merge.rc:1606
#, c-format
msgid "&Include Subfolders"
msgstr ""
-#: Merge.rc:698
+#: Merge.rc:700
#, c-format
msgid "Status:"
msgstr ""
-#: Merge.rc:700
-#: Merge.rc:730
-#: Merge.rc:790
-#: Merge.rc:820
-#: Merge.rc:852
-#: Merge.rc:862
-#: Merge.rc:1054
-#: Merge.rc:1083
-#: Merge.rc:1093
-#: Merge.rc:1144
-#: Merge.rc:1259
-#: Merge.rc:1336
-#: Merge.rc:1428
-#: Merge.rc:1443
-#: Merge.rc:1665
+#: Merge.rc:702
+#: Merge.rc:732
+#: Merge.rc:792
+#: Merge.rc:822
+#: Merge.rc:854
+#: Merge.rc:864
+#: Merge.rc:1056
+#: Merge.rc:1085
+#: Merge.rc:1095
+#: Merge.rc:1146
+#: Merge.rc:1261
+#: Merge.rc:1338
+#: Merge.rc:1430
+#: Merge.rc:1445
+#: Merge.rc:1667
#, c-format
msgid "Cancel"
msgstr ""
-#: Merge.rc:701
-#: Merge.rc:1337
+#: Merge.rc:703
+#: Merge.rc:1339
#, c-format
msgid "Help"
msgstr ""
-#: Merge.rc:702
+#: Merge.rc:704
#, c-format
msgid "Files or Folders to Compare"
msgstr ""
-#: Merge.rc:709
+#: Merge.rc:711
#, c-format
msgid "Visual SourceSafe"
msgstr ""
-#: Merge.rc:714
+#: Merge.rc:716
#, c-format
msgid "Database:"
msgstr ""
-#: Merge.rc:717
+#: Merge.rc:719
#, c-format
msgid "Project:"
msgstr ""
-#: Merge.rc:720
+#: Merge.rc:722
#, c-format
msgid "User:"
msgstr ""
-#: Merge.rc:722
+#: Merge.rc:724
#, c-format
msgid "Password:"
msgstr ""
-#: Merge.rc:724
+#: Merge.rc:726
#, c-format
msgid "Link to Destination VSS project"
msgstr ""
-#: Merge.rc:726
-#: Merge.rc:867
+#: Merge.rc:728
+#: Merge.rc:869
#, c-format
msgid "Apply to all items"
msgstr ""
-#: Merge.rc:728
+#: Merge.rc:730
#, c-format
msgid "Check Out"
msgstr ""
-#: Merge.rc:729
-#: Merge.rc:863
+#: Merge.rc:731
+#: Merge.rc:865
#, c-format
msgid "Save As..."
msgstr ""
-#: Merge.rc:735
+#: Merge.rc:737
#, c-format
msgid "Versioning System"
msgstr ""
-#: Merge.rc:738
+#: Merge.rc:740
#, c-format
msgid "&Versioning System:"
msgstr ""
-#: Merge.rc:741
+#: Merge.rc:743
#, c-format
msgid "&Path to cleartool.exe:"
msgstr ""
-#: Merge.rc:748
-#: Merge.rc:1919
+#: Merge.rc:750
+#: Merge.rc:1921
#, c-format
msgid "General"
msgstr ""
-#: Merge.rc:751
+#: Merge.rc:753
#, c-format
msgid "Automatically &scroll to first difference"
msgstr ""
-#: Merge.rc:754
+#: Merge.rc:756
#, c-format
msgid "&Disable Splash Screen"
msgstr ""
-#: Merge.rc:756
+#: Merge.rc:758
#, c-format
msgid "Cl&ose windows with ESC"
msgstr ""
-#: Merge.rc:758
+#: Merge.rc:760
#, c-format
msgid "&Automatically verify paths in Open-dialog"
msgstr ""
-#: Merge.rc:761
+#: Merge.rc:763
#, c-format
msgid "All&ow only one instance to run"
msgstr ""
-#: Merge.rc:763
+#: Merge.rc:765
#, c-format
msgid "As&k when closing multiple windows"
msgstr ""
-#: Merge.rc:765
+#: Merge.rc:767
#, c-format
msgid "&Preserve file time in file compare"
msgstr ""
-#: Merge.rc:768
+#: Merge.rc:770
#, c-format
msgid "O&pen-dialog Auto-Completion:"
msgstr ""
-#: Merge.rc:771
+#: Merge.rc:773
#, c-format
msgid "Enable multiple compare windows for"
msgstr ""
-#: Merge.rc:773
-#: Merge.rc:1616
+#: Merge.rc:775
+#: Merge.rc:1618
#, c-format
msgid "&Folder compare"
msgstr ""
-#: Merge.rc:775
-#: Merge.rc:1618
+#: Merge.rc:777
+#: Merge.rc:1620
#, c-format
msgid "Fil&e compare"
msgstr ""
-#: Merge.rc:777
+#: Merge.rc:779
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr ""
-#: Merge.rc:779
+#: Merge.rc:781
#, c-format
msgid "Reset"
msgstr ""
-#: Merge.rc:786
+#: Merge.rc:788
#, c-format
msgid "Language"
msgstr ""
-#: Merge.rc:793
+#: Merge.rc:795
#, c-format
msgid "Available languages:"
msgstr ""
-#: Merge.rc:799
+#: Merge.rc:801
#, c-format
msgid "Find"
msgstr ""
-#: Merge.rc:802
-#: Merge.rc:829
+#: Merge.rc:804
+#: Merge.rc:831
#, c-format
msgid "Fi&nd what:"
msgstr ""
-#: Merge.rc:805
-#: Merge.rc:835
+#: Merge.rc:807
+#: Merge.rc:837
#, c-format
msgid "Match &whole word only"
msgstr ""
-#: Merge.rc:807
-#: Merge.rc:837
+#: Merge.rc:809
+#: Merge.rc:839
#, c-format
msgid "Match &case"
msgstr ""
-#: Merge.rc:809
-#: Merge.rc:839
+#: Merge.rc:811
+#: Merge.rc:841
#, c-format
msgid "Regular &expression"
msgstr ""
-#: Merge.rc:811
+#: Merge.rc:813
#, c-format
msgid "D&on't wrap end of file"
msgstr ""
-#: Merge.rc:814
+#: Merge.rc:816
#, c-format
msgid "Direction"
msgstr ""
-#: Merge.rc:815
+#: Merge.rc:817
#, c-format
msgid "&Up"
msgstr ""
-#: Merge.rc:817
+#: Merge.rc:819
#, c-format
msgid "&Down"
msgstr ""
-#: Merge.rc:819
-#: Merge.rc:849
+#: Merge.rc:821
+#: Merge.rc:851
#, c-format
msgid "&Find Next"
msgstr ""
-#: Merge.rc:826
+#: Merge.rc:828
#, c-format
msgid "Replace"
msgstr ""
-#: Merge.rc:832
+#: Merge.rc:834
#, c-format
msgid "Re&place with:"
msgstr ""
-#: Merge.rc:841
+#: Merge.rc:843
#, c-format
msgid "&Don't wrap end of file"
msgstr ""
-#: Merge.rc:844
+#: Merge.rc:846
#, c-format
msgid "Replace in"
msgstr ""
-#: Merge.rc:845
+#: Merge.rc:847
#, c-format
msgid "&Selection"
msgstr ""
-#: Merge.rc:847
+#: Merge.rc:849
#, c-format
msgid "Wh&ole file"
msgstr ""
-#: Merge.rc:850
+#: Merge.rc:852
#, c-format
msgid "&Replace"
msgstr ""
-#: Merge.rc:851
+#: Merge.rc:853
#, c-format
msgid "Replace &All"
msgstr ""
-#: Merge.rc:858
-#: Merge.rc:2160
+#: Merge.rc:860
+#: Merge.rc:2162
#, c-format
msgid "Rational ClearCase"
msgstr ""
-#: Merge.rc:861
+#: Merge.rc:863
#, c-format
msgid "CheckOut"
msgstr ""
-#: Merge.rc:866
-#: Merge.rc:1178
+#: Merge.rc:868
+#: Merge.rc:1180
#, c-format
msgid "Comments"
msgstr ""
-#: Merge.rc:869
+#: Merge.rc:871
#, c-format
msgid "CheckIn after checkout"
msgstr ""
-#: Merge.rc:875
+#: Merge.rc:877
#, c-format
msgid "Linefilters"
msgstr ""
-#: Merge.rc:878
+#: Merge.rc:880
#, c-format
msgid "Enable Line Filters"
msgstr ""
-#: Merge.rc:881
+#: Merge.rc:883
#, c-format
msgid "Regular Expressions (one per line):"
msgstr ""
-#: Merge.rc:888
+#: Merge.rc:890
#, c-format
msgid "Save"
msgstr ""
-#: Merge.rc:889
+#: Merge.rc:891
#, c-format
msgid "New"
msgstr ""
-#: Merge.rc:890
+#: Merge.rc:892
#, c-format
msgid "Edit"
msgstr ""
-#: Merge.rc:891
+#: Merge.rc:893
#, c-format
msgid "Remove"
msgstr ""
-#: Merge.rc:896
-#: Merge.rc:1922
+#: Merge.rc:898
+#: Merge.rc:1924
#, c-format
msgid "Colors"
msgstr ""
-#: Merge.rc:899
+#: Merge.rc:901
#, c-format
msgid "Difference:"
msgstr ""
-#: Merge.rc:903
+#: Merge.rc:905
#, c-format
msgid "Selected Difference:"
msgstr ""
-#: Merge.rc:907
-#: Merge.rc:1568
+#: Merge.rc:909
+#: Merge.rc:1570
#, c-format
msgid "Background"
msgstr ""
-#: Merge.rc:908
+#: Merge.rc:910
#, c-format
msgid "Deleted"
msgstr ""
-#: Merge.rc:921
-#: Merge.rc:1363
-#: Merge.rc:1569
+#: Merge.rc:923
+#: Merge.rc:1365
+#: Merge.rc:1571
#, c-format
msgid "Text"
msgstr ""
-#: Merge.rc:925
+#: Merge.rc:927
#, c-format
msgid "Ignored Difference:"
msgstr ""
-#: Merge.rc:935
+#: Merge.rc:937
#, c-format
msgid "Moved:"
msgstr ""
-#: Merge.rc:945
+#: Merge.rc:947
#, c-format
msgid "Selected Moved:"
msgstr ""
-#: Merge.rc:952
+#: Merge.rc:954
#, c-format
msgid "Word Difference:"
msgstr ""
-#: Merge.rc:959
+#: Merge.rc:961
#, c-format
msgid "Selected Word Diff:"
msgstr ""
-#: Merge.rc:966
-#: Merge.rc:1052
-#: Merge.rc:1081
-#: Merge.rc:1181
-#: Merge.rc:1409
+#: Merge.rc:968
+#: Merge.rc:1054
+#: Merge.rc:1083
+#: Merge.rc:1183
+#: Merge.rc:1411
#, c-format
msgid "Defaults"
msgstr ""
-#: Merge.rc:972
-#: Merge.rc:1351
-#: Merge.rc:1557
+#: Merge.rc:974
+#: Merge.rc:1353
+#: Merge.rc:1559
#, c-format
msgid "Dialog"
msgstr ""
-#: Merge.rc:982
-#: Merge.rc:1925
+#: Merge.rc:984
+#: Merge.rc:1927
#, c-format
msgid "System"
msgstr ""
-#: Merge.rc:985
+#: Merge.rc:987
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr ""
-#: Merge.rc:987
+#: Merge.rc:989
#, c-format
msgid "Integration"
msgstr ""
-#: Merge.rc:988
+#: Merge.rc:990
#, c-format
msgid "&Add to explorer context menu"
msgstr ""
-#: Merge.rc:990
+#: Merge.rc:992
#, c-format
msgid "E&nable advanced menu"
msgstr ""
-#: Merge.rc:992
+#: Merge.rc:994
#, c-format
msgid "In&clude subfolders by default"
msgstr ""
-#: Merge.rc:994
+#: Merge.rc:996
#, c-format
msgid "&External editor:"
msgstr ""
-#: Merge.rc:997
+#: Merge.rc:999
#, c-format
msgid "&Filter folder:"
msgstr ""
-#: Merge.rc:999
+#: Merge.rc:1001
#, c-format
msgid "B&rowse..."
msgstr ""
-#: Merge.rc:1000
+#: Merge.rc:1002
#, c-format
msgid "Temporary files folder"
msgstr ""
-#: Merge.rc:1001
+#: Merge.rc:1003
#, c-format
msgid "S&ystem's temp folder"
msgstr ""
-#: Merge.rc:1003
+#: Merge.rc:1005
#, c-format
msgid "C&ustom folder:"
msgstr ""
-#: Merge.rc:1006
-#: Merge.rc:1022
+#: Merge.rc:1008
+#: Merge.rc:1024
#, c-format
msgid "Br&owse..."
msgstr ""
-#: Merge.rc:1012
+#: Merge.rc:1014
#, c-format
msgid "Patch Generator"
msgstr ""
-#: Merge.rc:1015
+#: Merge.rc:1017
#, c-format
msgid "File&1:"
msgstr ""
-#: Merge.rc:1019
+#: Merge.rc:1021
#, c-format
msgid "File&2:"
msgstr ""
-#: Merge.rc:1023
+#: Merge.rc:1025
#, c-format
msgid "&Swap"
msgstr ""
-#: Merge.rc:1024
+#: Merge.rc:1026
#, c-format
msgid "&Append to existing file"
msgstr ""
-#: Merge.rc:1026
+#: Merge.rc:1028
#, c-format
msgid "&Result:"
msgstr ""
-#: Merge.rc:1030
+#: Merge.rc:1032
#, c-format
msgid "&Format"
msgstr ""
-#: Merge.rc:1031
+#: Merge.rc:1033
#, c-format
msgid "St&yle:"
msgstr ""
-#: Merge.rc:1034
+#: Merge.rc:1036
#, c-format
msgid "&Context:"
msgstr ""
-#: Merge.rc:1037
+#: Merge.rc:1039
#, c-format
msgid "W&hitespaces"
msgstr ""
-#: Merge.rc:1038
+#: Merge.rc:1040
#, c-format
msgid "Com&pare"
msgstr ""
-#: Merge.rc:1040
+#: Merge.rc:1042
#, c-format
msgid "I&gnore changes"
msgstr ""
-#: Merge.rc:1042
+#: Merge.rc:1044
#, c-format
msgid "Ig&nore all"
msgstr ""
-#: Merge.rc:1044
+#: Merge.rc:1046
#, c-format
msgid "Ignor&e blank lines"
msgstr ""
-#: Merge.rc:1046
+#: Merge.rc:1048
#, c-format
msgid "Case sensi&tive"
msgstr ""
-#: Merge.rc:1048
+#: Merge.rc:1050
#, c-format
msgid "Inclu&de command line"
msgstr ""
-#: Merge.rc:1050
+#: Merge.rc:1052
#, c-format
msgid "Open to e&xternal editor"
msgstr ""
-#: Merge.rc:1072
+#: Merge.rc:1074
#, c-format
msgid "Display Columns"
msgstr ""
-#: Merge.rc:1078
+#: Merge.rc:1080
#, c-format
msgid "Move &Up"
msgstr ""
-#: Merge.rc:1079
+#: Merge.rc:1081
#, c-format
msgid "Move &Down"
msgstr ""
-#: Merge.rc:1089
+#: Merge.rc:1091
#, c-format
msgid "Select Unpacker"
msgstr ""
-#: Merge.rc:1094
+#: Merge.rc:1096
#, c-format
msgid "File unpacker:"
msgstr ""
-#: Merge.rc:1097
+#: Merge.rc:1099
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr ""
-#: Merge.rc:1100
+#: Merge.rc:1102
#, c-format
msgid "Extensions list:"
msgstr ""
-#: Merge.rc:1101
+#: Merge.rc:1103
#, c-format
msgid "Description:"
msgstr ""
-#: Merge.rc:1112
+#: Merge.rc:1114
#, c-format
msgid " Folder Compare Progress"
msgstr ""
-#: Merge.rc:1115
-#: Merge.rc:1872
+#: Merge.rc:1117
+#: Merge.rc:1874
#, c-format
msgid "Stop"
msgstr ""
-#: Merge.rc:1120
+#: Merge.rc:1122
#, c-format
msgid "Comparing items..."
msgstr ""
-#: Merge.rc:1121
+#: Merge.rc:1123
#, c-format
msgid "Items compared:"
msgstr ""
-#: Merge.rc:1122
+#: Merge.rc:1124
#, c-format
msgid "Items total:"
msgstr ""
-#: Merge.rc:1128
+#: Merge.rc:1130
#, c-format
msgid "Go To"
msgstr ""
-#: Merge.rc:1131
+#: Merge.rc:1133
#, c-format
msgid "G&oto:"
msgstr ""
-#: Merge.rc:1133
+#: Merge.rc:1135
#, c-format
msgid "File"
msgstr ""
-#: Merge.rc:1138
+#: Merge.rc:1140
#, c-format
msgid "Goto what"
msgstr ""
-#: Merge.rc:1139
+#: Merge.rc:1141
#, c-format
msgid "Li&ne"
msgstr ""
-#: Merge.rc:1141
+#: Merge.rc:1143
#, c-format
msgid "&Difference"
msgstr ""
-#: Merge.rc:1143
+#: Merge.rc:1145
#, c-format
msgid "&Go To"
msgstr ""
-#: Merge.rc:1149
-#: Merge.rc:1920
+#: Merge.rc:1151
+#: Merge.rc:1922
#, c-format
msgid "Compare"
msgstr ""
-#: Merge.rc:1152
+#: Merge.rc:1154
#, c-format
msgid "Whitespace"
msgstr ""
-#: Merge.rc:1153
+#: Merge.rc:1155
#, c-format
msgid "&Compare"
msgstr ""
-#: Merge.rc:1155
+#: Merge.rc:1157
#, c-format
msgid "&Ignore change"
msgstr ""
-#: Merge.rc:1157
+#: Merge.rc:1159
#, c-format
msgid "I&gnore all"
msgstr ""
-#: Merge.rc:1159
+#: Merge.rc:1161
#, c-format
msgid "Ignore blan&k lines"
msgstr ""
-#: Merge.rc:1161
+#: Merge.rc:1163
#, c-format
msgid "Ignore &case"
msgstr ""
-#: Merge.rc:1163
+#: Merge.rc:1165
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr ""
-#: Merge.rc:1166
+#: Merge.rc:1168
#, c-format
msgid "E&nable moved block detection"
msgstr ""
-#: Merge.rc:1168
+#: Merge.rc:1170
#, c-format
msgid "&Match similar lines"
msgstr ""
-#: Merge.rc:1170
+#: Merge.rc:1172
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr ""
-#: Merge.rc:1173
+#: Merge.rc:1175
#, c-format
msgid "&File Compare method:"
msgstr ""
-#: Merge.rc:1176
+#: Merge.rc:1178
#, c-format
msgid "S&top after first difference"
msgstr ""
-#: Merge.rc:1179
+#: Merge.rc:1181
#, c-format
msgid "Filter Comments"
msgstr ""
-#: Merge.rc:1186
-#: Merge.rc:1921
+#: Merge.rc:1188
+#: Merge.rc:1923
#, c-format
msgid "Editor"
msgstr ""
-#: Merge.rc:1189
+#: Merge.rc:1191
#, c-format
msgid "&Highlight syntax"
msgstr ""
-#: Merge.rc:1191
+#: Merge.rc:1193
#, c-format
msgid "&Automatic rescan"
msgstr ""
-#: Merge.rc:1193
+#: Merge.rc:1195
#, c-format
msgid "&Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1195
+#: Merge.rc:1197
#, c-format
msgid "Tabs"
msgstr ""
-#: Merge.rc:1196
+#: Merge.rc:1198
#, c-format
msgid "&Tab size:"
msgstr ""
-#: Merge.rc:1199
+#: Merge.rc:1201
#, c-format
msgid "&Insert Tabs"
msgstr ""
-#: Merge.rc:1201
+#: Merge.rc:1203
#, c-format
msgid "Insert &Spaces"
msgstr ""
-#: Merge.rc:1203
+#: Merge.rc:1205
#, c-format
msgid "Line Difference Coloring"
msgstr ""
-#: Merge.rc:1205
+#: Merge.rc:1207
#, c-format
msgid "View line differences"
msgstr ""
-#: Merge.rc:1207
+#: Merge.rc:1209
#, c-format
msgid "&Character level"
msgstr ""
-#: Merge.rc:1209
+#: Merge.rc:1211
#, c-format
msgid "&Word-level:"
msgstr ""
-#: Merge.rc:1224
+#: Merge.rc:1226
#, c-format
msgid "Filefilters"
msgstr ""
-#: Merge.rc:1230
+#: Merge.rc:1232
#, c-format
msgid "Test"
msgstr ""
-#: Merge.rc:1231
+#: Merge.rc:1233
#, c-format
msgid "Install..."
msgstr ""
-#: Merge.rc:1232
+#: Merge.rc:1234
#, c-format
msgid "New..."
msgstr ""
-#: Merge.rc:1233
+#: Merge.rc:1235
#, c-format
msgid "Edit..."
msgstr ""
-#: Merge.rc:1234
+#: Merge.rc:1236
#, c-format
msgid "Delete..."
msgstr ""
-#: Merge.rc:1240
+#: Merge.rc:1242
#, c-format
msgid "Save modified files?"
msgstr ""
-#: Merge.rc:1243
+#: Merge.rc:1245
#, c-format
msgid "Left side file"
msgstr ""
-#: Merge.rc:1246
+#: Merge.rc:1248
#, c-format
msgid "&Save changes"
msgstr ""
-#: Merge.rc:1248
+#: Merge.rc:1250
#, c-format
msgid "&Discard changes"
msgstr ""
-#: Merge.rc:1250
+#: Merge.rc:1252
#, c-format
msgid "Right side file"
msgstr ""
-#: Merge.rc:1253
+#: Merge.rc:1255
#, c-format
msgid "S&ave changes"
msgstr ""
-#: Merge.rc:1255
+#: Merge.rc:1257
#, c-format
msgid "Dis&card changes"
msgstr ""
-#: Merge.rc:1257
+#: Merge.rc:1259
#, c-format
msgid "Discard All"
msgstr ""
-#: Merge.rc:1264
-#: Merge.rc:1512
-#: Merge.rc:1927
+#: Merge.rc:1266
+#: Merge.rc:1514
+#: Merge.rc:1929
#, c-format
msgid "Codepage"
msgstr ""
-#: Merge.rc:1267
+#: Merge.rc:1269
#, c-format
msgid "Default Codepage"
msgstr ""
-#: Merge.rc:1268
+#: Merge.rc:1270
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr ""
-#: Merge.rc:1270
+#: Merge.rc:1272
#, c-format
msgid "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session"
msgstr ""
-#: Merge.rc:1273
+#: Merge.rc:1275
#, c-format
msgid "System codepage"
msgstr ""
-#: Merge.rc:1275
+#: Merge.rc:1277
#, c-format
msgid "According to WinMerge User Interface"
msgstr ""
-#: Merge.rc:1277
+#: Merge.rc:1279
#, c-format
msgid "Custom codepage :"
msgstr ""
-#: Merge.rc:1285
+#: Merge.rc:1287
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr ""
-#: Merge.rc:1288
+#: Merge.rc:1290
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr ""
-#: Merge.rc:1291
+#: Merge.rc:1293
#, 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:1293
+#: Merge.rc:1295
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr ""
-#: Merge.rc:1295
+#: Merge.rc:1297
#, c-format
msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available."
msgstr ""
-#: Merge.rc:1297
+#: Merge.rc:1299
#, c-format
msgid "Version"
msgstr ""
-#: Merge.rc:1299
+#: Merge.rc:1301
#, c-format
msgid "Plugin required\n(dllbuild %04u)"
msgstr ""
-#: Merge.rc:1301
+#: Merge.rc:1303
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr ""
-#: Merge.rc:1304
-#: Merge.rc:1307
+#: Merge.rc:1306
+#: Merge.rc:1309
#, c-format
msgid "present"
msgstr ""
-#: Merge.rc:1305
+#: Merge.rc:1307
#, c-format
msgid "Merge7z000U.dll"
msgstr ""
-#: Merge.rc:1308
+#: Merge.rc:1310
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr ""
-#: Merge.rc:1310
-#: Merge.rc:1315
+#: Merge.rc:1312
+#: Merge.rc:1317
#, c-format
msgid "none"
msgstr ""
-#: Merge.rc:1312
+#: Merge.rc:1314
#, c-format
msgid "missing"
msgstr ""
-#: Merge.rc:1313
+#: Merge.rc:1315
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr ""
-#: Merge.rc:1317
+#: Merge.rc:1319
#, c-format
msgid "outdated"
msgstr ""
-#: Merge.rc:1318
+#: Merge.rc:1320
#, c-format
msgid "Plugins on path:"
msgstr ""
-#: Merge.rc:1319
+#: Merge.rc:1321
#, c-format
msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
msgstr ""
-#: Merge.rc:1323
+#: Merge.rc:1325
#, c-format
msgid "Plugin Download"
msgstr ""
-#: Merge.rc:1332
+#: Merge.rc:1334
#, c-format
msgid "Options"
msgstr ""
-#: Merge.rc:1343
+#: Merge.rc:1345
#, c-format
msgid " Categories"
msgstr ""
-#: Merge.rc:1345
+#: Merge.rc:1347
#, c-format
msgid "Import..."
msgstr ""
-#: Merge.rc:1346
+#: Merge.rc:1348
#, c-format
msgid "Export..."
msgstr ""
-#: Merge.rc:1354
+#: Merge.rc:1356
#, c-format
msgid "Keywords:"
msgstr ""
-#: Merge.rc:1355
+#: Merge.rc:1357
#, c-format
msgid "Function names:"
msgstr ""
-#: Merge.rc:1356
+#: Merge.rc:1358
#, c-format
msgid "Comments:"
msgstr ""
-#: Merge.rc:1357
+#: Merge.rc:1359
#, c-format
msgid "Numbers:"
msgstr ""
-#: Merge.rc:1358
+#: Merge.rc:1360
#, c-format
msgid "Operators:"
msgstr ""
-#: Merge.rc:1359
+#: Merge.rc:1361
#, c-format
msgid "Strings:"
msgstr ""
-#: Merge.rc:1360
+#: Merge.rc:1362
#, c-format
msgid "Preprocessor:"
msgstr ""
-#: Merge.rc:1361
+#: Merge.rc:1363
#, c-format
msgid "User 1:"
msgstr ""
-#: Merge.rc:1362
+#: Merge.rc:1364
#, c-format
msgid "User 2:"
msgstr ""
-#: Merge.rc:1367
-#: Merge.rc:1372
-#: Merge.rc:1377
-#: Merge.rc:1382
-#: Merge.rc:1387
-#: Merge.rc:1392
-#: Merge.rc:1397
-#: Merge.rc:1402
-#: Merge.rc:1407
+#: Merge.rc:1369
+#: Merge.rc:1374
+#: Merge.rc:1379
+#: Merge.rc:1384
+#: Merge.rc:1389
+#: Merge.rc:1394
+#: Merge.rc:1399
+#: Merge.rc:1404
+#: Merge.rc:1409
#, c-format
msgid "Bold"
msgstr ""
-#: Merge.rc:1415
+#: Merge.rc:1417
#, c-format
msgid "Folder Compare Report"
msgstr ""
-#: Merge.rc:1418
+#: Merge.rc:1420
#, c-format
msgid "Report &File:"
msgstr ""
-#: Merge.rc:1421
-#: Merge.rc:1595
-#: Merge.rc:1599
-#: Merge.rc:1626
+#: Merge.rc:1423
+#: Merge.rc:1597
+#: Merge.rc:1601
+#: Merge.rc:1628
#, c-format
msgid "Browse..."
msgstr ""
-#: Merge.rc:1422
+#: Merge.rc:1424
#, c-format
msgid "&Style:"
msgstr ""
-#: Merge.rc:1425
+#: Merge.rc:1427
#, c-format
msgid "&Copy to Clipboard"
msgstr ""
-#: Merge.rc:1433
+#: Merge.rc:1435
#, c-format
msgid "Shared or Private Filter"
msgstr ""
-#: Merge.rc:1436
+#: Merge.rc:1438
#, c-format
msgid "Which type of filter do you want to create?"
msgstr ""
-#: Merge.rc:1438
+#: Merge.rc:1440
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr ""
-#: Merge.rc:1440
+#: Merge.rc:1442
#, c-format
msgid "Private Filter (only for current user)"
msgstr ""
-#: Merge.rc:1448
-#: Merge.rc:1928
+#: Merge.rc:1450
+#: Merge.rc:1930
#, c-format
msgid "Archive Support"
msgstr ""
-#: Merge.rc:1451
+#: Merge.rc:1453
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr ""
-#: Merge.rc:1453
+#: Merge.rc:1455
#, c-format
msgid "Download 7-zip Plugin"
msgstr ""
-#: Merge.rc:1454
+#: Merge.rc:1456
#, c-format
msgid "&Enable archive file support"
msgstr ""
-#: Merge.rc:1456
+#: Merge.rc:1458
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr ""
-#: Merge.rc:1459
+#: Merge.rc:1461
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr ""
-#: Merge.rc:1461
+#: Merge.rc:1463
#, c-format
msgid "&Detect archive type from file signature"
msgstr ""
-#: Merge.rc:1469
+#: Merge.rc:1471
#, c-format
msgid "Compare Statistics"
msgstr ""
-#: Merge.rc:1472
+#: Merge.rc:1474
#, c-format
msgid "Folders:"
msgstr ""
-#: Merge.rc:1473
+#: Merge.rc:1475
#, c-format
msgid "Files:"
msgstr ""
-#: Merge.rc:1474
-#: Merge.rc:2302
+#: Merge.rc:1476
+#: Merge.rc:2304
#, c-format
msgid "Different"
msgstr ""
-#: Merge.rc:1475
+#: Merge.rc:1477
#, c-format
msgid "Text:"
msgstr ""
-#: Merge.rc:1478
-#: Merge.rc:1497
+#: Merge.rc:1480
+#: Merge.rc:1499
#, c-format
msgid "Binary:"
msgstr ""
-#: Merge.rc:1481
+#: Merge.rc:1483
#, c-format
msgid "Unique"
msgstr ""
-#: Merge.rc:1482
+#: Merge.rc:1484
#, c-format
msgid "Left:"
msgstr ""
-#: Merge.rc:1487
+#: Merge.rc:1489
#, c-format
msgid "Right:"
msgstr ""
-#: Merge.rc:1492
-#: Merge.rc:2297
+#: Merge.rc:1494
+#: Merge.rc:2299
#, c-format
msgid "Identical"
msgstr ""
-#: Merge.rc:1501
+#: Merge.rc:1503
#, c-format
msgid "Total:"
msgstr ""
-#: Merge.rc:1506
+#: Merge.rc:1508
#, c-format
msgid "Close"
msgstr ""
-#: Merge.rc:1515
+#: Merge.rc:1517
#, c-format
msgid "Affects"
msgstr ""
-#: Merge.rc:1518
-#: Merge.rc:1521
+#: Merge.rc:1520
+#: Merge.rc:1523
#, c-format
msgid "(Affects)"
msgstr ""
-#: Merge.rc:1522
+#: Merge.rc:1524
#, c-format
msgid "Select Codepage for"
msgstr ""
-#: Merge.rc:1523
+#: Merge.rc:1525
#, c-format
msgid "&File Loading:"
msgstr ""
-#: Merge.rc:1525
-#: Merge.rc:1528
+#: Merge.rc:1527
+#: Merge.rc:1530
#, c-format
msgid "..."
msgstr ""
-#: Merge.rc:1526
+#: Merge.rc:1528
#, c-format
msgid "File &Saving:"
msgstr ""
-#: Merge.rc:1529
+#: Merge.rc:1531
#, c-format
msgid "&Use same codepage for both"
msgstr ""
-#: Merge.rc:1532
+#: Merge.rc:1534
#, c-format
msgid "&Apply"
msgstr ""
-#: Merge.rc:1533
-#: Merge.rc:1894
+#: Merge.rc:1535
+#: Merge.rc:1896
#, c-format
msgid "&Cancel"
msgstr ""
-#: Merge.rc:1538
+#: Merge.rc:1540
#, c-format
msgid "Test Filter"
msgstr ""
-#: Merge.rc:1541
+#: Merge.rc:1543
#, c-format
msgid "Testing filter ..."
msgstr ""
-#: Merge.rc:1543
+#: Merge.rc:1545
#, c-format
msgid "&Enter text to test:"
msgstr ""
-#: Merge.rc:1545
+#: Merge.rc:1547
#, c-format
msgid "&Folder Name"
msgstr ""
-#: Merge.rc:1547
+#: Merge.rc:1549
#, c-format
msgid "Result:"
msgstr ""
-#: Merge.rc:1551
+#: Merge.rc:1553
#, c-format
msgid "&Test"
msgstr ""
-#: Merge.rc:1552
+#: Merge.rc:1554
#, c-format
msgid "&Close"
msgstr ""
-#: Merge.rc:1560
+#: Merge.rc:1562
#, c-format
msgid "&Use customized text colors"
msgstr ""
-#: Merge.rc:1563
+#: Merge.rc:1565
#, c-format
msgid "Custom text colors"
msgstr ""
-#: Merge.rc:1565
+#: Merge.rc:1567
#, c-format
msgid "Whitespace:"
msgstr ""
-#: Merge.rc:1566
+#: Merge.rc:1568
#, c-format
msgid "Regular text:"
msgstr ""
-#: Merge.rc:1567
+#: Merge.rc:1569
#, c-format
msgid "Selection:"
msgstr ""
-#: Merge.rc:1590
+#: Merge.rc:1592
#, c-format
msgid "Paths"
msgstr ""
-#: Merge.rc:1596
+#: Merge.rc:1598
#, c-format
msgid "R&ead-only"
msgstr ""
-#: Merge.rc:1600
+#: Merge.rc:1602
#, c-format
msgid "Re&ad-only"
msgstr ""
-#: Merge.rc:1606
+#: Merge.rc:1608
#, c-format
msgid "Open..."
msgstr ""
-#: Merge.rc:1607
+#: Merge.rc:1609
#, c-format
msgid "Save..."
msgstr ""
-#: Merge.rc:1612
-#: Merge.rc:1929
+#: Merge.rc:1614
+#: Merge.rc:1931
#, c-format
msgid "Backup Files"
msgstr ""
-#: Merge.rc:1615
+#: Merge.rc:1617
#, c-format
msgid "Create backup files in:"
msgstr ""
-#: Merge.rc:1620
+#: Merge.rc:1622
#, c-format
msgid "Create backup files into:"
msgstr ""
-#: Merge.rc:1621
+#: Merge.rc:1623
#, c-format
msgid "&Original file's folder"
msgstr ""
-#: Merge.rc:1623
+#: Merge.rc:1625
#, c-format
msgid "&Global backup folder:"
msgstr ""
-#: Merge.rc:1627
+#: Merge.rc:1629
#, c-format
msgid "Backup filename:"
msgstr ""
-#: Merge.rc:1628
+#: Merge.rc:1630
#, c-format
msgid "&Append .bak -extension"
msgstr ""
-#: Merge.rc:1630
+#: Merge.rc:1632
#, c-format
msgid "A&ppend timestamp"
msgstr ""
-#: Merge.rc:1637
+#: Merge.rc:1639
#, c-format
msgid "Confirm Copy"
msgstr ""
-#: Merge.rc:1641
+#: Merge.rc:1643
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr ""
-#: Merge.rc:1643
+#: Merge.rc:1645
#, c-format
msgid "From left"
msgstr ""
-#: Merge.rc:1646
+#: Merge.rc:1648
#, c-format
msgid "To right"
msgstr ""
-#: Merge.rc:1649
+#: Merge.rc:1651
#, c-format
msgid "Yes"
msgstr ""
-#: Merge.rc:1650
+#: Merge.rc:1652
#, c-format
msgid "No"
msgstr ""
-#: Merge.rc:1656
+#: Merge.rc:1658
#, c-format
msgid "Plugins"
msgstr ""
-#: Merge.rc:1659
+#: Merge.rc:1661
#, c-format
msgid "&Enable plugins"
msgstr ""
#. StringFileInfo.Block
-#: Merge.rc:1689
+#: Merge.rc:1691
#, c-format
msgid "040904e4"
msgstr ""
#. VarFileInfo.Translation
-#: Merge.rc:1705
+#: Merge.rc:1707
#, c-format
msgid "0x409, 1252"
msgstr ""
-#: Merge.rc:1720
+#: Merge.rc:1722
#, c-format
msgid "Ready"
msgstr ""
-#: Merge.rc:1726
+#: Merge.rc:1728
#, c-format
msgid "EXT"
msgstr ""
-#: Merge.rc:1727
+#: Merge.rc:1729
#, c-format
msgid "CAP"
msgstr ""
-#: Merge.rc:1728
+#: Merge.rc:1730
#, c-format
msgid "NUM"
msgstr ""
-#: Merge.rc:1729
+#: Merge.rc:1731
#, c-format
msgid "SCRL"
msgstr ""
-#: Merge.rc:1730
+#: Merge.rc:1732
#, c-format
msgid "OVR"
msgstr ""
-#: Merge.rc:1731
+#: Merge.rc:1733
#, c-format
msgid "REC"
msgstr ""
-#: Merge.rc:1737
+#: Merge.rc:1739
#, c-format
msgid "Create empty documents\nNew Documents (Ctrl+N)"
msgstr ""
-#: Merge.rc:1738
+#: Merge.rc:1740
#, c-format
msgid "Open an existing document\nOpen (Ctrl+O)"
msgstr ""
-#: Merge.rc:1739
+#: Merge.rc:1741
#, c-format
msgid "Close the active document\nClose"
msgstr ""
-#: Merge.rc:1740
+#: Merge.rc:1742
#, c-format
msgid "Save the active document\nSave (Ctrl+S)"
msgstr ""
-#: Merge.rc:1741
+#: Merge.rc:1743
#, c-format
msgid "Save the active document with a new name\nSave As"
msgstr ""
-#: Merge.rc:1742
+#: Merge.rc:1744
#, c-format
msgid "Change the printing options\nPage Setup"
msgstr ""
-#: Merge.rc:1743
+#: Merge.rc:1745
#, c-format
msgid "Change the printer and printing options\nPrint Setup"
msgstr ""
-#: Merge.rc:1744
+#: Merge.rc:1746
#, c-format
msgid "Print the active document\nPrint"
msgstr ""
-#: Merge.rc:1745
+#: Merge.rc:1747
#, c-format
msgid "Display full pages\nPrint Preview"
msgstr ""
-#: Merge.rc:1750
+#: Merge.rc:1752
#, c-format
msgid "Make all hidden items visible again"
msgstr ""
-#: Merge.rc:1756
+#: Merge.rc:1758
#, c-format
msgid "Open project file\nProject file (Ctrl+J)"
msgstr ""
-#: Merge.rc:1757
+#: Merge.rc:1759
#, c-format
msgid "Unknown error attempting to open project file"
msgstr ""
-#: Merge.rc:1758
+#: Merge.rc:1760
#, c-format
msgid "Unknown error attempting to save project file"
msgstr ""
-#: Merge.rc:1759
+#: Merge.rc:1761
#, c-format
msgid "Project File"
msgstr ""
-#: Merge.rc:1760
+#: Merge.rc:1762
#, c-format
msgid "Project file successfully loaded."
msgstr ""
-#: Merge.rc:1761
+#: Merge.rc:1763
#, c-format
msgid "Project file successfully saved."
msgstr ""
-#: Merge.rc:1762
+#: Merge.rc:1764
#, c-format
msgid "Save current paths and options to project file\nSave Project File"
msgstr ""
-#: Merge.rc:1767
+#: Merge.rc:1769
#, c-format
msgid "Display program information, version number and copyright\nAbout"
msgstr ""
-#: Merge.rc:1768
+#: Merge.rc:1770
#, c-format
msgid "Quit the application; prompts to save documents\nExit"
msgstr ""
-#: Merge.rc:1774
-#: Merge.rc:1775
#: Merge.rc:1776
#: Merge.rc:1777
#: Merge.rc:1778
@@ -2723,2795 +2723,2797 @@
#: Merge.rc:1787
#: Merge.rc:1788
#: Merge.rc:1789
+#: Merge.rc:1790
+#: Merge.rc:1791
#, c-format
msgid "Open this document"
msgstr ""
-#: Merge.rc:1794
+#: Merge.rc:1796
#, c-format
msgid "Switch to the next window pane\nNext Pane"
msgstr ""
-#: Merge.rc:1795
+#: Merge.rc:1797
#, c-format
msgid "Switch back to the previous window pane\nPrevious Pane"
msgstr ""
-#: Merge.rc:1801
+#: Merge.rc:1803
#, c-format
msgid "Arrange windows so they overlap\nCascade Windows"
msgstr ""
-#: Merge.rc:1802
+#: Merge.rc:1804
#, c-format
msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally"
msgstr ""
-#: Merge.rc:1803
+#: Merge.rc:1805
#, c-format
msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically"
msgstr ""
-#: Merge.rc:1809
+#: Merge.rc:1811
#, c-format
msgid "Copy the selection and put it on the Clipboard\nCopy"
msgstr ""
-#: Merge.rc:1810
+#: Merge.rc:1812
#, c-format
msgid "Cut the selection and put it on the Clipboard\nCut"
msgstr ""
-#: Merge.rc:1811
+#: Merge.rc:1813
#, c-format
msgid "Find the specified text\nFind"
msgstr ""
-#: Merge.rc:1812
+#: Merge.rc:1814
#, c-format
msgid "Insert Clipboard contents\nPaste"
msgstr ""
-#: Merge.rc:1813
+#: Merge.rc:1815
#, c-format
msgid "Repeat the last action\nRepeat"
msgstr ""
-#: Merge.rc:1814
+#: Merge.rc:1816
#, c-format
msgid "Replace specific text with different text\nReplace"
msgstr ""
-#: Merge.rc:1815
+#: Merge.rc:1817
#, c-format
msgid "Select the entire document\nSelect All"
msgstr ""
-#: Merge.rc:1816
+#: Merge.rc:1818
#, c-format
msgid "Undo the last action\nUndo (Ctrl+Z)"
msgstr ""
-#: Merge.rc:1817
+#: Merge.rc:1819
#, c-format
msgid "Redo the previously undone action\nRedo (Ctrl+Y)"
msgstr ""
-#: Merge.rc:1823
+#: Merge.rc:1825
#, c-format
msgid "Show or hide the toolbar\nToggle ToolBar"
msgstr ""
-#: Merge.rc:1824
+#: Merge.rc:1826
#, c-format
msgid "Show or hide the status bar\nToggle StatusBar"
msgstr ""
-#: Merge.rc:1825
+#: Merge.rc:1827
#, c-format
msgid "Show or hide the tab bar\nToggle TabBar"
msgstr ""
-#: Merge.rc:1826
+#: Merge.rc:1828
#, c-format
msgid "Automatically resize panes\nLock Panes"
msgstr ""
-#: Merge.rc:1832
+#: Merge.rc:1834
#, c-format
msgid "Change the window size"
msgstr ""
-#: Merge.rc:1833
+#: Merge.rc:1835
#, c-format
msgid "Change the window position"
msgstr ""
-#: Merge.rc:1834
+#: Merge.rc:1836
#, c-format
msgid "Reduce the window to an icon"
msgstr ""
-#: Merge.rc:1835
+#: Merge.rc:1837
#, c-format
msgid "Enlarge the window to full size"
msgstr ""
-#: Merge.rc:1836
+#: Merge.rc:1838
#, c-format
msgid "Switch to the next document window"
msgstr ""
-#: Merge.rc:1837
+#: Merge.rc:1839
#, c-format
msgid "Switch to the previous document window"
msgstr ""
-#: Merge.rc:1838
+#: Merge.rc:1840
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr ""
-#: Merge.rc:1843
+#: Merge.rc:1845
#, c-format
msgid "Restore the window to normal size"
msgstr ""
-#: Merge.rc:1844
+#: Merge.rc:1846
#, c-format
msgid "Activate Task List"
msgstr ""
-#: Merge.rc:1845
+#: Merge.rc:1847
#, c-format
msgid "Activate this window"
msgstr ""
-#: Merge.rc:1851
+#: Merge.rc:1853
#, c-format
msgid "Close print preview mode\nCancel Preview"
msgstr ""
-#: Merge.rc:1858
+#: Merge.rc:1860
#, c-format
msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
msgstr ""
-#: Merge.rc:1859
+#: Merge.rc:1861
#, c-format
msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
msgstr ""
-#: Merge.rc:1866
+#: Merge.rc:1868
#, c-format
msgid "Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1873
+#: Merge.rc:1875
#, c-format
msgid "Press any key"
msgstr ""
-#: Merge.rc:1879
-#: Merge.rc:1880
+#: Merge.rc:1881
+#: Merge.rc:1882
#, c-format
msgid "Right click on the path to copy"
msgstr ""
-#: Merge.rc:1886
+#: Merge.rc:1888
#, c-format
msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
msgstr ""
-#: Merge.rc:1887
+#: Merge.rc:1889
#, 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 General Public License in the Help menu for details."
msgstr ""
-#: Merge.rc:1893
+#: Merge.rc:1895
#, c-format
msgid "&Ok"
msgstr ""
-#: Merge.rc:1895
+#: Merge.rc:1897
#, c-format
msgid "&Abort"
msgstr ""
-#: Merge.rc:1896
+#: Merge.rc:1898
#, c-format
msgid "&Retry"
msgstr ""
-#: Merge.rc:1897
+#: Merge.rc:1899
#, c-format
msgid "&Ignore"
msgstr ""
-#: Merge.rc:1898
+#: Merge.rc:1900
#, c-format
msgid "Ignore &all"
msgstr ""
-#: Merge.rc:1899
+#: Merge.rc:1901
#, c-format
msgid "&Yes"
msgstr ""
-#: Merge.rc:1905
+#: Merge.rc:1907
#, c-format
msgid "Yes to &all"
msgstr ""
-#: Merge.rc:1906
+#: Merge.rc:1908
#, c-format
msgid "&No"
msgstr ""
-#: Merge.rc:1907
+#: Merge.rc:1909
#, c-format
msgid "No to a&ll"
msgstr ""
-#: Merge.rc:1908
+#: Merge.rc:1910
#, c-format
msgid "&Continue"
msgstr ""
-#: Merge.rc:1909
+#: Merge.rc:1911
#, c-format
msgid "&Skip"
msgstr ""
-#: Merge.rc:1910
+#: Merge.rc:1912
#, c-format
msgid "Skip &all"
msgstr ""
-#: Merge.rc:1912
+#: Merge.rc:1914
#, c-format
msgid "Don't display this &message again."
msgstr ""
-#: Merge.rc:1913
+#: Merge.rc:1915
#, c-format
msgid "Don't ask this &question again."
msgstr ""
-#: Merge.rc:1923
+#: Merge.rc:1925
#, c-format
msgid "Syntax colors"
msgstr ""
-#: Merge.rc:1924
+#: Merge.rc:1926
#, c-format
msgid "Text Colors"
msgstr ""
-#: Merge.rc:1926
+#: Merge.rc:1928
#, c-format
msgid "Version Control"
msgstr ""
-#: Merge.rc:1936
+#: Merge.rc:1938
#, c-format
msgid "To:"
msgstr ""
-#: Merge.rc:1937
+#: Merge.rc:1939
#, c-format
msgid "From left:"
msgstr ""
-#: Merge.rc:1938
+#: Merge.rc:1940
#, c-format
msgid "To left:"
msgstr ""
-#: Merge.rc:1939
+#: Merge.rc:1941
#, c-format
msgid "From right:"
msgstr ""
-#: Merge.rc:1940
+#: Merge.rc:1942
#, c-format
msgid "To right:"
msgstr ""
-#: Merge.rc:1946
+#: Merge.rc:1948
#, c-format
msgid "Version %1"
msgstr ""
-#: Merge.rc:1947
+#: Merge.rc:1949
#, c-format
msgid "Unicode"
msgstr ""
-#: Merge.rc:1953
+#: Merge.rc:1955
#, c-format
msgid "Options (%1)"
msgstr ""
-#: Merge.rc:1954
+#: Merge.rc:1956
#, c-format
msgid "All message boxes are now displayed again."
msgstr ""
-#: Merge.rc:1955
+#: Merge.rc:1957
#, 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:1956
+#: Merge.rc:1958
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr ""
-#: Merge.rc:1958
+#: Merge.rc:1960
#, c-format
msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
msgstr ""
-#: Merge.rc:1960
+#: Merge.rc:1962
#, 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:1966
+#: Merge.rc:1968
#, c-format
msgid "Open"
msgstr ""
-#: Merge.rc:1967
+#: Merge.rc:1969
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1968
+#: Merge.rc:1970
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1969
+#: Merge.rc:1971
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr ""
-#: Merge.rc:1971
+#: Merge.rc:1973
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1977
+#: Merge.rc:1979
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1978
+#: Merge.rc:1980
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1979
+#: Merge.rc:1981
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1985
+#: Merge.rc:1987
#, c-format
msgid "UTF-8"
msgstr ""
-#: Merge.rc:1986
+#: Merge.rc:1988
#, c-format
msgid "UTF-8 (B)"
msgstr ""
-#: Merge.rc:1987
+#: Merge.rc:1989
#, c-format
msgid "UCS-2 LE"
msgstr ""
-#: Merge.rc:1988
+#: Merge.rc:1990
#, c-format
msgid "UCS-2 BE"
msgstr ""
-#: Merge.rc:1994
+#: Merge.rc:1996
#, c-format
msgid "Full Contents"
msgstr ""
-#: Merge.rc:1995
+#: Merge.rc:1997
#, c-format
msgid "Quick Contents"
msgstr ""
-#: Merge.rc:1996
+#: Merge.rc:1998
#, c-format
msgid "Modified Date"
msgstr ""
-#: Merge.rc:1997
+#: Merge.rc:1999
#, c-format
msgid "Modified Date and Size"
msgstr ""
-#: Merge.rc:1998
+#: Merge.rc:2000
#, c-format
msgid "Size"
msgstr ""
-#: Merge.rc:2004
-#: Merge.rc:2608
+#: Merge.rc:2006
+#: Merge.rc:2610
#, c-format
msgid "Name"
msgstr ""
-#: Merge.rc:2005
+#: Merge.rc:2007
#, c-format
msgid "Location"
msgstr ""
-#: Merge.rc:2006
+#: Merge.rc:2008
#, c-format
msgid "Filters"
msgstr ""
-#: Merge.rc:2007
+#: Merge.rc:2009
#, c-format
msgid "[F] "
msgstr ""
-#: Merge.rc:2008
-#: Merge.rc:2610
+#: Merge.rc:2010
+#: Merge.rc:2612
#, c-format
msgid "Description"
msgstr ""
-#: Merge.rc:2009
+#: Merge.rc:2011
#, c-format
msgid "Select filename for new filter"
msgstr ""
-#: Merge.rc:2010
+#: Merge.rc:2012
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:2012
+#: Merge.rc:2014
#, c-format
msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n...
[truncated message content] |
|
From: <ki...@us...> - 2008-07-28 14:33:18
|
Revision: 5686
http://winmerge.svn.sourceforge.net/winmerge/?rev=5686&view=rev
Author: kimmov
Date: 2008-07-28 14:33:16 +0000 (Mon, 28 Jul 2008)
Log Message:
-----------
PATCH: [ 2029275 ] Allow giving -u cmdline param instead of -ub
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/WinMergeCmdLineParser.cpp
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-28 14:31:26 UTC (rev 5685)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-28 14:33:16 UTC (rev 5686)
@@ -12,6 +12,7 @@
Add dialog listing available plugins (#2021722)
Refresh compare after changing filter (#2017426)
Add "Open Conflict" for file/folder compare menus (#2025472)
+ Add -u commandline parameter as alternative to -ub (#2029275)
BugFix: Use system codepage for paths (#1979429, #2008581)
BugFix: ANSI build crash in folder compare (#2010053)
BugFix: Add insert/overtype mode indicator to statusbar (#2015174)
Modified: branches/R2_10/Src/WinMergeCmdLineParser.cpp
===================================================================
--- branches/R2_10/Src/WinMergeCmdLineParser.cpp 2008-07-28 14:31:26 UTC (rev 5685)
+++ branches/R2_10/Src/WinMergeCmdLineParser.cpp 2008-07-28 14:33:16 UTC (rev 5686)
@@ -143,9 +143,9 @@
// -ur to not add right path to MRU
m_cmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU;
}
- else if (!lstrcmpi(pszParam, _T("ub")))
+ else if (!lstrcmpi(pszParam, _T("u")) || !lstrcmpi(pszParam, _T("ub")))
{
- // -ub to add neither right nor left path to MRU
+ // -u or -ub (deprecated) to add neither right nor left path to MRU
m_cmdLineInfo.m_dwLeftFlags |= FFILEOPEN_NOMRU;
m_cmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-07-28 14:56:13
|
Revision: 5688
http://winmerge.svn.sourceforge.net/winmerge/?rev=5688&view=rev
Author: kimmov
Date: 2008-07-28 14:56:09 +0000 (Mon, 28 Jul 2008)
Log Message:
-----------
PATCH: [ 2029457 ] Remove RCLocalizationHelper plugin dll
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
Removed Paths:
-------------
branches/R2_10/Plugins/dlls/RCLocalizationHelper.dll
branches/R2_10/Plugins/dlls/RCLocalizationHelper.ini
branches/R2_10/Plugins/dlls/RCLocalizationHelperU.dll
branches/R2_10/Plugins/dlls/RCLocalizationHelperU.ini
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-28 14:55:12 UTC (rev 5687)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-28 14:56:09 UTC (rev 5688)
@@ -13,6 +13,7 @@
Refresh compare after changing filter (#2017426)
Add "Open Conflict" for file/folder compare menus (#2025472)
Add -u commandline parameter as alternative to -ub (#2029275)
+ Remove RCLocalizationHelper plugin (#2029457)
BugFix: Use system codepage for paths (#1979429, #2008581)
BugFix: ANSI build crash in folder compare (#2010053)
BugFix: Add insert/overtype mode indicator to statusbar (#2015174)
Deleted: branches/R2_10/Plugins/dlls/RCLocalizationHelper.ini
===================================================================
--- branches/R2_10/Plugins/dlls/RCLocalizationHelper.ini 2008-07-28 14:55:12 UTC (rev 5687)
+++ branches/R2_10/Plugins/dlls/RCLocalizationHelper.ini 2008-07-28 14:56:09 UTC (rev 5688)
@@ -1,22 +0,0 @@
-[MetaData]
-Version=1.2
-Date=2006-02-05
-
-[IgnoreLines]
-count=7
-line.1=\$Id.*\$
-line.2=^// [a-zA-Z]+ \([a-z.A-Z]+\) resources
-line.3=^#endif[ ]+// [a-zA-Z]+ \([a-z.A-Z]+\) resources
-line.4=^#if !defined\(AFX_RESOURCE_DLL\) \|\| defined\(AFX_TARG_...\)
-line.5=^LANGUAGE LANG_
-line.6=VALUE "Translation",
-line.7=^#pragma code_page\([0-9]+\)
-
-[Substitutions]
-count=1
-source.1=[0-9]+
-dest.1=,
-
-[Options]
-IgnoreQuotes=1
-PluginName=RCLocalizationHelperU
Deleted: branches/R2_10/Plugins/dlls/RCLocalizationHelperU.ini
===================================================================
--- branches/R2_10/Plugins/dlls/RCLocalizationHelperU.ini 2008-07-28 14:55:12 UTC (rev 5687)
+++ branches/R2_10/Plugins/dlls/RCLocalizationHelperU.ini 2008-07-28 14:56:09 UTC (rev 5688)
@@ -1,22 +0,0 @@
-[MetaData]
-Version=1.2
-Date=2006-02-05
-
-[IgnoreLines]
-count=7
-line.1=\$Id.*\$
-line.2=^// [a-zA-Z]+ \([a-z.A-Z]+\) resources
-line.3=^#endif[ ]+// [a-zA-Z]+ \([a-z.A-Z]+\) resources
-line.4=^#if !defined\(AFX_RESOURCE_DLL\) \|\| defined\(AFX_TARG_...\)
-line.5=^LANGUAGE LANG_
-line.6=VALUE "Translation",
-line.7=^#pragma code_page\([0-9]+\)
-
-[Substitutions]
-count=1
-source.1=[0-9]+
-dest.1=,
-
-[Options]
-IgnoreQuotes=1
-PluginName=RCLocalizationHelperU
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-07-31 19:35:14
|
Revision: 5711
http://winmerge.svn.sourceforge.net/winmerge/?rev=5711&view=rev
Author: kimmov
Date: 2008-07-31 19:35:03 +0000 (Thu, 31 Jul 2008)
Log Message:
-----------
PATCH: [ 2026508 ] Add confirmation dialog for move operation
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/ConfirmFolderCopyDlg.cpp
branches/R2_10/Src/ConfirmFolderCopyDlg.h
branches/R2_10/Src/DirActions.cpp
branches/R2_10/Src/Languages/English.pot
branches/R2_10/Src/Merge.rc
branches/R2_10/Src/resource.h
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-31 11:39:05 UTC (rev 5710)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-07-31 19:35:03 UTC (rev 5711)
@@ -15,6 +15,7 @@
Add -u commandline parameter as alternative to -ub (#2029275, #2030359)
Remove RCLocalizationHelper plugin (#2029457)
Clarify Supercopier caused hang in release notes (#2030040)
+ Confirmation dialog for move operations (#2026508)
BugFix: Use system codepage for paths (#1979429, #2008581)
BugFix: ANSI build crash in folder compare (#2010053)
BugFix: Add insert/overtype mode indicator to statusbar (#2015174)
Modified: branches/R2_10/Src/ConfirmFolderCopyDlg.cpp
===================================================================
--- branches/R2_10/Src/ConfirmFolderCopyDlg.cpp 2008-07-31 11:39:05 UTC (rev 5710)
+++ branches/R2_10/Src/ConfirmFolderCopyDlg.cpp 2008-07-31 19:35:03 UTC (rev 5711)
@@ -81,6 +81,9 @@
CStatic * pIcon = (CStatic *) GetDlgItem(IDC_FLDCONFIRM_ICON);
pIcon->SetIcon(icon);
+ if (!m_caption.IsEmpty())
+ SetWindowText(m_caption);
+
// setup handler for resizing this dialog
m_constraint.InitializeCurrentSize(this);
// configure how individual controls adjust when dialog resizes
Modified: branches/R2_10/Src/ConfirmFolderCopyDlg.h
===================================================================
--- branches/R2_10/Src/ConfirmFolderCopyDlg.h 2008-07-31 11:39:05 UTC (rev 5710)
+++ branches/R2_10/Src/ConfirmFolderCopyDlg.h 2008-07-31 19:35:03 UTC (rev 5711)
@@ -22,6 +22,9 @@
// ID line follows -- this is updated by SVN
// $Id$
+#ifndef _CONFIRM_FOLDER_COPY_DLG_H_
+#define _CONFIRM_FOLDER_COPY_DLG_H_
+
#include "CMoveConstraint.h"
/**
@@ -50,9 +53,12 @@
CString m_fromPath;
CString m_toText;
CString m_toPath;
+ CString m_caption;
afx_msg void OnBnClickedNo();
afx_msg void OnBnClickedYes();
private:
prdlg::CMoveConstraint m_constraint; //*< Resizes dialog controls when dialog resized */
};
+
+#endif // _CONFIRM_FOLDER_COPY_DLG_H_
Modified: branches/R2_10/Src/DirActions.cpp
===================================================================
--- branches/R2_10/Src/DirActions.cpp 2008-07-31 11:39:05 UTC (rev 5710)
+++ branches/R2_10/Src/DirActions.cpp 2008-07-31 19:35:03 UTC (rev 5711)
@@ -53,6 +53,11 @@
static BOOL ConfirmCopy(int origin, int destination, int count,
LPCTSTR src, LPCTSTR dest, BOOL destIsSide);
+static BOOL ConfirmMove(int origin, int destination, int count,
+ LPCTSTR src, LPCTSTR dest, BOOL destIsSide);
+static BOOL ConfirmDialog(const String &caption, const String &question,
+ int origin, int destination, int count,
+ LPCTSTR src, LPCTSTR dest, BOOL destIsSide);
static BOOL CheckPathsExist(LPCTSTR orig, LPCTSTR dest, int allowOrig,
int allowDest, CString & failedPath);
@@ -69,19 +74,69 @@
* @param [in] src Source path.
* @param [in] dest Destination path.
* @param [in] destIsSide Is destination path either of compare sides?
- * @return IDYES if copy should proceed, IDNO if aborted.
+ * @return TRUE if copy should proceed, FALSE if aborted.
*/
static BOOL ConfirmCopy(int origin, int destination, int count,
LPCTSTR src, LPCTSTR dest, BOOL destIsSide)
{
+ CString strQuestion;
+ String caption = LoadResString(IDS_CONFIRM_COPY_CAPTION);
+ UINT id = count == 1 ? IDS_CONFIRM_SINGLE_COPY : IDS_CONFIRM_MULTIPLE_COPY;
+ strQuestion.Format(theApp.LoadString(id).c_str(), count);
+
+ BOOL ret = ConfirmDialog(caption, (LPCTSTR)strQuestion, origin,
+ destination, count, src, dest, destIsSide);
+ return ret;
+}
+
+/**
+ * @brief Ask user a confirmation for moving item(s).
+ * Shows a confirmation dialog for move operation. Depending ont item count
+ * dialog shows full paths to items (single item) or base paths of compare
+ * (multiple items).
+ * @param [in] origin Origin side of the item(s).
+ * @param [in] destination Destination side of the item(s).
+ * @param [in] count Number of items.
+ * @param [in] src Source path.
+ * @param [in] dest Destination path.
+ * @param [in] destIsSide Is destination path either of compare sides?
+ * @return TRUE if copy should proceed, FALSE if aborted.
+ */
+static BOOL ConfirmMove(int origin, int destination, int count,
+ LPCTSTR src, LPCTSTR dest, BOOL destIsSide)
+{
+ CString strQuestion;
+ String caption = LoadResString(IDS_CONFIRM_MOVE_CAPTION);
+ UINT id = count == 1 ? IDS_CONFIRM_SINGLE_MOVE : IDS_CONFIRM_MULTIPLE_MOVE;
+ strQuestion.Format(theApp.LoadString(id).c_str(), count);
+
+ BOOL ret = ConfirmDialog(caption, (LPCTSTR)strQuestion, origin,
+ destination, count, src, dest, destIsSide);
+ return ret;
+}
+
+/**
+ * @brief Show a (copy/move) confirmation dialog.
+ * @param [in] caption Caption of the dialog.
+ * @param [in] question Guestion to ask from user.
+ * @param [in] origin Origin side of the item(s).
+ * @param [in] destination Destination side of the item(s).
+ * @param [in] count Number of items.
+ * @param [in] src Source path.
+ * @param [in] dest Destination path.
+ * @param [in] destIsSide Is destination path either of compare sides?
+ * @return TRUE if copy should proceed, FALSE if aborted.
+ */
+static BOOL ConfirmDialog(const String &caption, const String &question,
+ int origin, int destination, int count,
+ LPCTSTR src, LPCTSTR dest, BOOL destIsSide)
+{
ConfirmFolderCopyDlg dlg;
- CString strQuestion;
String sOrig;
String sDest;
-
- UINT id = count == 1 ? IDS_CONFIRM_SINGLE_COPY : IDS_CONFIRM_MULTIPLE_COPY;
- strQuestion.Format(theApp.LoadString(id).c_str(), count);
+ dlg.m_caption = caption.c_str();
+
if (origin == FileActionItem::UI_LEFT)
sOrig = theApp.LoadString(IDS_FROM_LEFT);
else
@@ -114,7 +169,7 @@
strDest += _T("\\");
}
- dlg.m_question = strQuestion;
+ dlg.m_question = question.c_str();
dlg.m_fromText = sOrig.c_str();
dlg.m_toText = sDest.c_str();
dlg.m_fromPath = strSrc.c_str();
@@ -677,6 +732,7 @@
FileActionItem act;
CString sFullDest(destPath);
sFullDest += _T("\\");
+ actionScript.m_destBase = sFullDest;
if (GetDocument()->GetRecursive())
{
if (!di.left.path.empty())
@@ -744,6 +800,7 @@
FileActionItem act;
CString sFullDest(destPath);
sFullDest += _T("\\");
+ actionScript.m_destBase = sFullDest;
if (GetDocument()->GetRecursive())
{
if (!di.right.path.empty())
@@ -809,7 +866,7 @@
if (actionList.GetActionItemCount() == 1)
{
if (!ConfirmCopy(item.UIOrigin, item.UIDestination,
- actionList.GetActionItemCount(), item.src.c_str(), item.dest.c_str(),
+ actionList.GetActionItemCount(), item.src.c_str(), item.dest.c_str(),
bDestIsSide))
{
return FALSE;
@@ -837,8 +894,7 @@
if (!actionList.m_destBase.empty())
dst = actionList.m_destBase;
else
- item.dest;
-
+ dst = item.dest;
}
if (!ConfirmCopy(item.UIOrigin, item.UIDestination,
@@ -851,8 +907,40 @@
// Deleting does not need confirmation, CShellFileOp takes care of it
case FileAction::ACT_DEL:
- // Moving does not need confirmation, CShellFileOp takes care of it
+ break;
+
case FileAction::ACT_MOVE:
+ bDestIsSide = FALSE;
+ if (actionList.GetActionItemCount() == 1)
+ {
+ if (!ConfirmMove(item.UIOrigin, item.UIDestination,
+ actionList.GetActionItemCount(), item.src.c_str(), item.dest.c_str(),
+ bDestIsSide))
+ {
+ return FALSE;
+ }
+ }
+ else
+ {
+ String src;
+ String dst;
+
+ if (item.UIOrigin == FileActionItem::UI_LEFT)
+ src = GetDocument()->GetLeftBasePath();
+ else
+ src = GetDocument()->GetRightBasePath();
+
+ if (!actionList.m_destBase.empty())
+ dst = actionList.m_destBase;
+ else
+ dst = item.dest;
+
+ if (!ConfirmMove(item.UIOrigin, item.UIDestination,
+ actionList.GetActionItemCount(), src.c_str(), dst.c_str(), bDestIsSide))
+ {
+ return FALSE;
+ }
+ }
break;
// Invalid operation
Modified: branches/R2_10/Src/Languages/English.pot
===================================================================
--- branches/R2_10/Src/Languages/English.pot 2008-07-31 11:39:05 UTC (rev 5710)
+++ branches/R2_10/Src/Languages/English.pot 2008-07-31 19:35:03 UTC (rev 5711)
@@ -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-07-29 08:45+0000\n"
+"POT-Creation-Date: 2008-07-31 22:33+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -701,7 +701,7 @@
msgstr ""
#: Merge.rc:366
-#: Merge.rc:2746
+#: Merge.rc:2750
#, c-format
msgid "< Empty >"
msgstr ""
@@ -2306,7 +2306,7 @@
msgstr ""
#: Merge.rc:1476
-#: Merge.rc:2304
+#: Merge.rc:2308
#, c-format
msgid "Different"
msgstr ""
@@ -2338,7 +2338,7 @@
msgstr ""
#: Merge.rc:1494
-#: Merge.rc:2299
+#: Merge.rc:2303
#, c-format
msgid "Identical"
msgstr ""
@@ -2528,6 +2528,7 @@
msgstr ""
#: Merge.rc:1639
+#: Merge.rc:2218
#, c-format
msgid "Confirm Copy"
msgstr ""
@@ -3146,7 +3147,7 @@
msgstr ""
#: Merge.rc:2006
-#: Merge.rc:2610
+#: Merge.rc:2614
#, c-format
msgid "Name"
msgstr ""
@@ -3167,7 +3168,7 @@
msgstr ""
#: Merge.rc:2010
-#: Merge.rc:2612
+#: Merge.rc:2616
#, c-format
msgid "Description"
msgstr ""
@@ -3554,8 +3555,8 @@
msgstr ""
#: Merge.rc:2159
-#: Merge.rc:2594
-#: Merge.rc:2782
+#: Merge.rc:2598
+#: Merge.rc:2786
#, c-format
msgid "None"
msgstr ""
@@ -3736,1784 +3737,1799 @@
msgid "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare."
msgstr ""
-#: Merge.rc:2221
+#: Merge.rc:2216
#, c-format
+msgid "Are you sure you want to move:"
+msgstr ""
+
+#: Merge.rc:2217
+#, c-format
+msgid "Are you sure you want to move %d items:"
+msgstr ""
+
+#: Merge.rc:2219
+#, c-format
+msgid "Confirm Move"
+msgstr ""
+
+#: Merge.rc:2225
+#, c-format
msgid "Open left file"
msgstr ""
-#: Merge.rc:2222
+#: Merge.rc:2226
#, c-format
msgid "Open the left file to external editor"
msgstr ""
-#: Merge.rc:2223
+#: Merge.rc:2227
#, c-format
msgid "Open left file with ..."
msgstr ""
-#: Merge.rc:2224
+#: Merge.rc:2228
#, c-format
msgid "Open right file"
msgstr ""
-#: Merge.rc:2225
+#: Merge.rc:2229
#, c-format
msgid "Open the right file to external editor"
msgstr ""
-#: Merge.rc:2226
+#: Merge.rc:2230
#, c-format
msgid "Open right file with..."
msgstr ""
-#: Merge.rc:2227
+#: Merge.rc:2231
#, c-format
msgid "Failed to execute external editor: %1"
msgstr ""
-#: Merge.rc:2228
+#: Merge.rc:2232
#, c-format
msgid "Unknown extension on external editor: %1"
msgstr ""
-#: Merge.rc:2229
+#: Merge.rc:2233
#, c-format
msgid "Copy filenames to clipboard"
msgstr ""
-#: Merge.rc:2230
+#: Merge.rc:2234
#, c-format
msgid "Copy left side pathnames to clipboard"
msgstr ""
-#: Merge.rc:2231
+#: Merge.rc:2235
#, c-format
msgid "Copy right side pathnames to clipboard"
msgstr ""
-#: Merge.rc:2232
+#: Merge.rc:2236
#, c-format
msgid "Copy both sides pathnames to clipboard"
msgstr ""
-#: Merge.rc:2238
+#: Merge.rc:2242
#, c-format
msgid "Unknown archive format"
msgstr ""
-#: Merge.rc:2239
+#: Merge.rc:2243
#, c-format
msgid "Add items from left side to archive"
msgstr ""
-#: Merge.rc:2240
+#: Merge.rc:2244
#, c-format
msgid "Add items from right side to archive"
msgstr ""
-#: Merge.rc:2241
+#: Merge.rc:2245
#, c-format
msgid "Add items from both sides to archive"
msgstr ""
-#: Merge.rc:2242
+#: Merge.rc:2246
#, c-format
msgid "Add different items to archive (both sides)"
msgstr ""
-#: Merge.rc:2244
+#: Merge.rc:2248
#, c-format
msgid "Move selected file on left to custom directory"
msgstr ""
-#: Merge.rc:2246
+#: Merge.rc:2250
#, c-format
msgid "Move selected file on right to custom directory"
msgstr ""
-#: Merge.rc:2252
+#: Merge.rc:2256
#, c-format
msgid "Filename"
msgstr ""
-#: Merge.rc:2253
+#: Merge.rc:2257
#, c-format
msgid "Folder"
msgstr ""
-#: Merge.rc:2254
+#: Merge.rc:2258
#, c-format
msgid "Comparison result"
msgstr ""
-#: Merge.rc:2255
+#: Merge.rc:2259
#, c-format
msgid "Left Date"
msgstr ""
-#: Merge.rc:2256
+#: Merge.rc:2260
#, c-format
msgid "Right Date"
msgstr ""
-#: Merge.rc:2257
+#: Merge.rc:2261
#, c-format
msgid "Extension"
msgstr ""
-#: Merge.rc:2258
+#: Merge.rc:2262
#, c-format
msgid "Left Size"
msgstr ""
-#: Merge.rc:2259
+#: Merge.rc:2263
#, c-format
msgid "Right Size"
msgstr ""
-#: Merge.rc:2260
+#: Merge.rc:2264
#, c-format
msgid "Right Size (Short)"
msgstr ""
-#: Merge.rc:2261
+#: Merge.rc:2265
#, c-format
msgid "Left Size (Short)"
msgstr ""
-#: Merge.rc:2267
+#: Merge.rc:2271
#, c-format
msgid "Left Creation Time"
msgstr ""
-#: Merge.rc:2268
+#: Merge.rc:2272
#, c-format
msgid "Right Creation Time"
msgstr ""
-#: Merge.rc:2269
+#: Merge.rc:2273
#, c-format
msgid "Newer File"
msgstr ""
-#: Merge.rc:2270
+#: Merge.rc:2274
#, c-format
msgid "Left File Version"
msgstr ""
-#: Merge.rc:2271
+#: Merge.rc:2275
#, c-format
msgid "Right File Version"
msgstr ""
-#: Merge.rc:2272
+#: Merge.rc:2276
#, c-format
msgid "Short Result"
msgstr ""
-#: Merge.rc:2273
+#: Merge.rc:2277
#, c-format
msgid "Left Attributes"
msgstr ""
-#: Merge.rc:2274
+#: Merge.rc:2278
#, c-format
msgid "Right Attributes"
msgstr ""
-#: Merge.rc:2275
+#: Merge.rc:2279
#, c-format
msgid "Left EOL"
msgstr ""
-#: Merge.rc:2276
+#: Merge.rc:2280
#, c-format
msgid "Right EOL"
msgstr ""
-#: Merge.rc:2282
+#: Merge.rc:2286
#, c-format
msgid "Left Encoding"
msgstr ""
-#: Merge.rc:2283
+#: Merge.rc:2287
#, c-format
msgid "Right Encoding"
msgstr ""
-#: Merge.rc:2284
+#: Merge.rc:2288
#, c-format
msgid "Ignored Diff."
msgstr ""
-#: Merge.rc:2285
+#: Merge.rc:2289
#, c-format
msgid "Differences"
msgstr ""
-#: Merge.rc:2286
-#: Merge.rc:2590
+#: Merge.rc:2290
+#: Merge.rc:2594
#, c-format
msgid "Binary"
msgstr ""
-#: Merge.rc:2292
+#: Merge.rc:2296
#, c-format
msgid "Unable to compare files"
msgstr ""
-#: Merge.rc:2293
+#: Merge.rc:2297
#, c-format
msgid "Item aborted"
msgstr ""
-#: Merge.rc:2294
+#: Merge.rc:2298
#, c-format
msgid "File skipped"
msgstr ""
-#: Merge.rc:2295
+#: Merge.rc:2299
#, c-format
msgid "Folder skipped"
msgstr ""
-#: Merge.rc:2296
+#: Merge.rc:2300
#, c-format
msgid "Left only: %1"
msgstr ""
-#: Merge.rc:2297
+#: Merge.rc:2301
#, c-format
msgid "Right only: %1"
msgstr ""
-#: Merge.rc:2298
+#: Merge.rc:2302
#, c-format
msgid "Binary files are identical"
msgstr ""
-#: Merge.rc:2300
+#: Merge.rc:2304
#, c-format
msgid "Binary files are different"
msgstr ""
-#: Merge.rc:2301
+#: Merge.rc:2305
#, c-format
msgid "Files are different"
msgstr ""
-#: Merge.rc:2302
+#: Merge.rc:2306
#, c-format
msgid "Left Only"
msgstr ""
-#: Merge.rc:2303
+#: Merge.rc:2307
#, c-format
msgid "Right Only"
msgstr ""
-#: Merge.rc:2305
+#: Merge.rc:2309
#, c-format
msgid "Error"
msgstr ""
-#: Merge.rc:2311
+#: Merge.rc:2315
#, c-format
msgid "Elapsed time: %ld ms"
msgstr ""
-#: Merge.rc:2312
+#: Merge.rc:2316
#, c-format
msgid "1 item selected"
msgstr ""
-#: Merge.rc:2313
+#: Merge.rc:2317
#, c-format
msgid "%1 items selected"
msgstr ""
-#: Merge.rc:2319
+#: Merge.rc:2323
#, c-format
msgid "Filename or folder name."
msgstr ""
-#: Merge.rc:2320
+#: Merge.rc:2324
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr ""
-#: Merge.rc:2321
+#: Merge.rc:2325
#, c-format
msgid "Comparison result, long form."
msgstr ""
-#: Merge.rc:2322
+#: Merge.rc:2326
#, c-format
msgid "Left side modification date."
msgstr ""
-#: Merge.rc:2323
+#: Merge.rc:2327
#, c-format
msgid "Right side modification date."
msgstr ""
-#: Merge.rc:2324
+#: Merge.rc:2328
#, c-format
msgid "File's extension."
msgstr ""
-#: Merge.rc:2325
+#: Merge.rc:2329
#, c-format
msgid "Left file size in bytes."
msgstr ""
-#: Merge.rc:2326
+#: Merge.rc:2330
#, c-format
msgid "Right file size in bytes."
msgstr ""
-#: Merge.rc:2327
+#: Merge.rc:2331
#, c-format
msgid "Left file size abbreviated."
msgstr ""
-#: Merge.rc:2328
+#: Merge.rc:2332
#, c-format
msgid "Right file size abbreviated."
msgstr ""
-#: Merge.rc:2334
+#: Merge.rc:2338
#, c-format
msgid "Left side creation time."
msgstr ""
-#: Merge.rc:2335
+#: Merge.rc:2339
#, c-format
msgid "Right side creation time."
msgstr ""
-#: Merge.rc:2336
+#: Merge.rc:2340
#, c-format
msgid "Tells which side has newer modification date."
msgstr ""
-#: Merge.rc:2337
+#: Merge.rc:2341
#, c-format
msgid "Left side file version, only for some filetypes."
msgstr ""
-#: Merge.rc:2338
+#: Merge.rc:2342
#, c-format
msgid "Right side file version, only for some filetypes."
msgstr ""
-#: Merge.rc:2339
+#: Merge.rc:2343
#, c-format
msgid "Short comparison result."
msgstr ""
-#: Merge.rc:2340
+#: Merge.rc:2344
#, c-format
msgid "Left side attributes."
msgstr ""
-#: Merge.rc:2341
+#: Merge.rc:2345
#, c-format
msgid "Right side attributes."
msgstr ""
-#: Merge.rc:2342
+#: Merge.rc:2346
#, c-format
msgid "Left side file EOL type"
msgstr ""
-#: Merge.rc:2343
+#: Merge.rc:2347
#, c-format
msgid "Right side file EOL type"
msgstr ""
-#: Merge.rc:2349
+#: Merge.rc:2353
#, c-format
msgid "Left side encoding."
msgstr ""
-#: Merge.rc:2350
+#: Merge.rc:2354
#, c-format
msgid "Right side encoding."
msgstr ""
-#: Merge.rc:2351
+#: Merge.rc:2355
#, c-format
msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
msgstr ""
-#: Merge.rc:2352
+#: Merge.rc:2356
#, c-format
msgid "Number of differences in file. This number does not include ignored differences."
msgstr ""
-#: Merge.rc:2353
+#: Merge.rc:2357
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr ""
-#: Merge.rc:2359
+#: Merge.rc:2363
#, c-format
msgid "Compare %1 with %2"
msgstr ""
-#: Merge.rc:2360
+#: Merge.rc:2364
#, c-format
msgid "Comma-separated list"
msgstr ""
-#: Merge.rc:2361
+#: Merge.rc:2365
#, c-format
msgid "Tab-separated list"
msgstr ""
-#: Merge.rc:2362
+#: Merge.rc:2366
#, c-format
msgid "Simple HTML"
msgstr ""
-#: Merge.rc:2363
+#: Merge.rc:2367
#, c-format
msgid "Simple XML"
msgstr ""
-#: Merge.rc:2365
+#: Merge.rc:2369
#, c-format
msgid "The report file already exists. Do you want to overwrite existing file?"
msgstr ""
-#: Merge.rc:2366
+#: Merge.rc:2370
#, c-format
msgid "Error creating the report:\n%1"
msgstr ""
-#: Merge.rc:2367
+#: Merge.rc:2371
#, c-format
msgid "The report has been created successfully."
msgstr ""
-#: Merge.rc:2373
+#: Merge.rc:2377
#, c-format
msgid "The same file is opened in both panels."
msgstr ""
-#: Merge.rc:2374
+#: Merge.rc:2378
#, c-format
msgid "The selected files are identical."
msgstr ""
-#: Merge.rc:2375
+#: Merge.rc:2379
#, c-format
msgid "An error occurred while comparing the files."
msgstr ""
-#: Merge.rc:2376
+#: Merge.rc:2380
#, c-format
msgid "Temporary files could not be created. Check your temporary path settings."
msgstr ""
-#: Merge.rc:2377
+#: Merge.rc:2381
#, c-format
msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)."
msgstr ""
-#: Merge.rc:2378
+#: Merge.rc:2382
#, c-format
msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
msgstr ""
-#: Merge.rc:2379
+#: Merge.rc:2383
#, c-format
msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
msgstr ""
-#: Merge.rc:2380
+#: Merge.rc:2384
#, c-format
msgid "The selected folder is invalid."
msgstr ""
-#: Merge.rc:2381
+#: Merge.rc:2385
#, c-format
msgid "Cannot open a binary file to editor."
msgstr ""
-#: Merge.rc:2382
+#: Merge.rc:2386
#, c-format
msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"
msgstr ""
-#: Merge.rc:2388
+#: Merge.rc:2392
#, c-format
msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?"
msgstr ""
-#: Merge.rc:2389
+#: Merge.rc:2393
#, c-format
msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
msgstr ""
-#: Merge.rc:2390
+#: Merge.rc:2394
#, c-format
msgid "Information lost due to encoding errors: both files"
msgstr ""
-#: Merge.rc:2391
+#: Merge.rc:2395
#, c-format
msgid "Information lost due to encoding errors: right file"
msgstr ""
-#: Merge.rc:2392
+#: Merge.rc:2396
#, c-format
msgid "Information lost due to encoding errors: left file"
msgstr ""
-#: Merge.rc:2398
+#: Merge.rc:2402
#, c-format
msgid "No difference"
msgstr ""
-#: Merge.rc:2399
+#: Merge.rc:2403
#, c-format
msgid "Line difference"
msgstr ""
-#: Merge.rc:2405
+#: Merge.rc:2409
#, c-format
msgid "Replaced %1 string(s)."
msgstr ""
-#: Merge.rc:2406
+#: Merge.rc:2410
#, c-format
msgid "Cannot find string \"%s\""
msgstr ""
-#: Merge.rc:2412
+#: Merge.rc:2416
#, c-format
msgid "Copy Full Path"
msgstr ""
-#: Merge.rc:2413
+#: Merge.rc:2417
#, c-format
msgid "Copy Filename"
msgstr ""
-#: Merge.rc:2419
+#: Merge.rc:2423
#, c-format
msgid "Location Pane"
msgstr ""
-#: Merge.rc:2420
+#: Merge.rc:2424
#, c-format
msgid "Diff Pane"
msgstr ""
-#: Merge.rc:2426
+#: Merge.rc:2430
#, c-format
msgid "Patch file successfully written."
msgstr ""
-#: Merge.rc:2427
+#: Merge.rc:2431
#, c-format
msgid "1. item is not found or is directory!"
msgstr ""
-#: Merge.rc:2428
+#: Merge.rc:2432
#, c-format
msgid "2. item is not found or is directory!"
msgstr ""
-#: Merge.rc:2429
+#: Merge.rc:2433
#, c-format
msgid "The patch file already exists. Do you want to overwrite it?"
msgstr ""
-#: Merge.rc:2430
+#: Merge.rc:2434
#, c-format
msgid "[%1 files selected]"
msgstr ""
-#: Merge.rc:2431
+#: Merge.rc:2435
#, c-format
msgid "Normal"
msgstr ""
-#: Merge.rc:2432
+#: Merge.rc:2436
#, c-format
msgid "Context"
msgstr ""
-#: Merge.rc:2433
+#: Merge.rc:2437
#, c-format
msgid "Unified"
msgstr ""
-#: Merge.rc:2434
+#: Merge.rc:2438
#, c-format
msgid "Could not write to file %1."
msgstr ""
-#: Merge.rc:2435
+#: Merge.rc:2439
#, c-format
msgid "The specified output path is not an absolute path: %1"
msgstr ""
-#: Merge.rc:2436
+#: Merge.rc:2440
#, c-format
msgid "Specify an output file"
msgstr ""
-#: Merge.rc:2437
+#: Merge.rc:2441
#, c-format
msgid "Cannot create a patch file from binary files."
msgstr ""
-#: Merge.rc:2438
+#: Merge.rc:2442
#, c-format
msgid "Cannot create a patch file from directories."
msgstr ""
-#: Merge.rc:2439
+#: Merge.rc:2443
#, c-format
msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files."
msgstr ""
-#: Merge.rc:2440
+#: Merge.rc:2444
#, c-format
msgid "Folder does not exist."
msgstr ""
-#: Merge.rc:2445
+#: Merge.rc:2449
#, c-format
msgid "Current directory comparison results will be cleared."
msgstr ""
-#: Merge.rc:2446
+#: Merge.rc:2450
#, c-format
msgid "Archive support is not enabled.\nAll needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\nSee manual for more info about archive support and how to enable it."
msgstr ""
-#: Merge.rc:2447
+#: Merge.rc:2451
#, c-format
msgid "\nNote: 7-Zip integration is disabled in WinMerge settings."
msgstr ""
-#: Merge.rc:2448
+#: Merge.rc:2452
#, c-format
msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings."
msgstr ""
-#: Merge.rc:2449
+#: Merge.rc:2453
#, c-format
msgid "Select file for export"
msgstr ""
-#: Merge.rc:2450
+#: Merge.rc:2454
#, c-format
msgid "Select file for import"
msgstr ""
-#: Merge.rc:2451
+#: Merge.rc:2455
#, c-format
msgid "Options imported from the file."
msgstr ""
-#: Merge.rc:2452
+#: Merge.rc:2456
#, c-format
msgid "Options exported to the file."
msgstr ""
-#: Merge.rc:2453
+#: Merge.rc:2457
#, c-format
msgid "Failed to import options from the file."
msgstr ""
-#: Merge.rc:2454
+#: Merge.rc:2458
#, c-format
msgid "Failed to write options to the file."
msgstr ""
-#: Merge.rc:2455
+#: Merge.rc:2459
#, c-format
msgid "You are about to close several compare windows.\n\nDo you want to continue?"
msgstr ""
-#: Merge.rc:2461
+#: Merge.rc:2465
#, c-format
msgid "Regular expression error"
msgstr ""
-#: Merge.rc:2462
+#: Merge.rc:2466
#, c-format
msgid "No match"
msgstr ""
-#: Merge.rc:2463
+#: Merge.rc:2467
#, c-format
msgid "Invalid regular expression"
msgstr ""
-#: Merge.rc:2464
+#: Merge.rc:2468
#, c-format
msgid "Invalid collation character"
msgstr ""
-#: Merge.rc:2465
+#: Merge.rc:2469
#, c-format
msgid "Invalid character class name"
msgstr ""
-#: Merge.rc:2466
+#: Merge.rc:2470
#, c-format
msgid "Trailing backslash"
msgstr ""
-#: Merge.rc:2467
+#: Merge.rc:2471
#, c-format
msgid "Invalid back reference"
msgstr ""
-#: Merge.rc:2468
+#: Merge.rc:2472
#, c-format
msgid "Unmatched [ or [^"
msgstr ""
-#: Merge.rc:2469
+#: Merge.rc:2473
#, c-format
msgid "Unmatched ( or \\("
msgstr ""
-#: Merge.rc:2470
+#: Merge.rc:2474
#, c-format
msgid "Unmatched \\{"
msgstr ""
-#: Merge.rc:2471
+#: Merge.rc:2475
#, c-format
msgid "Invalid content of \\{\\}"
msgstr ""
-#: Merge.rc:2472
+#: Merge.rc:2476
#, c-format
msgid "Invalid range end"
msgstr ""
-#: Merge.rc:2473
+#: Merge.rc:2477
#, c-format
msgid "Out of memory"
msgstr ""
-#: Merge.rc:2474
+#: Merge.rc:2478
#, c-format
msgid "Invalid preceding regular expression"
msgstr ""
-#: Merge.rc:2475
+#: Merge.rc:2479
#, c-format
msgid "Premature end of regular expression"
msgstr ""
-#: Merge.rc:2476
+#: Merge.rc:2480
#, c-format
msgid "Regular expression too big"
msgstr ""
-#: Merge.rc:2481
+#: Merge.rc:2485
#, c-format
msgid "Unmatched ) or \\)"
msgstr ""
-#: Merge.rc:2487
+#: Merge.rc:2491
#, c-format
msgid "Western European"
msgstr ""
-#: Merge.rc:2488
+#: Merge.rc:2492
#, c-format
msgid "Eastern European"
msgstr ""
-#: Merge.rc:2489
+#: Merge.rc:2493
#, c-format
msgid "East Asian"
msgstr ""
-#: Merge.rc:2490
+#: Merge.rc:2494
#, c-format
msgid "SE & SW Asian"
msgstr ""
-#: Merge.rc:2491
+#: Merge.rc:2495
#, c-format
msgid "Middle Eastern"
msgstr ""
-#: Merge.rc:2492
-#: Merge.rc:2502
+#: Merge.rc:2496
+#: Merge.rc:2506
#, c-format
msgid "Not applicable"
msgstr ""
-#: Merge.rc:2498
+#: Merge.rc:2502
#, c-format
msgid "MS-Windows"
msgstr ""
-#: Merge.rc:2499
+#: Merge.rc:2503
#, c-format
msgid "MS-DOS"
msgstr ""
-#: Merge.rc:2500
+#: Merge.rc:2504
#, c-format
msgid "Macintosh"
msgstr ""
-#: Merge.rc:2501
+#: Merge.rc:2505
#, c-format
msgid "IBM"
msgstr ""
-#: Merge.rc:2508
+#: Merge.rc:2512
#, c-format
msgid "EBCDIC"
msgstr ""
-#: Merge.rc:2509
+#: Merge.rc:2513
#, c-format
msgid "IBM EBCDIC Cyrillic"
msgstr ""
-#: Merge.rc:2515
+#: Merge.rc:2519
#, c-format
msgid "MS-DOS Latin US"
msgstr ""
-#: Merge.rc:2516
+#: Merge.rc:2520
#, c-format
msgid "MS-DOS Arabic"
msgstr ""
-#: Merge.rc:2517
+#: Merge.rc:2521
#, c-format
msgid "MS-DOS Greek"
msgstr ""
-#: Merge.rc:2518
+#: Merge.rc:2522
#, c-format
msgid "MS-DOS Baltic Rim"
msgstr ""
-#: Merge.rc:2519
+#: Merge.rc:2523
#, c-format
msgid "MS-DOS Latin 1"
msgstr ""
-#: Merge.rc:2520
+#: Merge.rc:2524
#, c-format
msgid "MS-DOS Greek 1"
msgstr ""
-#: Merge.rc:2521
+#: Merge.rc:2525
#, c-format
msgid "MS-DOS Latin 2"
msgstr ""
-#: Merge.rc:2522
+#: Merge.rc:2526
#, c-format
msgid "MS-DOS Cyrillic"
msgstr ""
-#: Merge.rc:2523
+#: Merge.rc:2527
#, c-format
msgid "MS-DOS Turkish"
msgstr ""
-#: Merge.rc:2524
+#: Merge.rc:2528
#, c-format
msgid "MS-DOS Portuguese"
msgstr ""
-#: Merge.rc:2530
+#: Merge.rc:2534
#, c-format
msgid "MS-DOS Icelandic"
msgstr ""
-#: Merge.rc:2531
+#: Merge.rc:2535
#, c-format
msgid "MS-DOS Hebrew"
msgstr ""
-#: Merge.rc:2532
+#: Merge.rc:2536
#, c-format
msgid "MS-DOS French Canada"
msgstr ""
-#: Merge.rc:2533
+#: Merge.rc:2537
#, c-format
msgid "MS-DOS Nordic"
msgstr ""
-#: Merge.rc:2534
+#: Merge.rc:2538
#, c-format
msgid "MS-DOS Cyrillic CIS 1"
msgstr ""
-#: Merge.rc:2535
+#: Merge.rc:2539
#, c-format
msgid "MS-DOS Greek 2"
msgstr ""
-#: Merge.rc:2541
+#: Merge.rc:2545
#, c-format
msgid "Windows Thai"
msgstr ""
-#: Merge.rc:2542
+#: Merge.rc:2546
#, c-format
msgid "Windows Japanese"
msgstr ""
-#: Merge.rc:2543
+#: Merge.rc:2547
#, c-format
msgid "Windows Simplified Chinese"
msgstr ""
-#: Merge.rc:2544
+#: Merge.rc:2548
#, c-format
msgid "Windows Korean"
msgstr ""
-#: Merge.rc:2545
+#: Merge.rc:2549
#, c-format
msgid "Windows Traditional Chinese"
msgstr ""
-#: Merge.rc:2546
+#: Merge.rc:2550
#, c-format
msgid "Windows Latin 2"
msgstr ""
-#: Merge.rc:2547
+#: Merge.rc:2551
#, c-format
msgid "Windows Cyrillic (Slavic)"
msgstr ""
-#: Merge.rc:2548
+#: Merge.rc:2552
#, c-format
msgid "Windows Latin 1"
msgstr ""
-#: Merge.rc:2549
+#: Merge.rc:2553
#, c-format
msgid "Windows Greek"
msgstr ""
-#: Merge.rc:2550
+#: Merge.rc:2554
#, c-format
msgid "Windows Latin 5 (Turkish)"
msgstr ""
-#: Merge.rc:2551
+#: Merge.rc:2555
#, c-format
msgid "Windows Hebrew"
msgstr ""
-#: Merge.rc:2552
+#: Merge.rc:2556
#, c-format
msgid "Windows Arabic"
msgstr ""
-#: Merge.rc:2553
+#: Merge.rc:2557
#, c-format
msgid "Windows Baltic Rim"
msgstr ""
-#: Merge.rc:2554
+#: Merge.rc:2558
#, c-format
msgid "Windows Vietnamese"
msgstr ""
-#: Merge.rc:2560
+#: Merge.rc:2564
#, c-format
msgid "Macintosh Roman"
msgstr ""
-#: Merge.rc:2561
+#: Merge.rc:2565
#, c-format
msgid "Macintosh Greek"
msgstr ""
-#: Merge.rc:2562
+#: Merge.rc:2566
#, c-format
msgid "Macintosh Cyrillic"
msgstr ""
-#: Merge.rc:2563
+#: Merge.rc:2567
#, c-format
msgid "Macintosh "
msgstr ""
-#: Merge.rc:2564
+#: Merge.rc:2568
#, c-format
msgid "Macintosh Central Europe"
msgstr ""
-#: Merge.rc:2565
+#: Merge.rc:2569
#, c-format
msgid "Macintosh Turkish"
msgstr ""
-#: Merge.rc:2574
+#: Merge.rc:2578
#, c-format
msgid "Approximates ISO-8859-2"
msgstr ""
-#: Merge.rc:2577
+#: Merge.rc:2581
#, c-format
msgid "Approximates ISO-8859-1"
msgstr ""
-#: Merge.rc:2578
+#: Merge.rc:2582
#, c-format
msgid "Approximates ISO-8859-7"
msgstr ""
-#: Merge.rc:2579
+#: Merge.rc:2583
#, c-format
msgid "Approximates ISO-8859-9"
msgstr ""
-#: Merge.rc:2580
+#: Merge.rc:2584
#, c-format
msgid "Approximates ISO-8859-8"
msgstr ""
-#: Merge.rc:2586
+#: Merge.rc:2590
#, c-format
msgid "Win"
msgstr ""
-#: Merge.rc:2587
+#: Merge.rc:2591
#, c-format
msgid "Mac"
msgstr ""
-#: Merge.rc:2588
+#: Merge.rc:2592
#, c-format
msgid "Unix"
msgstr ""
-#: Merge.rc:2589
+#: Merge.rc:2593
#, c-format
msgid "Mixed"
msgstr ""
-#: Merge.rc:2591
+#: Merge.rc:2595
#, c-format
msgid "LF"
msgstr ""
-#: Merge.rc:2592
+#: Merge.rc:2596
#, c-format
msgid "CR"
msgstr ""
-#: Merge.rc:2593
+#: Merge.rc:2597
#, c-format
msgid "CRLF"
msgstr ""
-#: Merge.rc:2600
+#: Merge.rc:2604
#, c-format
msgid " B"
msgstr ""
-#: Merge.rc:2601
+#: Merge.rc:2605
#, c-format
msgid " KB"
msgstr ""
-#: Merge.rc:2602
+#: Merge.rc:2606
#, c-format
msgid " MB"
msgstr ""
-#: Merge.rc:2603
+#: Merge.rc:2607
#, c-format
msgid " GB"
msgstr ""
-#: Merge.rc:2604
+#: Merge.rc:2608
#, c-format
msgid " TB"
msgstr ""
-#: Merge.rc:2605
+#: Merge.rc:2609
#, c-format
msgid " PB"
msgstr ""
-#: Merge.rc:2611
+#: Merge.rc:2615
#, c-format
msgid "Type"
msgstr ""
-#: Merge.rc:2613
+#: Merge.rc:2617
#, c-format
msgid "Unpacker"
msgstr ""
-#: Merge.rc:2614
+#: Merge.rc:2618
#, c-format
msgid "Prediffer"
msgstr ""
-#: Merge.rc:2615
+#: Merge.rc:2619
#, c-format
msgid "Editor script"
msgstr ""
-#: Merge.rc:2622
+#: Merge.rc:2626
#, c-format
msgid "Save the left file"
msgstr ""
-#: Merge.rc:2623
+#: Merge.rc:2627
#, c-format
msgid "Save the right file"
msgstr ""
-#: Merge.rc:2624
+#: Merge.rc:2628
#, c-format
msgid "Save the left file with name..."
msgstr ""
-#: Merge.rc:2625
+#: Merge.rc:2629
#, c-format
msgid "Save the right file with name..."
msgstr ""
-#: Merge.rc:2626
+#: Merge.rc:2630
#, c-format
msgid "Change left side file/folder read-only status"
msgstr ""
-#: Merge.rc:2627
+#: Merge.rc:2631
#, c-format
msgid "Change right side file/folder read-only status"
msgstr ""
-#: Merge.rc:2628
+#: Merge.rc:2632
#, c-format
msgid "Convert EOL to Windows mode"
msgstr ""
-#: Merge.rc:2629
+#: Merge.rc:2633
#, c-format
msgid "Convert EOL to Unix mode"
msgstr ""
-#: Merge.rc:2630
+#: Merge.rc:2634
#, c-format
msgid "Convert EOL to Mac mode"
msgstr ""
-#: Merge.rc:2631
+#: Merge.rc:2635
#, c-format
msgid "Switch between editing and merging modes"
msgstr ""
-#: Merge.rc:2632
+#: Merge.rc:2636
#, c-format
msgid "View and adjust file encoding properties\nFile encoding properties"
msgstr ""
-#: Merge.rc:2633
+#: Merge.rc:2637
#, c-format
msgid "Open and resolve conflict file"
msgstr ""
-#: Merge.rc:2639
+#: Merge.rc:2643
#, c-format
msgid "Select difference area in the current line\nDifference in the Current Line"
msgstr ""
-#: Merge.rc:2640
+#: Merge.rc:2644
#, c-format
msgid "Go to line or difference\nGo to (Ctrl+G)"
msgstr ""
-#: Merge.rc:2641
+#: Merge.rc:2645
#, c-format
msgid "Set program options\nOptions"
msgstr ""
-#: Merge.rc:2642
+#: Merge.rc:2646
#, c-format
msgid "Refresh display\nRefresh (F5)"
msgstr ""
-#: Merge.rc:2643
+#: Merge.rc:2647
#, c-format
msgid "Copy selected lines to clipboard adding linenumbers to line begin"
msgstr ""
-#: Merge.rc:2644
+#: Merge.rc:2648
#, c-format
msgid "Refresh selected items"
msgstr ""
-#: Merge.rc:2645
+#: Merge.rc:2649
#, c-format
msgid "Toggle bookmark"
msgstr ""
-#: Merge.rc:2646
+#: Merge.rc:2650
#, c-format
msgid "Go to next bookmark"
msgstr ""
-#: Merge.rc:2647
+#: Merge.rc:2651
#, c-format
msgid "Go to previous bookmark"
msgstr ""
-#: Merge.rc:2648
+#: Merge.rc:2652
#, c-format
msgid "Clear all bookmarks"
msgstr ""
-#: Merge.rc:2654
+#: Merge.rc:2658
#, c-format
msgid "Displays items that are exactly the same\nShow Identical Items"
msgstr ""
-#: Merge.rc:2655
+#: Merge.rc:2659
#, c-format
msgid "Displays items that have differences\nShow Different Items"
msgstr ""
-#: Merge.rc:2656
+#: Merge.rc:2660
#, c-format
msgid "Displays items that exist in only on the left side\nShow Left Unique Items"
msgstr ""
-#: Merge.rc:2657
+#: Merge.rc:2661
#, c-format
msgid "Displays items that exist in only on the right side\nShow Right Unique Items"
msgstr ""
-#: Merge.rc:2658
+#: Merge.rc:2662
#, c-format
msgid "Displays binary files\nShow Binary Files"
msgstr ""
-#: Merge.rc:2659
+#: Merge.rc:2663
#, c-format
msgid "Displays skipped items\nShow Skipped Items"
msgstr ""
-#: Merge.rc:2665
+#: Merge.rc:2669
#, c-format
msgid "Select the font for the view\nSelect View Font"
msgstr ""
-#: Merge.rc:2666
+#: Merge.rc:2670
#, c-format
msgid "Revert to using the default system font for view\nDefault Font"
msgstr ""
-#: Merge.rc:2667
+#: Merge.rc:2671
#, c-format
msgid "Shows whitespace characters"
msgstr ""
-#: Merge.rc:2668
+#: Merge.rc:2672
#, c-format
msgid "Toggle Diff Pane"
msgstr ""
-#: Merge.rc:2669
+#: Merge.rc:2673
#, c-format
msgid "Location pane shows overall picture from files"
msgstr ""
-#: Merge.rc:2670
+#: Merge.rc:2674
#, c-format
msgid "Show folder compare statistics dialog"
msgstr ""
-#: Merge.rc:2671
+#: Merge.rc:2675
#, c-format
msgid "Select the current user interface language\nLanguage"
msgstr ""
-#: Merge.rc:2672
+#: Merge.rc:2676
#, c-format
msgid "Shows differences inside lines with different colors\nShow Line Difference"
msgstr ""
-#: Merge.rc:2673
+#: Merge.rc:2677
#, c-format
msgid "Swap the positions of the two panes"
msgstr ""
-#: Merge.rc:2674
+#: Merge.rc:2678
#, c-format
msgid "Shows line numbers\nShow Line Numbers"
msgstr ""
-#: Merge.rc:2675
+#: Merge.rc:2679
#, c-format
msgid "Enable word wrap\nWrap Lines"
msgstr ""
-#: Merge.rc:2676
+#: Merge.rc:2680
#, c-format
msgid "Shows selection margins for both panes\nShow Selection Margins"
msgstr ""
-#: Merge.rc:2677
+#: Merge.rc:2681
#, c-format
msgid "Increase text size"
msgstr ""
-#: Merge.rc:2678
+#: Merge.rc:2682
#, c-format
msgid "Decrease text size"
msgstr ""
-#: Merge.rc:2679
+#: Merge.rc:2683
#, c-format
msgid "Reset text zoom to default size"
msgstr ""
-#: Merge.rc:2685
+#: Merge.rc:2689
#, c-format
msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
msgstr ""
-#: Merge.rc:2686
+#: Merge.rc:2690
#, c-format
msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
msgstr ""
-#: Merge.rc:2687
+#: Merge.rc:2691
#, c-format
msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
msgstr ""
-#: Merge.rc:2688
+#: Merge.rc:2692
#, c-format
msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
msgstr ""
-#: Merge.rc:2689
+#: Merge.rc:2693
#, c-format
msgid "Scroll to the last difference\nLast Difference (Alt+End)"
msgstr ""
-#: Merge.rc:2690
+#: Merge.rc:2694
#, c-format
msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)"
msgstr ""
-#: Merge.rc:2691
+#: Merge.rc:2695
#, c-format
msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)"
msgstr ""
-#: Merge.rc:2692
+#: Merge.rc:2696
#, c-format
msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)"
msgstr ""
-#: Merge.rc:2693
+#: Merge.rc:2697
#, c-format
msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)"
msgstr ""
-#: Merge.rc:2694
+#: Merge.rc:2698
#, c-format
msgid "Copy all differences to the right file\nAll Right"
msgstr ""
-#: Merge.rc:2695
+#: Merge.rc:2699
#, c-format
msgid "Copy all differences to the left file\nAll Left"
msgstr ""
-#: Merge.rc:2696
+#: Merge.rc:2700
#, c-format
msgid "Delete selected items from both directories"
msgstr ""
-#: Merge.rc:2697
+#: Merge.rc:2701
#, c-format
msgid "Compare selected item (compare first item if multiple items selected)"
msgstr ""
-#: Merge.rc:2703
+#: Merge.rc:2707
#, c-format
msgid "Select and reorder directory compare columns"
msgstr ""
-#: Merge.rc:2704
+#: Merge.rc:2708
#, c-format
msgid "Generate a patch-file"
msgstr ""
-#: Merge.rc:2705
+#: Merge.rc:2709
#, c-format
msgid "Select and modify filters"
msgstr ""
-#: Merge.rc:2706
+#: Merge.rc:2710
#, c-format
msgid "Generates a report from compare results"
msgstr ""
-#: Merge.rc:2712
+#: Merge.rc:2716
#, c-format
msgid "Shows a list of available plugins"
msgstr ""
-#: Merge.rc:2713
+#: Merge.rc:2717
#, c-format
msgid "The user selects the unpacker (no unpacking when comparing dir)"
msgstr ""
-#: Merge.rc:2714
+#: Merge.rc:2718
#, c-format
msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
msgstr ""
-#: Merge.rc:2715
+#: Merge.rc:2719
#, c-format
msgid "Select an unpacker to edit this file"
msgstr ""
-#: Merge.rc:2716
+#: Merge.rc:2720
#, c-format
msgid "No prediffer (normal)"
msgstr ""
-#: Merge.rc:2717
+#: Merge.rc:2721
#, c-format
msgid "Suggested plugins"
msgstr ""
-#: Merge.rc:2718
+#: Merge.rc:2722
#, c-format
msgid "Other plugins"
msgstr ""
-#: Merge.rc:2719
+#: Merge.rc:2723
#, c-format
msgid "Unload all plugins and reload them (for developers)"
msgstr ""
-#: Merge.rc:2725
+#: Merge.rc:2729
#, c-format
msgid "Activates next visible file\nActivate next File"
msgstr ""
-#: Merge.rc:2726
+#: Merge.rc:2730
#, c-format
msgid "Closes all open windows"
msgstr ""
-#: Merge.rc:2732
+#: Merge.rc:2736
#, c-format
msgid "Opens the WinMerge Help\nWinMerge Help"
msgstr ""
-#: Merge.rc:2733
+#: Merge.rc:2737
#, c-format
msgid "Outputs current WinMerge version info and configuration to text file"
msgstr ""
-#: Merge.rc:2734
+#: Merge.rc:2738
#, c-format
msgid "Display the GNU General Public License"
msgstr ""
-#: Merge.rc:2735
+#: Merge.rc:2739
#, c-format
msgid "Private Build: %1"
msgstr ""
-#: Merge.rc:2736
+#: Merge.rc:2740
#, c-format
msgid "Opens the release notes document\nRelease Notes"
msgstr ""
-#: Merge.rc:2737
+#: Merge.rc:2741
#, c-format
msgid "Opens the translations website\nTranslations"
msgstr ""
-#: Merge.rc:2743
+#: Merge.rc:2747
#, c-format
msgid "Plugin Settings"
msgstr ""
-#: Merge.rc:2744
+#: Merge.rc:2748
#, c-format
msgid "No prediffer"
msgstr ""
-#: Merge.rc:2745
+#: Merge.rc:2749
#, c-format
msgid "Prediff if possible"
msgstr ""
-#: Merge.rc:2747
+#: Merge.rc:2751
#, c-format
msgid "WSH not found - .sct scripts disabled"
msgstr ""
-#: Merge.rc:2748
+#: Merge.rc:2752
#, c-format
msgid "<None>"
msgstr ""
-#: Merge.rc:2749
+#: Merge.rc:2753
#, c-format
msgid "<Automatic>"
msgstr ""
-#: Merge.rc:2755
+#: Merge.rc:2759
#, c-format
msgid "Open the file with registered application"
msgstr ""
-#: Merge.rc:2756
+#: Merge.rc:2760
#, c-format
msgid "Open the file with external editor"
msgstr ""
-#: Merge.rc:2757
+#: Merge.rc:2761
#, c-format
msgid "Open the file with a particular program"
msgstr ""
-#: Merge.rc:2763
+#: Merge.rc:2767
#, c-format
msgid "Do not display moved blocks"
msgstr ""
-#: Merge.rc:2764
+#: Merge.rc:2768
#, c-format
msgid "Display all moved blocks"
msgstr ""
-#: Merge.rc:2765
+#: Merge.rc:2769
#, c-format
msgid "Display moved blocks only from current diff"
msgstr ""
-#: Merge.rc:2766
+#: Merge.rc:2770
#, c-format
msgid "Go to diff under cursor"
msgstr ""
-#: Merge.rc:2767
+#: Merge.rc:2771
#, c-format
msgid "G&oto Diff %1 of %2"
msgstr ""
-#: Merge.rc:2768
+#: Merge.rc:2772
#, c-format
msgid "G&oto Line %1"
msgstr ""
-#: Merge.rc:2774
+#: Merge.rc:2778
#, c-format
msgid "Disabled"
msgstr ""
-#: Merge.rc:2775
+#: Merge.rc:2779
#, c-format
msgid "From file system"
msgstr ""
-#: Merge.rc:2776
+#: Merge.rc:2780
#, c-format
msgid "From MRU list"
msgstr ""
-#: Merge.rc:2783
+#: Merge.rc:2787
#, c-format
msgid "ASP"
msgstr ""
-#: Merge.rc:2784
+#: Merge.rc:2788
#, c-format
msgid "Basic"
msgstr ""
-#: Merge.rc:2785
+#: Merge.rc:2789
#, c-format
msgid "Batch"
msgstr ""
-#: Merge.rc:2786
+#: Merge.rc:2790
#, c-format
msgid "C/C++"
msgstr ""
-#: Merge.rc:2787
+#: Merge.rc:2791
#, c-format
msgid "C#"
msgstr ""
-#: Merge.rc:2788
+#: Merge.rc:2792
#, c-format
msgid "CSS"
msgstr ""
-#: Merge.rc:2789
+#: Merge.rc:2793
#, c-format
msgid "DCL"
msgstr ""
-#: Merge.rc:2790
+#: Merge.rc:2794
#, c-format
msgid "Fortran"
msgstr ""
-#: Merge.rc:2791
+#: Merge.rc:2795
#, c-format
msgid "HTML"
msgstr ""
-#: Merge.rc:2792
+#: Merge.rc:2796
#, c-format
msgid "INI"
msgstr ""
-#: Merge.rc:2793
+#: Merge.rc:2797
#, c-format
msgid "InnoSetup"
msgstr ""
-#: Merge.rc:2794
+#: Merge.rc:2798
#, c-format
msgid "InstallShield"
msgstr ""
-#: Merge.rc:2795
+#: Merge.rc:2799
#, c-format
msgid "Java"
msgstr ""
-#: Merge.rc:2796
+#: Merge.rc:2800
#, c-format
msgid "AutoLISP"
msgstr ""
-#: Merge.rc:2797
+#: Merge.rc:2801
#, c-format
msgid "NSIS"
msgstr ""
-#: Merge.rc:2798
+#: Merge.rc:2802
#, c-format
msgid "Pascal"
msgstr ""
-#: Merge.rc:2799
+#: Merge.rc:2803
#, c-format
msgid "Perl"
msgstr ""
-#: Merge.rc:2800
+#: Merge.rc:2804
#, c-format
msgid "PHP"
msgstr ""
-#: Merge.rc:2801
+#: Merge.rc:2805
#, c-format
msgid "Portable Object"
msgstr ""
-#: Merge.rc:2802
+#: Merge.rc:2806
#, c-format
msgid "PowerShell"
msgstr ""
-#: Merge.rc:2803
+#: Merge.rc:2807
#, c-format
msgid "Python"
msgstr ""
-#: Merge.rc:2804
+#: Merge.rc:2808
#, c-format
msgid "REXX"
msgstr ""
-#: Merge.rc:2805
+#: Merge.rc:2809
#, c-format
msgid "Resources"
msgstr ""
-#: Merge.rc:2806
+#: Merge.rc:2810
#, c-format
msgid "Ruby"
msgstr ""
-#: Merge.rc:2807
+#: Merge.rc:2811
#, c-format
msgid "SGML"
msgstr ""
-#: Merge.rc:2808
+#: Merge.rc:2812
#, c-format
msgid "Shell"
msgstr ""
-#: Merge.rc:2809
+#: Merge.rc:2813
#, c-format
msgid "SIOD"
msgstr ""
-#: Merge.rc:2810
+#: Merge.rc:2814
#, c-format
msgid "SQL"
msgstr ""
-#: Merge.rc:2811
+#: Merge.rc:2815
#, c-format
msgid "TCL"
msgstr ""
-#: Merge.rc:2812
+#: Merge.rc:2816
#, c-format
msgid "TEX"
msgstr ""
-#: Merge.rc:2813
+#: Merge.rc:2817
#, c-format
msgid "XML"
msgstr ""
-#: Merge.rc:2818
+#: Merge.rc:2822
#, c-format
msgid "Hide the toolbar"
msgstr ""
-#: Merge.rc:2819
+#: Merge.rc:2823
#, c-format
msgid "Show small toolbar"
msgstr ""
-#: Merge.rc:2820
+#: Merge.rc:2824
#, c-format
msgid "Show big toolbar"
msgstr ""
Modified: branches/R2_10/Src/Merge.rc
===================================================================
--- branches/R2_10/Src/Merge.rc 2008-07-31 11:39:05 UTC (rev 5710)
+++ branches/R2_10/Src/Merge.rc 2008-07-31 19:35:03 UTC (rev 5711)
@@ -2213,6 +2213,10 @@
IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
IDS_DIRCMP_NOTSYNC "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare."
+ IDS_CONFIRM_SINGLE_MOVE "Are you sure you want to move:"
+ IDS_CONFIRM_MULTIPLE_MOVE "Are you sure you want to move %d items:"
+ IDS_CONFIRM_COPY_CAPTION "Confirm Copy"
+ IDS_CONFIRM_MOVE_CAPTION "Confirm Move"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: branches/R2_10/Src/resource.h
===================================================================
--- branches/R2_10/Src/resource.h 2008-07-31 11:39:05 UTC (rev 5710)
+++ branches/R2_10/Src/resource.h 2008-07-31 19:35:03 UTC (rev 5711)
@@ -617,6 +617,10 @@
#define IDS_CONFIRM_SINGLE_COPY 17639
#define IDS_CONFIRM_MULTIPLE_COPY 17640
#define IDS_DIRCMP_NOTSYNC 17641
+#define IDS_CONFIRM_SINGLE_MOVE 17642
+#define IDS_CONFIRM_MULTIPLE_MOVE 17643
+#define IDS_CONFIRM_COPY_CAPTION 17644
+#define IDS_CONFIRM_MOVE_CAPTION 17645
#define ID_DIR_OPEN_LEFT 17648
#define ID_DIR_OPEN_LEFT_WITHEDITOR 17649
#define ID_DIR_OPEN_LEFT_WITH 17650
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-08-03 19:28:18
|
Revision: 5727
http://winmerge.svn.sourceforge.net/winmerge/?rev=5727&view=rev
Author: kimmov
Date: 2008-08-03 19:28:15 +0000 (Sun, 03 Aug 2008)
Log Message:
-----------
PATCH: [ 2033754 ] Unlimited undo
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/DiffTextBuffer.cpp
branches/R2_10/Src/GhostTextBuffer.cpp
branches/R2_10/Src/editlib/ccrystaltextbuffer.cpp
branches/R2_10/Src/editlib/ccrystaltextbuffer.h
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-03 11:47:53 UTC (rev 5726)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-03 19:28:15 UTC (rev 5727)
@@ -16,6 +16,7 @@
Remove RCLocalizationHelper plugin (#2029457)
Clarify Supercopier caused hang in release notes (#2030040)
Confirmation dialog for move operations (#2026508)
+ Unlimited undo (#2033754)
BugFix: Use system codepage for paths (#1979429, #2008581)
BugFix: ANSI build crash in folder compare (#2010053)
BugFix: Add insert/overtype mode indicator to statusbar (#2015174)
Modified: branches/R2_10/Src/DiffTextBuffer.cpp
===================================================================
--- branches/R2_10/Src/DiffTextBuffer.cpp 2008-08-03 11:47:53 UTC (rev 5726)
+++ branches/R2_10/Src/DiffTextBuffer.cpp 2008-08-03 19:28:15 UTC (rev 5727)
@@ -482,7 +482,6 @@
m_bInit = TRUE;
m_bModified = FALSE;
m_bUndoGroup = m_bUndoBeginGroup = FALSE;
- m_nUndoBufSize = 1024; // crystaltextbuffer.cpp - UNDO_BUF_SIZE;
m_nSyncPosition = m_nUndoPosition = 0;
ASSERT(m_aUndoBuf.GetSize() == 0);
m_ptLastChange.x = m_ptLastChange.y = -1;
Modified: branches/R2_10/Src/GhostTextBuffer.cpp
===================================================================
--- branches/R2_10/Src/GhostTextBuffer.cpp 2008-08-03 11:47:53 UTC (rev 5726)
+++ branches/R2_10/Src/GhostTextBuffer.cpp 2008-08-03 19:28:15 UTC (rev 5727)
@@ -561,45 +561,6 @@
m_aUndoBuf.SetSize (m_nUndoPosition);
}
- // If undo buffer size is close to critical, remove the oldest records
- ASSERT (m_aUndoBuf.GetSize () <= m_nUndoBufSize);
- nBufSize = (int) m_aUndoBuf.GetSize ();
- if (nBufSize >= m_nUndoBufSize)
- {
- int nIndex = 0;
- for (;;)
- {
- nIndex++;
- if (nIndex == nBufSize || (m_aUndoBuf[nIndex].m_dwFlags & UNDO_BEGINGROUP) != 0)
- break;
- }
- m_aUndoBuf.RemoveAt (0, nIndex);
-
-//<jtuc 2003-06-28>
-//- Keep m_nSyncPosition in sync.
-//- Ensure first undo record is flagged UNDO_BEGINGROUP since part of the code
-//..relies on this condition.
- if (m_nSyncPosition >= 0)
- {
- m_nSyncPosition -= nIndex; // \xE7\xE0 c'est bien...mais non, test inutile ? Ou Apres !
- }
- if (nIndex < nBufSize)
- {
- // Not really necessary as long as groups are discarded as a whole.
- // Just in case some day the loop above should be changed to limit
- // the number of discarded undo records to some reasonable value...
- m_aUndoBuf[0].m_dwFlags |= UNDO_BEGINGROUP; // \xE7\xE0 c'est sale
- }
- else
- {
- // No undo records left - begin a new group:
- m_bUndoBeginGroup = TRUE;
- }
-//</jtuc>
-
- }
- ASSERT (m_aUndoBuf.GetSize () < m_nUndoBufSize);
-
// Add new record
SUndoRecord ur;
ur.m_dwFlags = bInsert ? UNDO_INSERT : 0;
@@ -623,7 +584,6 @@
m_aUndoBuf.Add (ur);
m_nUndoPosition = (int) m_aUndoBuf.GetSize ();
- ASSERT (m_aUndoBuf.GetSize () <= m_nUndoBufSize);
}
@@ -728,8 +688,6 @@
}
RecomputeEOL (pSource, nLine, nEndLine);
-
-
if (bHistory == false)
{
delete paSavedRevisonNumbers;
@@ -821,9 +779,7 @@
}
RecomputeEOL (pSource, nStartLine, nStartLine);
-
-
- if (bHistory == false)
+ if (bHistory == FALSE)
{
delete paSavedRevisonNumbers;
return TRUE;
Modified: branches/R2_10/Src/editlib/ccrystaltextbuffer.cpp
===================================================================
--- branches/R2_10/Src/editlib/ccrystaltextbuffer.cpp 2008-08-03 11:47:53 UTC (rev 5726)
+++ branches/R2_10/Src/editlib/ccrystaltextbuffer.cpp 2008-08-03 19:28:15 UTC (rev 5727)
@@ -79,8 +79,6 @@
#define CHAR_ALIGN 16
#define ALIGN_BUF_SIZE(size) ((size) / CHAR_ALIGN) * CHAR_ALIGN + CHAR_ALIGN;
-#define UNDO_BUF_SIZE 1024
-
const TCHAR crlf[] = _T ("\r\n");
#ifdef _DEBUG
@@ -401,7 +399,6 @@
m_nTabSize = 4;
m_nSyncPosition = m_nUndoPosition = 0;
m_bUndoGroup = m_bUndoBeginGroup = FALSE;
- m_nUndoBufSize = UNDO_BUF_SIZE;
ASSERT (m_aUndoBuf.GetSize () == 0);
UpdateViews (NULL, NULL, UPDATE_RESET);
//BEGIN SW
@@ -1576,45 +1573,6 @@
m_aUndoBuf.SetSize (m_nUndoPosition);
}
- // If undo buffer size is close to critical, remove the oldest records
- ASSERT (m_aUndoBuf.GetSize () <= m_nUndoBufSize);
- nBufSize = (int) m_aUndoBuf.GetSize ();
- if (nBufSize >= m_nUndoBufSize)
- {
- int nIndex = 0;
- for (;;)
- {
- nIndex++;
- if (nIndex == nBufSize || (m_aUndoBuf[nIndex].m_dwFlags & UNDO_BEGINGROUP) != 0)
- break;
- }
- m_aUndoBuf.RemoveAt (0, nIndex);
-
-//<jtuc 2003-06-28>
-//- Keep m_nSyncPosition in sync.
-//- Ensure first undo record is flagged UNDO_BEGINGROUP since part of the code
-// relies on this condition.
- if (m_nSyncPosition >= 0)
- {
- m_nSyncPosition -= nIndex; // \xE7\xE0 c'est bien...mais non, test inutile ? Ou Apres !
- }
- if (nIndex < nBufSize)
- {
- // Not really necessary as long as groups are discarded as a whole.
- // Just in case some day the loop above should be changed to limit
- // the number of discarded undo records to some reasonable value...
- m_aUndoBuf[0].m_dwFlags |= UNDO_BEGINGROUP; // \xE7\xE0 c'est sale
- }
- else
- {
- // No undo records left - begin a new group:
- m_bUndoBeginGroup = TRUE;
- }
-//</jtuc>
-
- }
- ASSERT (m_aUndoBuf.GetSize () < m_nUndoBufSize);
-
// Add new record
SUndoRecord ur;
ur.m_dwFlags = bInsert ? UNDO_INSERT : 0;
@@ -1632,7 +1590,6 @@
m_aUndoBuf.Add (ur);
m_nUndoPosition = (int) m_aUndoBuf.GetSize ();
- ASSERT (m_aUndoBuf.GetSize () <= m_nUndoBufSize);
}
LPCTSTR CCrystalTextBuffer::GetStringEol(CRLFSTYLE nCRLFMode)
Modified: branches/R2_10/Src/editlib/ccrystaltextbuffer.h
===================================================================
--- branches/R2_10/Src/editlib/ccrystaltextbuffer.h 2008-08-03 11:47:53 UTC (rev 5726)
+++ branches/R2_10/Src/editlib/ccrystaltextbuffer.h 2008-08-03 19:28:15 UTC (rev 5727)
@@ -118,7 +118,6 @@
CRLFSTYLE m_nCRLFMode;
BOOL m_IgnoreEol;
BOOL m_bCreateBackupFile;
- int m_nUndoBufSize;
BOOL m_bInsertTabs;
int m_nTabSize;
int FindLineWithFlag (DWORD dwFlag);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-08-05 19:15:42
|
Revision: 5737
http://winmerge.svn.sourceforge.net/winmerge/?rev=5737&view=rev
Author: kimmov
Date: 2008-08-05 19:15:34 +0000 (Tue, 05 Aug 2008)
Log Message:
-----------
BUG: [ 1153696 ] Backspace doesn't work if Shift pressed down
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/editlib/editres.rc
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-05 19:09:56 UTC (rev 5736)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-05 19:15:34 UTC (rev 5737)
@@ -25,6 +25,7 @@
window is open (#2010463)
BugFix: Moving was allowed for protected items (#2023734)
BugFix: Could change EOL style for protected file (#2025781)
+ BugFix: Shift+Backspace didn't work in editor (#1153696)
WinMerge 2.10.x (R2_10) branch created (r5561)
Modified: branches/R2_10/Src/editlib/editres.rc
===================================================================
--- branches/R2_10/Src/editlib/editres.rc 2008-08-05 19:09:56 UTC (rev 5736)
+++ branches/R2_10/Src/editlib/editres.rc 2008-08-05 19:15:34 UTC (rev 5737)
@@ -58,6 +58,7 @@
VK_BACK, ID_EDIT_DELETE_BACK, VIRTKEY, NOINVERT
VK_BACK, ID_EDIT_DELETE_WORD_BACK, VIRTKEY, CONTROL, NOINVERT
VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT, NOINVERT
+ VK_BACK, ID_EDIT_DELETE_BACK, VIRTKEY, SHIFT, NOINVERT
VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
VK_DELETE, ID_EDIT_DELETE_WORD, VIRTKEY, CONTROL, NOINVERT
VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-08-06 15:35:44
|
Revision: 5741
http://winmerge.svn.sourceforge.net/winmerge/?rev=5741&view=rev
Author: sdottaka
Date: 2008-08-06 15:35:39 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
BUG: [ 2025833 ] Deleting/Moving file crashes WinMerge in debugger
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/DirActions.cpp
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-06 15:33:15 UTC (rev 5740)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-06 15:35:39 UTC (rev 5741)
@@ -26,6 +26,7 @@
BugFix: Moving was allowed for protected items (#2023734)
BugFix: Could change EOL style for protected file (#2025781)
BugFix: Shift+Backspace didn't work in editor (#1153696)
+ BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833)
WinMerge 2.10.x (R2_10) branch created (r5561)
Modified: branches/R2_10/Src/DirActions.cpp
===================================================================
--- branches/R2_10/Src/DirActions.cpp 2008-08-06 15:33:15 UTC (rev 5740)
+++ branches/R2_10/Src/DirActions.cpp 2008-08-06 15:35:39 UTC (rev 5741)
@@ -994,7 +994,7 @@
// doesn't invalidate our item indexes.
FileActionItem act = actionList.RemoveTailActionItem();
POSITION diffpos = GetItemKey(act.context);
- const DIFFITEM & di = pDoc->GetDiffByKey(diffpos);
+ DIFFCODE diffcode = pDoc->GetDiffByKey(diffpos).diffcode;
BOOL bUpdateLeft = FALSE;
BOOL bUpdateRight = FALSE;
@@ -1021,7 +1021,7 @@
break;
case FileActionItem::UI_DEL_LEFT:
- if (di.diffcode.isSideLeftOnly())
+ if (diffcode.isSideLeftOnly())
{
m_pList->DeleteItem(act.context);
bItemsRemoved = TRUE;
@@ -1033,7 +1033,7 @@
break;
case FileActionItem::UI_DEL_RIGHT:
- if (di.diffcode.isSideRightOnly())
+ if (diffcode.isSideRightOnly())
{
m_pList->DeleteItem(act.context);
bItemsRemoved = TRUE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-08-06 16:42:15
|
Revision: 5743
http://winmerge.svn.sourceforge.net/winmerge/?rev=5743&view=rev
Author: kimmov
Date: 2008-08-06 16:42:11 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
PATCH: [ 2039228 ] Add wait-cursor and statusbar message for undo and redo
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/Languages/English.pot
branches/R2_10/Src/Merge.rc
branches/R2_10/Src/MergeEditView.cpp
branches/R2_10/Src/resource.h
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-06 16:39:38 UTC (rev 5742)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-06 16:42:11 UTC (rev 5743)
@@ -17,6 +17,7 @@
Clarify Supercopier caused hang in release notes (#2030040)
Confirmation dialog for move operations (#2026508)
Unlimited undo (#2033754)
+ Add wait cursor for undo and redo (#2039228)
BugFix: Use system codepage for paths (#1979429, #2008581)
BugFix: ANSI build crash in folder compare (#2010053)
BugFix: Add insert/overtype mode indicator to statusbar (#2015174)
Modified: branches/R2_10/Src/Languages/English.pot
===================================================================
--- branches/R2_10/Src/Languages/English.pot 2008-08-06 16:39:38 UTC (rev 5742)
+++ branches/R2_10/Src/Languages/English.pot 2008-08-06 16:42:11 UTC (rev 5743)
@@ -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-07-31 22:33+0000\n"
+"POT-Creation-Date: 2008-08-06 19:36+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -701,7 +701,7 @@
msgstr ""
#: Merge.rc:366
-#: Merge.rc:2750
+#: Merge.rc:2752
#, c-format
msgid "< Empty >"
msgstr ""
@@ -1413,7 +1413,7 @@
msgstr ""
#: Merge.rc:860
-#: Merge.rc:2162
+#: Merge.rc:2164
#, c-format
msgid "Rational ClearCase"
msgstr ""
@@ -2306,7 +2306,7 @@
msgstr ""
#: Merge.rc:1476
-#: Merge.rc:2308
+#: Merge.rc:2310
#, c-format
msgid "Different"
msgstr ""
@@ -2338,7 +2338,7 @@
msgstr ""
#: Merge.rc:1494
-#: Merge.rc:2303
+#: Merge.rc:2305
#, c-format
msgid "Identical"
msgstr ""
@@ -2528,7 +2528,7 @@
msgstr ""
#: Merge.rc:1639
-#: Merge.rc:2218
+#: Merge.rc:2220
#, c-format
msgid "Confirm Copy"
msgstr ""
@@ -3147,7 +3147,7 @@
msgstr ""
#: Merge.rc:2006
-#: Merge.rc:2614
+#: Merge.rc:2616
#, c-format
msgid "Name"
msgstr ""
@@ -3168,7 +3168,7 @@
msgstr ""
#: Merge.rc:2010
-#: Merge.rc:2616
+#: Merge.rc:2618
#, c-format
msgid "Description"
msgstr ""
@@ -3318,2218 +3318,2228 @@
msgid "Creating the report..."
msgstr ""
-#: Merge.rc:2076
+#: Merge.rc:2071
#, c-format
+msgid "Undoing the last operation..."
+msgstr ""
+
+#: Merge.rc:2072
+#, c-format
+msgid "Redoing the previous operation..."
+msgstr ""
+
+#: Merge.rc:2078
+#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
-#: Merge.rc:2077
+#: Merge.rc:2079
#, c-format
msgid "Line: %s"
msgstr ""
-#: Merge.rc:2078
+#: Merge.rc:2080
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
-#: Merge.rc:2079
+#: Merge.rc:2081
#, c-format
msgid "Merge"
msgstr ""
-#: Merge.rc:2080
+#: Merge.rc:2082
#, c-format
msgid "Difference %1 of %2"
msgstr ""
-#: Merge.rc:2081
+#: Merge.rc:2083
#, c-format
msgid "%1 Differences Found"
msgstr ""
-#: Merge.rc:2082
+#: Merge.rc:2084
#, c-format
msgid "1 Difference Found"
msgstr ""
#. Abbreviation from "Read Only"
-#: Merge.rc:2083
+#: Merge.rc:2085
#, c-format
msgid "RO"
msgstr ""
-#: Merge.rc:2089
+#: Merge.rc:2091
#, c-format
msgid "Item %1 of %2"
msgstr ""
-#: Merge.rc:2090
+#: Merge.rc:2092
#, c-format
msgid "Items: %1"
msgstr ""
-#: Merge.rc:2096
+#: Merge.rc:2098
#, c-format
msgid "Select two existing folders or files to compare"
msgstr ""
-#: Merge.rc:2097
+#: Merge.rc:2099
#, c-format
msgid "Folder Selection"
msgstr ""
-#: Merge.rc:2098
+#: Merge.rc:2100
#, c-format
msgid "Select two folders or two files to compare."
msgstr ""
-#: Merge.rc:2099
+#: Merge.rc:2101
#, c-format
msgid "Left path is invalid!"
msgstr ""
-#: Merge.rc:2100
+#: Merge.rc:2102
#, c-format
msgid "Right path is invalid!"
msgstr ""
-#: Merge.rc:2101
+#: Merge.rc:2103
#, c-format
msgid "Both paths are invalid!"
msgstr ""
-#: Merge.rc:2102
+#: Merge.rc:2104
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr ""
-#: Merge.rc:2103
+#: Merge.rc:2105
#, c-format
msgid "Cannot compare file and folder!"
msgstr ""
-#: Merge.rc:2109
+#: Merge.rc:2111
#, c-format
msgid "File not found: %1"
msgstr ""
-#: Merge.rc:2110
+#: Merge.rc:2112
#, c-format
msgid "File not unpacked: %1"
msgstr ""
-#: Merge.rc:2111
+#: Merge.rc:2113
#, c-format
msgid "Cannot open file\n%1\n\n%2"
msgstr ""
-#: Merge.rc:2112
+#: Merge.rc:2114
#, c-format
msgid "Failed to parse conflict file."
msgstr ""
-#: Merge.rc:2113
+#: Merge.rc:2115
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
-#: Merge.rc:2119
+#: Merge.rc:2121
#, c-format
msgid "Save As"
msgstr ""
-#: Merge.rc:2120
+#: Merge.rc:2122
#, c-format
msgid "Save changes to %1?"
msgstr ""
-#: Merge.rc:2121
+#: Merge.rc:2123
#, c-format
msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
msgstr ""
-#: Merge.rc:2122
+#: Merge.rc:2124
#, c-format
msgid "Error checking destination writeability"
msgstr ""
-#: Merge.rc:2123
+#: Merge.rc:2125
#, c-format
msgid "Error backing up file"
msgstr ""
-#: Merge.rc:2125
+#: Merge.rc:2127
#, c-format
msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
msgstr ""
-#: Merge.rc:2126
+#: Merge.rc:2128
#, c-format
msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
msgstr ""
-#: Merge.rc:2127
+#: Merge.rc:2129
#, c-format
msgid "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
msgstr ""
-#: Merge.rc:2128
+#: Merge.rc:2130
#, c-format
msgid "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
msgstr ""
-#: Merge.rc:2129
+#: Merge.rc:2131
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?"
msgstr ""
-#: Merge.rc:2130
+#: Merge.rc:2132
#, c-format
msgid "%1\nis marked read-only. Would you like to override the read-only item?"
msgstr ""
-#: Merge.rc:2131
+#: Merge.rc:2133
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nIf you want to refresh files close current file compare and load files again."
msgstr ""
-#: Merge.rc:2132
+#: Merge.rc:2134
#, c-format
msgid "Save Left File As"
msgstr ""
-#: Merge.rc:2133
+#: Merge.rc:2135
#, c-format
msgid "Save Right File As"
msgstr ""
-#: Merge.rc:2139
+#: Merge.rc:2141
#, c-format
msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
msgstr ""
-#: Merge.rc:2145
+#: Merge.rc:2147
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
msgstr ""
-#: Merge.rc:2146
+#: Merge.rc:2148
#, c-format
msgid "Checkout files from VSS..."
msgstr ""
-#: Merge.rc:2147
+#: Merge.rc:2149
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
msgstr ""
-#: Merge.rc:2148
+#: Merge.rc:2150
#, c-format
msgid "Error executing versioning system command."
msgstr ""
-#: Merge.rc:2149
+#: Merge.rc:2151
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
msgstr ""
-#: Merge.rc:2150
+#: Merge.rc:2152
#, c-format
msgid "No VSS database(s) found!"
msgstr ""
-#: Merge.rc:2151
+#: Merge.rc:2153
#, c-format
msgid "Error from VSS:"
msgstr ""
-#: Merge.rc:2152
+#: Merge.rc:2154
#, c-format
msgid "Versioning System returned an error while attempting to check in the file.\n Please, check config spec of used view.\n Undo checkout operation?"
msgstr ""
-#: Merge.rc:2153
+#: Merge.rc:2155
#, c-format
msgid "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. "
msgstr ""
-#: Merge.rc:2159
-#: Merge.rc:2598
-#: Merge.rc:2786
+#: Merge.rc:2161
+#: Merge.rc:2600
+#: Merge.rc:2788
#, c-format
msgid "None"
msgstr ""
-#: Merge.rc:2160
+#: Merge.rc:2162
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
msgstr ""
-#: Merge.rc:2161
+#: Merge.rc:2163
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
msgstr ""
-#: Merge.rc:2163
+#: Merge.rc:2165
#, c-format
msgid "Break at whitespace"
msgstr ""
-#: Merge.rc:2164
+#: Merge.rc:2166
#, c-format
msgid "Break at whitespace or punctuation"
msgstr ""
-#: Merge.rc:2170
#: Merge.rc:2172
+#: Merge.rc:2174
#, c-format
msgid "Copy selected item to named directory"
msgstr ""
-#: Merge.rc:2171
#: Merge.rc:2173
+#: Merge.rc:2175
#, c-format
msgid "Copy selected item to custom directory"
msgstr ""
-#: Merge.rc:2174
+#: Merge.rc:2176
#, c-format
msgid "Delete selected item on left"
msgstr ""
-#: Merge.rc:2175
+#: Merge.rc:2177
#, c-format
msgid "Delete selected item on right"
msgstr ""
-#: Merge.rc:2176
+#: Merge.rc:2178
#, c-format
msgid "Delete selected item(s) on both sides"
msgstr ""
-#: Merge.rc:2177
+#: Merge.rc:2179
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
msgstr ""
-#: Merge.rc:2178
+#: Merge.rc:2180
#, c-format
msgid "Rename selected item on both sides"
msgstr ""
-#: Merge.rc:2179
+#: Merge.rc:2181
#, c-format
msgid "Right to Left (%1)"
msgstr ""
-#: Merge.rc:2180
+#: Merge.rc:2182
#, c-format
msgid "Left to Right (%1)"
msgstr ""
-#: Merge.rc:2181
+#: Merge.rc:2183
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr ""
-#: Merge.rc:2182
+#: Merge.rc:2184
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr ""
-#: Merge.rc:2183
-#: Merge.rc:2199
+#: Merge.rc:2185
+#: Merge.rc:2201
#, c-format
msgid "Left to... (%1)"
msgstr ""
-#: Merge.rc:2184
-#: Merge.rc:2200
+#: Merge.rc:2186
+#: Merge.rc:2202
#, c-format
msgid "Right to... (%1)"
msgstr ""
-#: Merge.rc:2185
-#: Merge.rc:2201
+#: Merge.rc:2187
+#: Merge.rc:2203
#, c-format
msgid "Left to... (%1 of %2)"
msgstr ""
-#: Merge.rc:2186
-#: Merge.rc:2202
+#: Merge.rc:2188
+#: Merge.rc:2204
#, c-format
msgid "Right to... (%1 of %2)"
msgstr ""
-#: Merge.rc:2192
+#: Merge.rc:2194
#, c-format
msgid "Left (%1)"
msgstr ""
-#: Merge.rc:2193
+#: Merge.rc:2195
#, c-format
msgid "Right (%1)"
msgstr ""
-#: Merge.rc:2194
+#: Merge.rc:2196
#, c-format
msgid "Both (%1)"
msgstr ""
-#: Merge.rc:2195
+#: Merge.rc:2197
#, c-format
msgid "Left (%1 of %2)"
msgstr ""
-#: Merge.rc:2196
+#: Merge.rc:2198
#, c-format
msgid "Right (%1 of %2)"
msgstr ""
-#: Merge.rc:2197
+#: Merge.rc:2199
#, c-format
msgid "Both (%1 of %2)"
msgstr ""
-#: Merge.rc:2198
+#: Merge.rc:2200
#, c-format
msgid "Select destination folder"
msgstr ""
-#: Merge.rc:2203
+#: Merge.rc:2205
#, c-format
msgid "Left side - select destination folder:"
msgstr ""
-#: Merge.rc:2204
+#: Merge.rc:2206
#, c-format
msgid "Right side - select destination folder:"
msgstr ""
-#: Merge.rc:2205
+#: Merge.rc:2207
#, c-format
msgid "(%1 Files Affected)"
msgstr ""
-#: Merge.rc:2206
+#: Merge.rc:2208
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr ""
-#: Merge.rc:2212
+#: Merge.rc:2214
#, c-format
msgid "Are you sure you want to delete\n\n%1 ?"
msgstr ""
-#: Merge.rc:2213
+#: Merge.rc:2215
#, c-format
msgid "Are you sure you want to copy:"
msgstr ""
-#: Merge.rc:2214
+#: Merge.rc:2216
#, c-format
msgid "Are you sure you want to copy %d items:"
msgstr ""
-#: Merge.rc:2215
+#: Merge.rc:2217
#, c-format
msgid "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare."
msgstr ""
-#: Merge.rc:2216
+#: Merge.rc:2218
#, c-format
msgid "Are you sure you want to move:"
msgstr ""
-#: Merge.rc:2217
+#: Merge.rc:2219
#, c-format
msgid "Are you sure you want to move %d items:"
msgstr ""
-#: Merge.rc:2219
+#: Merge.rc:2221
#, c-format
msgid "Confirm Move"
msgstr ""
-#: Merge.rc:2225
+#: Merge.rc:2227
#, c-format
msgid "Open left file"
msgstr ""
-#: Merge.rc:2226
+#: Merge.rc:2228
#, c-format
msgid "Open the left file to external editor"
msgstr ""
-#: Merge.rc:2227
+#: Merge.rc:2229
#, c-format
msgid "Open left file with ..."
msgstr ""
-#: Merge.rc:2228
+#: Merge.rc:2230
#, c-format
msgid "Open right file"
msgstr ""
-#: Merge.rc:2229
+#: Merge.rc:2231
#, c-format
msgid "Open the right file to external editor"
msgstr ""
-#: Merge.rc:2230
+#: Merge.rc:2232
#, c-format
msgid "Open right file with..."
msgstr ""
-#: Merge.rc:2231
+#: Merge.rc:2233
#, c-format
msgid "Failed to execute external editor: %1"
msgstr ""
-#: Merge.rc:2232
+#: Merge.rc:2234
#, c-format
msgid "Unknown extension on external editor: %1"
msgstr ""
-#: Merge.rc:2233
+#: Merge.rc:2235
#, c-format
msgid "Copy filenames to clipboard"
msgstr ""
-#: Merge.rc:2234
+#: Merge.rc:2236
#, c-format
msgid "Copy left side pathnames to clipboard"
msgstr ""
-#: Merge.rc:2235
+#: Merge.rc:2237
#, c-format
msgid "Copy right side pathnames to clipboard"
msgstr ""
-#: Merge.rc:2236
+#: Merge.rc:2238
#, c-format
msgid "Copy both sides pathnames to clipboard"
msgstr ""
-#: Merge.rc:2242
+#: Merge.rc:2244
#, c-format
msgid "Unknown archive format"
msgstr ""
-#: Merge.rc:2243
+#: Merge.rc:2245
#, c-format
msgid "Add items from left side to archive"
msgstr ""
-#: Merge.rc:2244
+#: Merge.rc:2246
#, c-format
msgid "Add items from right side to archive"
msgstr ""
-#: Merge.rc:2245
+#: Merge.rc:2247
#, c-format
msgid "Add items from both sides to archive"
msgstr ""
-#: Merge.rc:2246
+#: Merge.rc:2248
#, c-format
msgid "Add different items to archive (both sides)"
msgstr ""
-#: Merge.rc:2248
+#: Merge.rc:2250
#, c-format
msgid "Move selected file on left to custom directory"
msgstr ""
-#: Merge.rc:2250
+#: Merge.rc:2252
#, c-format
msgid "Move selected file on right to custom directory"
msgstr ""
-#: Merge.rc:2256
+#: Merge.rc:2258
#, c-format
msgid "Filename"
msgstr ""
-#: Merge.rc:2257
+#: Merge.rc:2259
#, c-format
msgid "Folder"
msgstr ""
-#: Merge.rc:2258
+#: Merge.rc:2260
#, c-format
msgid "Comparison result"
msgstr ""
-#: Merge.rc:2259
+#: Merge.rc:2261
#, c-format
msgid "Left Date"
msgstr ""
-#: Merge.rc:2260
+#: Merge.rc:2262
#, c-format
msgid "Right Date"
msgstr ""
-#: Merge.rc:2261
+#: Merge.rc:2263
#, c-format
msgid "Extension"
msgstr ""
-#: Merge.rc:2262
+#: Merge.rc:2264
#, c-format
msgid "Left Size"
msgstr ""
-#: Merge.rc:2263
+#: Merge.rc:2265
#, c-format
msgid "Right Size"
msgstr ""
-#: Merge.rc:2264
+#: Merge.rc:2266
#, c-format
msgid "Right Size (Short)"
msgstr ""
-#: Merge.rc:2265
+#: Merge.rc:2267
#, c-format
msgid "Left Size (Short)"
msgstr ""
-#: Merge.rc:2271
+#: Merge.rc:2273
#, c-format
msgid "Left Creation Time"
msgstr ""
-#: Merge.rc:2272
+#: Merge.rc:2274
#, c-format
msgid "Right Creation Time"
msgstr ""
-#: Merge.rc:2273
+#: Merge.rc:2275
#, c-format
msgid "Newer File"
msgstr ""
-#: Merge.rc:2274
+#: Merge.rc:2276
#, c-format
msgid "Left File Version"
msgstr ""
-#: Merge.rc:2275
+#: Merge.rc:2277
#, c-format
msgid "Right File Version"
msgstr ""
-#: Merge.rc:2276
+#: Merge.rc:2278
#, c-format
msgid "Short Result"
msgstr ""
-#: Merge.rc:2277
+#: Merge.rc:2279
#, c-format
msgid "Left Attributes"
msgstr ""
-#: Merge.rc:2278
+#: Merge.rc:2280
#, c-format
msgid "Right Attributes"
msgstr ""
-#: Merge.rc:2279
+#: Merge.rc:2281
#, c-format
msgid "Left EOL"
msgstr ""
-#: Merge.rc:2280
+#: Merge.rc:2282
#, c-format
msgid "Right EOL"
msgstr ""
-#: Merge.rc:2286
+#: Merge.rc:2288
#, c-format
msgid "Left Encoding"
msgstr ""
-#: Merge.rc:2287
+#: Merge.rc:2289
#, c-format
msgid "Right Encoding"
msgstr ""
-#: Merge.rc:2288
+#: Merge.rc:2290
#, c-format
msgid "Ignored Diff."
msgstr ""
-#: Merge.rc:2289
+#: Merge.rc:2291
#, c-format
msgid "Differences"
msgstr ""
-#: Merge.rc:2290
-#: Merge.rc:2594
+#: Merge.rc:2292
+#: Merge.rc:2596
#, c-format
msgid "Binary"
msgstr ""
-#: Merge.rc:2296
+#: Merge.rc:2298
#, c-format
msgid "Unable to compare files"
msgstr ""
-#: Merge.rc:2297
+#: Merge.rc:2299
#, c-format
msgid "Item aborted"
msgstr ""
-#: Merge.rc:2298
+#: Merge.rc:2300
#, c-format
msgid "File skipped"
msgstr ""
-#: Merge.rc:2299
+#: Merge.rc:2301
#, c-format
msgid "Folder skipped"
msgstr ""
-#: Merge.rc:2300
+#: Merge.rc:2302
#, c-format
msgid "Left only: %1"
msgstr ""
-#: Merge.rc:2301
+#: Merge.rc:2303
#, c-format
msgid "Right only: %1"
msgstr ""
-#: Merge.rc:2302
+#: Merge.rc:2304
#, c-format
msgid "Binary files are identical"
msgstr ""
-#: Merge.rc:2304
+#: Merge.rc:2306
#, c-format
msgid "Binary files are different"
msgstr ""
-#: Merge.rc:2305
+#: Merge.rc:2307
#, c-format
msgid "Files are different"
msgstr ""
-#: Merge.rc:2306
+#: Merge.rc:2308
#, c-format
msgid "Left Only"
msgstr ""
-#: Merge.rc:2307
+#: Merge.rc:2309
#, c-format
msgid "Right Only"
msgstr ""
-#: Merge.rc:2309
+#: Merge.rc:2311
#, c-format
msgid "Error"
msgstr ""
-#: Merge.rc:2315
+#: Merge.rc:2317
#, c-format
msgid "Elapsed time: %ld ms"
msgstr ""
-#: Merge.rc:2316
+#: Merge.rc:2318
#, c-format
msgid "1 item selected"
msgstr ""
-#: Merge.rc:2317
+#: Merge.rc:2319
#, c-format
msgid "%1 items selected"
msgstr ""
-#: Merge.rc:2323
+#: Merge.rc:2325
#, c-format
msgid "Filename or folder name."
msgstr ""
-#: Merge.rc:2324
+#: Merge.rc:2326
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr ""
-#: Merge.rc:2325
+#: Merge.rc:2327
#, c-format
msgid "Comparison result, long form."
msgstr ""
-#: Merge.rc:2326
+#: Merge.rc:2328
#, c-format
msgid "Left side modification date."
msgstr ""
-#: Merge.rc:2327
+#: Merge.rc:2329
#, c-format
msgid "Right side modification date."
msgstr ""
-#: Merge.rc:2328
+#: Merge.rc:2330
#, c-format
msgid "File's extension."
msgstr ""
-#: Merge.rc:2329
+#: Merge.rc:2331
#, c-format
msgid "Left file size in bytes."
msgstr ""
-#: Merge.rc:2330
+#: Merge.rc:2332
#, c-format
msgid "Right file size in bytes."
msgstr ""
-#: Merge.rc:2331
+#: Merge.rc:2333
#, c-format
msgid "Left file size abbreviated."
msgstr ""
-#: Merge.rc:2332
+#: Merge.rc:2334
#, c-format
msgid "Right file size abbreviated."
msgstr ""
-#: Merge.rc:2338
+#: Merge.rc:2340
#, c-format
msgid "Left side creation time."
msgstr ""
-#: Merge.rc:2339
+#: Merge.rc:2341
#, c-format
msgid "Right side creation time."
msgstr ""
-#: Merge.rc:2340
+#: Merge.rc:2342
#, c-format
msgid "Tells which side has newer modification date."
msgstr ""
-#: Merge.rc:2341
+#: Merge.rc:2343
#, c-format
msgid "Left side file version, only for some filetypes."
msgstr ""
-#: Merge.rc:2342
+#: Merge.rc:2344
#, c-format
msgid "Right side file version, only for some filetypes."
msgstr ""
-#: Merge.rc:2343
+#: Merge.rc:2345
#, c-format
msgid "Short comparison result."
msgstr ""
-#: Merge.rc:2344
+#: Merge.rc:2346
#, c-format
msgid "Left side attributes."
msgstr ""
-#: Merge.rc:2345
+#: Merge.rc:2347
#, c-format
msgid "Right side attributes."
msgstr ""
-#: Merge.rc:2346
+#: Merge.rc:2348
#, c-format
msgid "Left side file EOL type"
msgstr ""
-#: Merge.rc:2347
+#: Merge.rc:2349
#, c-format
msgid "Right side file EOL type"
msgstr ""
-#: Merge.rc:2353
+#: Merge.rc:2355
#, c-format
msgid "Left side encoding."
msgstr ""
-#: Merge.rc:2354
+#: Merge.rc:2356
#, c-format
msgid "Right side encoding."
msgstr ""
-#: Merge.rc:2355
+#: Merge.rc:2357
#, c-format
msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
msgstr ""
-#: Merge.rc:2356
+#: Merge.rc:2358
#, c-format
msgid "Number of differences in file. This number does not include ignored differences."
msgstr ""
-#: Merge.rc:2357
+#: Merge.rc:2359
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr ""
-#: Merge.rc:2363
+#: Merge.rc:2365
#, c-format
msgid "Compare %1 with %2"
msgstr ""
-#: Merge.rc:2364
+#: Merge.rc:2366
#, c-format
msgid "Comma-separated list"
msgstr ""
-#: Merge.rc:2365
+#: Merge.rc:2367
#, c-format
msgid "Tab-separated list"
msgstr ""
-#: Merge.rc:2366
+#: Merge.rc:2368
#, c-format
msgid "Simple HTML"
msgstr ""
-#: Merge.rc:2367
+#: Merge.rc:2369
#, c-format
msgid "Simple XML"
msgstr ""
-#: Merge.rc:2369
+#: Merge.rc:2371
#, c-format
msgid "The report file already exists. Do you want to overwrite existing file?"
msgstr ""
-#: Merge.rc:2370
+#: Merge.rc:2372
#, c-format
msgid "Error creating the report:\n%1"
msgstr ""
-#: Merge.rc:2371
+#: Merge.rc:2373
#, c-format
msgid "The report has been created successfully."
msgstr ""
-#: Merge.rc:2377
+#: Merge.rc:2379
#, c-format
msgid "The same file is opened in both panels."
msgstr ""
-#: Merge.rc:2378
+#: Merge.rc:2380
#, c-format
msgid "The selected files are identical."
msgstr ""
-#: Merge.rc:2379
+#: Merge.rc:2381
#, c-format
msgid "An error occurred while comparing the files."
msgstr ""
-#: Merge.rc:2380
+#: Merge.rc:2382
#, c-format
msgid "Temporary files could not be created. Check your temporary path settings."
msgstr ""
-#: Merge.rc:2381
+#: Merge.rc:2383
#, c-format
msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)."
msgstr ""
-#: Merge.rc:2382
+#: Merge.rc:2384
#, c-format
msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
msgstr ""
-#: Merge.rc:2383
+#: Merge.rc:2385
#, c-format
msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
msgstr ""
-#: Merge.rc:2384
+#: Merge.rc:2386
#, c-format
msgid "The selected folder is invalid."
msgstr ""
-#: Merge.rc:2385
+#: Merge.rc:2387
#, c-format
msgid "Cannot open a binary file to editor."
msgstr ""
-#: Merge.rc:2386
+#: Merge.rc:2388
#, c-format
msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"
msgstr ""
-#: Merge.rc:2392
+#: Merge.rc:2394
#, c-format
msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?"
msgstr ""
-#: Merge.rc:2393
+#: Merge.rc:2395
#, c-format
msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
msgstr ""
-#: Merge.rc:2394
+#: Merge.rc:2396
#, c-format
msgid "Information lost due to encoding errors: both files"
msgstr ""
-#: Merge.rc:2395
+#: Merge.rc:2397
#, c-format
msgid "Information lost due to encoding errors: right file"
msgstr ""
-#: Merge.rc:2396
+#: Merge.rc:2398
#, c-format
msgid "Information lost due to encoding errors: left file"
msgstr ""
-#: Merge.rc:2402
+#: Merge.rc:2404
#, c-format
msgid "No difference"
msgstr ""
-#: Merge.rc:2403
+#: Merge.rc:2405
#, c-format
msgid "Line difference"
msgstr ""
-#: Merge.rc:2409
+#: Merge.rc:2411
#, c-format
msgid "Replaced %1 string(s)."
msgstr ""
-#: Merge.rc:2410
+#: Merge.rc:2412
#, c-format
msgid "Cannot find string \"%s\""
msgstr ""
-#: Merge.rc:2416
+#: Merge.rc:2418
#, c-format
msgid "Copy Full Path"
msgstr ""
-#: Merge.rc:2417
+#: Merge.rc:2419
#, c-format
msgid "Copy Filename"
msgstr ""
-#: Merge.rc:2423
+#: Merge.rc:2425
#, c-format
msgid "Location Pane"
msgstr ""
-#: Merge.rc:2424
+#: Merge.rc:2426
#, c-format
msgid "Diff Pane"
msgstr ""
-#: Merge.rc:2430
+#: Merge.rc:2432
#, c-format
msgid "Patch file successfully written."
msgstr ""
-#: Merge.rc:2431
+#: Merge.rc:2433
#, c-format
msgid "1. item is not found or is directory!"
msgstr ""
-#: Merge.rc:2432
+#: Merge.rc:2434
#, c-format
msgid "2. item is not found or is directory!"
msgstr ""
-#: Merge.rc:2433
+#: Merge.rc:2435
#, c-format
msgid "The patch file already exists. Do you want to overwrite it?"
msgstr ""
-#: Merge.rc:2434
+#: Merge.rc:2436
#, c-format
msgid "[%1 files selected]"
msgstr ""
-#: Merge.rc:2435
+#: Merge.rc:2437
#, c-format
msgid "Normal"
msgstr ""
-#: Merge.rc:2436
+#: Merge.rc:2438
#, c-format
msgid "Context"
msgstr ""
-#: Merge.rc:2437
+#: Merge.rc:2439
#, c-format
msgid "Unified"
msgstr ""
-#: Merge.rc:2438
+#: Merge.rc:2440
#, c-format
msgid "Could not write to file %1."
msgstr ""
-#: Merge.rc:2439
+#: Merge.rc:2441
#, c-format
msgid "The specified output path is not an absolute path: %1"
msgstr ""
-#: Merge.rc:2440
+#: Merge.rc:2442
#, c-format
msgid "Specify an output file"
msgstr ""
-#: Merge.rc:2441
+#: Merge.rc:2443
#, c-format
msgid "Cannot create a patch file from binary files."
msgstr ""
-#: Merge.rc:2442
+#: Merge.rc:2444
#, c-format
msgid "Cannot create a patch file from directories."
msgstr ""
-#: Merge.rc:2443
+#: Merge.rc:2445
#, c-format
msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files."
msgstr ""
-#: Merge.rc:2444
+#: Merge.rc:2446
#, c-format
msgid "Folder does not exist."
msgstr ""
-#: Merge.rc:2449
+#: Merge.rc:2451
#, c-format
msgid "Current directory comparison results will be cleared."
msgstr ""
-#: Merge.rc:2450
+#: Merge.rc:2452
#, c-format
msgid "Archive support is not enabled.\nAll needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\nSee manual for more info about archive support and how to enable it."
msgstr ""
-#: Merge.rc:2451
+#: Merge.rc:2453
#, c-format
msgid "\nNote: 7-Zip integration is disabled in WinMerge settings."
msgstr ""
-#: Merge.rc:2452
+#: Merge.rc:2454
#, c-format
msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings."
msgstr ""
-#: Merge.rc:2453
+#: Merge.rc:2455
#, c-format
msgid "Select file for export"
msgstr ""
-#: Merge.rc:2454
+#: Merge.rc:2456
#, c-format
msgid "Select file for import"
msgstr ""
-#: Merge.rc:2455
+#: Merge.rc:2457
#, c-format
msgid "Options imported from the file."
msgstr ""
-#: Merge.rc:2456
+#: Merge.rc:2458
#, c-format
msgid "Options exported to the file."
msgstr ""
-#: Merge.rc:2457
+#: Merge.rc:2459
#, c-format
msgid "Failed to import options from the file."
msgstr ""
-#: Merge.rc:2458
+#: Merge.rc:2460
#, c-format
msgid "Failed to write options to the file."
msgstr ""
-#: Merge.rc:2459
+#: Merge.rc:2461
#, c-format
msgid "You are about to close several compare windows.\n\nDo you want to continue?"
msgstr ""
-#: Merge.rc:2465
+#: Merge.rc:2467
#, c-format
msgid "Regular expression error"
msgstr ""
-#: Merge.rc:2466
+#: Merge.rc:2468
#, c-format
msgid "No match"
msgstr ""
-#: Merge.rc:2467
+#: Merge.rc:2469
#, c-format
msgid "Invalid regular expression"
msgstr ""
-#: Merge.rc:2468
+#: Merge.rc:2470
#, c-format
msgid "Invalid collation character"
msgstr ""
-#: Merge.rc:2469
+#: Merge.rc:2471
#, c-format
msgid "Invalid character class name"
msgstr ""
-#: Merge.rc:2470
+#: Merge.rc:2472
#, c-format
msgid "Trailing backslash"
msgstr ""
-#: Merge.rc:2471
+#: Merge.rc:2473
#, c-format
msgid "Invalid back reference"
msgstr ""
-#: Merge.rc:2472
+#: Merge.rc:2474
#, c-format
msgid "Unmatched [ or [^"
msgstr ""
-#: Merge.rc:2473
+#: Merge.rc:2475
#, c-format
msgid "Unmatched ( or \\("
msgstr ""
-#: Merge.rc:2474
+#: Merge.rc:2476
#, c-format
msgid "Unmatched \\{"
msgstr ""
-#: Merge.rc:2475
+#: Merge.rc:2477
#, c-format
msgid "Invalid content of \\{\\}"
msgstr ""
-#: Merge.rc:2476
+#: Merge.rc:2478
#, c-format
msgid "Invalid range end"
msgstr ""
-#: Merge.rc:2477
+#: Merge.rc:2479
#, c-format
msgid "Out of memory"
msgstr ""
-#: Merge.rc:2478
+#: Merge.rc:2480
#, c-format
msgid "Invalid preceding regular expression"
msgstr ""
-#: Merge.rc:2479
+#: Merge.rc:2481
#, c-format
msgid "Premature end of regular expression"
msgstr ""
-#: Merge.rc:2480
+#: Merge.rc:2482
#, c-format
msgid "Regular expression too big"
msgstr ""
-#: Merge.rc:2485
+#: Merge.rc:2487
#, c-format
msgid "Unmatched ) or \\)"
msgstr ""
-#: Merge.rc:2491
+#: Merge.rc:2493
#, c-format
msgid "Western European"
msgstr ""
-#: Merge.rc:2492
+#: Merge.rc:2494
#, c-format
msgid "Eastern European"
msgstr ""
-#: Merge.rc:2493
+#: Merge.rc:2495
#, c-format
msgid "East Asian"
msgstr ""
-#: Merge.rc:2494
+#: Merge.rc:2496
#, c-format
msgid "SE & SW Asian"
msgstr ""
-#: Merge.rc:2495
+#: Merge.rc:2497
#, c-format
msgid "Middle Eastern"
msgstr ""
-#: Merge.rc:2496
-#: Merge.rc:2506
+#: Merge.rc:2498
+#: Merge.rc:2508
#, c-format
msgid "Not applicable"
msgstr ""
-#: Merge.rc:2502
+#: Merge.rc:2504
#, c-format
msgid "MS-Windows"
msgstr ""
-#: Merge.rc:2503
+#: Merge.rc:2505
#, c-format
msgid "MS-DOS"
msgstr ""
-#: Merge.rc:2504
+#: Merge.rc:2506
#, c-format
msgid "Macintosh"
msgstr ""
-#: Merge.rc:2505
+#: Merge.rc:2507
#, c-format
msgid "IBM"
msgstr ""
-#: Merge.rc:2512
+#: Merge.rc:2514
#, c-format
msgid "EBCDIC"
msgstr ""
-#: Merge.rc:2513
+#: Merge.rc:2515
#, c-format
msgid "IBM EBCDIC Cyrillic"
msgstr ""
-#: Merge.rc:2519
+#: Merge.rc:2521
#, c-format
msgid "MS-DOS Latin US"
msgstr ""
-#: Merge.rc:2520
+#: Merge.rc:2522
#, c-format
msgid "MS-DOS Arabic"
msgstr ""
-#: Merge.rc:2521
+#: Merge.rc:2523
#, c-format
msgid "MS-DOS Greek"
msgstr ""
-#: Merge.rc:2522
+#: Merge.rc:2524
#, c-format
msgid "MS-DOS Baltic Rim"
msgstr ""
-#: Merge.rc:2523
+#: Merge.rc:2525
#, c-format
msgid "MS-DOS Latin 1"
msgstr ""
-#: Merge.rc:2524
+#: Merge.rc:2526
#, c-format
msgid "MS-DOS Greek 1"
msgstr ""
-#: Merge.rc:2525
+#: Merge.rc:2527
#, c-format
msgid "MS-DOS Latin 2"
msgstr ""
-#: Merge.rc:2526
+#: Merge.rc:2528
#, c-format
msgid "MS-DOS Cyrillic"
msgstr ""
-#: Merge.rc:2527
+#: Merge.rc:2529
#, c-format
msgid "MS-DOS Turkish"
msgstr ""
-#: Merge.rc:2528
+#: Merge.rc:2530
#, c-format
msgid "MS-DOS Portuguese"
msgstr ""
-#: Merge.rc:2534
+#: Merge.rc:2536
#, c-format
msgid "MS-DOS Icelandic"
msgstr ""
-#: Merge.rc:2535
+#: Merge.rc:2537
#, c-format
msgid "MS-DOS Hebrew"
msgstr ""
-#: Merge.rc:2536
+#: Merge.rc:2538
#, c-format
msgid "MS-DOS French Canada"
msgstr ""
-#: Merge.rc:2537
+#: Merge.rc:2539
#, c-format
msgid "MS-DOS Nordic"
msgstr ""
-#: Merge.rc:2538
+#: Merge.rc:2540
#, c-format
msgid "MS-DOS Cyrillic CIS 1"
msgstr ""
-#: Merge.rc:2539
+#: Merge.rc:2541
#, c-format
msgid "MS-DOS Greek 2"
msgstr ""
-#: Merge.rc:2545
+#: Merge.rc:2547
#, c-format
msgid "Windows Thai"
msgstr ""
-#: Merge.rc:2546
+#: Merge.rc:2548
#, c-format
msgid "Windows Japanese"
msgstr ""
-#: Merge.rc:2547
+#: Merge.rc:2549
#, c-format
msgid "Windows Simplified Chinese"
msgstr ""
-#: Merge.rc:2548
+#: Merge.rc:2550
#, c-format
msgid "Windows Korean"
msgstr ""
-#: Merge.rc:2549
+#: Merge.rc:2551
#, c-format
msgid "Windows Traditional Chinese"
msgstr ""
-#: Merge.rc:2550
+#: Merge.rc:2552
#, c-format
msgid "Windows Latin 2"
msgstr ""
-#: Merge.rc:2551
+#: Merge.rc:2553
#, c-format
msgid "Windows Cyrillic (Slavic)"
msgstr ""
-#: Merge.rc:2552
+#: Merge.rc:2554
#, c-format
msgid "Windows Latin 1"
msgstr ""
-#: Merge.rc:2553
+#: Merge.rc:2555
#, c-format
msgid "Windows Greek"
msgstr ""
-#: Merge.rc:2554
+#: Merge.rc:2556
#, c-format
msgid "Windows Latin 5 (Turkish)"
msgstr ""
-#: Merge.rc:2555
+#: Merge.rc:2557
#, c-format
msgid "Windows Hebrew"
msgstr ""
-#: Merge.rc:2556
+#: Merge.rc:2558
#, c-format
msgid "Windows Arabic"
msgstr ""
-#: Merge.rc:2557
+#: Merge.rc:2559
#, c-format
msgid "Windows Baltic Rim"
msgstr ""
-#: Merge.rc:2558
+#: Merge.rc:2560
#, c-format
msgid "Windows Vietnamese"
msgstr ""
-#: Merge.rc:2564
+#: Merge.rc:2566
#, c-format
msgid "Macintosh Roman"
msgstr ""
-#: Merge.rc:2565
+#: Merge.rc:2567
#, c-format
msgid "Macintosh Greek"
msgstr ""
-#: Merge.rc:2566
+#: Merge.rc:2568
#, c-format
msgid "Macintosh Cyrillic"
msgstr ""
-#: Merge.rc:2567
+#: Merge.rc:2569
#, c-format
msgid "Macintosh "
msgstr ""
-#: Merge.rc:2568
+#: Merge.rc:2570
#, c-format
msgid "Macintosh Central Europe"
msgstr ""
-#: Merge.rc:2569
+#: Merge.rc:2571
#, c-format
msgid "Macintosh Turkish"
msgstr ""
-#: Merge.rc:2578
+#: Merge.rc:2580
#, c-format
msgid "Approximates ISO-8859-2"
msgstr ""
-#: Merge.rc:2581
+#: Merge.rc:2583
#, c-format
msgid "Approximates ISO-8859-1"
msgstr ""
-#: Merge.rc:2582
+#: Merge.rc:2584
#, c-format
msgid "Approximates ISO-8859-7"
msgstr ""
-#: Merge.rc:2583
+#: Merge.rc:2585
#, c-format
msgid "Approximates ISO-8859-9"
msgstr ""
-#: Merge.rc:2584
+#: Merge.rc:2586
#, c-format
msgid "Approximates ISO-8859-8"
msgstr ""
-#: Merge.rc:2590
+#: Merge.rc:2592
#, c-format
msgid "Win"
msgstr ""
-#: Merge.rc:2591
+#: Merge.rc:2593
#, c-format
msgid "Mac"
msgstr ""
-#: Merge.rc:2592
+#: Merge.rc:2594
#, c-format
msgid "Unix"
msgstr ""
-#: Merge.rc:2593
+#: Merge.rc:2595
#, c-format
msgid "Mixed"
msgstr ""
-#: Merge.rc:2595
+#: Merge.rc:2597
#, c-format
msgid "LF"
msgstr ""
-#: Merge.rc:2596
+#: Merge.rc:2598
#, c-format
msgid "CR"
msgstr ""
-#: Merge.rc:2597
+#: Merge.rc:2599
#, c-format
msgid "CRLF"
msgstr ""
-#: Merge.rc:2604
+#: Merge.rc:2606
#, c-format
msgid " B"
msgstr ""
-#: Merge.rc:2605
+#: Merge.rc:2607
#, c-format
msgid " KB"
msgstr ""
-#: Merge.rc:2606
+#: Merge.rc:2608
#, c-format
msgid " MB"
msgstr ""
-#: Merge.rc:2607
+#: Merge.rc:2609
#, c-format
msgid " GB"
msgstr ""
-#: Merge.rc:2608
+#: Merge.rc:2610
#, c-format
msgid " TB"
msgstr ""
-#: Merge.rc:2609
+#: Merge.rc:2611
#, c-format
msgid " PB"
msgstr ""
-#: Merge.rc:2615
+#: Merge.rc:2617
#, c-format
msgid "Type"
msgstr ""
-#: Merge.rc:2617
+#: Merge.rc:2619
#, c-format
msgid "Unpacker"
msgstr ""
-#: Merge.rc:2618
+#: Merge.rc:2620
#, c-format
msgid "Prediffer"
msgstr ""
-#: Merge.rc:2619
+#: Merge.rc:2621
#, c-format
msgid "Editor script"
msgstr ""
-#: Merge.rc:2626
+#: Merge.rc:2628
#, c-format
msgid "Save the left file"
msgstr ""
-#: Merge.rc:2627
+#: Merge.rc:2629
#, c-format
msgid "Save the right file"
msgstr ""
-#: Merge.rc:2628
+#: Merge.rc:2630
#, c-format
msgid "Save the left file with name..."
msgstr ""
-#: Merge.rc:2629
+#: Merge.rc:2631
#, c-format
msgid "Save the right file with name..."
msgstr ""
-#: Merge.rc:2630
+#: Merge.rc:2632
#, c-format
msgid "Change left side file/folder read-only status"
msgstr ""
-#: Merge.rc:2631
+#: Merge.rc:2633
#, c-format
msgid "Change right side file/folder read-only status"
msgstr ""
-#: Merge.rc:2632
+#: Merge.rc:2634
#, c-format
msgid "Convert EOL to Windows mode"
msgstr ""
-#: Merge.rc:2633
+#: Merge.rc:2635
#, c-format
msgid "Convert EOL to Unix mode"
msgstr ""
-#: Merge.rc:2634
+#: Merge.rc:2636
#, c-format
msgid "Convert EOL to Mac mode"
msgstr ""
-#: Merge.rc:2635
+#: Merge.rc:2637
#, c-format
msgid "Switch between editing and merging modes"
msgstr ""
-#: Merge.rc:2636
+#: Merge.rc:2638
#, c-format
msgid "View and adjust file encoding properties\nFile encoding properties"
msgstr ""
-#: Merge.rc:2637
+#: Merge.rc:2639
#, c-format
msgid "Open and resolve conflict file"
msgstr ""
-#: Merge.rc:2643
+#: Merge.rc:2645
#, c-format
msgid "Select difference area in the current line\nDifference in the Current Line"
msgstr ""
-#: Merge.rc:2644
+#: Merge.rc:2646
#, c-format
msgid "Go to line or difference\nGo to (Ctrl+G)"
msgstr ""
-#: Merge.rc:2645
+#: Merge.rc:2647
#, c-format
msgid "Set program options\nOptions"
msgstr ""
-#: Merge.rc:2646
+#: Merge.rc:2648
#, c-format
msgid "Refresh display\nRefresh (F5)"
msgstr ""
-#: Merge.rc:2647
+#: Merge.rc:2649
#, c-format
msgid "Copy selected lines to clipboard adding linenumbers to line begin"
msgstr ""
-#: Merge.rc:2648
+#: Merge.rc:2650
#, c-format
msgid "Refresh selected items"
msgstr ""
-#: Merge.rc:2649
+#: Merge.rc:2651
#, c-format
msgid "Toggle bookmark"
msgstr ""
-#: Merge.rc:2650
+#: Merge.rc:2652
#, c-format
msgid "Go to next bookmark"
msgstr ""
-#: Merge.rc:2651
+#: Merge.rc:2653
#, c-format
msgid "Go to previous bookmark"
msgstr ""
-#: Merge.rc:2652
+#: Merge.rc:2654
#, c-format
msgid "Clear all bookmarks"
msgstr ""
-#: Merge.rc:2658
+#: Merge.rc:2660
#, c-format
msgid "Displays items that are exactly the same\nShow Identical Items"
msgstr ""
-#: Merge.rc:2659
+#: Merge.rc:2661
#, c-format
msgid "Displays items that have differences\nShow Different Items"
msgstr ""
-#: Merge.rc:2660
+#: Merge.rc:2662
#, c-format
msgid "Displays items that exist in only on the left side\nShow Left Unique Items"
msgstr ""
-#: Merge.rc:2661
+#: Merge.rc:2663
#, c-format
msgid "Displays items that exist in only on the right side\nShow Right Unique Items"
msgstr ""
-#: Merge.rc:2662
+#: Merge.rc:2664
#, c-format
msgid "Displays binary files\nShow Binary Files"
msgstr ""
-#: Merge.rc:2663
+#: Merge.rc:2665
#, c-format
msgid "Displays skipped items\nShow Skipped Items"
msgstr ""
-#: Merge.rc:2669
+#: Merge.rc:2671
#, c-format
msgid "Select the font for the view\nSelect View Font"
msgstr ""
-#: Merge.rc:2670
+#: Merge.rc:2672
#, c-format
msgid "Revert to using the default system font for view\nDefault Font"
msgstr ""
-#: Merge.rc:2671
+#: Merge.rc:2673
#, c-format
msgid "Shows whitespace characters"
msgstr ""
-#: Merge.rc:2672
+#: Merge.rc:2674
#, c-format
msgid "Toggle Diff Pane"
msgstr ""
-#: Merge.rc:2673
+#: Merge.rc:2675
#, c-format
msgid "Location pane shows overall picture from files"
msgstr ""
-#: Merge.rc:2674
+#: Merge.rc:2676
#, c-format
msgid "Show folder compare statistics dialog"
msgstr ""
-#: Merge.rc:2675
+#: Merge.rc:2677
#, c-format
msgid "Select the current user interface language\nLanguage"
msgstr ""
-#: Merge.rc:2676
+#: Merge.rc:2678
#, c-format
msgid "Shows differences inside lines with different colors\nShow Line Difference"
msgstr ""
-#: Merge.rc:2677
+#: Merge.rc:2679
#, c-format
msgid "Swap the positions of the two panes"
msgstr ""
-#: Merge.rc:2678
+#: Merge.rc:2680
#, c-format
msgid "Shows line numbers\nShow Line Numbers"
msgstr ""
-#: Merge.rc:2679
+#: Merge.rc:2681
#, c-format
msgid "Enable word wrap\nWrap Lines"
msgstr ""
-#: Merge.rc:2680
+#: Merge.rc:2682
#, c-format
msgid "Shows selection margins for both panes\nShow Selection Margins"
msgstr ""
-#: Merge.rc:2681
+#: Merge.rc:2683
#, c-format
msgid "Increase text size"
msgstr ""
-#: Merge.rc:2682
+#: Merge.rc:2684
#, c-format
msgid "Decrease text size"
msgstr ""
-#: Merge.rc:2683
+#: Merge.rc:2685
#, c-format
msgid "Reset text zoom to default size"
msgstr ""
-#: Merge.rc:2689
+#: Merge.rc:2691
#, c-format
msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
msgstr ""
-#: Merge.rc:2690
+#: Merge.rc:2692
#, c-format
msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
msgstr ""
-#: Merge.rc:2691
+#: Merge.rc:2693
#, c-format
msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
msgstr ""
-#: Merge.rc:2692
+#: Merge.rc:2694
#, c-format
msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
msgstr ""
-#: Merge.rc:2693
+#: Merge.rc:2695
#, c-format
msgid "Scroll to the last difference\nLast Difference (Alt+End)"
msgstr ""
-#: Merge.rc:2694
+#: Merge.rc:2696
#, c-format
msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)"
msgstr ""
-#: Merge.rc:2695
+#: Merge.rc:2697
#, c-format
msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)"
msgstr ""
-#: Merge.rc:2696
+#: Merge.rc:2698
#, c-format
msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)"
msgstr ""
-#: Merge.rc:2697
+#: Merge.rc:2699
#, c-format
msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)"
msgstr ""
-#: Merge.rc:2698
+#: Merge.rc:2700
#, c-format
msgid "Copy all differences to the right file\nAll Right"
msgstr ""
-#: Merge.rc:2699
+#: Merge.rc:2701
#, c-format
msgid "Copy all differences to the left file\nAll Left"
msgstr ""
-#: Merge.rc:2700
+#: Merge.rc:2702
#, c-format
msgid "Delete selected items from both directories"
msgstr ""
-#: Merge.rc:2701
+#: Merge.rc:2703
#, c-format
msgid "Compare selected item (compare first item if multiple items selected)"
msgstr ""
-#: Merge.rc:2707
+#: Merge.rc:2709
#, c-format
msgid "Select and reorder directory compare columns"
msgstr ""
-#: Merge.rc:2708
+#: Merge.rc:2710
#, c-format
msgid "Generate a patch-file"
msgstr ""
-#: Merge.rc:2709
+#: Merge.rc:2711
#, c-format
msgid "Select and modify filters"
msgstr ""
-#: Merge.rc:2710
+#: Merge.rc:2712
#, c-format
msgid "Generates a report from compare results"
msgstr ""
-#: Merge.rc:2716
+#: Merge.rc:2718
#, c-format
msgid "Shows a list of available plugins"
msgstr ""
-#: Merge.rc:2717
+#: Merge.rc:2719
#, c-format
msgid "The user selects the unpacker (no unpacking when comparing dir)"
msgstr ""
-#: Merge.rc:2718
+#: Merge.rc:2720
#, c-format
msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
msgstr ""
-#: Merge.rc:2719
+#: Merge.rc:2721
#, c-format
msgid "Select an unpacker to edit this file"
msgstr ""
-#: Merge.rc:2720
+#: Merge.rc:2722
#, c-format
msgid "No prediffer (normal)"
msgstr ""
-#: Merge.rc:2721
+#: Merge.rc:2723
#, c-format
msgid "Suggested plugins"
msgstr ""
-#: Merge.rc:2722
+#: Merge.rc:2724
#, c-format
msgid "Other plugins"
msgstr ""
-#: Merge.rc:2723
+#: Merge.rc:2725
#, c-format
msgid "Unload all plugins and reload them (for developers)"
msgstr ""
-#: Merge.rc:2729
+#: Merge.rc:2731
#, c-format
msgid "Activates next visible file\nActivate next File"
msgstr ""
-#: Merge.rc:2730
+#: Merge.rc:2732
#, c-format
msgid "Closes all open windows"
msgstr ""
-#: Merge.rc:2736
+#: Merge.rc:2738
#, c-format
msgid "Opens the WinMerge Help\nWinMerge Help"
msgstr ""
-#: Merge.rc:2737
+#: Merge.rc:2739
#, c-format
msgid "Outputs current WinMerge version info and configuration to text file"
msgstr ""
-#: Merge.rc:2738
+#: Merge.rc:2740
#, c-format
msgid "Display the GNU General Public License"
msgstr ""
-#: Merge.rc:2739
+#: Merge.rc:2741
#, c-format
msgid "Private Build: %1"
msgstr ""
-#: Merge.rc:2740
+#: Merge.rc:2742
#, c-format
msgid "Opens the release notes document\nRelease Notes"
msgstr ""
-#: Merge.rc:2741
+#: Merge.rc:2743
#, c-format
msgid "Opens the translations website\nTranslations"
msgstr ""
-#: Merge.rc:2747
+#: Merge.rc:2749
#, c-format
msgid "Plugin Settings"
msgstr ""
-#: Merge.rc:2748
+#: Merge.rc:2750
#, c-format
msgid "No prediffer"
msgstr ""
-#: Merge.rc:2749
+#: Merge.rc:2751
#, c-format
msgid "Prediff if possible"
msgstr ""
-#: Merge.rc:2751
+#: Merge.rc:2753
#, c-format
msgid "WSH not found - .sct scripts disabled"
msgstr ""
-#: Merge.rc:2752
+#: Merge.rc:2754
#, c-format
msgid "<None>"
msgstr ""
-#: Merge.rc:2753
+#: Merge.rc:2755
#, c-format
msgid "<Automatic>"
msgstr ""
-#: Merge.rc:2759
+#: Merge.rc:2761
#, c-format
msgid "Open the file with registered application"
msgstr ""
-#: Merge.rc:2760
+#: Merge.rc:2762
#, c-format
msgid "Open the file with external editor"
msgstr ""
-#: Merge.rc:2761
+#: Merge.rc:2763
#, c-format
msgid "Open the file with a particular program"
msgstr ""
-#: Merge.rc:2767
+#: Merge.rc:2769
#, c-format
msgid "Do not display moved blocks"
msgstr ""
-#: Merge.rc:2768
+#: Merge.rc:2770
#, c-format
msgid "Display all moved blocks"
msgstr ""
-#: Merge.rc:2769
+#: Merge.rc:2771
#, c-format
msgid "Display moved blocks only from current diff"
msgstr ""
-#: Merge.rc:2770
+#: Merge.rc:2772
#, c-format
msgid "Go to diff under cursor"
msgstr ""
-#: Merge.rc:2771
+#: Merge.rc:2773
#, c-format
msgid "G&oto Diff %1 of %2"
msgstr ""
-#: Merge.rc:2772
+#: Merge.rc:2774
#, c-format
msgid "G&oto Line %1"
msgstr ""
-#: Merge.rc:2778
+#: Merge.rc:2780
#, c-format
msgid "Disabled"
msgstr ""
-#: Merge.rc:2779
+#: Merge.rc:2781
#, c-format
msgid "From file system"
msgstr ""
-#: Merge.rc:2780
+#: Merge.rc:2782
#, c-format
msgid "From MRU list"
msgstr ""
-#: Merge.rc:2787
+#: Merge.rc:2789
#, c-format
msgid "ASP"
msgstr ""
-#: Merge.rc:2788
+#: Merge.rc:2790
#, c-format
msgid "Basic"
msgstr ""
-#: Merge.rc:2789
+#: Merge.rc:2791
#, c-format
msgid "Batch"
msgstr ""
-#: Merge.rc:2790
+#: Merge.rc:2792
#, c-format
msgid "C/C++"
msgstr ""
-#: Merge.rc:2791
+#: Merge.rc:2793
#, c-format
msgid "C#"
msgstr ""
-#: Merge.rc:2792
+#: Merge.rc:2794
#, c-format
msgid "CSS"
msgstr ""
-#: Merge.rc:2793
+#: Merge.rc:2795
#, c-format
msgid "DCL"
msgstr ""
-#: Merge.rc:2794
+#: Merge.rc:2796
#, c-format
msgid "Fortran"
msgstr ""
-#: Merge.rc:2795
+#: Merge.rc:2797
#, c-format
msgid "HTML"
msgstr ""
-#: Merge.rc:2796
+#: Merge.rc:2798
#, c-format
msgid "INI"
msgstr ""
-#: Merge.rc:2797
+#: Merge.rc:2799
#, c-format
msgid "InnoSetup"
msgstr ""
-#: Merge.rc:2798
+#: Merge.rc:2800
#, c-format
msgid "InstallShield"
msgstr ""
-#: Merge.rc:2799
+#: Merge.rc:2801
#, c-format
msgid "Java"
msgstr ""
-#: Merge.rc:2800
+#: Merge.rc:2802
#, c-format
msgid "AutoLISP"
msgstr ""
-#: Merge.rc:2801
+#: Merge.rc:2803
#, c-format
msgid "NSIS"
msgstr ""
-#: Merge.rc:2802
+#: Merge.rc:2804
#, c-format
msgid "Pascal"
msgstr ""
-#: Merge.rc:2803
+#: Merge.rc:2805
#, c-format
msgid "Perl"
msgstr ""
-#: Merge.rc:2804
+#: Merge.rc:2806
#, c-format
msgid "PHP"
msgstr ""
-#: Merge.rc:2805
+#: Merge.rc:2807
#, c-format
msgid "Portable Object"
msgstr ""
-#: Merge.rc:2806
+#: Merge.rc:2808
#, c-format
msgid "PowerShell"
msgstr ""
-#: Merge.rc:2807
+#: Merge.rc:2809
#, c-format
msgid "Python"
msgstr ""
-#: Merge.rc:2808
+#: Merge.rc:2810
#, c-format
msgid "REXX"
msgstr ""
-#: Merge.rc:2809
+#: Merge.rc:2811
#, c-format
msgid "Resources"
msgstr ""
-#: Merge.rc:2810
+#: Merge.rc:2812
#, c-format
msgid "Ruby"
msgstr ""
-#: Merge.rc:2811
+#: Merge.rc:2813
#, c-format
msgid "SGML"
msgstr ""
-#: Merge.rc:2812
+#: Merge.rc:2814
#, c-format
msgid "Shell"
msgstr ""
-#: Merge.rc:2813
+#: Merge.rc:2815
#, c-format
msgid "SIOD"
msgstr ""
-#: Merge.rc:2814
+#: Merge.rc:2816
#, c-format
msgid "SQL"
msgstr ""
-#: Merge.rc:2815
+#: Merge.rc:2817
#, c-format
msgid "TCL"
msgstr ""
-#: Merge.rc:2816
+#: Merge.rc:2818
#, c-format
msgid "TEX"
msgstr ""
-#: Merge.rc:2817
+#: Merge.rc:2819
#, c-format
msgid "XML"
msgstr ""
-#: Merge.rc:2822
+#: Merge.rc:2824
#, c-format
msgid "Hide the toolbar"
msgstr ""
-#: Merge.rc:2823
+#: Merge.rc:2825
#, c-format
msgid "Show small toolbar"
msgstr ""
-#: Merge.rc:2824
+#: Merge.rc:2826
#, c-format
msgid "Show big toolbar"
msgstr ""
Modified: branches/R2_10/Src/Merge.rc
===================================================================
--- branches/R2_10/Src/Merge.rc 2008-08-06 16:39:38 UTC (rev 5742)
+++ branches/R2_10/Src/Merge.rc 2008-08-06 16:42:11 UTC (rev 5743)
@@ -2068,6 +2068,8 @@
IDS_STATUS_DELETEFILES "Deleting files..."
IDS_STATUS_MOVEFILES "Moving files..."
IDS_STATUS_CREATEREPORT "Creating the report..."
+ IDS_STATUS_UNDO "Undoing the last operation..."
+ IDS_STATUS_REDO "Redoing the previous operation..."
END
// STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR)
Modified: branches/R2_10/Src/MergeEditView.cpp
===================================================================
--- branches/R2_10/Src/MergeEditView.cpp 2008-08-06 16:39:38 UTC (rev 5742)
+++ branches/R2_10/Src/MergeEditView.cpp 2008-08-06 16:42:11 UTC (rev 5743)
@@ -796,6 +796,7 @@
*/
void CMergeEditView::OnEditUndo()
{
+ WaitStatusCursor waitstatus(IDS_STATUS_UNDO);
CMergeDoc* pDoc = GetDocument();
CMergeEditView *tgt = *(pDoc->curUndo-1);
if(tgt==this)
@@ -1417,6 +1418,7 @@
*/
void CMergeEditView::OnEditRedo()
{
+ WaitStatusCursor waitstatus(IDS_STATUS_REDO);
CMergeDoc* pDoc = GetDocument();
CMergeEditView *tgt = *(pDoc->curUndo);
if(tgt==this)
Modified: branches/R2_10/Src/resource.h
===================================================================
--- branches/R2_10/Src/resource.h 2008-08-06 16:39:38 UTC (rev 5742)
+++ branches/R2_10/Src/resource.h 2008-08-06 16:42:11 UTC (rev 5743)
@@ -538,6 +538,8 @@
#define IDS_STATUS_DELETEFILES 16823
#define IDS_STATUS_MOVEFILES 16824
#define IDS_STATUS_CREATEREPORT 16825
+#define IDS_STATUS_UNDO 16826
+#define IDS_STATUS_REDO 16827
#define IDS_LINE_STATUS_INFO_EOL 16832
#define IDS_EMPTY_LINE_STATUS_INFO 16833
#define IDS_LINE_STATUS_INFO 16834
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-08-06 17:09:05
|
Revision: 5744
http://winmerge.svn.sourceforge.net/winmerge/?rev=5744&view=rev
Author: kimmov
Date: 2008-08-06 17:08:58 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
BUG: [ 2037862 ] Not possible to use command line options for external editor
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/Common/coretools.cpp
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-06 16:42:11 UTC (rev 5743)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-06 17:08:58 UTC (rev 5744)
@@ -28,6 +28,7 @@
BugFix: Could change EOL style for protected file (#2025781)
BugFix: Shift+Backspace didn't work in editor (#1153696)
BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833)
+ BugFix: External editor command line switches did not work (#2037862)
WinMerge 2.10.x (R2_10) branch created (r5561)
Modified: branches/R2_10/Src/Common/coretools.cpp
===================================================================
--- branches/R2_10/Src/Common/coretools.cpp 2008-08-06 16:42:11 UTC (rev 5743)
+++ branches/R2_10/Src/Common/coretools.cpp 2008-08-06 17:08:58 UTC (rev 5744)
@@ -1170,7 +1170,7 @@
sCmdLine.erase(clpos, clpos - sCmdLine.length());
std::string::size_type pos = sCmdLine.find(_T(" "));
- if (pos > -1)
+ if (pos != std::string.npos)
{
// First space was before switch, we don't need "s
// (executable path didn't contain spaces)
@@ -1190,7 +1190,7 @@
prevPos = pos;
pos = sCmdLine.find(_T(" "), prevPos + 1);
- if (pos > -1)
+ if (pos != std::string.npos)
{
if (sCmdLine[pos + 1] == '/' || sCmdLine[pos + 1] == '-')
{
@@ -1205,7 +1205,7 @@
if (addQuote)
{
- if (pos > -1)
+ if (pos != std::string.npos)
{
sExecutable = sCmdLine.substr(0, pos);
sDecoratedCmdLine += sExecutable;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-08-06 17:48:29
|
Revision: 5746
http://winmerge.svn.sourceforge.net/winmerge/?rev=5746&view=rev
Author: kimmov
Date: 2008-08-06 17:48:26 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
BUG: [ 2025130 ] Line Filters behave wonky
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/LineFiltersDlg.cpp
branches/R2_10/Src/LineFiltersDlg.h
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-06 17:10:45 UTC (rev 5745)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-06 17:48:26 UTC (rev 5746)
@@ -29,6 +29,7 @@
BugFix: Shift+Backspace didn't work in editor (#1153696)
BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833)
BugFix: External editor command line switches did not work (#2037862)
+ BugFix: Editing line filters updated wrong filter (#2025130)
WinMerge 2.10.x (R2_10) branch created (r5561)
Modified: branches/R2_10/Src/LineFiltersDlg.cpp
===================================================================
--- branches/R2_10/Src/LineFiltersDlg.cpp 2008-08-06 17:10:45 UTC (rev 5745)
+++ branches/R2_10/Src/LineFiltersDlg.cpp 2008-08-06 17:48:26 UTC (rev 5746)
@@ -34,6 +34,7 @@
: CPropertyPage(LineFiltersDlg::IDD)
, m_pList(NULL)
, m_bEditing(FALSE)
+, m_editedIndex(-1)
{
//{{AFX_DATA_INIT(LineFiltersDlg)
m_bIgnoreRegExp = FALSE;
@@ -168,12 +169,6 @@
sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
if (sel > -1)
{
-/* CEdit * pEdit = m_filtersList.EditLabel(sel);
- if (pEdit)
- {
- pEdit->SetFocus();
- }
-*/
CString text = m_filtersList.GetItemText(sel, 0);
m_editRegexp.SetWindowText(text);
m_editRegexp.SetReadOnly(FALSE);
@@ -181,6 +176,7 @@
m_editRegexp.SetFocus();
m_editRegexp.SetSel(0, -1);
m_bEditing = TRUE;
+ m_editedIndex = sel;
}
}
@@ -308,17 +304,13 @@
{
if (m_bEditing)
{
- int sel =- 1;
- sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
- if (sel != -1)
- {
- CString text;
- m_editRegexp.GetWindowText(text);
- m_filtersList.SetItemText(sel, 0, text);
- }
+ CString text;
+ m_editRegexp.GetWindowText(text);
+ m_filtersList.SetItemText(m_editedIndex, 0, text);
m_bEditing = FALSE;
m_editRegexp.SetReadOnly(TRUE);
m_saveRegexp.EnableWindow(FALSE);
+ m_editedIndex = -1;
}
}
Modified: branches/R2_10/Src/LineFiltersDlg.h
===================================================================
--- branches/R2_10/Src/LineFiltersDlg.h 2008-08-06 17:10:45 UTC (rev 5745)
+++ branches/R2_10/Src/LineFiltersDlg.h 2008-08-06 17:48:26 UTC (rev 5746)
@@ -71,6 +71,7 @@
LineFiltersList * m_pList; /**< Helper list for getting/setting filters. */
BOOL m_bEditing; /**< Are we editing a filter string? */
+ int m_editedIndex; /**< Index of the item being edited. */
};
//{{AFX_INSERT_LOCATION}}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-08-08 15:19:05
|
Revision: 5766
http://winmerge.svn.sourceforge.net/winmerge/?rev=5766&view=rev
Author: kimmov
Date: 2008-08-08 15:19:00 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
PATCH: [ 2039929 ] update ChineseTraditional.po from revision 5739
Submitted by wck3
Revision Links:
--------------
http://winmerge.svn.sourceforge.net/winmerge/?rev=5739&view=rev
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/Languages/ChineseTraditional.po
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-08 15:06:54 UTC (rev 5765)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-08 15:19:00 UTC (rev 5766)
@@ -30,6 +30,8 @@
BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833)
BugFix: External editor command line switches did not work (#2037862)
BugFix: Editing line filters updated wrong filter (#2025130)
+ Translation updates:
+ - Chinese Traditional (#2039929)
WinMerge 2.10.x (R2_10) branch created (r5561)
Modified: branches/R2_10/Src/Languages/ChineseTraditional.po
===================================================================
--- branches/R2_10/Src/Languages/ChineseTraditional.po 2008-08-08 15:06:54 UTC (rev 5765)
+++ branches/R2_10/Src/Languages/ChineseTraditional.po 2008-08-08 15:19:00 UTC (rev 5766)
@@ -72,7 +72,7 @@
#: Merge.rc:81
#: Merge.rc:103
-#: Merge.rc:496
+#: Merge.rc:504
#, c-format
msgid "&Copy"
msgstr "\xBDƻs(&C)"
@@ -84,7 +84,7 @@
msgstr "\xB6K\xA4W(&P)"
#: Merge.rc:84
-#: Merge.rc:577
+#: Merge.rc:585
#, c-format
msgid "&Goto..."
msgstr "\xB8\xF5\xA6\xDC(&G)..."
@@ -95,62 +95,64 @@
msgstr "\xB6}\xB1\xD2(&E)"
#: Merge.rc:88
-#: Merge.rc:519
-#: Merge.rc:525
+#: Merge.rc:527
+#: Merge.rc:533
#, c-format
msgid "with &Registered Application"
msgstr "\xA5εn\xBF\xFD\xAA\xBA\xC0\xB3\xA5ε{\xA6\xA1(&R)"
#: Merge.rc:89
-#: Merge.rc:520
-#: Merge.rc:526
+#: Merge.rc:528
+#: Merge.rc:534
#, c-format
msgid "with &External Editor"
msgstr "\xA5Υ~\xA6b\xBDs\xBF边(&E)"
#: Merge.rc:90
-#: Merge.rc:521
-#: Merge.rc:527
+#: Merge.rc:529
+#: Merge.rc:535
#, c-format
msgid "&with..."
msgstr "\xA5\xCE(&W)..."
#: Merge.rc:110
-#: Merge.rc:189
-#: Merge.rc:303
+#: Merge.rc:191
+#: Merge.rc:308
#, c-format
msgid "&File"
msgstr "\xC0ɮ\xD7(&F)"
#: Merge.rc:112
-#: Merge.rc:191
-#: Merge.rc:305
+#: Merge.rc:193
+#: Merge.rc:310
#, c-format
msgid "&New\tCtrl+N"
msgstr "\xB7s\xBCW(&N)\tCtrl+N"
#: Merge.rc:113
-#: Merge.rc:192
-#: Merge.rc:306
+#: Merge.rc:194
+#: Merge.rc:311
#, c-format
msgid "&Open...\tCtrl+O"
msgstr "\xB6}\xB1\xD2(&O)...\tCtrl+O"
#: Merge.rc:114
+#: Merge.rc:195
+#: Merge.rc:312
#, c-format
msgid "Op&en Conflict File..."
msgstr "\xB6}\xB1ҽĬ\xF0\xC0\xC9(&E)..."
#: Merge.rc:116
-#: Merge.rc:194
-#: Merge.rc:308
+#: Merge.rc:197
+#: Merge.rc:314
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "\xB6}\xB1ұM\xAE\xD7(&J)...\tCtrl+J"
#: Merge.rc:117
-#: Merge.rc:195
-#: Merge.rc:309
+#: Merge.rc:198
+#: Merge.rc:315
#, c-format
msgid "Sa&ve Project..."
msgstr "\xC0x\xA6s\xB1M\xAE\xD7(&V)..."
@@ -161,1859 +163,1873 @@
msgstr "\xB3̪\xF1\xB6}\xB1Ҫ\xBA\xB1M\xAE\xD7"
#: Merge.rc:121
-#: Merge.rc:202
-#: Merge.rc:341
+#: Merge.rc:205
+#: Merge.rc:347
#, c-format
msgid "E&xit"
msgstr "\xB5\xB2\xA7\xF4(&X)"
#: Merge.rc:123
-#: Merge.rc:204
-#: Merge.rc:343
+#: Merge.rc:207
+#: Merge.rc:349
#, c-format
msgid "&Edit"
msgstr "\xBDs\xBF\xE8(&E)"
#: Merge.rc:125
-#: Merge.rc:208
-#: Merge.rc:377
+#: Merge.rc:211
+#: Merge.rc:383
#, c-format
msgid "&Options..."
msgstr "\xBFﶵ(&O)..."
#: Merge.rc:127
-#: Merge.rc:210
-#: Merge.rc:379
+#: Merge.rc:213
+#: Merge.rc:385
#, c-format
msgid "&View"
msgstr "\xC0˵\xF8(&V)"
#: Merge.rc:129
-#: Merge.rc:221
-#: Merge.rc:381
+#: Merge.rc:224
+#: Merge.rc:387
#, c-format
msgid "Select &Font..."
msgstr "\xBF\xEF\xA8\xFA\xA6r\xAB\xAC(&F)..."
#: Merge.rc:130
-#: Merge.rc:222
-#: Merge.rc:382
+#: Merge.rc:225
+#: Merge.rc:388
#, c-format
msgid "Use Default F&ont"
msgstr "\xA8ϥιw\xB3]\xA6r\xAB\xAC(&O)"
#: Merge.rc:132
-#: Merge.rc:224
-#: Merge.rc:403
+#: Merge.rc:227
+#: Merge.rc:409
#, c-format
msgid "&Toolbar"
msgstr "\xA4u\xA8\xE3\xA6C(&T)"
#: Merge.rc:134
-#: Merge.rc:226
-#: Merge.rc:405
+#: Merge.rc:229
+#: Merge.rc:411
#, c-format
msgid "&None"
msgstr "\xC3\xF6\xB3\xAC(&N)"
#: Merge.rc:135
-#: Merge.rc:227
-#: Merge.rc:406
+#: Merge.rc:230
+#: Merge.rc:412
#, c-format
msgid "&Small"
msgstr "\xA4p\xB9ϥ\xDC(&S)"
#: Merge.rc:136
-#: Merge.rc:228
-#: Merge.rc:407
+#: Merge.rc:231
+#: Merge.rc:413
#, c-format
msgid "&Big"
msgstr "\xA4j\xB9ϥ\xDC(&B)"
#: Merge.rc:138
-#: Merge.rc:230
-#: Merge.rc:409
+#: Merge.rc:233
+#: Merge.rc:415
#, c-format
msgid "&Status Bar"
msgstr "\xAA\xAC\xBAA\xA6C(&S)"
#: Merge.rc:139
-#: Merge.rc:231
-#: Merge.rc:410
+#: Merge.rc:234
+#: Merge.rc:416
#, c-format
msgid "Ta&b Bar"
msgstr "\xAD\xB6\xC5ҦC(&B)"
#: Merge.rc:141
-#: Merge.rc:234
-#: Merge.rc:414
+#: Merge.rc:237
+#: Merge.rc:420
#, c-format
msgid "&Language..."
msgstr "\xBBy\xA8\xA5(&L)..."
#: Merge.rc:143
-#: Merge.rc:255
-#: Merge.rc:436
+#: Merge.rc:258
+#: Merge.rc:442
#, c-format
msgid "&Tools"
msgstr "\xA4u\xA8\xE3(&T)"
#: Merge.rc:145
-#: Merge.rc:258
-#: Merge.rc:438
+#: Merge.rc:261
+#: Merge.rc:444
#, c-format
msgid "&Filters..."
msgstr "\xBFz\xBFﾹ(&F)..."
#: Merge.rc:146
-#: Merge.rc:259
-#: Merge.rc:439
+#: Merge.rc:262
+#: Merge.rc:445
#, c-format
msgid "&Generate Patch..."
msgstr "\xB2\xA3\xA5ɺ\xF3(&G)..."
#: Merge.rc:148
-#: Merge.rc:262
-#: Merge.rc:442
+#: Merge.rc:265
+#: Merge.rc:448
#, c-format
msgid "&Plugins"
msgstr "\xA5~\xB1\xBE(&P)"
-# "\xA4\xE2\xB0ʸ\xD1\xC0\xA3\xC1Y(&M)"
#: Merge.rc:150
-#: Merge.rc:264
-#: Merge.rc:444
+#: Merge.rc:267
+#: Merge.rc:450
#, c-format
+msgid "&List..."
+msgstr ""
+
+# "\xA4\xE2\xB0ʸ\xD1\xC0\xA3\xC1Y(&M)"
+#: Merge.rc:152
+#: Merge.rc:269
+#: Merge.rc:452
+#, c-format
msgid "&Manual Unpacking"
msgstr "\xA4\xE2\xB0ʸѶ}\xABD\xAF¤\xE5\xA6r\xC0\xC9(&M)"
# "\xA6۰ʸ\xD1\xC0\xA3\xC1Y(&A)"
-#: Merge.rc:151
-#: Merge.rc:265
-#: Merge.rc:445
+#: Merge.rc:153
+#: Merge.rc:270
+#: Merge.rc:453
#, c-format
msgid "&Automatic Unpacking"
msgstr "\xA6۰ʸѶ}\xABD\xAF¤\xE5\xA6r\xC0\xC9(&A)"
-# Is this message correct? Because the unpacker here is not a editor.
-#: Merge.rc:153
-#: Merge.rc:267
-#: Merge.rc:447
+# Is this message correct? Because the unpacker here is not a editor. Perhaps "Edit After Unpacking"?
+#: Merge.rc:155
+#: Merge.rc:272
+#: Merge.rc:455
#, c-format
msgid "&Edit with Unpacker"
msgstr "\xA5H\xB8ѥ]\xBE\xB9\xBDs\xBF\xE8(&E)"
-#: Merge.rc:155
-#: Merge.rc:269
-#: Merge.rc:454
+#: Merge.rc:157
+#: Merge.rc:274
+#: Merge.rc:462
#, c-format
msgid "&Reload plugins"
msgstr "\xAD\xAB\xB7s\xB8\xFC\xA4J\xA5~\xB1\xBE(&R)"
-#: Merge.rc:157
-#: Merge.rc:271
-#: Merge.rc:456
+#: Merge.rc:159
+#: Merge.rc:276
+#: Merge.rc:464
#, c-format
msgid "&Debug"
msgstr "\xB0\xA3\xBF\xF9(&D)"
-#: Merge.rc:159
-#: Merge.rc:273
-#: Merge.rc:458
+#: Merge.rc:161
+#: Merge.rc:278
+#: Merge.rc:466
#, c-format
msgid "&Load Config..."
msgstr "\xB8\xFC\xA4J\xB2պA(&L)..."
-#: Merge.rc:160
-#: Merge.rc:274
-#: Merge.rc:459
+#: Merge.rc:162
+#: Merge.rc:279
+#: Merge.rc:467
#, c-format
msgid "&Reset Options"
msgstr "\xAB\xEC\xB4_\xAD\xEC\xA9l\xB3]\xA9w(&R)"
-#: Merge.rc:162
-#: Merge.rc:276
-#: Merge.rc:461
+#: Merge.rc:164
+#: Merge.rc:281
+#: Merge.rc:469
#, c-format
msgid "&Window"
msgstr "\xB5\xF8\xB5\xA1(&W)"
-#: Merge.rc:164
-#: Merge.rc:278
-#: Merge.rc:463
+#: Merge.rc:166
+#: Merge.rc:283
+#: Merge.rc:471
#, c-format
msgid "Cl&ose"
msgstr "\xC3\xF6\xB3\xAC(&O)"
-#: Merge.rc:165
-#: Merge.rc:279
-#: Merge.rc:464
+#: Merge.rc:167
+#: Merge.rc:284
+#: Merge.rc:472
#, c-format
msgid "Clo&se All"
msgstr "\xC3\x{1B3B25}\xFE\xB3\xA1(&S)"
-#: Merge.rc:167
-#: Merge.rc:281
-#: Merge.rc:466
+#: Merge.rc:169
+#: Merge.rc:286
+#: Merge.rc:474
#, c-format
msgid "Change &Pane\tF6"
msgstr "\xA4\xC1\xB4\xAB\xB5\xA1\xAE\xE6(&P)\tF6"
-#: Merge.rc:169
-#: Merge.rc:283
-#: Merge.rc:468
+#: Merge.rc:171
+#: Merge.rc:288
+#: Merge.rc:476
#, c-format
msgid "Tile &Horizontally"
msgstr "\xA4\x{125B68}ñ\xC6(&H)"
-#: Merge.rc:170
-#: Merge.rc:284
-#: Merge.rc:469
+#: Merge.rc:172
+#: Merge.rc:289
+#: Merge.rc:477
#, c-format
msgid "Tile &Vertically"
msgstr "\xAB\xAB\xAA\xBD\xA8ñ\xC6(&V)"
-#: Merge.rc:171
-#: Merge.rc:285
-#: Merge.rc:470
+#: Merge.rc:173
+#: Merge.rc:290
+#: Merge.rc:478
#, c-format
msgid "&Cascade"
msgstr "\xC5|\xB8m(&C)"
-#: Merge.rc:173
-#: Merge.rc:287
-#: Merge.rc:472
-#: Merge.rc:1891
+#: Merge.rc:175
+#: Merge.rc:292
+#: Merge.rc:480
+#: Merge.rc:1913
#, c-format
msgid "&Help"
msgstr "\xBB\xA1\xA9\xFA(&H)"
-#: Merge.rc:175
-#: Merge.rc:289
-#: Merge.rc:474
+#: Merge.rc:177
+#: Merge.rc:294
+#: Merge.rc:482
#, c-format
msgid "&WinMerge Help\tF1"
msgstr "WinMerge \xBB\xA1\xA9\xFA(&W)\tF1"
-#: Merge.rc:177
-#: Merge.rc:291
-#: Merge.rc:476
+#: Merge.rc:179
+#: Merge.rc:296
+#: Merge.rc:484
#, c-format
msgid "R&elease Notes"
msgstr "\xB5o\xA6满\xA9\xFA(&E)"
-#: Merge.rc:178
-#: Merge.rc:292
-#: Merge.rc:477
+#: Merge.rc:180
+#: Merge.rc:297
+#: Merge.rc:485
#, c-format
msgid "&Translations"
msgstr "½Ķ(&T)"
-#: Merge.rc:179
-#: Merge.rc:293
-#: Merge.rc:478
+#: Merge.rc:181
+#: Merge.rc:298
+#: Merge.rc:486
#, c-format
msgid "C&onfiguration"
msgstr "\xB2պA(&O)"
-#: Merge.rc:180
-#: Merge.rc:294
-#: Merge.rc:479
+#: Merge.rc:182
+#: Merge.rc:299
+#: Merge.rc:487
#, c-format
msgid "A&rchive Support disabled..."
msgstr "\xC3\xF6\xB3\xAC\xC0\xA3\xC1Y\xA4䴩(&R)..."
-#: Merge.rc:182
-#: Merge.rc:296
-#: Merge.rc:481
+#: Merge.rc:184
+#: Merge.rc:301
+#: Merge.rc:489
#, c-format
msgid "&GNU General Public License"
msgstr "GNU \xA4\xBD\xA6@\xB1\xC2\xC5v\xC3\xD2(&G)"
-#: Merge.rc:183
-#: Merge.rc:297
-#: Merge.rc:482
+#: Merge.rc:185
+#: Merge.rc:302
+#: Merge.rc:490
#, c-format
msgid "&About WinMerge..."
msgstr "\xC3\xF6\xA9\xF3 WinMerge(&A)..."
-#: Merge.rc:197
-#: Merge.rc:327
+#: Merge.rc:200
+#: Merge.rc:333
#, c-format
msgid "L&eft Read-only"
msgstr "\xA5\xAA\xC3\xE4\xB0\xDFŪ(&E)"
-#: Merge.rc:198
-#: Merge.rc:328
+#: Merge.rc:201
+#: Merge.rc:334
#, c-format
msgid "Ri&ght Read-only"
msgstr "\xA5k\xC3\xE4\xB0\xDFŪ(&G)"
-#: Merge.rc:200
+#: Merge.rc:203
#, c-format
msgid "File En&coding"
msgstr "\xC0ɮs\xBDX(&C)"
-#: Merge.rc:206
-#: Merge.rc:353
+#: Merge.rc:209
+#: Merge.rc:359
#, c-format
msgid "Select &All\tCtrl+A"
msgstr "\xA5\xFE\xBF\xEF(&A)\tCtrl+A"
-#: Merge.rc:212
+#: Merge.rc:215
#, c-format
msgid "Show &Identical Items"
msgstr "\xC5\xE3\xA5ܬۦP\xB6\xB5\xA5\xD8(&I)"
-#: Merge.rc:213
+#: Merge.rc:216
#, c-format
msgid "Show &Different Items"
msgstr "\xC5\xE3\xA5ܬ۲\xA7\xB6\xB5\xA5\xD8(&D)"
-#: Merge.rc:214
+#: Merge.rc:217
#, c-format
msgid "Show L&eft Unique Items"
msgstr "\xC5\xE3\xA5ܥ\xAA\xC3\xE4\xBFW\xA6\xB3\xB6\xB5\xA5\xD8(&E)"
-#: Merge.rc:215
+#: Merge.rc:218
#, c-format
msgid "Show Ri&ght Unique Items"
msgstr "\xC5\xE3\xA5ܥk\xC3\xE4\xBFW\xA6\xB3\xB6\xB5\xA5\xD8(&G)"
-#: Merge.rc:216
+#: Merge.rc:219
#, c-format
msgid "Show S&kipped Items"
msgstr "\xC5\xE3\xA5ܲ\xA4\xB9L\xAA\xBA\xB6\xB5\xA5\xD8(&K)"
-#: Merge.rc:217
+#: Merge.rc:220
#, c-format
msgid "S&how Binary Files"
msgstr "\xC5\xE3\xA5ܤG\xB6i\xA8\xEE\xC0ɮ\xD7(&H)"
-#: Merge.rc:219
+#: Merge.rc:222
#, c-format
msgid "Show Hidd&en Items"
msgstr "\xC5\xE3\xA5\xDC\xC1\xF4\xC2ö\xB5\xA5\xD8(&E)"
-#: Merge.rc:232
+#: Merge.rc:235
#, c-format
msgid "Compa&re Statistics"
msgstr "\xB2έp\xA4\xF1\xB8\xFB\xB5\xB2\xAAG(&R)"
-#: Merge.rc:236
-#: Merge.rc:416
+#: Merge.rc:239
+#: Merge.rc:422
#, c-format
msgid "Refre&sh\tF5"
msgstr "\xAD\xAB\xBE\xE3(&S)\tF5"
-#: Merge.rc:237
+#: Merge.rc:240
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr "\xAD\xAB\xBE\xE3\xBCХܰ\xCF(&R)\tCtrl+F5"
-#: Merge.rc:239
-#: Merge.rc:418
+#: Merge.rc:242
+#: Merge.rc:424
#, c-format
msgid "&Merge"
msgstr "\xA6X\xA8\xD6(&M)"
-#: Merge.rc:241
+#: Merge.rc:244
#, c-format
msgid "Co&mpare\tEnter"
msgstr "\xA4\xF1\xB8\xFB(&M)\tEnter"
-#: Merge.rc:243
-#: Merge.rc:420
+#: Merge.rc:246
+#: Merge.rc:426
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr "\xA4U\xA4@\xAC۲\xA7(&N)\tAlt+Down"
-#: Merge.rc:244
-#: Merge.rc:421
+#: Merge.rc:247
+#: Merge.rc:427
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr "\xA4W\xA4@\xAC۲\xA7(&P)\tAlt+Up"
-#: Merge.rc:246
-#: Merge.rc:423
+#: Merge.rc:249
+#: Merge.rc:429
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr "\xB3̪\xEC\xAC۲\xA7(&F)\tAlt+Home"
-#: Merge.rc:247
-#: Merge.rc:424
+#: Merge.rc:250
+#: Merge.rc:430
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr "\xA5ثe\xAC۲\xA7(&C)\tAlt+Enter"
-#: Merge.rc:248
-#: Merge.rc:425
+#: Merge.rc:251
+#: Merge.rc:431
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr "\xB3̥\xBD\xAC۲\xA7(&L)\tAlt+End"
-#: Merge.rc:250
-#: Merge.rc:427
+#: Merge.rc:253
+#: Merge.rc:433
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr "\xBDƻs\xA8\xEC\xA5k\xC3\xE4(&R)\tAlt+Right"
-#: Merge.rc:251
-#: Merge.rc:428
+#: Merge.rc:254
+#: Merge.rc:434
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr "\xBDƻs\xA8쥪\xC3\xE4(&E)\tAlt+Left"
-#: Merge.rc:253
+#: Merge.rc:256
#, c-format
msgid "&Delete\tDel"
msgstr "\xA7R\xB0\xA3(&D)\tDel"
-#: Merge.rc:257
-#: Merge.rc:550
+#: Merge.rc:260
+#: Merge.rc:558
#, c-format
msgid "&Customize Columns..."
msgstr "\xA6ۭq\xC4\xE6\xA6\xEC(&C)..."
-#: Merge.rc:260
-#: Merge.rc:440
+#: Merge.rc:263
+#: Merge.rc:446
#, c-format
msgid "Generate &Report..."
msgstr "\xB2\xA3\xA5ͳ\xF8\xA7i(&R)..."
-#: Merge.rc:311
+#: Merge.rc:317
#, c-format
msgid "&Save\tCtrl+S"
msgstr "\xC0x\xA6s(&S)\tCtrl+S"
-#: Merge.rc:312
+#: Merge.rc:318
#, c-format
msgid "Save &Left"
msgstr "\xC0x\xA6s\xA5\xAA\xC3\xE4(&L)"
-#: Merge.rc:314
-#: Merge.rc:319
+#: Merge.rc:320
+#: Merge.rc:325
#, c-format
msgid "&Save"
msgstr "\xC0x\xA6s(&S)"
-#: Merge.rc:315
-#: Merge.rc:320
+#: Merge.rc:321
+#: Merge.rc:326
#, c-format
msgid "Save &As..."
msgstr "\xA5t\xA6s\xB7s\xC0\xC9(&A)..."
-#: Merge.rc:317
+#: Merge.rc:323
#, c-format
msgid "Save &Right"
msgstr "\xC0x\xA6s\xA5k\xC3\xE4(&R)"
-#: Merge.rc:323
+#: Merge.rc:329
#, c-format
msgid "&Print..."
msgstr "\xA6C\xA6L(&P)..."
-#: Merge.rc:324
+#: Merge.rc:330
#, c-format
msgid "Page Se&tup"
msgstr "\xB3]\xA9w\xA6C\xA6L\xAE榡(&T)"
-#: Merge.rc:325
+#: Merge.rc:331
#, c-format
msgid "Print Previe&w"
msgstr "\xB9w\xC4\xFD\xA6C\xA6L(&R)"
-#: Merge.rc:330
+#: Merge.rc:336
#, c-format
msgid "&Convert Line Endings to"
msgstr "\xC2ഫ\xA6\xE6\xA7\xC0\xA6r\xA4\xB8\xA6\xA8(&C)"
-#: Merge.rc:332
+#: Merge.rc:338
#, c-format
msgid "&Windows (CRLF)"
msgstr "&Windows (CRLF)"
-#: Merge.rc:333
+#: Merge.rc:339
#, c-format
msgid "&Unix (LF)"
msgstr "&Unix (LF)"
-#: Merge.rc:334
+#: Merge.rc:340
#, c-format
msgid "&Mac (CR)"
msgstr "&Mac (CR)"
-#: Merge.rc:337
+#: Merge.rc:343
#, c-format
msgid "&Merge Mode\tF9"
msgstr "\xB6}/\xC3\xF6\xA6X\xA8ּҦ\xA1(&M)\tF9"
-#: Merge.rc:339
+#: Merge.rc:345
#, c-format
msgid "&File Encoding..."
msgstr "\xC0ɮs\xBDX(&F)..."
-#: Merge.rc:345
+#: Merge.rc:351
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr "\xB4_\xAD\xEC(&U)\tCtrl+Z"
-#: Merge.rc:346
+#: Merge.rc:352
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr "\xA6A\xB0\xB5(&R)\tCtrl+Y"
-#: Merge.rc:348
+#: Merge.rc:354
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr "\xB0ŤU(&U)\tCtrl+X"
-#: Merge.rc:349
+#: Merge.rc:355
#, c-format
msgid "&Copy\tCtrl+C"
msgstr "\xBDƻs(&C)\tCtrl+C"
-#: Merge.rc:350
+#: Merge.rc:356
#, c-format
msgid "&Paste\tCtrl+V"
msgstr "\xB6K\xA4W(&P)\tCtrl+V"
-#: Merge.rc:352
+#: Merge.rc:358
#, c-format
msgid "Select Line &Difference\tF4"
msgstr "\xBF\xEF\xA8\xFA\xA6椺\xAEt\xB2\xA7(&D)\tF4"
-#: Merge.rc:355
+#: Merge.rc:361
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "\xB4M\xA7\xE4(&I)...\tCtrl+F"
-#: Merge.rc:356
+#: Merge.rc:362
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr "\xA8\xFA\xA5N(&C)...\tCtrl+H"
-#: Merge.rc:358
+#: Merge.rc:364
#, c-format
msgid "&Scripts"
msgstr "\xC0HĶ\xA7Y\xA6\xE6\xBDX(&S)"
-#: Merge.rc:360
-#: Merge.rc:2707
+#: Merge.rc:366
+#: Merge.rc:2752
#, c-format
msgid "< Empty >"
msgstr "< \xB5L >"
-#: Merge.rc:363
+#: Merge.rc:369
#, c-format
msgid "Advanced"
msgstr "\xB6i\xB6\xA5"
-#: Merge.rc:365
+#: Merge.rc:371
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "\xB3s\xA6P\xA6渹\xBDƻs(&C)\tCtrl+Shift+C"
-#: Merge.rc:368
+#: Merge.rc:374
#, c-format
msgid "&Bookmarks"
msgstr "\xAE\xD1\xC5\xD2(&B)"
-#: Merge.rc:370
+#: Merge.rc:376
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "\xA9\xF1\xB8m/\xB2M\xB0\xA3\xAE\xD1\xC5\xD2(&T)\tCtrl+F2"
-#: Merge.rc:371
+#: Merge.rc:377
#, c-format
msgid "&Next Bookmark\tF2"
msgstr "\xA4U\xA4@\xAE\xD1\xC5\xD2(&N)\tF2"
-#: Merge.rc:372
+#: Merge.rc:378
#, c-format
msgid "&Previous bookmark\tShift+F2"
msgstr "\xA4W\xA4@\xAE\xD1\xC5\xD2(&P)\tShift+F2"
-#: Merge.rc:373
+#: Merge.rc:379
#, c-format
msgid "&Clear All Bookmarks"
msgstr "\xB2M\xB0\xA3\xA5\xFE\xB3\xA1\xAE\xD1\xC5\xD2(&C)"
-#: Merge.rc:375
+#: Merge.rc:381
#, c-format
msgid "&Go To...\tCtrl+G"
msgstr "\xB2\xBE\xA6\xDC(&G)...\tCtrl+G"
-#: Merge.rc:383
+#: Merge.rc:389
#, c-format
msgid "&Zoom"
msgstr "\xA9Ԫ\xF1\xA9Ի\xB7(&Z)"
-#: Merge.rc:385
+#: Merge.rc:391
#, c-format
msgid "Zoom &In\tCtrl++"
msgstr "\xA9Ԫ\xF1(&I)\tCtrl++"
-#: Merge.rc:386
+#: Merge.rc:392
#, c-format
msgid "Zoom &Out\tCtrl+-"
msgstr "\xB1\xC0\xBB\xB7(&O)\tCtrl+-"
#. Zoom to normal
-#: Merge.rc:387
+#: Merge.rc:393
#, c-format
msgid "&Normal\tCtrl+*"
msgstr "\xAB\xEC\xB4_\xAD\xEC\xA9l(&N)\tCtrl+*"
-#: Merge.rc:389
+#: Merge.rc:395
#, c-format
msgid "Syntax Highlight"
msgstr "\xBBy\xAAk\xB0\xAA\xABG\xAB\xD7\xC5\xE3\xA5\xDC"
-#: Merge.rc:394
+#: Merge.rc:400
#, c-format
msgid "&Lock Panes"
msgstr "\xC2\xEA\xA6\x{DD61}\xAE\xE6(&L)"
-#: Merge.rc:395
+#: Merge.rc:401
#, c-format
msgid "&View Whitespace"
msgstr "\xC0˵\xF8\xAAťթM\xB8\xF5\xAE\xE6(&V)"
-#: Merge.rc:396
+#: Merge.rc:402
#, c-format
msgid "Vie&w Line Differences"
msgstr "\xC0˵\xF8\xA6椺\xAEt\xB2\xA7(&W)"
-#: Merge.rc:397
+#: Merge.rc:403
#, c-format
msgid "View Line &Numbers"
msgstr "\xC0˵\xF8\xA6渹(&N)"
-#: Merge.rc:398
+#: Merge.rc:404
#, c-format
msgid "View &Margins"
msgstr "\xC0˵\xF8\xAD\xB6\xC3\xE4(&M)"
-#: Merge.rc:399
+#: Merge.rc:405
#, c-format
msgid "W&rap Lines"
msgstr "\xA6۰ʴ\xAB\xA6\xE6(&R)"
-#: Merge.rc:401
+#: Merge.rc:407
#, c-format
msgid "Sw&ap Panes"
msgstr "\xB5\xA1\xAE洫\xA6\xEC(&A)"
-#: Merge.rc:411
+# I would suggest "Microview Pane"
+# \xAEt\xB2\xA7\xB5\xA1\xAE\xE6(&P)
+#: Merge.rc:417
#, c-format
msgid "Diff &Pane"
msgstr "\xAEt\xB2\xA7\xB5\xA1\xAE\xE6(&P)"
-#: Merge.rc:412
+# I would suggest "Macroview Pane".
+# \xA6\xEC\xB8m\xB5\xA1\xAE\xE6
+#: Merge.rc:418
#, c-format
msgid "Lo&cation Pane"
-msgstr "\xA6\xEC\xB8m\xB5\xA1\xAE\xE6(&P)"
+msgstr "\xBB\xB7\xB1浡\xAE\xE6(&P)"
-#: Merge.rc:430
+#: Merge.rc:436
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
msgstr "\xBDƻs\xA8\xEC\xA5k\xC3\xE4\xAB\xE1\xA8\xEC\xA4U\xA4@\xAD\xD3(&O)\tAlt+Ctrl+Right"
-#: Merge.rc:431
+#: Merge.rc:437
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
msgstr "\xBDƻs\xA8쥪\xC3\xE4\xAB\xE1\xA8\xEC\xA4U\xA4@\xAD\xD3(&T)\tAlt+Ctrl+Left"
-#: Merge.rc:433
+#: Merge.rc:439
#, c-format
msgid "Copy &All to Right"
msgstr "\xA5\xFE\xB3\xA1\xBDƻs\xA8\xEC\xA5k\xC3\xE4(&A)"
-#: Merge.rc:434
+#: Merge.rc:440
#, c-format
msgid "Cop&y All to Left"
msgstr "\xA5\xFE\xB3\xA1\xBDƻs\xA8쥪\xC3\xE4(&Y)"
-#: Merge.rc:449
+#: Merge.rc:457
#, c-format
msgid "&Prediffer"
msgstr "\xA5\xFD\xA6\xE6\xB3B\xB2z\xBE\xB9(&P)"
-#: Merge.rc:490
+#: Merge.rc:498
#, c-format
msgid "Comp&are"
msgstr "\xA4\xF1\xB8\xFB(&A)"
-#: Merge.rc:491
+#: Merge.rc:499
#, c-format
msgid "Co&mpare Special"
msgstr "\xA4\xF1\xB8\xFB\xAFS\xA9w\xAE榡(&M)"
-#: Merge.rc:493
+#: Merge.rc:501
#, c-format
msgid "&XML"
msgstr "&XML"
-#: Merge.rc:498
+#: Merge.rc:506
#, c-format
msgid "&Left to Right"
msgstr "\xA5\xAA\xC3\xE4\xA8\xEC\xA5k\xC3\xE4(&L)"
-#: Merge.rc:499
+#: Merge.rc:507
#, c-format
msgid "L&eft to..."
msgstr "\xA5\xAA\xC3\xE4\xA8\xEC(&E)..."
-#: Merge.rc:500
+#: Merge.rc:508
#, c-format
msgid "&Right to Left"
msgstr "\xA5k\xC3\xE4\xA8쥪\xC3\xE4(&R)"
-#: Merge.rc:501
+#: Merge.rc:509
#, c-format
msgid "R&ight to..."
msgstr "\xA5k\xC3\xE4\xA8\xEC(&I)..."
-#: Merge.rc:503
+#: Merge.rc:511
#, c-format
msgid "&Move"
msgstr "\xB2\xBE\xB0\xCA(&M)"
-#: Merge.rc:505
+#: Merge.rc:513
#, c-format
msgid "&Left to..."
msgstr "\xA5\xAA\xC3\xE4\xA8\xEC(&L)..."
-#: Merge.rc:506
+#: Merge.rc:514
#, c-format
msgid "&Right to..."
msgstr "\xA5k\xC3\xE4\xA8\xEC(&R)..."
-#: Merge.rc:508
+#: Merge.rc:516
#, c-format
msgid "&Delete"
msgstr "\xA7R\xB0\xA3(&D)"
-#: Merge.rc:510
-#: Merge.rc:1128
-#: Merge.rc:1510
+#: Merge.rc:518
+#: Merge.rc:1136
+#: Merge.rc:1518
#, c-format
msgid "&Left"
msgstr "\xA5\xAA\xC3\xE4(&L)"
-#: Merge.rc:511
-#: Merge.rc:1130
-#: Merge.rc:1513
+#: Merge.rc:519
+#: Merge.rc:1138
+#: Merge.rc:1521
#, c-format
msgid "&Right"
msgstr "\xA5k\xC3\xE4(&R)"
-#: Merge.rc:512
+#: Merge.rc:520
#, c-format
msgid "&Both"
msgstr "\xA8\xE2\xC3\xE4(&B)"
-#: Merge.rc:514
+#: Merge.rc:522
#, c-format
msgid "Re&name"
msgstr "\xAD\xAB\xB7s\xA9R\xA6W(&N)"
-#: Merge.rc:515
+#: Merge.rc:523
#, c-format
msgid "&Hide Items"
msgstr "\xC1\xF4\xC2\xC3\xC0ɮ\xD7(&H)"
-#: Merge.rc:517
+#: Merge.rc:525
#, c-format
msgid "&Open Left"
msgstr "\xB6}\xB1ҥ\xAA\xC3\xE4(&O)"
-#: Merge.rc:523
+#: Merge.rc:531
#, c-format
msgid "O&pen Right"
msgstr "\xB6}\xB1ҥk\xC3\xE4(&P)"
-#: Merge.rc:530
+#: Merge.rc:538
#, c-format
msgid "Cop&y Pathnames"
msgstr "\xBDƻs\xAE|\xA6W(&Y)"
-#: Merge.rc:532
+#: Merge.rc:540
#, c-format
msgid "&Left (%1 of %2)"
msgstr "\xA5\xAA\xC3\xE4(&L) (%2 \xA4\xA7 %1)"
-#: Merge.rc:533
+#: Merge.rc:541
#, c-format
msgid "&Right (%1 of %2)"
msgstr "\xA5k\xC3\xE4(&R) (%2 \xA4\xA7 %1)"
-#: Merge.rc:534
+#: Merge.rc:542
#, c-format
msgid "&Both (%1 of %2)"
msgstr "\xA8\xE2\xC3\xE4(&B) (%2 \xA4\xA7 %1)"
-#: Merge.rc:536
+#: Merge.rc:544
#, c-format
msgid "Copy &Filenames"
msgstr "\xBDƻs\xC0ɦW(&F)"
-#: Merge.rc:538
+#: Merge.rc:546
#, c-format
msgid "&Zip"
msgstr "Zip(&Z)"
-#: Merge.rc:540
+#: Merge.rc:548
#, c-format
msgid "&Left... (%1 of %2)"
msgstr "\xA5\xAA\xC3\xE4(&L)... (%2 \xA4\xA7 %1)"
-#: Merge.rc:541
+#: Merge.rc:549
#, c-format
msgid "&Right... (%1 of %2)"
msgstr "\xA5k\xC3\xE4(&R)... (%2 \xA4\xA7 %1)"
-#: Merge.rc:542
+#: Merge.rc:550
#, c-format
msgid "&Both... (%1 of %2)"
msgstr "\xA8\xE2\xC3\xE4(&B)... (%2 \xA4\xA7 %1)"
-#: Merge.rc:543
+#: Merge.rc:551
#, c-format
msgid "&Differences... (%1 of %2)"
msgstr "\xAC۲\xA7\xAA\xCC(&D)... (%2 \xA4\xA7 %1)"
-#: Merge.rc:546
+#: Merge.rc:554
#, c-format
msgid "&Refresh"
msgstr "\xAD\xAB\xBE\xE3(&R)"
-#: Merge.rc:558
+#: Merge.rc:566
#, c-format
msgid "&Copy Full Path"
msgstr "\xBDƻs\xA7\xB9\xBE\xE3\xB8\xF4\xAE|(&C)"
-#: Merge.rc:559
+#: Merge.rc:567
#, c-format
msgid "Copy &Filename"
msgstr "\xBDƻs\xC0ɦW(&F)"
-#: Merge.rc:565
+#: Merge.rc:573
#, c-format
msgid "Prediffer Settings"
msgstr "\xA5\xFD\xA6\xE6\xB3B\xB2z\xBE\xB9\xB3]\xA9w"
-#: Merge.rc:567
+#: Merge.rc:575
#, c-format
msgid "&No prediffer"
msgstr "\xA4\xA3\xADn\xA5\xFD\xA6\xE6\xB3B\xB2z\xBE\xB9(&N)"
-#: Merge.rc:568
+#: Merge.rc:576
#, c-format
msgid "Auto prediffer"
msgstr "\xA6۰ʥ\xFD\xA6\xE6\xB3B\xB2z\xBE\xB9"
-#: Merge.rc:576
+#: Merge.rc:584
#, c-format
msgid "G&oto Diff"
msgstr "\xA6ܬ۲\xA7\xB0϶\xF4(&O)"
-#: Merge.rc:579
+#: Merge.rc:587
#, c-format
msgid "&No Moved Blocks"
msgstr "\xA4\xA3\xC5\xE3\xA5ܲ\xBE\xA6\xEC\xB0϶\xF4(&N)"
-#: Merge.rc:580
+#: Merge.rc:588
#, c-format
msgid "&All Moved Blocks"
msgstr "\xC5\xE3\xA5ܲ\xBE\xA6\xEC\xB0϶\xF4(&A)"
-#: Merge.rc:581
+#: Merge.rc:589
#, c-format
msgid "Moved Block for &Current Diff"
msgstr "\xB4N\xA5ثe\xAC۲\xA7\xB3B\xC5\xE3\xA5ܨ䲾\xA6\xEC\xB0϶\xF4(&C)"
-#: Merge.rc:650
+#: Merge.rc:658
#, c-format
msgid "About WinMerge"
msgstr "\xC3\xF6\xA9\xF3 WinMerge"
-#: Merge.rc:656
+#: Merge.rc:664
#, c-format
msgid "(Private Build)"
msgstr "(\xA8p\xA4H\xBDsĶ)"
-#: Merge.rc:657
+#: Merge.rc:665
#, c-format
msgid "All rights reserved."
msgstr "\xAA\xA9\xC5v\xA9Ҧ\xB3"
-#: Merge.rc:658
+#: Merge.rc:666
#, c-format
msgid "Visit the WinMerge HomePage!"
msgstr "\xAB\xF4\xB3X WinMerge \xAD\xBA\xAD\xB6\xA1I"
-#: Merge.rc:661
-#: Merge.rc:693
-#: Merge.rc:783
-#: Merge.rc:969
-#: Merge.rc:1047
-#: Merge.rc:1076
-#: Merge.rc:1086
-#: Merge.rc:1252
-#: Merge.rc:1316
-#: Merge.rc:1329
-#: Merge.rc:1421
-#: Merge.rc:1436
+#: Merge.rc:669
+#: Merge.rc:701
+#: Merge.rc:791
+#: Merge.rc:977
+#: Merge.rc:1055
+#: Merge.rc:1084
+#: Merge.rc:1094
+#: Merge.rc:1260
+#: Merge.rc:1324
+#: Merge.rc:1337
+#: Merge.rc:1429
+#: Merge.rc:1444
+#: Merge.rc:1666
#, c-format
msgid "OK"
msgstr "\xBDT\xA9w"
-#: Merge.rc:662
+#: Merge.rc:670
#, c-format
msgid "Contributors"
msgstr "\xB0^\xC4m\xAA\xCC"
-#: Merge.rc:669
+#: Merge.rc:677
#, c-format
msgid "Select Files or Folders"
msgstr "\xBF\xEF\xA8\xFA\xC0ɮשθ\xEA\xAEƧ\xA8"
-#: Merge.rc:672
-#: Merge.rc:1587
+#: Merge.rc:680
+#: Merge.rc:1595
#, c-format
msgid "&Left:"
msgstr "\xA5\xAA\xC3\xE4(&L)\xA1G"
-#: Merge.rc:676
-#: Merge.rc:737
-#: Merge.rc:990
-#: Merge.rc:1012
+#: Merge.rc:684
+#: Merge.rc:745
+#: Merge.rc:998
+#: Merge.rc:1020
#, c-format
msgid "&Browse..."
msgstr "\xC2s\xC4\xFD(&B)..."
-#: Merge.rc:677
-#: Merge.rc:1591
+#: Merge.rc:685
+#: Merge.rc:1599
#, c-format
msgid "&Right:"
msgstr "\xA5k\xC3\xE4(&R)\xA1G"
-#: Merge.rc:681
-#: Merge.rc:1023
+#: Merge.rc:689
+#: Merge.rc:1031
#, c-format
msgid "Bro&wse..."
msgstr "\xC2s\xC4\xFD(&W)..."
-#: Merge.rc:682
-#: Merge.rc:1595
+#: Merge.rc:690
+#: Merge.rc:1603
#, c-format
msgid "&Filter:"
msgstr "\xBFz\xBFﾹ(&F)\xA1G"
-#: Merge.rc:685
-#: Merge.rc:1597
+#: Merge.rc:693
+#: Merge.rc:1605
#, c-format
msgid "Select..."
msgstr "\xBF\xEF\xA8\xFA..."
-#: Merge.rc:686
+#: Merge.rc:694
#, c-format
msgid "&Unpacker:"
msgstr "\xB8ѥ]\xBE\xB9(&U)\xA1G"
-#: Merge.rc:689
+#: Merge.rc:697
#, c-format
msgid "&Select..."
msgstr "\xBF\xEF\xA8\xFA(&S)..."
-#: Merge.rc:690
-#: Merge.rc:1598
+#: Merge.rc:698
+#: Merge.rc:1606
#, c-format
msgid "&Include Subfolders"
msgstr "\xA5]\xACA\xA4l\xB8\xEA\xAEƧ\xA8(&I)"
-#: Merge.rc:692
+#: Merge.rc:700
#, c-format
msgid "Status:"
msgstr "\xAA\xAC\xBAA\xA1G"
-#: Merge.rc:694
-#: Merge.rc:724
-#: Merge.rc:784
-#: Merge.rc:814
-#: Merge.rc:846
-#: Merge.rc:856
-#: Merge.rc:1048
-#: Merge.rc:1077
-#: Merge.rc:1087
-#: Merge.rc:1138
-#: Merge.rc:1253
-#: Merge.rc:1330
-#: Merge.rc:1422
-#: Merge.rc:1437
+#: Merge.rc:702
+#: Merge.rc:732
+#: Merge.rc:792
+#: Merge.rc:822
+#: Merge.rc:854
+#: Merge.rc:864
+#: Merge.rc:1056
+#: Merge.rc:1085
+#: Merge.rc:1095
+#: Merge.rc:1146
+#: Merge.rc:1261
+#: Merge.rc:1338
+#: Merge.rc:1430
+#: Merge.rc:1445
+#: Merge.rc:1667
#, c-format
msgid "Cancel"
msgstr "\xA8\xFA\xAE\xF8"
-#: Merge.rc:695
-#: Merge.rc:1331
+#: Merge.rc:703
+#: Merge.rc:1339
#, c-format
msgid "Help"
msgstr "\xBB\xA1\xA9\xFA"
-#: Merge.rc:696
+#: Merge.rc:704
#, c-format
msgid "Files or Folders to Compare"
msgstr "\xADn\xA4\xF1\xB9諸\xC0ɮשθ\xEA\xAEƧ\xA8"
-#: Merge.rc:703
+#: Merge.rc:711
#, c-format
msgid "Visual SourceSafe"
msgstr "Visual SourceSafe"
-#: Merge.rc:708
+#: Merge.rc:716
#, c-format
msgid "Database:"
msgstr "\xB8\xEA\xAEƮw\xA1G"
-#: Merge.rc:711
+#: Merge.rc:719
#, c-format
msgid "Project:"
msgstr "\xB1M\xAEסG"
-#: Merge.rc:714
+#: Merge.rc:722
#, c-format
msgid "User:"
msgstr "\xA5Τ\xE1\xA1G"
-#: Merge.rc:716
+#: Merge.rc:724
#, c-format
msgid "Password:"
msgstr "\xB1K\xBDX\xA1G"
-#: Merge.rc:718
+#: Merge.rc:726
#, c-format
msgid "Link to Destination VSS project"
msgstr "\xB3s\xB5\xB2\xA8\xEC\xA5ؼ\xD0 VSS \xB1M\xAE\xD7"
-#: Merge.rc:720
-#: Merge.rc:861
+#: Merge.rc:728
+#: Merge.rc:869
#, c-format
msgid "Apply to all items"
msgstr "\xAEM\xA5Ψ\xEC\xA9Ҧ\xB3\xB6\xB5\xA5\xD8"
-#: Merge.rc:722
+#: Merge.rc:730
#, c-format
msgid "Check Out"
msgstr "\xB3q\xB9L"
-#: Merge.rc:723
-#: Merge.rc:857
+#: Merge.rc:731
+#: Merge.rc:865
#, c-format
msgid "Save As..."
msgstr "\xA5t\xA6s\xB7s\xC0\xC9..."
-#: Merge.rc:729
+#: Merge.rc:737
#, c-format
msgid "Versioning System"
msgstr "\xAA\xA9\xA5\xBB\xBAz\xA8t\xB2\xCE"
-#: Merge.rc:732
+#: Merge.rc:740
#, c-format
msgid "&Versioning System:"
msgstr "\xAA\xA9\xA5\xBB\xBAz\xA8t\xB2\xCE(&V)\xA1G"
-#: Merge.rc:735
+#: Merge.rc:743
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "cleartool.exe \xB8\xF4\xAE|(&P)\xA1G"
-#: Merge.rc:742
-#: Merge.rc:1899
+#: Merge.rc:750
+#: Merge.rc:1921
#, c-format
msgid "General"
msgstr "\xA4@\xAF\xEB"
-#: Merge.rc:745
+#: Merge.rc:753
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "\xA6۰ʱ\xB2\xA6̪ܳ\xEC\xAEt\xB2\xA7(&S)"
-#: Merge.rc:748
+#: Merge.rc:756
#, c-format
msgid "&Disable Splash Screen"
msgstr "\xB1Ұʮɤ\xA3\xADn\xB9\xCF\xC0\xB2(&D)"
-#: Merge.rc:750
+#: Merge.rc:758
#, c-format
msgid "Cl&ose windows with ESC"
msgstr "\xAB\xF6 ESC \xC3\x{1B3B35}\xF8\xB5\xA1(&O)"
-#: Merge.rc:752
+#: Merge.rc:760
#, c-format
msgid "&Automatically verify paths in Open-dialog"
msgstr "\xA9\xF3\xA1u\xB6}\xB1ҡv\xB9\xEF\xB8ܤ\xE8\xB6\xF4\xA6۰\xCA\xC0\xCB\xC5\xE7\xB8\xF4\xAE|(&A)"
-#: Merge.rc:755
+#: Merge.rc:763
#, c-format
msgid "All&ow only one instance to run"
msgstr "\xA4\xA3\xAF\xE0\xA6P\xAEɰ\xF5\xA6\xE6\xA4@\xADӥH\xA4W\xA5\xBB\xB5{\xA6\xA1(&O)"
-#: Merge.rc:757
+#: Merge.rc:765
#, c-format
msgid "As&k when closing multiple windows"
msgstr "\xC3\x{1B3B26}h\xAD\xAB\xB5\xF8\xB5\xA1\xAEɥ\xFD\xB8߰\xDD(&K)"
-# "\xA4\xF1\xB8\xFB\xAEɫO\xAFd\xC0ɮɶ\xA1(&P)"
-#: Merge.rc:759
+# "\xA4\xF1\xB8\xFB\xAEɭp\xA4J\xC0ɮɶ\xA1(&P)"
+# Do you want with it to say "Include file time difference in comparing" or "Do not change file time in comparing"?
+#: Merge.rc:767
#, c-format
msgid "&Preserve file time in file compare"
msgstr "\xA4\xF1\xB8\xFB\xC0ɮɫO\xAFd\xC0ɮɶ\xA1(&P)"
-#: Merge.rc:762
+#: Merge.rc:770
#, c-format
msgid "O&pen-dialog Auto-Completion:"
msgstr "\xA1u\xB6}\xB1ҡv\xB9\xEF\xB8ܤ\xE8\xB6\x{1249E6}۰ʧ\xB9\xA6\xA8(&P)\xA1G"
-#: Merge.rc:765
+#: Merge.rc:773
#, c-format
msgid "Enable multiple compare windows for"
msgstr "\xB1ҥΦh\xAD\xAB\xA4\xF1\xB8\xFB\xB5\xF8\xB5\xA1"
-#: Merge.rc:767
-#: Merge.rc:1610
+#: Merge.rc:775
+#: Merge.rc:1618
#, c-format
msgid "&Folder compare"
msgstr "\xA4\xF1\xB8\xFB\xB8\xEA\xAEƧ\xA8\xAE\xC9(&F)"
-#: Merge.rc:769
-#: Merge.rc:1612
+#: Merge.rc:777
+#: Merge.rc:1620
#, c-format
msgid "Fil&e compare"
msgstr "\xA4\xF1\xB8\xFB\xC0ɮ\xC9(&E)"
-#: Merge.rc:771
+#: Merge.rc:779
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr "WinMerge \xA4\xB9\xB3\\xC1\xF4\xC2ìY\xA8Ǧ@\xA6P\xB0T\xAE\xA7\xB2\xB0\xA1C\xAB\x{1ADAF3}]\xC1\xE4\xA5H\xA6A\xA6\xB8\xC5\xE3\xA5ܩҦ\xB3\xB0T\xAE\xA7\xB2\xB0\xA1C"
-#: Merge.rc:773
+#: Merge.rc:781
#, c-format
msgid "Reset"
msgstr "\xAD\xAB\xB3]"
-#: Merge.rc:780
+#: Merge.rc:788
#, c-format
msgid "Language"
msgstr "\xBBy\xA8\xA5"
-#: Merge.rc:787
+#: Merge.rc:795
#, c-format
msgid "Available languages:"
msgstr "\xA5i\xA5Ϊ\xBA\xBBy\xA8\xA5\xA1G"
-#: Merge.rc:793
+#: Merge.rc:801
#, c-format
msgid "Find"
msgstr "\xB4M\xA7\xE4"
-#: Merge.rc:796
-#: Merge.rc:823
+#: Merge.rc:804
+#: Merge.rc:831
#, c-format
msgid "Fi&nd what:"
msgstr "\xB4M\xA7\xE4(&N)\xA1G"
-#: Merge.rc:799
-#: Merge.rc:829
+#: Merge.rc:807
+#: Merge.rc:837
#, c-format
msgid "Match &whole word only"
msgstr "\xBFW\xA5ߧ\xB9\xBE\xE3\xA6r(&W)"
-#: Merge.rc:801
-#: Merge.rc:831
+#: Merge.rc:809
+#: Merge.rc:839
#, c-format
msgid "Match &case"
msgstr "\xB0Ϥ\xC0\xA4j\xA4p\xBCg(&C)"
-#: Merge.rc:803
-#: Merge.rc:833
+#: Merge.rc:811
+#: Merge.rc:841
#, c-format
msgid "Regular &expression"
msgstr "\xA5\xCE\xC3\xFE\xAB\xAC\xAA\x{D9A1}(&E)"
-#: Merge.rc:805
+#: Merge.rc:813
#, c-format
msgid "D&on't wrap end of file"
msgstr "\xA6\xDC\xC0ɧ\xC0\xA4\xA3\xA7\xE9\xAA\xF0(&O)"
-#: Merge.rc:808
+#: Merge.rc:816
#, c-format
msgid "Direction"
msgstr "\xA4\xE8\xA6V"
-#: Merge.rc:809
+#: Merge.rc:817
#, c-format
msgid "&Up"
msgstr "\xA4W\xB2\xBE(&U)"
-#: Merge.rc:811
+#: Merge.rc:819
#, c-format
msgid "&Down"
msgstr "\xA4U\xB2\xBE(&D)"
-#: Merge.rc:813
-#: Merge.rc:843
+#: Merge.rc:821
+#: Merge.rc:851
#, c-format
msgid "&Find Next"
msgstr "\xA7\xE4\xA4U\xA4@\xAD\xD3(&F)"
-#: Merge.rc:820
+#: Merge.rc:828
#, c-format
msgid "Replace"
msgstr "\xA8\xFA\xA5N"
-#: Merge.rc:826
+#: Merge.rc:834
#, c-format
msgid "Re&place with:"
msgstr "\xA5N\xA5H(&P)\xA1G"
-#: Merge.rc:835
+#: Merge.rc:843
#, c-format
msgid "&Don't wrap end of file"
msgstr "\xA6\xDC\xC0ɧ\xC0\xA4\xA3\xA7\xE9\xAA\xF0(&D)"
-#: Merge.rc:838
+#: Merge.rc:846
#, c-format
msgid "Replace in"
msgstr "\xA9\xF3"
-#: Merge.rc:839
+#: Merge.rc:847
#, c-format
msgid "&Selection"
msgstr "\xBF\xEF\xA8\xFA\xB0\xCF(&S)"
-#: Merge.rc:841
+#: Merge.rc:849
#, c-format
msgid "Wh&ole file"
msgstr "\xBE\xE3\xAD\xD3\xC0ɮ\xD7(&O)"
-#: Merge.rc:844
+#: Merge.rc:852
#, c-format
msgid "&Replace"
msgstr "\xA8\xFA\xA5N(&R)"
-#: Merge.rc:845
+#: Merge.rc:853
#, c-format
msgid "Replace &All"
msgstr "\xA5\xFE\xB3\xA1\xA8\xFA\xA5N(&A)"
-#: Merge.rc:852
-#: Merge.rc:2134
+#: Merge.rc:860
+#: Merge.rc:2164
#, c-format
msgid "Rational ClearCase"
msgstr "Rational ClearCase"
-#: Merge.rc:855
+#: Merge.rc:863
#, c-format
msgid "CheckOut"
msgstr "\xB0e\xA6^\xA7\xEF\xB9L\xC0\xC9"
-#: Merge.rc:860
-#: Merge.rc:1172
+#: Merge.rc:868
+#: Merge.rc:1180
#, c-format
msgid "Comments"
msgstr "\xB3Ƶ\xF9"
-#: Merge.rc:863
+#: Merge.rc:871
#, c-format
msgid "CheckIn after checkout"
msgstr "\xB0e\xA6^\xA7\xEF\xB9L\xC0ɫ\xE1\xB4N\xA8\xFA\xA5X\xA4\xA7"
-#: Merge.rc:869
+#: Merge.rc:877
#, c-format
msgid "Linefilters"
msgstr "\xA6椧\xBFz\xB0\xA3\xBE\xB9"
-#: Merge.rc:872
+#: Merge.rc:880
#, c-format
msgid "Enable Line Filters"
msgstr "\xB1ҥΦ\xE6\xBFz\xB0\xA3\xBE\xB9"
-#: Merge.rc:875
+#: Merge.rc:883
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "\xC3\xFE\xAB\xAC\xAA\x{D9A1} (\xA8C\xA6\xE6\xA4@\xA6\xA1)\xA1G"
-#: Merge.rc:882
+#: Merge.rc:890
#, c-format
msgid "Save"
msgstr "\xC0x\xA6s"
-#: Merge.rc:883
+#: Merge.rc:891
#, c-format
msgid "New"
msgstr "\xB7s\xBCW"
-#: Merge.rc:884
+#: Merge.rc:892
#, c-format
msgid "Edit"
msgstr "\xBDs\xBF\xE8"
-#: Merge.rc:885
+#: Merge.rc:893
#, c-format
msgid "Remove"
msgstr "\xB2\xBE\xB0\xA3"
-#: Merge.rc:890
-#: Merge.rc:1902
+#: Merge.rc:898
+#: Merge.rc:1924
#, c-format
msgid "Colors"
msgstr "\xA6\xE2\xB1m"
-#: Merge.rc:893
+#: Merge.rc:901
#, c-format
msgid "Difference:"
msgstr "\xAC۲\xA7\xB0϶\xF4\xA1G"
-#: Merge.rc:897
+#: Merge.rc:905
#, c-format
msgid "Selected Difference:"
msgstr "\xA4w\xBF\xEF\xA8\xFA\xAA\xBA\xAC۲\xA7\xB0϶\xF4\xA1G"
-#: Merge.rc:901
-#: Merge.rc:1562
+#: Merge.rc:909
+#: Merge.rc:1570
#, c-format
msgid "Background"
msgstr "\xADI\xB4\xBA"
-#: Merge.rc:902
+#: Merge.rc:910
#, c-format
msgid "Deleted"
msgstr "\xA4w\xA7R\xB0\xA3"
-#: Merge.rc:915
-#: Merge.rc:1357
-#: Merge.rc:1563
+#: Merge.rc:923
+#: Merge.rc:1365
+#: Merge.rc:1571
#, c-format
msgid "Text"
msgstr "\xABe\xB4\xBA\xA4\xE5"
-#: Merge.rc:919
+#: Merge.rc:927
#, c-format
msgid "Ignored Difference:"
msgstr "\xA9\xBF\xB2\xA4\xAA\xBA\xAC۲\xA7\xB0϶\xF4\xA1G"
-#: Merge.rc:929
+#: Merge.rc:937
#, c-format
msgid "Moved:"
msgstr "\xB2\xBE\xA6\xEC\xB0϶\xF4\xA1G"
-#: Merge.rc:939
+#: Merge.rc:947
#, c-format
msgid "Selected Moved:"
msgstr "\xA4w\xBF\xEF\xA8\x{2ABACBE}\xA6\xEC\xB0϶\xF4\xA1G"
-#: Merge.rc:946
+#: Merge.rc:954
#, c-format
msgid "Word Difference:"
msgstr "\xA6r\xBCh\xA6\xB8\xAA\xBA\xAC۲\xA7\xA1G"
-#: Merge.rc:953
+#: Merge.rc:961
#, c-format
msgid "Selected Word Diff:"
msgstr "\xA4w\xBF\xEF\xA8\xFA\xAA\xBA\xA6r\xAC۲\xA7\xA1G"
-#: Merge.rc:960
-#: Merge.rc:1046
-#: Merge.rc:1075
-#: Merge.rc:1175
-#: Merge.rc:1403
+#: Merge.rc:968
+#: Merge.rc:1054
+#: Merge.rc:1083
+#: Merge.rc:1183
+#: Merge.rc:1411
#, c-format
msgid "Defaults"
msgstr "\xB9w\xB3]\xAD\xC8"
-#: Merge.rc:966
-#: Merge.rc:1345
-#: Merge.rc:1551
+#: Merge.rc:974
+#: Merge.rc:1353
+#: Merge.rc:1559
#, c-format
msgid "Dialog"
msgstr "\xB9\xEF\xB8\xDC"
-#: Merge.rc:976
-#: Merge.rc:1905
+#: Merge.rc:984
+#: Merge.rc:1927
#, c-format
msgid "System"
msgstr "\xA8t\xB2\xCE"
-#: Merge.rc:979
+#: Merge.rc:987
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr "\xA7R\xB0\xA3\xC0ɰe\xA8\xEC\xB8귽\xA6^\xA6\xAC\xB5\xA9(&S)"
-#: Merge.rc:981
+#: Merge.rc:989
#, c-format
msgid "Integration"
msgstr "\xBE\xE3\xA6X"
-#: Merge.rc:982
+#: Merge.rc:990
#, c-format
msgid "&Add to explorer context menu"
msgstr "\xA5[\xA8\xEC\xC0ɮ\xD7\xC1`\xBAޥk\xC1\xE4\xBF\xEF\xB3\xE6(&A)"
-#: Merge.rc:984
+#: Merge.rc:992
#, c-format
msgid "E&nable advanced menu"
msgstr "\xB1ҥζi\xB6\xA5\xBF\xEF\xB3\xE6(&N)"
-#: Merge.rc:986
+#: Merge.rc:994
#, c-format
msgid "In&clude subfolders by default"
msgstr "\xA6۰ʥ]\xACA\xA4l\xA5ؿ\xFD(&C)"
-#: Merge.rc:988
+#: Merge.rc:996
#, c-format
msgid "&External editor:"
msgstr "\xA5~\xB3\xA1\xBDs\xBF边(&E)\xA1G"
-#: Merge.rc:991
+#: Merge.rc:999
#, c-format
msgid "&Filter folder:"
msgstr "\xB8\xEA\xAEƧ\xA8\xBFz\xBFﾹ(&F)\xA1G"
-#: Merge.rc:993
+#: Merge.rc:1001
#, c-format
msgid "B&rowse..."
msgstr "\xC2s\xC4\xFD(&R)..."
-#: Merge.rc:994
+#: Merge.rc:1002
#, c-format
msgid "Temporary files folder"
msgstr "\xBCȦs\xC0ɸ\xEA\xAEƧ\xA8"
-#: Merge.rc:995
+#: Merge.rc:1003
#, c-format
msgid "S&ystem's temp folder"
msgstr "\xA8t\xB2Ϊ\xBA\xBCȦs\xB8\xEA\xAEƧ\xA8(&Y)"
-#: Merge.rc:997
+#: Merge.rc:1005
#, c-format
msgid "C&ustom folder:"
msgstr "\xA6ۭq\xB8\xEA\xAEƧ\xA8(&U)\xA1G"
-#: Merge.rc:1000
-#: Merge.rc:1016
+#: Merge.rc:1008
+#: Merge.rc:1024
#, c-format
msgid "Br&owse..."
msgstr "\xC2s\xC4\xFD(&O)..."
-#: Merge.rc:1006
+#: Merge.rc:1014
#, c-format
msgid "Patch Generator"
msgstr "\xB8ɺ;\xB9"
-#: Merge.rc:1009
+#: Merge.rc:1017
#, c-format
msgid "File&1:"
msgstr "\xC0ɮ\xD71(&1)\xA1G"
-#: Merge.rc:1013
+#: Merge.rc:1021
#, c-format
msgid "File&2:"
msgstr "\xC0ɮ\xD72(&2)\xA1G"
-#: Merge.rc:1017
+#: Merge.rc:1025
#, c-format
msgid "&Swap"
msgstr "\xB9\xEF\xBD\xD5(&S)"
-#: Merge.rc:1018
+#: Merge.rc:1026
#, c-format
msgid "&Append to existing file"
msgstr "\xAA\xFE\xA5[\xA8\xEC\xB2{\xA6\xB3\xC0ɮ\xD7(&A)"
-#: Merge.rc:1020
+#: Merge.rc:1028
#, c-format
msgid "&Result:"
msgstr "\xB5\xB2\xAAG(&R)\xA1G"
-#: Merge.rc:1024
+#: Merge.rc:1032
#, c-format
msgid "&Format"
msgstr "\xAE榡(&F)"
-#: Merge.rc:1025
+#: Merge.rc:1033
#, c-format
msgid "St&yle:"
msgstr "\xBC˦\xA1(&Y)\xA1G"
-#: Merge.rc:1028
+#: Merge.rc:1036
#, c-format
msgid "&Context:"
msgstr "\xA4W\xA4U\xA4\xE5(&C)\xA1G"
-#: Merge.rc:1031
+#: Merge.rc:1039
#, c-format
msgid "W&hitespaces"
msgstr "\xAAŮ\xE6(&H)"
-#: Merge.rc:1032
+#: Merge.rc:1040
#, c-format
msgid "Com&pare"
msgstr "\xA4\xF1\xB8\xFB\xA4\xA7(&P)"
-#: Merge.rc:1034
+#: Merge.rc:1042
#, c-format
msgid "I&gnore changes"
msgstr "\xA9\xBF\xB2\xA4\xA8\xE4\xC5ܧ\xF3(&G)"
-#: Merge.rc:1036
+#: Merge.rc:1044
#, c-format
msgid "Ig&nore all"
msgstr "\xA9\xBF\xB2\xA4\xA5\xFE\xB3\xA1(&N)"
-#: Merge.rc:1038
+#: Merge.rc:1046
#, c-format
msgid "Ignor&e blank lines"
msgstr "\xA9\xBF\xB2\xA4\xAAťզ\xE6(&E)"
-#: Merge.rc:1040
+#: Merge.rc:1048
#, c-format
msgid "Case sensi&tive"
msgstr "\xB0Ϥ\xC0\xA4j\xA4p\xBCg(&T)"
-#: Merge.rc:1042
+#: Merge.rc:1050
#, c-format
msgid "Inclu&de command line"
msgstr "\xAA\xFE\xA5[ diff \xA9R\xA5O\xA9\xF3\xC0ɭ\xBA(&P)"
-#: Merge.rc:1044
+#: Merge.rc:1052
#, c-format
msgid "Open to e&xternal editor"
msgstr "\xB6}\xB1ҥ~\xB3\xA1\xBDs\xBF边(&X)"
-#: Merge.rc:1066
+#: Merge.rc:1074
#, c-format
msgid "Display Columns"
msgstr "\xC5\xE3\xA5\xDC\xC4\xE6\xA6\xEC"
-#: Merge.rc:1072
+#: Merge.rc:1080
#, c-format
msgid "Move &Up"
msgstr "\xA4W\xB2\xBE(&U)"
-#: Merge.rc:1073
+#: Merge.rc:1081
#, c-format
msgid "Move &Down"
msgstr "\xA4U\xB2\xBE(&D)"
-#: Merge.rc:1083
+#: Merge.rc:1091
#, c-format
msgid "Select Unpacker"
msgstr "\xBF\xEF\xA8\xFA\xB8ѥ]\xBE\xB9"
-#: Merge.rc:1088
+#: Merge.rc:1096
#, c-format
msgid "File unpacker:"
msgstr "\xC0ɮѥ]\xBE\xB9\xA1G"
-#: Merge.rc:1091
+#: Merge.rc:1099
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr "\xC5\xE3\xA5ܩҦ\xB3\xB8ѥ]\xBE\xB9\xA1A\xA4\xA3\xADn\xC0ˬd\xB0\xC6\xC0ɦW"
-#: Merge.rc:1094
+#: Merge.rc:1102
#, c-format
msgid "Extensions list:"
msgstr "\xB0\xC6\xC0ɦW\xB2M\xB3\xE6\xA1G"
-#: Merge.rc:1095
+#: Merge.rc:1103
#, c-format
msgid "Description:"
msgstr "\xB4y\xADz\xA1G"
-#: Merge.rc:1106
+#: Merge.rc:1114
#, c-format
msgid " Folder Compare Progress"
msgstr "\xA4\xF1\xB8\xFB\xB8\xEA\xAEƧ\xA8\xA4\xA4"
-#: Merge.rc:1109
-#: Merge.rc:1852
+#: Merge.rc:1117
+#: Merge.rc:1874
#, c-format
msgid "Stop"
msgstr "\xB0\xB1\xA4\xEE"
-#: Merge.rc:1114
+#: Merge.rc:1122
#, c-format
msgid "Comparing items..."
msgstr "\xA4\xF1\xB8\xFB\xB6\xB5\xA5ؤ\xA4..."
-#: Merge.rc:1115
+#: Merge.rc:1123
#, c-format
msgid "Items compared:"
msgstr "\xA4\xF1\xB8\xFB\xB9L\xAA\xBA\xB6\xB5\xA5ءG"
-#: Merge.rc:1116
+#: Merge.rc:1124
#, c-format
msgid "Items total:"
msgstr "\xB6\xB5\xA5\xD8\xC1`\xBCơG"
-#: Merge.rc:1122
+#: Merge.rc:1130
#, c-format
msgid "Go To"
msgstr "\xB2\xBE\xA6\xDC"
-#: Merge.rc:1125
+#: Merge.rc:1133
#, c-format
msgid "G&oto:"
msgstr "\xB2\xBE\xA6\xDC(&O)\xA1G"
-#: Merge.rc:1127
+#: Merge.rc:1135
#, c-format
msgid "File"
msgstr "\xC0ɮ\xD7"
-#: Merge.rc:1132
+#: Merge.rc:1140
#, c-format
msgid "Goto what"
msgstr "\xB2\xBE\xA6\xDC"
-#: Merge.rc:1133
+#: Merge.rc:1141
#, c-format
msgid "Li&ne"
msgstr "\xA6\xE6(&N)"
-#: Merge.rc:1135
+#: Merge.rc:1143
#, c-format
msgid "&Difference"
msgstr "\xAC۲\xA7\xB0϶\xF4(&D)"
-#: Merge.rc:1137
+#: Merge.rc:1145
#, c-format
msgid "&Go To"
msgstr "\xB2\xBE\xA6\xDC(&G)"
-#: Merge.rc:1143
-#: Merge.rc:1900
+#: Merge.rc:1151
+#: Merge.rc:1922
#, c-format
msgid "Compare"
msgstr "\xA4\xF1\xB8\xFB"
-#: Merge.rc:1146
+#: Merge.rc:1154
#, c-format
msgid "Whitespace"
msgstr "\xAAťճB"
-#: Merge.rc:1147
+#: Merge.rc:1155
#, c-format
msgid "&Compare"
msgstr "\xA4\xF1\xB9\xEF\xAAťճB(&W)"
-#: Merge.rc:1149
+#: Merge.rc:1157
#, c-format
msgid "&Ignore change"
msgstr "\xA9\xBF\xB2\xA4\xAAťռƶq\xA4\xA7\xC5ܰʦӳy\xA6\xA8\xAA\xBA\xAEt\xB2\xA7(&H)"
-#: Merge.rc:1151
+#: Merge.rc:1159
#, c-format
msgid "I&gnore all"
msgstr "\xA9\xBF\xB2\xA4\xAAťճB\xA4\xA7\xA5\xF4\xA6\xF3\xAEt\xB2\xA7(&A)"
-#: Merge.rc:1153
+#: Merge.rc:1161
#, c-format
msgid "Ignore blan&k lines"
msgstr "\xA9\xBF\xB2\xA4\xAAťզ\xE6(&K)"
-#: Merge.rc:1155
+#: Merge.rc:1163
#, c-format
msgid "Ignore &case"
msgstr "\xA9\xBF\xB2\xA4\xA4j\xA4p\xBCg(&C)"
-#: Merge.rc:1157
+#: Merge.rc:1165
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "\xA9\xBF\xB2\xA4\xB4\xAB\xA6\xE6\xA6r\xA4\xB8\xA4\xA7\xAEt\xB2\xA7(Windows/Unix/Mac)(&R)"
-#: Merge.rc:1160
+#: Merge.rc:1168
#, c-format
msgid "E&nable moved block detection"
msgstr "\xB0\xBB\xB4\xFA\xB2\xBE\xA6쪺\xB0϶\xF4(&N)"
-#: Merge.rc:1162
+#: Merge.rc:1170
#, c-format
msgid "&Match similar lines"
msgstr "\xA7\xE4\xA5X\xACۦ\xFC\xA6\xE6(&M)"
-#: Merge.rc:1164
+#: Merge.rc:1172
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr "\xA6p\xA8\xE2\xC0ɮפ\xA7\xADק\xEF\xAEɶ\xA1\xB6\xA1\xB9j\xA4֩\xF3\xA4T\xAC\xED\xA1A\xABh\xA9\xBF\xB2\xA4\xA6\xB9\xAEt\xB2\xA7(&O)"
-#: Merge.rc:1167
+#: Merge.rc:1175
#, c-format
msgid "&File Compare method:"
msgstr "\xC0ɮפ\xF1\xB8\xFB\xA4覡(&F)\xA1G"
-#: Merge.rc:1170
+#: Merge.rc:1178
#, c-format
msgid "S&top after first difference"
msgstr "\xB2Ĥ@\xADӮt\xB2\xA7\xB4N\xB0\xB1(&T)"
-#: Merge.rc:1173
+#: Merge.rc:1181
#, c-format
msgid "Filter Comments"
msgstr "\xBFz\xBFﾹ\xA4\xA7\xB5\xF9"
-#: Merge.rc:1180
-#: Merge.rc:1901
+#: Merge.rc:1188
+#: Merge.rc:1923
#, c-format
msgid "Editor"
msgstr "\xBDs\xBF边"
-#: Merge.rc:1183
+#: Merge.rc:1191
#, c-format
msgid "&Highlight syntax"
msgstr "\xB0\xAA\xABG\xABy\xAAk(&H)"
-#: Merge.rc:1185
+#: Merge.rc:1193
#, c-format
msgid "&Automatic rescan"
msgstr "\xA6۰ʭ\xAB\xB7s\xB1\xBD\xB4y(&A)"
-#: Merge.rc:1187
+#: Merge.rc:1195
#, c-format
msgid "&Preserve original EOL chars"
msgstr "\xABO\xAFd\xAD\xEC\xA9l EOL \xA6r\xA4\xB8(&P)"
-#: Merge.rc:1189
+#: Merge.rc:1197
#, c-format
msgid "Tabs"
msgstr "\xB8\xF5\xAE\xE6"
-#: Merge.rc:1190
+#: Merge.rc:1198
#, c-format
msgid "&Tab size:"
msgstr "\xB8\xF5\xAE\xE6\xA4j\xA4p(&T)\xA1G"
-#: Merge.rc:1193
+#: Merge.rc:1201
#, c-format
msgid "&Insert Tabs"
msgstr "\xB4\xA1\xA4J\xB8\xF5\xAE\xE6\xA6r\xA4\xB8(&I)"
-#: Merge.rc:1195
+#: Merge.rc:1203
#, c-format
msgid "Insert &Spaces"
msgstr "\xB4\xA1\xA4J\xAAť\xD5(&S)"
-#: Merge.rc:1197
+#: Merge.rc:1205
#, c-format
msgid "Line Difference Coloring"
msgstr "\xA6椺\xAEt\xB2\xA7\xB5ۦ\xE2"
-#: Merge.rc:1199
+#: Merge.rc:1207
#, c-format
msgid "View line differences"
msgstr "\xC0˵\xF8\xA6椺\xAEt\xB2\xA7"
-#: Merge.rc:1201
+#: Merge.rc:1209
#, c-format
msgid "&Character level"
msgstr "\xA6r\xA4\xB8\xB6\xA5\xBCh(&C)"
-#: Merge.rc:1203
+#: Merge.rc:1211
#, c-format
msgid "&Word-level:"
msgstr "\xA6r\xB6\xA5\xBCh(&W)\xA1G"
-#: Merge.rc:1218
+#: Merge.rc:1226
#, c-format
msgid "Filefilters"
msgstr "\xC0ɮz\xBFﾹ"
-#: Merge.rc:1224
+#: Merge.rc:1232
#, c-format
msgid "Test"
msgstr "\xB4\xFA\xB8\xD5"
-#: Merge.rc:1225
+#: Merge.rc:1233
#, c-format
msgid "Install..."
msgstr "\xA6w\xB8\xCB..."
-#: Merge.rc:1226
+#: Merge.rc:1234
#, c-format
msgid "New..."
msgstr "\xB7s\xBCW..."
-#: Merge.rc:1227
+#: Merge.rc:1235
#, c-format
msgid "Edit..."
msgstr "\xBDs\xBF\xE8..."
-#: Merge.rc:1228
+#: Merge.rc:1236
#, c-format
msgid "Delete..."
msgstr "\xA7R\xB0\xA3..."
-#: Merge.rc:1234
+#: Merge.rc:1242
#, c-format
msgid "Save modified files?"
msgstr "\xC0x\xA6s\xADק諸\xC0ɮסH"
-#: Merge.rc:1237
+#: Merge.rc:1245
#, c-format
msgid "Left side file"
msgstr "\xA5\xAA\xC3\xE4\xC0ɮ\xD7"
-#: Merge.rc:1240
+#: Merge.rc:1248
#, c-format
msgid "&Save changes"
msgstr "\xC0x\xA6s\xC5ܧ\xF3(&S)"
-#: Merge.rc:1242
+#: Merge.rc:1250
#, c-format
msgid "&Discard changes"
msgstr "\xA9\xF1\xB1\xF3\xC5ܧ\xF3(&D)"
-#: Merge.rc:1244
+#: Merge.rc:1252
#, c-format
msgid "Right side file"
msgstr "\xA5k\xC3\xE4\xC0ɮ\xD7"
-#: Merge.rc:1247
+#: Merge.rc:1255
#, c-format
msgid "S&ave changes"
msgstr "\xC0x\xA6s\xC5ܧ\xF3(&A)"
-#: Merge.rc:1249
+#: Merge.rc:1257
#, c-format
msgid "Dis&card changes"
msgstr "\xA9\xF1\xB1\xF3\xC5ܧ\xF3(&C)"
-#: Merge.rc:1251
+#: Merge.rc:1259
#, c-format
msgid "Discard All"
msgstr "\xA9\xF1\xB1\xF3\xA5\xFE\xB3\xA1"
-#: Merge.rc:1258
-#: Merge.rc:1506
-#: Merge.rc:1907
+#: Merge.rc:1266
+#: Merge.rc:1514
+#: Merge.rc:1929
#, c-format
msgid "Codepage"
msgstr "\xBDs\xBDX\xAD\xB6"
-#: Merge.rc:1261
+#: Merge.rc:1269
#, c-format
msgid "Default Codepage"
msgstr "\xBDs\xBDX\xAD\xB6"
-#: Merge.rc:1262
+#: Merge.rc:1270
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "\xA9\xF3\xB8\xFC\xA4J non-unicode \xC0ɮɧ\xEF\xC5ܩҥΪ\xBA\xBDs\xBDX\xAD\xB6\xA6\xA8"
-#: Merge.rc:1264
+#: Merge.rc:1272
#, c-format
msgid ""
"Detect codepage info for these files : .html, .rc, .xml \n"
@@ -2022,32 +2038,32 @@
"\xB0\xBB\xB4\xFA\xA4Ψϥ\xCE html, rc \xA4\xCE xml \xC0ɮת\xBA\xBDs\xBDX\xAD\xB6\xB8\xEA\xB0T\xA1C\n"
"\xBBݭn\xAD\xAB\xB7s\xB8\xFC\xA4J\xC0ɮסC"
-#: Merge.rc:1267
+#: Merge.rc:1275
#, c-format
msgid "System codepage"
msgstr "\xA8t\xB2ΥΪ\xBA\xBDs\xBDX\xAD\xB6"
-#: Merge.rc:1269
+#: Merge.rc:1277
#, c-format
msgid "According to WinMerge User Interface"
msgstr "WinMerge \xA8ϥΪ̤\xB6\xAD\xB1\xA5Ϊ\xBA\xBDs\xBDX\xAD\xB6"
-#: Merge.rc:1271
+#: Merge.rc:1279
#, c-format
msgid "Custom codepage :"
msgstr "\xA6ۭq\xBDs\xBDX\xAD\xB6\xA1G"
-#: Merge.rc:1279
+#: Merge.rc:1287
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr "WinMerge - \xA4w\xC3\xF6\xB3\xAC\xC0\xA3\xC1Y\xC0ɤ䴩"
-#: Merge.rc:1282
+#: Merge.rc:1290
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr "\xB5L\xAAk\xB4\xFA\xAA\xBE 7-Zip \xAA\xA9\xA5\xBB(\xA8S\xA6w\xB8\xCB 7-Zip \xB6ܡH)"
-#: Merge.rc:1285
+#: Merge.rc:1293
#, c-format
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
@@ -2056,12 +2072,12 @@
"\xA5\xB2\xB6\xB7\xA6w\xB8\xCB 7-Zip 3.11 \xA9Χ\xF3\xB1ߪ\xBA\xAA\xA9\xA5\xBB\xA9\xF3\xA7A\xAA\xBA\xB9q\xB8\xA3\xA1A\n"
"\xA9Ψ\xE4\xAE֤ߤ\xB8\xA5\xF3\xA4w\xB3Q\xBDƻs\xA8\xEC\xB5{\xA6\xA1\xA5ؿ\xFD\xA1F"
-#: Merge.rc:1287
+#: Merge.rc:1295
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr "\xC1٥\xB2\xB6\xB7\xA6b\xB8\xF4\xB8g\xA4W\xA6\xB3\xBEA\xB7\x{D936}\xAD\xB1\xA5~\xB1\xBE(Merge7z*.dll)\xA1A\xA4~\xAF\xE0\xA4䴩\xC0\xA3\xC1Y\xA1C"
-#: Merge.rc:1289
+#: Merge.rc:1297
#, c-format
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
@@ -2070,12 +2086,14 @@
"\xB0\xA3\xABD\xA6\xB3\xA7\xF3\xB7s\xAA\xA9\xA5i\xA5ΡA\xAB\xD8ij\xA8ϥΤU\xAD\xB1\xAA\xBA\n"
"7-Zip \xA4\xB6\xAD\xB1\xA5~\xB1\xBE\xAA\xA9\xA5\xBB\xA1C"
-#: Merge.rc:1291
+# I suggest "7-Zip Version" instead.
+#: Merge.rc:1299
#, c-format
msgid "Version"
msgstr "7-Zip \xAA\xA9\xA5\xBB"
-#: Merge.rc:1293
+# I suggest "Required Interface-Plugin" instead.
+#: Merge.rc:1301
#, c-format
msgid ""
"Plugin required\n"
@@ -2084,54 +2102,56 @@
"\xB8Ӫ\xA9\xA9ҭn\xAA\xBA\xA4\xB6\xAD\xB1\xA5~\xB1\xBE\n"
"(dllbuild %04u)"
-#: Merge.rc:1295
+#: Merge.rc:1303
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr "\xB1\xC0\xC2˪\xBA 7-Zip \xAA\xA9\xA5\xBB\xA1G"
-#: Merge.rc:1298
-#: Merge.rc:1301
+#: Merge.rc:1306
+#: Merge.rc:1309
#, c-format
msgid "present"
msgstr "\xA6s\xA6b"
-#: Merge.rc:1299
+#: Merge.rc:1307
#, c-format
msgid "Merge7z000U.dll"
msgstr "Merge7z000U.dll"
-#: Merge.rc:1302
+#: Merge.rc:1310
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr "\xA4w\xA6w\xB8˩\xF3\xA7A\xAA\xBA\xB9q\xB8\xA3\xAA\xBA\xBFW\xA5\xDF 7-Zip \xB3n\xC5\xE9\xA1G"
-#: Merge.rc:1304
-#: Merge.rc:1309
+#: Merge.rc:1312
+#: Merge.rc:1317
#, c-format
msgid "none"
msgstr "\xB5L"
-#: Merge.rc:1306
+#: Merge.rc:1314
#, c-format
msgid "missing"
msgstr "\xA4\xA3\xA6s\xA6b"
-#: Merge.rc:1307
+# I suggest "7-Zip components only for WinMerge:" instead.
+#: Merge.rc:1315
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr "WinMerge \xA4\xBA\xA5Ϊ\xBA 7-Zip \xAE֤ߤ\xB8\xA5\xF3\xA1G"
-#: Merge.rc:1311
+#: Merge.rc:1319
#, c-format
msgid "outdated"
msgstr "\xA4w\xC2\xC2"
-#: Merge.rc:1312
+# I suggest "Interface-Plugin on path:" instead.
+#: Merge.rc:1320
#, c-format
msgid "Plugins on path:"
msgstr "\xB8\xF4\xAE|\xA4W\xAA\xBA\xA4\xB6\xAD\xB1\xA5~\xB1\xBE\xA1G"
-#: Merge.rc:1313
+#: Merge.rc:1321
#, c-format
msgid ""
"Don't display this &message again.\n"
@@ -2140,489 +2160,506 @@
"\xA4ŦA\xC5\xE3\xA5ܦ\xB9\xB0T\xAE\xA7\xA1C(&M)\n"
"(\xA4\xB4\xA5i\xA5ѻ\xA1\xA9\xFA\xBF\xEF\xB3椤\xA5s\xA5X\xA5\xA6)"
-#: Merge.rc:1317
+# I suggest Interface-Plugin Download" instead.
+#: Merge.rc:1325
#, c-format
msgid "Plugin Download"
msgstr "\xA4\xB6\xAD\xB1\xA5~\xB1\xBE\xA4U\xB8\xFC"
-#: Merge.rc:1326
+#: Merge.rc:1334
#, c-format
msgid "Options"
msgstr "\xBFﶵ"
-#: Merge.rc:1337
+#: Merge.rc:1345
#, c-format
msgid " Categories"
msgstr "\xBA\xD8\xC3\xFE"
-#: Merge.rc:1339
+#: Merge.rc:1347
#, c-format
msgid "Import..."
msgstr "\xB6פJ..."
-#: Merge.rc:1340
+#: Merge.rc:1348
#, c-format
msgid "Export..."
msgstr "\xB6ץX..."
-#: Merge.rc:1348
+#: Merge.rc:1356
#, c-format
msgid "Keywords:"
msgstr "\xC3\xF6\xC1\xE4\xA6r\xA1G"
-#: Merge.rc:1349
+#: Merge.rc:1357
#, c-format
msgid "Function names:"
msgstr "\xA8\xE7\xBCƦW\xA1G"
-#: Merge.rc:1350
+#: Merge.rc:1358
#, c-format
msgid "Comments:"
msgstr "\xB5\xF9\xA1G"
-#: Merge.rc:1351
+#: Merge.rc:1359
#, c-format
msgid "Numbers:"
msgstr "\xBCơG"
-#: Merge.rc:1352
+#: Merge.rc:1360
#, c-format
msgid "Operators:"
msgstr "\xB9B\xBA\xE2\xA4l\xA1G"
-#: Merge.rc:1353
+#: Merge.rc:1361
#, c-format
msgid "Strings:"
msgstr "\xA6r\xA6\xEA\xA1G"
-#: Merge.rc:1354
+#: Merge.rc:1362
#, c-format
msgid "Preprocessor:"
msgstr "\xABe\xB3B\xB2z\xBE\xB9\xA1G"
-#: Merge.rc:1355
+#: Merge.rc:1363
#, c-format
msgid "User 1:"
msgstr "\xA8ϥΪ\xCC 1\xA1G"
-#: Merge.rc:1356
+#: Merge.rc:1364
#, c-format
msgid "User 2:"
msgstr "\xA8ϥΪ\xCC 2\xA1G"
-#: Merge.rc:1361
-#: Merge.rc:1366
-#: Merge.rc:1371
-#: Merge.rc:1376
-#: Merge.rc:1381
-#: Merge.rc:1386
-#: Merge.rc:1391
-#: Merge.rc:1396
-#: Merge.rc:1401
+#: Merge.rc:1369
+#: Merge.rc:1374
+#: Merge.rc:1379
+#: Merge.rc:1384
+#: Merge.rc:1389
+#: Merge.rc:1394
+#: Merge.rc:1399
+#: Merge.rc:1404
+#: Merge.rc:1409
#, c-format
msgid "Bold"
msgstr "\xB2\xCA\xC5\xE9"
-#: Merge.rc:1409
+#: Merge.rc:1417
#, c-format
msgid "Folder Compare Report"
msgstr "\xA4\xF1\xB8\xFB\xA5ؿ\xFD\xAB᪺\xB3\xF8\xA7i"
-#: Merge.rc:1412
+#: Merge.rc:1420
#, c-format
msgid "Report &File:"
msgstr "\xB3\xF8\xA7i\xC0\xC9(&F)\xA1G"
-#: Merge.rc:1415
-#: Merge.rc:1589
-#: Merge.rc:1593
-#: Merge.rc:1620
+#: Merge.rc:1423
+#: Merge.rc:1597
+#: Merge.rc:1601
+#: Merge.rc:1628
#, c-format
msgid "Browse..."
msgstr "\xC2s\xC4\xFD..."
-#: Merge.rc:1416
+#: Merge.rc:1424
#, c-format
msgid "&Style:"
msgstr "\xBC˦\xA1(&S)\xA1G"
-#: Merge.rc:1419
+#: Merge.rc:1427
#, c-format
msgid "&Copy to Clipboard"
msgstr "\xBDƻs\xA8\xEC\xB0ŶKï(&C)"
-#: Merge.rc:1427
+#: Merge.rc:1435
#, c-format
msgid "Shared or Private Filter"
msgstr "\xA6@\xA5ΩέӤH\xBFz\xBFﾹ"
-#: Merge.rc:1430
+#: Merge.rc:1438
#, c-format
msgid "Which type of filter do you want to create?"
msgstr "\xA7A\xADn\xABإ߭\xFE\xBAؿz\xBFﾹ\xA1H"
-#: Merge.rc:1432
+#: Merge.rc:1440
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr "\xA6@\xA5οz\xBFﾹ(\xBEA\xA5ΩҦ\xB3\xA8ϥΪ\xCC)"
-#: Merge.rc:1434
+#: Merge.rc:1442
#, c-format
msgid "Private Filter (only for current user)"
msgstr "\xADӤH\xBFz\xBFﾹ(\xB6ȾA\xA5β{\xA6b\xA8ϥΪ\xCC)"
-#: Merge.rc:1442
-#: Merge.rc:1908
+#: Merge.rc:1450
+#: Merge.rc:1930
#, c-format
msgid "Archive Support"
msgstr "\xA4䴩\xC0\xA3\xC1Y"
-# \xA1u\xA5H shared installation \xA6w\xB8\xCB7-Zip \xA5~\xB1\xBE\xA4~\xA6\xB3\xA4䴩\xC0\xA3\xC1Y\xA4\xA7\xB1\xF8\xA5\xF3\xA1G\xA1v\xA1u\xA5\xB2\xB6\xB7\xA5\xFD\xA6w\xB8\xCB 7-Zip \xA5~\xB1\xBE\xA1A\xA4~\xA4䴩\xC0\xA3\xC1Y\xA1G\xA1vI suggest "The following options shall be invalid without 7-Zip inerface plugin installed first." instead.
-#: Merge.rc:1445
+# \xA1u\xA5H shared installation \xA6w\xB8\xCB7-Zip \xA5~\xB1\xBE\xA4~\xA6\xB3\xA4䴩\xC0\xA3\xC1Y\xA4\xA7\xB1\xF8\xA5\xF3\xA1G\xA1v\xA1u\xA5\xB2\xB6\xB7\xA5\xFD\xA6w\xB8\xCB 7-Zip \xA5~\xB1\xBE\xA1A\xA4~\xA4䴩\xC0\xA3\xC1Y\xA1G\xA1v
+# I suggest "The following options shall be invalid without 7-Zip inerface plugin installed first." instead.
+#: Merge.rc:1453
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
-msgstr "\xA5\xB2\xB6\xB7\xA5\xFD\xA6w\xB8\xCB 7-Zip \xA4\xB6\xAD\xB1\xA5~\xB1\xBE\xA1A\xA4~\xA4䴩\xC0\xA3\xC1Y\xA1G"
+msgstr "\xA5\xB2\xB6\xB7\xA5\xFD\xA6w\xB8\xCB 7-Zip \xA4\xB6\xAD\xB1\xA5~\xB1\xBE\xA1A\xA9\xB3\xA4U\xBFﶵ\xA4~\xA5i\xA6\xE6\xA1G"
-#: Merge.rc:1447
+# I suggest "Download 7-Zip Interface-Plugin" instead.
+#: Merge.rc:1455
#, c-format
msgid "Download 7-zip Plugin"
msgstr "\xA4U\xB8\xFC 7-Zip \xA4\xB6\xAD\xB1\xA5~\xB1\xBE"
-#: Merge.rc:1448
+#: Merge.rc:1456
#, c-format
msgid "&Enable archive file support"
msgstr "\xC0\xA3\xC1Y\xC0ɤ䴩(&E)"
-#: Merge.rc:1450
+# I suggest "Use installed 7-Zip software" instead.
+#: Merge.rc:1458
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr "\xA8ϥοW\xA5ߪ\xBA 7-Zip \xB3n\xC5\xE9(&U)"
-#: Merge.rc:1453
+# \xA8ϥΥH sp in + st op \xBFﶵ\xA6w\xB8˪\xBA\xA5[\xB1\xBE\xC0\xC9(\xA6w\xB8\xCB7-Zip \xA5~\xB1\xBE\xAE\xC9)(&S)
+# I suggest "U&se WinMerge-dependent 7-Zip" or "U&se 7-Zip components installed by WinMerge Plugin-installer" instead.
+#: Merge.rc:1461
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr "\xA8ϥΤ\xA3\xBFW\xA5ߩ\xF3 WinMerge \xAA\xBA 7-Zip \xAE֤ߤ\xB8\xA5\xF3(&S)"
-#: Merge.rc:1455
+#: Merge.rc:1463
#, c-format
msgid "&Detect archive type from file signature"
msgstr "\xB0\xBB\xB4\xFA\xC0ɭ\xBA\xB8\xEA\xB0T\xA5H\xA8M\xA9w\xC0\xA3\xC1Y\xC0\xC9\xC3\xFE\xAB\xAC(&D)"
-#: Merge.rc:1463
+#: Merge.rc:1471
#, c-format
msgid "Compare Statistics"
msgstr "\xA4\xF1\xB8\xFB\xAB᪺\xB2έp"
-#: Merge.rc:1466
+#: Merge.rc:1474
#, c-format
msgid "Folders:"
msgstr "\xB8\xEA\xAEƧ\xA8\xA1G"
-#: Merge.rc:1467
+#: Merge.rc:1475
#, c-format
msgid "Files:"
msgstr "\xC0ɮסG"
-#: Merge.rc:1468
-#: Merge.rc:2276
+#: Merge.rc:1476
+#: Merge.rc:2310
#, c-format
msgid "Different"
msgstr "\xA4\xA3\xA6P"
-#: Merge.rc:1469
+#: Merge.rc:1477
#, c-format
msgid "Text:"
msgstr "\xA4\xE5\xA6r\xA1G"
-#: Merge.rc:1472
-#: Merge.rc:1491
+#: Merge.rc:1480
+#: Merge.rc:1499
#, c-format
msgid "Binary:"
msgstr "\xA4G\xB6i\xA8\xEE\xA1G"
-#: Merge.rc:1475
+#: Merge.rc:1483
#, c-format
msgid "Unique"
msgstr "\xBFW\xA6\xB3"
-#: Merge.rc:1476
+#: Merge.rc:1484
#, c-format
msgid "Left:"
msgstr "\xA5\xAA\xC3\xE4\xA1G"
-#: Merge.rc:1481
+#: Merge.rc:1489
#, c-format
msgid "Right:"
msgstr "\xA5k\xC3\xE4\xA1G"
-#: Merge.rc:1486
-#: Merge.rc:2271
+#: Merge.rc:1494
+#: Merge.rc:2305
#, c-format
msgid "Identical"
msgstr "\xA5\xFE\xA6P"
-#: Merge.rc:1495
+#: Merge.rc:1503
#, c-format
msgid "Total:"
msgstr "\xC1`\xADp\xA1G"
-#: Merge.rc:1500
+#: Merge.rc:1508
#, c-format
msgid "Close"
msgstr "\xC3\xF6\xB3\xAC"
-#: Merge.rc:1509
+#: Merge.rc:1517
#, c-format
msgid "Affects"
msgstr "\xBCv\xC5T"
-#: Merge.rc:1512
-#: Merge.rc:1515
+#: Merge.rc:1520
+#: Merge.rc:1523
#, c-format
msgid "(Affects)"
msgstr "(\xBCv\xC5T)"
-#: Merge.rc:1516
+#: Merge.rc:1524
#, c-format
msgid "Select Codepage for"
msgstr "\xBF\xEF\xA9w\xBDs\xBDX\xAD\xB6\xB5\xB9"
-#: Merge.rc:1517
+#: Merge.rc:1525
#, c-format
msgid "&File Loading:"
msgstr "\xADn\xB8\xFC\xA4J\xAA\xBA\xC0ɮ\xD7(&F)\xA1G"
-#: Merge.rc:1519
-#: Merge.rc:1522
+#: Merge.rc:1527
+#: Merge.rc:1530
#, c-format
msgid "..."
msgstr "..."
-#: Merge.rc:1520
+#: Merge.rc:1528
#, c-format
msgid "File &Saving:"
msgstr "\xADn\xC0x\xA6s\xAA\xBA\xC0ɮ\xD7(&S)\xA1G"
-#: Merge.rc:1523
+#: Merge.rc:1531
#, c-format
msgid "&Use same codepage for both"
msgstr "\xA8\xE2\xC0ɳ\xA3\xA5άۦP\xAA\xBA\xBDs\xBDX\xAD\xB6(&U)"
-#: Merge.rc:1526
+#: Merge.rc:1534
#, c-format
msgid "&Apply"
msgstr "\xAEM\xA5\xCE(&A)"
-#: Merge.rc:1527
-#: Merge.rc:1874
+#: Merge.rc:1535
+#: Merge.rc:1896
#, c-format
msgid "&Cancel"
msgstr "\xA8\xFA\xAE\xF8(&C)"
-#: Merge.rc:1532
+#: Merge.rc:1540
#, c-format
msgid "Test Filter"
msgstr "\xB4\xFA\xB8տz\xBFﾹ"
-#: Merge.rc:1535
+#: Merge.rc:1543
#, c-format
msgid "Testing filter ..."
msgstr "\xB4\xFA\xB8տz\xBFﾹ ..."
-#: Merge.rc:1537
+#: Merge.rc:1545
#, c-format
msgid "&Enter text to test:"
msgstr "\xBF\xE9\xA4J\xA4\xE5\xA6r\xA5H\xB0\xB5\xB4\xFA\xB8\xD5(&E)\xA1G"
-#: Merge.rc:1539
+#: Merge.rc:1547
#, c-format
msgid "&Folder Name"
msgstr "\xB8\xEA\xAEƧ\xA8\xA6W\xBA\xD9(&F)"
-#: Merge.rc:1541
+#: Merge.rc:1549
#, c-format
msgid "Result:"
msgstr "\xB5\xB2\xAAG\xA1G"
-#: Merge.rc:1545
+#: Merge.r...
[truncated message content] |
|
From: <ge...@us...> - 2008-08-08 22:12:20
|
Revision: 5769
http://winmerge.svn.sourceforge.net/winmerge/?rev=5769&view=rev
Author: gerundt
Date: 2008-08-08 22:12:16 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
PATCH: [ 2027300 ] Rename color scheme menu item "None" and add separator
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/Languages/English.pot
branches/R2_10/Src/Merge.rc
branches/R2_10/Src/MergeEditView.cpp
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-08 17:32:34 UTC (rev 5768)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-08 22:12:16 UTC (rev 5769)
@@ -18,6 +18,7 @@
Confirmation dialog for move operations (#2026508)
Unlimited undo (#2033754)
Add wait cursor for undo and redo (#2039228)
+ Rename color scheme menu item "None" and add separator (#2027300)
BugFix: Use system codepage for paths (#1979429, #2008581)
BugFix: ANSI build crash in folder compare (#2010053)
BugFix: Add insert/overtype mode indicator to statusbar (#2015174)
Modified: branches/R2_10/Src/Languages/English.pot
===================================================================
--- branches/R2_10/Src/Languages/English.pot 2008-08-08 17:32:34 UTC (rev 5768)
+++ branches/R2_10/Src/Languages/English.pot 2008-08-08 22:12:16 UTC (rev 5769)
@@ -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-08-06 19:36+0000\n"
+"POT-Creation-Date: 2008-08-09 00:09+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -3566,7 +3566,6 @@
#: Merge.rc:2161
#: Merge.rc:2600
-#: Merge.rc:2788
#, c-format
msgid "None"
msgstr ""
@@ -5374,6 +5373,11 @@
msgid "From MRU list"
msgstr ""
+#: Merge.rc:2788
+#, c-format
+msgid "No Highlighting"
+msgstr ""
+
#: Merge.rc:2789
#, c-format
msgid "ASP"
Modified: branches/R2_10/Src/Merge.rc
===================================================================
--- branches/R2_10/Src/Merge.rc 2008-08-08 17:32:34 UTC (rev 5768)
+++ branches/R2_10/Src/Merge.rc 2008-08-08 22:12:16 UTC (rev 5769)
@@ -2785,7 +2785,7 @@
// COLOR SCHEMES
STRINGTABLE
BEGIN
- IDS_COLORSCHEME_PLAIN "None"
+ IDS_COLORSCHEME_PLAIN "No Highlighting"
IDS_COLORSCHEME_ASP "ASP"
IDS_COLORSCHEME_BASIC "Basic"
IDS_COLORSCHEME_BATCH "Batch"
Modified: branches/R2_10/Src/MergeEditView.cpp
===================================================================
--- branches/R2_10/Src/MergeEditView.cpp 2008-08-08 17:32:34 UTC (rev 5768)
+++ branches/R2_10/Src/MergeEditView.cpp 2008-08-08 22:12:16 UTC (rev 5769)
@@ -3196,9 +3196,13 @@
const HMENU hSubMenu = pCmdUI->m_pSubMenu->m_hMenu;
- for (int i = ID_COLORSCHEME_FIRST; i <= ID_COLORSCHEME_LAST; ++i)
+ String name = theApp.LoadString(ID_COLORSCHEME_FIRST);
+ DoAppendMenu(hSubMenu, MF_STRING, ID_COLORSCHEME_FIRST, name.c_str());
+ DoAppendMenu(hSubMenu, MF_SEPARATOR, 0, NULL);
+
+ for (int i = ID_COLORSCHEME_FIRST + 1; i <= ID_COLORSCHEME_LAST; ++i)
{
- String name = theApp.LoadString(i);
+ name = theApp.LoadString(i);
DoAppendMenu(hSubMenu, MF_STRING, i, name.c_str());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-08-11 08:39:16
|
Revision: 5787
http://winmerge.svn.sourceforge.net/winmerge/?rev=5787&view=rev
Author: kimmov
Date: 2008-08-11 08:39:04 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
BUG: [ 2027325 ] "Syntax Highlight" menu item enabled, if option disabled
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/MergeDoc.cpp
branches/R2_10/Src/MergeEditView.cpp
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-11 03:28:03 UTC (rev 5786)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-11 08:39:04 UTC (rev 5787)
@@ -31,6 +31,8 @@
BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833)
BugFix: External editor command line switches did not work (#2037862)
BugFix: Editing line filters updated wrong filter (#2025130)
+ BugFix: Could change syntax highlight mode when highlighting was
+ disabled from options (#2027325)
Translation updates:
- Chinese Traditional (#2039929)
Modified: branches/R2_10/Src/MergeDoc.cpp
===================================================================
--- branches/R2_10/Src/MergeDoc.cpp 2008-08-11 03:28:03 UTC (rev 5786)
+++ branches/R2_10/Src/MergeDoc.cpp 2008-08-11 08:39:04 UTC (rev 5787)
@@ -2238,10 +2238,18 @@
sextL = GetFileExt(sLeftFile.c_str(), m_strDesc[0].c_str());
sextR = GetFileExt(sRightFile.c_str(), m_strDesc[1].c_str());
}
- BOOL bLeftTyped = pLeft->SetTextType(sextL.c_str());
+
+ BOOL syntaxHLEnabled = GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT);
+ BOOL bLeftTyped = FALSE;
+ BOOL bRightTyped = FALSE;
+
+ if (syntaxHLEnabled)
+ {
+ bLeftTyped = pLeft->SetTextType(sextL.c_str());
pLeftDetail->SetTextType(sextL.c_str());
- BOOL bRightTyped = pRight->SetTextType(sextR.c_str());
+ bRightTyped = pRight->SetTextType(sextR.c_str());
pRightDetail->SetTextType(sextR.c_str());
+ }
// If other side didn't have recognized texttype, apply recognized
// type to unrecognized one. (comparing file.cpp and file.bak applies
Modified: branches/R2_10/Src/MergeEditView.cpp
===================================================================
--- branches/R2_10/Src/MergeEditView.cpp 2008-08-11 03:28:03 UTC (rev 5786)
+++ branches/R2_10/Src/MergeEditView.cpp 2008-08-11 08:39:04 UTC (rev 5787)
@@ -2320,6 +2320,9 @@
SetSelectionMargin(GetOptionsMgr()->GetBool(OPT_VIEW_FILEMARGIN));
+ if (!GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT))
+ SetTextType(CCrystalTextView::TextType::SRC_PLAIN);
+
SetWordWrapping(GetOptionsMgr()->GetBool(OPT_WORDWRAP));
SetViewLineNumbers(GetOptionsMgr()->GetBool(OPT_VIEW_LINENUMBERS));
m_cachedColors.clrDiff = GetOptionsMgr()->GetInt(OPT_CLR_DIFF);
@@ -3242,7 +3245,11 @@
const bool bIsCurrentScheme = (m_CurSourceDef->type == (pCmdUI->m_nID - ID_COLORSCHEME_FIRST));
pCmdUI->SetRadio(bIsCurrentScheme);
- pCmdUI->Enable(TRUE);
+ BOOL syntaxHLEnabled = GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT);
+ if (syntaxHLEnabled)
+ pCmdUI->Enable(TRUE);
+ else
+ pCmdUI->Enable(FALSE);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-08-11 21:18:07
|
Revision: 5788
http://winmerge.svn.sourceforge.net/winmerge/?rev=5788&view=rev
Author: kimmov
Date: 2008-08-11 21:17:49 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
BUG: [ 2000996 ] Syntax coloring boldface not working in most fonts
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/editlib/ccrystaltextview.cpp
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-11 08:39:04 UTC (rev 5787)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-11 21:17:49 UTC (rev 5788)
@@ -33,6 +33,7 @@
BugFix: Editing line filters updated wrong filter (#2025130)
BugFix: Could change syntax highlight mode when highlighting was
disabled from options (#2027325)
+ BugFix: Boldfacing did work only for Courier font (#2000996)
Translation updates:
- Chinese Traditional (#2039929)
Modified: branches/R2_10/Src/editlib/ccrystaltextview.cpp
===================================================================
--- branches/R2_10/Src/editlib/ccrystaltextview.cpp 2008-08-11 08:39:04 UTC (rev 5787)
+++ branches/R2_10/Src/editlib/ccrystaltextview.cpp 2008-08-11 21:17:49 UTC (rev 5788)
@@ -2296,15 +2296,14 @@
CClientDC dc (GetDesktopWindow ());
m_lfBaseFont.lfHeight = -MulDiv (11, dc.GetDeviceCaps (LOGPIXELSY), 72);
}
- m_lfBaseFont.lfWeight = bBold && !_tcsnicmp (m_lfBaseFont.lfFaceName, _T ("Courier"), 7) ? FW_BOLD : FW_NORMAL;
- m_lfBaseFont.lfItalic = (BYTE) (bItalic && !_tcsnicmp (m_lfBaseFont.lfFaceName, _T ("Courier"), 7));
+ m_lfBaseFont.lfWeight = bBold ? FW_BOLD : FW_NORMAL;
+ m_lfBaseFont.lfItalic = (BYTE) bItalic;
if (!m_apFonts[nIndex]->CreateFontIndirect (&m_lfBaseFont))
{
delete m_apFonts[nIndex];
m_apFonts[nIndex] = NULL;
return CView::GetFont ();
}
-
}
return m_apFonts[nIndex];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-08-12 21:06:30
|
Revision: 5794
http://winmerge.svn.sourceforge.net/winmerge/?rev=5794&view=rev
Author: gerundt
Date: 2008-08-12 21:06:27 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
PATCH: [ 2047054 ] Add icon for "Open Conflict File" menu item
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/MainFrm.cpp
branches/R2_10/Src/Merge2.rc
branches/R2_10/Src/resource.h
Added Paths:
-----------
branches/R2_10/Src/res/open_conflict.bmp
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-12 20:03:39 UTC (rev 5793)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-12 21:06:27 UTC (rev 5794)
@@ -19,6 +19,7 @@
Unlimited undo (#2033754)
Add wait cursor for undo and redo (#2039228)
Rename color scheme menu item "None" and add separator (#2027300)
+ Add icon for "Open Conflict File" menu item (#2047054)
BugFix: Use system codepage for paths (#1979429, #2008581)
BugFix: ANSI build crash in folder compare (#2010053)
BugFix: Add insert/overtype mode indicator to statusbar (#2015174)
Modified: branches/R2_10/Src/MainFrm.cpp
===================================================================
--- branches/R2_10/Src/MainFrm.cpp 2008-08-12 20:03:39 UTC (rev 5793)
+++ branches/R2_10/Src/MainFrm.cpp 2008-08-12 21:06:27 UTC (rev 5794)
@@ -96,6 +96,7 @@
* @brief A table associating menuitem id, icon and menus to apply.
*/
const CMainFrame::MENUITEM_ICON CMainFrame::m_MenuIcons[] = {
+ { ID_FILE_OPENCONFLICT, IDB_FILE_OPENCONFLICT, CMainFrame::MENU_ALL },
{ ID_EDIT_COPY, IDB_EDIT_COPY, CMainFrame::MENU_ALL },
{ ID_EDIT_CUT, IDB_EDIT_CUT, CMainFrame::MENU_ALL },
{ ID_EDIT_PASTE, IDB_EDIT_PASTE, CMainFrame::MENU_ALL },
Modified: branches/R2_10/Src/Merge2.rc
===================================================================
--- branches/R2_10/Src/Merge2.rc 2008-08-12 20:03:39 UTC (rev 5793)
+++ branches/R2_10/Src/Merge2.rc 2008-08-12 21:06:27 UTC (rev 5794)
@@ -138,6 +138,7 @@
IDB_TOOLBAR_ENABLED32 BITMAP "res\\ToolbarEnabled32.bmp"
IDB_VIEW_ZOOMIN BITMAP "res\\zoom_in.bmp"
IDB_VIEW_ZOOMOUT BITMAP "res\\zoom_out.bmp"
+IDB_FILE_OPENCONFLICT BITMAP "res\\open_conflict.bmp"
/////////////////////////////////////////////////////////////////////////////
Property changes on: branches/R2_10/Src/res/open_conflict.bmp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/R2_10/Src/resource.h
===================================================================
--- branches/R2_10/Src/resource.h 2008-08-12 20:03:39 UTC (rev 5793)
+++ branches/R2_10/Src/resource.h 2008-08-12 21:06:27 UTC (rev 5794)
@@ -100,6 +100,7 @@
#define IDB_TOOLBAR_ENABLED32 357
#define IDB_VIEW_ZOOMIN 358
#define IDB_VIEW_ZOOMOUT 359
+#define IDB_FILE_OPENCONFLICT 361
#define IDI_FOLDER 500
#define IDI_LFOLDER 501
#define IDI_RFOLDER 502
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-08-13 05:28:27
|
Revision: 5796
http://winmerge.svn.sourceforge.net/winmerge/?rev=5796&view=rev
Author: kimmov
Date: 2008-08-13 05:28:25 +0000 (Wed, 13 Aug 2008)
Log Message:
-----------
PATCH: [ 2046002 ] Fix losing focus after folder compare operations
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/Common/CShellFileOp.cpp
branches/R2_10/Src/DirActions.cpp
branches/R2_10/Src/MainFrm.cpp
branches/R2_10/Src/Merge.cpp
branches/R2_10/Src/Merge.h
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-13 04:12:20 UTC (rev 5795)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-13 05:28:25 UTC (rev 5796)
@@ -35,6 +35,7 @@
BugFix: Could change syntax highlight mode when highlighting was
disabled from options (#2027325)
BugFix: Boldfacing did work only for Courier font (#2000996)
+ Bugfix: Lost focus after folder compare operations (#2046002)
Translation updates:
- Chinese Traditional (#2039929)
Modified: branches/R2_10/Src/Common/CShellFileOp.cpp
===================================================================
--- branches/R2_10/Src/Common/CShellFileOp.cpp 2008-08-13 04:12:20 UTC (rev 5795)
+++ branches/R2_10/Src/Common/CShellFileOp.cpp 2008-08-13 05:28:25 UTC (rev 5796)
@@ -540,9 +540,7 @@
}
// drum roll please....
- ((CFrameWnd *)AfxGetMainWnd())->BeginModalState();
nAPIRet = SHFileOperation ( &m_rFOS ); // tah-dah!
- ((CFrameWnd *)AfxGetMainWnd())->EndModalState();
// Save the return value from the API.
if ( NULL != lpnAPIReturn )
{
Modified: branches/R2_10/Src/DirActions.cpp
===================================================================
--- branches/R2_10/Src/DirActions.cpp 2008-08-13 04:12:20 UTC (rev 5795)
+++ branches/R2_10/Src/DirActions.cpp 2008-08-13 05:28:25 UTC (rev 5796)
@@ -973,8 +973,10 @@
actionScript.SetParentWindow(this->GetSafeHwnd());
+ theApp.AddOperation();
if (actionScript.Run())
UpdateAfterFileScript(actionScript);
+ theApp.RemoveOperation();
}
/**
Modified: branches/R2_10/Src/MainFrm.cpp
===================================================================
--- branches/R2_10/Src/MainFrm.cpp 2008-08-13 04:12:20 UTC (rev 5795)
+++ branches/R2_10/Src/MainFrm.cpp 2008-08-13 05:28:25 UTC (rev 5796)
@@ -1756,6 +1756,9 @@
*/
void CMainFrame::OnClose()
{
+ if (theApp.GetActiveOperations())
+ return;
+
// Check if there are multiple windows open and ask for closing them
BOOL bAskClosing = GetOptionsMgr()->GetBool(OPT_ASK_MULTIWINDOW_CLOSE);
if (bAskClosing)
Modified: branches/R2_10/Src/Merge.cpp
===================================================================
--- branches/R2_10/Src/Merge.cpp 2008-08-13 04:12:20 UTC (rev 5795)
+++ branches/R2_10/Src/Merge.cpp 2008-08-13 05:28:25 UTC (rev 5796)
@@ -137,6 +137,7 @@
, m_bNonInteractive(false)
, m_pOptions(NULL)
, m_pLog(NULL)
+, m_nActiveOperations(0)
{
// add construction code here,
// Place all significant initialization in InitInstance
Modified: branches/R2_10/Src/Merge.h
===================================================================
--- branches/R2_10/Src/Merge.h 2008-08-13 04:12:20 UTC (rev 5795)
+++ branches/R2_10/Src/Merge.h 2008-08-13 05:28:25 UTC (rev 5796)
@@ -113,6 +113,31 @@
void ReloadMenu();
+ //@{
+ /**
+ * @name Active operations counter.
+ * These functions implement counter for active operations. We need to
+ * track active operations during whose user cannot exit the application.
+ * E.g. copying files in folder compare is such an operation.
+ */
+ /**
+ * Increment the active operation counter.
+ */
+ void AddOperation() { InterlockedIncrement(&m_nActiveOperations); }
+ /**
+ * Decrement the active operation counter.
+ */
+ void RemoveOperation()
+ {
+ ASSERT(m_nActiveOperations > 0);
+ InterlockedDecrement( &m_nActiveOperations);
+ }
+ /**
+ * Get the active operations count.
+ */
+ LONG GetActiveOperations() const { return m_nActiveOperations; }
+ //@}
+
//{{AFX_MSG(CMergeApp)
afx_msg BOOL OnOpenRecentFile(UINT nID);
afx_msg void OnAppAbout();
@@ -127,6 +152,7 @@
CLogFile * m_pLog;
int m_nLastCompareResult;
bool m_bNonInteractive;
+ LONG m_nActiveOperations; /**< Active operations count. */
};
extern CMergeApp theApp;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-08-15 04:48:35
|
Revision: 5809
http://winmerge.svn.sourceforge.net/winmerge/?rev=5809&view=rev
Author: sdottaka
Date: 2008-08-15 04:48:32 +0000 (Fri, 15 Aug 2008)
Log Message:
-----------
Japanese translation - update
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/Languages/Japanese.po
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-15 04:46:43 UTC (rev 5808)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-15 04:48:32 UTC (rev 5809)
@@ -3,6 +3,11 @@
to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
http://winmerge.org/tracker/[tracker-id]
+
+WinMerge 2.10 RC
+ Translation updates:
+ - Japanese (r5804)
+
WinMerge 2.9.10 - 2008-08-14 (r5804)
Manual: Introduction update (#2011365)
Manual: Reorganize structure (#2011924)
Modified: branches/R2_10/Src/Languages/Japanese.po
===================================================================
--- branches/R2_10/Src/Languages/Japanese.po 2008-08-15 04:46:43 UTC (rev 5808)
+++ branches/R2_10/Src/Languages/Japanese.po 2008-08-15 04:48:32 UTC (rev 5809)
@@ -285,7 +285,7 @@
#: Merge.rc:450
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "\x83\x8A\x83X\x83g(&L)..."
#: Merge.rc:152
#: Merge.rc:269
@@ -2582,12 +2582,12 @@
#: Merge.rc:1658
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "\x83v\x83\x89\x83O\x83C\x83\x93"
#: Merge.rc:1661
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "\x83v\x83\x89\x83O\x83C\x83\x93\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9(&E)"
#. StringFileInfo.Block
#: Merge.rc:1691
@@ -3454,6 +3454,9 @@
#, c-format
msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
msgstr ""
+"\x83t\x83B\x83\x8B\x83^\x82\xAA\x8DX\x90V\x82\xB3\x82\xEA\x82܂\xB5\x82\xBD\x81B\x8C\xBB\x8D݊J\x82\xA2\x82Ă\xA2\x82邷\x82ׂẴt\x83H\x83\x8B\x83_\x94\xE4\x8Ar\x83E\x83C\x83\x93\x83h\x83E\x82\xF0\x8DX\x90V\x82\xB5\x82܂\xB7\x82\xA9?\n"
+"\n"
+"\x82\xE0\x82\xB5\x81A\x82\xA2\x82܂͂\xB7\x82ׂĂ̔\xE4\x8Ar\x83E\x83C\x83\x93\x83h\x83E\x82\xF0\x8DX\x90V\x82\xB5\x82\xBD\x82\xAD\x82Ȃ\xA2\x8Fꍇ\x81A\x82\xA2\x82\xA2\x82\xA6\x82\xF0\x91I\x91\xF0\x82\xB5\x81A\x8C\xE3\x82Ŕ\xE4\x8Ar\x83E\x83C\x83\x93\x83h\x83E\x82\xF0\x8DX\x90V\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B"
#: Merge.rc:2043
#, c-format
@@ -3548,12 +3551,12 @@
#: Merge.rc:2071
#, c-format
msgid "Undoing the last operation..."
-msgstr ""
+msgstr "\x8DŌ\xE3\x82̑\x80\x8D\xEC\x82\xF0\x8C\xB3\x82ɖ߂\xB5\x82Ă\xA2\x82܂\xB7..."
#: Merge.rc:2072
#, c-format
msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "\x91O\x82̑\x80\x8D\xEC\x82\xF0\x82\xE2\x82蒼\x82\xB5\x82Ă\xA2\x82܂\xB7..."
#: Merge.rc:2078
#, c-format
@@ -4089,17 +4092,17 @@
#: Merge.rc:2218
#, c-format
msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "\x8D\x80\x96ڂ\xF0\x88ړ\xAE\x82\xB5\x82܂\xB7\x82\xA9?: "
#: Merge.rc:2219
#, c-format
msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "%d\x8C̍\x80\x96ڂ\xF0\x88ړ\xAE\x82\xB5\x82܂\xB7\x82\xA9?: "
#: Merge.rc:2221
#, c-format
msgid "Confirm Move"
-msgstr ""
+msgstr "\x88ړ\xAE\x82̊m\x94F"
#: Merge.rc:2227
#, c-format
@@ -5289,22 +5292,22 @@
#: Merge.rc:2617
#, c-format
msgid "Type"
-msgstr ""
+msgstr "\x83^\x83C\x83v"
#: Merge.rc:2619
#, c-format
msgid "Unpacker"
-msgstr ""
+msgstr "\x93W\x8AJ\x83v\x83\x89\x83O\x83C\x83\x93"
#: Merge.rc:2620
#, c-format
msgid "Prediffer"
-msgstr ""
+msgstr "\x94\xE4\x8Ar\x91O\x8F\x88\x97\x9D\x83v\x83\x89\x83O\x83C\x83\x93"
#: Merge.rc:2621
#, c-format
msgid "Editor script"
-msgstr ""
+msgstr "\x83G\x83f\x83B\x83^\x83X\x83N\x83\x8A\x83v\x83g"
#: Merge.rc:2628
#, c-format
@@ -5329,12 +5332,12 @@
#: Merge.rc:2632
#, c-format
msgid "Change left side file/folder read-only status"
-msgstr ""
+msgstr "\x8D\xB6\x91\xA4\x82̃t\x83@\x83C\x83\x8B/\x83t\x83H\x83\x8B\x83_\x82\xF0\x83\x8A\x81[\x83h\x83I\x83\x93\x83\x8A\x81[\x8F\xF3\x91ԂɕύX\x82\xB5\x82܂\xB7"
#: Merge.rc:2633
#, c-format
msgid "Change right side file/folder read-only status"
-msgstr ""
+msgstr "\x89E\x91\xA4\x82̃t\x83@\x83C\x83\x8B/\x83t\x83H\x83\x8B\x83_\x82\xF0\x83\x8A\x81[\x83h\x83I\x83\x93\x83\x8A\x81[\x8F\xF3\x91ԂɕύX\x82\xB5\x82܂\xB7"
#: Merge.rc:2634
#, c-format
@@ -5725,7 +5728,7 @@
#: Merge.rc:2718
#, c-format
msgid "Shows a list of available plugins"
-msgstr ""
+msgstr "\x97\x98\x97p\x89\\x82ȃv\x83\x89\x83O\x83C\x83\x93\x82̃\x8A\x83X\x83g\x82\xF0\x95\\x8E\xA6\x82\xB5\x82܂\xB7"
#: Merge.rc:2719
#, c-format
@@ -5911,7 +5914,7 @@
#: Merge.rc:2788
#, c-format
msgid "No Highlighting"
-msgstr ""
+msgstr "\x83n\x83C\x83\x89\x83C\x83g\x82Ȃ\xB5"
#: Merge.rc:2789
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-08-15 06:46:17
|
Revision: 5812
http://winmerge.svn.sourceforge.net/winmerge/?rev=5812&view=rev
Author: sdottaka
Date: 2008-08-15 06:46:14 +0000 (Fri, 15 Aug 2008)
Log Message:
-----------
PATCH [ 1989858 ] Use std::vector in word-diff code(2)
- BugFix: Didn't select word-diff cyclically by pressing F4 key
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/MergeDocLineDiffs.cpp
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-15 06:45:14 UTC (rev 5811)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-15 06:46:14 UTC (rev 5812)
@@ -3,8 +3,8 @@
to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
http://winmerge.org/tracker/[tracker-id]
-
WinMerge 2.10 RC
+ BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858)
Translation updates:
- Japanese (r5804)
Modified: branches/R2_10/Src/MergeDocLineDiffs.cpp
===================================================================
--- branches/R2_10/Src/MergeDocLineDiffs.cpp 2008-08-15 06:45:14 UTC (rev 5811)
+++ branches/R2_10/Src/MergeDocLineDiffs.cpp 2008-08-15 06:46:14 UTC (rev 5812)
@@ -238,7 +238,7 @@
}
// Are we continuing a cycle from the same place ?
- if (whichdiff >= worddiffs.size())
+ if (whichdiff >= (int)worddiffs.size())
whichdiff = -2; // Clearly not continuing the same cycle, reset to not in cycle
// After last diff, reset to get full line again
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-08-17 17:33:14
|
Revision: 5815
http://winmerge.svn.sourceforge.net/winmerge/?rev=5815&view=rev
Author: sdottaka
Date: 2008-08-17 17:33:10 +0000 (Sun, 17 Aug 2008)
Log Message:
-----------
PATCH: [ 2008581 ] Convert paths using system codepage
Fixed crash in DirCmpReport::WriteString()
(merge Jochen's fix from trunk rev. 5652)
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/DirCmpReport.cpp
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-15 14:13:13 UTC (rev 5814)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-17 17:33:10 UTC (rev 5815)
@@ -5,6 +5,7 @@
WinMerge 2.10 RC
BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858)
+ BugFix: Crash when generating a folder comparison report (#2008581)
Translation updates:
- Japanese (r5804)
Modified: branches/R2_10/Src/DirCmpReport.cpp
===================================================================
--- branches/R2_10/Src/DirCmpReport.cpp 2008-08-15 14:13:13 UTC (rev 5814)
+++ branches/R2_10/Src/DirCmpReport.cpp 2008-08-17 17:33:10 UTC (rev 5815)
@@ -223,7 +223,8 @@
*/
void DirCmpReport::WriteString(LPCTSTR pszText)
{
- LPCSTR pchOctets = ansiconvert_ThreadCP((LPTSTR)pszText);
+ LPCSTR pchOctets = ansiconvert_ThreadCP(pszText);
+ void *pvOctets = const_cast<char *>(pchOctets);
size_t cchAhead = strlen(pchOctets);
while (LPCSTR pchAhead = (LPCSTR)memchr(pchOctets, '\n', cchAhead))
{
@@ -236,7 +237,7 @@
cchAhead -= cchLine;
}
m_pFile->Write(pchOctets, cchAhead);
- free((void*)pchOctets);
+ free(pvOctets);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-08-18 19:39:52
|
Revision: 5817
http://winmerge.svn.sourceforge.net/winmerge/?rev=5817&view=rev
Author: gerundt
Date: 2008-08-18 19:39:46 +0000 (Mon, 18 Aug 2008)
Log Message:
-----------
PATCH: [ 2045666 ] Various Updates in German Translation
Modified Paths:
--------------
branches/R2_10/Docs/Users/ChangeLog.txt
branches/R2_10/Src/Languages/German.po
Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-18 19:38:32 UTC (rev 5816)
+++ branches/R2_10/Docs/Users/ChangeLog.txt 2008-08-18 19:39:46 UTC (rev 5817)
@@ -7,6 +7,7 @@
BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858)
BugFix: Crash when generating a folder comparison report (#2008581)
Translation updates:
+ - German (#2045666)
- Japanese (r5804)
WinMerge 2.9.10 - 2008-08-14 (r5804)
Modified: branches/R2_10/Src/Languages/German.po
===================================================================
--- branches/R2_10/Src/Languages/German.po 2008-08-18 19:38:32 UTC (rev 5816)
+++ branches/R2_10/Src/Languages/German.po 2008-08-18 19:39:46 UTC (rev 5817)
@@ -14,7 +14,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2008-04-21 23:30+0100\n"
+"PO-Revision-Date: 2008-08-16 14:30+0100\n"
"Last-Translator: Tim Gerundt <tim at gerundt.de>\n"
"Language-Team: German <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -287,7 +287,7 @@
#: Merge.rc:450
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&Liste..."
#: Merge.rc:152
#: Merge.rc:269
@@ -2588,12 +2588,12 @@
#: Merge.rc:1658
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "Plugins"
#: Merge.rc:1661
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "&Plugins aktivieren"
#. StringFileInfo.Block
#: Merge.rc:1691
@@ -3428,8 +3428,14 @@
#: Merge.rc:2037
#, c-format
-msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
+msgid ""
+"Filters were updated. Do you want to refresh all open folder compares?\n"
+"\n"
+"If you do not want to refresh all compares now you can select No and refresh compares later."
msgstr ""
+"Filter wurden aktualisiert. Wollen Sie alle ge\xF6ffneten Ordnervergleiche aktualisieren?\n"
+"\n"
+"Wenn Sie nicht jetzt alle Vergleiche aktualisieren m\xF6chten, k\xF6nnen Sie Nein w\xE4hlen und die Vergleiche sp\xE4ter aktualisieren."
#: Merge.rc:2043
#, c-format
@@ -3521,15 +3527,17 @@
msgid "Creating the report..."
msgstr "Erzeugt den Bericht..."
+# Use action instead operation, like the rest of the undo/redo system.
#: Merge.rc:2071
#, c-format
msgid "Undoing the last operation..."
-msgstr ""
+msgstr "R\xFCckg\xE4ngigmachen der letzten Aktion..."
+# Use action instead operation, like the rest of the undo/redo system.
#: Merge.rc:2072
#, c-format
msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "Wiederholen der vorherigen Aktion..."
#: Merge.rc:2078
#, c-format
@@ -4067,17 +4075,17 @@
#: Merge.rc:2218
#, c-format
msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "Wollen Sie wirklich verschieben:"
#: Merge.rc:2219
#, c-format
msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "Wollen Sie wirklich %d Objekte verschieben:"
#: Merge.rc:2221
#, c-format
msgid "Confirm Move"
-msgstr ""
+msgstr "Verschieben best\xE4tigen"
#: Merge.rc:2227
#, c-format
@@ -5266,22 +5274,22 @@
#: Merge.rc:2617
#, c-format
msgid "Type"
-msgstr ""
+msgstr "Typ"
#: Merge.rc:2619
#, c-format
msgid "Unpacker"
-msgstr ""
+msgstr "Entpacker"
#: Merge.rc:2620
#, c-format
msgid "Prediffer"
-msgstr ""
+msgstr "Prediffer"
#: Merge.rc:2621
#, c-format
msgid "Editor script"
-msgstr ""
+msgstr "Editor-Skript"
#: Merge.rc:2628
#, c-format
@@ -5306,12 +5314,12 @@
#: Merge.rc:2632
#, c-format
msgid "Change left side file/folder read-only status"
-msgstr ""
+msgstr "\xC4ndert den linken Schreibschutz-Status."
#: Merge.rc:2633
#, c-format
msgid "Change right side file/folder read-only status"
-msgstr ""
+msgstr "\xC4ndert den rechten Schreibschutz-Status."
#: Merge.rc:2634
#, c-format
@@ -5702,7 +5710,7 @@
#: Merge.rc:2718
#, c-format
msgid "Shows a list of available plugins"
-msgstr ""
+msgstr "Zeigt eine Liste der verf\xFCgbaren Plugins."
#: Merge.rc:2719
#, c-format
@@ -5888,7 +5896,7 @@
#: Merge.rc:2788
#, c-format
msgid "No Highlighting"
-msgstr ""
+msgstr "Keine Hervorhebung"
#: Merge.rc:2789
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X