PATCH: [ 2013845 ] Add option to enable plugins (disabled by default)

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index 9a19ac7..ab7585c 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -8,6 +8,7 @@ WinMerge 2.11.1.1
   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)
   BugFix: Use system codepage for paths (#1979429, #2008581)
 
 WinMerge 2.10.x (R2_10) branch created (r5561)

diff --git a/Src/DiffContext.cpp b/Src/DiffContext.cpp
index 2462fdc..5a7811d 100644 (file)
--- a/Src/DiffContext.cpp
+++ b/Src/DiffContext.cpp
@@ -70,6 +70,7 @@ CDiffContext::CDiffContext(LPCTSTR pszLeft /*=NULL*/, LPCTSTR pszRight /*=NULL*/
 , m_pFilterList(NULL)
 , m_pCompareOptions(NULL)
 , m_pOptions(NULL)
+, m_bPluginsEnabled(false)
 {
        m_paths.SetLeft(pszLeft);
        m_paths.SetRight(pszRight);

diff --git a/Src/DiffContext.h b/Src/DiffContext.h
index 657116b..280b003 100644 (file)
--- a/Src/DiffContext.h
+++ b/Src/DiffContext.h
@@ -152,6 +152,7 @@ public:
         * 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:

diff --git a/Src/DiffWrapper.cpp b/Src/DiffWrapper.cpp
index 6960147..2528e01 100644 (file)
--- a/Src/DiffWrapper.cpp
+++ b/Src/DiffWrapper.cpp
@@ -91,6 +91,7 @@ CDiffWrapper::CDiffWrapper()
 , 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 @@ CDiffWrapper::~CDiffWrapper()
 }
 
 /**
+ * @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.
@@ -671,52 +681,55 @@ BOOL CDiffWrapper::RunFileDiff()
        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();
+                       }
+               }
+
+               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, 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
                        m_infoPrediffer->bToBeScanned = FALSE;
                        m_infoPrediffer->pluginName.erase();
                }
+               FileTransform_UCS2ToUTF8(strFile2Temp, m_bPathsAreTemp);
        }
 
-       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;
        diffdata.SetDisplayFilepaths(filepath1.c_str(), filepath2.c_str()); // store true names for diff utils patch file
        // This opens & fstats both files (if it succeeds)
@@ -793,26 +806,28 @@ BOOL CDiffWrapper::RunFileDiff()
        // 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;
 }
 

diff --git a/Src/DiffWrapper.h b/Src/DiffWrapper.h
index ac8a2c4..7ab6fc5 100644 (file)
--- a/Src/DiffWrapper.h
+++ b/Src/DiffWrapper.h
@@ -168,6 +168,7 @@ public:
        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 @@ private:
        DiffList *m_pDiffList; /**< Pointer to external DiffList */
        MovedLines * m_pMovedLines;
        FilterCommentsManager * m_FilterCommentsManager; /**< Comments filtering manager */
+       bool m_bPluginsEnabled; /**< Are plugins enabled? */
 };
 
 

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index a17ef4b..e86b14f 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -343,6 +343,7 @@ void CDirDoc::Rescan()
        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

diff --git a/Src/FolderCmp.cpp b/Src/FolderCmp.cpp
index da4d209..c9d4ebd 100644 (file)
--- a/Src/FolderCmp.cpp
+++ b/Src/FolderCmp.cpp
@@ -83,8 +83,6 @@ bool FolderCmp::RunPlugins(CDiffContext * pCtxt, PluginsContext * plugCtxt, CStr
        // 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 @@ bool FolderCmp::RunPlugins(CDiffContext * pCtxt, PluginsContext * plugCtxt, CStr
                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 @@ bool FolderCmp::RunPlugins(CDiffContext * pCtxt, PluginsContext * plugCtxt, CStr
        // 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 @@ bool FolderCmp::RunPlugins(CDiffContext * pCtxt, PluginsContext * plugCtxt, CStr
 
 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 FolderCmp::prepAndCompareTwoFiles(CDiffContext * pCtxt, DIFFITEM &di)
 
        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 @@ UINT FolderCmp::prepAndCompareTwoFiles(CDiffContext * pCtxt, DIFFITEM &di)
                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);
        }

diff --git a/Src/Languages/English.pot b/Src/Languages/English.pot
index eb6ffb6..ed1eb10 100644 (file)
--- a/Src/Languages/English.pot
+++ b/Src/Languages/English.pot
@@ -8,7 +8,7 @@ msgid ""
 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-09 14:28+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -376,7 +376,7 @@ msgstr ""
 #: Merge.rc:173
 #: Merge.rc:287
 #: Merge.rc:472
-#: Merge.rc:1891
+#: Merge.rc:1893
 #, c-format
 msgid "&Help"
 msgstr ""
@@ -692,7 +692,7 @@ msgid "&Scripts"
 msgstr ""
 
 #: Merge.rc:360
-#: Merge.rc:2707
+#: Merge.rc:2709
 #, c-format
 msgid "< Empty >"
 msgstr ""
@@ -889,15 +889,15 @@ msgid "&Delete"
 msgstr ""
 
 #: Merge.rc:510
-#: Merge.rc:1128
-#: Merge.rc:1510
+#: Merge.rc:1130
+#: Merge.rc:1512
 #, c-format
 msgid "&Left"
 msgstr ""
 
 #: Merge.rc:511
-#: Merge.rc:1130
-#: Merge.rc:1513
+#: Merge.rc:1132
+#: Merge.rc:1515
 #, c-format
 msgid "&Right"
 msgstr ""
@@ -1049,16 +1049,16 @@ 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:785
+#: Merge.rc:971
+#: Merge.rc:1049
+#: Merge.rc:1078
+#: Merge.rc:1088
+#: Merge.rc:1254
+#: Merge.rc:1318
+#: Merge.rc:1331
+#: Merge.rc:1423
+#: Merge.rc:1438
 #, c-format
 msgid "OK"
 msgstr ""
@@ -1074,39 +1074,39 @@ msgid "Select Files or Folders"
 msgstr ""
 
 #: Merge.rc:672
-#: Merge.rc:1587
+#: Merge.rc:1589
 #, c-format
 msgid "&Left:"
 msgstr ""
 
 #: Merge.rc:676
 #: Merge.rc:737
-#: Merge.rc:990
-#: Merge.rc:1012
+#: Merge.rc:992
+#: Merge.rc:1014
 #, c-format
 msgid "&Browse..."
 msgstr ""
 
 #: Merge.rc:677
-#: Merge.rc:1591
+#: Merge.rc:1593
 #, c-format
 msgid "&Right:"
 msgstr ""
 
 #: Merge.rc:681
-#: Merge.rc:1023
+#: Merge.rc:1025
 #, c-format
 msgid "Bro&wse..."
 msgstr ""
 
 #: Merge.rc:682
-#: Merge.rc:1595
+#: Merge.rc:1597
 #, c-format
 msgid "&Filter:"
 msgstr ""
 
 #: Merge.rc:685
-#: Merge.rc:1597
+#: Merge.rc:1599
 #, c-format
 msgid "Select..."
 msgstr ""
@@ -1122,7 +1122,7 @@ msgid "&Select..."
 msgstr ""
 
 #: Merge.rc:690
-#: Merge.rc:1598
+#: Merge.rc:1600
 #, c-format
 msgid "&Include Subfolders"
 msgstr ""
@@ -1134,24 +1134,24 @@ 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:786
+#: Merge.rc:816
+#: Merge.rc:848
+#: Merge.rc:858
+#: Merge.rc:1050
+#: Merge.rc:1079
+#: Merge.rc:1089
+#: Merge.rc:1140
+#: Merge.rc:1255
+#: Merge.rc:1332
+#: Merge.rc:1424
+#: Merge.rc:1439
 #, c-format
 msgid "Cancel"
 msgstr ""
 
 #: Merge.rc:695
-#: Merge.rc:1331
+#: Merge.rc:1333
 #, c-format
 msgid "Help"
 msgstr ""
@@ -1192,7 +1192,7 @@ msgid "Link to Destination VSS project"
 msgstr ""
 
 #: Merge.rc:720
-#: Merge.rc:861
+#: Merge.rc:863
 #, c-format
 msgid "Apply to all items"
 msgstr ""
@@ -1203,7 +1203,7 @@ msgid "Check Out"
 msgstr ""
 
 #: Merge.rc:723
-#: Merge.rc:857
+#: Merge.rc:859
 #, c-format
 msgid "Save As..."
 msgstr ""
@@ -1224,7 +1224,7 @@ msgid "&Path to cleartool.exe:"
 msgstr ""
 
 #: Merge.rc:742
-#: Merge.rc:1899
+#: Merge.rc:1901
 #, c-format
 msgid "General"
 msgstr ""
@@ -1266,1430 +1266,1433 @@ msgstr ""
 
 #: Merge.rc:762
 #, c-format
-msgid "O&pen-dialog Auto-Completion:"
+msgid "E&nable plugins"
 msgstr ""
 
-#: Merge.rc:765
+#: Merge.rc:764
 #, c-format
-msgid "Enable multiple compare windows for"
+msgid "O&pen-dialog Auto-Completion:"
 msgstr ""
 
 #: Merge.rc:767
-#: Merge.rc:1610
 #, c-format
-msgid "&Folder compare"
+msgid "Enable multiple compare windows for"
 msgstr ""
 
 #: Merge.rc:769
 #: Merge.rc:1612
 #, c-format
-msgid "Fil&e compare"
+msgid "&Folder compare"
 msgstr ""
 
 #: Merge.rc:771
+#: Merge.rc:1614
 #, c-format
-msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
+msgid "Fil&e compare"
 msgstr ""
 
 #: Merge.rc:773
 #, c-format
+msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
+msgstr ""
+
+#: Merge.rc:775
+#, c-format
 msgid "Reset"
 msgstr ""
 
-#: Merge.rc:780
+#: Merge.rc:782
 #, c-format
 msgid "Language"
 msgstr ""
 
-#: Merge.rc:787
+#: Merge.rc:789
 #, c-format
 msgid "Available languages:"
 msgstr ""
 
-#: Merge.rc:793
+#: Merge.rc:795
 #, c-format
 msgid "Find"
 msgstr ""
 
-#: Merge.rc:796
-#: Merge.rc:823
+#: Merge.rc:798
+#: Merge.rc:825
 #, c-format
 msgid "Fi&nd what:"
 msgstr ""
 
-#: Merge.rc:799
-#: Merge.rc:829
+#: Merge.rc:801
+#: Merge.rc:831
 #, c-format
 msgid "Match &whole word only"
 msgstr ""
 
-#: Merge.rc:801
-#: Merge.rc:831
+#: Merge.rc:803
+#: Merge.rc:833
 #, c-format
 msgid "Match &case"
 msgstr ""
 
-#: Merge.rc:803
-#: Merge.rc:833
+#: Merge.rc:805
+#: Merge.rc:835
 #, c-format
 msgid "Regular &expression"
 msgstr ""
 
-#: Merge.rc:805
+#: Merge.rc:807
 #, c-format
 msgid "D&on't wrap end of file"
 msgstr ""
 
-#: Merge.rc:808
+#: Merge.rc:810
 #, c-format
 msgid "Direction"
 msgstr ""
 
-#: Merge.rc:809
+#: Merge.rc:811
 #, c-format
 msgid "&Up"
 msgstr ""
 
-#: Merge.rc:811
+#: Merge.rc:813
 #, c-format
 msgid "&Down"
 msgstr ""
 
-#: Merge.rc:813
-#: Merge.rc:843
+#: Merge.rc:815
+#: Merge.rc:845
 #, c-format
 msgid "&Find Next"
 msgstr ""
 
-#: Merge.rc:820
+#: Merge.rc:822
 #, c-format
 msgid "Replace"
 msgstr ""
 
-#: Merge.rc:826
+#: Merge.rc:828
 #, c-format
 msgid "Re&place with:"
 msgstr ""
 
-#: Merge.rc:835
+#: Merge.rc:837
 #, c-format
 msgid "&Don't wrap end of file"
 msgstr ""
 
-#: Merge.rc:838
+#: Merge.rc:840
 #, c-format
 msgid "Replace in"
 msgstr ""
 
-#: Merge.rc:839
+#: Merge.rc:841
 #, c-format
 msgid "&Selection"
 msgstr ""
 
-#: Merge.rc:841
+#: Merge.rc:843
 #, c-format
 msgid "Wh&ole file"
 msgstr ""
 
-#: Merge.rc:844
+#: Merge.rc:846
 #, c-format
 msgid "&Replace"
 msgstr ""
 
-#: Merge.rc:845
+#: Merge.rc:847
 #, c-format
 msgid "Replace &All"
 msgstr ""
 
-#: Merge.rc:852
-#: Merge.rc:2134
+#: Merge.rc:854
+#: Merge.rc:2136
 #, c-format
 msgid "Rational ClearCase"
 msgstr ""
 
-#: Merge.rc:855
+#: Merge.rc:857
 #, c-format
 msgid "CheckOut"
 msgstr ""
 
-#: Merge.rc:860
-#: Merge.rc:1172
+#: Merge.rc:862
+#: Merge.rc:1174
 #, c-format
 msgid "Comments"
 msgstr ""
 
-#: Merge.rc:863
+#: Merge.rc:865
 #, c-format
 msgid "CheckIn after checkout"
 msgstr ""
 
-#: Merge.rc:869
+#: Merge.rc:871
 #, c-format
 msgid "Linefilters"
 msgstr ""
 
-#: Merge.rc:872
+#: Merge.rc:874
 #, c-format
 msgid "Enable Line Filters"
 msgstr ""
 
-#: Merge.rc:875
+#: Merge.rc:877
 #, c-format
 msgid "Regular Expressions (one per line):"
 msgstr ""
 
-#: Merge.rc:882
+#: Merge.rc:884
 #, c-format
 msgid "Save"
 msgstr ""
 
-#: Merge.rc:883
+#: Merge.rc:885
 #, c-format
 msgid "New"
 msgstr ""
 
-#: Merge.rc:884
+#: Merge.rc:886
 #, c-format
 msgid "Edit"
 msgstr ""
 
-#: Merge.rc:885
+#: Merge.rc:887
 #, c-format
 msgid "Remove"
 msgstr ""
 
-#: Merge.rc:890
-#: Merge.rc:1902
+#: Merge.rc:892
+#: Merge.rc:1904
 #, c-format
 msgid "Colors"
 msgstr ""
 
-#: Merge.rc:893
+#: Merge.rc:895
 #, c-format
 msgid "Difference:"
 msgstr ""
 
-#: Merge.rc:897
+#: Merge.rc:899
 #, c-format
 msgid "Selected Difference:"
 msgstr ""
 
-#: Merge.rc:901
-#: Merge.rc:1562
+#: Merge.rc:903
+#: Merge.rc:1564
 #, c-format
 msgid "Background"
 msgstr ""
 
-#: Merge.rc:902
+#: Merge.rc:904
 #, c-format
 msgid "Deleted"
 msgstr ""
 
-#: Merge.rc:915
-#: Merge.rc:1357
-#: Merge.rc:1563
+#: Merge.rc:917
+#: Merge.rc:1359
+#: Merge.rc:1565
 #, c-format
 msgid "Text"
 msgstr ""
 
-#: Merge.rc:919
+#: Merge.rc:921
 #, c-format
 msgid "Ignored Difference:"
 msgstr ""
 
-#: Merge.rc:929
+#: Merge.rc:931
 #, c-format
 msgid "Moved:"
 msgstr ""
 
-#: Merge.rc:939
+#: Merge.rc:941
 #, c-format
 msgid "Selected Moved:"
 msgstr ""
 
-#: Merge.rc:946
+#: Merge.rc:948
 #, c-format
 msgid "Word Difference:"
 msgstr ""
 
-#: Merge.rc:953
+#: Merge.rc:955
 #, c-format
 msgid "Selected Word Diff:"
 msgstr ""
 
-#: Merge.rc:960
-#: Merge.rc:1046
-#: Merge.rc:1075
-#: Merge.rc:1175
-#: Merge.rc:1403
+#: Merge.rc:962
+#: Merge.rc:1048
+#: Merge.rc:1077
+#: Merge.rc:1177
+#: Merge.rc:1405
 #, c-format
 msgid "Defaults"
 msgstr ""
 
-#: Merge.rc:966
-#: Merge.rc:1345
-#: Merge.rc:1551
+#: Merge.rc:968
+#: Merge.rc:1347
+#: Merge.rc:1553
 #, c-format
 msgid "Dialog"
 msgstr ""
 
-#: Merge.rc:976
-#: Merge.rc:1905
+#: Merge.rc:978
+#: Merge.rc:1907
 #, c-format
 msgid "System"
 msgstr ""
 
-#: Merge.rc:979
+#: Merge.rc:981
 #, c-format
 msgid "&Send deleted files to Recycle Bin"
 msgstr ""
 
-#: Merge.rc:981
+#: Merge.rc:983
 #, c-format
 msgid "Integration"
 msgstr ""
 
-#: Merge.rc:982
+#: Merge.rc:984
 #, c-format
 msgid "&Add to explorer context menu"
 msgstr ""
 
-#: Merge.rc:984
+#: Merge.rc:986
 #, c-format
 msgid "E&nable advanced menu"
 msgstr ""
 
-#: Merge.rc:986
+#: Merge.rc:988
 #, c-format
 msgid "In&clude subfolders by default"
 msgstr ""
 
-#: Merge.rc:988
+#: Merge.rc:990
 #, c-format
 msgid "&External editor:"
 msgstr ""
 
-#: Merge.rc:991
+#: Merge.rc:993
 #, c-format
 msgid "&Filter folder:"
 msgstr ""
 
-#: Merge.rc:993
+#: Merge.rc:995
 #, c-format
 msgid "B&rowse..."
 msgstr ""
 
-#: Merge.rc:994
+#: Merge.rc:996
 #, c-format
 msgid "Temporary files folder"
 msgstr ""
 
-#: Merge.rc:995
+#: Merge.rc:997
 #, c-format
 msgid "S&ystem's temp folder"
 msgstr ""
 
-#: Merge.rc:997
+#: Merge.rc:999
 #, c-format
 msgid "C&ustom folder:"
 msgstr ""
 
-#: Merge.rc:1000
-#: Merge.rc:1016
+#: Merge.rc:1002
+#: Merge.rc:1018
 #, c-format
 msgid "Br&owse..."
 msgstr ""
 
-#: Merge.rc:1006
+#: Merge.rc:1008
 #, c-format
 msgid "Patch Generator"
 msgstr ""
 
-#: Merge.rc:1009
+#: Merge.rc:1011
 #, c-format
 msgid "File&1:"
 msgstr ""
 
-#: Merge.rc:1013
+#: Merge.rc:1015
 #, c-format
 msgid "File&2:"
 msgstr ""
 
-#: Merge.rc:1017
+#: Merge.rc:1019
 #, c-format
 msgid "&Swap"
 msgstr ""
 
-#: Merge.rc:1018
+#: Merge.rc:1020
 #, c-format
 msgid "&Append to existing file"
 msgstr ""
 
-#: Merge.rc:1020
+#: Merge.rc:1022
 #, c-format
 msgid "&Result:"
 msgstr ""
 
-#: Merge.rc:1024
+#: Merge.rc:1026
 #, c-format
 msgid "&Format"
 msgstr ""
 
-#: Merge.rc:1025
+#: Merge.rc:1027
 #, c-format
 msgid "St&yle:"
 msgstr ""
 
-#: Merge.rc:1028
+#: Merge.rc:1030
 #, c-format
 msgid "&Context:"
 msgstr ""
 
-#: Merge.rc:1031
+#: Merge.rc:1033
 #, c-format
 msgid "W&hitespaces"
 msgstr ""
 
-#: Merge.rc:1032
+#: Merge.rc:1034
 #, c-format
 msgid "Com&pare"
 msgstr ""
 
-#: Merge.rc:1034
+#: Merge.rc:1036
 #, c-format
 msgid "I&gnore changes"
 msgstr ""
 
-#: Merge.rc:1036
+#: Merge.rc:1038
 #, c-format
 msgid "Ig&nore all"
 msgstr ""
 
-#: Merge.rc:1038
+#: Merge.rc:1040
 #, c-format
 msgid "Ignor&e blank lines"
 msgstr ""
 
-#: Merge.rc:1040
+#: Merge.rc:1042
 #, c-format
 msgid "Case sensi&tive"
 msgstr ""
 
-#: Merge.rc:1042
+#: Merge.rc:1044
 #, c-format
 msgid "Inclu&de command line"
 msgstr ""
 
-#: Merge.rc:1044
+#: Merge.rc:1046
 #, c-format
 msgid "Open to e&xternal editor"
 msgstr ""
 
-#: Merge.rc:1066
+#: Merge.rc:1068
 #, c-format
 msgid "Display Columns"
 msgstr ""
 
-#: Merge.rc:1072
+#: Merge.rc:1074
 #, c-format
 msgid "Move &Up"
 msgstr ""
 
-#: Merge.rc:1073
+#: Merge.rc:1075
 #, c-format
 msgid "Move &Down"
 msgstr ""
 
-#: Merge.rc:1083
+#: Merge.rc:1085
 #, c-format
 msgid "Select Unpacker"
 msgstr ""
 
-#: Merge.rc:1088
+#: Merge.rc:1090
 #, c-format
 msgid "File unpacker:"
 msgstr ""
 
-#: Merge.rc:1091
+#: Merge.rc:1093
 #, c-format
 msgid "Display all unpackers, don't check the extension"
 msgstr ""
 
-#: Merge.rc:1094
+#: Merge.rc:1096
 #, c-format
 msgid "Extensions list:"
 msgstr ""
 
-#: Merge.rc:1095
+#: Merge.rc:1097
 #, c-format
 msgid "Description:"
 msgstr ""
 
-#: Merge.rc:1106
+#: Merge.rc:1108
 #, c-format
 msgid " Folder Compare Progress"
 msgstr ""
 
-#: Merge.rc:1109
-#: Merge.rc:1852
+#: Merge.rc:1111
+#: Merge.rc:1854
 #, c-format
 msgid "Stop"
 msgstr ""
 
-#: Merge.rc:1114
+#: Merge.rc:1116
 #, c-format
 msgid "Comparing items..."
 msgstr ""
 
-#: Merge.rc:1115
+#: Merge.rc:1117
 #, c-format
 msgid "Items compared:"
 msgstr ""
 
-#: Merge.rc:1116
+#: Merge.rc:1118
 #, c-format
 msgid "Items total:"
 msgstr ""
 
-#: Merge.rc:1122
+#: Merge.rc:1124
 #, c-format
 msgid "Go To"
 msgstr ""
 
-#: Merge.rc:1125
+#: Merge.rc:1127
 #, c-format
 msgid "G&oto:"
 msgstr ""
 
-#: Merge.rc:1127
+#: Merge.rc:1129
 #, c-format
 msgid "File"
 msgstr ""
 
-#: Merge.rc:1132
+#: Merge.rc:1134
 #, c-format
 msgid "Goto what"
 msgstr ""
 
-#: Merge.rc:1133
+#: Merge.rc:1135
 #, c-format
 msgid "Li&ne"
 msgstr ""
 
-#: Merge.rc:1135
+#: Merge.rc:1137
 #, c-format
 msgid "&Difference"
 msgstr ""
 
-#: Merge.rc:1137
+#: Merge.rc:1139
 #, c-format
 msgid "&Go To"
 msgstr ""
 
-#: Merge.rc:1143
-#: Merge.rc:1900
+#: Merge.rc:1145
+#: Merge.rc:1902
 #, c-format
 msgid "Compare"
 msgstr ""
 
-#: Merge.rc:1146
+#: Merge.rc:1148
 #, c-format
 msgid "Whitespace"
 msgstr ""
 
-#: Merge.rc:1147
+#: Merge.rc:1149
 #, c-format
 msgid "&Compare"
 msgstr ""
 
-#: Merge.rc:1149
+#: Merge.rc:1151
 #, c-format
 msgid "&Ignore change"
 msgstr ""
 
-#: Merge.rc:1151
+#: Merge.rc:1153
 #, c-format
 msgid "I&gnore all"
 msgstr ""
 
-#: Merge.rc:1153
+#: Merge.rc:1155
 #, c-format
 msgid "Ignore blan&k lines"
 msgstr ""
 
-#: Merge.rc:1155
+#: Merge.rc:1157
 #, c-format
 msgid "Ignore &case"
 msgstr ""
 
-#: Merge.rc:1157
+#: Merge.rc:1159
 #, c-format
 msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
 msgstr ""
 
-#: Merge.rc:1160
+#: Merge.rc:1162
 #, c-format
 msgid "E&nable moved block detection"
 msgstr ""
 
-#: Merge.rc:1162
+#: Merge.rc:1164
 #, c-format
 msgid "&Match similar lines"
 msgstr ""
 
-#: Merge.rc:1164
+#: Merge.rc:1166
 #, c-format
 msgid "Ign&ore time differences less than 3 seconds"
 msgstr ""
 
-#: Merge.rc:1167
+#: Merge.rc:1169
 #, c-format
 msgid "&File Compare method:"
 msgstr ""
 
-#: Merge.rc:1170
+#: Merge.rc:1172
 #, c-format
 msgid "S&top after first difference"
 msgstr ""
 
-#: Merge.rc:1173
+#: Merge.rc:1175
 #, c-format
 msgid "Filter Comments"
 msgstr ""
 
-#: Merge.rc:1180
-#: Merge.rc:1901
+#: Merge.rc:1182
+#: Merge.rc:1903
 #, c-format
 msgid "Editor"
 msgstr ""
 
-#: Merge.rc:1183
+#: Merge.rc:1185
 #, c-format
 msgid "&Highlight syntax"
 msgstr ""
 
-#: Merge.rc:1185
+#: Merge.rc:1187
 #, c-format
 msgid "&Automatic rescan"
 msgstr ""
 
-#: Merge.rc:1187
+#: Merge.rc:1189
 #, c-format
 msgid "&Preserve original EOL chars"
 msgstr ""
 
-#: Merge.rc:1189
+#: Merge.rc:1191
 #, c-format
 msgid "Tabs"
 msgstr ""
 
-#: Merge.rc:1190
+#: Merge.rc:1192
 #, c-format
 msgid "&Tab size:"
 msgstr ""
 
-#: Merge.rc:1193
+#: Merge.rc:1195
 #, c-format
 msgid "&Insert Tabs"
 msgstr ""
 
-#: Merge.rc:1195
+#: Merge.rc:1197
 #, c-format
 msgid "Insert &Spaces"
 msgstr ""
 
-#: Merge.rc:1197
+#: Merge.rc:1199
 #, c-format
 msgid "Line Difference Coloring"
 msgstr ""
 
-#: Merge.rc:1199
+#: Merge.rc:1201
 #, c-format
 msgid "View line differences"
 msgstr ""
 
-#: Merge.rc:1201
+#: Merge.rc:1203
 #, c-format
 msgid "&Character level"
 msgstr ""
 
-#: Merge.rc:1203
+#: Merge.rc:1205
 #, c-format
 msgid "&Word-level:"
 msgstr ""
 
-#: Merge.rc:1218
+#: Merge.rc:1220
 #, c-format
 msgid "Filefilters"
 msgstr ""
 
-#: Merge.rc:1224
+#: Merge.rc:1226
 #, c-format
 msgid "Test"
 msgstr ""
 
-#: Merge.rc:1225
+#: Merge.rc:1227
 #, c-format
 msgid "Install..."
 msgstr ""
 
-#: Merge.rc:1226
+#: Merge.rc:1228
 #, c-format
 msgid "New..."
 msgstr ""
 
-#: Merge.rc:1227
+#: Merge.rc:1229
 #, c-format
 msgid "Edit..."
 msgstr ""
 
-#: Merge.rc:1228
+#: Merge.rc:1230
 #, c-format
 msgid "Delete..."
 msgstr ""
 
-#: Merge.rc:1234
+#: Merge.rc:1236
 #, c-format
 msgid "Save modified files?"
 msgstr ""
 
-#: Merge.rc:1237
+#: Merge.rc:1239
 #, c-format
 msgid "Left side file"
 msgstr ""
 
-#: Merge.rc:1240
+#: Merge.rc:1242
 #, c-format
 msgid "&Save changes"
 msgstr ""
 
-#: Merge.rc:1242
+#: Merge.rc:1244
 #, c-format
 msgid "&Discard changes"
 msgstr ""
 
-#: Merge.rc:1244
+#: Merge.rc:1246
 #, c-format
 msgid "Right side file"
 msgstr ""
 
-#: Merge.rc:1247
+#: Merge.rc:1249
 #, c-format
 msgid "S&ave changes"
 msgstr ""
 
-#: Merge.rc:1249
+#: Merge.rc:1251
 #, c-format
 msgid "Dis&card changes"
 msgstr ""
 
-#: Merge.rc:1251
+#: Merge.rc:1253
 #, c-format
 msgid "Discard All"
 msgstr ""
 
-#: Merge.rc:1258
-#: Merge.rc:1506
-#: Merge.rc:1907
+#: Merge.rc:1260
+#: Merge.rc:1508
+#: Merge.rc:1909
 #, c-format
 msgid "Codepage"
 msgstr ""
 
-#: Merge.rc:1261
+#: Merge.rc:1263
 #, c-format
 msgid "Default Codepage"
 msgstr ""
 
-#: Merge.rc:1262
+#: Merge.rc:1264
 #, c-format
 msgid "Select the default codepage assumed when loading non-Unicode files:"
 msgstr ""
 
-#: Merge.rc:1264
+#: Merge.rc:1266
 #, c-format
 msgid "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session"
 msgstr ""
 
-#: Merge.rc:1267
+#: Merge.rc:1269
 #, c-format
 msgid "System codepage"
 msgstr ""
 
-#: Merge.rc:1269
+#: Merge.rc:1271
 #, c-format
 msgid "According to WinMerge User Interface"
 msgstr ""
 
-#: Merge.rc:1271
+#: Merge.rc:1273
 #, c-format
 msgid "Custom codepage :"
 msgstr ""
 
-#: Merge.rc:1279
+#: Merge.rc:1281
 #, c-format
 msgid "WinMerge - Archive support disabled"
 msgstr ""
 
-#: Merge.rc:1282
+#: Merge.rc:1284
 #, c-format
 msgid "Unable to detect 7-Zip version (not installed?)"
 msgstr ""
 
-#: Merge.rc:1285
+#: Merge.rc:1287
 #, 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:1289
 #, c-format
 msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
 msgstr ""
 
-#: Merge.rc:1289
+#: Merge.rc:1291
 #, 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:1293
 #, c-format
 msgid "Version"
 msgstr ""
 
-#: Merge.rc:1293
+#: Merge.rc:1295
 #, c-format
 msgid "Plugin required\n(dllbuild %04u)"
 msgstr ""
 
-#: Merge.rc:1295
+#: Merge.rc:1297
 #, c-format
 msgid "Recommended version of 7-Zip:"
 msgstr ""
 
-#: Merge.rc:1298
-#: Merge.rc:1301
+#: Merge.rc:1300
+#: Merge.rc:1303
 #, c-format
 msgid "present"
 msgstr ""
 
-#: Merge.rc:1299
+#: Merge.rc:1301
 #, c-format
 msgid "Merge7z000U.dll"
 msgstr ""
 
-#: Merge.rc:1302
+#: Merge.rc:1304
 #, c-format
 msgid "7-Zip software installed on your computer:"
 msgstr ""
 
-#: Merge.rc:1304
-#: Merge.rc:1309
+#: Merge.rc:1306
+#: Merge.rc:1311
 #, c-format
 msgid "none"
 msgstr ""
 
-#: Merge.rc:1306
+#: Merge.rc:1308
 #, c-format
 msgid "missing"
 msgstr ""
 
-#: Merge.rc:1307
+#: Merge.rc:1309
 #, c-format
 msgid "7-Zip components for standalone operation:"
 msgstr ""
 
-#: Merge.rc:1311
+#: Merge.rc:1313
 #, c-format
 msgid "outdated"
 msgstr ""
 
-#: Merge.rc:1312
+#: Merge.rc:1314
 #, c-format
 msgid "Plugins on path:"
 msgstr ""
 
-#: Merge.rc:1313
+#: Merge.rc:1315
 #, 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:1319
 #, c-format
 msgid "Plugin Download"
 msgstr ""
 
-#: Merge.rc:1326
+#: Merge.rc:1328
 #, c-format
 msgid "Options"
 msgstr ""
 
-#: Merge.rc:1337
+#: Merge.rc:1339
 #, c-format
 msgid " Categories"
 msgstr ""
 
-#: Merge.rc:1339
+#: Merge.rc:1341
 #, c-format
 msgid "Import..."
 msgstr ""
 
-#: Merge.rc:1340
+#: Merge.rc:1342
 #, c-format
 msgid "Export..."
 msgstr ""
 
-#: Merge.rc:1348
+#: Merge.rc:1350
 #, c-format
 msgid "Keywords:"
 msgstr ""
 
-#: Merge.rc:1349
+#: Merge.rc:1351
 #, c-format
 msgid "Function names:"
 msgstr ""
 
-#: Merge.rc:1350
+#: Merge.rc:1352
 #, c-format
 msgid "Comments:"
 msgstr ""
 
-#: Merge.rc:1351
+#: Merge.rc:1353
 #, c-format
 msgid "Numbers:"
 msgstr ""
 
-#: Merge.rc:1352
+#: Merge.rc:1354
 #, c-format
 msgid "Operators:"
 msgstr ""
 
-#: Merge.rc:1353
+#: Merge.rc:1355
 #, c-format
 msgid "Strings:"
 msgstr ""
 
-#: Merge.rc:1354
+#: Merge.rc:1356
 #, c-format
 msgid "Preprocessor:"
 msgstr ""
 
-#: Merge.rc:1355
+#: Merge.rc:1357
 #, c-format
 msgid "User 1:"
 msgstr ""
 
-#: Merge.rc:1356
+#: Merge.rc:1358
 #, 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:1363
+#: Merge.rc:1368
+#: Merge.rc:1373
+#: Merge.rc:1378
+#: Merge.rc:1383
+#: Merge.rc:1388
+#: Merge.rc:1393
+#: Merge.rc:1398
+#: Merge.rc:1403
 #, c-format
 msgid "Bold"
 msgstr ""
 
-#: Merge.rc:1409
+#: Merge.rc:1411
 #, c-format
 msgid "Folder Compare Report"
 msgstr ""
 
-#: Merge.rc:1412
+#: Merge.rc:1414
 #, c-format
 msgid "Report &File:"
 msgstr ""
 
-#: Merge.rc:1415
-#: Merge.rc:1589
-#: Merge.rc:1593
-#: Merge.rc:1620
+#: Merge.rc:1417
+#: Merge.rc:1591
+#: Merge.rc:1595
+#: Merge.rc:1622
 #, c-format
 msgid "Browse..."
 msgstr ""
 
-#: Merge.rc:1416
+#: Merge.rc:1418
 #, c-format
 msgid "&Style:"
 msgstr ""
 
-#: Merge.rc:1419
+#: Merge.rc:1421
 #, c-format
 msgid "&Copy to Clipboard"
 msgstr ""
 
-#: Merge.rc:1427
+#: Merge.rc:1429
 #, c-format
 msgid "Shared or Private Filter"
 msgstr ""
 
-#: Merge.rc:1430
+#: Merge.rc:1432
 #, c-format
 msgid "Which type of filter do you want to create?"
 msgstr ""
 
-#: Merge.rc:1432
+#: Merge.rc:1434
 #, c-format
 msgid "Shared Filter (for all users on this machine)"
 msgstr ""
 
-#: Merge.rc:1434
+#: Merge.rc:1436
 #, c-format
 msgid "Private Filter (only for current user)"
 msgstr ""
 
-#: Merge.rc:1442
-#: Merge.rc:1908
+#: Merge.rc:1444
+#: Merge.rc:1910
 #, c-format
 msgid "Archive Support"
 msgstr ""
 
-#: Merge.rc:1445
+#: Merge.rc:1447
 #, c-format
 msgid "Archive support requires 7-Zip plugin installed:"
 msgstr ""
 
-#: Merge.rc:1447
+#: Merge.rc:1449
 #, c-format
 msgid "Download 7-zip Plugin"
 msgstr ""
 
-#: Merge.rc:1448
+#: Merge.rc:1450
 #, c-format
 msgid "&Enable archive file support"
 msgstr ""
 
-#: Merge.rc:1450
+#: Merge.rc:1452
 #, c-format
 msgid "&Use stand-alone 7-Zip if available"
 msgstr ""
 
-#: Merge.rc:1453
+#: Merge.rc:1455
 #, c-format
 msgid "U&se local 7-Zip from WinMerge folder"
 msgstr ""
 
-#: Merge.rc:1455
+#: Merge.rc:1457
 #, c-format
 msgid "&Detect archive type from file signature"
 msgstr ""
 
-#: Merge.rc:1463
+#: Merge.rc:1465
 #, c-format
 msgid "Compare Statistics"
 msgstr ""
 
-#: Merge.rc:1466
+#: Merge.rc:1468
 #, c-format
 msgid "Folders:"
 msgstr ""
 
-#: Merge.rc:1467
+#: Merge.rc:1469
 #, c-format
 msgid "Files:"
 msgstr ""
 
-#: Merge.rc:1468
-#: Merge.rc:2276
+#: Merge.rc:1470
+#: Merge.rc:2278
 #, c-format
 msgid "Different"
 msgstr ""
 
-#: Merge.rc:1469
+#: Merge.rc:1471
 #, c-format
 msgid "Text:"
 msgstr ""
 
-#: Merge.rc:1472
-#: Merge.rc:1491
+#: Merge.rc:1474
+#: Merge.rc:1493
 #, c-format
 msgid "Binary:"
 msgstr ""
 
-#: Merge.rc:1475
+#: Merge.rc:1477
 #, c-format
 msgid "Unique"
 msgstr ""
 
-#: Merge.rc:1476
+#: Merge.rc:1478
 #, c-format
 msgid "Left:"
 msgstr ""
 
-#: Merge.rc:1481
+#: Merge.rc:1483
 #, c-format
 msgid "Right:"
 msgstr ""
 
-#: Merge.rc:1486
-#: Merge.rc:2271
+#: Merge.rc:1488
+#: Merge.rc:2273
 #, c-format
 msgid "Identical"
 msgstr ""
 
-#: Merge.rc:1495
+#: Merge.rc:1497
 #, c-format
 msgid "Total:"
 msgstr ""
 
-#: Merge.rc:1500
+#: Merge.rc:1502
 #, c-format
 msgid "Close"
 msgstr ""
 
-#: Merge.rc:1509
+#: Merge.rc:1511
 #, c-format
 msgid "Affects"
 msgstr ""
 
-#: Merge.rc:1512
-#: Merge.rc:1515
+#: Merge.rc:1514
+#: Merge.rc:1517
 #, c-format
 msgid "(Affects)"
 msgstr ""
 
-#: Merge.rc:1516
+#: Merge.rc:1518
 #, c-format
 msgid "Select Codepage for"
 msgstr ""
 
-#: Merge.rc:1517
+#: Merge.rc:1519
 #, c-format
 msgid "&File Loading:"
 msgstr ""
 
-#: Merge.rc:1519
-#: Merge.rc:1522
+#: Merge.rc:1521
+#: Merge.rc:1524
 #, c-format
 msgid "..."
 msgstr ""
 
-#: Merge.rc:1520
+#: Merge.rc:1522
 #, c-format
 msgid "File &Saving:"
 msgstr ""
 
-#: Merge.rc:1523
+#: Merge.rc:1525
 #, c-format
 msgid "&Use same codepage for both"
 msgstr ""
 
-#: Merge.rc:1526
+#: Merge.rc:1528
 #, c-format
 msgid "&Apply"
 msgstr ""
 
-#: Merge.rc:1527
-#: Merge.rc:1874
+#: Merge.rc:1529
+#: Merge.rc:1876
 #, c-format
 msgid "&Cancel"
 msgstr ""
 
-#: Merge.rc:1532
+#: Merge.rc:1534
 #, c-format
 msgid "Test Filter"
 msgstr ""
 
-#: Merge.rc:1535
+#: Merge.rc:1537
 #, c-format
 msgid "Testing filter ..."
 msgstr ""
 
-#: Merge.rc:1537
+#: Merge.rc:1539
 #, c-format
 msgid "&Enter text to test:"
 msgstr ""
 
-#: Merge.rc:1539
+#: Merge.rc:1541
 #, c-format
 msgid "&Folder Name"
 msgstr ""
 
-#: Merge.rc:1541
+#: Merge.rc:1543
 #, c-format
 msgid "Result:"
 msgstr ""
 
-#: Merge.rc:1545
+#: Merge.rc:1547
 #, c-format
 msgid "&Test"
 msgstr ""
 
-#: Merge.rc:1546
+#: Merge.rc:1548
 #, c-format
 msgid "&Close"
 msgstr ""
 
-#: Merge.rc:1554
+#: Merge.rc:1556
 #, c-format
 msgid "&Use customized text colors"
 msgstr ""
 
-#: Merge.rc:1557
+#: Merge.rc:1559
 #, c-format
 msgid "Custom text colors"
 msgstr ""
 
-#: Merge.rc:1559
+#: Merge.rc:1561
 #, c-format
 msgid "Whitespace:"
 msgstr ""
 
-#: Merge.rc:1560
+#: Merge.rc:1562
 #, c-format
 msgid "Regular text:"
 msgstr ""
 
-#: Merge.rc:1561
+#: Merge.rc:1563
 #, c-format
 msgid "Selection:"
 msgstr ""
 
-#: Merge.rc:1584
+#: Merge.rc:1586
 #, c-format
 msgid "Paths"
 msgstr ""
 
-#: Merge.rc:1590
+#: Merge.rc:1592
 #, c-format
 msgid "R&ead-only"
 msgstr ""
 
-#: Merge.rc:1594
+#: Merge.rc:1596
 #, c-format
 msgid "Re&ad-only"
 msgstr ""
 
-#: Merge.rc:1600
+#: Merge.rc:1602
 #, c-format
 msgid "Open..."
 msgstr ""
 
-#: Merge.rc:1601
+#: Merge.rc:1603
 #, c-format
 msgid "Save..."
 msgstr ""
 
-#: Merge.rc:1606
-#: Merge.rc:1909
+#: Merge.rc:1608
+#: Merge.rc:1911
 #, c-format
 msgid "Backup Files"
 msgstr ""
 
-#: Merge.rc:1609
+#: Merge.rc:1611
 #, c-format
 msgid "Create backup files in:"
 msgstr ""
 
-#: Merge.rc:1614
+#: Merge.rc:1616
 #, c-format
 msgid "Create backup files into:"
 msgstr ""
 
-#: Merge.rc:1615
+#: Merge.rc:1617
 #, c-format
 msgid "&Original file's folder"
 msgstr ""
 
-#: Merge.rc:1617
+#: Merge.rc:1619
 #, c-format
 msgid "&Global backup folder:"
 msgstr ""
 
-#: Merge.rc:1621
+#: Merge.rc:1623
 #, c-format
 msgid "Backup filename:"
 msgstr ""
 
-#: Merge.rc:1622
+#: Merge.rc:1624
 #, c-format
 msgid "&Append .bak -extension"
 msgstr ""
 
-#: Merge.rc:1624
+#: Merge.rc:1626
 #, c-format
 msgid "A&ppend timestamp"
 msgstr ""
 
-#: Merge.rc:1631
+#: Merge.rc:1633
 #, c-format
 msgid "Confirm Copy"
 msgstr ""
 
-#: Merge.rc:1635
+#: Merge.rc:1637
 #, c-format
 msgid "Are you sure you want to copy XXX items?"
 msgstr ""
 
-#: Merge.rc:1637
+#: Merge.rc:1639
 #, c-format
 msgid "From left"
 msgstr ""
 
-#: Merge.rc:1640
+#: Merge.rc:1642
 #, c-format
 msgid "To right"
 msgstr ""
 
-#: Merge.rc:1643
+#: Merge.rc:1645
 #, c-format
 msgid "Yes"
 msgstr ""
 
-#: Merge.rc:1644
+#: Merge.rc:1646
 #, c-format
 msgid "No"
 msgstr ""
 
 #. StringFileInfo.Block
-#: Merge.rc:1669
+#: Merge.rc:1671
 #, c-format
 msgid "040904e4"
 msgstr ""
 
 #. VarFileInfo.Translation
-#: Merge.rc:1685
+#: Merge.rc:1687
 #, c-format
 msgid "0x409, 1252"
 msgstr ""
 
-#: Merge.rc:1700
+#: Merge.rc:1702
 #, c-format
 msgid "Ready"
 msgstr ""
 
-#: Merge.rc:1706
+#: Merge.rc:1708
 #, c-format
 msgid "EXT"
 msgstr ""
 
-#: Merge.rc:1707
+#: Merge.rc:1709
 #, c-format
 msgid "CAP"
 msgstr ""
 
-#: Merge.rc:1708
+#: Merge.rc:1710
 #, c-format
 msgid "NUM"
 msgstr ""
 
-#: Merge.rc:1709
+#: Merge.rc:1711
 #, c-format
 msgid "SCRL"
 msgstr ""
 
-#: Merge.rc:1710
+#: Merge.rc:1712
 #, c-format
 msgid "OVR"
 msgstr ""
 
-#: Merge.rc:1711
+#: Merge.rc:1713
 #, c-format
 msgid "REC"
 msgstr ""
 
-#: Merge.rc:1717
+#: Merge.rc:1719
 #, c-format
 msgid "Create empty documents\nNew Documents (Ctrl+N)"
 msgstr ""
 
-#: Merge.rc:1718
+#: Merge.rc:1720
 #, c-format
 msgid "Open an existing document\nOpen (Ctrl+O)"
 msgstr ""
 
-#: Merge.rc:1719
+#: Merge.rc:1721
 #, c-format
 msgid "Close the active document\nClose"
 msgstr ""
 
-#: Merge.rc:1720
+#: Merge.rc:1722
 #, c-format
 msgid "Save the active document\nSave (Ctrl+S)"
 msgstr ""
 
-#: Merge.rc:1721
+#: Merge.rc:1723
 #, c-format
 msgid "Save the active document with a new name\nSave As"
 msgstr ""
 
-#: Merge.rc:1722
+#: Merge.rc:1724
 #, c-format
 msgid "Change the printing options\nPage Setup"
 msgstr ""
 
-#: Merge.rc:1723
+#: Merge.rc:1725
 #, c-format
 msgid "Change the printer and printing options\nPrint Setup"
 msgstr ""
 
-#: Merge.rc:1724
+#: Merge.rc:1726
 #, c-format
 msgid "Print the active document\nPrint"
 msgstr ""
 
-#: Merge.rc:1725
+#: Merge.rc:1727
 #, c-format
 msgid "Display full pages\nPrint Preview"
 msgstr ""
 
-#: Merge.rc:1730
+#: Merge.rc:1732
 #, c-format
 msgid "Make all hidden items visible again"
 msgstr ""
 
-#: Merge.rc:1736
+#: Merge.rc:1738
 #, c-format
 msgid "Open project file\nProject file (Ctrl+J)"
 msgstr ""
 
-#: Merge.rc:1737
+#: Merge.rc:1739
 #, c-format
 msgid "Unknown error attempting to open project file"
 msgstr ""
 
-#: Merge.rc:1738
+#: Merge.rc:1740
 #, c-format
 msgid "Unknown error attempting to save project file"
 msgstr ""
 
-#: Merge.rc:1739
+#: Merge.rc:1741
 #, c-format
 msgid "Project File"
 msgstr ""
 
-#: Merge.rc:1740
+#: Merge.rc:1742
 #, c-format
 msgid "Project file successfully loaded."
 msgstr ""
 
-#: Merge.rc:1741
+#: Merge.rc:1743
 #, c-format
 msgid "Project file successfully saved."
 msgstr ""
 
-#: Merge.rc:1742
+#: Merge.rc:1744
 #, c-format
 msgid "Save current paths and options to project file\nSave Project File"
 msgstr ""
 
-#: Merge.rc:1747
+#: Merge.rc:1749
 #, c-format
 msgid "Display program information, version number and copyright\nAbout"
 msgstr ""
 
-#: Merge.rc:1748
+#: Merge.rc:1750
 #, c-format
 msgid "Quit the application; prompts to save documents\nExit"
 msgstr ""
 
-#: Merge.rc:1754
-#: Merge.rc:1755
 #: Merge.rc:1756
 #: Merge.rc:1757
 #: Merge.rc:1758
@@ -2704,2763 +2707,2765 @@ msgstr ""
 #: Merge.rc:1767
 #: Merge.rc:1768
 #: Merge.rc:1769
+#: Merge.rc:1770
+#: Merge.rc:1771
 #, c-format
 msgid "Open this document"
 msgstr ""
 
-#: Merge.rc:1774
+#: Merge.rc:1776
 #, c-format
 msgid "Switch to the next window pane\nNext Pane"
 msgstr ""
 
-#: Merge.rc:1775
+#: Merge.rc:1777
 #, c-format
 msgid "Switch back to the previous window pane\nPrevious Pane"
 msgstr ""
 
-#: Merge.rc:1781
+#: Merge.rc:1783
 #, c-format
 msgid "Arrange windows so they overlap\nCascade Windows"
 msgstr ""
 
-#: Merge.rc:1782
+#: Merge.rc:1784
 #, c-format
 msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally"
 msgstr ""
 
-#: Merge.rc:1783
+#: Merge.rc:1785
 #, c-format
 msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically"
 msgstr ""
 
-#: Merge.rc:1789
+#: Merge.rc:1791
 #, c-format
 msgid "Copy the selection and put it on the Clipboard\nCopy"
 msgstr ""
 
-#: Merge.rc:1790
+#: Merge.rc:1792
 #, c-format
 msgid "Cut the selection and put it on the Clipboard\nCut"
 msgstr ""
 
-#: Merge.rc:1791
+#: Merge.rc:1793
 #, c-format
 msgid "Find the specified text\nFind"
 msgstr ""
 
-#: Merge.rc:1792
+#: Merge.rc:1794
 #, c-format
 msgid "Insert Clipboard contents\nPaste"
 msgstr ""
 
-#: Merge.rc:1793
+#: Merge.rc:1795
 #, c-format
 msgid "Repeat the last action\nRepeat"
 msgstr ""
 
-#: Merge.rc:1794
+#: Merge.rc:1796
 #, c-format
 msgid "Replace specific text with different text\nReplace"
 msgstr ""
 
-#: Merge.rc:1795
+#: Merge.rc:1797
 #, c-format
 msgid "Select the entire document\nSelect All"
 msgstr ""
 
-#: Merge.rc:1796
+#: Merge.rc:1798
 #, c-format
 msgid "Undo the last action\nUndo (Ctrl+Z)"
 msgstr ""
 
-#: Merge.rc:1797
+#: Merge.rc:1799
 #, c-format
 msgid "Redo the previously undone action\nRedo (Ctrl+Y)"
 msgstr ""
 
-#: Merge.rc:1803
+#: Merge.rc:1805
 #, c-format
 msgid "Show or hide the toolbar\nToggle ToolBar"
 msgstr ""
 
-#: Merge.rc:1804
+#: Merge.rc:1806
 #, c-format
 msgid "Show or hide the status bar\nToggle StatusBar"
 msgstr ""
 
-#: Merge.rc:1805
+#: Merge.rc:1807
 #, c-format
 msgid "Show or hide the tab bar\nToggle TabBar"
 msgstr ""
 
-#: Merge.rc:1806
+#: Merge.rc:1808
 #, c-format
 msgid "Automatically resize panes\nLock Panes"
 msgstr ""
 
-#: Merge.rc:1812
+#: Merge.rc:1814
 #, c-format
 msgid "Change the window size"
 msgstr ""
 
-#: Merge.rc:1813
+#: Merge.rc:1815
 #, c-format
 msgid "Change the window position"
 msgstr ""
 
-#: Merge.rc:1814
+#: Merge.rc:1816
 #, c-format
 msgid "Reduce the window to an icon"
 msgstr ""
 
-#: Merge.rc:1815
+#: Merge.rc:1817
 #, c-format
 msgid "Enlarge the window to full size"
 msgstr ""
 
-#: Merge.rc:1816
+#: Merge.rc:1818
 #, c-format
 msgid "Switch to the next document window"
 msgstr ""
 
-#: Merge.rc:1817
+#: Merge.rc:1819
 #, c-format
 msgid "Switch to the previous document window"
 msgstr ""
 
-#: Merge.rc:1818
+#: Merge.rc:1820
 #, c-format
 msgid "Close the active window and prompts to save the documents"
 msgstr ""
 
-#: Merge.rc:1823
+#: Merge.rc:1825
 #, c-format
 msgid "Restore the window to normal size"
 msgstr ""
 
-#: Merge.rc:1824
+#: Merge.rc:1826
 #, c-format
 msgid "Activate Task List"
 msgstr ""
 
-#: Merge.rc:1825
+#: Merge.rc:1827
 #, c-format
 msgid "Activate this window"
 msgstr ""
 
-#: Merge.rc:1831
+#: Merge.rc:1833
 #, c-format
 msgid "Close print preview mode\nCancel Preview"
 msgstr ""
 
-#: Merge.rc:1838
+#: Merge.rc:1840
 #, c-format
 msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
 msgstr ""
 
-#: Merge.rc:1839
+#: Merge.rc:1841
 #, c-format
 msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
 msgstr ""
 
-#: Merge.rc:1846
+#: Merge.rc:1848
 #, c-format
 msgid "Preserve original EOL chars"
 msgstr ""
 
-#: Merge.rc:1853
+#: Merge.rc:1855
 #, c-format
 msgid "Press any key"
 msgstr ""
 
-#: Merge.rc:1859
-#: Merge.rc:1860
+#: Merge.rc:1861
+#: Merge.rc:1862
 #, c-format
 msgid "Right click on the path to copy"
 msgstr ""
 
-#: Merge.rc:1866
+#: Merge.rc:1868
 #, c-format
 msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
 msgstr ""
 
-#: Merge.rc:1867
+#: Merge.rc:1869
 #, 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:1873
+#: Merge.rc:1875
 #, c-format
 msgid "&Ok"
 msgstr ""
 
-#: Merge.rc:1875
+#: Merge.rc:1877
 #, c-format
 msgid "&Abort"
 msgstr ""
 
-#: Merge.rc:1876
+#: Merge.rc:1878
 #, c-format
 msgid "&Retry"
 msgstr ""
 
-#: Merge.rc:1877
+#: Merge.rc:1879
 #, c-format
 msgid "&Ignore"
 msgstr ""
 
-#: Merge.rc:1878
+#: Merge.rc:1880
 #, c-format
 msgid "Ignore &all"
 msgstr ""
 
-#: Merge.rc:1879
+#: Merge.rc:1881
 #, c-format
 msgid "&Yes"
 msgstr ""
 
-#: Merge.rc:1885
+#: Merge.rc:1887
 #, c-format
 msgid "Yes to &all"
 msgstr ""
 
-#: Merge.rc:1886
+#: Merge.rc:1888
 #, c-format
 msgid "&No"
 msgstr ""
 
-#: Merge.rc:1887
+#: Merge.rc:1889
 #, c-format
 msgid "No to a&ll"
 msgstr ""
 
-#: Merge.rc:1888
+#: Merge.rc:1890
 #, c-format
 msgid "&Continue"
 msgstr ""
 
-#: Merge.rc:1889
+#: Merge.rc:1891
 #, c-format
 msgid "&Skip"
 msgstr ""
 
-#: Merge.rc:1890
+#: Merge.rc:1892
 #, c-format
 msgid "Skip &all"
 msgstr ""
 
-#: Merge.rc:1892
+#: Merge.rc:1894
 #, c-format
 msgid "Don't display this &message again."
 msgstr ""
 
-#: Merge.rc:1893
+#: Merge.rc:1895
 #, c-format
 msgid "Don't ask this &question again."
 msgstr ""
 
-#: Merge.rc:1903
+#: Merge.rc:1905
 #, c-format
 msgid "Syntax colors"
 msgstr ""
 
-#: Merge.rc:1904
+#: Merge.rc:1906
 #, c-format
 msgid "Text Colors"
 msgstr ""
 
-#: Merge.rc:1906
+#: Merge.rc:1908
 #, c-format
 msgid "Version Control"
 msgstr ""
 
-#: Merge.rc:1916
+#: Merge.rc:1918
 #, c-format
 msgid "To:"
 msgstr ""
 
-#: Merge.rc:1917
+#: Merge.rc:1919
 #, c-format
 msgid "From left:"
 msgstr ""
 
-#: Merge.rc:1918
+#: Merge.rc:1920
 #, c-format
 msgid "To left:"
 msgstr ""
 
-#: Merge.rc:1919
+#: Merge.rc:1921
 #, c-format
 msgid "From right:"
 msgstr ""
 
-#: Merge.rc:1920
+#: Merge.rc:1922
 #, c-format
 msgid "To right:"
 msgstr ""
 
-#: Merge.rc:1926
+#: Merge.rc:1928
 #, c-format
 msgid "Version %1"
 msgstr ""
 
-#: Merge.rc:1927
+#: Merge.rc:1929
 #, c-format
 msgid "Unicode"
 msgstr ""
 
-#: Merge.rc:1933
+#: Merge.rc:1935
 #, c-format
 msgid "Options (%1)"
 msgstr ""
 
-#: Merge.rc:1934
+#: Merge.rc:1936
 #, c-format
 msgid "All message boxes are now displayed again."
 msgstr ""
 
-#: Merge.rc:1935
+#: Merge.rc:1937
 #, 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:1936
+#: Merge.rc:1938
 #, c-format
 msgid "The selected font change will not be applied to any currently visible difference windows."
 msgstr ""
 
-#: Merge.rc:1938
+#: Merge.rc:1940
 #, c-format
 msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
 msgstr ""
 
-#: Merge.rc:1940
+#: Merge.rc:1942
 #, 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:1946
+#: Merge.rc:1948
 #, c-format
 msgid "Open"
 msgstr ""
 
-#: Merge.rc:1947
+#: Merge.rc:1949
 #, c-format
 msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1948
+#: Merge.rc:1950
 #, c-format
 msgid "All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1949
+#: Merge.rc:1951
 #, c-format
 msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
 msgstr ""
 
-#: Merge.rc:1951
+#: Merge.rc:1953
 #, c-format
 msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1957
+#: Merge.rc:1959
 #, c-format
 msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1958
+#: Merge.rc:1960
 #, c-format
 msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1959
+#: Merge.rc:1961
 #, c-format
 msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1965
+#: Merge.rc:1967
 #, c-format
 msgid "UTF-8"
 msgstr ""
 
-#: Merge.rc:1966
+#: Merge.rc:1968
 #, c-format
 msgid "UTF-8 (B)"
 msgstr ""
 
-#: Merge.rc:1967
+#: Merge.rc:1969
 #, c-format
 msgid "UCS-2 LE"
 msgstr ""
 
-#: Merge.rc:1968
+#: Merge.rc:1970
 #, c-format
 msgid "UCS-2 BE"
 msgstr ""
 
-#: Merge.rc:1974
+#: Merge.rc:1976
 #, c-format
 msgid "Full Contents"
 msgstr ""
 
-#: Merge.rc:1975
+#: Merge.rc:1977
 #, c-format
 msgid "Quick Contents"
 msgstr ""
 
-#: Merge.rc:1976
+#: Merge.rc:1978
 #, c-format
 msgid "Modified Date"
 msgstr ""
 
-#: Merge.rc:1977
+#: Merge.rc:1979
 #, c-format
 msgid "Modified Date and Size"
 msgstr ""
 
-#: Merge.rc:1978
+#: Merge.rc:1980
 #, c-format
 msgid "Size"
 msgstr ""
 
-#: Merge.rc:1984
+#: Merge.rc:1986
 #, c-format
 msgid "Name"
 msgstr ""
 
-#: Merge.rc:1985
+#: Merge.rc:1987
 #, c-format
 msgid "Location"
 msgstr ""
 
-#: Merge.rc:1986
+#: Merge.rc:1988
 #, c-format
 msgid "Filters"
 msgstr ""
 
-#: Merge.rc:1987
+#: Merge.rc:1989
 #, c-format
 msgid "[F] "
 msgstr ""
 
-#: Merge.rc:1988
+#: Merge.rc:1990
 #, c-format
 msgid "Description"
 msgstr ""
 
-#: Merge.rc:1989
+#: Merge.rc:1991
 #, c-format
 msgid "Select filename for new filter"
 msgstr ""
 
-#: Merge.rc:1990
+#: Merge.rc:1992
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:1992
+#: Merge.rc:1994
 #, c-format
 msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2."
 msgstr ""
 
-#: Merge.rc:1994
+#: Merge.rc:1996
 #, c-format
 msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable."
 msgstr ""
 
-#: Merge.rc:1996
+#: Merge.rc:1998
 #, c-format
 msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System."
 msgstr ""
 
-#: Merge.rc:1998
+#: Merge.rc:2000
 #, c-format
 msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
 msgstr ""
 
-#: Merge.rc:1999
+#: Merge.rc:2001
 #, c-format
 msgid "Locate filter file to install"
 msgstr ""
 
-#: Merge.rc:2001
+#: Merge.rc:2003
 #, c-format
 msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
 msgstr ""
 
-#: Merge.rc:2003
+#: Merge.rc:2005
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr ""
 
-#: Merge.rc:2009
+#: Merge.rc:2011
 #, c-format
 msgid "Regular expression"
 msgstr ""
 
-#: Merge.rc:2015
+#: Merge.rc:2017
 #, c-format
 msgid "&Path to cleartool.exe :"
 msgstr ""
 
-#: Merge.rc:2016
+#: Merge.rc:2018
 #, c-format
 msgid "&Path to SS.EXE :"
 msgstr ""
 
-#: Merge.rc:2022
+#: Merge.rc:2024
 #, c-format
 msgid "Folder Comparison Results"
 msgstr ""
 
-#: Merge.rc:2023
+#: Merge.rc:2025
 #, c-format
 msgid "File Comparison"
 msgstr ""
 
-#: Merge.rc:2024
+#: Merge.rc:2026
 #, c-format
 msgid "Untitled left"
 msgstr ""
 
-#: Merge.rc:2025
+#: Merge.rc:2027
 #, c-format
 msgid "Untitled right"
 msgstr ""
 
-#: Merge.rc:2026
+#: Merge.rc:2028
 #, c-format
 msgid "Theirs File"
 msgstr ""
 
-#: Merge.rc:2027
+#: Merge.rc:2029
 #, c-format
 msgid "Mine File"
 msgstr ""
 
-#: Merge.rc:2033
+#: Merge.rc:2035
 #, c-format
 msgid "Scanning files..."
 msgstr ""
 
-#: Merge.rc:2034
+#: Merge.rc:2036
 #, c-format
 msgid "Opening selection"
 msgstr ""
 
-#: Merge.rc:2035
+#: Merge.rc:2037
 #, c-format
 msgid "Copying Left to Right"
 msgstr ""
 
-#: Merge.rc:2036
+#: Merge.rc:2038
 #, c-format
 msgid "Copying Right to Left"
 msgstr ""
 
-#: Merge.rc:2037
+#: Merge.rc:2039
 #, c-format
 msgid "Copying All to Left"
 msgstr ""
 
-#: Merge.rc:2038
+#: Merge.rc:2040
 #, c-format
 msgid "Copying All to Right"
 msgstr ""
 
-#: Merge.rc:2039
+#: Merge.rc:2041
 #, c-format
 msgid "Copying files..."
 msgstr ""
 
-#: Merge.rc:2040
+#: Merge.rc:2042
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: Merge.rc:2041
+#: Merge.rc:2043
 #, c-format
 msgid "Moving files..."
 msgstr ""
 
-#: Merge.rc:2042
+#: Merge.rc:2044
 #, c-format
 msgid "Creating the report..."
 msgstr ""
 
-#: Merge.rc:2048
+#: Merge.rc:2050
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
-#: Merge.rc:2049
+#: Merge.rc:2051
 #, c-format
 msgid "Line: %s"
 msgstr ""
 
-#: Merge.rc:2050
+#: Merge.rc:2052
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
-#: Merge.rc:2051
+#: Merge.rc:2053
 #, c-format
 msgid "Merge"
 msgstr ""
 
-#: Merge.rc:2052
+#: Merge.rc:2054
 #, c-format
 msgid "Difference %1 of %2"
 msgstr ""
 
-#: Merge.rc:2053
+#: Merge.rc:2055
 #, c-format
 msgid "%1 Differences Found"
 msgstr ""
 
-#: Merge.rc:2054
+#: Merge.rc:2056
 #, c-format
 msgid "1 Difference Found"
 msgstr ""
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2055
+#: Merge.rc:2057
 #, c-format
 msgid "RO"
 msgstr ""
 
-#: Merge.rc:2061
+#: Merge.rc:2063
 #, c-format
 msgid "Item %1 of %2"
 msgstr ""
 
-#: Merge.rc:2062
+#: Merge.rc:2064
 #, c-format
 msgid "Items: %1"
 msgstr ""
 
-#: Merge.rc:2068
+#: Merge.rc:2070
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr ""
 
-#: Merge.rc:2069
+#: Merge.rc:2071
 #, c-format
 msgid "Folder Selection"
 msgstr ""
 
-#: Merge.rc:2070
+#: Merge.rc:2072
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr ""
 
-#: Merge.rc:2071
+#: Merge.rc:2073
 #, c-format
 msgid "Left path is invalid!"
 msgstr ""
 
-#: Merge.rc:2072
+#: Merge.rc:2074
 #, c-format
 msgid "Right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2073
+#: Merge.rc:2075
 #, c-format
 msgid "Both paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2074
+#: Merge.rc:2076
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr ""
 
-#: Merge.rc:2075
+#: Merge.rc:2077
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr ""
 
-#: Merge.rc:2081
+#: Merge.rc:2083
 #, c-format
 msgid "File not found: %1"
 msgstr ""
 
-#: Merge.rc:2082
+#: Merge.rc:2084
 #, c-format
 msgid "File not unpacked: %1"
 msgstr ""
 
-#: Merge.rc:2083
+#: Merge.rc:2085
 #, c-format
 msgid "Cannot open file\n%1\n\n%2"
 msgstr ""
 
-#: Merge.rc:2084
+#: Merge.rc:2086
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr ""
 
-#: Merge.rc:2085
+#: Merge.rc:2087
 #, c-format
 msgid "The file\n%1\nis not a conflict file."
 msgstr ""
 
-#: Merge.rc:2091
+#: Merge.rc:2093
 #, c-format
 msgid "Save As"
 msgstr ""
 
-#: Merge.rc:2092
+#: Merge.rc:2094
 #, c-format
 msgid "Save changes to %1?"
 msgstr ""
 
-#: Merge.rc:2093
+#: Merge.rc:2095
 #, 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:2094
+#: Merge.rc:2096
 #, c-format
 msgid "Error checking destination writeability"
 msgstr ""
 
-#: Merge.rc:2095
+#: Merge.rc:2097
 #, c-format
 msgid "Error backing up file"
 msgstr ""
 
-#: Merge.rc:2097
+#: Merge.rc:2099
 #, c-format
 msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
 msgstr ""
 
-#: Merge.rc:2098
+#: Merge.rc:2100
 #, 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:2099
+#: Merge.rc:2101
 #, 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:2100
+#: Merge.rc:2102
 #, 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:2101
+#: Merge.rc:2103
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?"
 msgstr ""
 
-#: Merge.rc:2102
+#: Merge.rc:2104
 #, c-format
 msgid "%1\nis marked read-only. Would you like to override the read-only item?"
 msgstr ""
 
-#: Merge.rc:2103
+#: Merge.rc:2105
 #, 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:2104
+#: Merge.rc:2106
 #, c-format
 msgid "Save Left File As"
 msgstr ""
 
-#: Merge.rc:2105
+#: Merge.rc:2107
 #, c-format
 msgid "Save Right File As"
 msgstr ""
 
-#: Merge.rc:2111
+#: Merge.rc:2113
 #, c-format
 msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
 msgstr ""
 
-#: Merge.rc:2117
+#: Merge.rc:2119
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr ""
 
-#: Merge.rc:2118
+#: Merge.rc:2120
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr ""
 
-#: Merge.rc:2119
+#: Merge.rc:2121
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr ""
 
-#: Merge.rc:2120
+#: Merge.rc:2122
 #, c-format
 msgid "Error executing versioning system command."
 msgstr ""
 
-#: Merge.rc:2121
+#: Merge.rc:2123
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr ""
 
-#: Merge.rc:2122
+#: Merge.rc:2124
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr ""
 
-#: Merge.rc:2123
+#: Merge.rc:2125
 #, c-format
 msgid "Error from VSS:"
 msgstr ""
 
-#: Merge.rc:2124
+#: Merge.rc:2126
 #, 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:2125
+#: Merge.rc:2127
 #, 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:2131
-#: Merge.rc:2566
-#: Merge.rc:2743
+#: Merge.rc:2133
+#: Merge.rc:2568
+#: Merge.rc:2745
 #, c-format
 msgid "None"
 msgstr ""
 
-#: Merge.rc:2132
+#: Merge.rc:2134
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr ""
 
-#: Merge.rc:2133
+#: Merge.rc:2135
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr ""
 
-#: Merge.rc:2135
+#: Merge.rc:2137
 #, c-format
 msgid "Break at whitespace"
 msgstr ""
 
-#: Merge.rc:2136
+#: Merge.rc:2138
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr ""
 
-#: Merge.rc:2142
 #: Merge.rc:2144
+#: Merge.rc:2146
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr ""
 
-#: Merge.rc:2143
 #: Merge.rc:2145
+#: Merge.rc:2147
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr ""
 
-#: Merge.rc:2146
+#: Merge.rc:2148
 #, c-format
 msgid "Delete selected item on left"
 msgstr ""
 
-#: Merge.rc:2147
+#: Merge.rc:2149
 #, c-format
 msgid "Delete selected item on right"
 msgstr ""
 
-#: Merge.rc:2148
+#: Merge.rc:2150
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr ""
 
-#: Merge.rc:2149
+#: Merge.rc:2151
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr ""
 
-#: Merge.rc:2150
+#: Merge.rc:2152
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr ""
 
-#: Merge.rc:2151
+#: Merge.rc:2153
 #, c-format
 msgid "Right to Left (%1)"
 msgstr ""
 
-#: Merge.rc:2152
+#: Merge.rc:2154
 #, c-format
 msgid "Left to Right (%1)"
 msgstr ""
 
-#: Merge.rc:2153
+#: Merge.rc:2155
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2154
+#: Merge.rc:2156
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2155
-#: Merge.rc:2171
+#: Merge.rc:2157
+#: Merge.rc:2173
 #, c-format
 msgid "Left to... (%1)"
 msgstr ""
 
-#: Merge.rc:2156
-#: Merge.rc:2172
+#: Merge.rc:2158
+#: Merge.rc:2174
 #, c-format
 msgid "Right to... (%1)"
 msgstr ""
 
-#: Merge.rc:2157
-#: Merge.rc:2173
+#: Merge.rc:2159
+#: Merge.rc:2175
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2158
-#: Merge.rc:2174
+#: Merge.rc:2160
+#: Merge.rc:2176
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2164
+#: Merge.rc:2166
 #, c-format
 msgid "Left (%1)"
 msgstr ""
 
-#: Merge.rc:2165
+#: Merge.rc:2167
 #, c-format
 msgid "Right (%1)"
 msgstr ""
 
-#: Merge.rc:2166
+#: Merge.rc:2168
 #, c-format
 msgid "Both (%1)"
 msgstr ""
 
-#: Merge.rc:2167
+#: Merge.rc:2169
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2168
+#: Merge.rc:2170
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2169
+#: Merge.rc:2171
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2170
+#: Merge.rc:2172
 #, c-format
 msgid "Select destination folder"
 msgstr ""
 
-#: Merge.rc:2175
+#: Merge.rc:2177
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr ""
 
-#: Merge.rc:2176
+#: Merge.rc:2178
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr ""
 
-#: Merge.rc:2177
+#: Merge.rc:2179
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr ""
 
-#: Merge.rc:2178
+#: Merge.rc:2180
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr ""
 
-#: Merge.rc:2184
+#: Merge.rc:2186
 #, c-format
 msgid "Are you sure you want to delete\n\n%1 ?"
 msgstr ""
 
-#: Merge.rc:2185
+#: Merge.rc:2187
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr ""
 
-#: Merge.rc:2186
+#: Merge.rc:2188
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr ""
 
-#: Merge.rc:2187
+#: Merge.rc:2189
 #, 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:2193
+#: Merge.rc:2195
 #, c-format
 msgid "Open left file"
 msgstr ""
 
-#: Merge.rc:2194
+#: Merge.rc:2196
 #, c-format
 msgid "Open the left file to external editor"
 msgstr ""
 
-#: Merge.rc:2195
+#: Merge.rc:2197
 #, c-format
 msgid "Open left file with ..."
 msgstr ""
 
-#: Merge.rc:2196
+#: Merge.rc:2198
 #, c-format
 msgid "Open right file"
 msgstr ""
 
-#: Merge.rc:2197
+#: Merge.rc:2199
 #, c-format
 msgid "Open the right file to external editor"
 msgstr ""
 
-#: Merge.rc:2198
+#: Merge.rc:2200
 #, c-format
 msgid "Open right file with..."
 msgstr ""
 
-#: Merge.rc:2199
+#: Merge.rc:2201
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr ""
 
-#: Merge.rc:2200
+#: Merge.rc:2202
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr ""
 
-#: Merge.rc:2201
+#: Merge.rc:2203
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr ""
 
-#: Merge.rc:2202
+#: Merge.rc:2204
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr ""
 
-#: Merge.rc:2203
+#: Merge.rc:2205
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr ""
 
-#: Merge.rc:2204
+#: Merge.rc:2206
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr ""
 
-#: Merge.rc:2210
+#: Merge.rc:2212
 #, c-format
 msgid "Unknown archive format"
 msgstr ""
 
-#: Merge.rc:2211
+#: Merge.rc:2213
 #, c-format
 msgid "Add items from left side to archive"
 msgstr ""
 
-#: Merge.rc:2212
+#: Merge.rc:2214
 #, c-format
 msgid "Add items from right side to archive"
 msgstr ""
 
-#: Merge.rc:2213
+#: Merge.rc:2215
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr ""
 
-#: Merge.rc:2214
+#: Merge.rc:2216
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr ""
 
-#: Merge.rc:2216
+#: Merge.rc:2218
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr ""
 
-#: Merge.rc:2218
+#: Merge.rc:2220
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr ""
 
-#: Merge.rc:2224
+#: Merge.rc:2226
 #, c-format
 msgid "Filename"
 msgstr ""
 
-#: Merge.rc:2225
+#: Merge.rc:2227
 #, c-format
 msgid "Folder"
 msgstr ""
 
-#: Merge.rc:2226
+#: Merge.rc:2228
 #, c-format
 msgid "Comparison result"
 msgstr ""
 
-#: Merge.rc:2227
+#: Merge.rc:2229
 #, c-format
 msgid "Left Date"
 msgstr ""
 
-#: Merge.rc:2228
+#: Merge.rc:2230
 #, c-format
 msgid "Right Date"
 msgstr ""
 
-#: Merge.rc:2229
+#: Merge.rc:2231
 #, c-format
 msgid "Extension"
 msgstr ""
 
-#: Merge.rc:2230
+#: Merge.rc:2232
 #, c-format
 msgid "Left Size"
 msgstr ""
 
-#: Merge.rc:2231
+#: Merge.rc:2233
 #, c-format
 msgid "Right Size"
 msgstr ""
 
-#: Merge.rc:2232
+#: Merge.rc:2234
 #, c-format
 msgid "Right Size (Short)"
 msgstr ""
 
-#: Merge.rc:2233
+#: Merge.rc:2235
 #, c-format
 msgid "Left Size (Short)"
 msgstr ""
 
-#: Merge.rc:2239
+#: Merge.rc:2241
 #, c-format
 msgid "Left Creation Time"
 msgstr ""
 
-#: Merge.rc:2240
+#: Merge.rc:2242
 #, c-format
 msgid "Right Creation Time"
 msgstr ""
 
-#: Merge.rc:2241
+#: Merge.rc:2243
 #, c-format
 msgid "Newer File"
 msgstr ""
 
-#: Merge.rc:2242
+#: Merge.rc:2244
 #, c-format
 msgid "Left File Version"
 msgstr ""
 
-#: Merge.rc:2243
+#: Merge.rc:2245
 #, c-format
 msgid "Right File Version"
 msgstr ""
 
-#: Merge.rc:2244
+#: Merge.rc:2246
 #, c-format
 msgid "Short Result"
 msgstr ""
 
-#: Merge.rc:2245
+#: Merge.rc:2247
 #, c-format
 msgid "Left Attributes"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2248
 #, c-format
 msgid "Right Attributes"
 msgstr ""
 
-#: Merge.rc:2247
+#: Merge.rc:2249
 #, c-format
 msgid "Left EOL"
 msgstr ""
 
-#: Merge.rc:2248
+#: Merge.rc:2250
 #, c-format
 msgid "Right EOL"
 msgstr ""
 
-#: Merge.rc:2254
+#: Merge.rc:2256
 #, c-format
 msgid "Left Encoding"
 msgstr ""
 
-#: Merge.rc:2255
+#: Merge.rc:2257
 #, c-format
 msgid "Right Encoding"
 msgstr ""
 
-#: Merge.rc:2256
+#: Merge.rc:2258
 #, c-format
 msgid "Ignored Diff."
 msgstr ""
 
-#: Merge.rc:2257
+#: Merge.rc:2259
 #, c-format
 msgid "Differences"
 msgstr ""
 
-#: Merge.rc:2258
-#: Merge.rc:2562
+#: Merge.rc:2260
+#: Merge.rc:2564
 #, c-format
 msgid "Binary"
 msgstr ""
 
-#: Merge.rc:2264
+#: Merge.rc:2266
 #, c-format
 msgid "Unable to compare files"
 msgstr ""
 
-#: Merge.rc:2265
+#: Merge.rc:2267
 #, c-format
 msgid "Item aborted"
 msgstr ""
 
-#: Merge.rc:2266
+#: Merge.rc:2268
 #, c-format
 msgid "File skipped"
 msgstr ""
 
-#: Merge.rc:2267
+#: Merge.rc:2269
 #, c-format
 msgid "Folder skipped"
 msgstr ""
 
-#: Merge.rc:2268
+#: Merge.rc:2270
 #, c-format
 msgid "Left only: %1"
 msgstr ""
 
-#: Merge.rc:2269
+#: Merge.rc:2271
 #, c-format
 msgid "Right only: %1"
 msgstr ""
 
-#: Merge.rc:2270
+#: Merge.rc:2272
 #, c-format
 msgid "Binary files are identical"
 msgstr ""
 
-#: Merge.rc:2272
+#: Merge.rc:2274
 #, c-format
 msgid "Binary files are different"
 msgstr ""
 
-#: Merge.rc:2273
+#: Merge.rc:2275
 #, c-format
 msgid "Files are different"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2276
 #, c-format
 msgid "Left Only"
 msgstr ""
 
-#: Merge.rc:2275
+#: Merge.rc:2277
 #, c-format
 msgid "Right Only"
 msgstr ""
 
-#: Merge.rc:2277
+#: Merge.rc:2279
 #, c-format
 msgid "Error"
 msgstr ""
 
-#: Merge.rc:2283
+#: Merge.rc:2285
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr ""
 
-#: Merge.rc:2284
+#: Merge.rc:2286
 #, c-format
 msgid "1 item selected"
 msgstr ""
 
-#: Merge.rc:2285
+#: Merge.rc:2287
 #, c-format
 msgid "%1 items selected"
 msgstr ""
 
-#: Merge.rc:2291
+#: Merge.rc:2293
 #, c-format
 msgid "Filename or folder name."
 msgstr ""
 
-#: Merge.rc:2292
+#: Merge.rc:2294
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr ""
 
-#: Merge.rc:2293
+#: Merge.rc:2295
 #, c-format
 msgid "Comparison result, long form."
 msgstr ""
 
-#: Merge.rc:2294
+#: Merge.rc:2296
 #, c-format
 msgid "Left side modification date."
 msgstr ""
 
-#: Merge.rc:2295
+#: Merge.rc:2297
 #, c-format
 msgid "Right side modification date."
 msgstr ""
 
-#: Merge.rc:2296
+#: Merge.rc:2298
 #, c-format
 msgid "File's extension."
 msgstr ""
 
-#: Merge.rc:2297
+#: Merge.rc:2299
 #, c-format
 msgid "Left file size in bytes."
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2300
 #, c-format
 msgid "Right file size in bytes."
 msgstr ""
 
-#: Merge.rc:2299
+#: Merge.rc:2301
 #, c-format
 msgid "Left file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2300
+#: Merge.rc:2302
 #, c-format
 msgid "Right file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2306
+#: Merge.rc:2308
 #, c-format
 msgid "Left side creation time."
 msgstr ""
 
-#: Merge.rc:2307
+#: Merge.rc:2309
 #, c-format
 msgid "Right side creation time."
 msgstr ""
 
-#: Merge.rc:2308
+#: Merge.rc:2310
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr ""
 
-#: Merge.rc:2309
+#: Merge.rc:2311
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2310
+#: Merge.rc:2312
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2311
+#: Merge.rc:2313
 #, c-format
 msgid "Short comparison result."
 msgstr ""
 
-#: Merge.rc:2312
+#: Merge.rc:2314
 #, c-format
 msgid "Left side attributes."
 msgstr ""
 
-#: Merge.rc:2313
+#: Merge.rc:2315
 #, c-format
 msgid "Right side attributes."
 msgstr ""
 
-#: Merge.rc:2314
+#: Merge.rc:2316
 #, c-format
 msgid "Left side file EOL type"
 msgstr ""
 
-#: Merge.rc:2315
+#: Merge.rc:2317
 #, c-format
 msgid "Right side file EOL type"
 msgstr ""
 
-#: Merge.rc:2321
+#: Merge.rc:2323
 #, c-format
 msgid "Left side encoding."
 msgstr ""
 
-#: Merge.rc:2322
+#: Merge.rc:2324
 #, c-format
 msgid "Right side encoding."
 msgstr ""
 
-#: Merge.rc:2323
+#: Merge.rc:2325
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr ""
 
-#: Merge.rc:2324
+#: Merge.rc:2326
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr ""
 
-#: Merge.rc:2325
+#: Merge.rc:2327
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr ""
 
-#: Merge.rc:2331
+#: Merge.rc:2333
 #, c-format
 msgid "Compare %1 with %2"
 msgstr ""
 
-#: Merge.rc:2332
+#: Merge.rc:2334
 #, c-format
 msgid "Comma-separated list"
 msgstr ""
 
-#: Merge.rc:2333
+#: Merge.rc:2335
 #, c-format
 msgid "Tab-separated list"
 msgstr ""
 
-#: Merge.rc:2334
+#: Merge.rc:2336
 #, c-format
 msgid "Simple HTML"
 msgstr ""
 
-#: Merge.rc:2335
+#: Merge.rc:2337
 #, c-format
 msgid "Simple XML"
 msgstr ""
 
-#: Merge.rc:2337
+#: Merge.rc:2339
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr ""
 
-#: Merge.rc:2338
+#: Merge.rc:2340
 #, c-format
 msgid "Error creating the report:\n%1"
 msgstr ""
 
-#: Merge.rc:2339
+#: Merge.rc:2341
 #, c-format
 msgid "The report has been created successfully."
 msgstr ""
 
-#: Merge.rc:2345
+#: Merge.rc:2347
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr ""
 
-#: Merge.rc:2346
+#: Merge.rc:2348
 #, c-format
 msgid "The selected files are identical."
 msgstr ""
 
-#: Merge.rc:2347
+#: Merge.rc:2349
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr ""
 
-#: Merge.rc:2348
+#: Merge.rc:2350
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr ""
 
-#: Merge.rc:2349
+#: Merge.rc:2351
 #, 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:2350
+#: Merge.rc:2352
 #, 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:2351
+#: Merge.rc:2353
 #, 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:2352
+#: Merge.rc:2354
 #, c-format
 msgid "The selected folder is invalid."
 msgstr ""
 
-#: Merge.rc:2353
+#: Merge.rc:2355
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr ""
 
-#: Merge.rc:2354
+#: Merge.rc:2356
 #, 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:2360
+#: Merge.rc:2362
 #, 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:2361
+#: Merge.rc:2363
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr ""
 
-#: Merge.rc:2362
+#: Merge.rc:2364
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr ""
 
-#: Merge.rc:2363
+#: Merge.rc:2365
 #, c-format
 msgid "Information lost due to encoding errors: right file"
 msgstr ""
 
-#: Merge.rc:2364
+#: Merge.rc:2366
 #, c-format
 msgid "Information lost due to encoding errors: left file"
 msgstr ""
 
-#: Merge.rc:2370
+#: Merge.rc:2372
 #, c-format
 msgid "No difference"
 msgstr ""
 
-#: Merge.rc:2371
+#: Merge.rc:2373
 #, c-format
 msgid "Line difference"
 msgstr ""
 
-#: Merge.rc:2377
+#: Merge.rc:2379
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr ""
 
-#: Merge.rc:2378
+#: Merge.rc:2380
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr ""
 
-#: Merge.rc:2384
+#: Merge.rc:2386
 #, c-format
 msgid "Copy Full Path"
 msgstr ""
 
-#: Merge.rc:2385
+#: Merge.rc:2387
 #, c-format
 msgid "Copy Filename"
 msgstr ""
 
-#: Merge.rc:2391
+#: Merge.rc:2393
 #, c-format
 msgid "Location Pane"
 msgstr ""
 
-#: Merge.rc:2392
+#: Merge.rc:2394
 #, c-format
 msgid "Diff Pane"
 msgstr ""
 
-#: Merge.rc:2398
+#: Merge.rc:2400
 #, c-format
 msgid "Patch file successfully written."
 msgstr ""
 
-#: Merge.rc:2399
+#: Merge.rc:2401
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr ""
 
-#: Merge.rc:2400
+#: Merge.rc:2402
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr ""
 
-#: Merge.rc:2401
+#: Merge.rc:2403
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr ""
 
-#: Merge.rc:2402
+#: Merge.rc:2404
 #, c-format
 msgid "[%1 files selected]"
 msgstr ""
 
-#: Merge.rc:2403
+#: Merge.rc:2405
 #, c-format
 msgid "Normal"
 msgstr ""
 
-#: Merge.rc:2404
+#: Merge.rc:2406
 #, c-format
 msgid "Context"
 msgstr ""
 
-#: Merge.rc:2405
+#: Merge.rc:2407
 #, c-format
 msgid "Unified"
 msgstr ""
 
-#: Merge.rc:2406
+#: Merge.rc:2408
 #, c-format
 msgid "Could not write to file %1."
 msgstr ""
 
-#: Merge.rc:2407
+#: Merge.rc:2409
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr ""
 
-#: Merge.rc:2408
+#: Merge.rc:2410
 #, c-format
 msgid "Specify an output file"
 msgstr ""
 
-#: Merge.rc:2409
+#: Merge.rc:2411
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr ""
 
-#: Merge.rc:2410
+#: Merge.rc:2412
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr ""
 
-#: Merge.rc:2411
+#: Merge.rc:2413
 #, c-format
 msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files."
 msgstr ""
 
-#: Merge.rc:2412
+#: Merge.rc:2414
 #, c-format
 msgid "Folder does not exist."
 msgstr ""
 
-#: Merge.rc:2417
+#: Merge.rc:2419
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr ""
 
-#: Merge.rc:2418
+#: Merge.rc:2420
 #, 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:2419
+#: Merge.rc:2421
 #, c-format
 msgid "\nNote: 7-Zip integration is disabled in WinMerge settings."
 msgstr ""
 
-#: Merge.rc:2420
+#: Merge.rc:2422
 #, c-format
 msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings."
 msgstr ""
 
-#: Merge.rc:2421
+#: Merge.rc:2423
 #, c-format
 msgid "Select file for export"
 msgstr ""
 
-#: Merge.rc:2422
+#: Merge.rc:2424
 #, c-format
 msgid "Select file for import"
 msgstr ""
 
-#: Merge.rc:2423
+#: Merge.rc:2425
 #, c-format
 msgid "Options imported from the file."
 msgstr ""
 
-#: Merge.rc:2424
+#: Merge.rc:2426
 #, c-format
 msgid "Options exported to the file."
 msgstr ""
 
-#: Merge.rc:2425
+#: Merge.rc:2427
 #, c-format
 msgid "Failed to import options from the file."
 msgstr ""
 
-#: Merge.rc:2426
+#: Merge.rc:2428
 #, c-format
 msgid "Failed to write options to the file."
 msgstr ""
 
-#: Merge.rc:2427
+#: Merge.rc:2429
 #, c-format
 msgid "You are about to close several compare windows.\n\nDo you want to continue?"
 msgstr ""
 
-#: Merge.rc:2433
+#: Merge.rc:2435
 #, c-format
 msgid "Regular expression error"
 msgstr ""
 
-#: Merge.rc:2434
+#: Merge.rc:2436
 #, c-format
 msgid "No match"
 msgstr ""
 
-#: Merge.rc:2435
+#: Merge.rc:2437
 #, c-format
 msgid "Invalid regular expression"
 msgstr ""
 
-#: Merge.rc:2436
+#: Merge.rc:2438
 #, c-format
 msgid "Invalid collation character"
 msgstr ""
 
-#: Merge.rc:2437
+#: Merge.rc:2439
 #, c-format
 msgid "Invalid character class name"
 msgstr ""
 
-#: Merge.rc:2438
+#: Merge.rc:2440
 #, c-format
 msgid "Trailing backslash"
 msgstr ""
 
-#: Merge.rc:2439
+#: Merge.rc:2441
 #, c-format
 msgid "Invalid back reference"
 msgstr ""
 
-#: Merge.rc:2440
+#: Merge.rc:2442
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr ""
 
-#: Merge.rc:2441
+#: Merge.rc:2443
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2444
 #, c-format
 msgid "Unmatched \\{"
 msgstr ""
 
-#: Merge.rc:2443
+#: Merge.rc:2445
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr ""
 
-#: Merge.rc:2444
+#: Merge.rc:2446
 #, c-format
 msgid "Invalid range end"
 msgstr ""
 
-#: Merge.rc:2445
+#: Merge.rc:2447
 #, c-format
 msgid "Out of memory"
 msgstr ""
 
-#: Merge.rc:2446
+#: Merge.rc:2448
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr ""
 
-#: Merge.rc:2447
+#: Merge.rc:2449
 #, c-format
 msgid "Premature end of regular expression"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2450
 #, c-format
 msgid "Regular expression too big"
 msgstr ""
 
-#: Merge.rc:2453
+#: Merge.rc:2455
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: Merge.rc:2459
+#: Merge.rc:2461
 #, c-format
 msgid "Western European"
 msgstr ""
 
-#: Merge.rc:2460
+#: Merge.rc:2462
 #, c-format
 msgid "Eastern European"
 msgstr ""
 
-#: Merge.rc:2461
+#: Merge.rc:2463
 #, c-format
 msgid "East Asian"
 msgstr ""
 
-#: Merge.rc:2462
+#: Merge.rc:2464
 #, c-format
 msgid "SE & SW Asian"
 msgstr ""
 
-#: Merge.rc:2463
+#: Merge.rc:2465
 #, c-format
 msgid "Middle Eastern"
 msgstr ""
 
-#: Merge.rc:2464
-#: Merge.rc:2474
+#: Merge.rc:2466
+#: Merge.rc:2476
 #, c-format
 msgid "Not applicable"
 msgstr ""
 
-#: Merge.rc:2470
+#: Merge.rc:2472
 #, c-format
 msgid "MS-Windows"
 msgstr ""
 
-#: Merge.rc:2471
+#: Merge.rc:2473
 #, c-format
 msgid "MS-DOS"
 msgstr ""
 
-#: Merge.rc:2472
+#: Merge.rc:2474
 #, c-format
 msgid "Macintosh"
 msgstr ""
 
-#: Merge.rc:2473
+#: Merge.rc:2475
 #, c-format
 msgid "IBM"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2482
 #, c-format
 msgid "EBCDIC"
 msgstr ""
 
-#: Merge.rc:2481
+#: Merge.rc:2483
 #, c-format
 msgid "IBM EBCDIC Cyrillic"
 msgstr ""
 
-#: Merge.rc:2487
+#: Merge.rc:2489
 #, c-format
 msgid "MS-DOS Latin US"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2490
 #, c-format
 msgid "MS-DOS Arabic"
 msgstr ""
 
-#: Merge.rc:2489
+#: Merge.rc:2491
 #, c-format
 msgid "MS-DOS Greek"
 msgstr ""
 
-#: Merge.rc:2490
+#: Merge.rc:2492
 #, c-format
 msgid "MS-DOS Baltic Rim"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2493
 #, c-format
 msgid "MS-DOS Latin 1"
 msgstr ""
 
-#: Merge.rc:2492
+#: Merge.rc:2494
 #, c-format
 msgid "MS-DOS Greek 1"
 msgstr ""
 
-#: Merge.rc:2493
+#: Merge.rc:2495
 #, c-format
 msgid "MS-DOS Latin 2"
 msgstr ""
 
-#: Merge.rc:2494
+#: Merge.rc:2496
 #, c-format
 msgid "MS-DOS Cyrillic"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2497
 #, c-format
 msgid "MS-DOS Turkish"
 msgstr ""
 
-#: Merge.rc:2496
+#: Merge.rc:2498
 #, c-format
 msgid "MS-DOS Portuguese"
 msgstr ""
 
-#: Merge.rc:2502
+#: Merge.rc:2504
 #, c-format
 msgid "MS-DOS Icelandic"
 msgstr ""
 
-#: Merge.rc:2503
+#: Merge.rc:2505
 #, c-format
 msgid "MS-DOS Hebrew"
 msgstr ""
 
-#: Merge.rc:2504
+#: Merge.rc:2506
 #, c-format
 msgid "MS-DOS French Canada"
 msgstr ""
 
-#: Merge.rc:2505
+#: Merge.rc:2507
 #, c-format
 msgid "MS-DOS Nordic"
 msgstr ""
 
-#: Merge.rc:2506
+#: Merge.rc:2508
 #, c-format
 msgid "MS-DOS Cyrillic CIS 1"
 msgstr ""
 
-#: Merge.rc:2507
+#: Merge.rc:2509
 #, c-format
 msgid "MS-DOS Greek 2"
 msgstr ""
 
-#: Merge.rc:2513
+#: Merge.rc:2515
 #, c-format
 msgid "Windows Thai"
 msgstr ""
 
-#: Merge.rc:2514
+#: Merge.rc:2516
 #, c-format
 msgid "Windows Japanese"
 msgstr ""
 
-#: Merge.rc:2515
+#: Merge.rc:2517
 #, c-format
 msgid "Windows Simplified Chinese"
 msgstr ""
 
-#: Merge.rc:2516
+#: Merge.rc:2518
 #, c-format
 msgid "Windows Korean"
 msgstr ""
 
-#: Merge.rc:2517
+#: Merge.rc:2519
 #, c-format
 msgid "Windows Traditional Chinese"
 msgstr ""
 
-#: Merge.rc:2518
+#: Merge.rc:2520
 #, c-format
 msgid "Windows Latin 2"
 msgstr ""
 
-#: Merge.rc:2519
+#: Merge.rc:2521
 #, c-format
 msgid "Windows Cyrillic (Slavic)"
 msgstr ""
 
-#: Merge.rc:2520
+#: Merge.rc:2522
 #, c-format
 msgid "Windows Latin 1"
 msgstr ""
 
-#: Merge.rc:2521
+#: Merge.rc:2523
 #, c-format
 msgid "Windows Greek"
 msgstr ""
 
-#: Merge.rc:2522
+#: Merge.rc:2524
 #, c-format
 msgid "Windows Latin 5 (Turkish)"
 msgstr ""
 
-#: Merge.rc:2523
+#: Merge.rc:2525
 #, c-format
 msgid "Windows Hebrew"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2526
 #, c-format
 msgid "Windows Arabic"
 msgstr ""
 
-#: Merge.rc:2525
+#: Merge.rc:2527
 #, c-format
 msgid "Windows Baltic Rim"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2528
 #, c-format
 msgid "Windows Vietnamese"
 msgstr ""
 
-#: Merge.rc:2532
+#: Merge.rc:2534
 #, c-format
 msgid "Macintosh Roman"
 msgstr ""
 
-#: Merge.rc:2533
+#: Merge.rc:2535
 #, c-format
 msgid "Macintosh Greek"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2536
 #, c-format
 msgid "Macintosh Cyrillic"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2537
 #, c-format
 msgid "Macintosh "
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2538
 #, c-format
 msgid "Macintosh Central Europe"
 msgstr ""
 
-#: Merge.rc:2537
+#: Merge.rc:2539
 #, c-format
 msgid "Macintosh Turkish"
 msgstr ""
 
-#: Merge.rc:2546
+#: Merge.rc:2548
 #, c-format
 msgid "Approximates ISO-8859-2"
 msgstr ""
 
-#: Merge.rc:2549
+#: Merge.rc:2551
 #, c-format
 msgid "Approximates ISO-8859-1"
 msgstr ""
 
-#: Merge.rc:2550
+#: Merge.rc:2552
 #, c-format
 msgid "Approximates ISO-8859-7"
 msgstr ""
 
-#: Merge.rc:2551
+#: Merge.rc:2553
 #, c-format
 msgid "Approximates ISO-8859-9"
 msgstr ""
 
-#: Merge.rc:2552
+#: Merge.rc:2554
 #, c-format
 msgid "Approximates ISO-8859-8"
 msgstr ""
 
-#: Merge.rc:2558
+#: Merge.rc:2560
 #, c-format
 msgid "Win"
 msgstr ""
 
-#: Merge.rc:2559
+#: Merge.rc:2561
 #, c-format
 msgid "Mac"
 msgstr ""
 
-#: Merge.rc:2560
+#: Merge.rc:2562
 #, c-format
 msgid "Unix"
 msgstr ""
 
-#: Merge.rc:2561
+#: Merge.rc:2563
 #, c-format
 msgid "Mixed"
 msgstr ""
 
-#: Merge.rc:2563
+#: Merge.rc:2565
 #, c-format
 msgid "LF"
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2566
 #, c-format
 msgid "CR"
 msgstr ""
 
-#: Merge.rc:2565
+#: Merge.rc:2567
 #, c-format
 msgid "CRLF"
 msgstr ""
 
-#: Merge.rc:2572
+#: Merge.rc:2574
 #, c-format
 msgid " B"
 msgstr ""
 
-#: Merge.rc:2573
+#: Merge.rc:2575
 #, c-format
 msgid " KB"
 msgstr ""
 
-#: Merge.rc:2574
+#: Merge.rc:2576
 #, c-format
 msgid " MB"
 msgstr ""
 
-#: Merge.rc:2575
+#: Merge.rc:2577
 #, c-format
 msgid " GB"
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2578
 #, c-format
 msgid " TB"
 msgstr ""
 
-#: Merge.rc:2577
+#: Merge.rc:2579
 #, c-format
 msgid " PB"
 msgstr ""
 
-#: Merge.rc:2584
+#: Merge.rc:2586
 #, c-format
 msgid "Save the left file"
 msgstr ""
 
-#: Merge.rc:2585
+#: Merge.rc:2587
 #, c-format
 msgid "Save the right file"
 msgstr ""
 
-#: Merge.rc:2586
+#: Merge.rc:2588
 #, c-format
 msgid "Save the left file with name..."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2589
 #, c-format
 msgid "Save the right file with name..."
 msgstr ""
 
-#: Merge.rc:2588
+#: Merge.rc:2590
 #, c-format
 msgid "Change left file/dir read-only status"
 msgstr ""
 
-#: Merge.rc:2589
+#: Merge.rc:2591
 #, c-format
 msgid "Change right file/dir read-only status"
 msgstr ""
 
-#: Merge.rc:2590
+#: Merge.rc:2592
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr ""
 
-#: Merge.rc:2591
+#: Merge.rc:2593
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr ""
 
-#: Merge.rc:2592
+#: Merge.rc:2594
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr ""
 
-#: Merge.rc:2593
+#: Merge.rc:2595
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr ""
 
-#: Merge.rc:2594
+#: Merge.rc:2596
 #, c-format
 msgid "View and adjust file encoding properties\nFile encoding properties"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2597
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr ""
 
-#: Merge.rc:2601
+#: Merge.rc:2603
 #, c-format
 msgid "Select difference area in the current line\nDifference in the Current Line"
 msgstr ""
 
-#: Merge.rc:2602
+#: Merge.rc:2604
 #, c-format
 msgid "Go to line or difference\nGo to (Ctrl+G)"
 msgstr ""
 
-#: Merge.rc:2603
+#: Merge.rc:2605
 #, c-format
 msgid "Set program options\nOptions"
 msgstr ""
 
-#: Merge.rc:2604
+#: Merge.rc:2606
 #, c-format
 msgid "Refresh display\nRefresh (F5)"
 msgstr ""
 
-#: Merge.rc:2605
+#: Merge.rc:2607
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr ""
 
-#: Merge.rc:2606
+#: Merge.rc:2608
 #, c-format
 msgid "Refresh selected items"
 msgstr ""
 
-#: Merge.rc:2607
+#: Merge.rc:2609
 #, c-format
 msgid "Toggle bookmark"
 msgstr ""
 
-#: Merge.rc:2608
+#: Merge.rc:2610
 #, c-format
 msgid "Go to next bookmark"
 msgstr ""
 
-#: Merge.rc:2609
+#: Merge.rc:2611
 #, c-format
 msgid "Go to previous bookmark"
 msgstr ""
 
-#: Merge.rc:2610
+#: Merge.rc:2612
 #, c-format
 msgid "Clear all bookmarks"
 msgstr ""
 
-#: Merge.rc:2616
+#: Merge.rc:2618
 #, c-format
 msgid "Displays items that are exactly the same\nShow Identical Items"
 msgstr ""
 
-#: Merge.rc:2617
+#: Merge.rc:2619
 #, c-format
 msgid "Displays items that have differences\nShow Different Items"
 msgstr ""
 
-#: Merge.rc:2618
+#: Merge.rc:2620
 #, c-format
 msgid "Displays items that exist in only on the left side\nShow Left Unique Items"
 msgstr ""
 
-#: Merge.rc:2619
+#: Merge.rc:2621
 #, c-format
 msgid "Displays items that exist in only on the right side\nShow Right Unique Items"
 msgstr ""
 
-#: Merge.rc:2620
+#: Merge.rc:2622
 #, c-format
 msgid "Displays binary files\nShow Binary Files"
 msgstr ""
 
-#: Merge.rc:2621
+#: Merge.rc:2623
 #, c-format
 msgid "Displays skipped items\nShow Skipped Items"
 msgstr ""
 
-#: Merge.rc:2627
+#: Merge.rc:2629
 #, c-format
 msgid "Select the font for the view\nSelect View Font"
 msgstr ""
 
-#: Merge.rc:2628
+#: Merge.rc:2630
 #, c-format
 msgid "Revert to using the default system font for view\nDefault Font"
 msgstr ""
 
-#: Merge.rc:2629
+#: Merge.rc:2631
 #, c-format
 msgid "Shows whitespace characters"
 msgstr ""
 
-#: Merge.rc:2630
+#: Merge.rc:2632
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr ""
 
-#: Merge.rc:2631
+#: Merge.rc:2633
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr ""
 
-#: Merge.rc:2632
+#: Merge.rc:2634
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr ""
 
-#: Merge.rc:2633
+#: Merge.rc:2635
 #, c-format
 msgid "Select the current user interface language\nLanguage"
 msgstr ""
 
-#: Merge.rc:2634
+#: Merge.rc:2636
 #, c-format
 msgid "Shows differences inside lines with different colors\nShow Line Difference"
 msgstr ""
 
-#: Merge.rc:2635
+#: Merge.rc:2637
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr ""
 
-#: Merge.rc:2636
+#: Merge.rc:2638
 #, c-format
 msgid "Shows line numbers\nShow Line Numbers"
 msgstr ""
 
-#: Merge.rc:2637
+#: Merge.rc:2639
 #, c-format
 msgid "Enable word wrap\nWrap Lines"
 msgstr ""
 
-#: Merge.rc:2638
+#: Merge.rc:2640
 #, c-format
 msgid "Shows selection margins for both panes\nShow Selection Margins"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2641
 #, c-format
 msgid "Increase text size"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2642
 #, c-format
 msgid "Decrease text size"
 msgstr ""
 
-#: Merge.rc:2641
+#: Merge.rc:2643
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr ""
 
-#: Merge.rc:2647
+#: Merge.rc:2649
 #, c-format
 msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
 msgstr ""
 
-#: Merge.rc:2648
+#: Merge.rc:2650
 #, c-format
 msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
 msgstr ""
 
-#: Merge.rc:2649
+#: Merge.rc:2651
 #, c-format
 msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
 msgstr ""
 
-#: Merge.rc:2650
+#: Merge.rc:2652
 #, c-format
 msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
 msgstr ""
 
-#: Merge.rc:2651
+#: Merge.rc:2653
 #, c-format
 msgid "Scroll to the last difference\nLast Difference (Alt+End)"
 msgstr ""
 
-#: Merge.rc:2652
+#: Merge.rc:2654
 #, c-format
 msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)"
 msgstr ""
 
-#: Merge.rc:2653
+#: Merge.rc:2655
 #, c-format
 msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)"
 msgstr ""
 
-#: Merge.rc:2654
+#: Merge.rc:2656
 #, c-format
 msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)"
 msgstr ""
 
-#: Merge.rc:2655
+#: Merge.rc:2657
 #, c-format
 msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)"
 msgstr ""
 
-#: Merge.rc:2656
+#: Merge.rc:2658
 #, c-format
 msgid "Copy all differences to the right file\nAll Right"
 msgstr ""
 
-#: Merge.rc:2657
+#: Merge.rc:2659
 #, c-format
 msgid "Copy all differences to the left file\nAll Left"
 msgstr ""
 
-#: Merge.rc:2658
+#: Merge.rc:2660
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr ""
 
-#: Merge.rc:2659
+#: Merge.rc:2661
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr ""
 
-#: Merge.rc:2665
+#: Merge.rc:2667
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr ""
 
-#: Merge.rc:2666
+#: Merge.rc:2668
 #, c-format
 msgid "Generate a patch-file"
 msgstr ""
 
-#: Merge.rc:2667
+#: Merge.rc:2669
 #, c-format
 msgid "Select and modify filters"
 msgstr ""
 
-#: Merge.rc:2668
+#: Merge.rc:2670
 #, c-format
 msgid "Generates a report from compare results"
 msgstr ""
 
-#: Merge.rc:2674
+#: Merge.rc:2676
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr ""
 
-#: Merge.rc:2675
+#: Merge.rc:2677
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr ""
 
-#: Merge.rc:2676
+#: Merge.rc:2678
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr ""
 
-#: Merge.rc:2677
+#: Merge.rc:2679
 #, c-format
 msgid "No prediffer (normal)"
 msgstr ""
 
-#: Merge.rc:2678
+#: Merge.rc:2680
 #, c-format
 msgid "Suggested plugins"
 msgstr ""
 
-#: Merge.rc:2679
+#: Merge.rc:2681
 #, c-format
 msgid "Other plugins"
 msgstr ""
 
-#: Merge.rc:2680
+#: Merge.rc:2682
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr ""
 
-#: Merge.rc:2686
+#: Merge.rc:2688
 #, c-format
 msgid "Activates next visible file\nActivate next File"
 msgstr ""
 
-#: Merge.rc:2687
+#: Merge.rc:2689
 #, c-format
 msgid "Closes all open windows"
 msgstr ""
 
-#: Merge.rc:2693
+#: Merge.rc:2695
 #, c-format
 msgid "Opens the WinMerge Help\nWinMerge Help"
 msgstr ""
 
-#: Merge.rc:2694
+#: Merge.rc:2696
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr ""
 
-#: Merge.rc:2695
+#: Merge.rc:2697
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr ""
 
-#: Merge.rc:2696
+#: Merge.rc:2698
 #, c-format
 msgid "Private Build: %1"
 msgstr ""
 
-#: Merge.rc:2697
+#: Merge.rc:2699
 #, c-format
 msgid "Opens the release notes document\nRelease Notes"
 msgstr ""
 
-#: Merge.rc:2698
+#: Merge.rc:2700
 #, c-format
 msgid "Opens the translations website\nTranslations"
 msgstr ""
 
-#: Merge.rc:2704
+#: Merge.rc:2706
 #, c-format
 msgid "Plugin Settings"
 msgstr ""
 
-#: Merge.rc:2705
+#: Merge.rc:2707
 #, c-format
 msgid "No prediffer"
 msgstr ""
 
-#: Merge.rc:2706
+#: Merge.rc:2708
 #, c-format
 msgid "Prediff if possible"
 msgstr ""
 
-#: Merge.rc:2708
+#: Merge.rc:2710
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr ""
 
-#: Merge.rc:2709
+#: Merge.rc:2711
 #, c-format
 msgid "<None>"
 msgstr ""
 
-#: Merge.rc:2710
+#: Merge.rc:2712
 #, c-format
 msgid "<Automatic>"
 msgstr ""
 
-#: Merge.rc:2716
+#: Merge.rc:2718
 #, c-format
 msgid "Open the file with registered application"
 msgstr ""
 
-#: Merge.rc:2717
+#: Merge.rc:2719
 #, c-format
 msgid "Open the file with external editor"
 msgstr ""
 
-#: Merge.rc:2718
+#: Merge.rc:2720
 #, c-format
 msgid "Open the file with a particular program"
 msgstr ""
 
-#: Merge.rc:2724
+#: Merge.rc:2726
 #, c-format
 msgid "Do not display moved blocks"
 msgstr ""
 
-#: Merge.rc:2725
+#: Merge.rc:2727
 #, c-format
 msgid "Display all moved blocks"
 msgstr ""
 
-#: Merge.rc:2726
+#: Merge.rc:2728
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr ""
 
-#: Merge.rc:2727
+#: Merge.rc:2729
 #, c-format
 msgid "Go to diff under cursor"
 msgstr ""
 
-#: Merge.rc:2728
+#: Merge.rc:2730
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr ""
 
-#: Merge.rc:2729
+#: Merge.rc:2731
 #, c-format
 msgid "G&oto Line %1"
 msgstr ""
 
-#: Merge.rc:2735
+#: Merge.rc:2737
 #, c-format
 msgid "Disabled"
 msgstr ""
 
-#: Merge.rc:2736
+#: Merge.rc:2738
 #, c-format
 msgid "From file system"
 msgstr ""
 
-#: Merge.rc:2737
+#: Merge.rc:2739
 #, c-format
 msgid "From MRU list"
 msgstr ""
 
-#: Merge.rc:2744
+#: Merge.rc:2746
 #, c-format
 msgid "ASP"
 msgstr ""
 
-#: Merge.rc:2745
+#: Merge.rc:2747
 #, c-format
 msgid "Basic"
 msgstr ""
 
-#: Merge.rc:2746
+#: Merge.rc:2748
 #, c-format
 msgid "Batch"
 msgstr ""
 
-#: Merge.rc:2747
+#: Merge.rc:2749
 #, c-format
 msgid "C/C++"
 msgstr ""
 
-#: Merge.rc:2748
+#: Merge.rc:2750
 #, c-format
 msgid "C#"
 msgstr ""
 
-#: Merge.rc:2749
+#: Merge.rc:2751
 #, c-format
 msgid "CSS"
 msgstr ""
 
-#: Merge.rc:2750
+#: Merge.rc:2752
 #, c-format
 msgid "DCL"
 msgstr ""
 
-#: Merge.rc:2751
+#: Merge.rc:2753
 #, c-format
 msgid "Fortran"
 msgstr ""
 
-#: Merge.rc:2752
+#: Merge.rc:2754
 #, c-format
 msgid "HTML"
 msgstr ""
 
-#: Merge.rc:2753
+#: Merge.rc:2755
 #, c-format
 msgid "INI"
 msgstr ""
 
-#: Merge.rc:2754
+#: Merge.rc:2756
 #, c-format
 msgid "InnoSetup"
 msgstr ""
 
-#: Merge.rc:2755
+#: Merge.rc:2757
 #, c-format
 msgid "InstallShield"
 msgstr ""
 
-#: Merge.rc:2756
+#: Merge.rc:2758
 #, c-format
 msgid "Java"
 msgstr ""
 
-#: Merge.rc:2757
+#: Merge.rc:2759
 #, c-format
 msgid "AutoLISP"
 msgstr ""
 
-#: Merge.rc:2758
+#: Merge.rc:2760
 #, c-format
 msgid "NSIS"
 msgstr ""
 
-#: Merge.rc:2759
+#: Merge.rc:2761
 #, c-format
 msgid "Pascal"
 msgstr ""
 
-#: Merge.rc:2760
+#: Merge.rc:2762
 #, c-format
 msgid "Perl"
 msgstr ""
 
-#: Merge.rc:2761
+#: Merge.rc:2763
 #, c-format
 msgid "PHP"
 msgstr ""
 
-#: Merge.rc:2762
+#: Merge.rc:2764
 #, c-format
 msgid "Portable Object"
 msgstr ""
 
-#: Merge.rc:2763
+#: Merge.rc:2765
 #, c-format
 msgid "PowerShell"
 msgstr ""
 
-#: Merge.rc:2764
+#: Merge.rc:2766
 #, c-format
 msgid "Python"
 msgstr ""
 
-#: Merge.rc:2765
+#: Merge.rc:2767
 #, c-format
 msgid "REXX"
 msgstr ""
 
-#: Merge.rc:2766
+#: Merge.rc:2768
 #, c-format
 msgid "Resources"
 msgstr ""
 
-#: Merge.rc:2767
+#: Merge.rc:2769
 #, c-format
 msgid "Ruby"
 msgstr ""
 
-#: Merge.rc:2768
+#: Merge.rc:2770
 #, c-format
 msgid "SGML"
 msgstr ""
 
-#: Merge.rc:2769
+#: Merge.rc:2771
 #, c-format
 msgid "Shell"
 msgstr ""
 
-#: Merge.rc:2770
+#: Merge.rc:2772
 #, c-format
 msgid "SIOD"
 msgstr ""
 
-#: Merge.rc:2771
+#: Merge.rc:2773
 #, c-format
 msgid "SQL"
 msgstr ""
 
-#: Merge.rc:2772
+#: Merge.rc:2774
 #, c-format
 msgid "TCL"
 msgstr ""
 
-#: Merge.rc:2773
+#: Merge.rc:2775
 #, c-format
 msgid "TEX"
 msgstr ""
 
-#: Merge.rc:2774
+#: Merge.rc:2776
 #, c-format
 msgid "XML"
 msgstr ""
 
-#: Merge.rc:2779
+#: Merge.rc:2781
 #, c-format
 msgid "Hide the toolbar"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2782
 #, c-format
 msgid "Show small toolbar"
 msgstr ""
 
-#: Merge.rc:2781
+#: Merge.rc:2783
 #, c-format
 msgid "Show big toolbar"
 msgstr ""

diff --git a/Src/Merge.rc b/Src/Merge.rc
index cfccc08..cc9b9ce 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -759,18 +759,20 @@ BEGIN
     CONTROL         "&Preserve file time in file compare",
                     IDC_PRESERVE_FILETIME,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,7,67,220,10
-    LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,82,125,8
-    COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,20,91,147,41,CBS_DROPDOWNLIST | 
+    CONTROL         "E&nable plugins",IDC_ENABLE_PLUGINS,"Button",
+                     BS_AUTOCHECKBOX | WS_TABSTOP,7,77,220,10
+    LTEXT           "O&pen-dialog Auto-Completion:",IDC_STATIC,19,92,125,8
+    COMBOBOX        IDC_AUTO_COMPLETE_SOURCE,20,101,147,41,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,110,
+    GROUPBOX        "Enable multiple compare windows for",IDC_STATIC,7,120,
                     221,37
     CONTROL         "&Folder compare",IDC_MULTIDOC_DIRCMP,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
-    CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,131,206,10
+    CONTROL         "Fil&e compare",IDC_MULTIDOC_FILECMP,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,141,206,10
     LTEXT           "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
-                    IDC_STATIC,7,163,168,31
-    PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,169,50,14,NOT
+                    IDC_STATIC,7,173,168,31
+    PUSHBUTTON      "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,179,50,14,NOT
                     WS_TABSTOP
 END
 

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index d2e8e76..4bef399 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -442,6 +442,7 @@ int CMergeDoc::Rescan(BOOL &bBinary, BOOL &bIdentical,
                m_diffWrapper.GetMovedLines()->Clear();
 
        // Set paths for diffing and run diff
+       m_diffWrapper.EnablePlugins(GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED));
        m_diffWrapper.SetPaths(m_tempFiles[0].GetPath(), m_tempFiles[1].GetPath(), TRUE);
        m_diffWrapper.SetCompareFiles(m_filePaths.GetLeft(), m_filePaths.GetRight());
        m_diffWrapper.SetCodepage(m_ptBuf[0]->m_encoding.m_unicoding ?

diff --git a/Src/OptionsDef.h b/Src/OptionsDef.h
index 9f9c539..f41bd9f 100644 (file)
--- a/Src/OptionsDef.h
+++ b/Src/OptionsDef.h
@@ -151,6 +151,9 @@ const TCHAR OPT_VSS_PATH[] = _T("Settings/VssPath");
 const TCHAR OPT_ARCHIVE_ENABLE[] = _T("Merge7z/Enable");
 const TCHAR OPT_ARCHIVE_PROBETYPE[] = _T("Merge7z/ProbeSignature");
 
+// Plugins
+const TCHAR OPT_PLUGINS_ENABLED[] = _T("Settings/PluginsEnabled");
+
 // Font options
 const TCHAR OPT_FONT_FILECMP_USECUSTOM[] = _T("Font/Specified");
 const TCHAR OPT_FONT_DIRCMP_USECUSTOM[] = _T("FontDirCompare/Specified");

diff --git a/Src/OptionsInit.cpp b/Src/OptionsInit.cpp
index 543e7ef..fedc11f 100644 (file)
--- a/Src/OptionsInit.cpp
+++ b/Src/OptionsInit.cpp
@@ -155,6 +155,8 @@ void CMergeApp::OptionsInit()
        m_pOptions->InitOption(OPT_ARCHIVE_ENABLE, 1); // Enable by default
        m_pOptions->InitOption(OPT_ARCHIVE_PROBETYPE, false);
 
+       m_pOptions->InitOption(OPT_PLUGINS_ENABLED, false);
+
        m_pOptions->InitOption(OPT_FONT_FILECMP_USECUSTOM, false);
        m_pOptions->InitOption(OPT_FONT_DIRCMP_USECUSTOM, false);
 

diff --git a/Src/PropGeneral.cpp b/Src/PropGeneral.cpp
index b56b48f..92d57dd 100644 (file)
--- a/Src/PropGeneral.cpp
+++ b/Src/PropGeneral.cpp
@@ -57,6 +57,7 @@ CPropGeneral::CPropGeneral(COptionsMgr *optionsMgr) : CPropertyPage(CPropGeneral
 , m_bMultipleDirCmp(FALSE)
 , m_nAutoCompleteSource(0)
 , m_bPreserveFiletime(FALSE)
+, m_bEnablePlugins(FALSE)
 {
 }
 
@@ -95,6 +96,7 @@ void CPropGeneral::DoDataExchange(CDataExchange* pDX)
        DDX_Check(pDX, IDC_MULTIDOC_DIRCMP, m_bMultipleDirCmp);
        DDX_CBIndex(pDX, IDC_AUTO_COMPLETE_SOURCE, m_nAutoCompleteSource);
        DDX_Check(pDX, IDC_PRESERVE_FILETIME, m_bPreserveFiletime);
+       DDX_Check(pDX, IDC_ENABLE_PLUGINS, m_bEnablePlugins);
        //}}AFX_DATA_MAP
 }
 
@@ -103,6 +105,7 @@ BEGIN_MESSAGE_MAP(CPropGeneral, CPropertyPage)
        //{{AFX_MSG_MAP(CPropGeneral)
        ON_BN_CLICKED(IDC_RESET_ALL_MESSAGE_BOXES, OnResetAllMessageBoxes)
        //}}AFX_MSG_MAP
+       ON_BN_CLICKED(IDC_VERIFY_OPEN_PATHS, &CPropGeneral::OnBnClickedVerifyOpenPaths)
 END_MESSAGE_MAP()
 
 /** 
@@ -120,6 +123,7 @@ void CPropGeneral::ReadOptions()
        m_bMultipleDirCmp = m_pOptionsMgr->GetBool(OPT_MULTIDOC_DIRDOCS);
        m_nAutoCompleteSource = m_pOptionsMgr->GetInt(OPT_AUTO_COMPLETE_SOURCE);
        m_bPreserveFiletime = m_pOptionsMgr->GetBool(OPT_PRESERVE_FILETIMES);
+       m_bEnablePlugins = m_pOptionsMgr->GetBool(OPT_PLUGINS_ENABLED);
 }
 
 /** 
@@ -137,6 +141,7 @@ void CPropGeneral::WriteOptions()
        m_pOptionsMgr->SaveOption(OPT_MULTIDOC_DIRDOCS, m_bMultipleDirCmp == TRUE);
        m_pOptionsMgr->SaveOption(OPT_AUTO_COMPLETE_SOURCE, m_nAutoCompleteSource);
        m_pOptionsMgr->SaveOption(OPT_PRESERVE_FILETIMES, m_bPreserveFiletime);
+       m_pOptionsMgr->SaveOption(OPT_PLUGINS_ENABLED, m_bEnablePlugins);
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -150,3 +155,8 @@ void CPropGeneral::OnResetAllMessageBoxes()
        CMessageBoxDialog::ResetMessageBoxes();
        LangMessageBox(IDS_MESSAGE_BOX_ARE_RESET, MB_ICONINFORMATION);
 }
+
+void CPropGeneral::OnBnClickedVerifyOpenPaths()
+{
+       // TODO: Add your control notification handler code here
+}

diff --git a/Src/PropGeneral.h b/Src/PropGeneral.h
index 7c9fc81..a273565 100644 (file)
--- a/Src/PropGeneral.h
+++ b/Src/PropGeneral.h
@@ -43,6 +43,7 @@ public:
        BOOL    m_bMultipleDirCmp;
        int             m_nAutoCompleteSource;
        BOOL    m_bPreserveFiletime;
+       BOOL m_bEnablePlugins;
        //}}AFX_DATA
 
 
@@ -65,6 +66,8 @@ protected:
 
 private:
        COptionsMgr *m_pOptionsMgr;
+public:
+       afx_msg void OnBnClickedVerifyOpenPaths();
 };
 
 //{{AFX_INSERT_LOCATION}}

diff --git a/Src/resource.h b/Src/resource.h
index 5c29cb1..d620cc3 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -431,6 +431,7 @@
 #define IDC_TMPFOLDER_SYSTEM            1338
 #define IDC_TMPFOLDER_BROWSE            1339
 #define IDC_TMPFOLDER_NAME              1340
+#define IDC_ENABLE_PLUGINS              1341
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605
@@ -1039,7 +1040,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        237
 #define _APS_NEXT_COMMAND_VALUE         33172
-#define _APS_NEXT_CONTROL_VALUE         1341
+#define _APS_NEXT_CONTROL_VALUE         1342
 #define _APS_NEXT_SYMED_VALUE           113
 #endif
 #endif