Remove MFC dependency

diff --git a/Externals/poco/Foundation/src/pocomsg.h b/Externals/poco/Foundation/src/pocomsg.h
index cf8b74d..d285444 100644 (file)
--- a/Externals/poco/Foundation/src/pocomsg.h
+++ b/Externals/poco/Foundation/src/pocomsg.h
@@ -37,7 +37,7 @@
 // Categories\r
 //\r
 //\r
-//  Values are 32 bit values laid out as follows:\r
+//  Values are 32 bit values layed out as follows:\r
 //\r
 //   3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1\r
 //   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0\r
@@ -77,7 +77,7 @@
 //\r
 // MessageText:\r
 //\r
-// Fatal\r
+//  Fatal\r
 //\r
 #define POCO_CTG_FATAL                   0x00000001L\r
 \r
@@ -86,7 +86,7 @@
 //\r
 // MessageText:\r
 //\r
-// Critical\r
+//  Critical\r
 //\r
 #define POCO_CTG_CRITICAL                0x00000002L\r
 \r
@@ -95,7 +95,7 @@
 //\r
 // MessageText:\r
 //\r
-// Error\r
+//  Error\r
 //\r
 #define POCO_CTG_ERROR                   0x00000003L\r
 \r
@@ -104,7 +104,7 @@
 //\r
 // MessageText:\r
 //\r
-// Warning\r
+//  Warning\r
 //\r
 #define POCO_CTG_WARNING                 0x00000004L\r
 \r
@@ -113,7 +113,7 @@
 //\r
 // MessageText:\r
 //\r
-// Notice\r
+//  Notice\r
 //\r
 #define POCO_CTG_NOTICE                  0x00000005L\r
 \r
@@ -122,7 +122,7 @@
 //\r
 // MessageText:\r
 //\r
-// Information\r
+//  Information\r
 //\r
 #define POCO_CTG_INFORMATION             0x00000006L\r
 \r
@@ -131,7 +131,7 @@
 //\r
 // MessageText:\r
 //\r
-// Debug\r
+//  Debug\r
 //\r
 #define POCO_CTG_DEBUG                   0x00000007L\r
 \r
@@ -140,7 +140,7 @@
 //\r
 // MessageText:\r
 //\r
-// Trace\r
+//  Trace\r
 //\r
 #define POCO_CTG_TRACE                   0x00000008L\r
 \r
@@ -152,7 +152,7 @@
 //\r
 // MessageText:\r
 //\r
-// %1\r
+//  %1\r
 //\r
 #define POCO_MSG_LOG                     0x00001000L\r
 \r

diff --git a/Externals/poco/Foundation/src/pocomsg.rc b/Externals/poco/Foundation/src/pocomsg.rc
index a928b13..116522b 100644 (file)
--- a/Externals/poco/Foundation/src/pocomsg.rc
+++ b/Externals/poco/Foundation/src/pocomsg.rc
@@ -1,2 +1,2 @@
 LANGUAGE 0x9,0x1\r
-1 11 "MSG00001.bin"\r
+1 11 MSG00001.bin\r

diff --git a/Src/ConflictFileParser.cpp b/Src/ConflictFileParser.cpp
index 39aec1a..2a14fd8 100644 (file)
--- a/Src/ConflictFileParser.cpp
+++ b/Src/ConflictFileParser.cpp
@@ -27,12 +27,10 @@
 // Copyright (C) 2000 - Francis Irving
 // <francis@flourish.org> - January 2001
 
-#include "StdAfx.h"
+#include <windows.h>
+#include "ConflictFileParser.h"
 #include "UnicodeString.h"
 #include "UniFile.h"
-#include "ConflictFileParser.h"
-#include "OptionsDef.h"
-#include "Merge.h"
 #include "FileTextEncoding.h"
 #include "codepage_detect.h"
 
@@ -87,12 +85,13 @@ bool IsConflictFile(LPCTSTR conflictFileName)
  * @param [in] workingCopyFileName Full path for user's modified file in
  *  working copy/working folder.
  * @param [in] newRevisionFileName Full path for revision control file.
+ * @param [in] iGuessEncodingType Try to guess codepage (not just unicode encoding)
  * @param [out] bNestedConflicts returned as true if nested conflicts found.
  * @return true if conflict file was successfully parsed, false otherwise.
  */
 bool ParseConflictFile(LPCTSTR conflictFileName,
                LPCTSTR workingCopyFileName, LPCTSTR newRevisionFileName,
-               bool &bNestedConflicts)
+               int iGuessEncodingType, bool &bNestedConflicts)
 {
        UniMemFile conflictFile;
        UniStdioFile workingCopy;
@@ -114,7 +113,6 @@ bool ParseConflictFile(LPCTSTR conflictFileName,
 
        // detect codepage of conflict file
        FileTextEncoding encoding;
-       int iGuessEncodingType = GetOptionsMgr()->GetInt(OPT_CP_DETECT);
        GuessCodepageEncoding(conflictFileName, &encoding,
                iGuessEncodingType);
 

diff --git a/Src/ConflictFileParser.h b/Src/ConflictFileParser.h
index 2380af1..03d41e6 100644 (file)
--- a/Src/ConflictFileParser.h
+++ b/Src/ConflictFileParser.h
@@ -36,6 +36,6 @@ bool IsConflictFile(LPCTSTR conflictFileName);
 
 bool ParseConflictFile(LPCTSTR conflictFileName,
                LPCTSTR workingCopyFileName, LPCTSTR newRevisionFileName,
-               bool &nestedConflicts);
+               int iGuessEncodingType, bool &nestedConflicts);
 
 #endif // _CONFLICT_FILE_PARSER_H_

diff --git a/Src/DiffFileInfo.cpp b/Src/DiffFileInfo.cpp
index 94c5acb..b4414ca 100644 (file)
--- a/Src/DiffFileInfo.cpp
+++ b/Src/DiffFileInfo.cpp
@@ -22,10 +22,9 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
-#include "stdafx.h"
-#include "DirItem.h"
+#include <windows.h>
 #include "DiffFileInfo.h"
-#include "unicoder.h"
+#include "DirItem.h"
 #include "UnicodeString.h"
 
 /**

diff --git a/Src/DirItem.cpp b/Src/DirItem.cpp
index 16a0092..da87b84 100644 (file)
--- a/Src/DirItem.cpp
+++ b/Src/DirItem.cpp
@@ -26,15 +26,16 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <tchar.h>
+#include "DirItem.h"
 #include "UnicodeString.h"
 #include "coretools.h"
-#include "DirItem.h"
+#include "paths.h"
 
 /**
  * @brief Set filename and path for the item.
  * @param [in] fullpath Full path to file to set to item.
  */
-void DirItem::SetFile(String fullPath)
+void DirItem::SetFile(const String &fullPath)
 {
        String ext;
        SplitFilename(fullPath.c_str(), &path, &filename, &ext);
@@ -43,6 +44,15 @@ void DirItem::SetFile(String fullPath)
 }
 
 /**
+ * @brief Get the full path of the item.
+ * @return fullpath
+ */
+String DirItem::GetFile() const
+{
+       return paths_ConcatPath(path, filename);
+}
+
+/**
  * @brief Update fileinfo from given file.
  * This function updates file's information from given item. Function
  * does not set filename and path.

diff --git a/Src/DirItem.h b/Src/DirItem.h
index ad3b3c8..6e384c0 100644 (file)
--- a/Src/DirItem.h
+++ b/Src/DirItem.h
@@ -59,7 +59,8 @@ struct DirItem
        FileFlags flags; /**< file attributes */
 
        DirItem() : ctime(0), mtime(0), size(-1), bIsDir(false) { }
-       void SetFile(String fullPath);
+       void SetFile(const String &fullPath);
+       String GetFile() const;
        BOOL Update(const String &sFilePath);
        void ClearPartial();
 };

diff --git a/Src/FileTextEncoding.cpp b/Src/FileTextEncoding.cpp
index 982e36d..d42e7d8 100644 (file)
--- a/Src/FileTextEncoding.cpp
+++ b/Src/FileTextEncoding.cpp
@@ -6,15 +6,8 @@
 // ID line follows -- this is updated by SVN
 // $Id: FileTextEncoding.cpp 7172 2010-05-19 12:57:18Z jtuc $
 
-#include "stdafx.h"
-#include "unicoder.h"
 #include "FileTextEncoding.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
+#include "unicoder.h"
 
 FileTextEncoding::FileTextEncoding()
 {
@@ -89,15 +82,15 @@ String FileTextEncoding::GetName() const
        if (m_unicoding == ucr::UTF8)
        {
                if (m_bom)
-                       return LoadResString(IDS_UNICODING_UTF8_BOM);
+                       return _T("UTF-8 (B)");
                else
-                       return LoadResString(IDS_UNICODING_UTF8);
+                       return _T("UTF-8");
        }
 
        if (m_unicoding == ucr::UCS2LE)
-               return LoadResString(IDS_UNICODING_UCS2_LE);
+               return _T("UCS-2 LE");
        if (m_unicoding == ucr::UCS2BE)
-               return LoadResString(IDS_UNICODING_UCS2_BE);
+               return _T("UCS-2 BE");
 
        String str;
        if (m_codepage > -1)
@@ -105,7 +98,7 @@ String FileTextEncoding::GetName() const
                if (m_codepage == CP_UTF8)
                {
                        // We detected codepage to be UTF-8, but unicoding was not set
-                       str = LoadResString(IDS_UNICODING_UTF8);
+                       str = _T("UTF-8");
                }
                else
                {

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index bf21adf..e0c1806 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -937,7 +937,7 @@ int CMainFrame::HandleReadonlySave(CString& strSavePath, BOOL bMultiFile,
        CString title;
        int nVerSys = 0;
 
-       bFileRO = files_isFileReadOnly(strSavePath, &bFileExists);
+       bFileRO = files_isFileReadOnly((LPCTSTR)strSavePath, &bFileExists);
        nVerSys = GetOptionsMgr()->GetInt(OPT_VCS_SYSTEM);
        
        if (bFileExists && bFileRO)
@@ -3703,7 +3703,8 @@ BOOL CMainFrame::DoOpenConflict(LPCTSTR conflictFile, bool checked)
 
        // Parse conflict file into two files.
        bool inners;
-       bool success = ParseConflictFile(conflictFile, workFile.c_str(), revFile.c_str(), inners);
+       int iGuessEncodingType = GetOptionsMgr()->GetInt(OPT_CP_DETECT);
+       bool success = ParseConflictFile(conflictFile, workFile.c_str(), revFile.c_str(), iGuessEncodingType, inners);
 
        if (success)
        {

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 819d324..d5ceb68 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -2173,15 +2173,6 @@ BEGIN
     IDS_XML_REPORT_FILES    "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
 END
 
-// Unicoding types
-STRINGTABLE
-BEGIN
-    IDS_UNICODING_UTF8      "UTF-8"
-    IDS_UNICODING_UTF8_BOM  "UTF-8 (B)"
-    IDS_UNICODING_UCS2_LE   "UCS-2 LE"
-    IDS_UNICODING_UCS2_BE   "UCS-2 BE"
-END
-
 // COMPARE OPTIONS
 STRINGTABLE
 BEGIN

diff --git a/Src/Merge.vcproj b/Src/Merge.vcproj
index 1fbec24..a88c85d 100644 (file)
--- a/Src/Merge.vcproj
+++ b/Src/Merge.vcproj
@@ -324,14 +324,16 @@
                        Name="Source Files"\r
                        Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">\r
                        <File\r
-                               RelativePath="7zCommon.cpp">\r
+                               RelativePath=".\AnsiConvert.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -340,6 +342,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -349,6 +353,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -357,18 +363,21 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="AboutDlg.cpp">\r
+                               RelativePath="charsets.c">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -377,6 +386,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -386,6 +396,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -394,20 +405,19 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath=".\AnsiConvert.cpp">\r
+                               RelativePath="codepage.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""/>\r
+                                               PreprocessorDefinitions=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -416,8 +426,6 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -427,8 +435,6 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -437,13 +443,11 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""/>\r
+                                               PreprocessorDefinitions=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="BCMenu.cpp">\r
+                               RelativePath="codepage_detect.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -480,17 +484,17 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Common\Bitmap.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="CCPrompt.cpp">\r
+                               RelativePath="CompareOptions.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -499,6 +503,9 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -508,6 +515,9 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -516,11 +526,14 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="charsets.c">\r
+                               RelativePath="CompareStats.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -528,7 +541,9 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -538,6 +553,8 @@
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -548,6 +565,8 @@
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -557,18 +576,20 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="ChildFrm.cpp">\r
+                               RelativePath="ConfigLog.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
+                                               PreprocessorDefinitions=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -594,18 +615,19 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
+                                               PreprocessorDefinitions=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\ClipBoard.cpp">\r
+                               RelativePath="ConflictFileParser.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -614,6 +636,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -623,6 +646,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -631,18 +655,20 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\CMoveConstraint.cpp">\r
+                               RelativePath="Common\coretools.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -651,6 +677,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -660,6 +687,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -668,11 +696,12 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="codepage.cpp">\r
+                               RelativePath="DiffContext.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -709,14 +738,15 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="codepage_detect.cpp">\r
+                               RelativePath="DiffFileData.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -725,6 +755,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="1"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -734,6 +765,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="1"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -742,18 +774,20 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="ColorButton.cpp">\r
+                               RelativePath="DiffFileInfo.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -762,6 +796,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -771,6 +806,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -779,11 +815,12 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="CompareOptions.cpp">\r
+                               RelativePath="DiffItem.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -832,14 +869,15 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="CompareStatisticsDlg.cpp">\r
+                               RelativePath="DiffItemList.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -848,6 +886,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -857,6 +896,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -865,11 +905,12 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="CompareStats.cpp">\r
+                               RelativePath="DiffList.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -918,7 +959,7 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="ConfigLog.cpp">\r
+                               RelativePath="DiffThread.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -955,7 +996,7 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="ConfirmFolderCopyDlg.cpp">\r
+                               RelativePath="DiffWrapper.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -992,7 +1033,7 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="ConflictFileParser.cpp">\r
+                               RelativePath="DirCmpReport.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -1029,7 +1070,7 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\coretools.cpp">\r
+                               RelativePath="DirItem.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -1037,7 +1078,9 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -1047,6 +1090,8 @@
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1057,6 +1102,8 @@
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1066,11 +1113,13 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\CSubclass.cpp">\r
+                               RelativePath="DirScan.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -1107,14 +1156,15 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DiffContext.cpp">\r
+                               RelativePath="DirTravel.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -1123,6 +1173,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1132,6 +1183,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1140,18 +1192,20 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DiffFileData.cpp">\r
+                               RelativePath="Common\dllproxy.c">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -1160,6 +1214,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1169,6 +1224,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1177,11 +1233,12 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DiffFileInfo.cpp">\r
+                               RelativePath="dllpstub.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -1218,17 +1275,14 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DiffItem.cpp">\r
+                               RelativePath="Environment.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
+                                               PreprocessorDefinitions=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -1237,9 +1291,6 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1249,9 +1300,6 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1260,14 +1308,11 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
+                                               PreprocessorDefinitions=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DiffItemList.cpp">\r
+                               RelativePath="FileFilter.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -1275,7 +1320,9 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -1285,6 +1332,8 @@
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1295,6 +1344,8 @@
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1304,11 +1355,13 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DiffList.cpp">\r
+                               RelativePath="FileFilterHelper.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -1357,14 +1410,17 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DiffTextBuffer.cpp">\r
+                               RelativePath="FileFilterMgr.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -1373,6 +1429,9 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1382,6 +1441,9 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1390,18 +1452,22 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DiffThread.cpp">\r
+                               RelativePath="files.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -1410,6 +1476,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1419,6 +1486,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1427,18 +1495,20 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DiffViewBar.cpp">\r
+                               RelativePath="FileTextEncoding.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -1447,6 +1517,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1456,6 +1527,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1464,11 +1536,12 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DiffWrapper.cpp">\r
+                               RelativePath="FileTransform.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -1505,14 +1578,17 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DirActions.cpp">\r
+                               RelativePath="FileVersion.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -1521,6 +1597,9 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1530,6 +1609,9 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1538,11 +1620,14 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DirCmpReport.cpp">\r
+                               RelativePath="FilterCommentsManager.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -1579,14 +1664,17 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DirCmpReportDlg.cpp">\r
+                               RelativePath="FilterList.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -1595,6 +1683,9 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1604,6 +1695,9 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1612,11 +1706,14 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DirColsDlg.cpp">\r
+                               RelativePath="FolderCmp.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -1653,14 +1750,16 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DirCompProgressDlg.cpp">\r
+                               RelativePath="LineFiltersList.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -1669,6 +1768,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1678,6 +1779,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1686,18 +1789,20 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DirDoc.cpp">\r
+                               RelativePath="locality.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
+                                               PreprocessorDefinitions=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -1723,18 +1828,18 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
+                                               PreprocessorDefinitions=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DirFrame.cpp">\r
+                               RelativePath="Common\LogFile.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
+                                               PreprocessorDefinitions=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -1760,11 +1865,11 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
+                                               PreprocessorDefinitions=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DirItem.cpp">\r
+                               RelativePath="Common\lwdisp.c">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -1772,9 +1877,7 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -1784,8 +1887,6 @@
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1796,8 +1897,6 @@
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1807,20 +1906,19 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DirScan.cpp">\r
+                               RelativePath="markdown.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -1829,6 +1927,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1838,6 +1937,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1846,11 +1946,12 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DirTravel.cpp">\r
+                               RelativePath="MergeCmdLineInfo.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -1858,7 +1959,9 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -1868,6 +1971,8 @@
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1878,6 +1983,8 @@
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1887,18 +1994,20 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DirView.cpp">\r
+                               RelativePath="MovedBlocks.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
+                                               PreprocessorDefinitions=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -1924,18 +2033,20 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
+                                               PreprocessorDefinitions=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DirViewColHandler.cpp">\r
+                               RelativePath="MovedLines.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -1944,6 +2055,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1953,6 +2066,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1961,11 +2076,13 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="DirViewColItems.cpp">\r
+                               RelativePath="Common\multiformatText.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -2002,15 +2119,14 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\dllproxy.c">\r
+                               RelativePath="OptionsInit.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
+                                               PreprocessorDefinitions=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -2019,7 +2135,6 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2029,7 +2144,6 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2038,19 +2152,20 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
+                                               PreprocessorDefinitions=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="dllpstub.cpp">\r
+                               RelativePath="Common\OptionsMgr.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -2059,6 +2174,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2068,6 +2185,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2076,18 +2195,24 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="EditorFilepathBar.cpp">\r
+                               RelativePath=".\PatchHTML.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="PathContext.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -2096,6 +2221,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2105,6 +2231,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2113,21 +2240,21 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath=".\EncodingErrorDlg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="Environment.cpp">\r
+                               RelativePath="paths.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -2136,6 +2263,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2145,6 +2274,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2153,11 +2284,16 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="FileActionScript.cpp">\r
+                               RelativePath="Common\PidlContainer.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="PluginManager.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -2194,17 +2330,14 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="FileFilter.cpp">\r
+                               RelativePath="Plugins.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
+                                               PreprocessorDefinitions=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -2213,9 +2346,6 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2225,9 +2355,6 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2236,14 +2363,11 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
+                                               PreprocessorDefinitions=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="FileFilterHelper.cpp">\r
+                               RelativePath="ProjectFile.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -2251,9 +2375,7 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -2263,8 +2385,6 @@
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2275,8 +2395,6 @@
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2286,13 +2404,11 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="FileFilterMgr.cpp">\r
+                               RelativePath="Common\RegKey.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -2300,9 +2416,7 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -2312,8 +2426,6 @@
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2324,8 +2436,6 @@
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2335,20 +2445,20 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="FileFiltersDlg.cpp">\r
+                               RelativePath="Common\RegOptionsMgr.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -2357,6 +2467,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2366,6 +2478,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2374,48 +2488,51 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="FileOrFolderSelect.cpp">\r
+                               RelativePath="Common\ShellContextMenu.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\Common\ShellFileOperations.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Debug|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Release|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="FilepathEdit.cpp">\r
+                               RelativePath="Common\SortHeaderCtrl.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -2452,7 +2569,7 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="files.cpp">\r
+                               RelativePath="ssapi.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -2489,14 +2606,15 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="FileTextEncoding.cpp">\r
+                               RelativePath="StdAfx.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"\r
+                                               UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -2505,6 +2623,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="1"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2514,6 +2633,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="1"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2522,48 +2642,12 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"\r
+                                               UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="FileTransform.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="FileVersion.cpp">\r
+                               RelativePath="stringdiffs.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -2612,14 +2696,18 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="FilterCommentsManager.cpp">\r
+                               RelativePath=".\SyntaxColorsUtil.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="TempFile.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -2628,6 +2716,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2637,6 +2726,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2645,11 +2735,12 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="FilterList.cpp">\r
+                               RelativePath="Common\unicoder.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -2657,9 +2748,7 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -2669,8 +2758,6 @@
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2681,8 +2768,6 @@
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2692,20 +2777,19 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="FolderCmp.cpp">\r
+                               RelativePath="Common\UnicodeString.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -2714,6 +2798,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2723,6 +2808,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2731,11 +2817,12 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="GhostTextBuffer.cpp">\r
+                               RelativePath="Common\UniFile.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -2772,7 +2859,7 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="GhostTextView.cpp">\r
+                               RelativePath="UniMarkdownFile.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -2809,23 +2896,15 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath=".\HexMergeDoc.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\HexMergeFrm.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\HexMergeView.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="Common\LanguageSelect.cpp">\r
+                               RelativePath="Common\Utf8FileDetect.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -2834,6 +2913,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2843,6 +2923,7 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2851,14 +2932,12 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath=".\LineFiltersDlg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="LineFiltersList.cpp">\r
+                               RelativePath="Common\varprop.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -2867,7 +2946,8 @@
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""/>\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -2878,6 +2958,7 @@
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
                                                PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2889,6 +2970,7 @@
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
                                                PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2899,18 +2981,22 @@
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
                                                UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""/>\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="LoadSaveCodepageDlg.cpp">\r
+                               RelativePath="Common\version.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="UnicodeDebug|Win32">\r
@@ -2919,6 +3005,9 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2928,6 +3017,9 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
                                                BrowseInformation="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2936,11 +3028,14 @@
                                                Name="VCCLCompilerTool"\r
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="locality.cpp">\r
+                               RelativePath="VSSHelper.cpp">\r
                                <FileConfiguration\r
                                        Name="UnicodeRelease|Win32">\r
                                        <Tool\r
@@ -2976,4710 +3071,4638 @@
                                                PreprocessorDefinitions=""/>\r
                                </FileConfiguration>\r
                        </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl">\r
                        <File\r
-                               RelativePath="LocationBar.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath=".\AnsiConvert.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="LocationView.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="charsets.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\LogFile.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="CmdLineParser.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\lwdisp.c">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
+                               RelativePath="codepage.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="MainFrm.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
-                               </FileConfiguration>\r
+                               RelativePath="codepage_detect.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="markdown.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
+                               RelativePath="CompareOptions.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\MDITabBar.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="CompareStats.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Merge.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
-                               </FileConfiguration>\r
+                               RelativePath="ConfigLog.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Merge.rc">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCResourceCompilerTool"\r
-                                               PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCResourceCompilerTool"\r
-                                               PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)"/>\r
-                               </FileConfiguration>\r
+                               RelativePath="ConflictFileParser.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="MergeCmdLineInfo.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="Constants.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="MergeDoc.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
-                               </FileConfiguration>\r
+                               RelativePath="Common\coretools.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="MergeDocDiffSync.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="Common\coretypes.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="MergeDocEncoding.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="DiffContext.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="MergeDocLineDiffs.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="DiffFileData.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="MergeEditView.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="DiffFileInfo.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\MessageBoxDialog.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="DiffItem.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="MovedBlocks.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="DiffItemList.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="MovedLines.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="DiffList.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\multiformatText.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="DiffThread.h">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\OpenDoc.cpp">\r
+                               RelativePath="DiffWrapper.h">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\OpenFrm.cpp">\r
+                               RelativePath="DirCmpReport.h">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\OpenView.cpp">\r
+                               RelativePath="DirItem.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="OptionsInit.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="DirReportTypes.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\OptionsMgr.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="DirScan.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="OptionsPanel.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="DirTravel.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="OutputDlg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="Common\dllproxy.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="PatchDlg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="dllpstub.h">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\PatchHTML.cpp">\r
+                               RelativePath="dllver.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="PatchTool.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="Environment.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="PathContext.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
+                               RelativePath="Exceptions.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="paths.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="FileFilter.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\Picture.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="FileFilterHelper.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\PidlContainer.cpp">\r
+                               RelativePath="FileFilterMgr.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="PluginManager.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="FileLocation.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Plugins.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="files.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="PluginsListDlg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="FileTextEncoding.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\PreferencesDlg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="FileTextStats.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="ProjectFile.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
+                               RelativePath="FileTransform.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="ProjectFilePathsDlg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="FileVersion.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="PropArchive.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="FilterCommentsManager.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="PropBackups.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="FilterList.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="PropCodepage.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="FolderCmp.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="PropColors.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="IAbortable.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="PropCompare.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="IntToIntMap.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="PropCompareFolder.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="LineFiltersList.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="PropEditor.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="locality.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\PropertyPageHost.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="Common\LogFile.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="PropGeneral.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
-                               </FileConfiguration>\r
+                               RelativePath="Common\lwdisp.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="PropRegistry.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="markdown.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="PropShell.cpp">\r
+                               RelativePath="MergeCmdLineInfo.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="PropSyntaxColors.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="MovedLines.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="PropTextColors.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="Common\multiformatText.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="PropVss.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
-                               </FileConfiguration>\r
+                               RelativePath="OptionsPanel.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\RegKey.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
+                               RelativePath=".\PatchHTML.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\RegOptionsMgr.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="PathContext.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="SaveClosingDlg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="paths.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\scbarcf.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="Common\PidlContainer.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\scbarg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="PluginManager.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="SelectUnpackerDlg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="Plugins.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="SharedFilterDlg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="ProjectFile.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\ShellContextMenu.cpp">\r
+                               RelativePath="Common\RegKey.h">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Common\ShellFileOperations.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="Common\RegOptionsMgr.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\sizecbar.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="resource.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\SortHeaderCtrl.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath=".\Common\ShellFileOperations.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="SourceControl.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="ssapi.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Splash.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
-                               </FileConfiguration>\r
+                               RelativePath="StdAfx.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\SplitterWndEx.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="stringdiffs.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="ssapi.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="stringdiffsi.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\StatLink.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath=".\SyntaxColorsUtil.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="StdAfx.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"\r
-                                               UsePrecompiledHeader="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="1"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="1"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"\r
-                                               UsePrecompiledHeader="1"/>\r
-                               </FileConfiguration>\r
+                               RelativePath="TempFile.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="stringdiffs.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="Common\unicoder.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\SuperComboBox.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="Common\UnicodeString.h">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\SyntaxColorsUtil.cpp">\r
+                               RelativePath="Common\UniFile.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="TempFile.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
+                               RelativePath="UniMarkdownFile.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="TestFilterDlg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="Common\Utf8FileDetect.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\ToolBarXPThemes.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="Common\varprop.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\unicoder.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
+                               RelativePath="Common\version.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\UnicodeString.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
+                               RelativePath="VSSHelper.h">\r
                        </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe">\r
                        <File\r
-                               RelativePath="Common\UniFile.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="res\binarydiff.ico">\r
                        </File>\r
                        <File\r
-                               RelativePath="UniMarkdownFile.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="res\both.bmp">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\Utf8FileDetect.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
+                               RelativePath="res\equalbinary.ico">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\varprop.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="res\equalfile.ico">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\version.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="res\error.ico">\r
                        </File>\r
                        <File\r
-                               RelativePath="VSSHelper.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="res\fileskip.ico">\r
                        </File>\r
                        <File\r
-                               RelativePath="VssPrompt.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
-                               </FileConfiguration>\r
+                               RelativePath="res\folder.ico">\r
                        </File>\r
                        <File\r
-                               RelativePath="WaitStatusCursor.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="res\folderskip.ico">\r
                        </File>\r
                        <File\r
-                               RelativePath="WMGotoDlg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
+                               RelativePath="res\folderup.ico">\r
                        </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl">\r
                        <File\r
-                               RelativePath="7zCommon.h">\r
+                               RelativePath="res\folderup_disable.ico">\r
                        </File>\r
                        <File\r
-                               RelativePath="AboutDlg.h">\r
+                               RelativePath="res\hand.cur">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\AnsiConvert.h">\r
+                               RelativePath="res\left.bmp">\r
                        </File>\r
                        <File\r
-                               RelativePath="BCMenu.h">\r
+                               RelativePath="res\left_to_browse.bmp">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\Common\Bitmap.h">\r
+                               RelativePath="res\left_to_right.bmp">\r
                        </File>\r
                        <File\r
-                               RelativePath="CCPrompt.h">\r
+                               RelativePath="res\lfile.ico">\r
                        </File>\r
                        <File\r
-                               RelativePath="charsets.h">\r
+                               RelativePath="res\lfolder.ico">\r
                        </File>\r
                        <File\r
-                               RelativePath="ChildFrm.h">\r
+                               RelativePath="res\Merge.ico">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\ClipBoard.h">\r
+                               RelativePath="res\Merge.rc2">\r
                        </File>\r
                        <File\r
-                               RelativePath="CmdLineParser.h">\r
+                               RelativePath="res\MergeDir.ico">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\CMoveConstraint.h">\r
+                               RelativePath="res\MergeDoc.ico">\r
                        </File>\r
                        <File\r
-                               RelativePath="codepage.h">\r
+                               RelativePath="res\MergeProject.ico">\r
                        </File>\r
                        <File\r
-                               RelativePath="codepage_detect.h">\r
+                               RelativePath="res\mg_cur.cur">\r
                        </File>\r
                        <File\r
-                               RelativePath="ColorButton.h">\r
+                               RelativePath="res\move_left_to_browse.bmp">\r
                        </File>\r
                        <File\r
-                               RelativePath="CompareOptions.h">\r
+                               RelativePath="res\move_right_to_browse.bmp">\r
                        </File>\r
                        <File\r
-                               RelativePath="CompareStatisticsDlg.h">\r
+                               RelativePath="res\notequalfile.ico">\r
                        </File>\r
                        <File\r
-                               RelativePath="CompareStats.h">\r
+                               RelativePath="res\rfile.ico">\r
                        </File>\r
                        <File\r
-                               RelativePath="ConfigLog.h">\r
+                               RelativePath="res\rfolder.ico">\r
                        </File>\r
                        <File\r
-                               RelativePath="ConfirmFolderCopyDlg.h">\r
+                               RelativePath="res\right.bmp">\r
                        </File>\r
                        <File\r
-                               RelativePath="ConflictFileParser.h">\r
+                               RelativePath="res\right_to_browse.bmp">\r
                        </File>\r
                        <File\r
-                               RelativePath="Constants.h">\r
+                               RelativePath="res\right_to_left.bmp">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\coretools.h">\r
+                               RelativePath="res\sigma.ico">\r
                        </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="EditLib"\r
+                       Filter="">\r
                        <File\r
-                               RelativePath="Common\coretypes.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\ccrystaleditview.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\CSubclass.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\ccrystaleditview.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="DiffContext.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\ccrystaleditview.inl">\r
                        </File>\r
                        <File\r
-                               RelativePath="DiffFileData.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="DiffFileInfo.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="DiffItem.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="DiffItemList.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="DiffList.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="DiffTextBuffer.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="DiffThread.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="DiffViewBar.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="DiffWrapper.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="DirCmpReport.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="DirCmpReportDlg.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="DirColsDlg.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\ccrystaltextbuffer.inl">\r
                        </File>\r
                        <File\r
-                               RelativePath="DirCompProgressDlg.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\ccrystaltextview.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="DirDoc.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\ccrystaltextview.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="DirFrame.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\ccrystaltextview.inl">\r
                        </File>\r
                        <File\r
-                               RelativePath="DirItem.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="DirReportTypes.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="DirScan.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\ceditreplacedlg.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="DirTravel.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\cfindtextdlg.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="DirView.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\cfindtextdlg.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="DirViewColItems.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\chcondlg.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\dllproxy.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\chcondlg.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="dllpstub.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\cregexp.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="dllver.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\cregexp_poco.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="EditorFilepathBar.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\crystaleditviewex.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\EncodingErrorDlg.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\crystaleditviewex.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Environment.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\crystalparser.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="Exceptions.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\crystalparser.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="FileActionScript.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\crystaltextblock.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="FileFilter.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\crystaltextblock.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="FileFilterHelper.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\cs2cs.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="FileFilterMgr.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\cs2cs.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="FileFiltersDlg.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\editcmd.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="FileLocation.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\editreg.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="FileOrFolderSelect.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\edtlib.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="FilepathEdit.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\edtlib.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="files.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\filesup.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="FileTextEncoding.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\filesup.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="FileTextStats.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\filesup.inl">\r
                        </File>\r
                        <File\r
-                               RelativePath="FileTransform.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\fpattern.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="FileVersion.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\fpattern.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="FilterCommentsManager.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\gotodlg.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="FilterList.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\gotodlg.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="FolderCmp.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\LineInfo.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="GhostTextBuffer.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\LineInfo.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="GhostTextView.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\memcombo.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\GhostUndorecord.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\memcombo.h">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\HexMergeDoc.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\memcombo.inl">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\HexMergeFrm.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\registry.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\HexMergeView.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\registry.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="IAbortable.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\splash.cpp">\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="$(IntDir)/$(InputName)1.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="$(IntDir)/$(InputName)1.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="$(IntDir)/$(InputName)1.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="$(IntDir)/$(InputName)1.obj"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="IntToIntMap.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\splash.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="IOptionsPanel.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\statbar.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\LanguageSelect.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\statbar.h">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\LineFiltersDlg.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\string_util.cpp">\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="LineFiltersList.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\string_util.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="LoadSaveCodepageDlg.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\SyntaxColors.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="locality.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\SyntaxColors.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="LocationBar.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\UndoRecord.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="LocationView.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\UndoRecord.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\LogFile.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\lwdisp.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\ViewableWhitespace.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="MainFrm.h">\r
+                               RelativePath="..\Externals\crystaledit\editlib\wispelld.h">\r
                        </File>\r
+                       <Filter\r
+                               Name="parsers"\r
+                               Filter="">\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\asp.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\basic.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\batch.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\cplusplus.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\csharp.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\css.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\dcl.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\fortran.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\html.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\ini.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\innosetup.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\is.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\java.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\lisp.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\nsis.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\pascal.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\perl.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\php.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\po.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\powershell.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\python.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\rexx.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\rsrc.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\ruby.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\sgml.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\sh.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\siod.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\sql.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\tcl.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\tex.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\verilog.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Externals\crystaledit\editlib\xml.cpp">\r
+                               </File>\r
+                       </Filter>\r
+               </Filter>\r
+               <Filter\r
+                       Name="DiffEngine"\r
+                       Filter="">\r
                        <File\r
-                               RelativePath="markdown.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="Common\MDITabBar.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\Common\memdc.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="Merge.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="MergeCmdLineInfo.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="MergeDoc.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="MergeEditStatus.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="MergeEditView.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="MergeLineFlags.h">\r
+                               RelativePath="diffutils\src\analyze.c">\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\MessageBoxDialog.h">\r
+                               RelativePath="diffutils\lib\CMPBUF.C">\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="MovedLines.h">\r
+                               RelativePath="diffutils\lib\CMPBUF.H">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\multiformatText.h">\r
+                               RelativePath="diffutils\CONFIG.H">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\OpenDoc.h">\r
+                               RelativePath="diffutils\src\CONTEXT.C">\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath=".\OpenFrm.h">\r
+                               RelativePath="diffutils\src\Diff.cpp">\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath=".\OpenView.h">\r
+                               RelativePath="diffutils\src\DIFF.H">\r
                        </File>\r
                        <File\r
-                               RelativePath="OptionsDef.h">\r
+                               RelativePath="diffutils\src\ED.C">\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\OptionsMgr.h">\r
+                               RelativePath="diffutils\GnuVersion.c">\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="1"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="1"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="OptionsPanel.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="OutputDlg.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="PatchDlg.h">\r
+                               RelativePath="diffutils\src\IFDEF.C">\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath=".\PatchHTML.h">\r
+                               RelativePath="diffutils\src\IO.C">\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="PatchTool.h">\r
+                               RelativePath="diffutils\src\NORMAL.C">\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="PathContext.h">\r
+                               RelativePath="diffutils\lib\REGEX.C">\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="paths.h">\r
+                               RelativePath="diffutils\lib\REGEX.H">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\Picture.h">\r
+                               RelativePath="diffutils\src\SIDE.C">\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\PidlContainer.h">\r
+                               RelativePath="diffutils\src\SYSTEM.H">\r
                        </File>\r
                        <File\r
-                               RelativePath="PluginManager.h">\r
+                               RelativePath="diffutils\src\UTIL.C">\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"/>\r
+                               </FileConfiguration>\r
                        </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="ChangeLogs"\r
+                       Filter="">\r
                        <File\r
-                               RelativePath="Plugins.h">\r
+                               RelativePath="CHANGELO">\r
                        </File>\r
                        <File\r
-                               RelativePath="PluginsListDlg.h">\r
+                               RelativePath="..\Docs\Users\ChangeLog.txt">\r
                        </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Compare Engines"\r
+                       Filter="cpp;c;h">\r
                        <File\r
-                               RelativePath="Common\PreferencesDlg.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="ProjectFile.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="ProjectFilePathsDlg.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="PropArchive.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="PropBackups.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="PropCodepage.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="PropColors.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="PropCompare.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="PropCompareFolder.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="PropEditor.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="Common\PropertyPageHost.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="PropGeneral.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="PropRegistry.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="PropShell.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="PropSyntaxColors.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="PropTextColors.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="PropVss.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="Common\RegKey.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="Common\RegOptionsMgr.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="resource.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="SaveClosingDlg.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="Common\scbarcf.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="Common\scbarg.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="SelectUnpackerDlg.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="SharedFilterDlg.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="Common\ShellContextMenu.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\Common\ShellFileOperations.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="Common\sizecbar.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="Common\SortHeaderCtrl.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="Splash.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="Common\SplitterWndEx.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="ssapi.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="Common\StatLink.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="StdAfx.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="stringdiffs.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="stringdiffsi.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="Common\SuperComboBox.h">\r
+                               RelativePath="CompareEngines\ByteComparator.cpp">\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="1"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="1"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                               PrecompiledHeaderFile=""/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath=".\SyntaxColorsUtil.h">\r
+                               RelativePath="CompareEngines\ByteComparator.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="TempFile.h">\r
+                               RelativePath="CompareEngines\ByteCompare.cpp">\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="1"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="1"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="TestFilterDlg.h">\r
+                               RelativePath="CompareEngines\ByteCompare.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\ToolbarXPThemes.h">\r
+                               RelativePath="CompareEngines\DiffUtils.cpp">\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="1"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="1"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\unicoder.h">\r
+                               RelativePath="CompareEngines\DiffUtils.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\UnicodeString.h">\r
+                               RelativePath="CompareEngines\TimeSizeCompare.cpp">\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="1"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="0"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                               BrowseInformation="1"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="1"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""/>\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\UniFile.h">\r
+                               RelativePath="CompareEngines\TimeSizeCompare.h">\r
                        </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Batch files"\r
+                       Filter="">\r
                        <File\r
-                               RelativePath="UniMarkdownFile.h">\r
+                               RelativePath="..\Translations\WinMerge\BuildMergeLangDll.bat">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\Utf8FileDetect.h">\r
+                               RelativePath="..\Translations\WinMerge\CreateMasterPotFile.vbs">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\varprop.h">\r
+                               RelativePath="..\Translations\WinMerge\GetTranslationsStatus.vbs">\r
                        </File>\r
                        <File\r
-                               RelativePath="Common\version.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="VSSHelper.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="VssPrompt.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="WaitStatusCursor.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="WMGotoDlg.h">\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe">\r
-                       <File\r
-                               RelativePath="res\binarydiff.ico">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\both.bmp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\equalbinary.ico">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\equalfile.ico">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\error.ico">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\fileskip.ico">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\folder.ico">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\folderskip.ico">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\folderup.ico">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\folderup_disable.ico">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\hand.cur">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\left.bmp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\left_to_browse.bmp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\left_to_right.bmp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\lfile.ico">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\lfolder.ico">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\Merge.ico">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\Merge.rc2">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\MergeDir.ico">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\MergeDoc.ico">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\MergeProject.ico">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\mg_cur.cur">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\move_left_to_browse.bmp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\move_right_to_browse.bmp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\notequalfile.ico">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\rfile.ico">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\rfolder.ico">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\right.bmp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\right_to_browse.bmp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\right_to_left.bmp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="res\sigma.ico">\r
+                               RelativePath="..\Translations\WinMerge\UpdatePoFilesFromPotFile.vbs">\r
                        </File>\r
                </Filter>\r
                <Filter\r
-                       Name="EditLib"\r
+                       Name="GUI"\r
                        Filter="">\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\ccrystaleditview.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\ccrystaleditview.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\ccrystaleditview.inl">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\ccrystaltextbuffer.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\ccrystaltextbuffer.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\ccrystaltextbuffer.inl">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\ccrystaltextview.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\ccrystaltextview.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\ccrystaltextview.inl">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\ccrystaltextview2.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\ceditreplacedlg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\ceditreplacedlg.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\cfindtextdlg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\cfindtextdlg.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\chcondlg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\chcondlg.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\cregexp.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\cregexp_poco.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\crystaleditviewex.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\crystaleditviewex.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\crystalparser.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\crystalparser.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\crystaltextblock.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\crystaltextblock.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\cs2cs.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\cs2cs.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\editcmd.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\editreg.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\edtlib.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\edtlib.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\filesup.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\filesup.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\filesup.inl">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\fpattern.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\fpattern.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\gotodlg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\gotodlg.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\LineInfo.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\LineInfo.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\memcombo.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\memcombo.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\memcombo.inl">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\registry.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\registry.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\splash.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="$(IntDir)/$(InputName)1.obj"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="$(IntDir)/$(InputName)1.obj"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="$(IntDir)/$(InputName)1.obj"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               ObjectFile="$(IntDir)/$(InputName)1.obj"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\splash.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\statbar.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\statbar.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\string_util.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\string_util.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\SyntaxColors.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\SyntaxColors.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\UndoRecord.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\UndoRecord.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\ViewableWhitespace.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\ViewableWhitespace.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Externals\crystaledit\editlib\wispelld.h">\r
-                       </File>\r
                        <Filter\r
-                               Name="parsers"\r
+                               Name="Source Files"\r
                                Filter="">\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\asp.cpp">\r
+                                       RelativePath="7zCommon.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\basic.cpp">\r
+                                       RelativePath="AboutDlg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\batch.cpp">\r
+                                       RelativePath="BCMenu.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\cplusplus.cpp">\r
+                                       RelativePath=".\Common\Bitmap.cpp">\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\csharp.cpp">\r
+                                       RelativePath="CCPrompt.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\css.cpp">\r
+                                       RelativePath="ChildFrm.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\dcl.cpp">\r
+                                       RelativePath="Common\ClipBoard.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\fortran.cpp">\r
+                                       RelativePath="Common\CMoveConstraint.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\html.cpp">\r
+                                       RelativePath="ColorButton.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\ini.cpp">\r
+                                       RelativePath="CompareStatisticsDlg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\innosetup.cpp">\r
+                                       RelativePath="ConfirmFolderCopyDlg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\is.cpp">\r
+                                       RelativePath="Common\CSubclass.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\java.cpp">\r
+                                       RelativePath="DiffTextBuffer.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\lisp.cpp">\r
+                                       RelativePath="DiffViewBar.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\nsis.cpp">\r
+                                       RelativePath="DirActions.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\pascal.cpp">\r
+                                       RelativePath="DirCmpReportDlg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\perl.cpp">\r
+                                       RelativePath="DirColsDlg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\php.cpp">\r
+                                       RelativePath="DirCompProgressDlg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\po.cpp">\r
+                                       RelativePath="DirDoc.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\powershell.cpp">\r
+                                       RelativePath="DirFrame.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\python.cpp">\r
+                                       RelativePath="DirView.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\rexx.cpp">\r
+                                       RelativePath="DirViewColHandler.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\rsrc.cpp">\r
+                                       RelativePath="DirViewColItems.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\ruby.cpp">\r
+                                       RelativePath="EditorFilepathBar.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\sgml.cpp">\r
+                                       RelativePath=".\EncodingErrorDlg.cpp">\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\sh.cpp">\r
+                                       RelativePath="FileActionScript.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\siod.cpp">\r
+                                       RelativePath="FileFiltersDlg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\sql.cpp">\r
+                                       RelativePath="FileOrFolderSelect.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\tcl.cpp">\r
+                                       RelativePath="FilepathEdit.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\tex.cpp">\r
+                                       RelativePath="GhostTextBuffer.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\verilog.cpp">\r
+                                       RelativePath="GhostTextView.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Externals\crystaledit\editlib\xml.cpp">\r
+                                       RelativePath=".\HexMergeDoc.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\HexMergeFrm.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\HexMergeView.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\LanguageSelect.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\LineFiltersDlg.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="LoadSaveCodepageDlg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="LocationBar.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="LocationView.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="MainFrm.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\MDITabBar.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Merge.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Merge.rc">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCResourceCompilerTool"\r
+                                                       PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCResourceCompilerTool"\r
+                                                       PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="MergeDoc.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="MergeDocDiffSync.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="MergeDocEncoding.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="MergeDocLineDiffs.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="MergeEditView.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\MessageBoxDialog.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\OpenDoc.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\OpenFrm.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\OpenView.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="OptionsPanel.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       UsePrecompiledHeader="0"\r
+                                                       PrecompiledHeaderThrough=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       UsePrecompiledHeader="0"\r
+                                                       PrecompiledHeaderThrough=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       UsePrecompiledHeader="0"\r
+                                                       PrecompiledHeaderThrough=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       UsePrecompiledHeader="0"\r
+                                                       PrecompiledHeaderThrough=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="OutputDlg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PatchDlg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PatchTool.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\Picture.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PluginsListDlg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\PreferencesDlg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="ProjectFilePathsDlg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropArchive.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropBackups.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropCodepage.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropColors.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropCompare.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropCompareFolder.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropEditor.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\PropertyPageHost.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropGeneral.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropRegistry.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropShell.cpp">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropSyntaxColors.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropTextColors.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropVss.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="SaveClosingDlg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\scbarcf.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\scbarg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="SelectUnpackerDlg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="SharedFilterDlg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\sizecbar.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="SourceControl.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Splash.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\SplitterWndEx.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\StatLink.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\SuperComboBox.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="TestFilterDlg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\ToolBarXPThemes.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="VssPrompt.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;POCO_STATIC;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="WaitStatusCursor.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="WMGotoDlg.cpp">\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeRelease|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="UnicodeDebug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Debug|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="0"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       BrowseInformation="1"/>\r
+                                       </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32">\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="1"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""/>\r
+                                       </FileConfiguration>\r
+                               </File>\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="Header Files"\r
+                               Filter="">\r
+                               <File\r
+                                       RelativePath="7zCommon.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="AboutDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="BCMenu.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Common\Bitmap.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="CCPrompt.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="ChildFrm.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\ClipBoard.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\CMoveConstraint.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="ColorButton.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="CompareStatisticsDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="ConfirmFolderCopyDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\CSubclass.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="DiffTextBuffer.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="DiffViewBar.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="DirCmpReportDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="DirColsDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="DirCompProgressDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="DirDoc.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="DirFrame.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="DirView.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="DirViewColItems.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="EditorFilepathBar.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\EncodingErrorDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="FileActionScript.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="FileFiltersDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="FileOrFolderSelect.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="FilepathEdit.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="GhostTextBuffer.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="GhostTextView.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\GhostUndorecord.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\HexMergeDoc.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\HexMergeFrm.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\HexMergeView.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="IOptionsPanel.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\LanguageSelect.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\LineFiltersDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="LoadSaveCodepageDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="LocationBar.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="LocationView.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="MainFrm.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\MDITabBar.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Common\memdc.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Merge.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="MergeDoc.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="MergeEditStatus.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="MergeEditView.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="MergeLineFlags.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\MessageBoxDialog.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\OpenDoc.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\OpenFrm.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\OpenView.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="OptionsDef.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\OptionsMgr.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="OutputDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PatchDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PatchTool.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\Picture.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PluginsListDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\PreferencesDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="ProjectFilePathsDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropArchive.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropBackups.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropCodepage.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropColors.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropCompare.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropCompareFolder.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropEditor.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\PropertyPageHost.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropGeneral.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropRegistry.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropShell.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropSyntaxColors.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropTextColors.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="PropVss.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="SaveClosingDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\scbarcf.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\scbarg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="SelectUnpackerDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="SharedFilterDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\ShellContextMenu.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\sizecbar.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\SortHeaderCtrl.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Splash.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\SplitterWndEx.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\StatLink.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\SuperComboBox.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="TestFilterDlg.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="Common\ToolbarXPThemes.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="VssPrompt.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="WaitStatusCursor.h">\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="WMGotoDlg.h">\r
                                </File>\r
                        </Filter>\r
-               </Filter>\r
-               <Filter\r
-                       Name="DiffEngine"\r
-                       Filter="">\r
-                       <File\r
-                               RelativePath="diffutils\src\analyze.c">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="diffutils\lib\CMPBUF.C">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="diffutils\lib\CMPBUF.H">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="diffutils\CONFIG.H">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="diffutils\src\CONTEXT.C">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="diffutils\src\Diff.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="diffutils\src\DIFF.H">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="diffutils\src\ED.C">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="diffutils\GnuVersion.c">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="diffutils\src\IFDEF.C">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="diffutils\src\IO.C">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="diffutils\src\NORMAL.C">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="diffutils\lib\REGEX.C">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="diffutils\lib\REGEX.H">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="diffutils\src\SIDE.C">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="diffutils\src\SYSTEM.H">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="diffutils\src\UTIL.C">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="2"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="ChangeLogs"\r
-                       Filter="">\r
-                       <File\r
-                               RelativePath="CHANGELO">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Docs\Users\ChangeLog.txt">\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Compare Engines"\r
-                       Filter="cpp;c;h">\r
-                       <File\r
-                               RelativePath="CompareEngines\ByteComparator.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                               PrecompiledHeaderThrough=""\r
-                                               PrecompiledHeaderFile=""/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="CompareEngines\ByteComparator.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="CompareEngines\ByteCompare.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="CompareEngines\ByteCompare.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="CompareEngines\DiffUtils.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="CompareEngines\DiffUtils.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="CompareEngines\TimeSizeCompare.cpp">\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""/>\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="CompareEngines\TimeSizeCompare.h">\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Batch files"\r
-                       Filter="">\r
-                       <File\r
-                               RelativePath="..\Translations\WinMerge\BuildMergeLangDll.bat">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Translations\WinMerge\CreateMasterPotFile.vbs">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Translations\WinMerge\GetTranslationsStatus.vbs">\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\PostBuild.bat">\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\PreLink.bat">\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\SetResourceVersions.bat">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Translations\WinMerge\UpdatePoFilesFromPotFile.vbs">\r
-                       </File>\r
                </Filter>\r
        </Files>\r
        <Globals>\r

diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj
index f6e2a0c..8968f8c 100644 (file)
--- a/Src/Merge.vcxproj
+++ b/Src/Merge.vcxproj
@@ -1351,6 +1351,14 @@
       <Optimization Condition="'$(Configuration)|$(Platform)'=='X64 Release|x64'">MinSpace</Optimization>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='X64 Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='X64 Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">NotUsing</PrecompiledHeader>\r
     </ClCompile>\r
     <ClCompile Include="Common\coretools.cpp">\r
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>\r
@@ -1595,6 +1603,14 @@
       <Optimization Condition="'$(Configuration)|$(Platform)'=='X64 Release|x64'">MinSpace</Optimization>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='X64 Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='X64 Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">NotUsing</PrecompiledHeader>\r
     </ClCompile>\r
     <ClCompile Include="DiffItem.cpp">\r
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>\r
@@ -3181,6 +3197,14 @@
       <Optimization Condition="'$(Configuration)|$(Platform)'=='X64 Release|x64'">MinSpace</Optimization>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='X64 Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='X64 Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">NotUsing</PrecompiledHeader>\r
     </ClCompile>\r
     <ClCompile Include="FileTextEncoding.cpp">\r
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>\r
@@ -3225,6 +3249,14 @@
       <Optimization Condition="'$(Configuration)|$(Platform)'=='X64 Release|x64'">MinSpace</Optimization>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='X64 Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='X64 Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">NotUsing</PrecompiledHeader>\r
     </ClCompile>\r
     <ClCompile Include="FileTransform.cpp">\r
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>\r

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index c22bb78..d8cf734 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -1290,7 +1290,7 @@ bool CMergeDoc::DoSave(LPCTSTR szPath, bool &bSaveSuccess, int nBuffer)
                if (GetOptionsMgr()->GetBool(OPT_PRESERVE_FILETIMES))
                {
                        fileInfo.SetFile((LPCTSTR)strSavePath);
-                       files_UpdateFileTime(fileInfo);
+                       files_UpdateFileTime(fileInfo.GetFile(), fileInfo.mtime);
                }
 
                m_ptBuf[nBuffer]->SetModified(false);

diff --git a/Src/files.cpp b/Src/files.cpp
index f2d0959..876d640 100644 (file)
--- a/Src/files.cpp
+++ b/Src/files.cpp
@@ -22,14 +22,12 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
-#include "stdafx.h"
+#include <windows.h>
 #include <sys/stat.h>
 #include <sys/utime.h>
 #include "UnicodeString.h"
-#include "DiffFileInfo.h"
 #include "files.h"
 #include "paths.h"
-#include "unicoder.h"
 
 /**
  * @brief Open file as memory-mapped file.
@@ -66,8 +64,6 @@ BOOL files_openFileMapped(MAPPEDFILEDATA *fileData)
        if (fileData->hFile == INVALID_HANDLE_VALUE)
        {
                bSuccess = FALSE;
-               LogErrorString(Fmt(_T("CreateFile(%s) failed in files_openFileMapped: %s")
-                       , fileData->fileName, GetSysError(GetLastError()).c_str()));
        }
        else
        {
@@ -94,8 +90,6 @@ BOOL files_openFileMapped(MAPPEDFILEDATA *fileData)
                if (!fileData->hMapping)
                {
                        bSuccess = FALSE;
-                       LogErrorString(Fmt(_T("CreateFileMapping(%s) failed: %s")
-                               , fileData->fileName, GetSysError(GetLastError()).c_str()));
                }
                else
                {
@@ -104,8 +98,6 @@ BOOL files_openFileMapped(MAPPEDFILEDATA *fileData)
                        if (!fileData->pMapBase)
                        {
                                bSuccess = FALSE;
-                               LogErrorString(Fmt(_T("MapViewOfFile(%s) failed: %s")
-                                       , fileData->fileName, GetSysError(GetLastError()).c_str()));
                        }
                }
        }
@@ -169,13 +161,13 @@ BOOL files_closeFileMapped(MAPPEDFILEDATA *fileData, DWORD newSize, BOOL flush)
  * @param [in, out] fileExists If non-NULL, function returns if file exists.
  * @return TRUE if file is read-only, FALSE otherwise.
  */
-BOOL files_isFileReadOnly(const CString &file, BOOL *fileExists /*=NULL*/)
+BOOL files_isFileReadOnly(const String &file, BOOL *fileExists /*=NULL*/)
 {
        struct _stati64 fstats = {0};
        BOOL bReadOnly = FALSE;
        BOOL bExists = FALSE;
 
-       if (_tstati64(file, &fstats) == 0)
+       if (_tstati64(file.c_str(), &fstats) == 0)
        {
                bExists = TRUE;
 
@@ -195,11 +187,10 @@ BOOL files_isFileReadOnly(const CString &file, BOOL *fileExists /*=NULL*/)
  * @brief Update file's modification time.
  * @param [in] info Contains filename, path and file times to update.
  */
-void files_UpdateFileTime(const DiffFileInfo & info)
+void files_UpdateFileTime(const String &file, __int64 mtime)
 {
-       String path = paths_ConcatPath(info.path, info.filename);
        struct __utimbuf64 times = {0};
 
-       times.modtime = info.mtime;
-       _tutime64(path.c_str(), &times);
+       times.modtime = mtime;
+       _tutime64(file.c_str(), &times);
 }

diff --git a/Src/files.h b/Src/files.h
index 20a9e42..fe1653a 100644 (file)
--- a/Src/files.h
+++ b/Src/files.h
@@ -25,8 +25,6 @@
 #ifndef _FILES_H_INCLUDED
 #define _FILES_H_INCLUDED
 
-struct DiffFileInfo;
-
 /**
  * @brief File-operation return-statuses
  * Note that FileLoadResult class has no instance data or methods.
@@ -149,8 +147,7 @@ struct MAPPEDFILEDATA
 
 BOOL files_openFileMapped(MAPPEDFILEDATA *fileData);
 BOOL files_closeFileMapped(MAPPEDFILEDATA *fileData, DWORD newSize, BOOL flush);
-BOOL files_isFileReadOnly(const CString &file, BOOL *fileExists = NULL);
-
-void files_UpdateFileTime(const DiffFileInfo & info);
+BOOL files_isFileReadOnly(const String &file, BOOL *fileExists = NULL);
+void files_UpdateFileTime(const String &file, __int64 mtime);
 
 #endif // _FILES_H

diff --git a/Src/resource.h b/Src/resource.h
index e34af79..ead39c0 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -892,10 +892,6 @@
 #define IDS_TEXT_REPORT_FILES           18540
 #define IDS_HTML_REPORT_FILES           18541
 #define IDS_XML_REPORT_FILES            18542
-#define IDS_UNICODING_UTF8              18592
-#define IDS_UNICODING_UTF8_BOM          18593
-#define IDS_UNICODING_UCS2_LE           18594
-#define IDS_UNICODING_UCS2_BE           18595
 #define IDD_LANGUAGE_SELECT             30000
 #define ID_FILE_NEW3                    32767
 #define IDS_EOL_DOS                     30400

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index 1df5757..876b154 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -1032,7 +1032,7 @@ msgid "&Scripts"
 msgstr "&Eskriptak"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Hutsik >"
@@ -1473,7 +1473,7 @@ msgid "&Versioning System:"
 msgstr "Bertsio &Sistema:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Helburutu hona cleartool.exe:"
@@ -1674,7 +1674,7 @@ msgid "Replace &All"
 msgstr "Ordeztu &Dena"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "KasuArgi Arrazionala"
@@ -2590,7 +2590,7 @@ msgid "Files:"
 msgstr "Agiriak:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Ezberdin"
@@ -2627,7 +2627,7 @@ msgid "Right:"
 msgstr "Eskuin:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Berdin"
@@ -2827,7 +2827,7 @@ msgid "A&ppend timestamp"
 msgstr "Erantsi denbora"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Berretsi Kopiatzea"
@@ -2905,7 +2905,7 @@ msgstr "Gehitu &Shell menua hitzinguru menura"
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Agiritegia"
@@ -3545,7 +3545,7 @@ msgid "Version Control"
 msgstr "Bertsio Kontrola"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Ezberdintasunak"
@@ -3674,87 +3674,67 @@ msgstr "XML Agiriak (*.xml)|*.xml|Agiri Denak (*.*)|*.*||"
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Eduki Denak"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Eduki Azkarrak"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Eguna Aldatuta"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Eguna eta Neurria Aldatuta"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Neurria"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Izena"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Kokalekua"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Iragazkiak"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Azalpena"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Hautatu agirizena iragazki berriarentzat"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Agiri Iragazkiak (*.flt)|*.flt|Agiri Denak (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3767,7 +3747,7 @@ msgstr ""
 "Mesedez kopiatu agiri hau: %1 WinMerge/Iragazkiak -agiritegia:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3780,7 +3760,7 @@ msgstr ""
 "\n"
 "Mesedez zihurtatu zaitez dagoen agiritegia idazgarria dela."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3791,7 +3771,7 @@ msgstr ""
 "\n"
 "Mesedez hautatu iragazki agiritegia hemen: Aukerak/Sistema."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3804,12 +3784,12 @@ msgstr ""
 "\n"
 "Badaiteke irakurtzeko-bakarrik agiria izatea?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Aurkitu ezartzeko iragazki agiria"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3820,17 +3800,17 @@ msgstr ""
 "\n"
 "Ezinezkoa iragazki agiri berria iragazki agiritegira kopiatzea."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Iragazki agiria jadanik badago. Gainidatzi dagoen iragazkia?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Adierazpen arrunta"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3841,243 +3821,243 @@ msgstr ""
 "\n"
 "Ez badituzu nahi alderaketa guztiak orain berritzea hautatu Ez eta berritu alderaketak gero."
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "&Helburutu SS.EXE-ra:"
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Agiritegi Alderaketa Emaitzak"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Agiri Alderaketa"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Izenburugabeko ezkerra"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Izenburugabeko eskuina"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "Theirs Agiria"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "Mine Agiria"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Agiriak mihatzen..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Hautapena irekitzen"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Ezkerra Eskuinera kopiatzen"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Eskuina Ezkerrera kopiatzen"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Dena Ezkerrera kopiatzen"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Dena Eskuinera kopiatzen"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Agiriak kopiatzen..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Agiriak ezabatzen..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Agiriak mugitzen..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Jakinarazpena sortzen..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Azken eragiketa desegiten..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "Aurreko eragiketa birregiten..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Lerroa: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Batu"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Ezberdintasuna %1 %2-tik"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 Ezberdintasun Aurkiturik"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "1 Ezberdintasun Aurkituta"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "RO"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Gaiak %1 %2-tik"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Gaiak:%1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Hautatu badauden bi agiritegi edo agiri alderatzeko"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Agirtegi Hautapena"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Hautatu bi agiritegiak edo bi agiriak alderatzeko."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "Ezker helburua baliogabea da!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Eskuin helburua baliogabea da!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Bi helburuak baliogabeak dira!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Hautatu bi agiriak despaketatzaile hautapena gaitzeko"
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Ezin dira agiria eta agiritegia alderatu!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Agiria ez da aurkitu: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Agiria ez da despaketatu: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4090,12 +4070,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Hutsegitea gatazka agiria aztertzerakoan."
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4106,32 +4086,32 @@ msgstr ""
 "agiria\n"
 "ez da agiri gatazkatsu bat."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Gorde Honela"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Gorde aldaketak %1-ri?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 markatuta dago irrakurtzeko-bakarrik bezala. Nahi duzu ezabatzea irakurtzeko-bakarrik agiria? (Ez gordetzeko agirizen berri bezala.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Akatsa helbide idazgarritasuna egiaztatzean"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Akatsa babeskopia agirian"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4144,7 +4124,7 @@ msgstr ""
 "\n"
 "Jarraitu horrela ere?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4161,7 +4141,7 @@ msgstr ""
 "\t-agirizen ezberdin bat erabiltzea (Sakatu Ongi)\n"
 "\t-uneko eragiketa uztea (Sakatu Ezeztatu)?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4176,7 +4156,7 @@ msgstr ""
 "\n"
 "Nahi duzu despaketatutako bertsioa beste agiri batean gordetzea?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4191,7 +4171,7 @@ msgstr ""
 "\n"
 "Nahi duzu despaketatutako bertsioa beste agiri batean gordetzea?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4206,7 +4186,7 @@ msgstr ""
 "\n"
 "Gainidatzi aldatutako agiria?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4215,7 +4195,7 @@ msgstr ""
 "%1\n"
 "irakurtzeko-bakarrik markatuta dago. Irakurtzeko-bakarrik gaia ezeztatzea nahi duzu?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4230,22 +4210,22 @@ msgstr ""
 "\n"
 "Nahi duzu agiria birgertatzea?"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Gorde Ezker Agiria Honela"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Gorde Eskuineko Agiria Honela"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid ""
 "The file\n"
@@ -4256,7 +4236,7 @@ msgstr ""
 "%1\n"
 "ezagertuta dago. Mesedez gorde agiriaren kopia bat jarraitzeko."
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4267,42 +4247,42 @@ msgstr ""
 "\n"
 "Berritu agiriak jarraitu aurretik."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "SourceSafe egitasmo helburu bat adierazi behar duzu jarraitzeko (ie:  $/MyProject)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Egiaztatu agiriak VSS-tik..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "Bertsio sistema akats bat itzuli du agiran egiaztatzen saiatzerakoan.  Ezinezkoa jarraitzea..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Akatsa bertsio sistema komandoari ekitean."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "VSS Lan Agirtegia eta uneko agiriaren kokalekua ez datoz bat. Jarraitu?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Ez da aurkitu VSS datubaserik!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Akatsa VSS-tik:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4313,7 +4293,7 @@ msgstr ""
 "Mesedez, egiaztatu  erabilitako ikuspen itxurap. berez.\n"
 "Desegin eragiketa?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4322,169 +4302,169 @@ msgstr ""
 "Bertsio sistema akats bat itzuli du agiran egiaztatzen saiatzerakoan.\n"
 "Mesedez, egiaztatu  erabilitako ikuspen itxurap. berez."
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Bat ere ez"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (5.0 azpikoa)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 edo gainekoa)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Hautsi zurigunean"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Hautsi zurigunean edo puntuaketan"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Kopiatu hautatutako gaia izendatutako zuzenbidera"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Kopiatu hautatutako gaia egile zuzenbidera"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Ezabatu hautatutako gaia ezkerrean"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Ezabatu hautatutako gaia eskuinean"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Ezabatu hautatutako gaia(k) bi aldeetan"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Ezkutatu hautatutako gaia(k) (orraz iragazkian)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Birrizendatu hautatuko gaiak bi aldeetan"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Eskuina Ezkerrera (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Ezkerra Eskuinera (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Eskuina Ezkerrera (%1 %2-tik)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Ezkerra Eskuinera (%1 %2-tik)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Ezkerra hona... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Eskuina hona... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Ezkerra hona... (%1 %2-tik)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Eskuina hona... (%1 %2-tik)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Ezkerra (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Eskuina (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Biak (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Ezkerra (%1 %2-tik)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Eskuina (%1 %2-tik)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Biak (%1 %2-tik)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Hautatu helmuga agiritegia"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Ezkerraldea - hautatu helmuga agiritegia:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Eskuinaldea - hautatu helmuga agiritegia:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 Agiri Eraginda)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 Agiri %2-tik Eraginda)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4495,17 +4475,17 @@ msgstr ""
 "\n"
 "%1?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Zihur zaude hona kopiatzea nahi duzula:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Zihur zaude %d gaiak kopiatzea nahi dituzula:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4524,613 +4504,613 @@ msgstr ""
 "\n"
 "Mesedez berritu alderaketa."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "Zihur zaude mugitzea nahi duzula:"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "Zihur zaude %d gaiak mugitzea nahi dituzula:"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "Berretsi Mugitzea"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Ireki ezkerreko agiria"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Ireki ezkerreko agiri kanpoko editatzailearekin"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Ireki ezkerreko agiria honekin..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Ireki eskuineko agiria"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Ireki eskuineko agiri kanpoko editatzailearekin"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Ireki eskuineko agiria honekin..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Hutsegitea kanpoko editatzailea ekiterakoan: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Luzapen ezezaguna kanpoko editatzailean: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Kopiatu agirizenak gakora?"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Kopiatu ezkerraldeko helburu-izenak gakora"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Kopiatu eskuinaldeko helburu-izenak gakora"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Kopiatu bi aldeetako helburu-izenak gakora"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr "Ezkerreko Shell menua"
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr "Eskuineko Shell menua"
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Agiri heuskarri ezezaguna"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Gehitu gaiak ezkerraldetik agirira"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Gehitu gaiak eskuinaldetik agirira"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Gehitu gaiak bi aldeetatik agirira"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Gehitu gai ezberdinak agirira (bi aldeetatik)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Mugitu ezkerrean hautatutako agiria egile zuzenbidera"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Mugitu eskuinean hautatutako agiria egile zuzenbidera"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Agirizena"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Alderaketa emaitza"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Ezker Eguna"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Eskuin Eguna"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Luzapena"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Ezker Neurria"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Eskuin Neurria"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Eskuin Neurria (Laburra)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Ezker Neurria (Laburra)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Ezkerreko Sortze Denbora"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Eskuineko Sortze Denbora"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Agiri Berriena"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Ezkerreko Agiri Bertsioa"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Eskuineko Agiri Bertsioa"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Emaitz Laburra"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Ezkerraren Ezaugarriak"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Eskuinaren Ezaugarriak"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "Ezker EOL"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "Eskuin EOL"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Ezker Kodeaketa"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Eskuin Kodeaketa"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Ezikusitako Ezberd."
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binarioa"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Ezinezkoa agiriak alderatzea"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Gaia utzita"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Agiria Jauzita"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Agiritegia jauzita"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Ezkerra bakarrik: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Eskuina bakarrik: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Agiri binarioak berdinak dira"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Agiri binarioak ezberdinak dira"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Agiriak ezberdinak dira"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr "Agiritegiak ezberdinak dira"
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Ezkerra Bakarrik"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Eskuina Bakarrik"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Akatsa"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr "Idazki agiriak berdinak dira"
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr "Idazki agiriak ezberdinak dira"
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Igarotako denbora: %ld sm"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 gai hautatuta"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 gai hautatuta"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Agirizena edo agiritegi izena"
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Azpiagiritegi izena azpiagiritegiak barne direnean."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Alderaketa emaitza, modu luzean."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Ezkerralde aldaketa eguna."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Eskuinalde aldaketa eguna."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Agiriaren luzapena."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Ezkerreko agiriaren neurria byte-tan"
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Eskuineko agiriaren neurria byte-tan"
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Ezkerreko agiri neurria laburtuta."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Eskuineko agiri neurria laburtuta."
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Ezkerraldearen sortze denbora."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Eskuinaldearen sortze denbora."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Esaten du zein aldek duen aldaketa egun berriagoa."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Ezkerraldeko agiri bertsioa, agiri-mota batzuentzat bakarrik."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Eskuinaldeko agiri bertsioa, agiri-mota batzuentzat bakarrik."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Alderaketa laburraren emaitza."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Ezkerraldearen ezaugarriak."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Eskuinaldearen ezaugarriak."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Ezkerraldeko agiria EOL motakoa da"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Eskuinaldeko agiria EOL motakoa da"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Eskuinalde kodeaketa."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Ezkerralde kodeaketa."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Agirian ezikusitako ezberdintasun zenbatekoa. Ezberdintasun hauek WinMergek ezikusi ditu eta ezin dira batu."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Agirian dauden ezberdintasun zenbatekoa. Zenbateko honek ez ditu barnebiltzen ezikusitako ezberdintasunak."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Erakutsi asteriskoa (*) agiria binarioa bada."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Alderatu %1 %2-rekin"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Kakotxaz banandutako zerrenda"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Fitxaz banandutako zerrenda"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "HTML Arrunta"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "XML Arrunta"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Jakinarazpen agiria jadanik badago. Dagoen agiria gainidaztea nahi duzu?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5139,32 +5119,32 @@ msgstr ""
 "Akatsa jakinarazpena sortzean:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Jakinarazpena ongi sortu da."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Agiri berdina dago irekita bi paneletan."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Hautatutako agiriak berdinak dira."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Akats bat gertatu da agiriak alderatzerakoan."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Aldibaterako agiriak ezin izan dira sortu. Egiaztatu zure aldibaterako helburu ezarpenak."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5179,7 +5159,7 @@ msgstr ""
 "\n"
 "Oharra: Gurdi itzulera mota guztiak berdin bezala tratatzea nahi badituzu, ezarri 'Ezikusi gurdi itzulera ezberdintasunak...' aukera Alderaketa fitxan aukeren elkarrizketan (eskuragarri hemen: Editatu/Aukerak)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5190,22 +5170,22 @@ msgstr ""
 " Uneko aukerekin, mota nagusian batuko dira.\n"
 " Nahi duzu aukerak aldatzea eta EOL ezberdinari heustea?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Akats bat gertatu da agiria aurrezberdintzen '%1' plugin honekin '%2'. Aurrezberdintzea ez da berriro ezarriko."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "Hautatutako agiritegia ez da baliogarria"
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Ezinenezkoa agiri binarioa editatzailera irekitzea"
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5220,7 +5200,7 @@ msgstr ""
 "%1\n"
 "beste aldean eta agiritegi hauek irekitzea?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5231,148 +5211,148 @@ msgstr ""
 "Erakutsiz agiri bakoitza kode-orrialde horretan erakuspen hobeago bat emango du baina batzea/kopiatzea kaltegarria izango da.\n"
 "Nahi duzu agiri biak tratatzea windowsen kode-orrialde berezkoan (gomendatuta)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Kontuz: Agiriek kodeaketa ezberdina erabiltzen dute, ezkerrak=%s eta eskuinak=%s, eta batzeak informazio galera eragin dezake."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Informazioa galduta kodeaketa akatsengaitik: bi agirietan"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Ezberdintasunik ez"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Lerro ezberdintasuna"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Ordeztuta %1 kate."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Ezin da kate hau aurkitu: \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Kopiatu Helburu Osoa"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Kopiatu Agirizena"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Kokaleku Panela"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Ezberdint. Panela"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Helburu agiria ongi idatzi da."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. gaia ez da aurkitu edo zuzenbidea da!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. gaia ez da aurkitu edo zuzenbidea da!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Helburu agiria jadanik badago. Gainidaztea nahi duzu?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 agiri hautatuta]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Normala"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Hitzingurua"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Bateratuta"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Ezin da %1 agirira idatzi."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Adierazitako irteera helburua ez helburu osoa: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Adierazi irteera agiri bat"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Ezin da helburu agiria sortu agiri binarioetatik"
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Ezin da helburu agiria sortu zuzenbideetatik"
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5383,17 +5363,17 @@ msgstr ""
 "\n"
 "Helburua sortzeak agirietan gordegabeko aldaketarik ez egotea eskatzen du."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Agiritegia ez dago."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Uneko zuzenbide alderaketa emaitzak ezabatu egingo dira."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5404,7 +5384,7 @@ msgstr ""
 "Beharrezko osagai guztiak (7-zip eta/edo Merge7z*.dll) agiri sostengurako ezin dira aurkitu.\n"
 "Ikusi eskuliburua argibide gehaigorako agiri sostenguari buruz eta nola gaitzeaz."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5413,7 +5393,7 @@ msgstr ""
 "\n"
 "Oharra: 7-Zip baterapena ezgaituta dago WinMerge ezarpenetan."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5422,37 +5402,37 @@ msgstr ""
 "\n"
 "Oharra: 7-Zip baterapena eragotzita dago eragiketa askerako WinMerge ezarpenetan."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Hautatu esportatzeko agiria"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Hautatu inportatzeko agiria"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Agiritik inportatutako aukerak"
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Agiritik esportatutako aukerak"
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Hutsegitea agiritik aukerak inportatzerakoan."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Hutsegitea aukerak agirian idazterakoan."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5463,242 +5443,242 @@ msgstr ""
 "\n"
 "Jarraitzea nahi duzu?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Adierazpen arrunt akatsa"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Emaitzik ez"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Adierazpen arrunt baliogabea"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Elkar hizki baliogabea"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Hizki klase izen baliogabea"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Amaierako ezkerbarra"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Xehetasun baliogabea atzera"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Berdingabe [ edo [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Berdingabe ( edo \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Berdingabe \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Eduki baliogabea \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "neurri amaiera baliogabea"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Oroimenetik kanpo"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Aurreko adierazpen arrunta baliogabea da"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Adierazpen arruntean amaiera aurreregi"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Adierazpen arrunt handiegia"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Berdingabe ) edo \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Mixed"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Mota"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "Despaketatzailea"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr "Aurrezberd"
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "Editatzaile eskripta"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Gorde ezkerreko agiria"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Gorde eskuineko agiria"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Gorde ezkerreko agiria izen honekin..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Gorde eskuineko agiria izen honekin..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Bihurtu EOL-ak Windows modura"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Bihurtu EOL-ak Unix modura"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Bihurtu EOL-ak Mac modura"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Aldatu editatzen eta batzen moduen artean"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5707,12 +5687,12 @@ msgstr ""
 "Ikusi eta zehaztu agiri kodeaketa ezaugarriak\n"
 "Agiri kodeaketa ezaugarriak"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "Ireki eta konpondu gatazka agiria"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5721,7 +5701,7 @@ msgstr ""
 "Hautatu ezberdintasun eremua uneko lerroan\n"
 "Ezberdintasuna Uneko Lerroan"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5730,7 +5710,7 @@ msgstr ""
 "Joan lerrora edo ezberdintasunera\n"
 "Joan (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5739,7 +5719,7 @@ msgstr ""
 "Ezarri programaren aukerak\n"
 "Aukerak"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5748,37 +5728,37 @@ msgstr ""
 "Berritu erakuspena\n"
 "Berritu (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Kopiatu hautatutako lerroak gakoan lerro-zenbakia gehituz hasierako lerroan"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Aldatu lastermarka"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Joan hurrengo lastermarkara"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Joan aurreko lastermarkara"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Garbitu lastermarka guztiak"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5787,7 +5767,7 @@ msgstr ""
 "Berdin-berdinak diren gaiak erakusten ditu\n"
 "Erakutsi Gai Berdinak"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5796,7 +5776,7 @@ msgstr ""
 "Ezberdintasunak ditzuten gaiak erakusten ditu\n"
 "Erakutsi Gai Ezberdinak"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5805,7 +5785,7 @@ msgstr ""
 "Ezkerraldean bakarrik dauden gaiak erakusten ditu\n"
 "Erakutsi Ezkerreko Gaiak Bakarrik"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5814,7 +5794,7 @@ msgstr ""
 "Eskuinaldean bakarrik dauden gaiak erakusten ditu\n"
 "Erakutsi Eskuineko Gaiak Bakarrik"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5823,7 +5803,7 @@ msgstr ""
 "Agiri binarioak erakutsi\n"
 "Erakutsi Agiri Binarioak"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5832,7 +5812,7 @@ msgstr ""
 "Jauzi egindako gaiak erakusten ditu\n"
 "Erakutsi Jauzitako Gaiak"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5841,7 +5821,7 @@ msgstr ""
 "Ikusteko hizkia hautatzen du\n"
 "Hautatu Ikus Hizkia"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5850,27 +5830,27 @@ msgstr ""
 "Berriro erabili sistemaren berezko hizkia ikusteko\n"
 "Berezko Hizkia"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Zurigune hizkiak erakusten ditu"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Aldatu Ezberd Panela"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Kokaleku panelak agirien ikuspegi orokor bat  erakusten du"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Erakutsi agiritegi alderaketa estatistika elkarrizketa"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5879,7 +5859,7 @@ msgstr ""
 "Hautatu uneko erabiltzaile interfaze hizkuntza\n"
 "Hizkuntza"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5888,12 +5868,12 @@ msgstr ""
 "Lerroen arteko ezberdintasunak margo ezberdinez erakusten ditu\n"
 "Erakutsi Lerro Ezberdintasuna"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Trukatu bi panelen kokalekua"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5902,7 +5882,7 @@ msgstr ""
 "Lerroen zenbakia erakusten du\n"
 "Erakutsi Lerro Zenbakia"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5911,7 +5891,7 @@ msgstr ""
 "Gaitu hitz inguratzea\n"
 "Inguratu Lerroak"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5920,22 +5900,22 @@ msgstr ""
 "Bi panelentzako bazter hautapenak erakusten ditu\n"
 "Erakutsi Bazter Hautapena"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Handitu idazkiaren neurria"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Gutxitu idazkiaren neurria"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Birrezarri idazkiaren zooma berezko neurrian"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5944,7 +5924,7 @@ msgstr ""
 "Irristatu aurreko ezberdintasunera\n"
 "Aurreko Ezberdintasuna (Alt+Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5953,67 +5933,67 @@ msgstr ""
 "Irristatu hurrengo ezberdintasunera\n"
 "Hurrengo Ezberdintasuna (Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -6022,7 +6002,7 @@ msgstr ""
 "Irristatu lehen ezberdintasunera\n"
 "Lehen Ezberdintasuna (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6031,7 +6011,7 @@ msgstr ""
 "Irristatu uneko ezberdintasunera\n"
 "Uneko Ezberdintasuna (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6040,7 +6020,7 @@ msgstr ""
 "Irristatu azken ezberdintasunera\n"
 "Azken Ezberdintasuna (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6049,7 +6029,7 @@ msgstr ""
 "Kopiatu hautatutako idazkia eskuineko agirira\n"
 "Kopiatu Eskuinera (Alt+Right)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6058,7 +6038,7 @@ msgstr ""
 "Kopiatu hautatutako idazkia ezkerreko agirira\n"
 "Kopiatu Ezkerrera (Alt+Left)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6067,7 +6047,7 @@ msgstr ""
 "Kopiatu ezberdintasuna eskuinera eta hurrengora joan\n"
 "Kopiatu Eskuinean eta Aurrera (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6076,7 +6056,7 @@ msgstr ""
 "Kopiatu ezberdintasuna ezkerrera eta hurrengora joan\n"
 "Kopiatu Ezkerrean eta Aurrera (Ctrl+Alt+Right)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6085,7 +6065,7 @@ msgstr ""
 "Kopiatu ezberdintasun guztiak eskuineko agirian\n"
 "Dena Eskuinera"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6094,77 +6074,77 @@ msgstr ""
 "Kopiatu ezberdintasun guztiak ezkerreko agirian\n"
 "Dena Ezkerrera"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Ezabatu hautatutako gaiak bien zuzenbideetatik"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Alderatu hautatutako gaiak (alderatu lehen gaia hautatuta gai anitz badaude)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Hautatu eta birrantolatu alderatu zutabeak zuzenbidea"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Helburu-agiri bat sortu"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Hautatu eta aldatu iragazkiak"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Alderaketa emaitzekin jakinarazpen bat sortzen du"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "Plugin eskuragarrien zerrenda bat erakusten du"
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "Erabiltzaileak hautatzen du despaketatzailea (ez da despaketatzen zuzenb. alderatzean)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Egokitutako despaketatzailea bi agiriei ezartzen zaie (agiri batek bakarrik behar du luzapena)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Hautatu depaketatzaile bat agiri hau editatzeko"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Ez aurrezberd (normala)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Iradokitutako pluginak"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Beste pluginak"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Desgertatu plugin guztiak eta birgertatu berriro (garatzaileentzat)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6173,12 +6153,12 @@ msgstr ""
 "Hurrengo agiri ikusgarria eragiten du\n"
 "Hurrengo Agiria Eragin"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Irekitako leiho guztiak isten ditu"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6187,22 +6167,22 @@ msgstr ""
 "WinMerge Laguntza irekitzen du\n"
 "WinMerge Laguntza"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Irteerak uneko WinMerge bertsio argibideak eta idazki agiri itxurapena "
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "GNU Baimen Publiko Orokorra erakusten du"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Bilduma Pribatua: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6211,7 +6191,7 @@ msgstr ""
 "Argitalpen oharrak irekitzen ditu\n"
 "Argitalpen Oharrak"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6220,272 +6200,272 @@ msgstr ""
 "Itzulpen webgunea irekitzen du\n"
 "Itzulpenak"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Plugin Ezarpenak"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Ez aurrezberd"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Aurrezberd ahal bada"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH ez da aurkitu - .sct eskriptak ezgaituta"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Ezer ez>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Berezgaitasunez>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Ireki agiria erregistratutako aplikazio batekin"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Ireki agiria kanpoko editatzaile batekin"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Ireki agiria programa jakin batekin"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Ez erakutsi mugitutako blokeak"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Erakutsi mugitutako bloke guztiak"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Erakutsi mugitutako blokeak uneko ezberd. bakarrik"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Joan kurtsorepeko ezberd."
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "Joan %1 %2-tik Ezberd"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "&Joan lerro honetara: %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Ezgaituta"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Agiri sistematik"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "MRU zerrendatik"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "Ez Nabarmenduta"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Batch"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Portable Object"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Resources"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr "Verilog"
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Ezkutatu tresnabarra"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Erakutsi tresnabarra txikia"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Erakutsi tresnabarra handia"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index cf9ed11..8904917 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -1032,7 +1032,7 @@ msgid "&Scripts"
 msgstr "&Scripts"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Vazio >"
@@ -1473,7 +1473,7 @@ msgid "&Versioning System:"
 msgstr "&Sistema de Versões:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Caminho para o cleartool.exe:"
@@ -1674,7 +1674,7 @@ msgid "Replace &All"
 msgstr "Substituir &Tudo"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2586,7 +2586,7 @@ msgid "Files:"
 msgstr "Arquivos:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Diferente"
@@ -2623,7 +2623,7 @@ msgid "Right:"
 msgstr "Direita:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Idênticos"
@@ -2823,7 +2823,7 @@ msgid "A&ppend timestamp"
 msgstr "A&nexar a estampa de tempo"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Confirmar a Cópia"
@@ -2901,7 +2901,7 @@ msgstr "Adicionar o &menu do Shell ao menu de contexto"
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Pasta"
@@ -3541,7 +3541,7 @@ msgid "Version Control"
 msgstr "Controle da Versão"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Diferenças"
@@ -3670,87 +3670,67 @@ msgstr "Arquivos XML (*.xml)|*.xml|Todos os Arquivos (*.*)|*.*||"
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Conteúdos Completos"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Conteúdos Rápidos"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Data Modificada"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Data e Tamanho Modificados"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Tamanho"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Nome"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Local"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filtros"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Descrição"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Selecionar o nome do arquivo para o novo filtro"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Filtros dos Arquivos (*.flt)|*.flt|Todos os Arquivos (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3763,7 +3743,7 @@ msgstr ""
 "Por favor copie o arquivo %1 para a pasta WinMerge/Filtros:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3776,7 +3756,7 @@ msgstr ""
 "\n"
 "Por favor tenha certeza de que a pasta exista e é gravável."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3787,7 +3767,7 @@ msgstr ""
 "\n"
 "Por favor selecione a pasta do filtro em Opções/Sistema."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3800,12 +3780,12 @@ msgstr ""
 "\n"
 "Talvez o arquivo seja somente-leitura?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Localizar o filtro do arquivo para instalar"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3816,17 +3796,17 @@ msgstr ""
 "\n"
 "Não pôde copiar o novo arquivo do filtro para a pasta do filtro."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "O arquivo do filtro já existe. Sobrescrever o filtro existente?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Expressão regular"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3837,243 +3817,243 @@ msgstr ""
 "\n"
 "Se você não quer atualizar todas as comparações agora você pode selecionar o Não e atualizar as comparações mais tarde."
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "&Caminho para o SS.EXE:"
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Resultado da Comparação dos Pastas"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Comparação de Arquivo"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Sem título a esquerda"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Sem título a direita"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "O Arquivo Deles"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "Meu Arquivo"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Escaneando arquivos..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Abrindo a seleção"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Copiando da Esquerda para a Direita"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Copiando da Direita para a Esquerda"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Copiando Tudo para a Esquerda"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Copiando Tudo para a Direita"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Copiando os arquivos..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Apagando os arquivos..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Movendo os arquivos..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Criando o relatório..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Desfazendo a última operação..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "Refazendo a operação anterior"
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Linha: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Unir"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Diferença %1 de %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 Diferenças Achadas"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "1 Diferença Achada"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "RO"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Item %1 de %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Itens: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Selecione duas pastas ou arquivos existentes para comparar"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Seleção de Pastas"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Selecione duas pastas ou dois arquivos para comparar."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "O caminho esquerdo é inválido!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "O caminho direito é inválido!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Ambos os caminhos são inválidos!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Escolher dois arquivos para ativar a seleção do desempacotador."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Não pôde comparar o arquivo e a pasta!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Arquivo não achado: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Arquivo não desempacotado: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4086,12 +4066,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Falhou em analisar o arquivo do conflito."
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4102,32 +4082,32 @@ msgstr ""
 "%1\n"
 "não é um arquivo de conflito."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Salvar Como"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Salvar as mudanças em %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 está marcado como somente-leitura. Você gostaria de sobrescrever o arquivo somente-leitura ? (Não para salvar com um novo nome de arquivo.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Erro ao verificar a habilidade de gravar no destino"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Erro ao fazer o backup do arquivo"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4140,7 +4120,7 @@ msgstr ""
 "\n"
 "Continuar de qualquer maneira?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4157,7 +4137,7 @@ msgstr ""
 "\t-usar um nome de arquivo diferente (Pressione Ok)\n"
 "\t-abortar a operação atual (Pressione Cancelar)?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4172,7 +4152,7 @@ msgstr ""
 "\n"
 "Você quer salvar a versão desempacotada em outro arquivo?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4187,7 +4167,7 @@ msgstr ""
 "\n"
 "Você quer salvar a versão despachada em outro arquivo?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4202,7 +4182,7 @@ msgstr ""
 "\n"
 "Sobrescrever o arquivo mudado?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4211,7 +4191,7 @@ msgstr ""
 "%1\n"
 "está marcado como somente-leitura. Você gostaria de sobrescrever o item somente-leitura?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4226,22 +4206,22 @@ msgstr ""
 "\n"
 "Você quer recarregar o arquivo?"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Salvar o Arquivo a Esquerda Como"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Salvar o Arquivo a Direita Como"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid ""
 "The file\n"
@@ -4252,7 +4232,7 @@ msgstr ""
 "%1\n"
 "desapareceu. Por favor salve uma cópia do arquivo para continuar."
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4263,42 +4243,42 @@ msgstr ""
 "\n"
 "Atualize os documentos antes de continuar."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Você deve especificar o caminho de um projeto do SourceSafe para continuar (ex:  $/MyProject)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Ver os arquivos da VSS..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "O Sistema de Versões retornou um erro enquanto tentava verificar o arquivo.  Incapaz de continuar..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Erro ao executar o comando do sistema de versões."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "A Pasta de Trabalho VSS e o local do arquivo atual não combinam. Continuar?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Não foram achadas base(s) de dados VSS!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Erro da VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4309,7 +4289,7 @@ msgstr ""
 " Por favor, verifique a spec da config da visualização usada.\n"
 " Desfazer a operação de verificação?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4318,169 +4298,169 @@ msgstr ""
 "O Sistema de Versões retornou um erro enquanto tentava desfazer o checkout do arquivo.\n"
 " Por favor, verifique a spec da config da visualização usada."
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Nenhum"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (menor do que 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 e acima)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Quebrar no espaço em branco"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Quebrar no espaço em branco ou pontuação"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Copiar o item selecionado para o diretório nomeado"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Copiar o item selecionado para o diretório personalizado"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Apagar o item selecionado a esquerda"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Apagar o item selecionado a direita"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Apagar o(s) item(ns) selecionado(s) em ambos os lados"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Esconder o(s) item(ns) selecionado(s) (filtro on the fly)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Renomear o item selecionado em ambos os lados"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Direita para a Esquerda (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Esquerda para a Direita (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Direita para a Esquerda (%1 de %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Esquerda para a Direita (%1 de %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Esquerda para... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Direita para... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Esquerda para... (%1 de %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Direita para... (%1 de %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Esquerda (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Direita (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Ambos (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Esquerda (%1 de %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Direita (%1 de %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Ambos (%1 de %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Selecionar a pasta de destino"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Lado esquerdo - selecionar a pasta de destino:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Lado direito - selecionar a pasta de destino:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 Arquivos Afetados)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 de %2 Arquivos Afetados)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4491,17 +4471,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Você tem certeza de que você quer copiar:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Você tem certeza que você quer copiar os itens %d:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4520,613 +4500,613 @@ msgstr ""
 "\n"
 "Por favor atualize a comparação."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "Você tem certeza que você quer mover:"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "Você tem certeza que você quer mover os itens %d:"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "Confirmar o Movimento"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Abrir o arquivo a esquerda"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Abrir o arquivo a esquerda no editor externo"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Abrir o arquivo a esquerda com..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Abrir o arquivo a direita"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Abrir o arquivo a direita no editor externo"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Abrir o arquivo a direita com..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Falhou em executar o editor externo: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Extensão desconhecida no editor externo: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Copiar os nomes dos arquivos para a área de transferência"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Copiar os nomes dos caminhos do lado esquerdo para a área de transferência"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Copiar os nomes dos caminhos do lado direito para a área de transferência"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Copiar os nomes dos caminhos de ambos os lados para a área de transferência"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr "Menu do Shell Esquerdo"
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr "Menu do Shell Direito"
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Formato do arquivo desconhecido"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Adicionar os itens do lado esquerdo ao arquivo"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Adicionar os itens do lado direitos ao arquivo"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Adicionar os itens de ambos os lados ao arquivo"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Adicionar itens diferentes ao arquivo (de ambos os lados)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Mover o arquivo selecionado a esquerda para o diretório personalizado"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Mover o arquivo selecionado a direita para o diretório personalizado"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Nome do Arquivo"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Resultado da comparação"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Data da Esquerda"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Data da Direita"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Extensão"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Tamanho a Esquerda"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Tamanho a Direita"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Tamanho a Direita (Curto)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Tamanho a Esquerda (Curto)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Hora da Criação a Esquerda"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Hora da Criação a Direita"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Arquivo Mais Novo"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Versão do Arquivo a Esquerda"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Versão do Arquivo a Direita"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Resultado Curto"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Atributos da Esquerda"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Atributos da Direita"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "EOL a esquerda"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "EOL a direita"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Codificação a Esquerda"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Codificação a Direita"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Diferença Ignorada."
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binário"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Incapaz de comparar os arquivos"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Item abortado"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Arquivo pulado"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Pasta pulada"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Apenas a esquerda: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Apenas a direita: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Os arquivos binários são idênticos"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Os arquivos binários são diferentes"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Os arquivos são diferentes"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr "As pastas são diferentes"
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Apenas a Esquerda"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Apenas a Direita"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Erro"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr "Os arquivos texto são idênticos"
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr "Os arquivos texto são diferentes"
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Tempo decorrido: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 item selecionado"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 itens selecionados"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Nome do arquivo ou nome da pasta."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Nome da sub-pasta quando as sub-pastas são incluídas."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Resultado da comparação, formulário longo"
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Data de modificação do lado esquerdo."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Data de modificação do lado direito."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Extensão do arquivo."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Tamanho do arquivo a esquerda em bytes."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Tamanho do arquivo a direita em bytes."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Tamanho do arquivo a esquerda abreviado."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Tamanho do arquivo a direita abreviado."
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Hora de criação do lado esquerdo."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Hora da criação do lado direito."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Diz qual lado tem a data de modificação mais nova."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Versão do arquivo do lado esquerdo, só para alguns tipos de arquivos."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Versão do arquivo do lado direito, só para alguns tipos de arquivos."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Resultado curto da comparação."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Atributos do lado esquerdo."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Atributos do lado direito."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Tipo de EOL do arquivo do lado esquerdo"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Tipo de EOL do arquivo do lado direito"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Codificação do lado esquerdo."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Codficação do lado direito."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Número de diferenças ignoradas no arquivo. Estas diferenças são ignoradas pelo WinMerge e não podem ser unidas."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Número de diferenças no arquivo. Este número não inclui as diferenças ignoradas."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Mostrar um asterisco (*) se o arquivo é binário."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Comparar o %1 com o %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Lista separada por vírgula"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Lista separada por aba"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "HTML Simples"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "XML Simples"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "O arquivo do relatório já existe. Você quer sobrescrever o arquivo existente?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5135,32 +5115,32 @@ msgstr ""
 "Erro ao criar o relatório:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "O relatório foi criado com sucesso."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "O mesmo arquivo está aberto em ambos os painéis."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Os arquivos selecionados são idênticos."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Um erro ocoreu enquanto comparava os arquivos."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Os arquivos temporários não puderam ser criados. Verifique suas configurações do caminho dos temporários."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5175,7 +5155,7 @@ msgstr ""
 "\n"
 "Nota: Se você quer sempre tratar todos os tipos de retorno de procedimentos como equivalentes, configure a opção 'Ignorar diferenças de retorno dos procedimentos..' na aba Comparar do diálogo das opções (disponível em Editar/Opções)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5186,22 +5166,22 @@ msgstr ""
 " Com as opções atuais, eles serão unificados ao tipo principal.\n"
 " Você quer mudar as opções e preservar os EOL diferentes?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Um erro ocorreu enquanto prediffing o arquivo '%1' com o plugin '%2'. O prediffing não está mais aplicado."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "A pasta selecionada é inválida."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Não pode abrir um arquivo binário no editor."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5216,7 +5196,7 @@ msgstr ""
 "%1\n"
 "no outro lado e abrir estas pastas?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5227,148 +5207,148 @@ msgstr ""
 "Exibir cada arquivo na sua página de código dará uma melhor exibição mas unir/copiar será perigoso.\n"
 "Você gostaria de tratar ambos os arquivos como estando na página do código padrão do windows? (recomendado)"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Aviso: Os arquivos usam codificações diferentes, esquerda=%s e direita=%s, e a união pode levar a perda de informação."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Informação perdida devido a erros de codificação: em ambos os arquivos"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Sem diferença"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Diferença da linha"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Substituiu %1 string(s)."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Não pôde achar a string \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Copiar o Caminho Completo"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Copiar o Nome do Arquivo"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Painel de Localização"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Painel das Diferenças"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Arquivo patch gravado com sucesso."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. o item não foi achado ou é diretório!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. o item não foi achado ou é diretório!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "O arquivo do patch já existe. Você quer sobrescrevê-lo?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 arquivos selecionados]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Contexto"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Unificado"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Não pôde gravar no arquivo %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "O caminho de saída especificado não é um caminho absoluto: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Especificar um arquivo de saída"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Não pode criar um arquivo patch dos arquivos binários."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Não pode criar um arquivo patch dos diretórios."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5379,17 +5359,17 @@ msgstr ""
 "\n"
 "Criar um patch requer que não hajam mudanças não salvas nos arquivos."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "A pasta não existe."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Os resultados da comparação dos diretórios atuais serão limpados."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5400,7 +5380,7 @@ msgstr ""
 "Todos os componentes necessários (7-zip e/ou Merge7z*.dll) para o suporte para arquivos não podem ser achados.\n"
 "Veja o manual para mais info sobre o suporte para arquivos e como ativá-lo."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5409,7 +5389,7 @@ msgstr ""
 "\n"
 "Nota: A integração do 7-Zip está desativada nas configurações do WinMerge."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5418,37 +5398,37 @@ msgstr ""
 "\n"
 "Nota: A integração do 7-Zip está restrita a operação isolada nas configurações do WinMerge."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Selecione o arquivo para exportar"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Selecione o arquivo para importar"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Opções importadas do arquivo"
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Opções exportadas para o arquivo."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Falhou em importar as opções do arquivo."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Falhou em gravar as opções no arquivo."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5459,242 +5439,242 @@ msgstr ""
 "\n"
 "Você quer continuar?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Erro da expressão regular"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Nenhuma combinação"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Expressão regular inválida"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Caractere de comparação inválido"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Nome da classe do caractere inválido"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Rastreando o backslash"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Referência anterior inválida"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Não comparável [ ou [^ "
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Não comparável ( ou \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Não comparável \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Conteúdo inválido de \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Final do alcance inválido"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Sem memória"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Expressão regular precedente inválida"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Final prematuro da expressão regular"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Expressão regular muito grande"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Não comparável ) ou \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Misturado"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Tipo"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "Desempacotador"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr "Prediffer"
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "Script do editor"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Salvar o arquivo a esquerda"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Salvar o arquivo a direita"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Salvar o arquivo a esquerda com o nome..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Salvar o arquivo a direita com o nome..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Converter o EOL para o modo do Windows"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Converter o EOL para o modo do Unix"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Converter o EOL para o modo do Mac"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Trocar entre os modos de edição e união"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5703,12 +5683,12 @@ msgstr ""
 "Visualizar e ajustar as propriedades da codificação do arquivo\n"
 "Propriedades da codificação do arquivo"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "Abrir e determinar o arquivo do conflito"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5717,7 +5697,7 @@ msgstr ""
 "Selecionar a área da diferença na linha atual\n"
 "Diferença na Linha Atual"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5726,7 +5706,7 @@ msgstr ""
 "Ir para a linha ou diferença\n"
 "Ir para (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5735,7 +5715,7 @@ msgstr ""
 "Definir as opções do programa\n"
 "Opções"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5744,37 +5724,37 @@ msgstr ""
 "Atualizar a exibição\n"
 "Atualizar (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Copiar as linhas selecionadas para a área de transferência adicionando números da linha ao começo da linha"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Ativar o bookmark"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Ir para o bookmark seguinte"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Ir para o bookmark anterior"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Limpar todos os bookmarks"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5783,7 +5763,7 @@ msgstr ""
 "Exibe itens que são exatamente os mesmos\n"
 "Mostrar Itens Idênticos"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5792,7 +5772,7 @@ msgstr ""
 "Exibe itens que tem diferenças\n"
 "Mostrar Itens Diferentes"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5801,7 +5781,7 @@ msgstr ""
 "Exibe itens que existem apenas no lado esquerdo\n"
 "Mostrar Itens Únicos a Esquerda"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5810,7 +5790,7 @@ msgstr ""
 "Exibe itens que existem apenas no lado direito\n"
 "Mostrar Itens Únicos a Direita"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5819,7 +5799,7 @@ msgstr ""
 "Exibe os arquivos binários\n"
 "Mostrar Arquivos Binários"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5828,7 +5808,7 @@ msgstr ""
 "Exibe os itens pulados\n"
 "Mostrar os Itens Pulados"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5837,7 +5817,7 @@ msgstr ""
 "Selecionar a fotne para a visualização\n"
 "Selecionar a Fonte para a Visualização"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5846,27 +5826,27 @@ msgstr ""
 "Reverter para usar a fonte padrão do sistema para a visualização\n"
 "Fonte Padrão"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Mostrar os caracteres do espaço em branco"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Ativar o Painel das Diferenças"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "O painel da localização mostra a fotografia global dos arquivos"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Mostrar o diálogo das estatísticas de comparação das pastas"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5875,7 +5855,7 @@ msgstr ""
 "Selecionar o idioma da interface do usuário atual\n"
 "Idioma"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5884,12 +5864,12 @@ msgstr ""
 "Mostra as diferenças dentro das linhas com cores diferentes\n"
 "Mostrar a Diferença das Linhas"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Trocar as posições dos dois painéis"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5898,7 +5878,7 @@ msgstr ""
 "Mostra os números das linhas\n"
 "Mostrar os Números das Linhas"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5907,7 +5887,7 @@ msgstr ""
 "Ativar a organização das palavras\n"
 "Organizar as Linhas"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5916,22 +5896,22 @@ msgstr ""
 "Mostra as margens da seleção para ambos os painéis\n"
 "Mostrar as Margens da Seleção"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Aumentar o tamanho do texto"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Diminuir o tamanho do texto"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Resetar o zoom do texto para o tamanho padrão"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5940,7 +5920,7 @@ msgstr ""
 "Rolar para o diferença anterior\n"
 "Diferença Anterior (Alt+Pra Cima)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5949,67 +5929,67 @@ msgstr ""
 "Rolar para a diferença seguinte\n"
 "Diferença Seguinte (Alt+Pra baixo)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -6018,7 +5998,7 @@ msgstr ""
 "Rolar para a primeira diferença\n"
 "Primeira Diferença (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6027,7 +6007,7 @@ msgstr ""
 "Rolar para a diferença atual\n"
 "Diferença Atual (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6036,7 +6016,7 @@ msgstr ""
 "Rolar para a última diferença\n"
 "Última Diferença (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6045,7 +6025,7 @@ msgstr ""
 "Copiar o texto selecionado para o arquivo da direita\n"
 "Copiar para a Direita (Alt+Direita)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6054,7 +6034,7 @@ msgstr ""
 "Copiar o texto selecionado para o arquivo da esquerda\n"
 "Copiar para a Esquerda (Alt+Esquerda)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6063,7 +6043,7 @@ msgstr ""
 "Copiar a diferença para a direita e avançar para a próxima\n"
 "Copiar para a Direita e Avançar (Ctrl+Alt+Direita)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6072,7 +6052,7 @@ msgstr ""
 "Copiar a diferença para a esquerda e avançar para a próxima\n"
 "Copiar para a Esquerda e Avançar (Ctrl+Alt+Esquerda)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6081,7 +6061,7 @@ msgstr ""
 "Copiar todas as diferenças para o arquivo da direita\n"
 "Tudo para a Direita"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6090,77 +6070,77 @@ msgstr ""
 "Copiar todas as diferenças para o arquivo da esquerda\n"
 "Tudo para a Esquerda"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Apagar os itens selecionados de ambos os diretórios"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Comparar o item selecionado (comparar o primeiro item se múltiplos itens estão selecionados)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Selecionar e re-ordenar as colunas de comparação dos diretórios"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Gerar um arquivo-patch"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Selecionar e modificar os filtros"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Gera um relatório dos resultados da comparação"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "Mostra uma lista de plugins disponíveis"
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "O usuário seleciona o desempacotador (sem desempacotamento quando comparando diretórios)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "O desempacotador adaptado está aplicado a ambos os arquivos (um arquivo só precisa da extensão)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Selecione um desempacotador para editar este arquivo"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Sem prediffer (normal)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Plugins sugeridos"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Outros plugins"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Descarregar todos os plugins e recarregá-los (para desenvolvedores)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6169,12 +6149,12 @@ msgstr ""
 "Ativa o próximo arquivo visível\n"
 "Ativar o próximo arquivo"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Fecha todas as janelas abertas"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6183,22 +6163,22 @@ msgstr ""
 "Abre a Ajuda do WinMerge\n"
 "Ajuda do WinMerge"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Emite a info da versão atual do WinMerge e configuração para o arquivo texto"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "Exibe a GNU Licença para o Público em Geral"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Build Privado: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6207,7 +6187,7 @@ msgstr ""
 "Abre o documento das notas do lançamento\n"
 "Notas do Lançamento"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6216,272 +6196,272 @@ msgstr ""
 "Abre o website das traduções\n"
 "Traduções"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Configurações dos Plugins"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Sem prediffer"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Prediff se possível"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH não achado - scripts .sct desativados"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Nenhum>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Automático>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Abrir o arquivo com o aplicativo registrado"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Abrir o arquivo com o editor externo"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Abrir o arquivo com um programa particular"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Não exibir os blocos movidos"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Exibir todos os blocos movidos"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Exibir os blocos movidos apenas da diferença atual"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Ir para a diferença sob o cursor"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "I&ir para a Diferença %1 de %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "I&r para a Linha %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Desativado"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Do sistema de arquivos"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Da lista da MRU"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "Sem Destacamento"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Básico"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Batch"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Objeto Portátil"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Recursos"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr "Verilog"
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Esconder a barra de ferramentas"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Mostrar barra de ferramentas pequena"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Mostrar barra de ferramentas grande"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index ffe4c92..a02f78b 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -1030,7 +1030,7 @@ msgid "&Scripts"
 msgstr "&Ñêðèïòîâå"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Ïðàçåí >"
@@ -1471,7 +1471,7 @@ msgid "&Versioning System:"
 msgstr "Ñèñòåìà çà âåðñèè"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Ïúò äî cleartool.exe:"
@@ -1672,7 +1672,7 @@ msgid "Replace &All"
 msgstr "Çàì. &âñè÷êî"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr ""
@@ -2580,7 +2580,7 @@ msgid "Files:"
 msgstr "Ôàéëà:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Ðàçëè÷íè"
@@ -2617,7 +2617,7 @@ msgid "Right:"
 msgstr "Äÿñíî:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Èäåíòè÷íè"
@@ -2817,7 +2817,7 @@ msgid "A&ppend timestamp"
 msgstr "Äîáàâè âðåìå"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Ïîòâúðäè êîïèðàíå"
@@ -2895,7 +2895,7 @@ msgstr ""
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Äèðåêòîðèÿ"
@@ -3499,7 +3499,7 @@ msgid "Version Control"
 msgstr "Êîíòðîë íà âåðñèÿòà"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Ðàçëèêè"
@@ -3628,87 +3628,67 @@ msgstr "XML 
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr ""
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr ""
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr ""
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr ""
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Öÿëîòî ñúäúðæàíèå"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Áúðç äîñòúï"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Ïðîìåíåíà äàòà"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Ïðîìåíåíè äàòà è ðàçìåð"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Ðàçìåð"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Èìå"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Ìÿñòî"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Ôèëòðè"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr ""
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Îïèñàíèå"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Èçáåðåòå èìå çà íîâèÿ ôèëòúð"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Ôàéëîâè Ôèëòðè (*.flt)|*.flt|Âñè÷êè ôàéëîâå (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3721,7 +3701,7 @@ msgstr ""
 "Ìîëÿ, êîïèðàéòå ôàéëà %1 â ïàïêàòà WinMerge/Filters:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3734,7 +3714,7 @@ msgstr ""
 "\n"
 "Ìîëÿ, óâåðåòå ñå ÷å ïàïêàòà ñúùåñòâóâà è ìîæå äà ñå çàïèñâà â íåÿ."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3745,7 +3725,7 @@ msgstr ""
 "\n"
 "Ìîëÿ, èçáåðåòå ïàïêà çà ôèëòðè â Íàñòðîéêè/Ñèñòåìíè."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3758,12 +3738,12 @@ msgstr ""
 "\n"
 "Ìîæå áè ôàéëúò å ñàìî çà ÷åòåíå?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Çàäàéòå ôèëòúðåí ôàéë çà èíñòàëèðàíå"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3774,258 +3754,258 @@ msgstr ""
 "\n"
 "Íå ìîæå äà ñå êîïèðà íîâèÿò ôàéë â ïàïêàòà ñ ôèëòðè."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Ôèëòúðíèÿò ôàéë âå÷å ñúùåñòâóâà. Äà ñå ïðåçàïèøå ëè ñúùåñòâóâàùèÿò ôèëòúð?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "×åñòè èçðàçè"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
 msgstr ""
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr ""
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Ðåçóëòàòè îò ñðàâíÿâàíå íà äèðåêòîðèèòå"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Ñðàâíÿâàíå íà ôàéëîâå"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Áåç çàãëàâèå ëÿâ"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Áåç çàãëàâèå äåñåí"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "Òåõåí ôàéë"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "Ìîé ôàéë"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Ñêàíèðàíå íà ôàéëîâåòå..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Îòâàðÿ èçáðàíîòî"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Êîïèðà îò ëÿâî íà äÿñíî"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Êîïèðà îò äÿñíî íà ëÿâî"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Êîïèðà âñè÷êî â ëÿâî"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Êîïèðà âñè÷êî â äÿñíî"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Êîïèðàíå íà ôàéëîâå..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Èçòðèâàíå íà ôàéëîâå..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Ïðåìåñòâàíå íà ôàéëîâå..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Ñúçäàâàíå íà îò÷åò..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr ""
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr ""
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Ðåä: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Ñëèâàíå"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Ðàçëèêè %1 îò %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 Íàìåðåíè ðàçëèêè"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "1 Íàìåðåíà ðàçëèêà"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "Ñ×"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Åëåìåíò %1 îò %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Îáùî: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Èçáåðåòå äâå ÑÚÙÅÑÒÂÓÂÀÙÈ äèðåêòîðèè èëè ôàéëîâå çà ñðàâíåíèå"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Èçáîð íà äèðåêòîðèÿ"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Èçáåðåòå äâå ïàïêè èëè äâà ôàéëà çà ñðàâíåíèå."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "Íåâàëèäåí ëÿâ ïúò!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Íåâàëèäåí äåñåí ïúò!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Äâàòà ïúòÿ ñà íåâàëèäíè!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Èçáåðåòå äâà ôàéëà çà àêòèâèðàíå íà èçáîðà çà ðàçàðõèâèðàíå."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Íå ìîæå äà ñå ñðàâíè ôàéë ñ äèðåêòîðèÿ!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Íå å íàìåðåí ôàéëà: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Íå å ðàçàðõèâèðàí ôàéëà: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4038,42 +4018,42 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Ãðåøêà ïðè ðàçáîðà íà êîíôëèêòåí ôàéë"
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid "The file\n%1\nis not a conflict file."
 msgstr "Ôàéëúò\n%1\níå å êîíôëèêòåí."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Çàïèøè êàòî"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Çàïèøè ïðîìåíèòå íà %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 å ñàìî çà ÷åòåíå. Äà çàïèøà ëè ôàéëà? (Íå, ùå ãî çàïèøà ñ íîâî èìå.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Ãðåøêà ïðè ïðîâåðêàòà çà çàïèñ"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Ãðåøêà ïðè ñúçäàâàíå íà ðåçåðâíî êîïèå"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4086,7 +4066,7 @@ msgstr ""
 "\n"
 "Äà ïðîäúëæà ëè?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4103,7 +4083,7 @@ msgstr ""
 "\t-èçïîëçâàòå ðàçëè÷íî èìå (íàòèñíåòå Ok)\n"
 "\t-îòìåíèòå òåêóùàòà îïåðàöèÿ (íàòèñíåòå Îòìåíè)?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4118,7 +4098,7 @@ msgstr ""
 "\n"
 "Èñêàòå ëè äà çàïèøåòå íåïàêåòèðàíà âåðñèÿ â äðóã ôàéë?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4133,7 +4113,7 @@ msgstr ""
 "\n"
 "Èñêàòå ëè äà çàïèøåòå íåïàêåòèðàíà âåðñèÿ â äðóã ôàéë?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4148,7 +4128,7 @@ msgstr ""
 "\n"
 "Äà çàìåíÿ ëè ïðîìåíåíèÿ ôàéë?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4157,32 +4137,32 @@ msgstr ""
 "%1\n"
 "å ìàðêèðàí ñàìî ç ÷åòåíå. Èñêàòå ëè äà çàìåíèòå åëåìåíòà ñàìî çà ÷åòåíå?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
 msgstr ""
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Çàïèøè ëåâèÿ ôàéë êàòî"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Çàïèøè äåñíèÿ ôàéë êàòî"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
 msgstr ""
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4193,42 +4173,42 @@ msgstr ""
 "\n"
 "Îáíîâåòå äîêóìåíòèòå ïðåäè äà ïðîäúëæèòå."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Âèå òðÿáâà äà èçáåðåòå SourceSafe ïðîåêò çà äà ïðîäúëæèòå (ïð:  $/MyProject)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Ïðîâåðÿâàíå íà ôàéëîâå îò VSS..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "Versioning System âúðíà ãðåøêà ïðè îïèòà äà ïðîâåðè ôàéëà. Íå ìîæå äà ïðîäúëæè..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Ãðåøêà ïðè ñòàðòèðàíå íà êîìàíäà îò versioning system."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "VSS ðàáîòíàòà ïàïêà è ðàçïîëîæåíèåòî íà ôàéëà íå ñúâïàäàò. Ùå ïðîäúëæèòå ëè?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Íå å íàìåðåíà VSS áàçà äàííè!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Ãðåøêà îò VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4239,7 +4219,7 @@ msgstr ""
 " Ìîëÿ, ïðîâåðåòå êîíôèãóðàöèÿòà íà èçïîëçâàíèÿ èçãëåä.\n"
 " Äà îòìåíÿ ëè ïðîâåðêàòà?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4248,169 +4228,169 @@ msgstr ""
 "Versioning System âúðíà ãðåøêà äîêàòî ñå îïèòâà äà îòìåíè ïðîâåðêàòà íà ôàéëà.\n"
 " Ìîëÿ, ïðîâåðåòå êîíôèãóðàöèÿòà íà èçïîëçâàíèÿ èçãëåä."
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Íÿìà"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (ïðåäè â.5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (â.5.0 è íàãîðå)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Ïðåêúñíè íà ïðàçíî ïðîñòðàíñòâî"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Ïðåêúñíè íà ïðàçíî ïðîñòðàíñòâî èëè ïóíêòóàöèÿ"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Êîïèðàé èçáðàíèòå íåùà â çàäàäåíàòà ïàïêà"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Êîïèðàé èçáðàíèòå íåùà â ïîòðåáèòåëñêà ïàïêà"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Èçòðèâàíå íà èçáðàíèÿ îáåêò îò ëÿâî"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Èçòðèâàíå íà èçáðàíèÿ îáåêò îò äÿñíî"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Èçòðèâàíå íà èçáðàíèÿ îáåêò(è) îò äâåòå ñòðàíè"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Ñêðèé èçáðàíèÿ îáåêò(è) ('on the fly' ôèëòúð)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Ïðåèìåíóâàé èçáðàíèÿ åëåìåíò â äâåòå ñòðàíè"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Îò äÿñíî êúì ëÿâî (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Îò ëÿâî êúì äÿñíî (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Äåñåí êúì ëÿâ (%1 îò %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Ëÿâ êúì äåñåí (%1 îò %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Ëÿâ êúì... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Äåñåí êúì... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Ëÿâ êúì... (%1 îò %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Äåñåí êúì... (%1 îò %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Ëÿâî (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Äÿñíî (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Äâåòå(%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Ëÿâ (%1 îò %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Äåñåí (%1 îò %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Äâåòå (%1 îò %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Èçáîð íà äèðåêòîðèÿ"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Ëÿâà ÷àñò - èçáåðåòå ïàïêà:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Äÿñíà ÷àñò - èçáåðåòå ïàïêà:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 Ôàéëà çàñåãíàòè)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 îò %2 ôàéëà çàñåãíàòè)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4421,17 +4401,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Èñêàòå ëè äà êîïèðàòå:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Èñêàòå ëè äà êîïèðàòå %d åëåìåíòè:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4450,613 +4430,613 @@ msgstr ""
 "\n"
 "Ìîëÿ, îáíîâåòå ñðàâíÿâàíåòî."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr ""
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr ""
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr ""
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Îòâàðÿíå íà ëåâèÿ ôàéë"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Îòâàðÿíå íà ëåâèÿ ôàéë ñ âúíøåí ðåäàêòîð"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Îòâàðÿíå íà ëåâèÿ ôàéë ñ..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Îòâàðÿíå íà äåñíèÿ ôàéë"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Îòâàðÿíå íà äåñíèÿ ôàéë ñ âúíøåí ðåäàêòîð"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Îòâàðÿíå íà äåñíèÿ ôàéë ñ..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Íå ìîæå äà ñå ñòàðòèðà âúíøíèÿ ðåäàêòîð: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Íåïîçíàòî ðàçøèðåíèå çà âúíøíèÿ ðåäàêòîð: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Êîïèðàé ôàéëîâèòå èìåíà â êëèïáîðäà"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Êîïèðàé ïúòÿ äî äîêóìåíòà â ëÿâî â êëèïáîðäà"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Êîïèðàé ïúòÿ äî äîêóìåíòà â äÿñíî â êëèïáîðäà"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Êîïèðàé ïúòÿ äî äîêóìåíòà â äâåòå ñòðàíè â êëèïáîðäà"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr ""
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr ""
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Íåïîçíàò àðõèâåí ôîðìàò"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Äîáàâè îáåêòèòå îò ëÿâàòà ñòðàíà â àðõèâ"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Äîáàâè îáåêòèòå îò äÿñíàòà ñòðàíà â àðõèâ"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Äîáàâè îáåêòèòå îò äâåòå ñòðàíè â àðõèâ"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Äîáàâè äðóãè îáåêòè â àðõèâ (îò äâåòå ñòðàíè)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Ïðåìåñòè èçáðàíèÿ ôàéë îò ëÿâî â äàäåíà ïàïêà"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Ïðåìåñòè èçáðàíèÿ ôàéë îò äÿñíî â äàäåíà ïàïêà"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Èìå"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Ðåçóëòàòè ïðè ñðàâíÿâàíå"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Ëÿâà äàòà"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Äÿñíà äàòà"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Ðàçøèðåíèå"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Ðàçìåð íà ëÿâàòà ÷àñò"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Ðàçìåð íà äÿñíàòà ÷àñò"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Ðàçìåð îò äÿñíî (Êðàòúê)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Ðàçìåð îò ëÿâî (Êðàòúê)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Âðåìå çà íàïðàâà íà ëÿâàòà ÷àñò"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Âðåìå çà íàïðàâà íà äÿñíàòà ÷àñò"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Íîâè ôàéëîâå"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Âåðñèÿ íà ëåâèÿ ôàéë"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Âåðñèÿ íà äåñíèÿ ôàéë"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Áúðçè ðåçóëòàòè"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Àòðèáóòè îò ëÿâî"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Àòðèáóòè îò äÿñíî"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "Ëÿâ EOL"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "Äåñåí EOL"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Ëÿâà êîäèðîâêà"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Äÿñíà êîäèðîâêà"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Èãíîðèðàíè ðàçëèêè"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Äâîè÷åí"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Íå ìîæå äà ñå ñðàâíÿò ôàéëîâåòå"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Ïðåêúñíàò ôàéë"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Ïðîïóñíàò ôàéë"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Ïðîïóñíàòà äèðåêòîðèÿ"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Îò ëÿâî ñàìî: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Îò äÿñíî ñàìî: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Áèíàðíèòå ôàéëîâå ñà åäíàêâè"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Áèíàðíèòå ôàéëîâå ñà ðàçëè÷íè"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Ðàçëè÷íè ôàéëîâå"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr ""
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Ñàìî ëåâèÿò"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Ñàìî äåñíèÿò"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Ãðåøêà"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr ""
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr ""
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Îñòàâàùî âðåìå: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 èçáðàí îáåêò"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 èçáðàíè îáåêòà"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Èìå íà ïàïêàòà èëè ôàéëà."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Èìå íà ïîäïàïêàòà, êîãàòî ñà âêëþ÷åíè ïîäïàïêèòå."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Ðåçóëòàò íà ñðàâíåíèåòî, äúëãà ôîðìà."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Äàòà íà ïðîìÿíà íà ëÿâàòà ñòðàíà."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Äàòà íà ïðîìÿíà íà äÿñíàòà ñòðàíà."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Ðàçøèðåíèå íà ôàéëà."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Ðàçìåð íà ëåâèÿ ôàéë â áàéòà."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Ðàçìåð íà äåñíèÿ ôàéë â áàéòà."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Ñúêðàòåí ðàçìåð íà ôàéëà â ëÿâî."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Ñúêðàòåí ðàçìåð íà ôàéëà â äÿñíî."
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Äàòà íà ñúçäàâàíå íà ëÿâàòà ñòðàíà."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Äàòà íà ñúçäàâàíå íà äÿñíàòà ñòðàíà."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Ïîêàçâà êîÿ ñòðàíà èìà ïî-íîâà äàòà íà ïðîìÿíà."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Âåðñèÿ íà ôàéëà îò ëÿâî, ñàìî çà ôàéëîâå îò åäíàêúâ òèï."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Âåðñèÿ íà ôàéëà îò äÿñíî, ñàìî çà ôàéëîâå îò åäíàêúâ òèï."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Êðàòêè ðåçóëòàòè íà ñðàâíÿâàíå."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Àòðèáóòè íà ëÿâàòà ñòðàíà."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Àòðèáóòè íà äÿñíàòà ñòðàíà."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "EOL òèï íà ëåâèÿ ôàéë"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "EOL òèï íà äåñíèÿ ôàéë"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Êîäèðîâêà íà ëÿâàòà ñòðàíà."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Êîäèðîâêà íà äÿñíàòà ñòðàíà."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Áðîé íà èãíîðèðàíèòå ðàçëèêè âúâ ôàéë. Òåçè ðàçëèêè ñà èãíîðèðàíè îò WinMerge è íå ìîãàò äà áúäàò ñìåñåíè."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Áðîé íà ðàçëè÷èÿòà âúâ ôàéë. Òîçè áðîé íå âêëþ÷âà èãíîðèðàíèòå ðàçëèêè."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Ïîêàæè çâåçäè÷êà (*), àêî ôàéëúò å äâîè÷åí."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Ñðàâíÿâàíå íà %1 ñ %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Ñïèñúê, ðàçäåëåí ñúñ çàïåòàÿ"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Ñïèñúê, ðàçäåëåí ñ òàáóëàöèÿ"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "×èñò HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "×èñò XML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Ôàéëúò ñ îò÷åòà âå÷å ñúùåñòâóâà. Èñêàòå ëè äà çàìåíèòå ñúùåñòâóâàùèÿ ôàéë?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5065,32 +5045,32 @@ msgstr ""
 "Ãðåøêà ïðè ñúçäàâàíå íà îò÷åòà:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Îò÷åòúò áåøå ñúçäàäåí óñïåøíî."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Åäíàêâè ôàéëîâå ñà îòâîðåíè â äâàòà ïàíåëà."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Èçáðàíèòå ôàéëîâå ñà åäíàêâè."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Ïîëó÷è ñå ãðåøêà ïðè ñðàâíÿâàíå íà ôàéëîâåòå."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Íå ìîæå äà ñå ñúçäàäàò âðåìåííè ôàéëîâå. Ïðîâåðåòå íàñòðîéêèòå çà âðåìåííè ôàéëîâå."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5105,32 +5085,32 @@ msgstr ""
 "\n"
 "Áåëåæêà: Àêî èñêàòå äà ñ÷èòàòå âñè÷êè âúðíàòè òèïîâå êàòî åäíàêâè, çàäàéòå îïöèÿòà 'Èãíîðèðàé ðàçëè÷íèòå âúðíàòè òèïîâå..' â ðàçäåëà Ñðàâíÿâàíå îò ïðîçîðåöà ñ íàñòðîéêèòå (íàìèðà ñå îò Ðåäàêòèðàíå/Íàñòðîéêè)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, 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 "Ñèìâîëèòå EOL ñà îò ðàçëè÷åí òèï (Windows/Unix/Mac) âúâ ôàéëà '%1'.\n Ñ òåêóùèòå íàñòðîéêè òå ùå áúäàò óåäíàêâåíè ñ îñíîâíèÿò òèï.\n Èñêàòå ëè äà ïðîìåíèòå íàñòðîéêèòå, çà äà ñå ïðåäïàçèòå îò ðàçëè÷íè EOL ?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Âúçíèêíà ãðåøêà äîêàòî ñå ïðîâåðÿâàøå çà ïðåäâàðèòåëíè ãðåøêè ôàéëúò '%1' ñ äîáàâêàòà '%2'. Ïðåäâàðèòåëíîòî ïðîâåðÿâàíå çà ãðåøêè íå ñå ïðèëàãà âå÷å."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "Èçáðàíàòà ïàïêà å íåâàëèäíà."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Íå ìîæå äà ñå îòâîðè äâîè÷åí ôàéë ñ ðåäàêòîð."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, 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 "Ïàïêàòà ñúùåñòâóâà ñàìî â äðóãàòà ñòðàíà è íå ìîæå äà ñå îòâîðè.\n\nÈñêàò ëè äà ñúçäàäåòå ñúîòâåòñòâàùè ïàïêè:\n%1\nâ äðóãàòà ñòðàíà è äà ãè îòâîðèòå?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5141,148 +5121,148 @@ msgstr ""
 "Ïîêàçâàíåòî íà âñåêè ôàéë ñ íåãîâàòà êîäèðîâêà ùå äàäå ïî-äîáðà âèäèìîñò, íî ñðàâíÿâàíåòî èëè êîïèðàíåòî ùå å îïàñíî.\n"
 "Èñêàòå ëè ôàéëîâåòå äà ñå îáðàáîòâàò, èçïîëçâàéêè çàäàäåíàòà êîäèðîâêà íà Windows (ïðåïîðú÷èòåëíî)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Âíèìàíèå: Ôàéëîâåòå èçïîëçâàò ðàçëè÷íà êîäèðîâêà, ëÿâ=%s è äåñåí=%s, ñðàâíåíèåòî ìîæå äà äîâåäå äî çàãóáà íà èíôîðìàöèÿ."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Çàãóáà íà èíôîðìàöèÿ, ïîðàäè ãðåøêà â êîäèðîâêàòà íà: äâàòà ôàéëà"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Áåç ðàçëèêè"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Ðàçëèêè â ðåäîâåòå"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Çàìåíåíè %1 íèç(à)."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Íå ìîæå äà ñå íàìåðè íèçà \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Êîïèðàé ïúëíèÿ ïúò"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Êîïèðàé èìåòî íà ôàéëà"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Ìåñòîïîëîæåíèå"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Ðàçëèêè"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Ïà÷úò å ãîòîâ."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. îáåêòà íå å íàìåðåí èëè å äèðåêòîðèÿ!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. îáåêòà íå å íàìåðåí èëè å äèðåêòîðèÿ!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Ïà÷à âå÷å ñúùåñòâóâà. Ùå ãî ïðåçàïèøåòå ëè?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 èçáðàíè ôàéëîâå]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Íîðìàëåí"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Êîíòåêñò"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Óíèôèöèðàí"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr ""
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Íå ìîæå äà ñå çàïèøå âúðõó %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Çàäàäåíèÿò ïúò íå å ïúëåí ïúò: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Çàäàéòå èçõîäåí ôàéë"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Íå ìîæå äà ñå ñúçäàäå ïà÷ îò äâîè÷íè ôàéëîâå."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Íå ìîæå äà ñå ñúçäàäå ïà÷ îò äèðåêòîðèè."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5293,17 +5273,17 @@ msgstr ""
 "\n"
 "Ñúçäàâàíåòî íà ïà÷ èçèñêâà äà íÿìà íåçàïèñàíè ïðîìåíè âúâ ôàéëîâåòå."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Ïàïêàòà íå ñúùåñòâóâà."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Ðåçóëòàòèòå îò òåêóùîòî ñðàâíÿâàíå íà äèðåêòîðèèòå ùå áúäàò èç÷èñòåíè."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5314,7 +5294,7 @@ msgstr ""
 "Íå ñà íàìåðåíè íåîáõîäèìèòå êîìïîíåíòè (7-zip è/èëè Merge7z*.dll) çà ïîääðúæêàòà íà àðõèâè.\n"
 "Ïîãëåäíåòå ðúêîâîäñòâîòî çà ïîâå÷å èíôîðìàöèÿ îòíîñíî ïîääðúæêàòà íà àðõèâè è êàê äà ÿ âêëþ÷èòå."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5323,7 +5303,7 @@ msgstr ""
 "\n"
 "Áåëåæêà: Èíòåãðèðàíåòî íà 7-Zip å çàáðàíåíî â íàñòðîéêèòå íà WinMerge."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5332,37 +5312,37 @@ msgstr ""
 "\n"
 "Áåëåæêà: Èíòåãðèðàíåòî íà 7-Zip å îãðàíè÷åíî äî ñîáñòâåíè äåéñòâèÿ â íàñòðîéêèòå íà WinMerge."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Èçáåðåòå ôàéë çà åêñïîðò"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Èçáåðåòå ôàéë çà èìïîðò"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Íàñòðîéêèòå ñà èìïîðòèðàíè îò ôàéë."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Íàñòðîéêèòå ñà åêñïîðòèðàíè âúâ ôàéë."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Íå ìîæå äà ñå èìïîðòèðàò íàñòðîéêèòå îò ôàéë."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Íå ìîæå äà ñå åêñïîðòèðàò íàñòðîéêèòå âúâ ôàéë."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5373,242 +5353,242 @@ msgstr ""
 "\n"
 "Èñêàòå ëè äà ïðîäúëæèòå?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Ðåäîâíà èçðàçíà ãðåøêà"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Íÿìà ñúâïàäåíèÿ"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Íåâàëèäåí èçðàç"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Íåâàëèäåí ñèìâîë çà ïðîâåðêà"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Íåâàëèäåí ñèìâîë â èìåòî íà êëàñà"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Ïðîñëåäÿâàíå íà îáðàòíî íàêëîíåíà ÷åðòà"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Íåâàëèäåí ñèìâîë çà âðúùàíå"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Íåñðàâíèì [ èëè [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Íåñðàâíèì ( èëè \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Íåñðàâíèì \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Íåâàëèäíî ñúäúðæàíèå íà \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Íåâàëèäåí êðàé íà äèàïàçîíà"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Íåäîñòàòú÷íà ïàìåò"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Íåâàëèäåí èçðàç ïðåäè ïðàâèëíèÿ"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Ïðåæäåâðåìåíåí êðàé íà ïðàâèëíèÿ èçðàç"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Ïðàâèëíèÿò èçðàç å òâúðäå ãîëÿì"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Íåñðàâíèì ) èëè \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr ""
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr ""
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr ""
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Ñìåñåí"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr ""
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr ""
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr ""
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " á"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " Êá"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " Ìá"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " Ãá"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " Òá"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " Ïá"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr ""
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr ""
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr ""
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr ""
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Çàïàçâàíå íà ëåâèÿ ôàéë"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Çàïàçâàíå íà äåñíèÿ ôàéë"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Çàïàçâàíå íà ëåâèÿ ôàéë êàòî..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Çàïàçâàíå íà äåñíèÿ ôàéë êàòî..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Êîíâåðòèðàé EOL êúì Windows ðåæèì"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Êîíâåðòèðàé EOL êúì Unix ðåæèì"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Êîíâåðòèðàé EOL êúì Mac ðåæèì"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Ïðåâêëþ÷è ìåæäó ðåæèìèòå íà ðåäàêòèðàíå è ñðàâíåíèå"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5617,12 +5597,12 @@ msgstr ""
 "Âèæ è çàäàé íàñòðîéêèòå íà êîäèðîâêàòà íà ôàéëà\n"
 "Íàñòðîéêè íà êîäèðîâêàòà íà ôàéëà"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "Îòâîðè è ïîïðàâè êîíôëèêòåí ôàéë"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5631,7 +5611,7 @@ msgstr ""
 "Èçáåðåòå ðàçëè÷íèòå íåùà â òåêóùèÿ ðåä\n"
 "Ðàçëè÷èÿ â òåêóùèÿ ðåä"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5640,7 +5620,7 @@ msgstr ""
 "Îòèäè íà ðåä èëè ðàçëèêà\n"
 "Îòèäè íà (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5649,7 +5629,7 @@ msgstr ""
 "Ïðîìÿíà íà ïðîãðàìíèòå íàñòðîéêè\n"
 "Íàñòðîéêè"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5658,37 +5638,37 @@ msgstr ""
 "Îáíîâè ïîêàçàíîòî\n"
 "Îáíîâè (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Êîïèðàíå íà èçáðàíèòå ðåäîâå â êëèïáîðäà, äîáàâÿéêè íîìåðà íà ðåäîâåòå â íà÷àëîòî"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Ïðèêðåïè îòìåòêà"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Îòèäè íà ñëåäâàùàòà îòìåòêà"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Îòèäè íà ïðåäèøíàòà îòìåòêà"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Èç÷èñòè âñè÷êè îòìåòêè"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5697,7 +5677,7 @@ msgstr ""
 "Ïîêàæè åëåìåíòèòå, êîèòî ñà àáñîëþòíî åäíàêâè\n"
 "Ïîêàæè åäíàêâèòå îáåêòè"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5706,7 +5686,7 @@ msgstr ""
 "Ïîêàæè åëåìåíòèòå, êîèòî èìàò ðàçëèêè\n"
 "Ïîêàæè ðàçëè÷íèòå îáåêòè"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5715,7 +5695,7 @@ msgstr ""
 "Ïîêàæè åëåìåíòèòå, êîèòî ñúùåñòâóâàò ñàìî â ëÿâàòà ñòðàíà\n"
 "Ïîêàæè óíèêàëíèòå îáåêòè â ëÿâî"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5724,7 +5704,7 @@ msgstr ""
 "Ïîêàæè åëåìåíòèòå, êîèòî ñúùåñòâóâàò ñàìî â äÿñíàòà ñòðàíà\n"
 "Ïîêàæè óíèêàëíèòå îáåêòè â äÿñíî"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5733,7 +5713,7 @@ msgstr ""
 "Ïîêàçâà äâîè÷íè ôàéëîâå\n"
 "Ïîêàæè äâîè÷íè ôàéëîâå"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5742,7 +5722,7 @@ msgstr ""
 "Ïîêàçâà ïðåñêî÷åíèòå åëåìåíòè\n"
 "Ïîêàæè ïðåñêî÷åíèòå åëåìåíòè"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5751,7 +5731,7 @@ msgstr ""
 "Èçáèðàíå íà øðèôò çà èçãëåäà\n"
 "Èçáåðåòå øðèôò çà èçãëåäà"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5760,42 +5740,42 @@ msgstr ""
 "Çàäàâàíå çà èçïîëçâàíå íà ñèñòåìíèÿ øðèôò\n"
 "Ñèñòåìåí øðèôò"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Ïîêàæè ïðàçíèòå ìåñòà"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Âêëþ÷âà/Èçêëþ÷âà ñïèñúêà ñ ðàçëè÷èÿ"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Ïðîçîðåöà ñ ïîëîæåíèåòî ïîêàçâà öÿëîñòíà êàðòèíà îò ôàéëà"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Ïîêàçâà ñòàòèñòèêàòà çà ñðàâíåíèå íà ïàïêèòå"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid "Select the current user interface language\nLanguage"
 msgstr "Èçáîð íà òåêóù ïîòðåáèòåëñêè èíòåðôåéñ\nÅçèê"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid "Shows differences inside lines with different colors\nShow Line Difference"
 msgstr "Ïîêàçâà ðàçëèêèòå â ðåäîâåòå ñ ðàçëè÷íè öâåòîâå\nÏîêàæè ðàçëè÷èÿòà â ðåäà"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Ñìåíè ïîçèöèèòå íà äâàòà ïàíåëà"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5804,7 +5784,7 @@ msgstr ""
 "Ïîêàæè íîìåðà íà ðåäîâåòå\n"
 "Ïîêàæè íîìåðà íà ðåäîâåòå"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5813,7 +5793,7 @@ msgstr ""
 "Ïîçâîëè ïðåíàñÿíå íà äóìè\n"
 "Ïðåíàñÿé ðåäîâåòå"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5822,107 +5802,107 @@ msgstr ""
 "Ïîêàçâà èçáðàíèòå ïîëåòà â äâàòà ïàíåëà\n"
 "Ïîêàæè èçáðàíèòå ïîëåòà"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Óâåëè÷è ðàçìåðà íà òåêñòà"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Íàìàëè ðàçìåðà íà òåêñòà"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Âúçñòàíîâè ðàçìåðà íà òåêñòà äî íîðìàëíèÿ"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
 msgstr "Ïðåìåñòè äî ïðåäèøíàòà ðàçëèêà\nÏðåäèøíà ðàçëèêà (Alt+Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
 msgstr "Ïðåìåñòè äî ñëåäâàùàòà ðàçëèêà\nÑëåäâàùà ðàçëèêà (Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
 msgstr "Ïðåìåñòè äî ïúðâàòà ðàçëèêà\nÏúðâà ðàçëèêà (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
 msgstr "Ïðåìåñòè äî òåêóùàòà ðàçëèêà\nÒåêóùà ðàçëèêà (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid "Scroll to the last difference\nLast Difference (Alt+End)"
 msgstr "Ïðåìåñòè äî ïîñëåäíàòà ðàçëèêà\nÏîñëåäíà ðàçëèêà (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -5931,7 +5911,7 @@ msgstr ""
 "Êîïèðàíå íà èçáðàíèÿ òåêñò â äåñíèÿ ôàéë\n"
 "Êîïèðàíå â äÿñíî (Alt+Right)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -5940,7 +5920,7 @@ msgstr ""
 "Êîïèðàíå íà èçáðàíèÿ òåêñò â ëåâèÿ ôàéë\n"
 "Êîïèðàíå â ëÿâî (Alt+Left)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -5949,7 +5929,7 @@ msgstr ""
 "Êîïèðàíå íà ðàçëèêàòà â äåñíèÿ ôàéë è ïðèäâèæâàíå  êúì ñëåäâàùàòà\n"
 "Êîïèðàíå â äÿñíî è ïðèäâèæâàíå  (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -5958,7 +5938,7 @@ msgstr ""
 "Êîïèðàíå íà ðàçëèêàòà â ëåâèÿ ôàéë è ïðèäâèæâàíå  êúì ñëåäâàùàòà\n"
 "Êîïèðàíå â ëÿâî è ïðèäâèæâàíå  (Ctrl+Alt+Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -5967,7 +5947,7 @@ msgstr ""
 "Êîïèðàíå íà âñè÷êè ðàçëèêè â äåñíèÿ ôàéë\n"
 "Âñè÷êî â äÿñíî"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -5976,382 +5956,382 @@ msgstr ""
 "Êîïèðàíå íà âñè÷êè ðàçëèêè â ëåâèÿ ôàéë\n"
 "Âñè÷êî â ëÿâî"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Èçòðèé èçáðàíèòå îáåêòè îò äâåòå ïàïêè"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Ñðàâíè èçáðàíèòå îáåêòè (ñðàâíè ïúðâèÿ åëåìåíò îò íÿêîëêî èçáðàíè òàêèâà)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Èçáåðè è ïîäðåäè êîëîíèòå çà ñðàâíÿâàíå íà äèðåêòîðèè"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Ñúçäàé ïà÷-ôàéë"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Èçáåðè è ïðîìåíè ôèëòðè"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Ãåíåðèðàíå íà îò÷åò îò ðåçóëòàòèòå çà ñðàâíåíèå"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr ""
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "Ïîòðåáèòåëÿ èçáèðà ðàçàðõèâàòîð (íÿìà ðàçàðõèâèðàíå ïðè ñðàâíÿâàíå íà ïàïêè)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Çàäàäåíèÿ ðàçàðõèâàòîð ùå ñå ïðèëîæè è çà äâàòà ôàéëà (íåîáõîäèìî å ðàçøèðåíèå ñàìî íà åäèíèÿ ôàéë)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Èçáèðàíå íà ðàçàðõèâàòîð çà ðåäàêòèðàíå íà òîçè ôàéë"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Íÿìà ïðåäâàðèòåëíè ðàçëè÷èÿ (íîðìàëåí)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Ïðåäëîæåíà äîáàâêà"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Äðóãè äîáàâêè"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Çàòâàðÿ âñè÷êè äîáàâêè è ãè çàðåæäà îòíîâî (çà ðàçðàáîò÷èöè)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid "Activates next visible file\nActivate next File"
 msgstr "Àêòèâèðà ñëåäâàùèÿò âèäèì ôàéë\nÀêòèâèðàé ñëåäâàù ôàéë"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Çàòâàðÿ âñè÷êè îòâîðåíè ïðîçîðöè"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid "Opens the WinMerge Help\nWinMerge Help"
 msgstr "Îòâàðÿ ïîìîùòà íà WinMerge\nWinMerge ïîìîù"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Ïîêàçâàíå íà òåêóùèòå íàñòðîéêè íà WinMerge è èíôîðìàöèÿ çà âåðñèÿòà â òåêñòîâ ôàéë"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "Ïîêàçâà GNU Îáù ïóáëè÷åí ëèöåíç"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Âúòðåøåí áèëä: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid "Opens the release notes document\nRelease Notes"
 msgstr "Îòâàðÿ äîêóìåíòà ñ áåëåæêè çà ïðîãðàìàòà\nÁåëåæêè"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid "Opens the translations website\nTranslations"
 msgstr "Îòâàðÿ ñòðàíèöàòà ñ ïðåâîäè\nÏðåâîäè"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Íàñòðîéêè íà äîáàâêèòå"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Íÿìà ïðåäâàðèòåëíè ðàçëè÷èÿ"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Ïðåäâàðèòåëíè ðàçëèêè, àêî å âúçìîæíî"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH íå å íàìåðåí - .sct ñêðèïòîâåòå ñà çàáðàíåíè"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Íÿìà>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Àâòîìàòè÷íî>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Îòâîðè ôàéëúò ñ ðåãèñòðèðàíîòî ïðèëîæåíèå"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Îòâîðè ôàéëúò ñ âúíøåí ðåäàêòîð"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Îòâîðè ôàéëúò ñ ëè÷íà ïðîãðàìà"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Íå ïîêàçâàé ïðåìåñòåíèòå áëîêîâå"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Ïîêàæè âñè÷êè ïðåìåñòåíè áëîêîâå"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Ïîêàæè ïðåìåñòåíèòå áëîêîâå ñàìî îò òåêóùàòà ðàçëèêà"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Îòèäè íà ðàçëèêàòà ïîä êóðñîðà"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "Îòèäè íà ðàçëèêà %1 îò %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "Îòèäè íà ðåä %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Çàáðàíåí"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Îò ôàéëîâàòà ñèñòåìà"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Îò MRU ñïèñúê"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr ""
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr ""
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Îñíîâåí"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr ""
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr ""
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr ""
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr ""
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr ""
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr ""
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr ""
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr ""
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr ""
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr ""
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr ""
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr ""
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr ""
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr ""
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr ""
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr ""
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr ""
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr ""
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr ""
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Ðåñóðñè"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr ""
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr ""
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr ""
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr ""
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr ""
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr ""
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr ""
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr ""
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr ""
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Ñêðèé ëåíòàòà ñ èíñòðóìåíòè"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Ïîêàæè ìàëêà ëåíòà ñ èíñòðóìåíòè"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Ïîêàæè ãîëÿìà ëåíòà ñ èíñòðóìåíòè"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index e5e10bf..5a7d4d8 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -1029,7 +1029,7 @@ msgid "&Scripts"
 msgstr "&Seqüències d'ordres"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Buit >"
@@ -1470,7 +1470,7 @@ msgid "&Versioning System:"
 msgstr "Sistema de control de &versions"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Camí al cleartool.exe:"
@@ -1671,7 +1671,7 @@ msgid "Replace &All"
 msgstr "Su&bstitueix-ho tot"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr ""
@@ -2580,7 +2580,7 @@ msgid "Files:"
 msgstr "Fitxers:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Diferents"
@@ -2617,7 +2617,7 @@ msgid "Right:"
 msgstr "Dreta:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Idèntics"
@@ -2817,7 +2817,7 @@ msgid "A&ppend timestamp"
 msgstr "A&fegeix una marca horària"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Confirmació de còpia"
@@ -2895,7 +2895,7 @@ msgstr ""
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Directori"
@@ -3499,7 +3499,7 @@ msgid "Version Control"
 msgstr "Control de versions"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Diferències"
@@ -3628,87 +3628,67 @@ msgstr "Fitxers XML (*.xml)|*.xml|All Files (*.*)|*.*||"
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr ""
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr ""
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr ""
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr ""
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Tot el contingut"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Contingut en un cop d'ull"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Data de modificació"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Data de modificació i mida"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Mida"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Nom"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Ubicació"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filtres"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr ""
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Descripció"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Selecciona un nom de fitxer per al nou filtre"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Filtres de fitxer (*.flt)|*.flt|Tots els fitxers (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3721,7 +3701,7 @@ msgstr ""
 "Copieu el fitxer %1 a la carpeta WinMerge/Filters:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3734,7 +3714,7 @@ msgstr ""
 "\n"
 "Verifiqueu que la carpeta existeix i s'hi pot escriure."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3745,7 +3725,7 @@ msgstr ""
 "\n"
 "Seleccioneu la carpeta de filtres a opcions/sistema."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3758,12 +3738,12 @@ msgstr ""
 "\n"
 "Potser el fitxer és només de lectura?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Localitza el fitxer de filtre a instal·lar"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3774,258 +3754,258 @@ msgstr ""
 "\n"
 "No s'ha pogut copiar el nou fitxer de filtre a la carpeta de filtres."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "El fitxer de filtre ja existeix. Voleu sobreescriure el filtre existent?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Expressió regular"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
 msgstr ""
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr ""
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Resultats de la comparació dels directoris"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Comparació de fitxers"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Fitxer esquerre sense títol"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Fitxer dret sense títol"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr ""
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr ""
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "S'estan examinant els fitxers..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "S'està obrint la selecció"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "S'està copiant de l'esquerra a la dreta"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "S'està copiant de la dreta a l'esquerra"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "S'està copiant tot a l'esquerra"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "S'està copiant tot a la dreta"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "S'estan copiant els fitxers..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "S'estan suprimint els fitxers..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "S'estan movent els fitxers..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Creant l'informe..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr ""
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr ""
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Línia: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Combina"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Diferència %1 de %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "S'han trobat %1 diferènces"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "S'ha trobat una diferència"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr ""
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Element %1 de %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Elements: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Selecciona dos directoris o fitxers existents per a comparar"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Selecció de directori"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Selecciona dos directoris o dos fitxers per a comparar."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "El camí de l'esquerra és invalid!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "El camí de la dreta és invalid!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Ambdós camins són invalids!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Tria dos fitxers per a habilitar la selecció del desempaquetador."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "No es pot comparar un fitxer i un directori!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "El fitxer no s'ha trobat: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "El fitxer no s'ha desempaquetat: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4038,42 +4018,42 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr ""
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid "The file\n%1\nis not a conflict file."
 msgstr ""
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Anomena i desa"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Voleu desar els canvis a %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "El fitxer %1 està marcat com a només de lectua. Voldríeu substituir el fitxer només de lectura? (No es tracta de desar amb un nom nou.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Hi ha hagut un error en comprovar si la destinació era modificable"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Hi ha hagut un error en crear una còpia de seguretat del fitxer"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4086,7 +4066,7 @@ msgstr ""
 "\n"
 "Voleu continuar tot i així?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4103,7 +4083,7 @@ msgstr ""
 "\t-desar-lo amb un nom diferent (premeu D'acord)\n"
 "\t-avortar l'operació actual (Premeu Cancel·lar)?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4118,7 +4098,7 @@ msgstr ""
 "\n"
 "Voleu desar la versió desempaquetada en un altre fitxer?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4133,7 +4113,7 @@ msgstr ""
 "\n"
 "Voleu desar la versió desempaquetada en un altre fitxer?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4148,7 +4128,7 @@ msgstr ""
 "\n"
 "Voleu sobreescriure el fitxer?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4157,32 +4137,32 @@ msgstr ""
 "%1\n"
 "està marcat com a només de lectura. Voleu substituir l'element només de lectura?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
 msgstr ""
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Anomena i desa el fitxer de l'esquerra"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Anomena i desa el fitxer de la dreta"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
 msgstr ""
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4193,42 +4173,42 @@ msgstr ""
 "\n"
 "Cal que refresqueu els documents abans de continuar."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Cal que especifiqueu el camí a un projecte del SourceSafe per tal de continuar (p.ex.:  $/ElMeuProjecte)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Extreu (check-out) fitxers del VSS..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "El sistema de control de versions ha retornat un error en extreure (check-out) el fitxer. No es pot continuar..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "S'ha produït un error en executar una ordre del sistema de control de versions."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "La carpeta de treball del VSS i la ubicació del fitxer actual no concorden. Voleu continuar?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "No s'han trobat cap base de dades del VSS!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Error del VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4239,7 +4219,7 @@ msgstr ""
 "Reviseu les especificacions de configuració de la vista emprada.\n"
 "Voleu desfer la operació d'extracció (check-out)?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4248,169 +4228,169 @@ msgstr ""
 "El sistema de control de versions ha retornat un error en intentar desfer l'extracció (check-out) del fitxer.\n"
 "Reviseu les especificacions de configuració de la vista emprada."
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Cap"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (anterior al 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 i posterior)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Separa a l'espai"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Separa a l'espai o puntuació"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Copia l'element seleccionat al directori indicat"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Copia l'element seleccionat en un directori a triar"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Suprimeix els elements seleccionats a l'esquerra"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Suprimeix els elements seleccionats a la dreta"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Suprimeix els element(s) seleccionat(s) a ambdues bandes"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Amaga el(s) element(s) seleccionat(s) (filtratge al vol)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Canvia el nom de l'element seleccionat a ambdós costats"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Dreta a esquerra (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Esquerra a dreta (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Dreta a esquerra (%1 de %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Esquerra a dreta (%1 de %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Esquerra a... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Dreta a... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Esquerra a... (%1 de %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Dreta a... (%1 de %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Esquerra (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Dreta (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Ambdós (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Esquerra (%1 de %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Dreta (%1 de %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Ambdós (%1 de %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Selecciona la carpeta de destinació"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Costat esquerre - seleccioneu la carpeta de destinació:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Costat dret - seleccioneu la carpeta de destinació:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 fitxers afectats)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 de %2 fitxers afectats)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4421,17 +4401,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Esteu segur que voleu copiar:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Esteu segur que voleu copiar %d elements:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4450,613 +4430,613 @@ msgstr ""
 "\n"
 "Actualitzeu la comparació."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr ""
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr ""
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr ""
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Obre el fitxer de l'esquerra"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Obre el fitxer de l'esquerra en un editor extern"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Obre el fitxer de l'esquerra amb..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Obre el fitxer de la dreta"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Obre el fitxer de la dreta en un editor extern"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Obre el fitxer de la dreta amb..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "No s'ha pogut executar l'editor extern: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Extensió desconeguda a l'editor extern: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Copia els noms dels fitxers al Porta-retalls"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Copia el camí al fitxer de l'esquerra al Porta-retalls"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Copia el camí al fitxer de la dreta al Porta-retalls"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Copia els camins als fitxers d'ambdós costats al Porta-retalls"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr ""
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr ""
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "El format de l'arxiu és desconegut"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Afegeix els elements del costat esquerre a l'arxiu"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Afegeix els elements del costat dret a l'arxiu"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Afegeix els elements d'ambdós costats a l'arxiu"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Afegeix els elements diferents a l'arxiu (d'ambdós costats)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Mou els fitxers seleccionats de l'esquerra al directori especificat"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Mou els fitxers seleccionats de la dreta al directori especificat"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Nom"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Resultat de la comparació"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Data esquerra"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Data dreta"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Extensió"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Mida esquerra"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Mida dreta"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Mida dreta (breu)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Mida esquerra (breu)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Data de creació esquerra"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Data de creació dreta"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Fitxer més nou"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Versió del fitxer esquerra"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Versió del fitxer dreta"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Resultat breu"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Atributs esquerra"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Atributs dreta"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "Salt de línia esquerra"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "Salt de línia dreta"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Codificació esquerra"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Codificació dreta"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Diferències ignorades"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binari"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "No es pot comparar els fitxers"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Element avortat"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Fitxer omès"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Directori omès"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Només esquerra: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Només dreta: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Els fitxers binaris són idèntics"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Els fitxers binaris són diferents"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Els fitxers són diferents"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr ""
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Només l'esquerre"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Només el dret"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr ""
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr ""
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr ""
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Temps transcorregut: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 element seleccionat"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 elements seleccionats"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Nom del fitxer o directori."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Nom del subdirectori quan s'incloguin els subdirectoris."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Resultat de la comparació, en forma llarga."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Data de modificació del costat esquerre."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Data de modificació del costat dret."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Extensió del fitxer."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Mida en bytes del fitxer esquerre."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Mida en bytes del fitxer dret."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Mida del fitxer esquerre en format abreujat."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Mida del fitxer dret en format abreujat."
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Data de creació del fitxer esquerre."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Data de creació del fitxer dret."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Diu quin costat te una data de modificació més recent."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Versió del fitxer del costat esquerre, només per a alguns tipus de fitxer."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Versió del fitxer del costat dret. només per a alguns tipus de fitxer."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Resultat breu de la comparació."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Atributs del costat esquerre."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Atributs del costat dret."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Tipus de salt de línia del fitxer del costat esquerre"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Tipus de salt de línia del fitxer del costat dret"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Codificació del costat esquerre."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Codificació del costat dret."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Nombre de diferències ignorades al fitxer. Aquestes diferències són ignorades pel WinMerge i no es poden combinar."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Nombre de diferències al fitxer. Aquest nombre no inclou les diferències ignorades.."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Mostra un asterisc (*) si el fitxer és binari."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Compara %1 amb %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Llista delimitada per comes"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Llista delimitada per tabulacions"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "HTML símple"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "XML símple"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "El fitxer d'informe ja existeix. Voleu sobreescriure'l?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5065,32 +5045,32 @@ msgstr ""
 "Hi ha hagut un error creant l'informe:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "L'informe s'ha creat satisfactòriament."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "El mateix fitxer és obert a ambdues subfinestres."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Els fitxers seleccionats són idèntics."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "S'ha produït un error en comparar els fitxers."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "No s'han pogut obrir els fitxers temporals. Comproveu els ajustos de camí temporal."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5105,32 +5085,32 @@ msgstr ""
 "\n"
 "Nota: Si voleu tractar els salts de línia sempre com a equivalents, especifiqueu l'opció 'Ignora diferències de salt de línia...' al quadre d'opcions (disponible des del menú Edita/Opcions...)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, 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:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Hi ha hagut un error prediferenciant el fitxer '%1' amb el connector '%2'. No es tornarà a aplicar la prediferenciació."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "La carpeta seleccionada és invàlida."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "No es poden obrir fitxers binaris a l'editor."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, 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:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5141,148 +5121,148 @@ msgstr ""
 "En mostrar cada fitxer en la seva pròpia pàgina de codis millora la seva visualització però fa perillosa la combinació/còpia.\n"
 "Voleu tractar ambdós fitxers com si fossin en la pàgina de codis predeterminada del Windows (recomanat)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Advertiment: Els fitxers empren codificacions diferents, l'esquerre=%s i el dret=%s, i en combinar-los es podria perdre informació."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "S'ha perdut informació degut a errors de codificació: ambdós fitxers"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Sense diferències"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Diferència de línia"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "S'ha(n) substituït %1 cadena(s)."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "No s'ha trobat la cadena \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Copia el camí sencer del fitxer"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Copia el nom del fixer"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Subfinestra d'ubicació"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Subfinestra de diferències"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "El pedaç s'ha generat satisfactòriament."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. no s'ha trobat l'element o aquest és un directori!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. no s'ha trobat l'element o aquest és un directori!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "El fitxer de pedaç ja existeix. El voleu sobreescriure?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 fitxers seleccionats]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr ""
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr ""
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Unificat"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr ""
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "No s'ha pogut escriure al fitxer  %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "El camí de sortida especificat no és un camí absolut: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Especifiqueu un fitxer de sortida"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "No es pot crear un pedaç de fitxers binaris."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "No es pot crear un pedaç de directoris."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5293,17 +5273,17 @@ msgstr ""
 "\n"
 "Cal que no hi hagi cap fitxer pendent de salvar per tal de crear un pedaç."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "La carpeta no existeix."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "S'esborraran els resulats actuals de la comparació de directoris."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5314,7 +5294,7 @@ msgstr ""
 "Els components necessaris (7-zip i/o Merge7z*.dll) per al suport d'arxivament no s'han pogut trobar.\n"
 "Vegeu el manual per a més informació quan al suport per a arxivament i com habilitar-lo."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5323,7 +5303,7 @@ msgstr ""
 "\n"
 "Nota: La integració del 7-Zip està desabilitada des dels ajustos del WinMerge."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5332,37 +5312,37 @@ msgstr ""
 "\n"
 "Nota: La integració del 7-Zip està restringida com a operació independent des dels ajustos del WinMerge."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Trieu el fitxer per a exportar"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Trieu el fitxer per a importar"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "S'ha importat les opcions des del fitxer."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "S'ha exportat les opcions al fitxer."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "No s'ha pogut importar les opcions del fitxer."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "No s'ha pogut escriure les opcions al fitxer."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5370,242 +5350,242 @@ msgid ""
 "Do you want to continue?"
 msgstr ""
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Hi ha un error a l'expressió regular"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "No s'ha trobat cap coincidència"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "L'expressió regular és invàlida"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "El caràcter de col·lació és invàlid"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "El nom de la classe de caràcter és invàlid"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Hi ha una barra inversa al final"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "La referència vers enrere és invàlida"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Una construcció [ o [^ està desaparellada"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Una construcció ( o \\( està desaparellada"
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Una construcció \\{ està desaparellada"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "El contingut de la construcció \\{\\} és invàlid"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "El final del rang és invàlid"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Sense memòria"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "L'expressió regular precedent és invàlida"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "L'expressió regular acaba prematurament"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "L'expressió regular és massa llarga"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Una construcció ) o \\) està desaparellada"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr ""
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr ""
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr ""
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Barrejat"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr ""
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr ""
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr ""
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr ""
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr ""
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr ""
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr ""
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr ""
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr ""
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr ""
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr ""
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr ""
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr ""
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Desa el fitxer de l'esquerra"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Desa el fitxer de la dreta"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Desa i anomena el fitxer de l'esquerra..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Desa i anomena el fitxer de la dreta..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr ""
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr ""
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr ""
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Commuta entre els modes d'edició i el de combinació"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5614,12 +5594,12 @@ msgstr ""
 "Mostra i ajusta les propietats de codificació de fixter\n"
 "Propietats de codificació de fitxer"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr ""
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5628,7 +5608,7 @@ msgstr ""
 "Selecciona l'àrea de diferència a la línia actual\n"
 "Diferència a la línia actual (F4)"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5637,7 +5617,7 @@ msgstr ""
 "Va fins a una línia o una diferència\n"
 "Vés a (Control+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5646,7 +5626,7 @@ msgstr ""
 "Especifica opcions del programa\n"
 "Opcions"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5655,37 +5635,37 @@ msgstr ""
 "Actualitza la visualització\n"
 "Actualitza (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Copia les línies seleccionades al Porta-retalls afegint-hi els números de línia al inici de línia"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Activa/desactiva el punt d'interès"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Va al següent punt d'interès"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Va al punt d'interès anterior"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Esborra tots els punts d'interès"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5694,7 +5674,7 @@ msgstr ""
 "Visualitza els elements que singuin exactament iguals\n"
 "Mostra elements idèntics"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5703,7 +5683,7 @@ msgstr ""
 "Visualitza els elements que tinguin diferències\n"
 "Mostra elements diferents"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5712,7 +5692,7 @@ msgstr ""
 "Visualitza els elements existents únicament a l'esquerra\n"
 "Mostra elements únics de l'esquerra"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5721,7 +5701,7 @@ msgstr ""
 "Visualitza els elements existents únicament a la dreta\n"
 "Mostra elements únics de la dreta"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5730,7 +5710,7 @@ msgstr ""
 "Visualitza els elements binaris\n"
 "Mostra elements binaris"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5739,7 +5719,7 @@ msgstr ""
 "Visualitza els elements omesos\n"
 "Mostra elements omesos"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5748,7 +5728,7 @@ msgstr ""
 "Selecciona el tipus de lletra per a les visualitzacions de diferències\n"
 "Selecciona tipus de lletra per a diferències"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5757,42 +5737,42 @@ msgstr ""
 "Recupera el tipus de lletra del sistema per a la visualització de diferències\n"
 "Tipus de lletra del sistema"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Mostra els caràcters d'espais"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Mostra la subfinestra de diferències"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Mostra la subfinestra d'ubicació amb una image general dels fitxers"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Mostra el quadre de diàleg d'estadístiques de comparació de carpeta"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid "Select the current user interface language\nLanguage"
 msgstr ""
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid "Shows differences inside lines with different colors\nShow Line Difference"
 msgstr ""
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Intercanvia la posició d'ambdues subfinestres"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5801,7 +5781,7 @@ msgstr ""
 "Mostra els números de línia\n"
 "Mostra els números de línia"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5810,7 +5790,7 @@ msgstr ""
 "Permet l'ajustament de paraules\n"
 "Ajusta les línies"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5819,107 +5799,107 @@ msgstr ""
 "Mostra els marges de selecció per a ambdós subfinestres\n"
 "Mostra els marges de selecció"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr ""
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr ""
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr ""
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
 msgstr ""
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
 msgstr ""
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
 msgstr ""
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
 msgstr ""
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid "Scroll to the last difference\nLast Difference (Alt+End)"
 msgstr ""
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -5928,7 +5908,7 @@ msgstr ""
 "Copia el text seleccionat al fitxer de la dreta\n"
 "Copia al fitxer de la dreta (Alt+Dreta)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -5937,7 +5917,7 @@ msgstr ""
 "Copia el text seleccionat al fitxer de l'esquerra\n"
 "Copia al fitxer de l'esquerra (Alt+Esquerra)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -5946,7 +5926,7 @@ msgstr ""
 "Copia la diferència a la dreta i avança a al següent\n"
 "Copia a la dreta i avança (Control+Alt+Dreta)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -5955,7 +5935,7 @@ msgstr ""
 "Copia la diferència a l'esquerra i avança a la següent\n"
 "Copia a l'esquerra i avança (Control+Alt+Esquerra)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -5964,7 +5944,7 @@ msgstr ""
 "Copia totes les diferènces al fitxer de la dreta\n"
 "Tot a la dreta"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -5973,382 +5953,382 @@ msgstr ""
 "Copia totes les diferènces al fitxer de l'esquerra\n"
 "Tot a l'esquerra"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Suprimeix els elements seleccionats d'ambdós directoris"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Compara l'element seleccionat (compara el primer element en cas de selecció múltiple)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Tria i reordena les columnes de comparació de directoris"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Genera un fitxer de pedaços"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Tria i modifica els filtres"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Genera un informe a partir dels resultats de comparació"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr ""
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "L'usuari tria el desempaquetador (no hi ha desempaquetament en comparar directoris)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "El desempaquetador adaptat s'aplica a ambdós fitxers (només hi cal l'extensió en un fitxer)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Tria un desempaquetador per a editar aquest fitxer"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "No prediferencia (normal)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Connectors suggerits"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Altres connectors"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Descarrega el connectoris i els torna a carregar (per a desenvolupadors)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid "Activates next visible file\nActivate next File"
 msgstr ""
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Tanca totes les finestres obertes"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid "Opens the WinMerge Help\nWinMerge Help"
 msgstr ""
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Treu informació de versió i configuració actuals del WinMerge en un fitxer de text"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr ""
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Muntatge privat: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid "Opens the release notes document\nRelease Notes"
 msgstr ""
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid "Opens the translations website\nTranslations"
 msgstr ""
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Ajustos del connector"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "No prediferenciïs"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Prediferencia quan sigui possible"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "No s'ha trobat el WSH - seqüències d'ordres .sct inhabilitades"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Cap>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Automàtic>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Obre el fitxer amb l'apliació registrada"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Obre el fitxer amb l'editor extern"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Obre el fitxer amb una aplicació particular"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "No mostra els blocs moguts"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr ""
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Mostra només els blocs moguts des de la diferència actual"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Va fins a la diferència sota la busca"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "Va fins a la diferència %1 de %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "Va fins a la línia %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Inhabilitat"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Des del sistema de fitxers"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Des de la llista de recents"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr ""
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr ""
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr ""
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr ""
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr ""
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr ""
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr ""
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr ""
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr ""
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr ""
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr ""
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr ""
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr ""
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr ""
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr ""
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr ""
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr ""
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr ""
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr ""
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr ""
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr ""
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr ""
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr ""
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr ""
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr ""
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr ""
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr ""
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr ""
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr ""
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr ""
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr ""
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr ""
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Amaga la barra d'eines"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Mostra la barra d'eines petita"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Mostra la barra d'eines gran"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index 6dce31b..39cab73 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -1030,7 +1030,7 @@ msgid "&Scripts"
 msgstr "½Å±¾(&S)"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< ¿Õ >"
@@ -1471,7 +1471,7 @@ msgid "&Versioning System:"
 msgstr "°æ±¾¿ØÖÆϵͳ(&V)"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "cleartool.exe ·¾¶(&P):"
@@ -1672,7 +1672,7 @@ msgid "Replace &All"
 msgstr "È«²¿Ìæ»»(&A)"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2578,7 +2578,7 @@ msgid "Files:"
 msgstr "Îļþ:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "²»Í¬"
@@ -2615,7 +2615,7 @@ msgid "Right:"
 msgstr "ÓÒ²à:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "ÍêÈ«Ïàͬ"
@@ -2815,7 +2815,7 @@ msgid "A&ppend timestamp"
 msgstr "Ìí¼Óʱ¼ä´Á(&P)"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "È·Èϸ´ÖÆ"
@@ -2893,7 +2893,7 @@ msgstr ""
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Îļþ¼Ð"
@@ -3497,7 +3497,7 @@ msgid "Version Control"
 msgstr "°æ±¾¿ØÖÆ"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "²»Í¬´¦"
@@ -3626,87 +3626,67 @@ msgstr "XML 
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "È«²¿ÄÚÈÝ"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "¿ìËÙÄÚÈÝ"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "ÐÞ¸ÄÈÕÆÚ"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "ÐÞ¸ÄÈÕÆÚºÍÎļþ´óС"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Îļþ´óС"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Ãû³Æ"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "λÖÃ"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "¹ýÂËÆ÷"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "ÃèÊö"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Ñ¡ÔñйýÂËÆ÷µÄÎļþÃû"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "¹ýÂËÆ÷Îļþ (*.flt)|*.flt|ËùÓÐÎļþ (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3718,7 +3698,7 @@ msgstr ""
 "\n"
 "Çë°ÑÎļþ %1 ¸´ÖƵ½ WinMerge/Filters Îļþ¼ÐÏÂ."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3731,7 +3711,7 @@ msgstr ""
 "\n"
 "ÇëÈ·ÈÏ´ËÎļþ¼Ð´æÔÚ²¢¿ÉÒÔдÈë."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3742,7 +3722,7 @@ msgstr ""
 "\n"
 "ÇëÔÚÑ¡Ïî/ϵͳÖÐÑ¡ÔñÒ»¸ö·¾¶."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3755,12 +3735,12 @@ msgstr ""
 "\n"
 "¸ÃÎļþÊÇ·ñΪֻ¶Á?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Ñ¡ÔñÒª°²×°µÄ¹ýÂËÆ÷Îļþ"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3771,258 +3751,258 @@ msgstr ""
 "\n"
 "»òÐíÊÇÎÞ·¨½«ÐÂÎļþ¸´ÖƵ½¹ýÂËÆ÷·¾¶?"
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "¹ýÂËÆ÷ÎļþÒѾ­´æÔÚ. ÊÇ·ñ¸²¸ÇÔ­ÓйýÂËÆ÷?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "ÕýÔò±í´ïʽ"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
 msgstr ""
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr ""
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Îļþ¼Ð¶Ô±È½á¹û"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Îļþ¶Ô±È"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "δÃüÃû ×ó"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "δÃüÃû ÓÒ"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "ËûÃǵÄÎļþ"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "ÎÒµÄÎļþ"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "ɨÃèÎļþ..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "´ò¿ªÑ¡Ôñ"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "ÕýÔÚ´Ó×ó²à¸´ÖƵ½ÓÒ²à"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "ÕýÔÚ´ÓÓҲิÖƵ½×ó²à"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "ÕýÔÚÈ«²¿¸´ÖƵ½×ó²à"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "ÕýÔÚÈ«²¿¸´ÖƵ½ÓÒ²à"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "ÕýÔÚ¸´ÖÆÎļþ..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "ÕýÔÚɾ³ýÎļþ..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "ÕýÔÚÒƶ¯Îļþ..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "´´½¨±¨¸æ..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr ""
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr ""
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "ÐÐ: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "ºÏ²¢"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "µÚ %1 ´¦²»Í¬(¹² %2 ´¦)"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "¹²ÕÒµ½ %1 ´¦²»Í¬"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "ÕÒµ½ 1 ´¦²»Í¬"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "Ö»¶Á"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "µÚ %1 ÏîÄ¿£¬¹² %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "ÏîÄ¿: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Ñ¡ÔñÁ½¸öÒÑ´æÔÚµÄÎļþ¼Ð»òÎļþ½øÐжԱÈ"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Ñ¡ÔñÎļþ¼Ð"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Ñ¡ÔñÒª½øÐжԱȵÄÁ½¸öÎļþ¼Ð»òÁ½¸öÎļþ¡£"
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "×ó²à·¾¶²»´æÔÚ!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "ÓҲ෾¶²»´æÔÚ!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Á½¸ö·¾¶¶¼²»´æÔÚ!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Ñ¡ÔñÁ½¸öÎļþÒÔÆôÓýâ°ü³ÌÐò."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "²»ÄÜÔÚÎļþºÍÎļþ¼ÐÖ®¼ä½øÐжԱÈ!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "ÕÒ²»µ½Îļþ: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Îļþδ½â°ü: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4035,42 +4015,42 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "½âÎö³åÍ»Îļþʱʧ°Ü"
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid "The file\n%1\nis not a conflict file."
 msgstr "Îļþ\n%1\n²»ÊÇÒ»¸ö³åÍ»Îļþ"
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Áí´æΪ"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "±£´æ¸ü¸Äµ½ %1£¿"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 ±ê¼ÇΪֻ¶Á¡£ÄúÏ£Íû¸²¸ÇÖ»¶ÁÎļþÂð£¿Ñ¡¡°·ñ¡±¿ÉÒÔÓÃÆäËüÎļþÃû±£´æ¡£"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Ä¿±ê¿ÉдÈëÐÔ¼ì²é³ö´í"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "±¸·ÝÎļþʱ³ö´í"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4083,7 +4063,7 @@ msgstr ""
 "\n"
 "ÈÔÈ»¼ÌÐøÂð£¿"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4100,7 +4080,7 @@ msgstr ""
 "\t-ÓÃÆäËüÎļþÃû±£´æ(µã»÷¡°È·¶¨¡±)\n"
 "\t-ÖÐÖ¹µ±Ç°²Ù×÷(µã»÷¡°È¡Ïû¡±)"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4115,7 +4095,7 @@ msgstr ""
 "\n"
 "ÄúÒª½«Î´´ò°üµÄ°æ±¾±£´æΪÆäËüÎļþÂð£¿"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4130,7 +4110,7 @@ msgstr ""
 "\n"
 "ÄúÒª½«Î´´ò°üµÄ°æ±¾±£´æΪÆäËüÎļþÂð£¿"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4145,7 +4125,7 @@ msgstr ""
 "\n"
 "Òª¸²¸ÇÒѱ»Ð޸ĵÄÎļþÂð£¿"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4154,32 +4134,32 @@ msgstr ""
 "%1\n"
 "Îļþ±ê¼ÇΪֻ¶Á¡£ÄúÒª¸²¸ÇÖ»¶ÁµÄÎļþÂð£¿"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
 msgstr ""
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "×ó²àÎļþÁí´æΪ"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "ÓÒ²àÎļþÁí´æΪ"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
 msgstr ""
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4190,42 +4170,42 @@ msgstr ""
 "\n"
 "ÇëË¢ÐÂÎĵµºóÔÙ¼ÌÐø¡£"
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Äú±ØÐëÖ¸¶¨Ò»¸ö SourceSafe ÏîĿ·¾¶ÒÔ±ã¼ÌÐø (ÀýÈ磺 $/MyProject)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "´ÓVSSÖÐÇ©³öÎļþ..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "ÔÚÇ©³ö(Checkout)Îļþʱ°æ±¾¿ØÖÆϵͳ·µ»ØÒ»¸ö´íÎó¡£ÎÞ·¨¼ÌÐø..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Ö´Ðа汾¿ØÖÆϵͳÃüÁîʱ³ö´í¡£"
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "VSS ¹¤×÷Îļþ¼Ð(Working Folder)Ó뵱ǰÎļþλÖò»·û¡£ÊÇ·ñ¼ÌÐø£¿"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "δÕÒµ½ VSS Êý¾Ý¿â£¡"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "VSS ·µ»Ø´íÎó:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4236,7 +4216,7 @@ msgstr ""
 " Çë¼ì²éÒ»ÏÂʹÓÃÖеÄÊÓͼµÄÅäÖÃ˵Ã÷.\n"
 " ³·ÏúÇ©³ö²Ù×÷Âð?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4245,169 +4225,169 @@ msgstr ""
 "ÔÚ³¢ÊÔ³·ÏúÇ©³öÎļþʱ°æ±¾¿ØÖÆϵͳ·µ»ØÁËÒ»¸ö´íÎó.\n"
 " Çë¼ì²éÒ»ÏÂʹÓÃÖеÄÊÓͼµÄÅäÖÃ˵Ã÷. "
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "ÎÞ"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (5.0 ÒÔÇ°°æ±¾)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 ¼°ÒÔºó°æ±¾)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "ÒÔ¿Õ°×·Ö¸ô"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "ÒÔ¿Õ°×»ò±êµã·Ö¸ô"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "½«Ñ¡ÖеÄÏîÄ¿¸´ÖƵ½ÓÒ²àÎļþ¼Ð"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "½«Ñ¡ÖеÄÏîÄ¿¸´ÖƵ½Ö¸¶¨µÄÎļþ¼Ð"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "ɾ³ý×ó²àÑ¡ÖеÄÏîÄ¿"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "ɾ³ýÓÒ²àÑ¡ÖеÄÏîÄ¿"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "ɾ³ýÁ½²àÑ¡ÖеÄÏîÄ¿"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Òþ²ØÑ¡ÖеÄÏîÄ¿(¼´Ê±¹ýÂË)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "ΪÁ½²àÑ¡ÖеÄÏîÄ¿¸ÄÃû"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "ÓҲൽ×ó²à (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "×ó²àµ½ÓÒ²à (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "ÓҲൽ×ó²à (%1 ¹²%2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "×ó²àµ½ÓÒ²à (%1 ¹²%2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "×ó²àµ½... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "ÓҲൽ... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "×ó²àµ½... (%1 ¹²%2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "ÓҲൽ... (%1 ¹²%2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "×ó²à (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "ÓÒ²à (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Á½²à (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "×ó²à (%1 ¹²%2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "ÓÒ²à (%1 ¹²%2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Á½²à (%1 ¹²%2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Ñ¡ÔñÄ¿±êÎļþ¼Ð"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "×ó²à - ÇëÑ¡ÔñÄ¿±êÎļþ¼Ð:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "ÓÒ²à - ÇëÑ¡ÔñÄ¿±êÎļþ¼Ð:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(Ó°Ïì %1 ¸öÎļþ)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(Ó°Ïì %2 ÎļþÖÐµÄ %1 ¸ö)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4419,17 +4399,17 @@ msgstr ""
 "%1\n"
 "Âð£¿"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "ÄúÈ·¶¨Òª¸´ÖÆÂð:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "ÄúÈ·¶¨Òª¸´ÖÆ %d ¸öÏîÄ¿Âð:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4448,613 +4428,613 @@ msgstr ""
 "\n"
 "ÇëˢбȽϴ°¿Ú."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr ""
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr ""
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr ""
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "´ò¿ª×ó²àÎļþ"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "ÓÃÍⲿ±à¼­Æ÷´ò¿ª×ó²àÎļþ"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Ñ¡Ôñ³ÌÐòÒÔ´ò¿ª×ó²àÎļþ ..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "´ò¿ªÓÒ²àÎļþ"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "ÓÃÍⲿ±à¼­Æ÷´ò¿ªÓÒ²àÎļþ"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Ñ¡Ôñ³ÌÐòÒÔ´ò¿ªÓÒ²àÎļþ ..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Íⲿ±à¼­Æ÷ÔËÐÐʧ°Ü: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "δ֪µÄÍⲿ±à¼­Æ÷À©Õ¹Ãû: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "½«ÎļþÃû¸´ÖƵ½¼ôÌù°å"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "½«×ó²àµÄ·¾¶Ãû¸´ÖƵ½¼ôÌù°å"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "½«ÓÒ²àµÄ·¾¶Ãû¸´ÖƵ½¼ôÌù°å"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "½«Á½²àµÄ·¾¶Ãû¸´ÖƵ½¼ôÌù°å"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr ""
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr ""
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "δ֪µÄѹËõ°ü¸ñʽ"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "´Ó×ó²àÌí¼Óµ½Ñ¹Ëõ°ü"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "´ÓÓÒ²àÌí¼Óµ½Ñ¹Ëõ°ü"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "´ÓÁ½²àÌí¼Óµ½Ñ¹Ëõ°ü"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "½«Á½²àÖв»ÏàͬµÄÌí¼Óµ½Ñ¹Ëõ°ü"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "½«×ó²àÑ¡ÖеÄÎļþÒƶ¯µ½Ö¸¶¨Îļþ¼Ð"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "½«ÓÒ²àÑ¡ÖеÄÎļþÒƶ¯µ½Ö¸¶¨Îļþ¼Ð"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "ÎļþÃû³Æ"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "¶Ô±È½á¹û"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "×ó²àÈÕÆÚ"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "ÓÒ²àÈÕÆÚ"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "À©Õ¹Ãû"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "×ó²àÎļþ´óС"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "ÓÒ²àÎļþ´óС"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "ÓÒ²àÎļþ´óС (¼ò¶Ì)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "×ó²àÎļþ´óС (¼ò¶Ì)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "×ó²à½¨Á¢Ê±¼ä"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "ÓҲཨÁ¢Ê±¼ä"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "½ÏеÄÎļþ"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "×ó²àÎļþ°æ±¾"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "ÓÒ²àÎļþ°æ±¾"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "¼ò¶ÌµÄ½á¹û"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "×ó²àÊôÐÔ"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "ÓÒ²àÊôÐÔ"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "×ó²à»»Ðзû"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "ÓҲ໻Ðзû"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "×ó²àÎļþ±àÂë"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "ÓÒ²àÎļþ±àÂë"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "ºöÂԵIJ»Í¬´¦"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "¶þ½øÖÆ"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "ÎÞ·¨¶Ô±ÈÎļþ"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "ÏîÄ¿È¡Ïû"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "ÎļþÒÑÌø¹ý"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Îļþ¼ÐÒÑÌø¹ý"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "½öÔÚ×ó²à: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "½öÔÚÓÒ²à: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "¶þ½øÖÆÎļþÍêÈ«Ïàͬ"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "¶þ½øÖÆÎļþ²»Í¬"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Îļþ²»Í¬"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr ""
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Ö»´æÔÚ×ó²à"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Ö»´æÔÚÓÒ²à"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "´íÎó"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr ""
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr ""
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Ö´ÐÐʱ¼ä: %ld ºÁÃë"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "Ñ¡ÔñÁË 1 ¸öÏîÄ¿"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "Ñ¡ÔñÁË %1 ¸öÏîÄ¿"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "ÎļþÃû»òÎļþ¼ÐÃû¡£"
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Ëù´¦µÄ×ÓÎļþ¼ÐÃû¡£"
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "¶Ô±È½á¹û£¬½Ï³¤µÄ¸ñʽ¡£"
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "×ó²àµÄ×îºóÐÞ¸ÄÈÕÆÚ¡£"
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "ÓÒ²àµÄ×îºóÐÞ¸ÄÈÕÆÚ¡£"
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "ÎļþµÄÀ©Õ¹Ãû¡£"
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "×ó²àÎļþ³¤¶È×Ö½ÚÊý¡£"
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "ÓÒ²àÎļþ³¤¶È×Ö½ÚÊý¡£"
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "×ó²àÎļþ³¤¶ÈµÄ¼ò¶Ì±íʾ."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "ÓÒ²àÎļþ³¤¶ÈµÄ¼ò¶Ì±íʾ."
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "×ó²àµÄ´´½¨Ê±¼ä¡£"
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "ÓÒ²àµÄ´´½¨Ê±¼ä¡£"
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "ÏÔʾ³öÄıßÊǽÏÍíÐ޸ĹýµÄ¡£"
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "×ó²àÎļþµÄ°æ±¾£¬Ö»¶ÔһЩÎļþÀàÐÍÓÐЧ¡£"
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "ÓÒ²àÎļþµÄ°æ±¾£¬Ö»¶ÔһЩÎļþÀàÐÍÓÐЧ¡£"
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "¶Ì¸ñʽµÄ¶Ô±È½á¹û¡£"
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "×ó²àµÄÊôÐÔ¡£"
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "ÓÒ²àµÄÊôÐÔ¡£"
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "×ó²àÎļþµÄ»»ÐзûÀàÐÍ"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "ÓÒ²àÎļþµÄ»»ÐзûÀàÐÍ"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "×ó²àÎļþµÄ×Ö·û±àÂë¡£"
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "ÓÒ²àÎļþµÄ×Ö·û±àÂë¡£"
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "±»ÂÔ¹ýµÄ²»Í¬Êý. ÓÉWinMergeºöÂԵIJ»Í¬, ÎÞ·¨¶ÔËüÃǽøÐкϲ¢."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "ÎļþÖеIJ»Í¬Êý. ²»°üÀ¨ºöÂԵIJ»Í¬."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "ÔÚ¶þ½øÖÆÎļþ´¦ÏÔʾÐǺÅ(*)¡£"
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "¶Ô±È %1 ºÍ %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "¶ººÅ·Ö¸ôµÄÁбí"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "ÖƱí·û·Ö¸ôµÄÁбí"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "¼òµ¥HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "¼òµ¥XML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "±¨¸æÎļþÒѾ­´æÔÚ£¬Òª¸²¸ÇÂð£¿"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5063,32 +5043,32 @@ msgstr ""
 "´´½¨±¨¸æʱ³ö´í:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "³É¹¦´´½¨±¨¸æ¡£"
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Á½²à´ò¿ªµÄÊÇͬһ¸öÎļþ¡£"
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Ñ¡ÔñµÄÎļþÍêÈ«Ïàͬ¡£"
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Ò»¸ö´íÎó·¢ÉúÓÚ¶Ô±ÈÎļþʱ¡£"
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "ÎÞ·¨´´½¨ÁÙʱÎļþ¡£Çë¼ì²éÄúµÄÁÙʱ·¾¶ÉèÖá£"
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5103,32 +5083,32 @@ msgstr ""
 "\n"
 "Ìáʾ£ºÈç¹ûÄú×ÜÊǺöÂÔ»»ÐзûµÄ²»Í¬£¬ÇëÔÚ¡°±à¼­/Ñ¡ÏµÄ¡°¶Ô±È¡±Ò³Öй´Ñ¡¡°ºöÂÔ»»Ðзû²îÒ족¡£"
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, 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:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "ÔÚʹÓòå¼þ¡°%2¡±¶ÔÎļþ¡°%1¡±½øÐÐÔ¤¶Ô±Èʱ·¢ÉúÁËÒ»¸ö´íÎó¡£Ô¤¶Ô±È½«²»»á±»²ÉÓá£"
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "Ñ¡ÖеÄÎļþ¼ÐÎÞЧ¡£"
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "ÎÞ·¨Óñ༭Æ÷´ò¿ª¶þ½øÖÆÎļþ¡£"
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, 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 "Õâ¸öÎļþ¼ÐÖ»´æÔÚÓÚÒ»²àËùÒÔÎÞ·¨´ò¿ª¡£\n\nÊÇ·ñÒªÔÚÁíÒ»²à´´½¨Ò»¸ö¶ÔÓ¦µÄÎļþ¼Ð£º\n%1\n²¢ÇÒ´ò¿ªÕâÁ½¸öÎļþ¼Ð£¿"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5139,148 +5119,148 @@ msgstr ""
 "·Ö±ðÒÔ²»Í¬´úÂëÒ³ÏÔʾ½«»áÓнϺõÄЧ¹û£¬µ«ÊǺϲ¢/¸´ÖÆ»áÓÐΣÏÕ¡£\n"
 "ÄúÒªÒÔWindowsĬÈϵĴúÂëÒ³ÏÔʾÁ½¸öÎļþÂð(ÍƼö)£¿"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "¾¯¸æ: ÎļþʹÓò»Í¬µÄ×Ö·û±àÂë, ×ó²à=%s ÓÒ²à=%s, ºÏ²¢²Ù×÷ÓпÉÄÜÔì³ÉÐÅÏ¢¶ªÊ§."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "ÓÉÓÚ×Ö·û±àÂë´íÎóÔì³ÉÁ½¸öÎļþÐÅÏ¢¶ªÊ§"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "ûÓв»Í¬"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "ÐÐÄÚ²»Í¬"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "ÒÑÌæ»» %1 ¸ö×Ö·û´®¡£"
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "ÎÞ·¨²éÕÒ×Ö·û´®¡¸%s¡¹"
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "¸´ÖÆÈ«Ãû"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "¸´ÖÆÎļþÃû"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "λÖÃʾÒâ"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "²»Í¬´¦ÏÔʾ"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "³É¹¦Ð´ÈëpatchÎļþ¡£"
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. ÌõĿδÕÒµ½»òÕßËüÊÇÒ»¸öÎļþ¼Ð!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. ÌõĿδÕÒµ½»òÕßËüÊÇÒ»¸öÎļþ¼Ð!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "patchÎļþÒѾ­´æÔÚ£¬ÄúÒª¸²¸ÇËüÂð£¿"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[Ñ¡ÖÐ %1 ¸öÎļþ]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "ÆÕͨ"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "ÉÏÏÂÎÄ"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "ͳһ"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "ÎÞ·¨Ð´ÈëÎļþ %1¡£"
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Ö¸¶¨µÄ·¾¶²»ÊǾø¶Ô·¾¶: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "ÇëÖ¸¶¨Êä³öÎļþ"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "ÎÞ·¨Îª¶þ½øÖÆÎļþ´´½¨ patch¡£"
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "ÎÞ·¨ÎªÎļþ¼Ð´´½¨ patch¡£"
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5291,17 +5271,17 @@ msgstr ""
 "\n"
 "´´½¨ patch ÒªÇóÎļþÖÐûÓÐδ±£´æµÄ¸Ä¶¯¡£"
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Îļþ¼Ð²»´æÔÚ¡£"
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "µ±Ç°µÄÎļþ¼Ð¶Ô±È½á¹û½«»á±»Çå³ý¡£"
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5313,7 +5293,7 @@ msgstr ""
 "ûÕÒµ½Ö§³ÖѹËõ°üËùÐèÒªµÄ×é¼þ(7-zip »ò Merge7z*.dll)¡£\n"
 "Çë²é¿´ÊÖ²á»ñµÃÓйØѹËõ°üÖ§³Ö¼°ÈçºÎÆôÓõĸü¶àÐÅÏ¢¡£"
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5322,7 +5302,7 @@ msgstr ""
 "\n"
 "×¢Òâ: 7-Zip ¼¯³É¹¦ÄÜÔÚ WinMerge µÄÉèÖÃÖб»½ûÓÃ."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5331,37 +5311,37 @@ msgstr ""
 "\n"
 "×¢Òâ: 7-Zip ¼¯³É¹¦ÄÜÔÚ WinMerge µÄÉèÖÃÖÐÏÞÖÆΪµ¥¶À³ÌÐòʹÓÃ."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Ñ¡Ôñµ¼³öÎļþ"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Ñ¡Ôñµ¼ÈëÎļþ"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Ñ¡ÏîÒÑ´ÓÎļþµ¼Èë."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Ñ¡ÏîÒѾ­µ¼³öµ½Îļþ."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Ñ¡Ïîµ¼Èëʧ°Ü."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Ñ¡Ïîµ¼³öʧ°Ü."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5369,242 +5349,242 @@ msgid ""
 "Do you want to continue?"
 msgstr "ÄúÕýÒª¹Ø±Õ¶à¸ö¶Ô±È´°¿Ú¡£\nÊÇ·ñ¼ÌÐø£¿"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "ÕýÔò±í´ïʽ´íÎó"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "²»Æ¥Åä"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "ÎÞЧµÄÕýÔò±í´ïʽ"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "ÎÞЧµÄ collation character"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "ÎÞЧµÄ×Ö·ûÀà(character class)Ãû"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "ĩβµÄ·´Ð±¸Ü"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "ÎÞЧµÄ back reference"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "δÅä¶ÔµÄ [ or [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "δÅä¶ÔµÄ ( or \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "δÅä¶ÔµÄ \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "\\{\\}µÄÄÚÈÝÎÞЧ"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "ÎÞЧµÄ·¶Î§½áβ"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "ÄÚ´æ²»×ã"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "ÎÞЧµÄÇ°ÖÃÕýÔò±í´ïʽ"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "ÕýÔò±í´ïʽ¹ýÔçµØ½áÊø"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "ÕýÔò±í´ïʽ̫´ó"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "δÅä¶ÔµÄ ) or \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "»ìºÏ"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " ×Ö½Ú"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr ""
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr ""
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr ""
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr ""
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "±£´æ×ó²àµÄÎļþ"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "±£´æÓÒ²àµÄÎļþ"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "½«×ó²àÎļþ±£´æΪָ¶¨ÎļþÃû..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "½«ÓÒ²àÎļþ±£´æΪָ¶¨ÎļþÃû..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "½«»»Ðзûת»»ÎªWindowsģʽ"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "½«»»Ðзûת»»ÎªUnixģʽ"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "½«»»Ðзûת»»ÎªMacģʽ"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Ôڱ༭ģʽºÍºÏ²¢Ä£Ê½Ö®¼äÇл»"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5613,12 +5593,12 @@ msgstr ""
 "ÏÔʾ²¢ÐÞ¸ÄÎļþ±àÂëÊôÐÔ\n"
 "Îļþ±àÂëÊôÐÔ"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "´ò¿ª²¢½âÎö³åÍ»Îļþ"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5627,7 +5607,7 @@ msgstr ""
 "Ñ¡Öе±Ç°ÐÐÄÚ²»Í¬µÄ²¿·Ö\n"
 "µ±Ç°ÐÐÄÚ²»Í¬"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5636,7 +5616,7 @@ msgstr ""
 "תµ½ÐкŻòij´¦²»Í¬\n"
 "תµ½ (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5645,7 +5625,7 @@ msgstr ""
 "É趨³ÌÐòÑ¡Ïî\n"
 "Ñ¡Ïî"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5654,37 +5634,37 @@ msgstr ""
 "¸üÐÂÏÔʾ\n"
 "¸üР(F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "½«µ±Ç°Ñ¡ÖеÄÐи´ÖƵ½¼ôÌù°å²¢ÔÚÿÐÐÇ°Ìí¼ÓÐкÅ"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "ÉèÖÃ/È¡ÏûÊéÇ©"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "תµ½ÏÂÒ»¸öÊéÇ©"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "תµ½ÉÏÒ»¸öÊéÇ©"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Çå³ýËùÓÐÊéÇ©"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5693,7 +5673,7 @@ msgstr ""
 "ÏÔʾÍêÈ«ÏàͬµÄÏîÄ¿\n"
 "ÏÔʾÍêÈ«ÏàͬµÄÏîÄ¿"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5702,7 +5682,7 @@ msgstr ""
 "ÏÔʾº¬Óв»Í¬µÄÏîÄ¿\n"
 "ÏÔʾ²»Í¬µÄÏîÄ¿"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5711,7 +5691,7 @@ msgstr ""
 "ÏÔʾֻÔÚ×ó²à´æÔÚµÄÏîÄ¿\n"
 "ÏÔʾֻÔÚ×ó²àÏîÄ¿"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5720,7 +5700,7 @@ msgstr ""
 "ÏÔʾֻÔÚÓÒ²à´æÔÚµÄÏîÄ¿\n"
 "ÏÔʾֻÔÚÓÒ²àÏîÄ¿"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5729,7 +5709,7 @@ msgstr ""
 "ÏÔʾ¶þ½øÖÆÎļþ\n"
 "ÏÔʾ¶þ½øÖÆÎļþ"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5738,7 +5718,7 @@ msgstr ""
 "ÏÔʾÌø¹ýµÄÎļþ\n"
 "ÏÔʾÌø¹ýµÄÎļþ"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5747,7 +5727,7 @@ msgstr ""
 "ΪÊÓͼѡÔñ×ÖÌå\n"
 "Ñ¡ÔñÊÓͼ×ÖÌå"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5756,42 +5736,42 @@ msgstr ""
 "°ÑÊÓͼµÄ×ÖÌå»Ö¸´ÎªÏµÍ³×ÖÌå\n"
 "ĬÈÏ×ÖÌå"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "ÏÔʾ¿Õ°×ºÍÖƱí·û×Ö·û"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "ÏÔʾ/Òþ²Ø¶Ô±È´°¸ñ"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "λÖô°¸ñÏÔʾÎļþµÄ×ÜÌåÇé¿ö"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "ÏÔʾÎļþ¼Ð¶Ô±È½á¹ûͳ¼Æ"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid "Select the current user interface language\nLanguage"
 msgstr "Ñ¡Ôñµ±Ç°Óû§½çÃæµÄÓïÑÔ\nÓïÑÔ"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid "Shows differences inside lines with different colors\nShow Line Difference"
 msgstr "ÒÔ²»Í¬ÑÕÉ«ÏÔʾÐÐÄڵIJ»Í¬\nÏÔʾÐÐÄÚ²»Í¬"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "½»»»×óÓÒ´°¸ñµÄλÖÃ"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5800,7 +5780,7 @@ msgstr ""
 "ÏÔʾÐкÅ\n"
 "ÏÔʾÐкÅ"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5809,7 +5789,7 @@ msgstr ""
 "ÔÊÐí×Ô¶¯»»ÐÐ\n"
 "×Ô¶¯»»ÐÐ"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5818,107 +5798,107 @@ msgstr ""
 "ÔÚÁ½¸ö´°¸ñÄÚÏÔʾÓÃÒÔÑ¡ÔñµÄÒ³±ß\n"
 "ÏÔʾѡÔñÒ³±ß"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Ôö´óÎÄ×ֳߴç"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "¼õСÎÄ×ֳߴç"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "°ÑÎÄ×ֳߴç»Ö¸´µ½Ä¬ÈÏ´óС"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
 msgstr "¹ö¶¯µ½ÉÏÒ»´¦²»Í¬\nÉÏÒ»´¦²»Í¬(Alt+Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
 msgstr "¹ö¶¯µ½ÏÂÒ»´¦²»Í¬\nÏÂÒ»´¦²»Í¬(Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
 msgstr "¹ö¶¯µ½µÚÒ»´¦²»Í¬\nµÚÒ»´¦²»Í¬(Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
 msgstr "¹ö¶¯µ½µ±Ç°²»Í¬´¦\nµ±Ç°²»Í¬(Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid "Scroll to the last difference\nLast Difference (Alt+End)"
 msgstr "¹ö¶¯µ½×îºóÒ»´¦²»Í¬\n×îºóÒ»´¦²»Í¬(Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -5927,7 +5907,7 @@ msgstr ""
 "¸´ÖÆÑ¡ÔñµÄÎÄ×Öµ½ÓÒ²àÎļþ\n"
 "¸´ÖÆÓÒ²à (Alt+Right)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -5936,7 +5916,7 @@ msgstr ""
 "¸´ÖÆÑ¡ÔñµÄÎÄ×Öµ½×ó²àÎļþ\n"
 "¸´ÖÆ×ó²à (Alt+Left)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -5945,7 +5925,7 @@ msgstr ""
 "½«µ±Ç°²»Í¬´¦¸´ÖƵ½ÓҲಢǰ½øµ½ÏÂÒ»´¦²»Í¬\n"
 "¸´ÖƵ½ÓҲಢǰ½ø (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -5954,7 +5934,7 @@ msgstr ""
 "½«µ±Ç°²»Í¬´¦¸´ÖƵ½×ó²à²¢Ç°½øµ½ÏÂÒ»´¦²»Í¬\n"
 "¸´ÖƵ½×ó²à²¢Ç°½ø (Ctrl+Alt+Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -5963,7 +5943,7 @@ msgstr ""
 "¸´ÖÆËùÓв»Í¬µ½ÓÒ²àÎļþ\n"
 "ËùÓе½ÓÒ²à"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -5972,382 +5952,382 @@ msgstr ""
 "¸´ÖÆËùÓв»Í¬µ½×ó²àÎļþ\n"
 "ËùÓе½×ó²à"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "ɾ³ýÁ½²àÖÐÑ¡ÖеÄÏîÄ¿"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "¶Ô±ÈÑ¡ÖеÄÏîÄ¿(µ±¶àѡʱ¶Ô±ÈµÚÒ»¸öÏîÄ¿)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Ñ¡Ôñ¼°ÅÅÐòÎļþ¼Ð¶Ô±ÈÏÔʾµÄÁÐ"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Éú³ÉÒ»¸öpatchÎļþ"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Ñ¡Ôñ¼°Ð޸ĹýÂËÆ÷"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "ÓɶԱȽá¹ûÉú³É±¨¸æ"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr ""
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "ÈÃÓû§Ñ¡Ôñ½â°ü³ÌÐò (¶Ô±ÈÎļþ¼Ðʱ²»½øÐнâ°ü)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "ÔÚÁ½¸öÎļþÉÏÓ¦ÓÃÊʵ±µÄ½â°ü³ÌÐò (ÎļþÖ»ÐèÒªÓÐÊʵ±µÄÀ©Õ¹Ãû)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Ñ¡ÔñÒ»¸ö½â°ü³ÌÐòÀ´±à¼­Õâ¸öÎļþ"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "ûÓÐÔ¤¶Ô±È³ÌÐò (ÆÕͨ)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "ÍƼöµÄ²å¼þ"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "ÆäËü²å¼þ"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "жÔØËùÓвå¼þ²¢ÖØÐÂÔØÈë (¿ª·¢ÕßÓÃ)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid "Activates next visible file\nActivate next File"
 msgstr "Çл»½¹µãµ½ÏÂÒ»¸ö¿É¼ûµÄÎļþ\nÇл»µ½ÏÂÒ»Îļþ"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "¹Ø±ÕËùÓдò¿ªµÄ´°¿Ú"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid "Opens the WinMerge Help\nWinMerge Help"
 msgstr "´ò¿ªWinMergeµÄ°ïÖú\nWinMerge°ïÖú"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "½«µ±Ç°µÄ WinMerge °æ±¾ÐÅÏ¢¼°ÅäÖÃÊä³öµ½Îı¾Îļþ"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "ÏÔʾGNU General Public License"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Private Build: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid "Opens the release notes document\nRelease Notes"
 msgstr "´ò¿ª·¢ÐÐÎĵµ\n·¢ÐÐÎĵµ"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid "Opens the translations website\nTranslations"
 msgstr "´ò¿ª·­ÒëÍøÕ¾\n·­Òë"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "²å¼þÉèÖÃ"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "ûÓÐÔ¤¶Ô±È³ÌÐò"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Èç¹û¿ÉÄÜ£¬½øÐÐÔ¤¶Ô±È"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH δÕÒµ½ - .sct ½Å±¾ÒѽûÓÃ"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<ÎÞ>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<×Ô¶¯>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "ÓÃϵͳĬÈϳÌÐò´ò¿ªÎļþ"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "ÓÃÍⲿ±à¼­Æ÷´ò¿ªÎļþ"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Ñ¡Ôñ³ÌÐòÒÔ´ò¿ªÎļþ"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "²»ÏÔʾÒƶ¯Çø¿é"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "ÏÔʾËùÓÐÒƶ¯Çø¿é"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Ö»ÏÔʾµ±Ç°´¦µÄÒƶ¯Çø¿é"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "תµ½¹â±ê´¦²»Í¬"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "תµ½µÚ %1 ´¦²»Í¬(¹² %2 ´¦)(&O)"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "תµ½µÚ %1 ÐÐ(&O)"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "½ûÓÃ"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "ÓÉÎļþϵͳѡÔñ"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "ÓÉ×î½üʹÓõÄÎļþÑ¡Ôñ"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr ""
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Åú´¦Àí"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Portable Object"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "×ÊÔ´Îļþ"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr ""
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Òþ²Ø¹¤¾ßÀ¸"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "ÏÔʾС¹¤¾ßÀ¸"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "ÏÔʾ´ó¹¤¾ßÀ¸"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index bd4bcb2..2fa6090 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -1036,7 +1036,7 @@ msgid "&Scripts"
 msgstr "ÀHĶ§Y¦æ½X(&S)"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< µL >"
@@ -1477,7 +1477,7 @@ msgid "&Versioning System:"
 msgstr "ª©¥»ºÞ²z¨t²Î(&V)¡G"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "cleartool.exe ¸ô®|(&P)¡G"
@@ -1680,7 +1680,7 @@ msgid "Replace &All"
 msgstr "¥þ³¡¨ú¥N(&A)"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2608,7 +2608,7 @@ msgid "Files:"
 msgstr "ÀɮסG"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "¤£¦P"
@@ -2645,7 +2645,7 @@ msgid "Right:"
 msgstr "¥kÃä¡G"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "¥þ¦P"
@@ -2845,7 +2845,7 @@ msgid "A&ppend timestamp"
 msgstr "ªþ¤W®É¶¡ÂW°O(&P)"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "½T»{½Æ»s"
@@ -2923,7 +2923,7 @@ msgstr "
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "¸ê®Æ§¨"
@@ -3563,7 +3563,7 @@ msgid "Version Control"
 msgstr "ª©¥»±±¨î"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "®t²§"
@@ -3692,88 +3692,68 @@ msgstr "XML 
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "§¹¾ã¤º®e"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "§Ö³t¤º®e"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "­×§ï¤é´Á"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "­×§ï¤é´Á»P¤j¤p"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "¤j¤p"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "¦WºÙ"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "¦ì¸m"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "¿z¿ï¾¹"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "´y­z"
 
 # I suggest "Add new filter filename" instead. For it must not select a name, rather give one.
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "«Ø¥ß·s¿z¿ï¾¹ÀɦW"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Àɮ׿z¿ï¾¹ (*.flt)|*.flt|©Ò¦³ÀÉ®× (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3786,7 +3766,7 @@ msgstr ""
 "½Ð½Æ»sÀÉ®× %1 ¨ì WinMerge/Àɮ׿z¿ï¾¹-¸ê®Æ§¨¡G\n"
 "%2¡C"
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3799,7 +3779,7 @@ msgstr ""
 "\n"
 "½Ð½T©w¦³¸Ó¸ê®Æ§¨¡A¦Ó¥B¤¹³\¼g¤J¡C"
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3810,7 +3790,7 @@ msgstr ""
 "\n"
 "½Ð©ó¡u¿ï¶µ/¨t²Î¡v¤¤¿ï©wÀɮ׿z¿ï¾¹¸ê®Æ§¨¡C"
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3823,12 +3803,12 @@ msgstr ""
 "\n"
 "¥¦¬O°ßŪÀÉ¡H"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "§ä¨ìÀɮ׿z¿ï¾¹ÀÉ¥H¦w¸Ë"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3839,17 +3819,17 @@ msgstr ""
 "\n"
 "¤£¯à½Æ»s·s¿z¿ï¾¹ÀɨìÀɮ׿z¿ï¾¹¸ê®Æ§¨¡C"
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Àɮ׿z¿ï¾¹Àɤw¦s¦b¡CÂл\¤§¡H"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Ãþ«¬ªí¦¡"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3860,243 +3840,243 @@ msgstr ""
 "\n"
 "¦p¤£·Q²{¦b­«¾ã¡A¿ï¡u§_¡v¡A¥H«á¦A­«¾ã¡C"
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "¦Ü SS.EXE ªº¸ô®|(&P)"
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "¸ê®Æ§¨¤ñ¹ïµ²ªG"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Àɮפñ¹ï¤¤"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "¥¼³]¼ÐÃDªº¥ªÃä"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "¥¼³]¼ÐÃDªº¥kÃä"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "¥L­Ìªº(ÀÉ®×)"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "§Úªº(ÀÉ®×)"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "±½´yÀÉ®×..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "¶}±Ò¿ï¨ú"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "¥¿½Æ»s¥ªÃä¨ì¥kÃä"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "¥¿½Æ»s¥kÃä¨ì¥ªÃä"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "¥¿½Æ»s¥þ³¡¨ì¥ªÃä"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "¥¿½Æ»s¥þ³¡¨ì¥kÃä"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "¥¿½Æ»sÀÉ®×..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "¥¿§R°£ÀÉ®×..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "¥¿²¾°ÊÀÉ®×..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "¥¿²£¥Í³ø§i..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "ºM¦^¤W¦¸ªº¾Þ§@..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "¦A°µ¤W¦¸ªº¾Þ§@..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "¦æ¡G %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "¦X¨Ö"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "%2 ­Ó®t²§¤¤¤§²Ä %1"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "§ä¨ì %1 ­Ó®t²§"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "§ä¨ì 1 ­Ó®t²§"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "RO"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "%2 ­Ó¶µ¥Ø¤§²Ä %1"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "¶µ¥Ø¡G%1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "¿ï¨ú¨â­Ó²{¦s¸ê®Æ§¨©ÎÀÉ®×°µ¤ñ¹ï"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "¸ê®Æ§¨¿ï¨ú"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "¿ï¨ú¨â­Ó¸ê®Æ§¨©ÎÀÉ®×°µ¤ñ¹ï¡C"
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "¥ªÃä¸ô®|µL®Ä¡I"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "¥kÃä¸ô®|µL®Ä¡I"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "¨âÃä¸ô®|µL®Ä¡I"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "¿ï¨âÀÉ¥H±Ò¥Î¸Ñ¥]¾¹¿ï¨ú¡C"
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "µLªk¤ñ¸ûÀɮשM¸ê®Æ§¨¡I"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "§ä¤£¨ìÀɮסG%1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "¥¼¸Ñ¥]ªºÀɮסG%1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4109,12 +4089,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "µLªk¸ÑªR½Ä¬ðÀÉ¡C"
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4125,32 +4105,32 @@ msgstr ""
 "%1\n"
 "¤£¬O½Ä¬ðÀÉ¡C"
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "¥t¦s·sÀÉ"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Àx¦s§ó§ï¨ì %1¡H"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 ¤w¼Ð°O¦¨°ßŪ¡C§A­nÂмg°ßŪÀɶܡH (§_¡A«h¥H·sÀɦWÀx¦s)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Àˬd¥Ø¼Ð¼g¤J©Ê®Éµo¥Í¿ù»~"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "³Æ¥÷Àɮ׮ɵo¥Í¿ù»~"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4163,7 +4143,7 @@ msgstr ""
 "\n"
 "¤´ÂÂÄ~Äò¶Ü¡H"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4180,7 +4160,7 @@ msgstr ""
 "\t-¥H¤£¦P¦WºÙÀx¦sÀÉ®× («ö¡u½T©w¡v)\n"
 "\t-©ñ±ó¥Ø«e¾Þ§@(«ö¡u¨ú®ø¡v)¡H"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4195,7 +4175,7 @@ msgstr ""
 "\n"
 "­nÀx¦s¸Ñ¥]ª©¦¨¥t¤@Àɮ׶ܡH"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4210,7 +4190,7 @@ msgstr ""
 "\n"
 "§A­nÀx¦s¸Ñ«Ê¥]ª©¥»¬°¥t¤@Àɮ׶ܡH"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4225,7 +4205,7 @@ msgstr ""
 "\n"
 "­nÂмg¨º§ó·s¹LªºÀɮ׶ܡH"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4234,7 +4214,7 @@ msgstr ""
 "%1\n"
 "¤w¼Ð°O¦¨°ßŪ¡C¤´­nÂмg¥¦¶Ü¡H"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4249,22 +4229,22 @@ msgstr ""
 "\n"
 "­n­«·s¸ü¤J¥¦¶Ü¡H"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Àx¦s¥ªÃäÀɮ׬°"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Àx¦s¥kÃäÀɮ׬°"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid ""
 "The file\n"
@@ -4275,7 +4255,7 @@ msgstr ""
 "%1\n"
 "®ø¥¢¡C½ÐÀx¦sÀÉ®×°Æ¥»¦AÄ~Äò¡C"
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4283,42 +4263,42 @@ msgid ""
 "Refresh documents before continuing."
 msgstr "¦p¥¼­«¾ãÀɮסAWinMerge ¤£¯à¨Ö¤J²§°Ê¡C"
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "¤@©w±o«ü©w¤@­Ó SourceSafe ±M®×¸ô®|¤~¯àÄ~Äò (¨Ò¦p¡G $/MyProject)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "¥Ñ VSS ¨ú¥XÀÉ®×..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "°e¦^§ï¹LÀɮɡAª©¥»¨t²Î¦^³ø¤@­Ó¿ù»~¡CµLªkÄ~Äò..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "°õ¦æª©¥»¨t²Î«ü¥O®Éµo¥Í¿ù»~¡C"
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "VSS §@·~¸ê®Æ§¨©M¥Ø«eÀɮצì¸m¤£²Å¦X¡C­nÄ~Äò¶Ü¡H"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "§ä¤£¨ì VSS ¸ê®Æ®w¡I"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "VSS µo¥Í¿ù»~¡G"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4329,7 +4309,7 @@ msgstr ""
 " ½ÐÀˬdÀ˵ø¹L«áªº²ÕºA¡C\n"
 " ºM¦^¨ú¥X¡H"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4338,169 +4318,169 @@ msgstr ""
 "ºM¦^¨ú¥XÀɮ׮ɡAª©¥»¨t²Î¦^³ø¤@­Ó¿ù»~¡C\n"
 " ½ÐÀˬdÀ˵ø¹L«áªº²ÕºA¡C"
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "µL"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (¦­©ó 5.0 ª©)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 ª©©M§ó±ßªºª©¥»)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "ªÅ¥Õ³B¤¤Â_"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "ªÅ¥Õ³B©Î¼ÐÂI³B¤¤Â_"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "½Æ»s¿ï¨ú¶µ¨ìnamed ¥Ø¿ý"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "½Æ»s¿ï¨ú¶µ¨ì¦Û­q¥Ø¿ý"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "§R°£¥ªÃ䪺¿ï¨ú¶µ¥Ø"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "§R°£¥kÃ䪺¿ï¨ú¶µ¥Ø"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "§R°£¨âÃ䪺¿ï¨ú¶µ¥Ø"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "ÁôÂÿï¨ú¶µ¥Ø (¦Û°Ê¿z¿ï¾¹)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "¨âÃä¿ï¨ú¶µ¥Ø³£­«·s©R¦W"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "¥kÃä¨ì¥ªÃä (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "¥ªÃä¨ì¥kÃä (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "¥kÃä¨ì¥ªÃä (%2 ¤§ %1)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "¥ªÃä¨ì¥kÃä (%2 ¤§ %1)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "¥ªÃä¨ì... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "¥kÃä¨ì... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "¥ªÃä¨ì... (%2 ¤§ %1)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "¥kÃä¨ì... (%2 ¤§ %1)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "¥ªÃä (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "¥kÃä (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "¨âÃä (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "¥ªÃä (%2 ¤§ %1)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "¥kÃä (%2 ¤§ %1)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "¨âÃä (%2 ¤§ %1)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "¿ï¨ú¥Ø¼Ð¸ê®Æ§¨"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "¥ªÃä - ¿ï¨ú¥Ø¼Ð¸ê®Æ§¨¡G"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "¥kÃä - ¿ï¨ú¥Ø¼Ð¸ê®Æ§¨¡G"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 ¨ü¼vÅTÀÉ®×)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%2 ¨ü¼vÅTÀɮפ§ %1)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4511,17 +4491,17 @@ msgstr ""
 "\n"
 "%1¡H"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "½T©w­n½Æ»s¡G"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "½T©w­n½Æ»s %d ¶µ¥Ø¡G"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4540,613 +4520,613 @@ msgstr ""
 "\n"
 "½Ð­«¾ã¤ñ¸û¡C"
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "½T©w­n²¾°£¡G"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "½T©w­n²¾°£ %d ¶µ¥Ø¡G"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "½T»{²¾°£"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "¶}±Ò¥ªÃäÀÉ®×"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "¶}±Ò¥ªÃäÀɮרì¥~³¡½s¿è¾¹"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "¥H...¶}±Ò¥ªÃäÀÉ®×"
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "¶}±Ò¥kÃäÀÉ®×"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "¶}±Ò¥kÃäÀɮרì¥~³¡½s¿è¾¹"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "¥H...¶}±Ò¥kÃäÀÉ®×"
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "µLªk°õ¦æ¥~³¡½s¿è¾¹ %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "¥¼ª¾°ÆÀɦW©ó¥~³¡½s¿è¾¹¡G%1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "½Æ»sÀɦW¨ì°Å¶Kï"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "½Æ»s¥ªÃä®|¦W¨ì°Å¶Kï"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "½Æ»s¥kÃä®|¦W¨ì°Å¶Kï"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "½Æ»s¨âÃä®|¦W¨ì°Å¶Kï"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr "¥ªÃ䤶­±¿ï³æ"
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr "¥kÃ䤶­±¿ï³æ"
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "¥¼ª¾À£ÁY®æ¦¡"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "¥ªÃ䶵¥Ø¥[¨ìÀ£ÁYÀÉ"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "¥kÃ䶵¥Ø¥[¨ìÀ£ÁYÀÉ"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "¨âÃ䶵¥Ø¥[¨ìÀ£ÁYÀÉ"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "¨âÃä¬Û²§¶µ¥Ø¥[¤J¨ìÀ£ÁYÀÉ"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "¥ªÃä¿ï¨ú¶µ¥Ø²¾¨ì¦Û­q¸ê®Æ§¨"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "¥kÃä¿ï¨ú¶µ¥Ø²¾¨ì¦Û­q¸ê®Æ§¨"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "ÀɮצWºÙ"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "¤ñ¹ïµ²ªG"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "¥ªÃä¤é´Á"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "¥kÃä¤é´Á"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "°ÆÀɦW"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "¥ªÃä¤j¤p"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "¥kÃä¤j¤p"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "¥kÃä¤j¤p (²)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "¥ªÃä¤j¤p (²)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "¥ªÃä«Ø¥ß®É¶¡"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "¥kÃä«Ø¥ß®É¶¡"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "¸û·sÀÉ®×"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "¥ªÃäÀɮת©¥»"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "¥kÃäÀɮת©¥»"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "²¦¡µ²ªG"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "¥ªÃäÄÝ©Ê"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "¥kÃäÄÝ©Ê"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "¥ªÃä EOL"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "¥kÃä EOL"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "¥ªÃä½s½X"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "¥kÃä½s½X"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "©¿²¤ªº®t²§"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "¤G¶i¨î"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "µLªk¤ñ¸ûÀÉ®×"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "¤¤Â_ªº¶µ¥Ø"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "²¤¹LªºÀÉ®×"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "²¤¹Lªº¸ê®Æ§¨"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "¶È¥ªÃä¡G%1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "¶È¥kÃä¡G%1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "¤G¶i¨îÀɧ¹¥þ¬Û¦P"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "¤G¶i¨îÀɤ£¦P"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Àɮפ£¦P"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr "¨â¸ê®Æ§¨¤£¦P"
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "¶È¥ªÃä"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "¶È¥kÃä"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "¿ù»~"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr "¤å¦rÀɤº®e¬Û¦P"
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr "¤å¦rÀɤº®e¤£¦P"
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "¸g¹L®É¶¡¡G %ld ²@¬í"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "¤w¿ï¨ú 1 ­Ó¶µ¥Ø"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "¤w¿ï¨ú %1 ­Ó¶µ¥Ø"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "ÀɮצWºÙ©Î¸ê®Æ§¨¦WºÙ¡C"
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "¥]¬A¤l¸ê®Æ§¨®É¤§¤l¸ê®Æ§¨¦WºÙ¡C"
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "¤ñ¸ûµ²ªG¡Aªø¦¡ªí³æ¡C"
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "¥ªÃä­×§ï¤é´Á¡C"
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "¥ªÃä­×§ï¤é´Á¡C"
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "°ÆÀɦW¡C"
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "¥ªÃäÀɮצ줸²Õ¤j¤p¡C"
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "¥kÃäÀɮצ줸²Õ¤j¤p¡C"
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "¥ªÃäÀɮײ¦¡¤j¤p¡C"
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "¥kÃäÀɮײ¦¡¤j¤p¡C"
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "¥ªÃä«Ø¥ß®É¶¡¡C"
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "¥kÃä«Ø¥ß®É¶¡¡C"
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "§iª¾¨ºÃ䦳¸û·sªº­×§ï¤é´Á¡C"
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "¥ªÃäÀɮת©¥»¡A¥u¬Y¨ÇÀÉ®×Ãþ«¬¡C"
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "¥kÃäÀɮת©¥»¡A¥u¬Y¨ÇÀÉ®×Ãþ«¬¡C"
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "µu¦¡¤ñ¸ûµ²ªG¡C"
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "¥ªÃäÄÝ©Ê¡C"
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "¥kÃäÄÝ©Ê¡C"
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "¥ªÃäÀÉ®× EOL Ãþ«¬"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "¥kÃäÀÉ®× EOL Ãþ«¬"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "¥ªÃä½s½X¡C"
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "¥kÃä½s½X¡C"
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "³Q©¿²¤ªºÀɮפ¤ªº®t²§­Ó¼Æ¡C¬J³Q©¿²¤¡A´N¤£¯à¦X¨Ö¡C"
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Àɮפ¤ªº®t²§­Ó¼Æ¡C¦¹¼Æ¤£¥]¬A³Q©¿²¤ªº®t²§¡C"
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "¬O¤G¶i¨îÀÉ¡A´NÅã¥Ü¬P¸¹ (*)"
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "¤ñ¸û %1 ©M %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "³r¸¹¤À¹j¦Cªí"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "¸õ®æ¸¹¤À¹j¦Cªí"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "³æ¯Â HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "³æ¯Â XML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "³ø§iÀɤw¸g¦s¦b¡CÂл\¤§¡H"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5155,32 +5135,32 @@ msgstr ""
 "²£¥Í³ø§i®Éµo¥Í¿ù»~¡G\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "¦¨¥\²£¥Í³ø§i¡C"
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "¬Û¦PÀɮ׶}±Ò¨ì¨âÃä¡C"
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "©Ò¿ïÀɮק¹¥þ¬Û¦P¡C"
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "¤ñ¹ïÀɮ׮ɵo¥Í¿ù»~¡C"
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "µLªk«Ø¥ß¼È¦sÀɮסC½ÐÀˬd¼È¦s¸ô®|¤§³]©w¡C"
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5195,7 +5175,7 @@ msgstr ""
 "\n"
 "ª`·N¡G¦p­n±N©Ò¦³´«¦æ¦r¤¸µø­Y¬Û¦P¡A±o¦b(½s¿è > ¿ï¶µ) ¿ï¶µ¹ï¸Ü²°¤§¡u¤ñ¸û¡v­¶ÅÒ³]©w¿ï¶µ¦¨¡u©¿²¤´«¦æ¦r¤¸¤§®t²§¡v¡C"
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5206,22 +5186,22 @@ msgstr ""
 "¥H¥Ø«e¿ï¶µ¡A¥¦­Ì·|²Î¤@¨ì¥DÃþ«¬¡C\n"
 "§A­nÅܧó¿ï¶µ¨Ã«O¯d¤£¦PªºÀÉ®×µ²§ô¦r¤¸¶Ü¡H"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "¤@­Ó¿ù»~µo¥Í©ó«e¸m¤£¦PÀÉ®× '%1' ¥H¥~±¾ '%2'¡C «e¸m¤£¦PµLªk¦A®M¥Î¡C"
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "©Ò¿ïªº¸ê®Æ§¨µL®Ä¡C"
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "½s¿è¾¹¤£¯à¶}±Ò¤G¶i¨îÀÉ¡C"
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5236,7 +5216,7 @@ msgstr ""
 "%1\n"
 "¨ì¥t¤@Ãä¡AµM«á¶}±Ò¨â§¨¶Ü¡H"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5247,152 +5227,152 @@ msgstr ""
 "§Y¨Ïºû«ù¦U§O½X­¶·|¤À§O¬Ý¨ì¤å¦r¡A¦ý¦X¨Ö/½Æ»s·|¦³¦MÀI¡C\n"
 "­n¨Ï¥Î¬Û¦Pªº¹w³] windows ½s½X­¶¥h¬Ý¨âÃä¶Ü¡H(«Øij)"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "ĵ§i¡GÀɮרϥΤ£¦Pªº½s½X¡A¥ªÃä=%s¡A¥kÃä=%s¡A¦X¨Ö¥i¯à¾É­P¸ê°T·l¥¢¡C"
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "¦]½s½X°ÝÃD¾É­P¤º®eµLªk¥¿±`§e²{¡G¨â­ÓÀɮ׬Ҧp¦¹¡C"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "µL®t²§"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "¦æ¤º®t²§"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "¤w¨ú¥N %1 ­Ó¦r¦ê¡C"
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "§ä¤£¨ì \"%s\" ¦r¦ê"
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "½Æ»s§¹¾ã¸ô®|"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "½Æ»sÀɦW"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
 # also refer to line 5584
 # ¦ì¸mµ¡®æ
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "»·±æµ¡®æ"
 
 # also refer to line 5578
 # ®t²§µ¡®æ
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "ªñ¹îµ¡®æ"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "¸ÉºóÀɦ¨¥\¼g¤J¡C"
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. ¶µ¥Ø§ä¤£¨ì©Î¥¦¬O¸ê®Æ§¨¡I"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. ¶µ¥Ø§ä¤£¨ì©Î¥¦¬O¸ê®Æ§¨¡I"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "¸ÉºóÀɤw¦s¦b¡C­nÂмg¥¦¶Ü¡H"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 ­ÓÀɮפw¿ï¨ú]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "¤@¯ë"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "¯ßµ¸"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "¦P¤@¤Æ"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "µLªk¼g¤J¨ìÀÉ®× %1¡C"
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "«ü©wªº¿é¥X¸ô®|¤£¬Oµ´¹ï¸ô®|¡G%1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "«ü©w¤@­Ó¿é¥XÀÉ"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "µLªk±q¤G¶i¨îÀɫظɺóÀÉ¡C"
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "µLªk±q¥Ø¿ý«Ø¸ÉºóÀÉ¡C"
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5403,17 +5383,17 @@ msgstr ""
 "\n"
 "«Ø¸ÉºóÀÉ«e±o¥ýÀx¦sÀɤº©Ò¦³²§°Ê¡C"
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "¸ê®Æ§¨¤£¦s¦b¡C"
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "·|²M°£¥Ø«eªº¸ê®Æ§¨¤ñ¸ûµ²ªG¡C"
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5424,7 +5404,7 @@ msgstr ""
 "§ä¤£¨ì¤ä´©À£ÁYªº©Ò¦³¥²­n¤¸¥ó (7-Zip ©M/©Î Merge7z*.dll)¡C\n"
 "½Ð°Ñ¦Ò¤â¥U¨ú±o§ó¦h¦³ÃöÀ£ÁY¤ä´©©M±Ò¥ÎÀ£ÁYªº¸ê°T¡C"
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5433,7 +5413,7 @@ msgstr ""
 "\n"
 "ª`·N¡GWinMerge ³]©w¤¤¤wÃö³¬ 7-Zip ¤§¾ã¦X¡C"
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5442,37 +5422,37 @@ msgstr ""
 "\n"
 "ª`·N¡GWinMerge ³]©w¤¤ 7-Zip ¤w³]¦¨¿W¥ß¹B§@¡C"
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "¿ï¨úÀÉ®×¥H¶×¥X"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "¿ï¨úÀÉ®×¥H¶×¤J"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "±qÀɮ׶פJ¿ï¶µ¡C"
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "¶×¥X¿ï¶µ¨ìÀɮסC"
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "µLªk±qÀɮ׶פJ¿ï¶µ¡C"
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "µLªk¶×¥X¿ï¶µ¨ìÀɮסC"
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5483,243 +5463,243 @@ msgstr ""
 "\n"
 "­nÄ~Äò¶Ü¡H"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Ãþ«¬ªí¦¡¿ù»~"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "¨S¦³²Å¦Xªí¦¡ªº"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "µL®ÄªºÃþ«¬ªí¦¡"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "µL®Äªº¤ñ¸û¦r¤¸"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "µL®Äªº¦r¤¸Ãþ¦WºÙ"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "©ì¦²¤Ï±×½u"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "µL®Äªº¦^°Ñ"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "[ or [^ ¤£§¹¾ã"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "( or \\( ¤£§¹¾ã"
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "\\{ ¤£§¹¾ã"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "\\{\\} ¤¤¬°µL®Ä¤º®e"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "µL®Äªº½d³ò¬É"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "°O¾ÐÅ餣¨¬"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "µL®Äªº«e¸mÃþ«¬ªí¦¡"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Ãþ«¬ªí¦¡¥¼§¹"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Ãþ«¬ªí¦¡¤Óªø"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "¥¼§ä¨ì ) or \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "²V¦X"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Ãþ«¬"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "¸Ñ¥]¾¹"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr "¥ý¦æ³B²z¾¹"
 
 # What does "Editor script" mean? Perhaps "editing scripts" or "scripts to edit"?
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "½s¿è¾¹ÀHĶ§Y¦æ½X"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Àx¦s¥ªÃäÀÉ®×"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Àx¦s¥kÃäÀÉ®×"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Àx¦s¥ªÃäÀÉ®×¥H¦WºÙ..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Àx¦s¥kÃäÀÉ®×¥H¦WºÙ..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Âà´«¦æ§À¦r¤¸¬° Windows ¦¡"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Âà´«¦æ§À¦r¤¸¬° Unix ¦¡"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Âà´«¦æ§À¦r¤¸¬° Mac ¦¡"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "½s¿è©M¦X¨Ö¼Ò¦¡¤Á´«"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5728,12 +5708,12 @@ msgstr ""
 "À˵ø»P½Õ¾ãÀÉ®×½s½X\n"
 "ÀÉ®×½s½X"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "¶}±Ò¨Ã¸Ñ¨M½Ä¬ðÀÉ"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5742,7 +5722,7 @@ msgstr ""
 "¿ï¨ú¥Ø«e¦æ¤§®t²§³¡¥÷\n"
 "¥Ø«e¦æ¤§®t²§"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5751,7 +5731,7 @@ msgstr ""
 "²¾¦Ü¬Y¦æ©Î¬Y¬Û²§°Ï¶ô\n"
 "²¾¦Ü (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5760,7 +5740,7 @@ msgstr ""
 "³]©wµ{¦¡¿ï¶µ\n"
 "¿ï¶µ"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5769,37 +5749,37 @@ msgstr ""
 "­«¾ã«áÅã¥Ü\n"
 "­«¾ã (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "½Æ»s¿ï¨ú¦æ¨ì°Å¶Kï(ªþ¥[¦æ¸¹©ó¦æ­º)"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "¶}Ãö®ÑÅÒ"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "¦Ü¤U¤@®ÑÅÒ"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "¦Ü¤W¤@®ÑÅÒ"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "²M°£©Ò¦³®ÑÅÒ"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5808,7 +5788,7 @@ msgstr ""
 "Åã¥Ü§¹¥þ¬Û¦Pªº¶µ¥Ø\n"
 "Åã¥Ü¬Û¦P¶µ¥Ø"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5817,7 +5797,7 @@ msgstr ""
 "Åã¥Ü¬Û²§ªº¶µ¥Ø\n"
 "Åã¥Ü¬Û²§¶µ¥Ø"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5826,7 +5806,7 @@ msgstr ""
 "Åã¥Ü¥u¦b¥ªÃ䦳ªº¶µ¥Ø\n"
 "Åã¥Ü¥ªÃä¿W¦³¶µ¥Ø"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5835,7 +5815,7 @@ msgstr ""
 "Åã¥Ü¥u¦b¥kÃ䦳ªº¶µ¥Ø\n"
 "Åã¥Ü¥kÃä¿W¦³¶µ¥Ø"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5844,7 +5824,7 @@ msgstr ""
 "Åã¥Ü¤G¶i¨îÀÉ®×\n"
 "Åã¥Ü¤G¶i¨îÀÉ®×"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5853,7 +5833,7 @@ msgstr ""
 "Åã¥Ü²¤¹Lªº¶µ¥Ø\n"
 "Åã¥Ü²¤¹Lªº¶µ¥Ø"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5862,7 +5842,7 @@ msgstr ""
 "¿ï¨úÀ˵ø¥Î¦r«¬\n"
 "¿ï¨úÀ˵ø¦r«¬"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5871,30 +5851,30 @@ msgstr ""
 "«ì´_¨Ï¥Î¹w³]ªº¨t²Î¦r«¬©óÀ˵ø\n"
 "¹w³]ªº¦r«¬"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Åã¥ÜªÅ¥Õ©M¸õ®æ¦r¤¸"
 
 # I would suggest "Toggle Microview Pane" instead.
 # "¶}Ãö®t²§µ¡®æ"
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "¶}Ãöªñ¹îµ¡®æ"
 
 # ¦ì¸mµ¡®æÅã¥ÜÀÉ®×¥þ¹³
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "»·±æµ¡®æÅã¥ÜÀÉ®×¥þ¹³"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Åã¥Ü¸ê®Æ§¨¤ñ¸û¤§²Î­p¹ï¸Ü²°"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5903,7 +5883,7 @@ msgstr ""
 "¿ï¨ú¥Ø«e¨Ï¥ÎªÌ¤¶­±»y¨¥\n"
 "»y¨¥"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5912,12 +5892,12 @@ msgstr ""
 "¥H¤£¦P¦â±mÅã¥Ü¦æ¤º®t²§\n"
 "Åã¥Ü¦æ¤º®t²§"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "¹ï½Õ¨âµ¡®æ¦ì¸m"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5926,7 +5906,7 @@ msgstr ""
 "Åã¥Ü¦æ¸¹\n"
 "Åã¥Ü¦æ¸¹"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5935,7 +5915,7 @@ msgstr ""
 "±Ò¥Î¦Û°Ê§é¦æ\n"
 "¦Û°Ê§é¦æ"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5944,22 +5924,22 @@ msgstr ""
 "Åã¥Ü¨âµ¡¤§Ãä°Ï\n"
 "Åã¥Ü¨âµ¡Ãä°Ï"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "¥[¤j¤å¦r"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "ÁY¤p¤å¦r"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "«ì´_¤å¦r­ì©l¤j¤p"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5968,7 +5948,7 @@ msgstr ""
 "±²¨ì¤W¤@®t²§\n"
 "¤W¤@®t²§ (Alt+Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5977,67 +5957,67 @@ msgstr ""
 "±²¨ì¤U¤@®t²§\n"
 "¤U¤@®t²§ (Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -6046,7 +6026,7 @@ msgstr ""
 "±²¨ì³Ìªì®t²§\n"
 "³Ìªì®t²§ (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6055,7 +6035,7 @@ msgstr ""
 "±²¨ì¥Ø«e®t²§\n"
 "¥Ø«e®t²§ (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6064,7 +6044,7 @@ msgstr ""
 "±²¨ì³Ì¥½®t²§\n"
 "³Ì¥½®t²§ (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6073,7 +6053,7 @@ msgstr ""
 "½Æ»s®t²§°Ï¶ô¨ì¥kÃäÀÉ®×\n"
 "½Æ»s¨ì¥kÃä (Alt+Right)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6082,7 +6062,7 @@ msgstr ""
 "½Æ»s®t²§°Ï¶ô¨ì¥ªÃäÀÉ®×\n"
 "½Æ»s¨ì¥ªÃä (Alt+Left)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6091,7 +6071,7 @@ msgstr ""
 "½Æ»s®t²§¨ì¥kÃä¨Ã¨ì¤U¤@®t²§\n"
 "½Æ»s¨ì¥kÃä¨Ã«e¶i (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6100,7 +6080,7 @@ msgstr ""
 "½Æ»s®t²§¨ì¥ªÃä¨Ã¨ì¤U¤@®t²§\n"
 "½Æ»s¨ì¥ªÃä¨Ã«e¶i (Ctrl+Alt+Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6109,7 +6089,7 @@ msgstr ""
 "½Æ»s©Ò¦³®t²§¨ì¥kÃäÀÉ®×\n"
 "©Ò¦³¨ì¥kÃä"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6118,81 +6098,81 @@ msgstr ""
 "½Æ»s©Ò¦³®t²§¨ì¥ªÃäÀÉ®×\n"
 "©Ò¦³¨ì¥ªÃä"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "±q¨âÃä¥Ø¿ý°»´ú©Ò¦³¶µ¥Ø"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "¤ñ¸û¿ï¨ú¶µ¥Ø(­Y¬°¦h­«¿ï¨ú¶µ¥Ø¡A¤ñ¸û¨ä²Ä¤@­Ó¶µ¥Ø)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "¿ï¨ú¨Ã¬ö¿ý¸ê®Æ§¨¤ñ¸ûÄæ¦ì"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "²£¥Í¸ÉºóÀÉ"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "¿ï¨ú¨Ã­×§ï¿z¿ï¾¹"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "±q¤ñ¸ûµ²ªG²£¥Í³ø§i"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "¦C¥X¥i¥Îªº¥~±¾"
 
 # "¨Ï¥ÎªÌ¿ï¨ú¸ÑÀ£¾¹(¤ñ¸û¸ê®Æ§¨®É¤£¸ÑÀ£)
 # " I would suggest "The user selects the unpacker (no automatic unpacking non-text files when comparing dir)" instead.
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "¨Ï¥ÎªÌ¿ï¨ú¸Ñ¥]¾¹(¤ñ¸û¸ê®Æ§¨®É¤£¦Û°Ê¸Ñ¶}«D¯Â¤å¦rÀÉ®×)"
 
 # Instead of "one file only needs the extension" I would suggest "at least one file should have a needed extension".
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "¥H¿ï¥Îªº¸Ñ¥]¾¹¥Î¨ì¨â­ÓÀÉ (¦Ü¤Ö¤@­ÓÀɮ׻ݰÆÀɦW)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "¿ï¤@­Ó¸Ñ¥]¾¹¥H½s¿è³o­ÓÀÉ®×"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "¤£­n¥ý¦æ³B²z¾¹ (±`ºA)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "«Øijªº¥~±¾"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "¨ä¥L¥~±¾"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "¨ø¸ü©Ò¦³¥~±¾¦A­«·s¸ü¤J (¾A¥Îµo®iªÌ)"
 
 # The original text is strange because the next file seems to be always visible. The correct one is "Activate next file" or "Change the focus to next file", etc.
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6201,12 +6181,12 @@ msgstr ""
 "¤Á´«µJÂI¦Ü¥t¤@ÀÉ\n"
 "¤Á´«¦Ü¥t¤@ÀÉ"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Ãö³¬©Ò¦³¶}±Òµøµ¡"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6215,22 +6195,22 @@ msgstr ""
 "¶}±Ò WinMerge »¡©úÀÉ\n"
 "WinMerge »¡©ú"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "¿é¥X¥Ø«e WinMerge ª©¥»¸ê°T¤Î¨ä²ÕºA¨ì¤å¦rÀÉ®×"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "Åã¥Ü GNU ¤@¯ë¤½¦@±ÂÅvÃÒ"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "¨p¤H½sĶ¡G%1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6239,7 +6219,7 @@ msgstr ""
 "¶}±Òµo¦æ»¡©ú\n"
 "µo¦æ»¡©ú"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6248,272 +6228,272 @@ msgstr ""
 "¶}±Ò½Ķ¤åºô¯¸\n"
 "½Ķ"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "¥~±¾³]©w"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "¤£­n¥Î¥ý¦æ³B²z¾¹"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "¦p¥i¯à´N¥Î¥ý¦æ³B²z¾¹"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "§ä¤£¨ì WSH - °±¥Î .sct «ü¥O½X"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<µL>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<¦Û°Ê>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "¥Hµn¿ýªºÀ³¥Îµ{¦¡¶}±ÒÀÉ®×"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "¥H¥~¦b½s¿è¾¹¶}±ÒÀÉ®×"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "¥H¯S©wÀ³¥Îµ{¦¡¶}±ÒÀÉ®×"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "¤£Åã¥Ü²¾¦ìªº°Ï¶ô"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Åã¥Ü©Ò¦³²¾¦ìªº°Ï¶ô"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "¶È´N¥Ø«e¬Û²§³BÅã¥Ü¨ä²¾¦ìªº°Ï¶ô"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "¸õ¨ì²{¦b¹«¼Ð¤U©Ò¥Ü¦æ"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "¦Ü %2 ¤§²Ä %1 ¬Û²§³B(&O)"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "¦Ü²Ä %1 ¦æ(&O)"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Ãö³¬"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "±qÀɮרt²Î"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "±q MRU ªí"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "µL°ª«G«×Åã¥Ü"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Batch"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "¥iÄ⦡ª«¥ó"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Resources"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr "Verilog"
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "ÁôÂäu¨ã¦C"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Åã¥Ü¤p¤u¨ã¦C"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Åã¥Ü¤j¤u¨ã¦C"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index 9198780..975e4bd 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -1030,7 +1030,7 @@ msgid "&Scripts"
 msgstr "&Skripte"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< ni\9ata >"
@@ -1471,7 +1471,7 @@ msgid "&Versioning System:"
 msgstr "&Izbor programa:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Staza do cleartool.exe:"
@@ -1672,7 +1672,7 @@ msgid "Replace &All"
 msgstr "Zamijeni &sve"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Racionalno ClearCase"
@@ -2584,7 +2584,7 @@ msgid "Files:"
 msgstr "Datoteke:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Razlika"
@@ -2621,7 +2621,7 @@ msgid "Right:"
 msgstr "Desno:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Identièno"
@@ -2821,7 +2821,7 @@ msgid "A&ppend timestamp"
 msgstr "&Dodaj datum i vrijeme"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Potvrdite kopiranje"
@@ -2899,7 +2899,7 @@ msgstr "Dodaj &Shall izbornik u kontekstni izbornik"
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Mapa"
@@ -3539,7 +3539,7 @@ msgid "Version Control"
 msgstr "Programi"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Razlike"
@@ -3668,87 +3668,67 @@ msgstr "XML datoteke (*.xml)|*.xml|Sve datoteke (*.*)|*.*||"
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Potpun sadr\9eaj"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Skraæeni sadr\9eaj"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Datum promjene"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Datum promjene i velièina"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Velièina"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Naziv"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Polo\9eaj"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filtri..."
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Opis"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Izaberite datoteku kao novi filtar"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "FLT datoteke (*.flt)|*.flt|Sve datoteke (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3761,7 +3741,7 @@ msgstr ""
 "Molimo, kopirajte datoteku %1 u WinMerge/Filters -mapu:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3774,7 +3754,7 @@ msgstr ""
 "\n"
 "Provjerite postoji li mapa i njenu dostupnost."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3785,7 +3765,7 @@ msgstr ""
 "\n"
 "Molimo, odredite ju u 'Postavke/Sistem'."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3798,12 +3778,12 @@ msgstr ""
 "\n"
 "Mo\9eda je za\9atiæena - samo za èitanje?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Locirajte datoteku filtriranja za instalaciju"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3814,17 +3794,17 @@ msgstr ""
 "\n"
 "Ne mogu je pohraniti u mapu filtara."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Filtar veæ postoji. Natpisati ga?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Algoritam"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3835,243 +3815,243 @@ msgstr ""
 "\n"
 "Ako odaberete 'Ne', to mo\9eete uæiniti i kasnije.."
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "&Staza do SS.EXE:"
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Rezultati usporedbe mapa"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Usporedba datoteka"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Neimenovan"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Neimenovan"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "Tuðe datoteke"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "Moje datoteke"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Pretra\9eivanje datoteka..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Otvaranje odabranog"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Kopiranje lijevo u desno"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Kopiranje desno u lijevo"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Kopiranje sve u lijevo"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Kopiranje sve u desno"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Kopiranje datoteka..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Brisanje datoteka..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Premje\9atanje datoteka..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Stvaranje izvje\9ataja..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Poni\9atenje zadnje operacije..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "Ponavljanje prethodne operacije..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Redak: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Usporedo"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Razlika:  %1 od %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "Naðeno razlika:  %1"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "Naðeno razlika: 1"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "SÈ"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Stavka %1 od %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Stavke: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Odaberite dvije datoteke ili mape za usporedbu"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Izbor mape"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Odabir dvije datoteke ili mape za usporedbu."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "Nedostaje staza do lijeve datoteke!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Nedostaje staza do desne datoteke!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Obje staze su krive!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Molim izaberite dvije datoteke koje prihvaæa arhiver."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Ne mogu usporediti datoteku i mapu."
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Nema datoteke: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Datoteka nije raspakirana: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4084,12 +4064,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Ne mogu podjeliti konfliktnu datoteku."
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4100,32 +4080,32 @@ msgstr ""
 "%1\n"
 "nije konfliktna."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Pohrani kao"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Pohraniti izmjene %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 je oznaèena smo za èitanje. Natpisati za\9atiæenu datoteku? (Stisnite 'Ne', za pohranu pod novim nazivom.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Gre\9aka pri kontroli moguænosti pohrane na odredi\9atu"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Gre\9aka pri stvaranju rezervne datoteke"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4138,7 +4118,7 @@ msgstr ""
 "\n"
 "Nastaviti?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4155,7 +4135,7 @@ msgstr ""
 "\t- Pritisnite 'U redu' za pohranu pod drugim nazivom\n"
 "\t- ili pritisnite 'Odustajem' za prekid postupka."
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4170,7 +4150,7 @@ msgstr ""
 "\n"
 "Pohraniti nespakiranu verziju kao datoteku?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4185,7 +4165,7 @@ msgstr ""
 "\n"
 "Pohraniti nespakiranu verziju kao datoteku?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4200,7 +4180,7 @@ msgstr ""
 "\n"
 "Natpisati datoteku?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4209,7 +4189,7 @@ msgstr ""
 "%1\n"
 "je oznaèena samo za èitanje. Natpisati za\9atiæenu stavku?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4224,22 +4204,22 @@ msgstr ""
 "\n"
 "\8eelite li ponovno uèitanje datoteke?"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Pohrani lijevu datoteku kao"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Pohrani desnu datoteku kao"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid ""
 "The file\n"
@@ -4250,7 +4230,7 @@ msgstr ""
 "%1\n"
 "je nestala. Za nastavak, pohranite kopiju."
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4261,42 +4241,42 @@ msgstr ""
 "\n"
 "Osvje\9eite dokumente prije nastavka."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Odredite SourceSafe stazu usporedbe, ako \9eelite nastaviti (ie:  $/MyProject)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Provjera datoteka na VSS..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "Sistem pokazuje gre\9aku dok poku\9aava provjeriti datoteku.  Nastavak nemoguæ..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Gre\9aka pri izvr\9aenju sistemske naredbe."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "VSS radna mapa i lokacija aktivne datoteke se ne poklapaju. Nastaviti?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Nema VSS baze"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Gre\9aka iz VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4307,7 +4287,7 @@ msgstr ""
 " Molimo pregledajte pode\9aenost kori\9atenog izgleda. .\n"
 " Odustati?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4316,169 +4296,169 @@ msgstr ""
 "Versioning Sistem pokazuje gre\9aku dok poku\9aava provjeriti datoteku.\n"
 " Molimo pregledajte pode\9aenost kori\9atenog izgleda. "
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Ni\9ata"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (5.0 i vi\9ai)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 i vi\9ai)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Stani na razmaku"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Stani na razmaku ili interpunkciji"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Kopiraj odabranu stavku u imenovanu mapu"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Kopiraj odabranu stavku u korisnikovu mapu"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Obri\9ai odabranu stavku s lijeva"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Obri\9ai odabranu stavku s desna"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Obri\9ai odabranu stavku na obje strane"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Sakrij odabranu(e) stavku(e) (filtar u letu)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Preimenuj odabranu stavku na obje strane"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Desno do lijevo (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Lijevo do desno (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Desno do lijevo (%1 od %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Lijevo do desno (%1 od %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Lijevo do... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Desno do... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Lijevo do... (%1 od %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Desno do... (%1 od %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Lijevo (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Desno (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Oba panela (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Lijevo (%1 od %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Desno (%1 od %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Oba panela (%1 od %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Odaberite odredi\9anu mapu:"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Lijeva strana - odaberite odredi\9anu mapu:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Desna strana - odaberite odredi\9anu mapu:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 datoteka doraðeno)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 od %2 datoteka doraðeno)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4489,17 +4469,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Kopirati? -"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Kopirati %d stavku:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4518,613 +4498,613 @@ msgstr ""
 "\n"
 "Osvje\9eite usporedbu."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "Premjestiti?"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "Premjestiti %d stavku?"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "Potvrdite premje\9atanje"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Otvori lijevu datoteku"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Otvori lijevu datoteku u vanjskom editoru"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Otvori lijevu datoteku s..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Otvori desnu datoteku"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Otvori desnu datoteku u vanjskom editoru"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Otvori desnu datoteku s..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Gre\9aka pri pokretanju vanjskog editora: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Nepoznat tip datoteke za vanjski editor: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Kopiraj nazive datoteka u meðumemoriju"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Kopiraj stazu lijeve strane u meðumemoriju"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Kopiraj stazu desne strane u meðumemoriju"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Kopiraj staze obiju strana u meðumemoriju"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr "Lijevi Shell izbornik"
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr "Desni Shell izbornik"
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Nepoznat oblik arhiva"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Dodaj stavke s lijeva u arhiv"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Dodaj stavke s desna u arhiv"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Dodaj stavke obiju strana u arhiv"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Dodaj stavke razlika u arhiv (obje strane)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Premje\9ataj oznaèene datoteke s lijeva u izabranu mapu"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Premje\9ataj oznaèene datoteke s desna u izabranu mapu"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Naziv datoteke"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Rezultat usporedbe"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Datum lijevo"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Datum sada\9anji"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Tip"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Velièina lijevo"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Velièina desno"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Velièina desno (skraæeno)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Velièina lijevo (skraæeno)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Tim lijeve datoteke"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Tim desne datoteke"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Novija datoteka"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Verzija lijeve datoteke"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Verzija desne datoteke"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Rezultat skraæeno"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Atributi lijevo"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Atributi desno"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "Zavr\9aetak reda lijevo"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "Zavr\9aetak retka desne datoteke."
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Kodiranje lijevo"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Kodiranje desno"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Zanemari razlike"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binarno"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Ne mogu usporediti datoteke"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Odbaèena stavka"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Izostavljene datoteke"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Izostavljene mape"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Samo lijevi: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Samo desni: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Binarne datoteke su identiène"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Binarne datoteke su razlièite"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Datoteke su razlièite"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr "Mape su razlièite"
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Samo lijevo"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Samo desno"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Gre\9aka"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr "Tekstovi su identièni"
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr "Tekstovi su razlièiti"
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Proteklo vrijeme: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 stavka oznaèena"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 stavki oznaèeno"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Naziv datoteke ili mape."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Nazivi podmapa ako su podmape ukljuèene."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Rezultat usporedbe, du\9ei oblik."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Lijeva strana - datum promjene."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Desna strana - datum promjene."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Tip (ekstenzija) datoteke"
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Velièina u bajtima, lijeve datoteke."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Velièina u bajtima, desne datoteke."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Skraæenice lijeve datoteke"
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Skraæenice desne datoteke"
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Lijeva strana - vrijeme stvaranja."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Desna strana - vrijeme stvaranja."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Koja strana je promijenjena ranije?"
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Verzija na lijevoj strani, samo za neke tipove."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Verzija na desnoj strani, samo za neke tipove."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Rezultat usporedbe, kraæi oblik."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Atributi lijeve datoteke"
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Atributi desne strane"
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Naèin zavr\9aetka retka lijeve datoteke."
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Naèin zavr\9aetka retka desne datoteke."
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Kodirana lijeva strana"
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Kodiranje desne strane"
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Broj zanemarenih razlika u datoteci. Zanemarene razlike ne mogu biti spajane u WinMergeu."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Broj razlika u datoteci. Zanemarene razlike nisu ukljuèene."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Prika\9ei zvjezdicu (*) uz binarnu datoteku."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Usporedi %1 s %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Popis odvojen zarezom"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Popis odvojen tabulatorom"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "Jednostavni HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "Jednostavni HTML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Datoteka izvje\9ataja veæ postoji. Natpisati?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5133,32 +5113,32 @@ msgstr ""
 "Gre\9aka pri stvaranju izvje\9ataja:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Izvje\9ataj je uspje\9ano stvoren."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Ista datoteka je otvorena u oba panela."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Datoteke su identiène."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Gre\9aka pri usporedbi datoteka."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Ne mogu stvoriti privremenu datoteku. Provjerite postavke staze."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5173,7 +5153,7 @@ msgstr ""
 "\n"
 "Napomena: \8eelite li uvijek zadr\9eati li razlièitost prijelaza u drugi redak, odaberite 'Zanemari razlièitost prijelaza u drugi redak..' u kartici usporedbi u oknu dijaloga 'Ureðivanje/Postavke."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5184,22 +5164,22 @@ msgstr ""
 " Prema postavkama, promijenit æe se kako je odabrano.\n"
 " Izmijeniti ovu postavku i zadr\9eati razlièit naèin zavr\9aetaka?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Gre\9aka prilikom prediffing datoteke '%1' s dodatkom '%2'. Prediffing se dalje ne izvodi."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "Odabrana mapa je pogre\9ana."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Ne mogu otvoriti binarnu datoteku u ureðivaèu"
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5214,7 +5194,7 @@ msgstr ""
 "%1\n"
 "na drugoj strani i otvoriti je?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5225,148 +5205,148 @@ msgstr ""
 "Prikaz svake datoteke u vlastitoj ks je ljep\9ai, ali dovodi do te\9akoæa prilikom spajanja ili kopiranja.\n"
 "Preporuèamo obje datoteke prikazati u Windows prednamje\9atenoj kodnoj stranici?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Pa\9enja: Datoteke su kodirane razlièito, lijeva=%s, a desna=%s, i spajanje mo\9ee prouzroèiti gubitak informacija."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Gre\9akom pri kodiranju izgubljena je informacija: obje datoteke"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Nema razlike"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Razlièiti redak"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Zamijenjeno %1 pojam (pojmova)."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Ne mogu naæi pojam \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Kopiraj stazu"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Kopiraj naziv datoteke"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Polo\9eaj panela"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Panel razlika"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Datoteka razlika je pohranjena."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. stavka ili mapa ne postoji!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. stavka ili mapa ne postoji!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Datoteka razlika veæ postoji. Natpisati?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 datoteka odabrano]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Uobièajeno"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Detaljnije"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Zdru\9eeno"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Ne mogu pohraniti u datoteku"
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Dana staza ne odgovara: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Odredite izlaznu datoteku"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Ne mogu stvoriti datoteku razlika iz binarnih datoteka"
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Ne mogu stvoriti datoteku razlika mapa."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5377,17 +5357,17 @@ msgstr ""
 "\n"
 "Prije stvaranja datoteke razlika, sve datoteke trebaju biti pohranjene."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Mapa ne postoji"
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Rezultati usporedbi mapa æe biti uklonjeni."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5398,7 +5378,7 @@ msgstr ""
 "Nema nu\9enih komponenata (7-zip i/ili Merge7z*.dll) .\n"
 "Pregledajte upute kako omoguæiti rad s arhivama."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5407,7 +5387,7 @@ msgstr ""
 "\n"
 "Napomena: Integracija 7-Zip je onemoguæena u WinMerge postavkama."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5416,37 +5396,37 @@ msgstr ""
 "\n"
 "Napomena: Integrirani 7-Zip je ogranièen na samostalno djelovanje unutar WinMerge postavki."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Odabir datoteke za izvoz"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Odabir datoteke za uvoz"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Uvoz postavki u datoteku"
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Izvoz postavki u datoteku"
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Gre\9aka pri uèitanju postavki"
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Gre\9aka pri pohrani odabranih postavki."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5457,242 +5437,242 @@ msgstr ""
 "\n"
 "Nastaviti?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Gre\9aka u algoritmu"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Nema"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Krivi algoritam"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Krivi znak"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Krivi znak naziva klase"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Znak \"\""
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Kriva referenca"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Neodgovarajuæe [ ili [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Neodgovarajuæe ( ili \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Neodgovarajuæe"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Krivi sadr\9eaj \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Krivi kraj raspona"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Izvan memorije"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Neoèekivan kraj algoritma"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Prerani kraj algoritma"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Dani algoritma je prevelik"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Neodgovarajuæe ) ili \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Mixed"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "NR"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "DR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "DRNR"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Tip"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "Raspakiravaè"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr "Prediffer"
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "Ureðivaè skripti"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Pohrani lijevu datoteku"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Pohrani desnu datoteku"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Pohrani lijevu datoteku pod nazivom..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Pohrani desnu datoteku pod nazivom..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Pretvori kraj retka na Windows naèin"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Pretvori kraj retka na Unix naèin"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Pretvori kraj retka na Mac naèin"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Naèina rada: Ureðivanje - Usporedo"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5701,12 +5681,12 @@ msgstr ""
 "Prikaz i pode\9aavanje moguænosti kodiranja datoteka\n"
 "Moguænosti kodiranja"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "Otvaranje i rje\9aavanje konfliktnih datoteka"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5715,7 +5695,7 @@ msgstr ""
 "Isticanje razlike u aktivnom retku\n"
 "Razlike u aktivnom retku"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5724,7 +5704,7 @@ msgstr ""
 "Idi na redak razlike\n"
 "Idi na (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5733,7 +5713,7 @@ msgstr ""
 "Postavke programa\n"
 "Postavke "
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5742,37 +5722,37 @@ msgstr ""
 "Osvje\9eavanje prikaza\n"
 "Osvje\9ei (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Kopiraj redak u meðumemoriju s brojem retka na poèetku"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Zamijeni oznake"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Slijedeæa oznaka"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Prethodna oznaka"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Ukloni sve oznake"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5781,7 +5761,7 @@ msgstr ""
 "Prikaz jednakih stavki\n"
 "Identiène stavke"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5790,7 +5770,7 @@ msgstr ""
 "Prikazivanje stavki koje se razlikuju\n"
 "Prikaz razlièitih stavki"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5799,7 +5779,7 @@ msgstr ""
 "Prikaz jedinih stavki razlika lijeve strane\n"
 "Lijevi unikati"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5808,7 +5788,7 @@ msgstr ""
 "Prikaz jedinih stavki raznika desne strane\n"
 "Desni unikati"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5817,7 +5797,7 @@ msgstr ""
 "Prikazivanje binarnih datoteka\n"
 "Prikaz binarnih datoteka"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5826,7 +5806,7 @@ msgstr ""
 "Prikazivanje zanemarenih stavki\n"
 "Prikaz zanemarenih stavki"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5835,7 +5815,7 @@ msgstr ""
 "Odabir fonta\n"
 "Odabir fonta"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5844,42 +5824,42 @@ msgstr ""
 "Vraæanje na prednamje\9ateni font za pregledanje\n"
 "Standardni font"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Skriveni znaci i razmaci"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Zamjeni panele"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Panel prikazuje polo\9eaj razlike u datoteci"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Prika\9ei okno statistike usporedbe mapa"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid "Select the current user interface language\nLanguage"
 msgstr "Izaberite va\9a jezik suèelja\nJezik"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid "Shows differences inside lines with different colors\nShow Line Difference"
 msgstr "Bojom isticanje razlika u recima\nOboji razlièite retke"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Meðusobno zamijeni polo\9eaje panela"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5888,7 +5868,7 @@ msgstr ""
 "Prikaz brojeva redaka\n"
 "Prika\9ei brojeva redaka"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5897,7 +5877,7 @@ msgstr ""
 "Omoguæavanje prijeloma teksta\n"
 "Prijelom teksta"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5906,107 +5886,107 @@ msgstr ""
 "Prikaz odabranih margina za oba panela\n"
 "Prikaz odabranih margina"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Poveæaj velièinu teksta"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Smanji velièinu teksta"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Izvorna velièina teksta"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
 msgstr "Prikaz prethodne razlike\nPrethodna razlika (Alt+Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
 msgstr "Prikaz slijedeæe razlike\nSlijedeæa razlika (Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
 msgstr "Prikaz prve razlike\nPrva razlika (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
 msgstr "Prikaz aktivne razlike\nAktivna razlika (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid "Scroll to the last difference\nLast Difference (Alt+End)"
 msgstr "Posljednja razlika\nPosljednja razlika (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6015,7 +5995,7 @@ msgstr ""
 "Kopiranje oznaèenog teksta u  desnu datoteku\n"
 "Kopiraj u desno (Alt+desno)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6024,7 +6004,7 @@ msgstr ""
 "Kopiranje oznaèenog teksta u  lijevu datoteku\n"
 "Kopiraj u lijevo (Alt+lijevo)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6033,7 +6013,7 @@ msgstr ""
 "Kopiraj razliku u desno i idi na slijedeæu\n"
 "Kopiraj u desno i nastavi dalje (Ctrl+Alt+desno)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6042,7 +6022,7 @@ msgstr ""
 "Kopiraj razliku u lijevo i idi na slijedeæu\n"
 "Kopiraj u lijevo i nastavi dalje (Ctrl+Alt+lijevo)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6051,7 +6031,7 @@ msgstr ""
 "Kopiranje svih razlika u desno\n"
 "Sve u desno"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6060,77 +6040,77 @@ msgstr ""
 "Kopiranje svih razlika u lijevo\n"
 "Sve u lijevo"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Obri\9ai odabrane stavke iz obje mape."
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Usporedba odabranih stavki (U vi\9aestrukom izboru, usporeðuje se prva)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Selektiranje i razmje\9ataj mape prema usporedbi kolona"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Stvaranje datoteke razlika"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Odaberi sve filtre za promjene"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Stvaranje izvje\9ataja iz usporedbe"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "Prika\9ei popis dobavljivih dodataka."
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "Korisnik bira arhiver (ne djeluje na mapama)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Arhiver æe se koristiti za obje datoteke (jedna treba samo ekstenziju)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Odaberite arhiver za ovaj arhiv."
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Bez dodataka (uobièajeno)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Preporuèljivi dodaci"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Ostali dodaci"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Ponovo uèitaj sve dodatke (za znalce)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6139,12 +6119,12 @@ msgstr ""
 "Aktiviranje slijedeæe datoteke - vidljiva\n"
 "Aktiviraj slijedeæu datoteku"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Zatvori sve panele"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6153,22 +6133,22 @@ msgstr ""
 "Prkaz WinMerge pomoæi\n"
 "WinMerge Pomoæ"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Pohrana WinMerge informacija o inaèici i pode\9aenosti u tekst datoteku"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "GNU javna licenca"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Osobni uradak: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6177,7 +6157,7 @@ msgstr ""
 "Otvori datoteku napomena uz inaèicu\n"
 "Release Notes"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6186,272 +6166,272 @@ msgstr ""
 "OtvoriWeb lokaciju prevoditelja\n"
 "Translations"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Postavke dodataka"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Bez dodataka"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Prediff ako je moguæe"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH dodatak nije naðen! - .sct skripte su onemoguæene"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "Ni\9ata"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "Automatski"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Otvori datoteku u pridru\9eenom ureðivaèu"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Otvori datoteku u vanjskom ureðivaèu"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Otvori datoteku u odreðenom ureðivaèu"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Ne prikazuj premje\9atene blokove"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Prika\9ei sve premje\9atene blokove"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Prika\9ei premje\9atene blokove samo aktivnih razlika"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Idi na razliku pod kursorom"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "Idi &na razliku %1 od %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "Idi &na redak"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Onemoguæeno"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Sistem datoteka"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Popis zadnje kori\9atenih"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "Nije oznaèeno"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Batch"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Prenosni objekt"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Resursi"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr "Verilog"
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Sakrij alatnu traku"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Male ikone alatne trake"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Velike ikone alatne trake"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index b04abd8..efeec96 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -1030,7 +1030,7 @@ msgid "&Scripts"
 msgstr "Skrip&ty"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< \9eádné >"
@@ -1471,7 +1471,7 @@ msgid "&Versioning System:"
 msgstr "&Systém sledování verzí:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Cesta k programu cleartool.exe:"
@@ -1674,7 +1674,7 @@ msgid "Replace &All"
 msgstr "Nahradit &v\9ae"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr ""
@@ -2578,7 +2578,7 @@ msgid "Files:"
 msgstr "Soubory:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Rozdílné"
@@ -2615,7 +2615,7 @@ msgid "Right:"
 msgstr "Vpravo:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Shodné"
@@ -2815,7 +2815,7 @@ msgid "A&ppend timestamp"
 msgstr "Pøipojit è&asové razítko"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Potvrdit kopírování"
@@ -2893,7 +2893,7 @@ msgstr "P
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Slo\9eka"
@@ -3497,7 +3497,7 @@ msgid "Version Control"
 msgstr "Kontrola verzí"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Rozdílù"
@@ -3626,87 +3626,67 @@ msgstr "Soubory XML (*.xml)|*.xml|V
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr ""
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr ""
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr ""
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr ""
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Plný obsah"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Rychlý obsah"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Datum zmìny"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Datum zmìny a velikost"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Velikost"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Název"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Umístìní"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filtry"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr ""
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Popis"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Zvolte název souboru pro nový filtr"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Filtry (*.flt)|*.flt|V\9aechny soubory (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3719,7 +3699,7 @@ msgstr ""
 "Zkopírujte prosím soubor %1 do slo\9eky s filtry pro aplikaci WinMerge:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3732,7 +3712,7 @@ msgstr ""
 "\n"
 "Ujistìte se prosím, \9ee slo\9eka existuje a je mo\9ené do ní zapisovat."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3743,7 +3723,7 @@ msgstr ""
 "\n"
 "Zvolte prosím slo\9eku v dialogovém oknì Mo\9enosti, v kategorii Systém."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3756,12 +3736,12 @@ msgstr ""
 "\n"
 "Mo\9ená je soubor oznaèen pouze pro ètení?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Vyhledat soubor s filtrem k instalaci"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3772,258 +3752,258 @@ msgstr ""
 "\n"
 "Nový soubor nelze zkopírovat do slo\9eky filtrù."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Soubor s filtrem ji\9e existuje. Chcete nahradit stávající filtr?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Regulérní výraz"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
 msgstr "Filtry byly aktualizovány. Chcete obnovit v\9aechna porovnání slo\9eek?\n\nPokud nechcete obnovit v\9aechna porovnání teï, zvolte Ne a obnovte porovnání pozdìji."
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "&Cesta k programu SS.EXE :"
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Výsledky porovnání slo\9eek"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Porovnání souborù"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Bez názvu vlevo"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Bez názvu vpravo"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr ""
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr ""
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Prohledávaní souborù..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Otevírání výbìru"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Kopírování zleva doprava"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Kopírování zprava doleva"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Kopírování v\9aech doleva"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Kopírování v\9aech doprava"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Kopírování souborù..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Odstranìní souborù..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Pøesouvání souborù..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Vytváøení protokolu..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Vracení poslední operace..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "Opakování pøedchozí operace..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Øádek: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Slouèit"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Rozdíl %1 z %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "Nalezeno %1 rozdílù"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "Nalezen 1 rozdíl"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "Pro ètení"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Polo\9eka %1 z %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Polo\9eek: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Vyberte dvì existující slo\9eky nebo soubory k porovnání"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Vybrat slo\9eku"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Vyberte dvì slo\9eky nebo dva soubory k porovnání"
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "Levá cesta je chybná!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Pravá cesta je chybná!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Obì cesty jsou chybné!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Vyberte dva soubory k zpøístupnìní volby pøevadìèe"
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Nelze porovnat soubor a slo\9eku!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Soubor nebyl nalezen: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Soubor nebyl pøeveden: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4036,42 +4016,42 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr ""
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid "The file\n%1\nis not a conflict file."
 msgstr ""
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Ulo\9eit jako"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Ulo\9eit zmìny do %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 je oznaèen pouze pro ètení. Chcete nahradit tento soubor? (Neukládat pod novým názvem.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Chyba pøi kontrole zapisovatelnosti do cíle"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Chyba pøi zálohování souboru"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4084,7 +4064,7 @@ msgstr ""
 "\n"
 "Chcete pokraèovat?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4101,7 +4081,7 @@ msgstr ""
 "\t- pou\9eít jiný název souboru (stisknìte OK)\n"
 "\t- pøeru\9ait souèasnou operaci (stisknìte Storno)"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4116,7 +4096,7 @@ msgstr ""
 "\n"
 "Chcete ulo\9eit pøevedenou verzi do jiného souboru?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4131,7 +4111,7 @@ msgstr ""
 "\n"
 "Chcete ulo\9eit pøevedenou verzi do jiného souboru?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4146,7 +4126,7 @@ msgstr ""
 "\n"
 "Pøepsat zmìnìný soubor?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4155,32 +4135,32 @@ msgstr ""
 "%1\n"
 "je oznaèen pouze pro ètení. Chcete nahradit tuto polo\9eku?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
 msgstr "Jiná aplikace provedla zmìny v souboru\n%1\nod jeho posledního prozkoumání aplikací WinMerge.\n\nChcete soubor naèíst znovu?"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Ulo\9eit levý soubor jako"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Ulo\9eit pravý soubor jako"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
 msgstr "Soubor\n%1\nse ztratil. Pro pokraèování prosím ulo\9ete kopii souboru."
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4191,42 +4171,42 @@ msgstr ""
 "\n"
 "Pøed dal\9aím pokraèováním dokumenty obnovte."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr ""
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr ""
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr ""
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr ""
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr ""
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr ""
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr ""
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4234,176 +4214,176 @@ msgid ""
 " Undo checkout operation?"
 msgstr ""
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, 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:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "\8eádný"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (ni\9e\9aí ne\9e 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 a vy\9a\9aí)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Pøeru\9ait v mezerách"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Pøeru\9ait v mezerách nebo v interpunkci"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Zkopíruje vybrané polo\9eky do uvedené slo\9eky"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Zkopíruje vybrané polo\9eky do vlastní slo\9eky"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Odstraní vybrané polo\9eky vlevo"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Odstraní vybrané polo\9eky vpravo"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Odstraní vybrané polo\9eky na obou stranách"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Doèasnì skryje vybrané polo\9eky"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Pøejmenuje vybrané polo\9eky na obou stranách"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "P&ravé doleva (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "&Levé doprava (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "P&ravé doleva (%1 z %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "&Levé doprava (%1 z %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "L&evé do... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Pr&avé do... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "L&evé do... (%1 z %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Pr&avé do... (%1 z %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "&Levé (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "P&ravé (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "O&boje (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "&Levé (%1 z %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "P&ravé (%1 z %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "O&boje (%1 z %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Zvolte cílovou slo\9eku"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Zvolte cílovou slo\9eku pro polo\9eky z levé strany:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Zvolte cílovou slo\9eku pro polo\9eky z pravé strany:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(ovlivnìno souborù: %1)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(ovlivnìno souborù: %1 z %2)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4414,17 +4394,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Opravdu chcete zkopírovat:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Opravdu chcete zkopírovat %d polo\9eek:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4443,613 +4423,613 @@ msgstr ""
 "\n"
 "Obnovte prosím porovnání."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "Opravdu chcete pøesunout:"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "Opravdu chcete pøesunout %d polo\9eek:"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "Potvrdit pøesunutí"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Otevøe polo\9eku vlevo"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Otevøe soubor vlevo v externím editoru"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Otevøe soubor vlevo ve zvolené aplikaci"
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Otevøe polo\9eku vpravo"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Otevøe soubor vpravo v externím editoru"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Otevøe soubor vpravo ve zvolené aplikaci"
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Nelze spustit externí editor: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Neznámé roz\9aíøení externího editoru: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Zkopíruje názvy polo\9eek do schránky"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Zkopíruje cesty polo\9eek vlevo do schránky"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Zkopíruje cesty polo\9eek vpravo do schránky"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Zkopíruje cesty polo\9eek na obou stranách do schránky"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr "Levá systémová nabídka"
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr "Pravá systémová nabídka"
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Neznámý formát archivu"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Pøidá polo\9eky z levé strany do archivu"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Pøidá polo\9eky z pravé strany do archivu"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Pøidá polo\9eky z obou stran do archivu"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Pøidá rozdílné polo\9eky do archivu (z obou stran)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Pøesune vybrané polo\9eky z levé strany do vlastní slo\9eky"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Pøesune vybrané polo\9eky z pravé strany do vlastní slo\9eky"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Název souboru"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Výsledek porovnání"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Datum vlevo"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Datum vpravo"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Pøípona"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Velikost vlevo"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Velikost vpravo"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Velikost vpravo (krátce)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Velikost vlevo (krátce)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Datum vytvoøení vlevo"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Datum vytvoøení vpravo"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Novìj\9aí soubor"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Verze souboru vlevo"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Verze souboru vpravo"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Struèný výsledek"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Atributy vlevo"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Atributy vpravo"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "Konce øádkù vlevo"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "Konce øádkù vpravo"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Kódování vlevo"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Kódování vpravo"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Ignor. rozdílù"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binární"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Soubory nelze porovnat"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Pøeru\9aeno"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Soubor pøeskoèen"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Slo\9eka pøeskoèena"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Pouze vlevo: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Pouze vpravo: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Binární soubory jsou shodné"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Binární soubory jsou rozdílné"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Soubory jsou rozdílné"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr "Slo\9eky jsou rozdílné"
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Pouze vlevo"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Pouze vpravo"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Chyba"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr "Textové soubory jsou shodné"
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr "Textové soubory jsou rozdílné"
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Uplynulý èas: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "Vybrána 1 polo\9eka"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "Vybráno %1 polo\9eek"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Název souboru nebo slo\9eky"
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Název podslo\9eky, pokud jsou porovnávány i soubory v podslo\9ekách"
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Výsledek porovnání, dlouhý popis"
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Datum zmìny souboru na levé stranì"
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Datum zmìny souboru na pravé stranì"
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Pøípona souboru"
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Velikost souboru na levé stranì v bytech"
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Velikost souboru na pravé stranì v bytech"
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Velikost souboru na levé stranì zkrácenì"
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Velikost souboru na pravé stranì zkrácenì"
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Datum vytvoøení souboru na levé stranì"
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Datum vytvoøení souboru na pravé stranì"
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Uká\9ee, na které stranì je novìj\9aí datum zmìny"
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Verze souboru na levé stranì, pouze pro nìkteré typy souborù"
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Verze souboru na pravé stranì, pouze pro nìkteré typy souborù"
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Struèný výsledek porovnání"
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Atributy souboru na levé stranì"
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Atributy souboru na pravé stranì"
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Typ konce øádkù v souboru na levé stranì"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Typ konce øádkù v souboru na pravé stranì"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Kódování souboru na levé stranì"
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Kódování souboru na pravé stranì"
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Poèet ignorovaných rozdílù v souboru. Tyto rozdíly nelze slouèit."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Poèet rozdílù v souboru. Neobsahuje ignorované rozdíly."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Uká\9ee hvìzdièku (*), pokud je soubor binární"
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Porovnání %1 s %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Seznam oddìlený èárkami"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Seznam oddìlený tabelátory"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "Soubor HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "Soubor XML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Soubor protokolu ji\9e existuje. Chcete ho pøepsat?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5058,32 +5038,32 @@ msgstr ""
 "Chyba pøi vytváøení protokolu:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Protokol byl úspì\9anì vytvoøen."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "V obou panelech je otevøen stejný soubor."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Vybrané soubory jsou shodné."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Bìhem porovnání souborù se vyskytla chyba."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Nelze vytvoøit doèasné soubory. Zkontrolujte nastavení cesty k doèasným souborùm."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5098,32 +5078,32 @@ msgstr ""
 "\n"
 "Poznámka: Pokud chcete v\9edy sjednocovat konce øádkù, nastavte mo\9enost 'Ignorovat rozdíly v koncích øádkù' v nastavení Porovnávání v Mo\9enostech dostupných z nabídky Úpravy."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, 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 "Konce øádkù v souboru '%1' jsou rozdílných typù (Windows/Unix/Mac).\nPodle aktuálních mo\9eností budou sjednoceny do hlavního typu.\nChcete zmìnit mo\9enosti a zachovat rozdílné konce øádkù?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, 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:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "Zvolená slo\9eka je chybná."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Binární soubor nelze otevøít pro úpravy."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, 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 "Slo\9eka existuje pouze na jedné stranì a nelze ji otevøít.\n\nChcete vytvoøit odpovídající slo\9eku na druhé stranì a otevøít ji?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5134,148 +5114,148 @@ msgstr ""
 "Zobrazení ka\9edého souboru v jeho znakové stránce poskytne lep\9aí náhled, ale sluèování nebo kopírování bude nebezpeèné.\n"
 "Chcete kódování u obou souborù upravit na výchozí znakovou stránku Windows (doporuèeno)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Upozornìní: Soubory pou\9eívají rozdílné kódování, levé=%s a pravé=%s, a sluèování mù\9ee vést ke ztrátì informací."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Do\9alo ke ztrátì informací zpùsobené chybami kódování u obou souborù."
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "\8eádný rozdíl"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Rozdíl v øádku"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Nahrazeno %1 øetìzcù."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Nelze najít øetìzec \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Zkopíruje celou cestu k souboru do schránky"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Zkopíruje název souboru do schránky"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Poloha"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Rozdíly"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Opravný soubor byl úspì\9anì vytvoøen."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. polo\9eka nebyla nalezena nebo je to slo\9eka!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. polo\9eka nebyla nalezena nebo je to slo\9eka!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Opravný soubor ji\9e existuje. Chcete ho pøepsat?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[vybráno %1 souborù]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr ""
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr ""
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr ""
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr ""
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Nelze zapisovat do souboru %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Zadaná cesta pro výstup není cesta k souboru: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Zadejte výstupní soubor"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Nelze vytvoøit opravný soubor z binárních souborù."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Nelze vytvoøit opravný soubor ze slo\9eek."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5286,17 +5266,17 @@ msgstr ""
 "\n"
 "Vytvoøení opravného souboru vy\9eaduje, aby v souborech nebyly \9eádné neulo\9eené zmìny."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Slo\9eka neexistuje."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Aktuální výsledek porovnání slo\9eek bude vymazán."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5308,7 +5288,7 @@ msgstr ""
 "Nelze nalézt v\9aechny potøebné souèásti (7-Zip anebo Merge7z*.dll).\n"
 "Podívejte se do u\9eivatelské pøíruèky, kde najdete dal\9aí informace o podpoøe archivace a jak ji zpøístupnit."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5317,7 +5297,7 @@ msgstr ""
 "\n"
 "Poznámka: Integrace 7-Zip je vypnutá v nastavení WinMerge."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5326,37 +5306,37 @@ msgstr ""
 "\n"
 "Poznámka: Integrace 7-Zip je omezená na samostatné operace v nastavení WinMerge."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Ulo\9eit nastavení"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Naèíst nastavení"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Nastavení bylo naèteno ze souboru."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Nastavení bylo ulo\9eeno do souboru."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Naètení nastavení ze souboru se nezdaøilo."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Ulo\9eení nastavení do souboru se nezdaøilo."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5367,242 +5347,242 @@ msgstr ""
 "\n"
 "Chcete pokraèovat?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Chyba v regulérním výrazu"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Nic neodpovídá"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Chybný regulérní výraz"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Chybný porovnávací znak"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Chybný znak v názvu tøídy"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Zpìtné lomítko na konci"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Chybný zpìtný odkaz"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Nespárované [ nebo [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Nespárované ( nebo \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Nespárované \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Chybný obsah \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Chybné ukonèení rozsahu"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Nedostatek pamìti"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Chybný pøedcházející regulérní výraz"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Pøedèasné ukonèení regulérního výrazu"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Regulérní výraz je pøíli\9a dlouhý"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Nespárované ) nebo \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr ""
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr ""
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr ""
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Rùzné"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr ""
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr ""
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr ""
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr ""
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " kB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr ""
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr ""
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr ""
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr ""
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Typ"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "Pøevadìè"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr ""
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr ""
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Ulo\9eí levý soubor"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Ulo\9eí pravý soubor"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Ulo\9eí levý soubor pod názvem..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Ulo\9eí pravý soubor pod názvem..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Pøevede konce øádkù na typ Windows"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Pøevede konce øádkù na typ Unix"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Pøevede konce øádkù na typ Mac"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Pøepíná mezi re\9eimem úprav a re\9eimem sluèování"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5611,12 +5591,12 @@ msgstr ""
 "Uká\9ee a pøizpùsobí vlastnosti kódování souboru\n"
 "Vlastnosti kódování souboru"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr ""
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5625,7 +5605,7 @@ msgstr ""
 "Vybere oblast rozdílù v aktuálním øádku\n"
 "Rozdíl v aktuálním øádku"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5634,7 +5614,7 @@ msgstr ""
 "Pøejde na daný øádek nebo na daný rozdíl\n"
 "Pøejít na (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5643,7 +5623,7 @@ msgstr ""
 "Umo\9ení zmìnit nastavení aplikace\n"
 "Mo\9enosti"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5652,37 +5632,37 @@ msgstr ""
 "Obnoví zobrazení\n"
 "Obnovit (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Zkopíruje vybrané øádky do schránky a pøidá jim na zaèátek jejich èísla øádkù"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Zalo\9eí nebo zru\9aí zálo\9eku"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Pøejde na dal\9aí zálo\9eku"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Pøejde na pøedchozí zálo\9eku"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Zru\9aí v\9aechny zálo\9eky"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5691,7 +5671,7 @@ msgstr ""
 "Zobrazí polo\9eky, které se pøesnì shodují\n"
 "Ukázat shodné polo\9eky"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5700,7 +5680,7 @@ msgstr ""
 "Zobrazí polo\9eky, ve kterých jsou rozdíly\n"
 "Ukázat rozdílné polo\9eky"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5709,7 +5689,7 @@ msgstr ""
 "Zobrazí polo\9eky, které existují pouze na levé stranì\n"
 "Ukázat levé jedineèné polo\9eky"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5718,7 +5698,7 @@ msgstr ""
 "Zobrazí polo\9eky, které existují pouze na pravé stranì\n"
 "Ukázat pravé jedineèné polo\9eky"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5727,7 +5707,7 @@ msgstr ""
 "Zobrazí binární soubory\n"
 "Ukázat binární soubory"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5736,7 +5716,7 @@ msgstr ""
 "Zobrazí pøeskoèené polo\9eky\n"
 "Ukázat pøeskoèené polo\9eky"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5745,7 +5725,7 @@ msgstr ""
 "Vybere písmo pro zobrazení\n"
 "Vybrat písmo"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5754,42 +5734,42 @@ msgstr ""
 "Vrátí výchozí písmo systému pro zobrazení\n"
 "Výchozí písmo"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Uká\9ee netisknutelné znaky"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Zobrazí nebo skryje rozdílový panel"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Polohový panel ukazuje celkový obraz porovnávaných souborù"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Zobrazí statistiku porovnání slo\9eek"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid "Select the current user interface language\nLanguage"
 msgstr "Umo\9ení zvolit jazyk u\9eivatelského prostøedí aplikace\nJazyk"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid "Shows differences inside lines with different colors\nShow Line Difference"
 msgstr "Uká\9ee rozdíly v øádcích odli\9anou barvou\nRozdíly v øádcích"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Zamìní umístìní panelù s porovnáním souborù"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5798,7 +5778,7 @@ msgstr ""
 "Zobrazí nebo skryje èísla øádkù\n"
 "Zobrazit èísla øádkù"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5807,7 +5787,7 @@ msgstr ""
 "Pøepíná zalamování øádkù\n"
 "Zalamovat øádky"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5816,107 +5796,107 @@ msgstr ""
 "Zobrazí nebo skryje u obou panelù levé okraje pro výbìr\n"
 "Okraje pro výbìr"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Zvìt\9aí velikost písma"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Zmen\9aí velikost písma"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Vrátí písmo na pùvodní velikost"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
 msgstr "Posune na pøedchozí rozdíl\nPøedchozí rozdíl (Alt+Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
 msgstr "Posune na dal\9aí rozdíl\nDal\9aí rozdíl (Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
 msgstr "Posune na první rozdíl\nPrvní rozdíl (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
 msgstr "Posune na aktuální rozdíl\nAktuální rozdíl (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid "Scroll to the last difference\nLast Difference (Alt+End)"
 msgstr "Posune na poslední rozdíl\nPoslední rozdíl (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -5925,7 +5905,7 @@ msgstr ""
 "Zkopíruje vybraný rozdíl do souboru vpravo\n"
 "Kopírovat doprava (Alt+Right)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -5934,7 +5914,7 @@ msgstr ""
 "Zkopíruje vybraný rozdíl do souboru vlevo\n"
 "Kopírovat doleva (Alt+Left)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -5943,7 +5923,7 @@ msgstr ""
 "Zkopíruje vybraný rozdíl do souboru vpravo a pokraèuje na dal\9aí rozdíl\n"
 "Kopírovat doprava a pokraèovat (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -5952,7 +5932,7 @@ msgstr ""
 "Zkopíruje vybraný rozdíl do souboru vlevo a pokraèuje na dal\9aí rozdíl\n"
 "Kopírovat doleva a pokraèovat (Ctrl+Alt+Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -5961,7 +5941,7 @@ msgstr ""
 "Zkopíruje v\9aechny rozdíly do souboru vpravo\n"
 "V\9ae doprava"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -5970,382 +5950,382 @@ msgstr ""
 "Zkopíruje v\9aechny rozdíly do souboru vlevo\n"
 "V\9ae doleva"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Odstraní vybrané polo\9eky z obou slo\9eek"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Porovná vybranou polo\9eku (pokud je vybráno více polo\9eek, porovná první)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Zvolit a pøeskupit sloupce v oknì porovnání slo\9eek"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Vytvoøí opravný soubor"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Vybrat a upravit filtry"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Vytvoøí protokol o výsledku porovnání slo\9eek"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "Zobrazí seznam dostupných pluginù"
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "U\9eivatel sám vybere pøevadìè (neplatí pøi porovnání slo\9eek)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Pøizpùsobený pøevadìè bude pou\9eit pro oba soubory (podle pøípony jednoho ze souborù)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Zvolí pøevadìè pro úpravy tohoto souboru"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr ""
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Navr\9eené pluginy"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Ostatní pluginy"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Uvolní v\9aechny pluginy a znovu je naète (pro vývojáøe)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid "Activates next visible file\nActivate next File"
 msgstr "Aktivovat následující viditelný soubor\nAktivovat následující soubor"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Zavøe v\9aechna otevøená okna"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid "Opens the WinMerge Help\nWinMerge Help"
 msgstr "Otevøe nápovìdu pro aplikaci WinMerge\nNápovìda aplikace WinMerge"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Vytvoøí textový soubor obsahující informace o aktuální verzi aplikace WinMerge a o místní konfiguraci"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "Zobrazí Obecnou veøejnou licenci GNU"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr ""
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid "Opens the release notes document\nRelease Notes"
 msgstr "Otevøe dokument s poznámkami k aktuální verzi aplikace WinMerge\nPoznámky k vydání"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid "Opens the translations website\nTranslations"
 msgstr "Otevøe internetovou stránku s informacemi o jazykových pøekladech\nPøeklady"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Nastavení pluginù"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr ""
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr ""
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "Program Windows Script Host nebyl nalezen - skripty .sct jsou vypnuté"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<\9eádný>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<automaticky>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Otevøe soubor v pøidru\9eené aplikaci"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Otevøe soubor v externím editoru"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Otevøe soubor v pøíslu\9aném programu"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Potlaèí zobrazení pøesunutých blokù"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Zobrazí v\9aechny pøesunuté bloky"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Zobrazí pøesunuté bloky týkající se pouze aktuálního výbìru"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Pøejde na øádek nebo rozdíl pod ukazatelem"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "&Pøejít na rozdíl %1 z %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "&Pøejít na øádek %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Vypnuto"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Systém souborù"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Naposledy pou\9eité"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "\8eádné zvýraznìní"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr ""
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr ""
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr ""
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr ""
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr ""
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr ""
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr ""
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr ""
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr ""
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr ""
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr ""
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr ""
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr ""
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr ""
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr ""
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr ""
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr ""
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr ""
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr ""
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr ""
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr ""
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr ""
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr ""
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr ""
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr ""
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr ""
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr ""
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr ""
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr ""
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr ""
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr ""
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Skryje panel nástrojù"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Zobrazí malý panel nástrojù"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Zobrazí velký panel nástrojù"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index 36718e2..8fab513 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -1031,7 +1031,7 @@ msgid "&Scripts"
 msgstr "&Scripts"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Tom >"
@@ -1472,7 +1472,7 @@ msgid "&Versioning System:"
 msgstr "&Versionsstyringssystem"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Sti til cleartool.exe:"
@@ -1673,7 +1673,7 @@ msgid "Replace &All"
 msgstr "Erstat &alt"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rationel Logik"
@@ -2585,7 +2585,7 @@ msgid "Files:"
 msgstr "Filer:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Forskellige"
@@ -2622,7 +2622,7 @@ msgid "Right:"
 msgstr "Højre:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Identiske"
@@ -2822,7 +2822,7 @@ msgid "A&ppend timestamp"
 msgstr "T&ilføj Tidspunkt"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Bekræft Kopi"
@@ -2900,7 +2900,7 @@ msgstr ""
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Mappe"
@@ -3540,7 +3540,7 @@ msgid "Version Control"
 msgstr "Versions Kontrol"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Differencer"
@@ -3669,87 +3669,67 @@ msgstr "XML Filer (*.xml)|*.xml|All Files (*.*)|*.*||"
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Alt Indhold"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Hurtigt Indhold"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Ændringsdato"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Ændret Dato og Størrelse"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Størrelse"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Navn"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Sti"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filtre"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F]"
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Vælg filnavn til nyt filter"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Fil Filtre (*.flt)|*.flt|Alle Filer (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3762,7 +3742,7 @@ msgstr ""
 "Kopier filen %1 til WinMerge/Filtermappe:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3775,7 +3755,7 @@ msgstr ""
 "\n"
 "Undersøg om mappen eksisterer og kan ændres."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3786,7 +3766,7 @@ msgstr ""
 "\n"
 "Vælg filter mappe i valg/System."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3799,12 +3779,12 @@ msgstr ""
 "\n"
 "Måske er filen skrivebeskyttet?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Find filter fil til installering"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3815,17 +3795,17 @@ msgstr ""
 "\n"
 "Kunne ikke kopiere filter fil til filter mappe."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Filter filen eksisterer allerede. Vil du overskrive den?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Almindeligt udtryk"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3836,243 +3816,243 @@ msgstr ""
 "\n"
 "Hvis du ikke vil opdatere sammenligningerne så vælg Nej og opdater senere."
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "&Sti til SS.EXE:"
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Resultat af sammenligning af mapper"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Filsammenligning"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Ikke navngivet venstre"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Ikke navngivet højre"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "Deres Fil"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "Mine Fil"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Skanner filer..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Åbner valgte"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Kopierer venstre til højre"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Kopierer højre til venstre"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Kopierer alt til venstre"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Kopierer alt til højre"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Kopierer filer..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Sletter filer..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Flytter filer..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Opretter rapport"
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Fortryd sidste handling..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "Gentager sidste handling..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Linje: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Flet"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Forskel %1 af %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 forskelle fundet"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "1 forskel fundet"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "RO"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Emne %1 of %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Emner: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Vælg to eksisterende mapper eller filer at sammenligne"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Valgt mappe"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Vælg to mapper eller to filer at sammenligne."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "Ventre sti er ugyldig!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Højre sti er ugyldig!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Begge stier er ugyldige!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Vælg to filer for at aktivere udvælgelse af udpakker."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Kan ikke sammenligne en fil og en mappe!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Fil ikke fundet: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Fil ikke udpakket: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4085,12 +4065,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Kunne ikke analysere Konflikt fil"
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4101,32 +4081,32 @@ msgstr ""
 "%1\n"
 "er ikke en konflikt fil."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Gem som"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Gem ændringer til %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 er markeret som skrivebeskyttet. Vil du ignorerer skrivebeskyttelsen? (Nej for at gemme til et andet filnavn.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Fejl ender tjek af skrivebeskyttelsen på destinationen"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Fejl under backup af filen"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4139,7 +4119,7 @@ msgstr ""
 "\n"
 "Fortsæt alligevel?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4156,7 +4136,7 @@ msgstr ""
 "\t-bruge et andet filenavn (Tryk Ok)\n"
 "\t-afbryd aktuel operation (Tryk Annuller)?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4171,7 +4151,7 @@ msgstr ""
 "\n"
 "Vil du gemme den udpakkede version under et andet filnavn?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4186,7 +4166,7 @@ msgstr ""
 "\n"
 "Vil du gemme den udpakkede version under et andet filnavn?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4201,7 +4181,7 @@ msgstr ""
 "\n"
 "Vil du overskrive den ændrede fil?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4210,32 +4190,32 @@ msgstr ""
 "%1\n"
 "er markeret som skrivebeskyttet. Vil du overskrive den skrivebeskyttede fil alligevel?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
 msgstr ""
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Gem venstre fil som"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Gem højre fil som"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
 msgstr ""
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4246,42 +4226,42 @@ msgstr ""
 "\n"
 "Opdater dokumenter før du fortsætter."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Du skal angive en SourceSafe projekt sti for at fortsætte (ie:  $/MitProjekt)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Checkout filer fra VSS..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "Versionsstyringssystemet returnerede en fejl under forsøget på at kontrollere filen. Kan ikke fortsætte..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Fejl under udførelse af versionsstyringssystem kommando."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "Arbejdsmappen for VSS og mappen for den aktuelle fil er ikke ens. Vil du fortsætte?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Ingen VSS database(r) fundet!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Fejl fra VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4292,7 +4272,7 @@ msgstr ""
 "Kontroller konfiguration af visning.\n"
 "Fortryd kontrol operation?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4301,169 +4281,169 @@ msgstr ""
 "Versionsstyrings System returnerede en fejl under forsøget på at fortryde filkontrol.\n"
 "Knotroller konfiguration af visning."
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Ingen"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visuel kildesikkerhed (mindre end 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visuel kildesikkerhed (5.0 og over)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Bryd ved mellemrum"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Bryd ved mellemrum eller tegnsætning"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Kopier valgte element til navngivet mappe"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Kopier valgte element til tilpasset mappe"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Slet det valgte element til venstre"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Slet det valgte element til højre"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Slet de valgte element(er) på begge sider"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Skjul valgt emne(r) (ad hoc filter)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Omdøb valgte emner på begge sider"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Højre til venstre (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Venstre til højre (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Højre til venstre (%1 af %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Venstre til højre (%1 af %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Venstre til... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Højre til... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Venstre til... (%1 af %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Højre til... (%1 af %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Venstre (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Højre (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Begge (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Venstre (%1 af %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Højre (%1 af %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Begge (%1 af %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Vælg en destinationsmappe"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Venstre side - vælg destinationsmappen"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Højre side - vælg destinationsmappen"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 Filer Påvirket)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 af %2 Filer Påvirket)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4474,17 +4454,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Er du sikker på du vil kopiere:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Er du sikker på du vil kopiere %d emner:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4503,613 +4483,613 @@ msgstr ""
 "\n"
 "Opdater sammenligning."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "Er du sikker på du vil flytte:"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "Er du sikker på du vil flytte: %d emner:"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "Bekræft Flytning"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Åben venstre fil"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Åben venstre fil i ekstern editor"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Åben venstre fil med ..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Åben højre fil"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Åben højre fil i ekstern editor"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Åben højre fil med ..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Kunne ikke eksekvere ekstern editor: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Ukendt udvidelse i ekstern editor: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Kopier filnavn til clipboard"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Kopier venstre sides mappenavne til clipboard"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Kopier højre sides mappenavne til clipboard"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Kopier begge siders mappenavne til clipboard"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr ""
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr ""
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Ukendt arkivformat"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Tilføj elementer fra venstre side til arkiv"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Tilføj elementer fra højre side til arkiv"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Tilføj elementer fra begge sider til arkiv"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Tilføj elementer der er forskellige til arkiv (fra begge sider)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Flyt den valgte fil på venstre side til udvalgt mappe"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Flyt den valgte fil på højre side til udvalgt mappe"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Filnavn"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Resultat af sammenligning"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Venstre dato"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Højre dato"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Udvidelse"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Venstre størrelse"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Højre størrelse"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Højre Størrelse (Kort)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Venstre Størrelse (Kort)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Venstre oprettelsesdato"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Højre oprettelsesdato"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Nyeste fil"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Venstre filversion"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Højre filversion"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Kort resultat"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Venstre attributter"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Højre attributter"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "Venstre EOL"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "Højre EOL"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Venstre Koding"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Højre Koding"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Ignoreret Diff."
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binær"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Kan ikke sammenligne filer"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Emne fortrudt"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Fil sprunget over"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Mappe sprunget over"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Venstre kun: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Højre kun: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Binære filer er identiske"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Binære filer er forskellige"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Filer er forskellige"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr ""
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Kun venstre"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Kun højre"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Fejl"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr ""
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr ""
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Tid forløbet: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 element valgt"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 elementer valgt"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Filnavn eller mappenavn."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Undermappenavn når undermapper er inkluderet."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Resultat af sammenligning, lang form."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Venstre side ændringsdato."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Højre side ændringsdato."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Filens extension."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Venstre filstørrelse i bytes."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Højre filstørrelse i bytes."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Venstre filstørrelse forkortet."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Højre filstørrelse forkortet."
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Venstre side oprettelsesdato."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Højre side oprettelsesdato."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Fortæller hvilken side har den nyeste ændringsdato."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Venstre side filversion, kun for nogle filtyper."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Højre side filversion, kun for nogle filtyper."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Kort resultat af sammenligning."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Venstre side attributter."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Højre side attributter."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Venstre sidefil EOL type"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Højre sidefil EOL type"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Venstre side encoding."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Højre side encoding."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Antal ignorerede forskelle i filen. Disse forskelle er ignoreret af WinMerge og kan ikke blive flettet."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Antel forskelle i filen. Dette tal omfatter ikke ignorerede forskelle."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Vis stjerne (*) hvis fil er binær."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Sammenlign %1 med %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Komma opdelt liste"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Tab opdelt liste"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "Simpel HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "Simpel XML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Rapportfilen eksisterer allerede. Ønsker du at overskrive eksisterende fil"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5118,32 +5098,32 @@ msgstr ""
 "Fejl ved opretning af rapporten:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Rapporten blev oprettet succesfuldt."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Den samme fil er åbnet på begge sider."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "De valgte filer er identiske."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Der skete en fejl under sammenligning af filerne."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Midlertidige filer kunne ikke oprettes. Tjek dine indstillinger for midlertidig (temp) mappe."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5158,7 +5138,7 @@ msgstr ""
 "\n"
 "Bemærk: Hvis du altid vil behandle alle returtegn typer ens, så indstil valget 'Ignorer returtegn forskelle ..' i Fanen: Indstillinger -> Sammenlign  (findes under Redigér)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5169,22 +5149,22 @@ msgstr ""
 "Med de nuværende valg, vil de blive samlet til den dominerende type.\n"
 "Ønsker du at ændre indstillinger og bevare de forskellige EOL ?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Der skete en fejl under prediffing af filen '%1' med plugin '%2'. Denne prediffing er ikke brugt mere."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "Den valgte mappe er ugyldig."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Kan ikke åbne en binær fil til editor."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5199,7 +5179,7 @@ msgstr ""
 "%1\n"
 "til den anden side og åbne disse mapper?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5210,148 +5190,148 @@ msgstr ""
 "Visning af hver fil i sin egen codepage vil give et bedre visuelt resultat men fletning/kopiering vil være farligt.\n"
 "Would you like to treat both files as being in the default windows codepage (recommended)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Advarsel: Filerne bruger forskellige kodninger, venstre =% s og højre =% s, og fletning kan føre til tab af oplysninger."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Oplysninger tabt, på grund af kodnings fejl: begge filer"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Ingen forskel"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Linje forskel"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Erstattet %1 streng(e)."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Kan ikke finde strengen \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Kopier det fulde mappenavn"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Kopier filnavn"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Placerings vindue"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Forskels vindue"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Patch fil oprettet med succes."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. element er ikke fundet eller er en mappe!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. element er ikke fundet eller er en mappe!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Denne patch fil eksisterer allerede. Vil du overskrive den?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 filer valgt]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Kontekst"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Samlet"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Kunne ikke skrive til fil %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Den angivne output sti er ikke en endelig sti: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Angiv en output fil"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Kan ikke lave patch filer fra binære filer."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Kan ikke lave patch filer fra mapper."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5362,17 +5342,17 @@ msgstr ""
 "\n"
 "Oprettelse af en patch kræver at alle ændringer i filen er gemt."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Mappen eksisterer ikke."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Nuværende resultat af sammenligning af mapper vil blive nulstillet."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5383,7 +5363,7 @@ msgstr ""
 "Alle komponenter (7-zip og/eller Merge7z*.dll) der er nødvendige til arkiv support kan ikke findes.\n"
 "Se manualen for mere information om arkiv support og hvordan man aktivere det."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5392,7 +5372,7 @@ msgstr ""
 "\n"
 "Note: 7-Zip integration er deaktiveret i WinMerge indstillinger."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5401,37 +5381,37 @@ msgstr ""
 "\n"
 "Note: 7-Zip integration er begrænset til standalone operationer i WinMerge indstillinger."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Vælg fil til eksport"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Select file for import"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Valg importeret fra filen."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Valg eksporteret til filen."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Kunne ikke importere valg fra filen."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Kunne ikke skrive valg til filen."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5442,242 +5422,242 @@ msgstr ""
 "\n"
 "Vil du fortsætte?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Fejl ved Alment udtryk"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Ingen match"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Ugyldigt Alment udtryk"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Ugyldigt sammenlignings tegn"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Ugyldigt tegnklasse navn"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Efterfølgende backslash (omv. skråstreg)"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Ugyldig bagud reference"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Umatched [ eller [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Umatched ( eller \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Umatched \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Ugyldigt indhold af \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Ugyldig område afslutning"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Ude af hukommelse"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Ugyldigt foregående alment udtryk"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "For tidlig afslutning af alment udtryk"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Alment udtryk er for stort"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Umatched ) eller \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Mixed"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Type"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "Udpakker"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr "Predeffineret"
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "Editor script"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Gem den venstre fil"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Gem den højre fil"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Gem den venstre fil med navnet..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Gem den højre fil med navnet..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Konverter EOL til Windows tilstand"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Konverter EOL til Unix tilstand"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Konverter EOL til Mac tilstand"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Skift mellem rediger og flette tilstande"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5686,12 +5666,12 @@ msgstr ""
 "Vis og juster fil kodnings egenskaber\n"
 "Fil kodnings egenskaber"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "Åben og udbedre konflikt fil"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5700,7 +5680,7 @@ msgstr ""
 "Vælg differencen i den aktuelle linie\n"
 "Difference i aktuel Linie"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5709,7 +5689,7 @@ msgstr ""
 "Gå til linje eller forskel\n"
 "Gå til (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5718,7 +5698,7 @@ msgstr ""
 "Sæt program indstillinger\n"
 "Indstillinger"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5727,37 +5707,37 @@ msgstr ""
 "Opdater display\n"
 "Opdater (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Kopier valgte linjer til udklipsholderen og tilføj numre til liniebegyndelsen"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Vis/Skjul Bogmærke"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Gå til næste bogmærke"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Gå til forrige bogmærke"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Slet alle bogmærker"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5766,7 +5746,7 @@ msgstr ""
 "Viser emner der er nøjagtigt ens\n"
 "Vis identiske emner"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5775,7 +5755,7 @@ msgstr ""
 "Vis emner der har differencer\n"
 "Vis emner med differencer"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5784,7 +5764,7 @@ msgstr ""
 "Vis emner der kun eksisterer i venstre side\n"
 "Vis emner der kun er i venstre side"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5793,7 +5773,7 @@ msgstr ""
 "Vis emner der kun eksisterer i højre side\n"
 "Vis emner der kun er i højre side"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5802,7 +5782,7 @@ msgstr ""
 "Viser binære filer\n"
 "Vis binære filer"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5811,7 +5791,7 @@ msgstr ""
 "Viser skippede emner\n"
 "Vis skippede emner"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5820,7 +5800,7 @@ msgstr ""
 "Vælg skrifttype der vises\n"
 "Vælg skrifttype der vises"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5829,27 +5809,27 @@ msgstr ""
 "Skift tilbage til standard skrifttypevisning\n"
 "Standard Skrifttype"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Viser et tegn for mellemrum"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Vis/Skjul horisontalt panel"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Vis eller gem vertikalt panel"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Vis mappesammenlignings statistik dialog"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5858,7 +5838,7 @@ msgstr ""
 "Vælg aktuelt brugerflade sprog\n"
 "Sprog"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5867,12 +5847,12 @@ msgstr ""
 "Vis differencer i selve linien med forskellige farver\n"
 "Vis Linie Differencer"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Byt de to vinduers placering"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5881,7 +5861,7 @@ msgstr ""
 "Viser linie numre\n"
 "Vis linie numre"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5890,7 +5870,7 @@ msgstr ""
 "Aktiver Tekstombrydning\n"
 "Ombryd Linier"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5899,22 +5879,22 @@ msgstr ""
 "Viser udvælgelses margener for begge vinduer\n"
 "Vis Udvælgelses Margener"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Forstør tekst"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Formindsk Tekst"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Nulstil tekststørrelse til standard"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5923,7 +5903,7 @@ msgstr ""
 "Scroll til forrige difference\n"
 "Forrige Difference (Alt+Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5932,67 +5912,67 @@ msgstr ""
 "Scroll til næste difference\n"
 "Næste Difference (Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -6001,7 +5981,7 @@ msgstr ""
 "Scroll til første difference\n"
 "Første Difference (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6010,7 +5990,7 @@ msgstr ""
 "Scroll til aktuel difference\n"
 "Aktuel Difference (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6019,7 +5999,7 @@ msgstr ""
 "Scroll til sidste difference\n"
 "Sidste Difference (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6028,7 +6008,7 @@ msgstr ""
 "Kopier den valgte tekst til den højre fil\n"
 "Kopier højre (Alt Højre)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6037,7 +6017,7 @@ msgstr ""
 "Kopier den valgte tekst til den venstre fil\n"
 "Kopier venstre (Alt Venstre)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6046,7 +6026,7 @@ msgstr ""
 "Kopier forskel til højre side og gå til næste forskel\n"
 "Kopier til højre og gå til næste (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6055,7 +6035,7 @@ msgstr ""
 "Kopier forskel til venstre side og gå til næste forskel\n"
 "Kopier til venstre og gå til næste (Ctrl+Alt+Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6064,7 +6044,7 @@ msgstr ""
 "Kopier alle forskelle til den højre fil\n"
 "Alt til højre"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6073,77 +6053,77 @@ msgstr ""
 "Kopier alle forskelle til den venstre fil\n"
 "Alt til venstre"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Slet valgte emner fra begge mapper"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Sammenlign valgte emner (sammenlign første emne hvis flere er valgt)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Vælg og gen-sorter sammenligning af mapper"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Lav en patch-fil"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Vælge og ændrer filtre"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Genererer en rapport fra sammenlignings resultat"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "Vis liste med tilgængelige Plugins"
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "Brugeren vælger udpakkeren (ingen udpakning under sammenligning af mapper)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Udpakkeren bruges på begge filer (kun den ene fil behøves en korrekt extension)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Vælg en udpakker til at redigere denne fil"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Ingen predeffinering (normal)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Anbefalede plugins"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Andre plugins"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Fjern alle plugins og genindlæs dem (for udviklere)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6152,12 +6132,12 @@ msgstr ""
 "Aktiverer næste synlige fil\n"
 "Aktiverer næste fil"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Lukker alle åbne vinduer"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6166,22 +6146,22 @@ msgstr ""
 "Åben WinMerge Hjælp\n"
 "WinMerge Hjælp"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Skriver den nuværende WinMerge versionsinformation og konfiguration til en tekst fil"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "Vis GNU General Public License"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Privat Udgave: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6190,7 +6170,7 @@ msgstr ""
 "Åben udgivelses noter\n"
 "Udgivelses noter"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6199,272 +6179,272 @@ msgstr ""
 "Åben oversættelses websiden\n"
 "Oversættelser"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Plugin indstillinger"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Ingen predeffinering"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Prediff hvis muligt"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH ikke fundet - .sct scripts afbrudt"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Ingen>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Automatisk>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Åben filen med registreret applikation"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Åben filen med ekstern editor"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Åben filen med et bestemt program"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Vis ikke flyttede blokke"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Vis alle flyttede blokke"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Vis kun flyttede blokke fra den nuværende forskel"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Gå til forskel under cursor"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "G&å til forskel %1 af %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "G&å til linje %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Deaktiveret"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Fra filsystem"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Fra MRU liste"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "Ingen Fremhævning"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Batch"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Transportabelt Objekt"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Resourser"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr ""
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Skjul Værktøjslinie"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Vis lille Værktøjslinie"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Vis stor Værktøjslinie"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index 1f73bc0..2cc7477 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -1031,7 +1031,7 @@ msgid "&Scripts"
 msgstr "&Scripts"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Leeg >"
@@ -1472,7 +1472,7 @@ msgid "&Versioning System:"
 msgstr "&Versiebeheersysteem:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Pad naar cleartool.exe:"
@@ -1673,7 +1673,7 @@ msgid "Replace &All"
 msgstr "&Alles vervangen"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2589,7 +2589,7 @@ msgid "Files:"
 msgstr "Bestanden:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Verschillend"
@@ -2626,7 +2626,7 @@ msgid "Right:"
 msgstr "Rechts:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Identiek"
@@ -2826,7 +2826,7 @@ msgid "A&ppend timestamp"
 msgstr "Voeg tijdstem&pel toe"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Bevestig kopiëren"
@@ -2904,7 +2904,7 @@ msgstr "Toevoegen &aan contextmenu van verkenner"
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Map"
@@ -3544,7 +3544,7 @@ msgid "Version Control"
 msgstr "Versiebeheer"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Verschillen"
@@ -3673,87 +3673,67 @@ msgstr "XML-bestanden (*.xml)|*.xml|Alle Bestanden (*.*)|*.*||"
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Volledige inhoud"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Snelle inhoud"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Datum laatste wijziging"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Aangepaste datum en grootte"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Grootte"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Naam"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Locatie"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filters"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Beschrijving"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Selecteer bestandsnaam voor nieuwe filter"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Bestandsfilters (*.flt)|*.flt|Alle Bestanden (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3766,7 +3746,7 @@ msgstr ""
 "Kopieer bestand %1 naar map WinMerge/Filters:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3779,7 +3759,7 @@ msgstr ""
 "\n"
 "Ga na of de map bestaat en schrijfbaar is."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3790,7 +3770,7 @@ msgstr ""
 "\n"
 "Selecteer filtermap in Opties/Systeem."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3803,12 +3783,12 @@ msgstr ""
 "\n"
 "Misschien is het bestand alleen-lezen?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Localiseer te installeren filterbestand"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3819,17 +3799,17 @@ msgstr ""
 "\n"
 "Kon nieuwe filter niet kopiëren naar filtermap."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Filterbestand bestaat reeds. Bestaande filter overschrijven?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Reguliere expressie"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3840,243 +3820,243 @@ msgstr ""
 "\n"
 "Indien u dit nu niet wilt doen, kan u Nee selecteren en de vergelijkingen later vernieuwen."
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "&Pad naar SS.EXE:"
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Resultaten mapvergelijking"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Restultaten bestandsvergelijking"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Geen titel links"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Geen titel rechts"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "Hun bestand"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "Mijn bestand"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Bestanden aan het scannen..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Bezig met openen van selectie"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Aan het kopiëren van links naar rechts"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Aan het kopiëren van rechts naar links"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Alles naar links aan het kopiëren"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Alles naar rechts aan het kopiëren"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Bezig met kopiëren van bestanden..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Bezig met verwijderen van bestanden..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Bezig met verplaatsen van bestanden..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Rapport genereren..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Laatste operatie ongedaan maken..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "Vorige operatie opnieuw doen..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Regel: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Samenvoegen"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Verschil %1 van %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 verschillen gevonden"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "Eén verschil gevonden"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "AL"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Item %1 van %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Items: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Selecteer twee bestaande mappen of bestanden om te vergelijken"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Selectie van mappen"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Selecteer twee mappen of bestanden om te vergelijken."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "Linker pad is ongeldig!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Rechter pad is ongeldig!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Beide paden zijn ongeldig!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Kies twee bestanden om de uitpakker selectie in te schakelen."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Kan geen bestand met een map vergelijken!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Bestand niet gevonden: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Bestand niet uitgepakt: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4089,12 +4069,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Analyseren van conflictbestand mislukt."
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4105,32 +4085,32 @@ msgstr ""
 "%1\n"
 "is geen conflictbestand."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Opslaan als"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Wijzigingen opslaan in %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 is gemarkeerd als alleen lezen. Wilt u dit alleen-lezen bestand overschrijven? (Niet opslaan onder nieuwe naam.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Fout bij het controleren van de schrijfrechten van het doelbestand"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Fout bij het maken van een veiligheidskopie"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4143,7 +4123,7 @@ msgstr ""
 "\n"
 "Toch doorgaan?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4158,7 +4138,7 @@ msgstr ""
 "%2\n"
 "Wilt u het bestand onder een andere naam opslaan?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4173,7 +4153,7 @@ msgstr ""
 "\n"
 "Wilt u de uitgepakte versie in een ander bestand opslaan?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4188,7 +4168,7 @@ msgstr ""
 "\n"
 "Wilt u de uitgepakte versie in een ander bestand opslaan?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4203,7 +4183,7 @@ msgstr ""
 "\n"
 "Het gewijzigde bestand overschrijven?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4212,7 +4192,7 @@ msgstr ""
 "%1\n"
 "is gemarkeerd als alleen-lezen. Wilt u het alleen-lezen item overschrijven?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4227,22 +4207,22 @@ msgstr ""
 "\n"
 "Wilt u het bestand opnieuw laden?"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Linker bestand opslaan als"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Rechter bestand opslaan als"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid ""
 "The file\n"
@@ -4253,7 +4233,7 @@ msgstr ""
 "%1\n"
 "is verdwenen. Sla een kopie op van het bestand om door te gaan."
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4264,42 +4244,42 @@ msgstr ""
 "\n"
 "Vernieuw documenten voordat u doorgaat."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "U moet een SourceSafe-project pad specificeren voordat u verder kunt  (bv:  $/MyProject)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Bestanden vanuit VSS uitchecken..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "SourceSafe gaf een foutmelding bij de checkout van het bestand. Kan niet verder gaan..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Fout bij het uitvoeren van een versiebeheer systeemopdracht."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "De VSS-werkmap en de locatie van het huidige bestand komen niet overeen. Doorgaan?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Geen VSS-database(s) gevonden!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Fout uit VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4310,7 +4290,7 @@ msgstr ""
 " Controleer configuratie-specificaties van de gebruikte weergave.\n"
 " Checkout ongedaan maken?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4319,169 +4299,169 @@ msgstr ""
 "Versie-systeem gaf een fout bij een poging tot het ongedaan maken van een bestands-checkout.\n"
 " Controleer configuratie-specificaties van de gebruikte weergave."
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Geen"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (5.0 of lager)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 en hoger)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Afbreken bij witruimte"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Afbreken bij witruimte of interpunctie"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Kopieer geselecteerd item naar genoemde map"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Kopieer geselecteerd item naar aangepaste map"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Geselecteerd item aan de linkerkant verwijderen"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Geselecteerd item aan de rechterkant verwijderen"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Geselecteerd(e) item(s) aan beide kanten verwijderen"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Verberg geselecteerd(e) item(s) (on-the-fly-filter)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Herbenoem geselecteerd item aan beide kanten"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Van rechts naar links (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Van links naar rechts (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Van rechts naar links (%1 van %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Van links naar rechts (%1 van %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Van links naar... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Van rechts naar... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Van links naar... (%1 van %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Van rechts naar... (%1 van %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Links (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Rechts (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Beide (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Links (%1 of %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Rechts (%1 of %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Beide (%1 of %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Selecteer doelmap"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Linkerkant - selecteer doelmap:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Rechterkant - selecteer doelmap:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 bestanden aangepast)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 van %2 bestanden aangepast)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4493,17 +4473,17 @@ msgstr ""
 "%1\n"
 "wilt verwijderen?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Bent u zeker dat u het volgende wilt kopiëren:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Bent u zeker dat u %d items wilt kopiëren:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4522,613 +4502,613 @@ msgstr ""
 "\n"
 "Vernieuw a.u.b. de vergelijking."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "Bent u zeker dat u wilt verplaatsen:"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "Bent u zeker dat u %d items wilt verplaatsen:"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "Bevestig verplaatsen"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Linker bestand openen"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Het linker bestand met de externe editor openen"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Linker bestand openen met..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Rechter bestand openen"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Het rechter bestand met de externe editor openen"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Rechter bestand openen met..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Uitvoeren externe editor mislukt: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Onbekende extensie bij externe editor: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Bestandsnamen naar het klembord kopiëren"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Padnamen van de linker kant naar het klembord kopiëren"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Padnamen van de rechter kant naar het klembord kopiëren"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Padnamen van beide kanten naar het klembord kopiëren"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr "Linker shellmenu"
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr "Rechter shellmenu"
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Onbekend archiefformaat"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Items van de linkerkant aan het archief toevoegen"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Items van de rechterkant aan het archief toevoegen"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Items van beide kanten aan het archief toevoegen"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Items die verschillen (van beide kanten) aan het archief toevoegen"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Geselecteerd bestand van links naar door gebruiker gedefinieerde map verplaatsen"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Geselecteerd bestand van rechts naar door gebruiker gedefinieerde map verplaatsen"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Resultaat vergelijking"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Datum links"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Datum rechts"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Extensie"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Grootte links"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Grootte rechts"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Rechtse grootte (Kort)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Linkse grootte (Kort)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Aanmaaktijd links"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Aanmaaktijd rechts"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Nieuwer bestand"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Bestandsversie links"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Bestandsversie rechts"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Kort resultaat"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Attributen links"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Attributen rechts"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "Links regeleinde"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "Rechts regeleinde"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Tekenset links"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Tekenset rechts"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Genegeerde versch."
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binair"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Kan bestanden niet vergelijken"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Item afgebroken"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Bestand overgeslagen"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Map overgeslagen"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Alleen links: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Alleen rechts: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Binaire bestanden zijn identiek"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Binaire bestanden zijn niet gelijk"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Bestanden zijn niet gelijk"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr "Mappen zijn verschillend"
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Alleen links"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Alleen rechts"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Fout"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr "Tekstbestanden zijn identiek"
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr "Tekstbestanden zijn verschillend"
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Verstreken tijd: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 item geselecteerd"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 items geselecteerd"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Bestandsnaam of mapnaam."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Naam van submap als submappen erbij horen."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Resultaat van vergelijking, lange vorm."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Wijzigingsdatum linkerzijde."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Wijzigingsdatum rechterzijde."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Bestandsextensie."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Bestandsgrootte in bytes voor linkerzijde."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Bestandsgrootte in bytes voor rechterzijde."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Linker bestandsgrootte ingekort."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Rechter bestandsgrootte ingekort."
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Aanmaaktijdstip linkerzijde."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Aanmaaktijdstip rechterzijde."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Geeft aan welke zijde het recentst gewijzigd is."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Bestandsversie linkerzijde, alleen voor bepaalde bestandstypes."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Bestandsversie rechterzijde, alleen voor bepaalde bestandstypes."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Kort vergelijkingsresultaat."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Attributen linkerzijde."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Attributen rechterzijde."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Type regeleinde linker bestand"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Type regeleinde rechter bestand"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Tekenset linkerzijde."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Tekenset rechterzijde."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Aantal genegeerde verschillen in bestand. Deze verschillen worden genegeerd door WinMerge en kunnen niet samengevoegd worden."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Aantal verschillen in bestand. Dit aantal is zonder genegeerde verschillen."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Toont sterretje (*) als het een binair bestand is."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "%1 met %2 vergelijken"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Komma-gescheiden lijst"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Tab-gescheiden lijst"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "Simpele html"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "Simpele xml"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Het rapportbestand bestaat reeds. Wilt u het bestaande bestand overschrijven?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5137,32 +5117,32 @@ msgstr ""
 "Fout bij maken van rapport:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Het rapport is met succes opgesteld."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Hetzelfde bestand is in beide vensters geopend."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "De geselecteerde bestanden zijn identiek"
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Fout opgetreden tijdens het vergelijken van de bestanden"
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Tijdelijke bestanden konden niet aangemaakt worden. Controleer de instelling voor het pad van tijdelijke bestanden."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5177,7 +5157,7 @@ msgstr ""
 "\n"
 "Opmerking: Indien u op elk moment alle regeleinde-types als equivalent wilt behandelen, stel optie \"Negeer regeleindeteken-verschillen...\" dan in in de Vergelijken-tab van het opties-venster (beschikbaar onder Wijzigen/Opties)"
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5188,22 +5168,22 @@ msgstr ""
 " Met de huidige opties zullen ze één gemaakt worden naar het hoofdtype.\n"
 " Wilt u de opties wijzigen en de verschillende regeleindes behouden?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Er trad een fout op bij het voorvergelijken van bestand '%1' met plugin '%2'. De voorvergelijking is niet meer toegepast."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "De geselecteerde map is ongeldig."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Kan geen binair bestand openen met de editor."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5218,7 +5198,7 @@ msgstr ""
 "%1\n"
 "maken aan de andere kant en deze mappen openen?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5229,148 +5209,148 @@ msgstr ""
 "Elk bestand in zijn eigen codetabel weergeven zal resulteren in een betere weergave, maar samenvoegen/kopiëren zal gevaarlijk zijn.\n"
 "Wilt u beide bestanden behandelen alsof ze in de standaard Windows-codetabel zijn (aangeraden)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Waarschuwing: Bestanden gebruiken verschillende coderingen, links=%s en rechts=%s, en samenvoegen kan leiden tot verlies van informatie."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Informatie verloren gegaan wegens coderingsfouten: beide bestanden"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Geen verschil"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Regelverschil"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "%1 tekenreeks(en) vervangen."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Kan tekenreeks \"%s\" niet vinden"
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Volledig pad kopiëren"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Bestandsnaam kopiëren"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Locatievenster"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Verschilvenster"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Patchbestand met succes weggeschreven."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1ste item niet gevonden! (is het een map?)"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2de item niet gevonden! (is het een map?)"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Het patchbestand bestaat al. Wilt u het overschrijven?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 bestanden geselecteerd]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Normaal"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Context"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Verenigd"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Kan niet schrijven naar bestand %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Het gespecifieerde uitvoerpad is geen absoluut pad: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Specificeer een uitvoerbestand"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Kan geen patchbestand maken uit binaire bestanden."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Kan geen patchbestand maken uit mappen."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5381,17 +5361,17 @@ msgstr ""
 "\n"
 "Een patch genereren vereist dat er geen niet-opgeslagen veranderingen in bestanden zijn."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Map bestaat niet."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Huidige resultaten van mapvergelijking zullen worden gewist."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5402,7 +5382,7 @@ msgstr ""
 "Er kon geen enkel onderdeel voor archiefondersteuning (7-zip and/or Merge7z*.dll) gevonden worden.\n"
 "Zie de handleiding voor meer info over archiefondersteuning en hoe het te activeren."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5411,7 +5391,7 @@ msgstr ""
 "\n"
 "Opmerking: 7-Zip-integratie is uitgeschakeld in de instellingen van WinMerge."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5420,37 +5400,37 @@ msgstr ""
 "\n"
 "Opmerking: 7-Zip-integratie is gelimiteerd tot standalone-operatie in de instellingen van WinMerge."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Selecteer te exporteren bestand"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Selecteer te importeren bestand"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Opties geïmporteerd van bestand"
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Opties geëxporteerd naar bestand."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Opties importeren van bestand mislukt."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Opties schrijven naar bestand mislukt."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5461,242 +5441,242 @@ msgstr ""
 "\n"
 "Wilt u doorgaan?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Fout in reguliere expressie"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Geen overkomst"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Ongeldige reguliere expressie"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Ongeldig collatieteken"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Ongeldige tekenklassenaam"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Backslash aan het eind"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Ongeldige achterwaartse referentie"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Geen overeenkomende [ of [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Geen overeenkomende ( or \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Geen overeenkomende \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Ongeldige inhoud van \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Ongeldig einde van bereik"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Onvoldoende geheugen"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Ongeldige voorafgaande reguliere expressie"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Voortijdig einde van reguliere expressie"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Te grote reguliere expressie"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Geen overeenkomende ) of \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Gemengd"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Type"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "Uitpakker"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr "Voorvergelijken"
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "Editor-script"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Het linker bestand opslaan"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Het rechter bestand opslaan"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Het linker bestand opslaan met de naam..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Het rechter bestand opslaan met de naam..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Converteer regeleinde naar Windows-modus"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Converteer regeleinde naar Unix-modus"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Converteer regeleinde naar Mac-modus"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Wisselen tussen bewerkmodus en samenvoegmodus"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5705,12 +5685,12 @@ msgstr ""
 "Bekijk en wijzig bestandscodering-eigenschappen\n"
 "Bestandscodering-eigenschappen"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "Open en verplaats conflictbestand"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5719,7 +5699,7 @@ msgstr ""
 "Selecteer verschilgebied in de huidige regel\n"
 "Verschil in huidige regel"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5728,7 +5708,7 @@ msgstr ""
 "Ga naar regel of verschil\n"
 "Ga naar (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5737,7 +5717,7 @@ msgstr ""
 "Programmaopties instellen\n"
 "Eigenschappen"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5746,37 +5726,37 @@ msgstr ""
 "Beeld verversen\n"
 "Verversen (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Kopieer geselecteerde regels naar het klembord en voeg regelnummers toe aan het begin van elke regel"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Bladwijzer aan/uit"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Ga naar volgende bladwijzer"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Ga naar vorige bladwijzer"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Alle bladwijzers wissen"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5785,7 +5765,7 @@ msgstr ""
 "Toont items die exact hetzelfde zijn\n"
 "Toon identieke items"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5794,7 +5774,7 @@ msgstr ""
 "Toont items die verschillen bevatten\n"
 "Toon verschillende items"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5803,7 +5783,7 @@ msgstr ""
 "Toont items die alleen aan de linkerkant bestaan\n"
 "Toon linker unieke items"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5812,7 +5792,7 @@ msgstr ""
 "Toont items die alleen aan de rechterkant bestaan\n"
 "Toon rechter unieke items"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5821,7 +5801,7 @@ msgstr ""
 "Toont binaire bestanden\n"
 "Toon binaire bestanden"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5830,7 +5810,7 @@ msgstr ""
 "Toont overgeslagen items\n"
 "Toon overgeslagen items"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5839,7 +5819,7 @@ msgstr ""
 "Het lettertype voor de verschilvensters selecteren\n"
 "Het verschil-lettertype selecteren"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5848,27 +5828,27 @@ msgstr ""
 "Terug naar gebruik standaard systeemlettertype voor verschilvensters \n"
 "Standaard lettertype"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Toont tekens witruimte"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Verschilvenster Aan/Uit"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Locatievenster toont overzichtsweergave van bestanden"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Toon venster met mapvergelijkingsstatistieken"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5877,7 +5857,7 @@ msgstr ""
 "Selecteer de interfacetaal voor de huidige gebruiker\n"
 "Taal"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5886,12 +5866,12 @@ msgstr ""
 "Toont verschillen binnen dezelfde regel met verschillende kleuren\n"
 "Toon regelverschil"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Wissel de plaats van de twee vensters"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5900,7 +5880,7 @@ msgstr ""
 "Toont regelnummers\n"
 "Toon regelnummers"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5909,7 +5889,7 @@ msgstr ""
 "Activeer woordterugloop\n"
 "Regelterugloop"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5918,22 +5898,22 @@ msgstr ""
 "Toont selectiemarges voor beide vensters\n"
 "Toon selectiemarges"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Vergroot tekst"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Verklein tekst"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Herstel tekst-zoom naar standaardgrootte"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5942,7 +5922,7 @@ msgstr ""
 "Scroll naar het vorige verschil\n"
 "Vorige verschil (Alt+Omhoog)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5951,67 +5931,67 @@ msgstr ""
 "Scroll naar het volgende verschil\n"
 "Volgende verschil (Alt+Omlaag)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -6020,7 +6000,7 @@ msgstr ""
 "Scroll naar het eerste verschil\n"
 "Eerste verschil (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6029,7 +6009,7 @@ msgstr ""
 "Scroll naar het huidige verschil\n"
 "Huidig verschil (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6038,7 +6018,7 @@ msgstr ""
 "Scroll naar het laatste verschil\n"
 "Laatste verschil (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6047,7 +6027,7 @@ msgstr ""
 "De geselecteerde tekst naar het rechter bestand kopiëren.\n"
 "Naar rechts kopiëren (Pijl rechts)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6056,7 +6036,7 @@ msgstr ""
 "De geselecteerde tekst naar het linker bestand kopiëren.\n"
 "Naar links kopiëren (Pijl links)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6065,7 +6045,7 @@ msgstr ""
 "Het verschil naar rechts kopiëren en verder naar het volgende verschil.\n"
 "Naar rechts kopiëren en volgende (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6074,7 +6054,7 @@ msgstr ""
 "Het verschil naar links kopiëren en verder naar het volgende verschil.\n"
 "Naar links kopiëren en volgende (Ctrl+Alt+Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6083,7 +6063,7 @@ msgstr ""
 "Alle verschillen naar het rechter bestand kopiëren.\n"
 "Alles naar rechts kopiëren"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6092,77 +6072,77 @@ msgstr ""
 "Kopieer alle verschillen naar het linker bestand. \n"
 "Alles naar links kopiëren"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Geselecteerde items uit beide mappen wissen"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Vergelijk geselecteerd item (vergelijk eerste item indien meerdere items geselecteerd)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Kolommen van mapvergelijk selecteren en herordenen"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Een patch-bestand genereren"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Filters selecteren en wijzigen"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Genereert een rapport met vergelijkingsresultaten"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "Toont een lijst met beschikbare plugins"
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "De gebruiker selecteert de uitpakker (niet uitpakken bij het vergelijken van mappen)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "De overgenomen uitpakker wordt gebruikt voor beide bestanden (een bestand hoeft maar de extensie te hebben)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Selecteer een uitpakker om dit bestand te wijzigen"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Geen voorvergelijking (normaal)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Voorgestelde plug-ins"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Andere plug-ins"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Alle plug-ins opnieuw inladen (voor ontwikkelaars)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6171,12 +6151,12 @@ msgstr ""
 "Activeert volgend zichtbaar bestand\n"
 "Activeer volgend bestand"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Sluit alle geopende vensters"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6185,22 +6165,22 @@ msgstr ""
 "Opent de WinMerge Help\n"
 "WinMerge help"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "De huidige WinMerge versie en configuratie naar een tekstbestand wegschrijven"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "Toon de GNU General Public License"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Private Versie: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6209,7 +6189,7 @@ msgstr ""
 "Opent het document met vrijgave-opmerkingen\n"
 "Vrijgave-opmerkingen"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6218,272 +6198,272 @@ msgstr ""
 "Opent de vertalingen-website\n"
 "Vertalingen"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Plug-in instellingen"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Geen voorvergelijking"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Voorvergelijking indien mogelijk"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH niet gevonden - .sct scripts uitgeschakeld"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Geen>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Automatisch>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Open bestand met geregistreerde applicatie"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Open bestand met externe editor"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Open bestand met een bepaald programma"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Verplaatste blokken niet weergeven"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Toon alle verplaatste blokken"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Alleen verplaatse blokken van huidige vergelijking weergeven"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Ga naar het verschil onder de cursor"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "G&a naar verschil %1 van %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "G&a naar regel %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Uitgeschakeld"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Van bestandssysteem"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Van MRU-lijst"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "Geen Markering"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Batch"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Draagbaar Object"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Bronnen"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr "Verilog"
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Verberg de werkbalk"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Toon kleine werkbalk"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Toon grote werkbalk"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index 60c5f72..b1198bc 100644 (file)
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2012-09-02 18:47+0000\n"
+"POT-Creation-Date: 2012-09-08 23:09+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -1026,7 +1026,7 @@ msgid "&Scripts"
 msgstr ""
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr ""
@@ -1467,7 +1467,7 @@ msgid "&Versioning System:"
 msgstr ""
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr ""
@@ -1668,7 +1668,7 @@ msgid "Replace &All"
 msgstr ""
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr ""
@@ -2564,7 +2564,7 @@ msgid "Files:"
 msgstr ""
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr ""
@@ -2601,7 +2601,7 @@ msgid "Right:"
 msgstr ""
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr ""
@@ -2801,7 +2801,7 @@ msgid "A&ppend timestamp"
 msgstr ""
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr ""
@@ -2879,7 +2879,7 @@ msgstr ""
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr ""
@@ -3359,7 +3359,7 @@ msgid "Version Control"
 msgstr ""
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr ""
@@ -3476,2462 +3476,2442 @@ msgstr ""
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr ""
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr ""
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr ""
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr ""
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr ""
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr ""
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr ""
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr ""
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr ""
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr ""
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr ""
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr ""
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr ""
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr ""
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr ""
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr ""
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2."
 msgstr ""
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, 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:2210
+#: Merge.rc:2201
 #, c-format
 msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System."
 msgstr ""
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
 msgstr ""
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr ""
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
 msgstr ""
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr ""
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr ""
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
 msgstr ""
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr ""
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr ""
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr ""
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr ""
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr ""
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr ""
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr ""
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr ""
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr ""
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr ""
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr ""
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr ""
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr ""
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr ""
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr ""
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr ""
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr ""
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr ""
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr ""
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr ""
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr ""
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr ""
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr ""
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr ""
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr ""
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr ""
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr ""
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr ""
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr ""
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr ""
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr ""
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr ""
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr ""
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr ""
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid "Cannot open file\n%1\n\n%2"
 msgstr ""
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr ""
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid "The file\n%1\nis not a conflict file."
 msgstr ""
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr ""
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr ""
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, 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:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr ""
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr ""
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
 msgstr ""
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, 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:2329
+#: Merge.rc:2320
 #, 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:2330
+#: Merge.rc:2321
 #, 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:2331
+#: Merge.rc:2322
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?"
 msgstr ""
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid "%1\nis marked read-only. Would you like to override the read-only item?"
 msgstr ""
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
 msgstr ""
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr ""
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr ""
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
 msgstr ""
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
 msgstr ""
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr ""
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr ""
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr ""
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr ""
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr ""
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr ""
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr ""
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, 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:2357
+#: Merge.rc:2348
 #, 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:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr ""
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr ""
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr ""
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr ""
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr ""
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr ""
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr ""
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr ""
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr ""
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr ""
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr ""
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr ""
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr ""
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr ""
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr ""
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr ""
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr ""
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr ""
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr ""
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr ""
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr ""
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr ""
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr ""
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr ""
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr ""
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid "Are you sure you want to delete\n\n%1 ?"
 msgstr ""
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr ""
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr ""
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, 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:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr ""
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr ""
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr ""
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr ""
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr ""
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr ""
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr ""
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr ""
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr ""
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr ""
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr ""
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr ""
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr ""
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr ""
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr ""
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr ""
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr ""
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr ""
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr ""
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr ""
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr ""
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr ""
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr ""
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr ""
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr ""
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr ""
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr ""
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr ""
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr ""
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr ""
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr ""
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr ""
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr ""
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr ""
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr ""
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr ""
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr ""
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr ""
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr ""
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr ""
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr ""
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr ""
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr ""
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr ""
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr ""
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr ""
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr ""
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr ""
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr ""
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr ""
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr ""
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr ""
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr ""
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr ""
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr ""
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr ""
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr ""
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr ""
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr ""
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr ""
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr ""
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr ""
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr ""
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr ""
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr ""
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr ""
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr ""
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr ""
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr ""
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr ""
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr ""
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr ""
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr ""
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr ""
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr ""
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr ""
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr ""
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr ""
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr ""
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr ""
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr ""
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr ""
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr ""
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr ""
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr ""
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr ""
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr ""
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr ""
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr ""
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr ""
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr ""
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr ""
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid "Error creating the report:\n%1"
 msgstr ""
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr ""
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr ""
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr ""
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr ""
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr ""
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, 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:2625
+#: Merge.rc:2616
 #, 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:2626
+#: Merge.rc:2617
 #, 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:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr ""
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr ""
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, 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:2635
+#: Merge.rc:2626
 #, 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:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr ""
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr ""
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr ""
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr ""
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr ""
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr ""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr ""
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr ""
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr ""
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr ""
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr ""
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr ""
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr ""
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr ""
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr ""
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr ""
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr ""
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr ""
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr ""
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr ""
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr ""
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr ""
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr ""
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr ""
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files."
 msgstr ""
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr ""
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr ""
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, 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:2702
+#: Merge.rc:2693
 #, c-format
 msgid "\nNote: 7-Zip integration is disabled in WinMerge settings."
 msgstr ""
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings."
 msgstr ""
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr ""
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr ""
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr ""
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr ""
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr ""
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr ""
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid "You are about to close several compare windows.\n\nDo you want to continue?"
 msgstr ""
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr ""
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr ""
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr ""
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr ""
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr ""
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr ""
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr ""
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr ""
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr ""
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr ""
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr ""
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr ""
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr ""
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr ""
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr ""
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr ""
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr ""
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr ""
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr ""
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr ""
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr ""
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr ""
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr ""
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr ""
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr ""
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr ""
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr ""
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr ""
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr ""
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr ""
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr ""
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr ""
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr ""
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr ""
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr ""
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr ""
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr ""
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr ""
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr ""
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr ""
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr ""
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid "View and adjust file encoding properties\nFile encoding properties"
 msgstr ""
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr ""
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid "Select difference area in the current line\nDifference in the Current Line"
 msgstr ""
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid "Go to line or difference\nGo to (Ctrl+G)"
 msgstr ""
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid "Set program options\nOptions"
 msgstr ""
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid "Refresh display\nRefresh (F5)"
 msgstr ""
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr ""
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr ""
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr ""
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr ""
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr ""
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid "Displays items that are exactly the same\nShow Identical Items"
 msgstr ""
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid "Displays items that have differences\nShow Different Items"
 msgstr ""
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid "Displays items that exist in only on the left side\nShow Left Unique Items"
 msgstr ""
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid "Displays items that exist in only on the right side\nShow Right Unique Items"
 msgstr ""
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid "Displays binary files\nShow Binary Files"
 msgstr ""
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid "Displays skipped items\nShow Skipped Items"
 msgstr ""
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid "Select the font for the view\nSelect View Font"
 msgstr ""
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid "Revert to using the default system font for view\nDefault Font"
 msgstr ""
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr ""
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr ""
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr ""
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr ""
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid "Select the current user interface language\nLanguage"
 msgstr ""
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid "Shows differences inside lines with different colors\nShow Line Difference"
 msgstr ""
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr ""
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid "Shows line numbers\nShow Line Numbers"
 msgstr ""
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid "Enable word wrap\nWrap Lines"
 msgstr ""
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid "Shows selection margins for both panes\nShow Selection Margins"
 msgstr ""
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr ""
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr ""
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr ""
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
 msgstr ""
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
 msgstr ""
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
 msgstr ""
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
 msgstr ""
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid "Scroll to the last difference\nLast Difference (Alt+End)"
 msgstr ""
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)"
 msgstr ""
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)"
 msgstr ""
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)"
 msgstr ""
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)"
 msgstr ""
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid "Copy all differences to the right file\nAll Right"
 msgstr ""
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid "Copy all differences to the left file\nAll Left"
 msgstr ""
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr ""
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr ""
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr ""
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr ""
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr ""
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr ""
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr ""
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr ""
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr ""
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr ""
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr ""
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr ""
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr ""
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr ""
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid "Activates next visible file\nActivate next File"
 msgstr ""
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr ""
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid "Opens the WinMerge Help\nWinMerge Help"
 msgstr ""
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr ""
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr ""
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr ""
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid "Opens the release notes document\nRelease Notes"
 msgstr ""
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid "Opens the translations website\nTranslations"
 msgstr ""
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr ""
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr ""
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr ""
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr ""
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr ""
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr ""
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr ""
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr ""
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr ""
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr ""
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr ""
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr ""
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr ""
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr ""
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr ""
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr ""
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr ""
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr ""
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr ""
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr ""
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr ""
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr ""
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr ""
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr ""
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr ""
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr ""
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr ""
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr ""
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr ""
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr ""
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr ""
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr ""
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr ""
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr ""
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr ""
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr ""
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr ""
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr ""
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr ""
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr ""
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr ""
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr ""
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr ""
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr ""
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr ""
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr ""
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr ""
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr ""
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr ""
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr ""
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr ""
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr ""
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr ""
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index 090c28c..431c89c 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -1034,7 +1034,7 @@ msgid "&Scripts"
 msgstr "Appli&quer un script"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Vide >"
@@ -1475,7 +1475,7 @@ msgid "&Versioning System:"
 msgstr "&Système utilisé:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Chemin vers cleartool.exe:"
@@ -1676,7 +1676,7 @@ msgid "Replace &All"
 msgstr "&Tout Remplacer"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2592,7 +2592,7 @@ msgid "Files:"
 msgstr "Fichiers:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Différent"
@@ -2629,7 +2629,7 @@ msgid "Right:"
 msgstr "Droit:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Identique"
@@ -2829,7 +2829,7 @@ msgid "A&ppend timestamp"
 msgstr "Apposer une estampille &temporelle"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Confirmation de copie"
@@ -2907,7 +2907,7 @@ msgstr "Ajouter le menu de l'explorateur au menu contextuel"
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Répertoire"
@@ -3543,7 +3543,7 @@ msgid "Version Control"
 msgstr "Contrôle de version"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Différences"
@@ -3670,87 +3670,67 @@ msgstr "Fichiers XML (*.xml)|*.xml|All Files (*.*)|*.*||"
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Contenu complet"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Contenu rapide"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Date de modification"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Date et taille modifiée"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Taille"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Nom"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Emplacement"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filtres"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Description"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Sélectionner un nom de fichier pour le nouveau filtre"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Filtres de fichier (*.flt)|*.flt|Tous les fichiers (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3763,7 +3743,7 @@ msgstr ""
 "Veuillez copier le fichier %1 dans WinMerge/Répertoire des filtres:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3776,7 +3756,7 @@ msgstr ""
 "\n"
 "Veuillez vous assurer de l'existance du répertore et qu'il soit inscriptible."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3787,7 +3767,7 @@ msgstr ""
 "\n"
 "Veuillez le définir sous Préférences/Système."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3800,12 +3780,12 @@ msgstr ""
 "\n"
 "Cause probable: fichier en lecture seule?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Localiser le fichier de filtre à installer"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3816,17 +3796,17 @@ msgstr ""
 "\n"
 "Ne peut copier le nouveau fichier de filtre au répertoire de filtre."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Le fichier de filtre existe déjà. Écraser le filtre existant?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Expression régulière"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3837,243 +3817,243 @@ msgstr ""
 "\n"
 "Si vous ne voulez pas actualiser la comparaison. Sélectionnez Non et l'actualisation se fera plus tard."
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "&Chemin vers SS.EXE:"
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Résultats de la comparaison des répertoires"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Comparaison de fichiers"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Sans titre à gauche"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Sans titre à droite"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "Leur fichier"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "Mon fichier"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Balayage des fichiers en cours..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Ouverture en cours..."
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Copie de gauche à droite en cours..."
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Copie de droite à gauche en cours..."
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Copie de tout vers la gauche en cours..."
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Copie de tout vers la droite en cours..."
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Copie des fichiers en cours..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Suppression des fichiers en cours..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Déplacement des fichiers en cours..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Création du rapport..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Annuler la dernière opération..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "Refaire l'opération précédente..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Ligne: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Fusion"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Différence %1 de %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 Différences trouvées"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "1 Différence trouvée"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "LS"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Élément %1 de %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Élément: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Comparez deux fichiers ou deux répertoires !"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Sélection de répertoire"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Sélectionner deux répertoires ou deux fichiers à comparer"
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "Le chemin de gauche est invalide !"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Le chemin de droite est invalide !"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Les deux chemins sont invalides !"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Choisissez deux fichiers pour activer la sélection du décompresseur."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Ne peut comparer un fichier et un répertoire !"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Fichier %1 non trouvé"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Fichier non décompressé : %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4086,12 +4066,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "L'analyse du fichier en conflit a échoué."
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4102,32 +4082,32 @@ msgstr ""
 "%1\n"
 "n'est pas un fichier en conflit."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Enregistrer sous"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Enregistrer les changements de %1 ?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 est en lecture seule. Voulez-vous outrepasser ? (Choisissez Non pour enregistrer avec un nouveau nom.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Erreur en vérifiant les droits en écriture de la destination"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Erreur durant la prise de fichiers d'archive"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4140,7 +4120,7 @@ msgstr ""
 "\n"
 "Continuer quand même ?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4157,7 +4137,7 @@ msgstr ""
 "\t-utiliser un nom autre nom de fichier (Ok)\n"
 "\t-avorter l'opération en cours (Annuler)?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4172,7 +4152,7 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer la version décompressée sous un autre nom ?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4187,7 +4167,7 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer la version décompressée sous un autre nom ?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4202,7 +4182,7 @@ msgstr ""
 "\n"
 "Voulez-vous écraser le fichier mis à jour ?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4211,7 +4191,7 @@ msgstr ""
 "%1\n"
 "est en lecture seule. Voulez-vous outrepasser ?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4226,22 +4206,22 @@ msgstr ""
 "\n"
 "Voulez-vous actualiser le fichier?"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Enregistrer le fichier de gauche sous"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Enregistrer le fichier de droite sous"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid ""
 "The file\n"
@@ -4252,7 +4232,7 @@ msgstr ""
 "%1\n"
 "a disparu. Veuillez enregistrer une copie du fichier pour continuer."
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4263,42 +4243,42 @@ msgstr ""
 "\n"
 "Actualiser les documents avant de poursuivre."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Vous dever indiquer un chemin d'accès au projet SourceSafe afin de pouvoir continuer (par ex. :  $/MonProjet)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Extraire les fichiers de VSS..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "Le système de contrôle de version a retourné une erreur en essayant d'extraire le fichier. Ne peut continuer..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Erreur d'exécution d'une commande du système de contrôle de version."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "Le répertoire de travail de VSS et l'emplacement du fichier courant ne correspondent pas. Continuer ?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Aucune base de données de VSS trouvée !"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Erreur de VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4309,7 +4289,7 @@ msgstr ""
 " Veuillez vérifier la configuration.\n"
 " Annuler l'operation d'extraction?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4318,169 +4298,169 @@ msgstr ""
 "Le système de contrôle de version a retourné une erreur en essayant d'extraire le fichier.\n"
 " Veuillez vérifier la configuration. "
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Aucun"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (inférieur à 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 et supérieur)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Distinguer sur espacement"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Distinguer sur espacement ou ponctuation"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Copier le fichier sélectionné vers le répertoire indentifié"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Copier le fichier sélectionné vers un répertoire à indentifer"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Supprimer l'élément sélectionné à gauche"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Supprimer l'élément sélectionné à droite"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Supprimer l'élément sélectionné de chaque côté"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Dissimuler l'élément sélectionné (filtre instantané)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Renommer l'élément sélectionné de chaque côté"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "De droite à gauche (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "De gauche à droite (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "De droite à gauche (%1 de %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "De gauche à droite (%1 de %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "De gauche vers... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "De droite vers... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "De gauche vers... (%1 de %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "De droite vers... (%1 de %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "À gauche (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "À droite (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Des deux côtés (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "À gauche (%1 de %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "À droite (%1 de %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Des deux côtés (%1 de %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Choisir un répertoire de destination"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Côté gauche - choisir répertoire de destination:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Côté droit - choisir répertoire de destination:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 Fichiers concernés)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 de %2 Fichiers concernés)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4491,17 +4471,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Voulez-vous vraiment copier:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Voulez-vous vraiment copier %d éléments:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4520,613 +4500,613 @@ msgstr ""
 "\n"
 "Veuillez actualiser la comparaison."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "Êtes-vous sûr de vouloir déplacer:"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "Êtes-vous sûr de vouloir déplacer %d éléments:"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "Confirmez le déplacement"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Ouvrir le fichier de gauche"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Ouvrir le fichier de gauche avec l'éditeur externe"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Ouvrir le fichier de gauche avec ..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Ouvrir le fichier de droite"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Ouvrir le fichier de droite avec l'éditeur externe"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Ouvrir le fichier de droite avec ..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Lancement de l'éditeur externe a échoué: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Extension inconnue pour l'éditeur externe: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Copier les fichiers vers le presse-papiers"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Copier les chemins de gauche vers le presse-papiers"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Copier les chemins de droite vers le presse-papiers"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Copier les chemins des deux côtés vers le presse-papiers"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr "Menu explorateur gauche"
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr "Menu explorateur droit"
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Format d'archives inconnu"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Ajouter les éléments du côté gauche au fichier d'archives"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Ajouter les éléments du côté droit au fichier d'archives"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Ajouter les éléments des deux côté au fichier d'archives"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Ajouter les éléments distincts des deux côté au fichier d'archives"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Déplacer le fichier sélectionné de gauche vers un répertoire à indentifer"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Déplacer le fichier sélectionné de droite vers un répertoire à indentifer"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Nom du fichier"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Résultat de la comparaison"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Date mod. gauche"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Date mod. droite"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Extension"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Taille gauche"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Taille droite"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Taille droite (abrégée)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Taille gauche (abrégée)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Date cré. gauche"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Date cré. droit"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Plus récent"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Version gauche"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Version droite"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Résultat"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Attributs gauches"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Attributs droits"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "Fin de ligne gauche"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "Fin de ligne droit"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Page de code gauche"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Page de code droite"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Différences ignorées"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binaire"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Impossible de comparer les fichiers"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Élément abandonné"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Fichier ignoré"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Répertoire ignoré"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Juste à gauche: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Juste à droite: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Les fichiers binaires sont identiques"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Les fichiers binaires sont différents"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Les fichiers sont différents"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr "Les répertoires sont différents"
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Juste à gauche"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Juste à droite"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Erreur"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr "Les fichiers de texte sont identiques"
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr "Les fichiers de texte sont différents"
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Temps écoulé: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 élément sélectionné"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 éléments sélectionnés"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Nom de fichier ou de répertoire."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Nom du sous-répertoire lorsque ceux-ci sont inclus."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Resultat de la comparison, format étendu."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Date de modification du côté gauche."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Date de modification du côté droit."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Extension du fichier."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Taille du fichier du côté gauche en octets."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Taille du fichier du côté droit en octets."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Taille du fichier du côté gauche abrégée."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Taille du fichier du côté droit abrégée."
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Date de creation du côté gauche."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Date de creation du côté droit."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Indique le côté ayant la date de modification la plus récente."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Version du fichier du côté gauche, certains fichiers seulement."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Version du fichier du côté droit, certains fichiers seulement."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Resultat de la comparison, format abrégé."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Attributs du côté gauche."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Attributs du côté droit."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Type de fin de ligne du côté gauche"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Type de fin de ligne du côté droit"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Page de code du côté gauche."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Page de code du côté droit."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Nombre total des différences. Elles sont ignorées par WinMerge et ne peuvent être fusionnées."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Nombre de différences à l'exclusion de celles ignorées."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Indique un astérisque (*) si le fichier est binaire."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Comparer %1 avec %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Liste délimitée par des virgules"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Liste délimitée par des tabulations"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "Format HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "Format XML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Le rapport existe déjà. Voulez-vous écraser le fichier existant?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5135,32 +5115,32 @@ msgstr ""
 "Erreur à la création du rapport:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Le rapport a été créé avec succès."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Le même fichier est ouvert dans les deux volets."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Les fichiers sélectionnés sont identiques."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Erreur lors de la comparaison des fichiers."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Des fichiers temporaires ne peuvent être créés. Vérifiez la définition du chemin temporaire."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5175,7 +5155,7 @@ msgstr ""
 "\n"
 "Notez bien: Si vous voulez toujours considérer une telle égalité. Définnissez l'option: Ignorer les différences de fin de ligne à la fenêtre des Préférences sous l'onglet Comparaison (accessible avec le menu Edition/Préférences)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5186,22 +5166,22 @@ msgstr ""
 " Selon les préférences en vigueur, elles seront uniformisées au type principal.\n"
 " Désirez-vous changer l'option et préserver les différences ?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Une erreur est survenue pendant la pré-comparaison du fichier '%1' avec le plugiciel '%2'. La pré-comparaison ne sera donc plus utilisée."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "Le répertoire sélectionné est invalide."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Ne peut ouvrir un fichier binaire avec l'éditeur."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5216,7 +5196,7 @@ msgstr ""
 "%1\n"
 "à l'autre côté et ouvrir ces répertoires"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5227,148 +5207,148 @@ msgstr ""
 "L'affichage est ainsi meilleurs cependant les copie/fusion seront dangeureuses.\n"
 "Désirez-vous traiter les deux fichiers avec la page de code windows par défaut (recommandé)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Attention! Les fichiers utilisent un encodage différent: gauche=%s , droit=%s  et la fusion peut conduire à une perte d'information."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Information perdue à cause d'erreurs d'encodage: pour les deux fichiers"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Aucune différence"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Ligne différente"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "%1 remplacement(s) effectué(s)."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Texte non trouvé \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Copier le chemin complet"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Copier le nom du fichier"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Barre de localisation"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Détail des différences"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Fichier de retouche écrit avec succès."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. élément non trouvé ou il s'agit d'un répertoire !"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. élément non trouvé ou il s'agit d'un répertoire !"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Le fichier de retouche existe déja. Voulez-vous l'écraser ?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 fichiers sélectionnés]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Contexte"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Unifié"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Ne peut écrire au fichier %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Le chemin spécifié n'est pas un chemin absolu: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Indiquez un fichier de sortie"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Ne peut créer un fichier de retouche depuis un fichier binaire."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Ne peut créer un fichier de retouche depuis des répertoires."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5379,17 +5359,17 @@ msgstr ""
 "\n"
 "Générer une retouche requiert l'état non modifié des fichiers."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Le répertoire n'existe pas."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Les résultats de comparaison du répertoire courant seront effacés."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5400,7 +5380,7 @@ msgstr ""
 "Tous les composants requis (7-zip et/ou Merge7z*.dll) pour le support d'archives ne peuvent être trouvés.\n"
 "Consulter la documentation au sujet du support d'archives indiquant comment l'activer."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5409,7 +5389,7 @@ msgstr ""
 "\n"
 "Note: l'intégration de 7-Zip est désactivée avec les préférences de WinMerge."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5418,37 +5398,37 @@ msgstr ""
 "\n"
 "Note: l'intégration de 7-Zip est restreinte au mode autonome avec les préférences de WinMerge."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Sélectionner le fichier pour exportation"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Sélectionner le fichier pour importation"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Préférences importées du fichier."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Préférences exportées au fichier."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "L'importation (lecture) du fichier des préférences a échoué."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "L'exportation (écriture) du fichier des préférences a échoué."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5459,242 +5439,242 @@ msgstr ""
 "\n"
 "Voulez-vous continuer ?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Erreur d'expression régulière"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Pas de concordance"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Expression régulière invalide"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Caractère de classement invalide"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Nom de classe de caractère invalide"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Barre oblique à la fin"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Référence arrière invalide"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Non concordance de [ ou [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Non concordance de ( ou \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Non concordance de \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Contenu invalide de \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Fin de l'intervalle invalide"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Mémoire insuffisante"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Expression régulière précédente invalide"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Fin prématurée d'expression régulière"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Expression régulière trop grande"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Non concordance de ) or \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Combiné"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " O"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KO"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MO"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GO"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TO"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PO"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Type"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "Décompresseur"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr "Pré-comparaison"
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "Éditeur de script"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Enregistrer le fichier de gauche"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Enregistrer le fichier de droite"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Enregistrer le fichier de gauche sous..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Enregistrer le fichier de droite sous..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Convertir la fin de ligne en mode Windows"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Convertir la fin de ligne en mode Unix"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Convertir la fin de ligne en mode Mac"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Basculer entre les modes d'édition et de fusion"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5703,12 +5683,12 @@ msgstr ""
 "Voir et ajuster les propriétés d'encodage de fichier\n"
 "Propriétés d'encodage de fichier"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "Ouvrir et résoudre le fichier en conflit"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5717,7 +5697,7 @@ msgstr ""
 "Sélectionner la différence de la ligne courante\n"
 "Différence de la ligne courante"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5726,7 +5706,7 @@ msgstr ""
 "Atteindre une ligne ou une différence\n"
 "Atteindre (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5735,7 +5715,7 @@ msgstr ""
 "Modifier les préférences du programme\n"
 "Préférences"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5744,37 +5724,37 @@ msgstr ""
 "Actualiser l'affichage\n"
 "Actualiser (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Copier les lignes sélectionnés vers le presse-papiers en les précédants d'un numéro de ligne"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Placer ou retirer un signet"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Atteindre le signet suivant"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Atteindre le signet précédent"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Effacer tous les signets"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5783,7 +5763,7 @@ msgstr ""
 "Afficher les éléments strictement identiques\n"
 "Afficher les éléments identiques"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5792,7 +5772,7 @@ msgstr ""
 "Afficher les éléments comportants des différences\n"
 "Afficher les éléments différents"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5801,7 +5781,7 @@ msgstr ""
 "Afficher les éléments existant seulement au côté gauche\n"
 "Afficher les éléments de gauche seulement"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5810,7 +5790,7 @@ msgstr ""
 "Afficher les éléments existant seulement au côté droit\n"
 "Afficher les éléments de droite seulement"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5819,7 +5799,7 @@ msgstr ""
 "Afficher les éléments binaires\n"
 "Afficher les éléments binaires"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5828,7 +5808,7 @@ msgstr ""
 "Afficher les éléments ignorés\n"
 "Afficher les éléments ignorés"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5836,7 +5816,7 @@ msgid ""
 msgstr "Sélectionner la police utilisée pour l'affichage des différences\n"
 "Sélection de la Police d'affichage"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5845,27 +5825,27 @@ msgstr ""
 "Revenir à la police par défaut pour l'affichage des différences\n"
 "Police par Défaut"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Afficher ou masquer les espaces"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Afficher ou masquer le détail des différences courantes"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Afficher ou masquer la barre de localisation (vue d'ensemble des fichiers)"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Afficher la boîte de dialogue de comparaison des statistiques"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5874,7 +5854,7 @@ msgstr ""
 "Sélectionner le langage de l'interface\n"
 "Langage"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5883,12 +5863,12 @@ msgstr ""
 "Afficher les différences des lignes avec différentes couleurs\n"
 "Afficher différences des lignes"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Intervertir la position de deux fenêtres"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5897,7 +5877,7 @@ msgstr ""
 "Afficher la numérotation des lignes\n"
 "Afficher la numérotation des lignes"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5906,7 +5886,7 @@ msgstr ""
 "Afficher ou masquer le retour à la ligne automatique\n"
 "Retour à la ligne automatique"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5915,22 +5895,22 @@ msgstr ""
 "Afficher les marges des deux fenêtres\n"
 "Afficher les marges"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Augmenter la taille du texte"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Diminuer la taille du texte"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Rétablir le zoom du texte à la taille par défaut"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5939,7 +5919,7 @@ msgstr ""
 "Atteindre la différence précédente\n"
 "Diff Précédente (Alt+Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5948,67 +5928,67 @@ msgstr ""
 "Atteindre la différence suivante\n"
 "Diff Suivante (Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -6017,7 +5997,7 @@ msgstr ""
 "Atteindre la première différence\n"
 "Première Diff (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6026,7 +6006,7 @@ msgstr ""
 "Atteindre la différence courante\n"
 "Diff Courante (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6035,7 +6015,7 @@ msgstr ""
 "Atteindre la dernière différence\n"
 "Dernière Diff (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6044,7 +6024,7 @@ msgstr ""
 "Copier le texte sélectionné vers le fichier de droite\n"
 "Copier à Droite (Alt Right)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6053,7 +6033,7 @@ msgstr ""
 "Copier le texte sélectionné vers le fichier de gauche\n"
 "Copier à Gauche (Alt Left)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6062,7 +6042,7 @@ msgstr ""
 "Copier la différence vers la droite et Avancer\n"
 "Copier vers la droite et Avancer (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6071,7 +6051,7 @@ msgstr ""
 "Copier la différence vers la gauche et Avancer\n"
 "Copier vers la gauche et Avancer (Ctrl+Alt+Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6080,7 +6060,7 @@ msgstr ""
 "Copier toutes les différences vers le fichier de droite\n"
 "Copier Tout à Droite"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6089,77 +6069,77 @@ msgstr ""
 "Copier toutes les différences vers le fichier de gauche\n"
 "Copier Tout à Gauche"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Détruire les éléments sélectionnés pour les deux répertoires"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Comparer l'élément sélectionné (premier élément retenu si sélection multiple)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Sélectionner et ordonner les colonnes de la fenêtre de comparaison des répertoires"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Générer un fichier de retouche"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Sélectionner et modifier les filtres"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Générer un rapport des résultats de la comparaison"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "Affiche une liste des plugiciels disponibles"
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "Choisir le décompresseur (pas de décompression lors de la comparaison des répertoires)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Appliquer automatiquement le décompresseur approprié (basé sur l'extension d'au moins un des deux fichiers)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Choisir le décompresseur pour éditer ce fichier"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Pas de pré-comparaison (normal)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Plugiciels suggérés"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Plugiciels autres"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Recharger tous les plugiciels (pour les développeurs)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6168,12 +6148,12 @@ msgstr ""
 "Active le prochain fichier visible\n"
 "Active le prochain fichier"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Fermer toutes les fenêtres"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6182,22 +6162,22 @@ msgstr ""
 "Ouvre la rubrique d'aide de WinMerge\n"
 "Aide de WinMerge"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Affiche les informations de version et de configuration de WinMerge avec un fichier de texte"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "Afficher la licence publique générale GNU"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Compilation personnelle: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6206,7 +6186,7 @@ msgstr ""
 "Ouvre les notes de mise à jour\n"
 "Notes de mise à jour"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6215,272 +6195,272 @@ msgstr ""
 "Ouvre le site web des traductions\n"
 "Traductions"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Ajuster les plugiciels"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Pas de pré-comparaison"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Pré-comparer si possible"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH pas trouvé - .sct les scripts sont désactivés"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Aucun>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Automatique>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Ouvrir le fichier avec l'application désignée"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Ouvrir le fichier avec l'éditeur externe"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Ouvrir le fichier avec le programme indiqué"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Ne pas afficher les blocs déplacés"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Afficher tous les blocs déplacés"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Afficher le bloc déplacé de la différence courante"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Atteindre l'endroit pointé à la barre de localisation"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "Atteindre la différence %1 de %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "Atteindre la ligne %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "A partir du système de fichier"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "A partir de la liste des fichiers récents"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "Pas de surbrillance"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Batch"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Objet portatif"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Ressources"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr "Verilog"
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Masquer la barre d'outils"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Afficher la petite barre d'outils"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Afficher la grande barre d'outils"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index 5cd4d3b..3b05b83 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -1030,7 +1030,7 @@ msgid "&Scripts"
 msgstr "&Scripts"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Baleiro >"
@@ -1471,7 +1471,7 @@ msgid "&Versioning System:"
 msgstr "&Sistema de versionado:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Camiño a cleartool.exe:"
@@ -1672,7 +1672,7 @@ msgid "Replace &All"
 msgstr "Substituír &todo"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2589,7 +2589,7 @@ msgid "Files:"
 msgstr "Arquivos:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Diferente"
@@ -2626,7 +2626,7 @@ msgid "Right:"
 msgstr "Dereita"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Iguais"
@@ -2826,7 +2826,7 @@ msgid "A&ppend timestamp"
 msgstr "&Engadir etiqueta coa data"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Confirmar copia"
@@ -2904,7 +2904,7 @@ msgstr "Engadir men
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Cartafol"
@@ -3544,7 +3544,7 @@ msgid "Version Control"
 msgstr "Control de versións"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Diferenzas"
@@ -3673,87 +3673,67 @@ msgstr "Arquivos XML (*.xml)|*.xml|Todos os arquivos(*.*)|*.*||"
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Contidos completos"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Contidos rápidos"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Data de modificación"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Data de modificación e tamaño"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Tamaño"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Nome"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Localización"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filtros"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F]"
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Descrición"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Escoller un nome de arquivo para o filtro novo "
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Filtros dos arquivos (*.flt)|*.flt|Todos os arquivos (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3766,7 +3746,7 @@ msgstr ""
 "Copia o arquivo %1 ao cartafol de filtros:\n"
 "%2"
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3779,7 +3759,7 @@ msgstr ""
 "\n"
 "Asegúrate de que existe o cartafol e de que é escribible."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3790,7 +3770,7 @@ msgstr ""
 "\n"
 "Escolle un cartafol de filtros en Opcións/Sistema."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3803,12 +3783,12 @@ msgstr ""
 "\n"
 "Comprobe se o arquivo é do só-lectura."
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Procurar arquivo de filtros para instalar"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3819,17 +3799,17 @@ msgstr ""
 "\n"
 "Non se poden copiar novos filtros ao cartafol de filtros."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "O arquivo de filtros xa existe. Quérelo sobre-escribir?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Expresión regular"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3840,243 +3820,243 @@ msgstr ""
 "\n"
 "Se non queres regargar todas as comparacións agora podes seleccionar Non e actualizalas máis adiante."
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "&Ruta ao SS.EXE:"
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Resultado da comparación dos cartafoles "
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Comparación de arquivos"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Cadro esquerdo sen título"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Cadro dereito sen título"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "O Arquivo Deles"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "O Meu Arquivo"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "A escanear arquivos..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Abrindo selección"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "A copiar da esquerda para a dereita"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "A copiar da dereita para a esquerda"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "A copiar todo para a esquerda"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "A copiar todo para a dereita"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "A copiar arquivos..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "A borrar arquivos..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "A mover arquivos..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "A crear o informe..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Desfacendo a última operación..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "Refacendo a operación previa..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Liña: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Combinar"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Diferenza %1 de %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 diferenzas atopadas"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "1 diferenza atopada"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "SL"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Elemento %1 de %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Elementos: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Escolle dous cartafoles ou arquivos para comparar"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Selección de cartafol"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Escolle dous cartafoles ou arquivos para comparar."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "O camiño esquerdo non é válido!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "O camiño dereito non é válido!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Ambos os camiños non son válidos!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Escolle dous arquivos para activar a selección de desempaquetador."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Non se pode comparar un arquivo cun cartafol!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "No se atopou o arquivo: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "O arquivo non está desempaquetado: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4089,12 +4069,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Fallo na análise interpretativa do arquivo de conflito."
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4105,32 +4085,32 @@ msgstr ""
 "%1\n"
 "non é un arquivo de conflito."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Gardar como"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Queres gardar os cambios en %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 está definido como de só-lectura. Queres sobre-escribilo? (Non gardar cun nome de arquivo novo.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Erro ao comprobar se o destino é escribible"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Erro ao facer unha copia de seguridade do arquivo"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4143,7 +4123,7 @@ msgstr ""
 "\n"
 "Queres continuar?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4160,7 +4140,7 @@ msgstr ""
 "\t-usar un nome de arquivo distinto (preme Aceptar)\n"
 "\t-abortar a operación (preme Abortar)?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4175,7 +4155,7 @@ msgstr ""
 "\n"
 "Desexas gardar a versión desempaquetada noutro arquivo?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4190,7 +4170,7 @@ msgstr ""
 "\n"
 "Desexas gardar a versión desempaquetada noutro arquivo?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4205,7 +4185,7 @@ msgstr ""
 "\n"
 "Queres sobre-escribir o arquivo cambiado?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4214,7 +4194,7 @@ msgstr ""
 "%1\n"
 " está marcado como de só-lectura. Queres sobre-escribir o elemento?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4229,27 +4209,27 @@ msgstr ""
 "\n"
 "Queres recargar o arquivo?"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Gardar o arquivo esquerdo como"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Gardar o arquivo dereito como"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
 msgstr ""
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4260,42 +4240,42 @@ msgstr ""
 "\n"
 "Actualizar os documentos antes de seguir."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Debes especificar o camiño do proxecto SourceSafe para continuar (p.e:$/ProxectoMeu)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Desprotexer arquivos de VSS..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "O Sistema de Versionado devolveu un erro mentres se intentaba desprotexer o arquivo. Imposible proseguir..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Erro ao executar un comando no sistema de versionado"
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "O cartafol de traballo VSS e a localización do arquivo actual non coinciden. Queres continuar?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Non se atopou banco de datos VSS ningún"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Erro de VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4306,7 +4286,7 @@ msgstr ""
 "Comproba a configuración da visualización.\n"
 "Queres anular a operación de desprotección?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4315,169 +4295,169 @@ msgstr ""
 "O sistema de versionado devolveu un erro ao intentar desfacer a desprotección do arquivo.\n"
 "Comproba a configuración da visualización."
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Ningún"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (inferior de 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 e superiores)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Parar no espazo en branco"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Parar en espazo en branco ou puntuación"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Copiar o elemento escollido para o cartafol chamado"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Copiar o elemento escollido para o cartafol seleccionado"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Borrar o elemento escollido da banda esquerda  "
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Borrar o elemento escollido da banda dereita"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Borrar os elementos escollidos en ambas as bandas"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Agochar os elementos seleccionados (filtro sobre a marcha)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Renomear os elementos escollidos en ambas as bandas"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Da dereita para a esquerda (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Da esquerda para a dereita(%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Da dereita para a esquerda (%1 de %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Da esquerda para a dereita (%1 de %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Banda esquerda a...(%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Banda dereita a...(%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Banda esquerda a...(%1 de %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Banda dereita a...(%1 de %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Esquerda (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Dereita (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Ambas (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Esquerda (%1 de %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Dereita (%1 de %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Ambas as bandas (%1 de %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Escoller cartafol de destino"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Banda esquerda - escoller cartafol de destino:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Banda dereita - escoller cartafol de destino:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 arquivos afectados)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 de %2 arquivos afectados)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4488,17 +4468,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Tes a certeza de quereres copiar:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Tes a certeza de quereres copiar %d elementos: "
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4517,645 +4497,645 @@ msgstr ""
 "\n"
 "Actualiza a comparación. "
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "Tes a certeza de quereres mover:"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "Tes a certeza de quereres mover %d elementos: "
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "Confirmar Movemento"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Abrir arquivo esquerdo"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Abrir o arquivo esquerdo cun editor externo"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Abrir arquivo esquerdo con..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Abrir arquivo dereito"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Abrir o arquivo dereito cun editor externo"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Abrir o arquivo dereito con..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Non se puido executar o editor externo: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Extensión descoñecida do editor externo: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Copiar ao portapapeis os nomes dos arquivos"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Copiar ao portapapeis os camiños da banda esquerda"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Copiar ao portapapeis os camiños da banda dereita"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Copiar ao portapapeis os camiños de ambas as bandas"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr "Menú Shell Esquerdo"
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr "Menú Shell Dereito"
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Formato de arquivo descoñecido"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Engadir os elementos da banda esquerda ao arquivo"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Engadir os elementos da banda dereita ao arquivo"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Engadir os elementos de ambas as bandas ao arquivo"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Engadir ao arquivo elementos diferentes (ambas as bandas)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Mover o arquivo seleccionado da esquerda para o cartafol escollido"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Mover o arquivo seleccionado da dereita para o cartafol escollido"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Resultado da comparación"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Data esquerda"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Data dereita"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Extensión"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Tamaño esquerda"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Tamaño dereita"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Tamaño dereita (curto)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Tamaño esquerda (curto)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Data de creación esquerda"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Data de creación dereita"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Arquivo máis recente"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Versión do arquivo esquerdo"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Versión do arquivo dereito"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Resultado curto"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Atributos da esquerda"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Atributos da dereita"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "EOL esquerdo"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "EOL dereito"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Codificación esquerda"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Codificación dereita"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Diferenzas ignoradas"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binario"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Non é posible comparar os arquivos"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Elemento abortado"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Arquivo saltado"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Cartafol saltado"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Só esquerda: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Só dereita: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Os arquivos binarios son idénticos"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Os arquivos binarios son diferentes"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Os arquivos son diferentes"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr "Os cartafoles son diferentes"
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Só esquerda"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Só dereita"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Erro"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr "Os arquivos de texto son idénticos"
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr "Os arquivos de texto son diferentes"
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Tempo decorrido: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 elemento seleccionado"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 elementos seleccionados"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Nome do arquivo ou cartafol."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Nome do sub-cartafol cando os sub-cartafoles están incluídos"
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Resultados da comparación, formato completo."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Data de modificación da banda esquerda."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Data de modificación da banda dereita"
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Extensión do arquivo."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Tamaño do arquivo esquerdo en bytes."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Tamaño do arquivo dereito en bytes."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Tamaño abreviado do arquivo esquerdo."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Tamaño abreviado do arquivo dereito. "
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Data de creación do arquivo esquerdo."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Data de creación do arquivo dereito."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Di que parte foi modificada máis recentemente."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Versión do arquivo da banda esquerda, só para algúns tipos de arquivo."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Versión do arquivo da banda dereita, só para algúns tipos de arquivo."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Resultados curtos da comparación."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Atributos da banda esquerda."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Atributos da banda dereita."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Tipo de EOL do arquivo esquerdo"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Tipo de EOL do arquivo dereito"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Codificación da banda esquerda."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Codificación da banda dereita."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Número de diferenzas ignoradas no arquivo. Estas diferenzas son ignoradas por WinMerge e non se poden combinar."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Número de diferenzas no arquivo. Este número non inclúe as diferenzas ignoradas."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Amosa un asterisco (*) se o arquivo é binario."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Comparar %1 con %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Listaxe separada por comas"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Listaxe separada por tabulacións"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "HTML simple"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "XML simple"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "O arquivo de informe xa existe. Quérelo sobre-escribir?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
 "%1"
 msgstr "Erro ao crear o informe:n%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "O informe creouse correctamente."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "O mesmo arquivo está aberto en ambos paneis."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Os arquivos escollidos son idénticos."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Produciuse un erro durante a comparación dos arquivos."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Non se puideron crear os arquivos temporais. Comproba as configuracións dos camiños."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5170,7 +5150,7 @@ msgstr ""
 "\n"
 "Aviso: Se queres tratar todos os tipos de quebra como equivalentes, marca a opción 'Ignorar diferenzas de quebras de liña..' no apartado de comparación do diálogo de opcións (dispoñible en Editar/Opcións)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5181,22 +5161,22 @@ msgstr ""
 "Coa configuración actual, serán unificados co tipo principal.\n"
 "Queres cambiar as opcións e conservar os EOL diferentes?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Aconteceu un erro durante a pre-comparación do arquivo '%1' co plugin '%2'. A pre-comparación non se aplicará de novo."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "O cartafol seleccionado non é válido."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Non se pode abrir un arquivo binario no editor."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5211,7 +5191,7 @@ msgstr ""
 "%1\n"
 "que coincida co anterior e abrir ámbolos dous?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5222,148 +5202,148 @@ msgstr ""
 "Amosando cada arquivo coa súa páxina de códigos proporcionará unha mellor visualización pero combinar/copiar será perigoso.\n"
 "Preferirías tratar ambos arquivos como se tivesen a páxina de códigos predeterminada de windows (recomendado)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "AVISO: Os arquivos empregan codificacións distintas, esquerdo=%s e dereito=%s, combinalos pode producir perdas de datos."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Perdeuse información debido a erros de codificación: en ambos os arquivos"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Non hai diferenzas"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Diferenzas de liña"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Substituídas %1 cadea(s)."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Non se atopou a cadea \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Copiar o camiño completo"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Copiar o nome do arquivo"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Panel de situación"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Panel de diferenzas"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Escribiuse correctamente o arquivo de mendo."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. Non se atopou este elemento ou é un cartafol"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. Non se atopou este elemento ou é un cartafol"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "O arquivo patch xa existe. Quérelo sobre-escribir?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 arquivos seleccionados]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Contexto"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Unificado"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Non se puido escribir no arquivo %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "O camiño de saída especificado non é un camiño absoluto: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Especifica un arquivo de saída"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Non se pode crear un arquivo patch desde arquivos binarios."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Non se pode crear un arquivo patch desde un cartafol."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5374,17 +5354,17 @@ msgstr ""
 "\n"
 "Crear un arquivo patch precisa que todos os cambios nos arquivos estean gardados."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "O cartafol non existe."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Os resultados da comparación actual serán borrados."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5395,7 +5375,7 @@ msgstr ""
 "Non foron atopados todos os compoñentes precisos (7-zip e/ou Merge7z*.dll).\n"
 "Mira o manual para máis información acerca do soporte de arquivos e como se activa. "
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5404,7 +5384,7 @@ msgstr ""
 "\n"
 "Aviso: a integración do 7-Zip está desactivada na configuración de Winmerge."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5413,37 +5393,37 @@ msgstr ""
 "\n"
 "Aviso: a integración de 7-Zip está restrinxida a unha operación independente na configuración de Winmerge."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Escolle un arquivo para exportar"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Escolle un arquivo para importar"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Opcións importadas desde o arquivo."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Opcións exportadas desde o arquivo."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Fallo na importación das opcións deste arquivo."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Fallo ao escribir as opcións no arquivo."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5454,242 +5434,242 @@ msgstr ""
 "\n"
 "Queres continuar?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Erro na expresión regular"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Non hai coincidencias"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "A expresión regular non é válida"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Caracter de intercalación non válido"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "O nome da clase do caracter non é válido"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Barra invertida ao final"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Invalid back reference"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Sen coincidencias [ ou [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Sen coincidencias ( ou \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Sen coincidencia \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Contido non válido en \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "O fin de rango non é válido"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Memoria insuficiente"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "A expresión regular precedente non é válida"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Final prematuro da expresión regular"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "A expresión regular é grande de máis"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Sen coincidencia ) or \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Mesturado"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr "B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr "KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr "MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr "GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr "TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr "PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Tipo"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "Desempaquetador"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr "Pre-comparación"
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "Script do Editor"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Gardar o arquivo esquerdo"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Gardar o arquivo dereito"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Gardar o arquivo esquerdo co nome..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Gardar o arquivo dereito co nome..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Coverter EOL ao modo Windows"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Converter EOL ao modo Unix"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Converter EOL ao modo Mac"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Cambiar entre modo editar e  modo combinar"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5698,12 +5678,12 @@ msgstr ""
 "Ver e axustar as propiedades de codificación de arquivos\n"
 "Propiedades de codificación de arquivos"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "Abrir e resolver arquivo de conflito"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5712,7 +5692,7 @@ msgstr ""
 "Selecciona a área de diferenzas na liña actual\n"
 "Diferenzas na liña actual"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5721,7 +5701,7 @@ msgstr ""
 "Ir á liña ou á diferenza\n"
 "Ir (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5730,7 +5710,7 @@ msgstr ""
 "Establecer as opcións\n"
 "Opcións"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5739,37 +5719,37 @@ msgstr ""
 "Actualizar pantalla\n"
 "Actualizar (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Copiar as liñas seleccionadas ao portapapeis engadindo o número de liña ao comezo"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Cambiar marcador"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Ir ao seguinte marcador"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Ir ao marcador anterior"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Limpar todos o marcadores"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5778,7 +5758,7 @@ msgstr ""
 "Amosa os elementos que son exactamente iguais\n"
 "Amosar elementos iguais"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5787,7 +5767,7 @@ msgstr ""
 "Amosa os elementos que teñen diferenzas\n"
 "Amosar elementos diferentes"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5796,7 +5776,7 @@ msgstr ""
 "Amosa elementos que só existen na banda esquerda\n"
 "Amosar elementos únicos da banda esquerda"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5805,7 +5785,7 @@ msgstr ""
 "Amosa elementos que só existen na banda dereita\n"
 "Amosar elementos únicos da banda dereita"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5814,7 +5794,7 @@ msgstr ""
 "Amosa os arquivos binarios\n"
 "Amosar arquivos binarios"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5823,7 +5803,7 @@ msgstr ""
 "Amosa os elementos que se saltaron\n"
 "Amosar elementos saltados"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5832,7 +5812,7 @@ msgstr ""
 "Escolle o tipo de fonte para a vista\n"
 "Escoller fonte"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5841,27 +5821,27 @@ msgstr ""
 "Volver a empregar a fonte predeterminada do sistema\n"
 "Fonte predeterminada"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Amosar espazos en branco"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Amosar panel de diferenzas"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "O panel de situación amosa unha visión xeral dos arquivos"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Amosa os diálogos de estadísticas de comparación dos cartafoles"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5870,7 +5850,7 @@ msgstr ""
 "Selecciona o idioma do interface de usuario actual\n"
 "Idioma"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5879,12 +5859,12 @@ msgstr ""
 "Amosa cunha cor distinta as diferenzas dentro das liñas\n"
 "Amosar Diferenzas nas Liñas"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Intercambia a posición dos dous paneis"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5893,7 +5873,7 @@ msgstr ""
 "Amosa os números de liña\n"
 "Amosar números de liña"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5902,7 +5882,7 @@ msgstr ""
 "Axusta as liñas á largura do panel\n"
 "Axustar liñas"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5911,22 +5891,22 @@ msgstr ""
 "Amosa as marxes en ambos os paneis\n"
 "Amosar marxes"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Aumentar tamaño de texto"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Reducir tamaño de texto"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Restaurar tamaño de texto predeterminado"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5935,7 +5915,7 @@ msgstr ""
 "Ir á diferenza anterior\n"
 "Diferenza Anterior (Alt+Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5944,67 +5924,67 @@ msgstr ""
 "Ir á seguinte diferenza\n"
 "Seguinte Diferenza (Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -6013,7 +5993,7 @@ msgstr ""
 "Ir á primeira diferenza\n"
 "Primeira Diferenza (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6022,7 +6002,7 @@ msgstr ""
 "Ir á diferenza actual\n"
 "Diferenza Actual (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6031,7 +6011,7 @@ msgstr ""
 "Ir á derradeira diferenza\n"
 "Derradeira Diferenza (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6040,7 +6020,7 @@ msgstr ""
 "Copiar o texto seleccionado para a banda dereita\n"
 "Copiar para a dereita (Alt+Right)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6049,7 +6029,7 @@ msgstr ""
 "Copiar o texto seleccionado para a banda esquerda\n"
 "Copiar para a esquerda (Alt+Left)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6058,7 +6038,7 @@ msgstr ""
 "Copiar a diferenza para a banda dereita e ir á seguinte diferenza\n"
 "Copiar para a dereita e avanzar (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6067,7 +6047,7 @@ msgstr ""
 "Copiar a diferenza para a banda esquerda e avanzar á seguinte diferenza\n"
 "Copiar para a esquerda e avanzar (Ctrl+Alt+Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6076,7 +6056,7 @@ msgstr ""
 "Copiar todas as diferenzas para o arquivo dereito\n"
 "Todas para a dereita"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6085,77 +6065,77 @@ msgstr ""
 "Copiar todas as diferenzas para o arquivo esquerdo\n"
 "Todas para a esquerda"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Borrar os elementos seleccionados de ambos cartafoles"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Comparar elementos seleccionados (comparar o primeiro elemento se hai varios seleccionados)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Seleccionar e reordenar as columnas da comparación de cartafoles"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Xerar un arquivo patch"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Seleccionar e modificar filtros"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Xerar un informe cos resultados da comparación"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "Amosa unha lista dos plugins dispoñibles"
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "O usuario selecciona o desempaquetador (non se desempaqueta cando se comparan cartafoles)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "O desempaquetador escollido utilízase con ambos arquivos (unicamente un arquivo precisa a extensión)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Seleccionar un desempaquetador para editar este arquivo"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Sen pre-comparación (normal)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Plugins recomendados"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Outros plugins"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Desbotar todos os plugins e recargalos (para desenvolvedores)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6164,12 +6144,12 @@ msgstr ""
 "Activa o seguinte arquivo visible\n"
 "Activar o seguinte Arquivo"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Pecha todas as xanelas abertas"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6178,22 +6158,22 @@ msgstr ""
 "Abre a Axuda do WinMerge\n"
 "Axuda do WinMerge"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Esribe a información e a configuración da versión actual do WinMerge nun arquivo de texto"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "Amosa a Licenza Pública Xeral GNU"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Private Build: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6202,7 +6182,7 @@ msgstr ""
 "Abre o documento coas notas da versión\n"
 "Notas da Versión"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6211,272 +6191,272 @@ msgstr ""
 "Abre o sitio web de traducións\n"
 "Traducións"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Configuración do plugin"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Sen pre-comparación"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Pre-comparar se é posible"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH non atopado - scripts .sct desactivados"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Ningún>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Automático>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Abrir o arquivo coa aplicación rexistrada"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Abrir o arquivo cun editor externo"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Abrir o arquivo cun programa específico"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Non amosar bloques movidos"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Amosa todos os bloques movidos"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Amosar só os bloques movidos desde a diferenza actual"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Ir á diferenza baixo o cursor"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "I&r á diferenza %1 de %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "I&r á liña %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Do sistema de arquivos"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Da listaxe MRU"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "Sen Resaltar"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Batch"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Obxecto Portable"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Recursos"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr "Verilog"
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Agochar a barra de ferramentas"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Mostrar barra pequena de ferramentas"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Mostrar barra grande de ferramentas"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index 33e68ef..65fcabd 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -1033,7 +1033,7 @@ msgid "&Scripts"
 msgstr "Skri&pte"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Leer >"
@@ -1474,7 +1474,7 @@ msgid "&Versioning System:"
 msgstr "&Versionskontrollsystem"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Pfad zu cleartool.exe:"
@@ -1677,7 +1677,7 @@ msgid "Replace &All"
 msgstr "A&lle ersetzen"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2593,7 +2593,7 @@ msgid "Files:"
 msgstr "Dateien:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Unterschiedlich"
@@ -2630,7 +2630,7 @@ msgid "Right:"
 msgstr "Rechts:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Identisch"
@@ -2830,7 +2830,7 @@ msgid "A&ppend timestamp"
 msgstr "&Zeitstempel anhängen"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Kopieren bestätigen"
@@ -2908,7 +2908,7 @@ msgstr "&Shell-Men
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Ordner"
@@ -3516,7 +3516,7 @@ msgid "Version Control"
 msgstr "Versionskontrolle"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Unterschiede"
@@ -3645,87 +3645,67 @@ msgstr "XML-Dateien (*.xml)|*.xml|Alle Dateien (*.*)|*.*||"
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Voller Inhalt"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Schneller Inhalt"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Änderungsdatum"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Änderungsdatum und Größe"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Größe"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Name"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Pfad"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filter"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Beschreibung"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Dateinamen für neuen Filter auswählen"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Dateifilter (*.flt)|*.flt|Alle Dateien (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3738,7 +3718,7 @@ msgstr ""
 "Bitte kopieren Sie die Datei %1 in den Filterordner:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3751,7 +3731,7 @@ msgstr ""
 "\n"
 "Bitte stellen Sie sicher, dass der Ordner existiert und beschreibbar ist."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3762,7 +3742,7 @@ msgstr ""
 "\n"
 "Bitte wählen Sie den Filterordner unter Einstellungen/System aus."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3775,12 +3755,12 @@ msgstr ""
 "\n"
 "Ist die Datei möglicherweise schreibgeschützt?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Zu installierenden Filter auswählen"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3791,17 +3771,17 @@ msgstr ""
 "\n"
 "Die Filterdatei konnte nicht in den Filterordner kopiert werden."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Filterdatei existiert bereits. Existierenden Filter überschreiben?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Regulärer Ausdruck"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3812,245 +3792,245 @@ msgstr ""
 "\n"
 "Wenn Sie nicht jetzt alle Vergleiche aktualisieren möchten, können Sie Nein wählen und die Vergleiche später aktualisieren."
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "&Pfad zu SS.EXE:"
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Ordnervergleichs-Ergebnisse"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Dateivergleich"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Unbenannt links"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Unbenannt rechts"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "Deren Datei"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "Meine Datei"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Überprüfe Dateien..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Öffne Auswahl"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Kopiere links nach rechts"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Kopiere rechts nach links"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Kopiere alles nach links"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Kopiere alles nach rechts"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Kopiere Dateien..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Lösche Dateien..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Verschiebe Dateien..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Erzeugt den Bericht..."
 
 # Use action instead operation, like the rest of the undo/redo system.
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Rückgängigmachen der letzten Aktion..."
 
 # Use action instead operation, like the rest of the undo/redo system.
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "Wiederholen der vorherigen Aktion..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Zeile: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Merge"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Unterschied %1 von %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 Unterschiede gefunden"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "1 Unterschied gefunden"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "RO"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Objekt %1 von %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Objekte: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Wählen Sie zwei Dateien oder Ordner zum Vergleichen aus"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Ordnerauswahl"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Zwei Ordner oder zwei Dateien zum Vergleichen auswählen."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "Der linke Pfad ist ungültig!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Der rechte Pfad ist ungültig!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Beide Pfade sind ungültig!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Zwei Dateien zum Aktivieren der Entpacker-Auswahl auswählen."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Datei und Ordner können nicht verglichen werden!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Datei nicht gefunden: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Datei nicht entpackt: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4063,12 +4043,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Fehler beim Analysieren der Konflikt-Datei."
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4079,32 +4059,32 @@ msgstr ""
 "%1\n"
 "ist keine Konflikt-Datei."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Speichern unter"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Änderungen in %1 speichern?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 ist als Schreibgeschützt markiert. Möchten Sie die schreibgeschützte Datei überschreiben? (Nicht unter neuem Dateinamen speichern.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Fehler beim Prüfen des Zielverzeichnisses auf Schreibschutz"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Fehler beim Erstellen einer Sicherheitskopie"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4117,7 +4097,7 @@ msgstr ""
 "\n"
 "Trotzdem fortfahren?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4134,7 +4114,7 @@ msgstr ""
 "\t-einen anderen Dateinamen verwenden? (Ok drücken)\n"
 "\t-die aktuelle Operation abbrechen? (Abbruch drücken)"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4149,7 +4129,7 @@ msgstr ""
 "\n"
 "Möchten Sie die ungepackte Version in einer anderen Datei speichern?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4164,7 +4144,7 @@ msgstr ""
 "\n"
 "Möchten Sie die ungepackte Version in einer anderen Datei speichern?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4179,7 +4159,7 @@ msgstr ""
 "\n"
 "Geänderte Datei überschreiben?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4188,32 +4168,32 @@ msgstr ""
 "%1\n"
 "ist als schreibgeschützt markiert. Möchten Sie das schreibgeschützte Objekt überschreiben?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
 msgstr "Eine andere Anwendung hat die Datei\n%1\naktualisiert, seit WinMerge sie das letzte Mal geprüft hat.\n\nMöchten Sie die Datei neu laden?"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Speichere linke Datei unter"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Speichere rechte Datei unter"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
 msgstr "Die Datei\n%1\nist verlorengegangen. Bitte speichern Sie eine Kopie der Datei, um fortzufahren."
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4224,42 +4204,42 @@ msgstr ""
 "\n"
 "Aktualisieren Sie die Dokumente, bevor Sie fortfahren."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Sie müssen einen SourceSafe-Projektpfad angeben um fortzufahren (z.B.: $/MeinProjekt)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Dateien auschecken vom VSS..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "Das Versionierungssystem meldete einen Fehler beim Versuch die Datei auszuchecken. Der Vorgang kann nicht fortgesetzt werden..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Fehler beim Ausführen eines Befehles des Versionierungssystems."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "Der VSS-Arbeitsordner und die Position der aktuellen Datei stimmen nicht überein. Fortsetzen?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Keine VSS Datenbank(en) gefunden!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Fehler vom VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4270,7 +4250,7 @@ msgstr ""
 " Bitte überprüfen Sie die Konfiguration der verwendeten Ansicht.\n"
 " Auschecken rückgängig machen?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4279,169 +4259,169 @@ msgstr ""
 "Das Versionierungssystem meldete einen Fehler beim Versuch das Auschecken der Datei rückgängig zu machen.\n"
 " Bitte überprüfen Sie die Konfiguration der verwendeten Ansicht."
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Keines"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (kleiner als 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 und höher)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "An Leerzeichen abbrechen"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "An Leerzeichen oder Interpunktion abbrechen"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Kopiert ausgewähltes Objekt ins angegebene Verzeichnis."
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Kopiert ausgewähltes Objekt in ein beliebiges Verzeichnis."
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Löscht ausgewähltes Objekt auf der linken Seite."
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Löscht ausgewähltes Objekt auf der rechten Seite."
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Löscht ausgewählte Objekte auf beiden Seiten."
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Versteckt ausgewählte Objekte (dynamischer Filter)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Nennt ausgewähltes Objekt auf beiden Seiten um."
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Rechts nach Links (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Links nach Rechts (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Rechts nach Links (%1 von %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Links nach Rechts (%1 von %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Links nach... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Rechts nach... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Links nach... (%1 von %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Rechts nach... (%1 von %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Links (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Rechts (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Beide (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Links (%1 von %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Rechts (%1 von %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Beide (%1 von %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Zielordner auswählen."
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Linke Seite - Zielordner auswählen:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Rechte Seite - Zielordner auswählen:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 Dateien betroffen)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 von %2 Dateien betroffen)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4453,17 +4433,17 @@ msgstr ""
 "%1\n"
 "löschen?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Wollen Sie wirklich kopieren:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Wollen Sie wirklich %d Objekte kopieren:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4482,613 +4462,613 @@ msgstr ""
 "\n"
 "Bitte aktualisieren Sie den Vergleich."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "Wollen Sie wirklich verschieben:"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "Wollen Sie wirklich %d Objekte verschieben:"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "Verschieben bestätigen"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Öffne linke Datei"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Öffnet die linke Datei im externen Editor."
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Öffne linke Datei mit..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Öffne rechte Datei"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Öffnet die rechte Datei im externen Editor."
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Öffne rechte Datei mit..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Konnte externen Editor nicht ausführen: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Unbekannte Erweiterung beim externen Editor: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Kopiere Dateinamen in die Zwischenablage"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Kopiere linken Pfad in die Zwischenablage"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Kopiere rechten Pfad in die Zwischenablage"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Kopiere beide Pfade in die Zwischenablage"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr "Linkes Shell-Menü"
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr "Rechtes Shell-Menü"
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Unbekanntes Archiv Format"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Fügt Objekte von der linken Seite zum Archiv hinzu."
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Fügt Objekte von der rechten Seite zum Archiv hinzu."
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Fügt Objekte von beiden Seiten zum Archiv hinzu."
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Fügt unterschiedliche Objekte zum Archiv hinzu (beide Seiten)."
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Verschiebt die ausgewählte Datei in ein beliebiges Verzeichnis."
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Verschiebt die ausgewählte Datei in ein beliebiges Verzeichnis."
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Dateiname"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Vergleichsergebnis"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Linkes Datum"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Rechtes Datum"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Erweiterung"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Linke Größe"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Rechte Größe"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Rechte Größe (Kurz)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Linke Größe (Kurz)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Linkes Erstellungsdatum"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Rechtes Erstellungsdatum"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Neuere Datei"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Linke Dateiversion"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Rechte Dateiversion"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Kurz-Ergebnis"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Linke Attribute"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Rechte Attribute"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "Linkes Zeilenende"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "Rechtes Zeilenende"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Linke Kodierung"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Rechte Kodierung"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Ignorierte Unter."
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binär"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Dateien können nicht verglichen werden"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Objekt abgebrochen"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Datei übersprungen"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Ordner übersprungen"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Nur Links: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Nur Rechts: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Binärdateien sind identisch"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Binärdateien sind unterschiedlich"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Dateien sind unterschiedlich"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr "Ordner sind unterschiedlich"
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Nur Links"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Nur Rechts"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Fehler"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr "Textdateien sind identisch"
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr "Textdateien sind unterschiedlich"
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Ausführungszeit: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 Objekt ausgewählt"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 Objekte ausgewählt"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Dateiname oder Ordnername."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Unterordnername, wenn Unterordner vorhanden sind."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Vergleichsergebnis, langes Format."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Linkes Änderungsdatum."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Rechtes Änderungsdatum."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Dateierweiterung."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Linke Dateigröße in Byte."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Rechte Dateigröße in Byte."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Linke Dateigröße gekürzt."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Rechte Dateigröße gekürzt."
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Linkes Erstellungsdatum."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Rechtes Erstellungsdatum."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Zeigt, welche Seite ein neueres Änderungsdatum hat."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Linke Dateiversion, nur für einige Dateitypen."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Rechte Dateiversion, nur für einige Dateitypen."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Vergleichsergebnis, kurzes Format."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Linke Attribute."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Rechte Attribute."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Linker Zeilenenden-Typ"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Rechter Zeilenenden-Typ"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Linke Zeichensatz-Kodierung."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Rechte Zeichensatz-Kodierung."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Anzahl der ignorierten Unterschiede in der Datei. Diese Unterschiede werden von WinMerge ignoriert und können nicht vermischt werden."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Anzahl der Unterschiede in der Datei. Die Zahl enthält nicht die ignorierten Unterschiede."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Zeigt ein Asterisk (*), wenn die Datei binär ist."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Vergleiche %1 mit %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Komma-getrennte Liste"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Tab-getrennte Liste"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "Einfaches HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "Einfaches XML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Der Bericht existiert bereits. Überschreiben?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5097,32 +5077,32 @@ msgstr ""
 "Fehler beim Erzeugen des Berichtes:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Der Bericht wurde erfolgreich geschrieben."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Die gleiche Datei ist in beiden Feldern ausgewählt."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Die ausgewählten Dateien sind identisch."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Beim Vergleichen der Dateien ist ein Fehler aufgetreten."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Temporäre Dateien konnten nicht erzeugt werden. Überprüfen Sie Ihre Einstellungen für temporäre Dateien."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5137,7 +5117,7 @@ msgstr ""
 "\n"
 "Hinweis: Wenn Sie immer alle Zeilenumbruch-Formate als Gleichwertig behandeln wollen, aktivieren Sie die Option 'Zeilenumbruchunterschiede ignorieren' unter 'Vergleichen' im Einstellungsdialog (erreichbar unter Bearbeiten/Einstellungen)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5148,22 +5128,22 @@ msgstr ""
 " Mit den aktuellen Einstellungen werden sie zum Hauptformat vereinheitlicht.\n"
 " Möchten Sie die Einstellungen ändern und die unterschiedlichen Zeilenumbrüche erhalten?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Ein Fehler trat beim Prediffing der Datei '%1' mit dem Plugin '%2' auf. Das Prediffing wird daher nicht mehr angewendet."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "Der ausgewählte Ordner ist ungültig."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Kann keine Binärdatei im Editor öffnen."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5178,7 +5158,7 @@ msgstr ""
 "%1\n"
 "auf der anderen Seite erzeugen und die Ordner öffnen?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5189,148 +5169,148 @@ msgstr ""
 "Das Anzeigen jeder Datei im eigenen Zeichensatz erlaubt eine bessere Darstellung, aber das Mischen/Kopieren ist gefährlich.\n"
 "Wollen Sie beide Dateien behandeln, als wären sie im gleichen Zeichensatz (empfohlen)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Warnung: Die Dateien haben unterschiedliche Kodierungen, links=%s und rechts=%s, und das Vermischen führt möglicherweise zu Informationsverlusten."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Informationsverlust wegen Kodierungsfehlern: Beide Dateien"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Kein Unterschied"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Zeilen-Unterschied"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "%1 Vorkommen ersetzt."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Kann \"%s\" nicht finden"
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Kopiere vollständigen Pfad"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Kopiere Dateiname"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Positionsleiste"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Unterschiedsleiste"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Die Patchdatei wurde erfolgreich geschrieben."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. Objekt ist nicht vorhanden oder ist ein Verzeichnis!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. Objekt ist nicht vorhanden oder ist ein Verzeichnis!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Die Patchdatei existiert bereits. Überschreiben?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 Dateien ausgewählt]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Context"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Unified"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Konnte nicht in die Datei %1 schreiben."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Der angegebene Ausgabepfad ist kein absoluter Pfad: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Geben Sie eine Ausgabedatei an."
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Kann keine Patchdatei von Binärdateien erzeugen."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Kann keine Patchdatei von Verzeichnissen erzeugen."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5341,17 +5321,17 @@ msgstr ""
 "\n"
 "Das Erzeugen eines Patches erfordert, dass es keine ungespeicherten Änderungen in den Dateien gibt."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Der Ordner existiert nicht."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Die aktuellen Resultate des Ordnervergleichs werden gelöscht."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5362,7 +5342,7 @@ msgstr ""
 "Alle erforderlichen Komponenten (7-zip und/oder Merge7z*.dll) für die Archiv-Unterstützung können nicht gefunden werden.\n"
 "Entnehmen Sie dem Handbuch mehr Informationen über die Archiv-Unterstützung und wie sie aktiviert wird."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5371,7 +5351,7 @@ msgstr ""
 "\n"
 "Hinweis: Die 7-Zip Integration ist in den WinMerge-Einstellungen deaktiviert."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5380,37 +5360,37 @@ msgstr ""
 "\n"
 "Hinweis: Die 7-Zip Integration ist in den WinMerge-Einstellungen auf eigenständige Arbeitsweise beschränkt."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Datei zum Exportieren auswählen"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Datei zum Importieren auswählen"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Einstellungen aus der Datei importiert."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Einstellungen in die Datei exportiert."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Konnte die Einstellungen nicht aus der Datei importieren."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Konnte die Einstellungen nicht in die Datei exportieren."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5421,242 +5401,242 @@ msgstr ""
 "\n"
 "Möchten Sie wirklich fortfahren?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Regulärer Ausdruck Fehler"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Keine Übereinstimmung"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Ungültiger regulärer Ausdruck"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Ungültiges Vergleichszeichen"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Ungültiger Zeichenklasse-Name"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Nachfolgender Backslash"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Ungültiger Rückbezug"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Unpassende [ oder [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Unpassende ( oder \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Unpassende \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Ungültiger Inhalt von \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Ungültiges Bereichsende"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Platz im Hauptspeicher reicht nicht aus"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Ungültiger vorhergehender regulärer Ausdruck"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Vorzeitiges Ende des regulären Ausdruckes"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Regulärer Ausdruck zu groß"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Unpassende ) oder \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Gemischt"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Typ"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "Entpacker"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr "Prediffer"
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "Editor-Skript"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Speichert die linke Datei."
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Speichert die rechte Datei."
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Speichert die linke Datei unter..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Speichert die rechte Datei unter..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Konvertiert Zeilenumbrüche ins Windows-Format."
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Konvertiert Zeilenumbrüche ins Unix-Format."
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Konvertiert Zeilenumbrüche ins Macintosh-Format."
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Wechselt zwischen Bearbeitungs- und Merging-Modus."
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5665,12 +5645,12 @@ msgstr ""
 "Zeigt und passt die Dateikodierungs-Eigenschaften an.\n"
 "Dateikodierungs-Eigenschaften"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "Öffnet und löst eine Konflikt-Datei."
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5679,7 +5659,7 @@ msgstr ""
 "Markiert den unterschiedlichen Bereich in der aktuellen Zeile.\n"
 "Unterschied in der aktuellen Zeile"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5688,7 +5668,7 @@ msgstr ""
 "Geht zur Zeile oder zum Unterschied.\n"
 "Gehe nach (Strg+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5697,7 +5677,7 @@ msgstr ""
 "Nimmt Programm-Einstellungen vor.\n"
 "Einstellungen"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5706,37 +5686,37 @@ msgstr ""
 "Aktualisiert die Anzeige\n"
 "Aktualisieren (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Kopiert die ausgewählten Zeilen in die Zwischenablage und fügt Zeilennummern vor den Zeilenanfang."
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Lesezeichen setzen oder löschen."
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Zum nächsten Lesezeichen gehen."
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Zum vorherigen Lesezeichen gehen."
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Alle Lesezeichen löschen."
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5745,7 +5725,7 @@ msgstr ""
 "Objekte anzeigen die exakt gleich sind.\n"
 "Identische Objekte"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5754,7 +5734,7 @@ msgstr ""
 "Objekte anzeigen die Unterschiede haben.\n"
 "Unterschiedliche Objekte anzeigen"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5763,7 +5743,7 @@ msgstr ""
 "Zeigt eindeutige Objekte auf der linken Seite an.\n"
 "Eindeutige Objekte links anzeigen"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5772,7 +5752,7 @@ msgstr ""
 "Zeigt eindeutige Objekte auf der rechten Seite an.\n"
 "Eindeutige Objekte rechts anzeigen"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5781,7 +5761,7 @@ msgstr ""
 "Zeigt Binärdateien an.\n"
 "Binärdateien anzeigen"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5790,7 +5770,7 @@ msgstr ""
 "Zeigt übersprungene Objekte an.\n"
 "Übersprungene Objekte anzeigen"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5799,7 +5779,7 @@ msgstr ""
 "Wählt die Schrift für die Anzeige.\n"
 "Schrift auswählen"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5808,27 +5788,27 @@ msgstr ""
 "Stellt die Schrift für die Anzeige zurück auf die Standard-Systemschrift.\n"
 "Standard-Schrift verwenden"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Zeigt Leerzeichen an."
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Blendet die Unterschiedsleiste ein oder aus."
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Die Positionsleiste zeigt gesamte Abbildungen von den Dateien."
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Zeigt die Vergleichsstatistik an."
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5837,7 +5817,7 @@ msgstr ""
 "Wählt die Sprache der Benutzeroberfläche.\n"
 "Sprache"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5846,12 +5826,12 @@ msgstr ""
 "Zeigt Unterschiede innerhalb der Zeilen mit unterschiedlicher Farbe an.\n"
 "Zeilenunterschied anzeigen"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Vertauscht die Position der beiden Ausschnitte."
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5860,7 +5840,7 @@ msgstr ""
 "Zeigt Zeilennummern an.\n"
 "Zeilennummern anzeigen"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5869,7 +5849,7 @@ msgstr ""
 "Aktiviert das Umbrechen der Zeilen.\n"
 "Zeilen umbrechen"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5878,22 +5858,22 @@ msgstr ""
 "Zeigt Markierungsränder für beide Ausschnitte an.\n"
 "Markierungsränder anzeigen"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Textgröße erhöhen."
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Textgröße verringern."
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Textzoom auf Standardgröße zurücksetzen."
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5902,7 +5882,7 @@ msgstr ""
 "Bewegt die Anzeige zum vorigen Unterschied.\n"
 "Vorheriger Unterschied (Alt+Hoch)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5911,67 +5891,67 @@ msgstr ""
 "Bewegt die Anzeige zum nächsten Unterschied.\n"
 "Nächster Unterschied (Alt+Runter)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -5980,7 +5960,7 @@ msgstr ""
 "Bewegt die Anzeige zum ersten Unterschied.\n"
 "Erster Unterschied (Alt+Pos1)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -5989,7 +5969,7 @@ msgstr ""
 "Bewegt die Anzeige zum aktuellen Unterschied.\n"
 "Aktueller Unterschied (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -5998,7 +5978,7 @@ msgstr ""
 "Bewegt die Anzeige zum letzten Unterschied.\n"
 "Letzter Unterschied (Alt+Ende)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6007,7 +5987,7 @@ msgstr ""
 "Kopiert den ausgewählten Text in die rechte Datei.\n"
 "Nach rechts kopieren (Alt+Rechts)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6016,7 +5996,7 @@ msgstr ""
 "Kopiert den ausgewählten Text in die linke Datei.\n"
 "Nach links kopieren (Alt+Links)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6025,7 +6005,7 @@ msgstr ""
 "Kopiere Unterschied nach Rechts und springe zum nächsten Unterschied.\n"
 "Nach rechts kopieren und fortschreiten (Strg+Alt+Rechts)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6034,7 +6014,7 @@ msgstr ""
 "Kopiere Unterschied nach Links und springe zum nächsten Unterschied.\n"
 "Nach links kopieren und fortschreiten (Strg+Alt+Links)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6043,7 +6023,7 @@ msgstr ""
 "Kopiert alle Unterschiede in die rechte Datei.\n"
 "Alles nach rechts kopieren"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6052,77 +6032,77 @@ msgstr ""
 "Kopiert alle Unterschiede in die linke Datei.\n"
 "Alles nach links kopieren"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Löscht ausgewählte Objekte von beiden Seiten."
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Vergleicht ausgewählte Objekte. (Vergleicht das erste Objekt, wenn mehrere Objekte ausgewählt wurden.)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Auswählen und wieder ordnen der Spalten vom Ordnervergleich."
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Erzeugt eine Patchdatei."
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Auswählen und modifizieren von Filtern."
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Erzeugt einen Bericht von den Vergleichsergebnissen."
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "Zeigt eine Liste der verfügbaren Plugins."
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "Der Benutzer wählt den Entpacker (kein Entpacken beim Ordnervergleich)."
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Der passende Entpacker wird auf beide Dateien angewendet (nur eine Datei benötigt die Erweiterung)."
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Auswählen eines Entpackers zum Bearbeiten dieser Datei."
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Kein Prediffer (Normal)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Vorgeschlagene Plugins"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Andere Plugins"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Entlädt alle Plugins und lädt sie neu (für Entwickler)."
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6131,12 +6111,12 @@ msgstr ""
 "Aktiviert die nächste sichtbare Datei\n"
 "Aktiviere nächste Datei"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Schließt alle geöffneten Fenster."
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6145,22 +6125,22 @@ msgstr ""
 "Öffnet die WinMerge Hilfe.\n"
 "WinMerge Hilfe"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Ausgeben der aktuellen WinMerge Versionsinformationen und Konfiguration in eine Textdatei."
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "Zeigt die GNU General Public License an."
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Private Build: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6169,7 +6149,7 @@ msgstr ""
 "Öffnet das Versionshinweisen-Dokument.\n"
 "Versionshinweise"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6178,272 +6158,272 @@ msgstr ""
 "Öffnet die Übersetzungen-Webseite.\n"
 "Übersetzungen"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Plugin Einstellungen"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Kein Prediffer."
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Prediff ist möglich."
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH nicht gefunden - .sct Skripte deaktiviert."
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Keine>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Automatisch>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Öffnet die Datei mit registrierter Anwendung."
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Öffnet die Datei mit externem Editor."
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Öffnet die Datei mit einem bestimmten Programm."
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Keine verschobene Blöcke anzeigen."
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Alle verschobene Blöcke anzeigen."
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Verschobenen Block nur für den aktuellen Unterschied anzeigen."
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Geht zum Unterschied unter dem Cursor."
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "G&ehe nach Unterschied %1 von %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "G&ehe nach Zeile %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Von Dateisystem"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Von MRU-Liste"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "Keine Hervorhebung"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Batch"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Portable Object"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Ressourcen"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr "Verilog"
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Versteckt die Symbolleiste."
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Zeigt kleine Symbolleiste an."
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Zeigt große Symbolleiste an."
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index d0b2af0..efa86ef 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -1029,7 +1029,7 @@ msgid "&Scripts"
 msgstr "Ìáê&ñïåíôïëÝò"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< ¢äåéï >"
@@ -1470,7 +1470,7 @@ msgid "&Versioning System:"
 msgstr "&Óýóôçìá Äéá÷åéñßóåùò Åêäüóåùí:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&ÄéáäñïìÞ ôïõ cleartool.exe:"
@@ -1671,7 +1671,7 @@ msgid "Replace &All"
 msgstr "ÁíôéêáôÜóôáóç ¼&ëùí"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr ""
@@ -2583,7 +2583,7 @@ msgid "Files:"
 msgstr "Áñ÷åßá:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "ÄéáöïñåôéêÜ"
@@ -2620,7 +2620,7 @@ msgid "Right:"
 msgstr "ÄåîéÜ:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Ðáíïìïéüôõðá"
@@ -2820,7 +2820,7 @@ msgid "A&ppend timestamp"
 msgstr "ÐñïóèÞêç &çìåñïìçíßáò ê´ þñáò"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Åðéâåâáßùóç ÁíôéãñáöÞò"
@@ -2898,7 +2898,7 @@ msgstr ""
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "ÖÜêåëïò"
@@ -3538,7 +3538,7 @@ msgid "Version Control"
 msgstr "Äéá÷åßñéóç Åêäüóåùí"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "ÄéáöïñÝò"
@@ -3667,87 +3667,67 @@ msgstr "
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr ""
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr ""
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr ""
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr ""
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "ÐëÞñçò Ðåñéå÷ïìÝíùí"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Óýíôïìç Ðåñéå÷ïìÝíùí"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Çìåñïìçíßá ÔñïðïðïéÞóåùò"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Çìåñïìçíßá ÔñïðïðïéÞóåùò êáé ÌÝãåèïò"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "ÌÝãåèïò"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "¼íïìá"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Ôïðïèåóßá"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Ößëôñá"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr ""
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "ÐåñéãñáöÞ"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "ÅðéëÝîáôå üíïìá áñ÷åßïõ ãéá ôï íÝï ößëôñï"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Ößëôñá Áñ÷åßùí (*.flt)|*.flt|¼ëá ôá áñ÷åßá (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3760,7 +3740,7 @@ msgstr ""
 "Ðáñáêáëþ áíôéãñÜøáôå ôï áñ÷åßï %1 óôï öÜêåëï WinMerge/Filters:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3773,7 +3753,7 @@ msgstr ""
 "\n"
 "Ðáñáêáëþ âåâáéùèåßôå üôé ï öÜêåëïò õðÜñ÷åé êáé äåí Ý÷åé ôçí éäéüôçôá \"Ìüíï ãéá ÁíÜãíùóç\"."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3784,7 +3764,7 @@ msgstr ""
 "\n"
 "Ðáñáêáëþ åðéëÝîôå öÜêåëï áñ÷åßùí áðü ÅðéëïãÝò/Óýóôçìá."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3797,12 +3777,12 @@ msgstr ""
 "\n"
 "ÌÞðùò ôï áñ÷åßï Ý÷åé ôçí éäéüôçôá \"Ìüíï ãéá ÁíÜãíùóç\";"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Åíôïðéóìüò áñ÷åßïõ ößëôñïõ ðñïò åãêáôÜóôáóç"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3813,258 +3793,258 @@ msgstr ""
 "\n"
 "Ç áíôéãñáöÞ ôïõ íÝïõ áñ÷åßïõ ößëôñïõ óôï öÜêåëï ößëôñùí Þôáí áäýíáôç."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Ôï áñ÷åßï ößëôñïõ õðÜñ÷åé Þäç. ÁíôéêáôÜóôáóç ôïõ õðÜñ÷ïíôïò ößëôñïõ;"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "ÔõðïðïéçìÝíç ¸êöñáóç"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
 msgstr "Ôá ößëôñá åíçìåñþèçêáí. Åðéèõìåßôå íá áíáíåùèïýí üëåò ïé áíïéêôÝò óõãêñßóåéò öáêÝëùí;\n\nÅÜí äåí åðéèõìåßôå íá áíáíåùèïýí üëåò ïé óõãêñßóåéò ôþñá, ìðïñåßôå íá åðéëÝîåôå ¼÷é êáé íá áíáíåþóåôå ôéò óõãêñßóåéò áñãüôåñá."
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr ""
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "ÁðïôåëÝóìáôá Óõãêñßóåùò ÖáêÝëùí"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Óýãêñéóç Áñ÷åßùí"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "×ùñßò ôßôëï áñéóôåñÜ"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "×ùñßò ôßôëï äåîéÜ"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "Áñ÷åßï Áõôþí"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "Áñ÷åßï Äéêü ìïõ"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "ÁíÜëõóç Áñ÷åßùí..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "¢íïéãìá åðéëïãÞò"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "ÁíôéãñáöÞ åî Áñéóôåñþí ðñïò ôá ÄåîéÜ"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "ÁíôéãñáöÞ åê Äåîéþí ðñïò ôá ÁñéóôåñÜ"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "ÁíôéãñáöÞ üëùí ÁñéóôåñÜ"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "ÁíôéãñáöÞ üëùí ÄåîéÜ"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "ÁíôéãñáöÞ áñ÷åßùí..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "ÄéáãñáöÞ áñ÷åßùí..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Ìåôáêßíçóç áñ÷åßùí..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Äçìéïõñãßá ôçò áíáöïñÜò..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Áíáßñåóç ôçò ôåëåõôáßáò ëåéôïõñãßáò..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "ÅðáíÜëçøç ôçò ôåëåõôáßáò ëåéôïõñãßáò..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "ÃñáììÞ: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Óõã÷þíåõóç"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "ÄéáöïñÜ %1 áðü %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 ÄéáöïñÝò âñÝèçêáí"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "1 ÄéáöïñÜ âñÝèçêå"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "ÌãÁ"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Áíôéêåßìåíï %1 áðü %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Áíôéêåßìåíá: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "ÅðéëÝîáôå äýï õðÜñ÷ïíôåò öáêÝëïõò Þ áñ÷åßá ðñïò óýãêñéóç"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "ÅðéëïãÞ ÖáêÝëùí"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "ÅðéëÝîáôå äýï öáêÝëïõò Þ áñ÷åßá ðñïò óýãêñéóç."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "ÓöÜëìá óôç äéáäñïìÞ ôïõ áñéóôåñïý!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "ÓöÜëìá óôç äéáäñïìÞ ôïõ äåîéïý!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "ÓöÜëìá óå áìöüôåñåò ôéò äéáäñïìÝò!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "ÅðéëÝîáôå äýï áñ÷åßá þóôå íá åíåñãïðïéçèåß ç åðéëïãÞ áðïóõìðéåóôéêïý."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Ç óýãêñéóç áñ÷åßïõ êáé öáêÝëïõ äåí åßíáé äõíáôÞ!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Ôï áñ÷åßï äå âñÝèçêå: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Ôï áñ÷åßï äåí áðïóõìðéÝóèçêå: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4077,12 +4057,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Áðïôõ÷ßá áíáëýóåùò áñ÷åßïõ äéåíÝîåùí."
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4093,32 +4073,32 @@ msgstr ""
 "%1\n"
 "äåí åßíáé áñ÷åßï äéåíÝîåùí."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "ÁðïèÞêåõóç Ùò"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "ÁðïèÞêåõóç ìåôáâïëþí óôï %1;"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "Ôï %1 Ý÷åé ôçí éäéüôçôá \"Ìüíï ãéá ÁíÜãíùóç\". Èá èÝëáôå íá áíôéêáôáóôÞóåôå ôï áñ÷åßï; (¼÷é ãéá áðïèÞêåõóç ùò äéáöïñåôéêü áñ÷åßï.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "ÓöÜëìá êáôÜ ôïí Ýëåã÷ï åããñáøéìüôçôáò ôïõ ðñïïñéóìïý"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Áðïôõ÷ßá äçìéïõñãßáò åöåäñéêïý áñ÷åßïõ"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4131,7 +4111,7 @@ msgstr ""
 "\n"
 "ÓõíÝ÷åéá ùò Ý÷åé;"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4148,7 +4128,7 @@ msgstr ""
 "\t-÷ñçóéìïðïéÞóåôå Ýíá äéáöïñåôéêü üíïìá (ÐéÝóôå ÏÊ)\n"
 "\t-ìáôáéþóåôå ôçí ôñÝ÷ïõóá åíÝñãåéá (ÐéÝóôå ¢êõñï);"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4163,7 +4143,7 @@ msgstr ""
 "\n"
 "Åðéèõìåßôå íá áðïèçêåýóåôå ôï áðïóõìðéåóìÝíï áñ÷åßï ùò äéáöïñåôéêü áñ÷åßï;"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4178,7 +4158,7 @@ msgstr ""
 "\n"
 "Åðéèõìåßôå íá áðïèçêåýóåôå ôï áðïóõìðéåóìÝíï áñ÷åßï ùò äéáöïñåôéêü áñ÷åßï;"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4193,7 +4173,7 @@ msgstr ""
 "\n"
 "ÁíôéêáôÜóôáóç ìåôáâëçèÝíôïò áñ÷åßïõ?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4202,32 +4182,32 @@ msgstr ""
 "Ôï %1\n"
 "Ý÷åé ôçí éäéüôçôá \"Ìüíï ãéá ÁíÜãíùóç\". Åðéèõìåßôå íá áíôéêáôáóôÞóåôå ôï áñ÷åßï;"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
 msgstr ""
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "ÁðïèÞêåõóç Áñéóôåñïý Áñ÷åßïõ Ùò"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "ÁðïèÞêåõóç Äåîéïý Áñ÷åßïõ Ùò"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
 msgstr ""
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4238,42 +4218,42 @@ msgstr ""
 "\n"
 "Áíáíåþóôå ôá áñ÷åßá ðñéí óõíå÷ßóåôå."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "ÐñÝðåé íá ïñßóåôå ìßá äéáäñïìÞ Ýñãïõ ôïõ SourceSafe þóôå íá óõíå÷ßóåôå (äçë. $/Ôï¸ñãïìïõ)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "¸ëåã÷ïò ê´ ¸îïäïò áðü ôï VSS..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "Ôï Óýóôçìá Äéá÷åéñßóåùò Åêäüóåùí áíÝöåñå óöÜëìá êáôÜ ôïí Ýëåã÷ï ê´ Ýîïäï ôïõ áñ÷åßïõ. Ç óõíÝ÷åéá åßíáé áäýíáôç..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "ÓöÜëìá êáôÜ ôçí åêôÝëåóç åíôïëÞò ôïõ óõóôÞìáôïò äéá÷åéñßóåùò åêäüóåùí."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "Ï öÜêåëïò åñãáóßáò ôïõ VSS êáé ç èÝóç ôïõ ôñÝ÷ïíôïò áñ÷åßïõ äåí åßíáé óå óõìöùíßá. ÓõíÝ÷åéá;"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Äå âñÝèçêáí âÜóåéò äåäïìÝíùí ôïõ VSS!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "ÓöÜëìá ôïõ  VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4284,7 +4264,7 @@ msgstr ""
 " Ðáñáêáëþ, åëÝãîôå ðñïäéáãñáöÝò ñõèìßóåùí ôçò ÷ñçóéìïðïéïõìÝíçò åðéóêïðÞóåùò.\n"
 " Áíáßñåóç åíåñãåßáò åëÝã÷ïõ ê´ åîüäïõ;"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4293,169 +4273,169 @@ msgstr ""
 "Ôï Óýóôçìá Äéá÷åéñßóåùò Åêäüóåùí áíÝöåñå óöÜëìá êáôÜ ôçí áíáßñåóç åëÝã÷ïõ ê´ åîüäïõ ôïõ áñ÷åßïõ.\n"
 " Ðáñáêáëþ, åëÝãîôå ðñïäéáãñáöÝò ñõèìßóåùí ôçò ÷ñçóéìïðïéïõìÝíçò åðéóêïðÞóåùò.\n"
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "×ùñßò"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (Ýêäïóç ðñï ôçò 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (Ýêäïóç 5.0 êáé ìåôáãåíÝóôåñï)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "ÓôÜóç óôá êåíÜ"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "ÓôÜóç óôá êåíÜ Þ óôá óçìåßá óôßîåùò"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "ÁíôéãñáöÞ åðéëåãìÝíïõ óôïé÷åßïõ óôïí êáôïíïìáæüìåíï öÜêåëï"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "ÁíôéãñáöÞ åðéëåãìÝíïõ óôïé÷åßïõ óôïí ðñïôéìþìåíï öÜêåëï"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "ÄéáãñáöÞ åðéëåãìÝíïõ óôïé÷åßïõ áñéóôåñÜ"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "ÄéáãñáöÞ åðéëåãìÝíïõ óôïé÷åßïõ äåîéÜ"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "ÄéáãñáöÞ åðéëåãìÝíïõ(-ùí) óôïé÷åßïõ(-ùí) óå áìöüôåñåò ôéò ðëåõñÝò"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Áðüêñõøç åðéëåãìÝíïõ(-ùí) áíôéêåéìÝíïõ(-ùí) (Üìåóï ößëôñï)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Ìåôïíïìáóßá åðéëåãìÝíïõ áíôéêåéìÝíïõ óå áìöüôåñåò ôéò ðëåõñÝò"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Äåîéü óôï Áñéóôåñü (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Áñéóôåñü óôï Äåîéü (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Äåîéü óôï Áñéóôåñü (%1 áðü %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Áñéóôåñü óôï Äåîéü (%1 áðü %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Áñéóôåñü óôï... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Äåîéü óôï... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Áñéóôåñü óôï... (%1 áðü %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Äåîéü óôï... (%1 áðü %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Áñéóôåñü (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Äåîéü (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Áìöüôåñá (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Áñéóôåñü (%1 áðü %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Äåîéü (%1 áðü %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Áìöüôåñá (%1áðü %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "ÅðéëïãÞ öáêÝëïõ ðñïïñéóìïý"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "ÁñéóôåñÞ ðëåõñÜ - åðéëïãÞ öáêÝëïõ ðñïïñéóìïý:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "ÄåîéÜ ðëåõñÜ - åðéëïãÞ öáêÝëïõ ðñïïñéóìïý:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 Áñ÷åßá ÌåôáâëÞèçêáí)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 áðü %2 Áñ÷åßá ÌåôáâëÞèçêáí)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4466,17 +4446,17 @@ msgstr ""
 "\n"
 "%1 ;"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Åßóèå âÝâáéïé üôé åðéèõìåßôå íá áíôéãñÜøåôå:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Åßóèå âÝâáéïé üôé åðéèõìåßôå íá áíôéãñÜøåôå %d áíôéêåßìåíá:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4495,613 +4475,613 @@ msgstr ""
 "\n"
 "Ðáñáêáëþ áíáíåþóôå ôç óýãêñéóç."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "Åßóèå âÝâáéïò üôé åðéèõìåßôå íá ìåôáêéíÞóåôå:"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "Åßóèå âÝâáéïò üôé åðéèõìåßôå íá ìåôáêéíÞóåôå %d áíôéêåßìåíá:"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "Åðéâåâáéþóáôå Ìåôáêßíçóç"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "¢íïéãìá áñéóôåñïý áñ÷åßïõ"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "¢íïéãìá ôïõ áñéóôåñïý áñ÷åßïõ ìå Üëëç åöáñìïãÞ"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "¢íïéãìá áñéóôåñïý áñ÷åßïõ ìå..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "¢íïéãìá äåîéïý áñ÷åßïõ"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "¢íïéãìá ôïõ äåîéïý áñ÷åßïõ ìå Üëëç åöáñìïãÞ"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "¢íïéãìá äåîéïý áñ÷åßïõ ìå..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Áðïôõ÷ßá êáôÜ ôï Üíïéãìá Üëëçò åöáñìïãÞò: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "¢ãíùóôç åðÝêôáóç Üëëçò åöáñìïãÞò: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "ÁíôéãñáöÞ ôùí ïíïìÜôùí áñ÷åßùí óôï ðñü÷åéñï"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "ÁíôéãñáöÞ äéáäñïìþí áñéóôåñÞò ðëåõñÜò óôï ðñü÷åéñï"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "ÁíôéãñáöÞ äéáäñïìþí äåîéÜò ðëåõñÜò óôï ðñü÷åéñï"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "ÁíôéãñáöÞ äéáäñïìþí áìöïôÝñùí ôùí ðëåõñþí óôï ðñü÷åéñï"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr ""
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr ""
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "¢ãíùóôç ìïñöÞ óõìðéåóìÝíïõ áñ÷åßïõ"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "ÐñïóèÞêç áíôéêåéìÝíùí áðü áñéóôåñÞ ðëåõñÜ óå óõìðéåóìÝíï áñ÷åßï"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "ÐñïóèÞêç áíôéêåéìÝíùí áðü äåîéÜ ðëåõñÜ óå óõìðéåóìÝíï áñ÷åßï"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "ÐñïóèÞêç áíôéêåéìÝíùí áðü áìöüôåñåò ôéò ðëåõñÝò óå óõìðéåóìÝíï áñ÷åßï"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "ÐñïóèÞêç äéáöïñåôéêþí áíôéêåéìÝíùí óôï óõìðéåóìÝíï áñ÷åßï (áìöüôåñåò ïé ðëåõñÝò)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Ìåôáêßíçóç åðéëåãìÝíïõ áñ÷åßïõ óôá áñéóôåñÜ óå ðñïôéìþìåíï öÜêåëï"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Ìåôáêßíçóç åðéëåãìÝíïõ áñ÷åßïõ óôá äåîéÜ óå ðñïôéìþìåíï öÜêåëï"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "¼íïìá Áñ÷åßïõ"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "ÁðïôÝëåóìá Óõãêñßóåùò"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Çìåñïìçíßá Áñéóôåñïý"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Çìåñïìçíßá Äåîéïý"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "ÅðÝêôáóç"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "ÌÝãåèïò Áñéóôåñïý"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "ÌÝãåèïò Äåîéïý"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "ÌÝãåèïò Äåîéïý (Óýíôïìï)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "ÌÝãåèïò Áñéóôåñïý (Óýíôïìï)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "×ñüíïò Äçìéïõñãßáò Áñéóôåñïý"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "×ñüíïò Äçìéïõñãßáò Äåîéïý"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Íåþôåñï Áñ÷åßï"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "¸êäïóç Áñéóôåñïý Áñ÷åßïõ"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "¸êäïóç Äåîéïý Áñ÷åßïõ"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Óýíôïìï ÁðïôÝëåóìá"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Éäéüôçôåò Áñéóôåñïý"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Éäéüôçôåò Äåîéïý"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "×áñáêôÞñáò Ôåñìáôéóìïý Áñéóôåñïý"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "×áñáêôÞñáò Ôåñìáôéóìïý Äåîéïý"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Êùäéêïóåëßäá Áñéóôåñïý"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Êùäéêïóåëßäá Äåîéïý"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Áãíïçèåßóá ÄéáöïñÜ."
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Äõáäéêü"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Ç óýãêñéóç ôùí áñ÷åßùí åßíáé áäýíáôç"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Ôï áíôéêåßìåíï ìáôáéþèçêå"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Ôï áñ÷åßï ðáñåëåßöèç"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Ï öÜêåëïò ðáñåëåßöèç"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "ÁñéóôåñÜ ìüíï: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "ÄåîéÜ ìüíï: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Ôá äõáäéêÜ áñ÷åßá åßíáé ðáíïìïéüôõðá"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Ôá äõáäéêÜ áñ÷åßá åßíáé äéáöïñåôéêÜ"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Ôá áñ÷åßá åßíáé äéáöïñåôéêÜ"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr ""
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "ÁñéóôåñÜ ìüíï"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "ÄåîéÜ ìüíï"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "ÓöÜëìá"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr ""
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr ""
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Ðáñåëèþí ÷ñüíïò: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 áíôéêåßìåíï åðéëåãìÝíï"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 áíôéêåßìåíá åðéëåãìÝíá"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "¼íïìá áñ÷åßïõ Þ üíïìá öáêÝëïõ."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "¼íïìá õðïöáêÝëïõ üôáí ïé õðïöÜêåëïé ðåñéëáìâÜíïíôáé."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "ÁðïôÝëåóìá óõãêñßóåùò, ðëÞñçò áíÜðôõîç"
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Çìåñïìçíßá ôñïðïðïéÞóåùò áñéóôåñÞò ðëåõñÜò."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Çìåñïìçíßá ôñïðïðïéÞóåùò äåîéÜò ðëåõñÜò."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "ÅðÝêôáóç áñ÷åßïõ."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "ÌÝãåèïò áñéóôåñïý áñ÷åßïõ óå byte."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "ÌÝãåèïò äåîéïý áñ÷åßïõ óå byte."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "ÌÝãåèïò áñéóôåñïý áñ÷åßïõ óõíôïìåõìÝíï."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "ÌÝãåèïò äåîéïý áñ÷åßïõ óõíôïìåõìÝíï."
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "×ñüíïò äçìéïõñãßáò áñéóôåñÞò ðëåõñÜò."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "×ñüíïò äçìéïõñãßáò äåîéÜò ðëåõñÜò."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Ðëçñïöïñåß ðïéá ðëåõñÜ Ý÷åé ôçí ðëÝïí ðñüóöáôç çìåñïìçíßá ôñïðïðïéÞóåùò."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "¸êäïóç áñ÷åßïõ áñéóôåñÞò ðëåõñÜò, ìüíï ãéá ïñéóìÝíïõò ôýðïõò áñ÷åßùí."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "¸êäïóç áñ÷åßïõ äåîéÜò ðëåõñÜò, ìüíï ãéá ïñéóìÝíïõò ôýðïõò áñ÷åßùí."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Âñá÷ý áðïôÝëåóìá óõãêñßóåùò."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Éäéüôçôåò áñéóôåñÞò ðëåõñÜò."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Éäéüôçôåò äåîéÜò ðëåõñÜò."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Ôýðïò ÷áñáêôÞñá ôåñìáôéóìïý áñéóôåñÞò ðëåõñÜò"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Ôýðïò ÷áñáêôÞñá ôåñìáôéóìïý äåîéÜò ðëåõñÜò"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Êùäéêïóåëßäá áñéóôåñÞò ðëåõñÜò."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Êùäéêïóåëßäá äåîéÜò ðëåõñÜò."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Áñéèìüò áãíïçèåéóþí äéáöïñþí óôï áñ÷åßï. ÁõôÝò ïé äéáöïñÝò áãíïïýíôáé áðü ôï WinMerge êáé äåí åßíáé äõíáôüí íá óõã÷ùíåõèïýí."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Áñéèìüò äéáöïñþí óôï áñ÷åßï. Áõôüò ï áñéèìüò äåí ðåñéëáìâÜíåé áãíïçèåßóåò äéáöïñÝò."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Åìöáíßæåé Ýíáí áóôåñßóêï (*) åÜí ôï áñ÷åßï åßíáé äõáäéêü."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Óýãêñéóç %1 ìå %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "ÊáôÜëïãïò ìå êüììá ùò ÷áñáêôÞñá äéá÷ùñéóìïý"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "ÊáôÜëïãïò ìå óôçëïèÝôç ùò ÷áñáêôÞñá äéá÷ùñéóìïý"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "Áðëü HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "Áðëü XML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Ôï áñ÷åßï áíáöïñÜò áðïôåëåóìÜôùí õðÜñ÷åé Þäç. Åðéèõìåßôå íá áíôéêáôáóôÞóåôå ôï õðÜñ÷ïí áñ÷åßï;"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5110,32 +5090,32 @@ msgstr ""
 "ÓöÜëìá êáôÜ ôç äçìéïõñãßá ôçò áíáöïñÜò áðïôåëåóìÜôùí:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Ç áíáöïñÜ áðïôåëåóìÜôùí äçìéïõñãÞèçêå åðéôõ÷þò."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Ôï ßäéï áñ÷åßï áíïß÷èçêå óå áìöüôåñá ôá ðåäßá."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Ôá åðéëåãìÝíá áñ÷åßá åßíáé ðáíïìïéüôõðá."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "ÐáñïõóéÜóèçêå êÜðïéï óöÜëìá êáôÜ ôç óýãêñéóç ôùí áñ÷åßùí."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Ç äçìéïõñãßá ðñïóùñéíþí áñ÷åßùí äåí Þôáí äõíáôÞ. ÅëÝãîôå ôéò ñõèìßóåéò óáò ôéò ó÷åôéêÝò ìå ôçí ðñïóùñéíÞ äéáäñïìÞ."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5150,7 +5130,7 @@ msgstr ""
 "\n"
 "Óçìåßùóç: ÅÜí åðéèõìåßôå ïé ÷áñáêôÞñåò ôåñìáôéóìïý íá èåùñïýíôáé ðÜíôïôå éóïäýíáìïé, åíåñãïðïéåßóôå ôçí åðéëïãÞ \"ÄéáöïñÝò ÷áñáêôÞñùí ôåñìáôéóìïý (Win/Unix/Mac) íá áãíïïýíôáé...\" óôçí êáñôÝëá Óýãêñéóç ôïõ äéáëüãïõ åðéëïãþí (åìöáíßæåôáé ìå ôçí åðéëïãÞ Åðåîåñãáóßá/ÅðéëïãÝò)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5161,22 +5141,22 @@ msgstr ""
 " Ìå ôéò éó÷ýïõóåò åðéëïãÝò, èá ìåôáôñáðïýí óôïí êýñéï ôýðï.\n"
 " Åðéèõìåßôå íá áëëÜîåôå ôéò åðéëïãÝò êáé íá äéáôçñÞóåôå ôïõò äéáöïñåôéêïýò ÷áñáêôÞñåò ôåñìáôéóìïý;"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "ÐáñïõóéÜóèçêå óöÜëìá êáôÜ ôçí ðñïåðåîåñãáóßá äéáöïñþí ôïõ áñ÷åßïõ '%1' ìå ôï Üñèñùìá '%2'. Ç ðñïåðåîåñãáóßá äéáöïñþí èá ðáýóåé íá åöáñìüæåôáé."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "Ï åðéëåãìÝíïò öÜêåëïò äåí åßíáé Ýãêõñïò."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Ôï Üíïéãìá äõáäéêïý áñ÷åßïõ óôï ðåäßï åðåîåñãáóßáò äåí åßíáé äõíáôüí."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5191,7 +5171,7 @@ msgstr ""
 "%1\n"
 "óôçí Üëëç ðëåõñÜ êáé íá áíïßîåôå áõôïýò ôïõò öáêÝëïõò;"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5202,148 +5182,148 @@ msgstr ""
 "Ç åìöÜíéóç êÜèå öáêÝëïõ ìå ôç äéêÞ ôïõ êùäéêïóåëßäá èá Ý÷åé åìöáíéóéáêÜ êáëýôåñá áðïôåëÝóìáôá áëëÜ ç óõã÷þíåõóç/áíôéãñáöÞ èá åßíáé åðéêßíäõíç.\n"
 "Åðéèõìåßôå íá èåùñçèåß üôé áìöüôåñá ôá áñ÷åßá ÷ñçóéìïðïéïýí ôçí ðñïêáèïñéóìÝíç êùäéêïóåëßäá ôïõ windows (óõíéóôÜôáé);"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Ðñïóï÷Þ: Ôá áñ÷åßá ÷ñçóéìïðïéïýí äéáöïñåôéêÝò êùäéêïóåëßäåò, áñéóôåñü=%s êáé äåîéü=%s, êáé ç óõã÷þíåõóç åíäÝ÷åôáé íá ïäçãÞóåé óå áðþëåéá ðëçñïöïñéþí."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Áðþëåéá ðëçñïöïñéþí ëüãù óöáëìÜôïò êùäéêïóåëßäáò: áìöüôåñá ôá áñ÷åßá"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "×ùñßò äéáöïñÜ"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "ÄéáöïñÜ ãñáììÞò"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "ÁíôéêáôáóôÜèçêáí %1 áêïëïõèßåò ÷áñáêôÞñùí."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Ç áêïëïõèßá ÷áñáêôÞñùí \"%s\" äåí åßíáé äõíáôüí íá âñåèåß"
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "ÁíôéãñáöÞ ðëÞñïõò ÄéáäñïìÞò"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "ÁíôéãñáöÞ Ïíüìáôïò Áñ÷åßïõ"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Ðåäßï Åíôïðéóìïý"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Ðåäßï Äéáöïñþí"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Ç åããñáöÞ ôïõ áñ÷åßïõ patch ïëïêëçñþèçêå åðéôõ÷þò."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. ôï áíôéêåßìåíï äå âñÝèçêå Þ åßíáé öÜêåëïò!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. ôï áíôéêåßìåíï äå âñÝèçêå Þ åßíáé öÜêåëïò!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Ôï áñ÷åßï patch õðÜñ÷åé Þäç. Åðéèõìåßôå íá ôï áíôéêáôáóôÞóåôå;"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 åðéëåãìÝíá áñ÷åßá]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Êáíïíéêü"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Ìå ðåñéâÜëëïí êåßìåíï"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "ÅíïðïéçìÝíï"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr ""
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Ç åããñáöÞ óôï áñ÷åßï %1 äåí Þôáí äõíáôÞ."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Ç ïñéóèåßóá äéáäñïìÞ åîüäïõ äåí åßíáé áðüëõôç äéáäñïìÞ: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Ïñßóáôå Ýíá áñ÷åßï åîüäïõ"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Ç äçìéïõñãßá áñ÷åßïõ patch áðü äõáäéêÜ áñ÷åßá äåí åßíáé äõíáôÞ."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Ç äçìéïõñãßá áñ÷åßïõ patch áðü öáêÝëïõò äåí åßíáé äõíáôÞ."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5354,17 +5334,17 @@ msgstr ""
 "\n"
 "Ç äçìéïõñãßá patch áðáéôåß íá ìçí õðÜñ÷ïõí óå áñ÷åßá áëëáãÝò ïé ïðïßåò äåí Ý÷ïõí áðïèçêåõèåß."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Ï öÜêåëïò äåí õðÜñ÷åé."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Ôá áðïôåëÝóìáôá ôçò ôñÝ÷ïõóáò óõãêñßóåùò èá äéáãñáöïýí."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5375,7 +5355,7 @@ msgstr ""
 "Äåí åßíáé äõíáôüí íá âñåèïýí üëá ôá áðáñáßôçôá óôïé÷åßá (ôï 7-zip êáé/Þ ôï Merge7z*.dll) ãéá ôçí õðïóôÞñéîç óõìðéåóìÝíùí áñ÷åßùí.\n"
 "Äåßôå óôï åã÷åéñßäéï ãéá ðåñéóóüôåñåò ðëçñïöïñßåò ó÷åôéêÜ ìå ôçí õðïóôÞñéîç óõìðéåóìÝíùí áñ÷åßùí êáé ìå ôïí ôñüðï åíåñãïðïéÞóåùò áõôÞò."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5384,7 +5364,7 @@ msgstr ""
 "\n"
 "Óçìåßùóç: Ç åíóùìÜôùóç ôïõ 7-Zip åßíáé áðåíåñãïðïéçìÝíç óôéò ñõèìßóåéò ôïõ WinMerge."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5393,37 +5373,37 @@ msgstr ""
 "\n"
 "Óçìåßùóç: Ç åíóùìÜôùóç ôïõ 7-Zip åßíáé ðåñéïñéóìÝíç óå áõôüíïìç ëåéôïõñãßá óôéò ñõèìßóåéò ôïõ WinMerge."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "ÅðéëÝîáôå áñ÷åßï ðñïò åîáãùãÞ"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "ÅðéëÝîáôå áñ÷åßï ðñïò åéóáãùãÞ"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Ïé ñõèìßóåéò åéóÞ÷èçóáí áðü ôï áñ÷åßï."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Ïé ñõèìßóåéò åîÞ÷èçóáí óôï áñ÷åßï."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Áðïôõ÷ßá åéóáãùãÞò ñõèìßóåùí áðü ôï áñ÷åßï."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Áðïôõ÷ßá åããñáöÞò ñõèìßóåùí óôï áñ÷åßï."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5434,242 +5414,242 @@ msgstr ""
 "\n"
 "Åðéèõìåßôå íá óõíå÷ßóåôå;"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "ÓöÜëìá ôõðïðïéçìÝíùí åêöñÜóåùí"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Ïõäåìßá áíôéóôïé÷ßá"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "ÅóöáëìÝíç ôõðïðïéçìÝíç Ýêöñáóç"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "ÓöÜëìá óõãêñéôéêïý (óõíäåôéêïý;) ÷áñáêôÞñá"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "ÓöÜëìá óôï üíïìá êáôçãïñßáò ÷áñáêôÞñùí"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "ÊÜèåôïò óôï ôÝëïò ôçò äéáäñïìÞò"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "ÓöÜëìá ïìáäïðïéçìÝíïõ óôïé÷åßïõ ôõðïðïéçìÝíçò åêöñÜóåùò"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "ÏñöáíÞ [ or [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "ÏñöáíÞ ( Þ \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "ÏñöáíÞ \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "ÓöÜëìá óôï ðåñéå÷üìåíï ôùí \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "ÓöÜëìá ôÝëïõò áêïëïõèßáò"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Äåí õðÜñ÷åé äéáèÝóéìç ìíÞìç"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "ÓöÜëìá óôçí ðñïçãïõìÝíç ôõðïðïéçìÝíç Ýêöñáóç"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Ðñüùñïò ôåñìáôéóìüò ôõðïðïéçìÝíçò åêöñÜóåùò"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Ç ÔõðïðïéçìÝíç ¸êöñáóç åßíáé ðïëý ìåãÜëç"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "ÏñöáíÞ ) Þ \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr ""
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr ""
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr ""
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Ìéêôü"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr ""
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr ""
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr ""
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr ""
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr ""
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr ""
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr ""
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr ""
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr ""
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Ôýðïò"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "Áðïóõìðéåóôéêü"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr "ÐñïåðåîåñãáóôÞò Äéáöïñþí"
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "ÌáêñïåíôïëÝò ÅðåîåñãáóôÞ ÊåéìÝíïõ"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "ÁðïèÞêåõóç ôïõ áñéóôåñïý áñ÷åßïõ"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "ÁðïèÞêåõóç ôïõ äåîéïý áñ÷åßïõ"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "ÁðïèÞêåõóç ôïõ áñéóôåñïý áñ÷åßïõ ìå üíïìá..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "ÁðïèÞêåõóç ôïõ äåîéïý áñ÷åßïõ ìå üíïìá..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "ÌåôáôñïðÞ ôùí ÷áñáêôÞñùí ôåñìáôéóìïý óå ôýðïõ Windows (CRLF)"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "ÌåôáôñïðÞ ôùí ÷áñáêôÞñùí ôåñìáôéóìïý óå ôýðïõ Unix (LF)"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "ÌåôáôñïðÞ ôùí ÷áñáêôÞñùí ôåñìáôéóìïý óå ôýðïõ Mac (CR)"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "ÅíáëëáãÞ ìåôáîý ëåéôïõñãéþí åðåîåñãáóßáò êáé óõã÷ùíåýóåùò"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5678,12 +5658,12 @@ msgstr ""
 "ÅìöÜíéóç êáé ñýèìéóç éäéïôÞôùí êùäéêïðïéÞóåùò áñ÷åßïõ\n"
 "Éäéüôçôåò êùäéêïðïéÞóåùò áñ÷åßïõ"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "¢íïéãìá êáé åðßëõóç áñ÷åßïõ äéåíÝîåùí"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5692,7 +5672,7 @@ msgstr ""
 "ÅðéëÝîáôå ðåñéï÷Þ äéáöïñÜò óôçí ôñÝ÷ïõóá ãñáììÞ\n"
 "ÄéáöïñÜ óôçí ôñÝ÷ïõóá ÃñáììÞ"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5701,7 +5681,7 @@ msgstr ""
 "ÌåôÜâáóç óå ãñáììÞ Þ äéáöïñÜ\n"
 "ÌåôÜâáóç (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5710,7 +5690,7 @@ msgstr ""
 "Ñýèìéóç åðéëïãþí ôçò åöáñìïãÞò\n"
 "ÅðéëïãÝò"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5719,37 +5699,37 @@ msgstr ""
 "ÁíáíÝùóç Ïèüíçò\n"
 "ÁíáíÝùóç (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "ÁíôéãñáöÞ åðéëåãìÝíùí ãñáììþí óôï ðñü÷åéñï ìáæß ìå ôïõò áñéèìïýò ôïõò óôçí áñ÷Þ ôïõò"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "ÌåôáâïëÞ óçìÜíóåùò"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "ÌåôÜâáóç óôçí åðïìÝíç óÞìáíóç"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "ÌåôÜâáóç óôçí ðñïçãïõìÝíç óÞìáíóç"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "ÊáôÜñãçóç üëùí ôùí óçìÜíóåùí"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5758,7 +5738,7 @@ msgstr ""
 "ÅìöÜíéóç ðáíïìïéïôýðùí áíôéêåéìÝíùí\n"
 "ÅìöÜíéóç Ðáíïìïéïôýðùí ÁíôéêåéìÝíùí"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5767,7 +5747,7 @@ msgstr ""
 "ÅìöÜíéóç áíôéêåéìÝíùí ìå äéáöïñÝò\n"
 "ÅìöÜíéóç Äéáöïñåôéêþí ÁíôéêåéìÝíùí"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5776,7 +5756,7 @@ msgstr ""
 "ÅìöÜíéóç áíôéêåéìÝíùí õðáñ÷üíôùí ìüíï óôçí áñéóôåñÞ ðëåõñÜ\n"
 "ÅìöÜíéóç Ïñöáíþí ÁíôéêåéìÝíùí óôá ÁñéóôåñÜ"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5785,7 +5765,7 @@ msgstr ""
 "ÅìöÜíéóç áíôéêåéìÝíùí õðáñ÷üíôùí ìüíï óôç äåîéÜ ðëåõñÜ\n"
 "ÅìöÜíéóç Ïñöáíþí ÁíôéêåéìÝíùí óôá ÄåîéÜ"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5794,7 +5774,7 @@ msgstr ""
 "ÅìöÜíéóç äõáäéêþí áñ÷åßùí\n"
 "ÅìöÜíéóç Äõáäéêþí Áñ÷åßùí"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5803,7 +5783,7 @@ msgstr ""
 "ÅìöÜíéóç ðáñáëåéöèÝíôùí áíôéêåéìÝíùí\n"
 "ÅìöÜíéóç ÐáñáëåéöèÝíôùí ÁíôéêåéìÝíùí"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5812,7 +5792,7 @@ msgstr ""
 "ÅðéëïãÞ ãñáììáôïóåéñÜò ãéá ôçí åìöÜíéóç\n"
 "ÅðéëïãÞ ÃñáììáôïóåéñÜò Åìöáíßóåùò"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5821,27 +5801,27 @@ msgstr ""
 "ÅðéóôñïöÞ óôç ÷ñÞóç ôçò ðñïêáèïñéóìÝíçò ãñáììáôïóåéñÜò óõóôÞìáôïò ãéá ôçí åìöÜíéóç"
 "ÐñïêáèïñéóìÝíç ÃñáììáôïóåéñÜ"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Åìöáíßæåé ÷áñáêôÞñåò äéáóôÞìáôïò"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Áðüêñõøç/ÅìöÜíéóç ôïõ Ðåäßïõ Äéáöïñþí"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Ôï ðåäßï åíôïðéóìïý åìöáíßæåé ìßá ãåíéêÞ åéêüíá ôùí áñ÷åßùí"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "ÅìöÜíéóç äéáëüãïõ óôáôéóôéêþí óõãêñßóåùò öáêÝëùí"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5849,7 +5829,7 @@ msgid ""
 msgstr ""
 "ÅðéëïãÞ ôçò ÷ñçóéìïðïéïõìÝíçò ãëþóóáò ðåñéâÜëëïíôïò åñãáóßáò"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5858,12 +5838,12 @@ msgstr ""
 "Åðéóçìáßíåé ôéò äéáöïñÝò åíôüò ôùí ãñáììþí ìå äéáöïñåôéêïýò ÷ñùìáôéóìïýò\n"
 "ÅìöÜíéóç Äéáöïñþí Ãñáììþí"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "ÁíôéìåôÜèåóç ôùí äýï ðåäßùí"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5872,7 +5852,7 @@ msgstr ""
 "Åìöáíßæåé ôïõò áñéèìïýò ôùí ãñáììþí\n"
 "ÅìöÜíéóç ÁñéèìÞóåùò Ãñáììþí"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5880,7 +5860,7 @@ msgid ""
 msgstr "Åíåñãïðïßçóç áíáäéðëþóåùò êåéìÝíïõ\n"
 "Áíáäßðëùóç ÊåéìÝíïõ"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5889,22 +5869,22 @@ msgstr ""
 "ÅìöÜíéóç ðåñéèùñßùí åðéëïãÞò ãéá áìöüôåñá ôá ðåäßá\n"
 "ÅìöÜíéóç Ðåñéèùñßùí ÅðéëïãÞò"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Áýîçóç öáéíïìÝíïõ ìåãÝèïõò êåéìÝíïõ"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Ìåßùóç öáéíïìÝíïõ ìåãÝèïõò êåéìÝíïõ"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "ÅðáíáöïñÜ öáéíïìÝíïõ ìåãÝèïõò êåéìÝíïõ óôï ðñïåðéëåãìÝíï"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5913,7 +5893,7 @@ msgstr ""
 "Êýëéóç óôçí ðñïçãïõìÝíç äéáöïñÜ\n"
 "ÐñïçãïõìÝíç ÄéáöïñÜ (Alt+Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5922,67 +5902,67 @@ msgstr ""
 "Êýëéóç óôçí åðïìÝíç äéáöïñÜ\n"
 "ÅðïìÝíç ÄéáöïñÜ (Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -5991,7 +5971,7 @@ msgstr ""
 "Êýëéóç óôçí ðñþôç äéáöïñÜ\n"
 "Ðñþôç ÄéáöïñÜ (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6000,7 +5980,7 @@ msgstr ""
 "Êýëéóç óôçí ôñÝ÷ïõóá äéáöïñÜ\n"
 "ÔñÝ÷ïõóá ÄéáöïñÜ (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6009,7 +5989,7 @@ msgstr ""
 "Êýëéóç óôçí ôåëåõôáßá äéáöïñÜ\n"
 "Ôåëåõôáßá ÄéáöïñÜ (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6018,7 +5998,7 @@ msgstr ""
 "ÁíôéãñáöÞ ôïõ åðéëåãìÝíïõ êåéìÝíïõ óôï äåîéü Áñ÷åßï\n"
 "ÁíôéãñáöÞ ÄåîéÜ (Alt+Right)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6027,7 +6007,7 @@ msgstr ""
 "ÁíôéãñáöÞ ôïõ åðéëåãìÝíïõ êåéìÝíïõ óôï áñéóôåñü Áñ÷åßï\n"
 "ÁíôéãñáöÞ ÁñéóôåñÜ (Alt+Left)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6036,7 +6016,7 @@ msgstr ""
 "ÁíôéãñáöÞ äéáöïñÜò äåîéÜ êáé ìåôÜâáóç óå åðïìÝíç\n"
 "ÁíôéãñáöÞ ÄåîéÜ êáé ìåôÜâáóç (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6045,7 +6025,7 @@ msgstr ""
 "ÁíôéãñáöÞ äéáöïñÜò áñéóôåñÜ êáé ìåôÜâáóç óå åðïìÝíç\n"
 "ÁíôéãñáöÞ ÁñéóôåñÜ êáé ìåôÜâáóç (Ctrl+Alt+Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6054,7 +6034,7 @@ msgstr ""
 "ÁíôéãñáöÞ üëùí ôùí äéáöïñþí óôï äåîéü áñ÷åßï\n"
 "¼ëá ÄåîéÜ"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6063,77 +6043,77 @@ msgstr ""
 "ÁíôéãñáöÞ äéáöïñÜò äåîéÜ êáé ìåôÜâáóç óå åðïìÝíç\n"
 "ÁíôéãñáöÞ ÄåîéÜ êáé ìåôÜâáóç (Ctrl+Alt+Right)"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "ÄéáãñáöÞ åðéëåãìÝíùí áíôéêåéìÝíùí áðü áìöïôÝñïõò ôïõò öáêÝëïõò"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Óýãêñéóç åðéëåãìÝíïõ áíôéêåéìÝíïõ (óýãêñéóç ðñþôïõ áíôéêåéìÝíïõ åÜí Ý÷ïõí åðéëåãåß ðïëëÜ áíôéêåßìåíá)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "ÅðéëïãÞ êáé áíáäéÜôáîç óôçëþí óõãêñßóåùò öáêÝëùí"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Äçìéïõñãßá áñ÷åßïõ patch"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "ÅðéëïãÞ êáé ôñïðïðïßçóç ößëôñùí"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Äçìéïõñãåß ìßá áíáöïñÜ áðïôåëåóìÜôùí óõãêñßóåùò"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "Åìöáíßæåé Ýíáí êáôÜëïãï ôùí äéáèåóßìùí áñèñùìÜôùí"
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "Ï ÷ñÞóôçò åðéëÝãåé ôï áðïóõìðéåóôéêü (÷ùñßò áðïóõìðßåóç êáôÜ ôç óýãêñéóç öáêÝëùí)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Ôï óõíåñãáæüìåíï áðïóõìðéåóôéêü åíåñãåß óå áìöüôåñá ôá áñ÷åßá (ìüíï Ýíá áñ÷åßï ÷ñåéÜæåôáé íá Ý÷åé ôçí åðÝêôáóç)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "ÅðéëÝîáôå Ýíá áðïóõìðéåóôéêü ãéá ôçí åðåîåñãáóßá áõôïý ôïõ áñ÷åßïõ"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "×ùñßò ðñïåðåîåñãáóßá äéáöïñþí (ÊáíïíéêÞ Ëåéôïõñãßá)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Ðñïôåéíüìåíá Áñèñþìáôá"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "¢ëëá áñèñþìáôá"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Áðïóýíäåóç üëùí ôùí áñèñùìÜôùí êáé åðáíáóýíäåóç áõôþí (ãéá ðñïãñáììáôéóôÝò)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6142,12 +6122,12 @@ msgstr ""
 "Åíåñãïðïéåß ôï åðüìåíï ïñáôü áñ÷åßï\n"
 "Åíåñãïðïßçóç ôïõ åðïìÝíïõ Áñ÷åßïõ"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Êëåßíåé üëá ôá áíïéêôÜ ðáñÜèõñá"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6156,22 +6136,22 @@ msgstr ""
 "Áíïßãåé ôï áñ÷åßï âïçèåßáò ôïõ WinMerge\n"
 "ÂïÞèåéá ãéá ôï WinMerge"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Äçìéïõñãåß Ýíá áñ÷åßï (áðëïý) êåéìÝíïõ ìå ðëçñïöïñßåò ãéá ôçí Ýêäïóç êáé ôéò ñõèìßóåéò ôïõ WinMerge"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "ÅìöÜíéóç ôçò ÃåíéêÞò Äçìïóßáò Áäåßáò ôïõ GNU"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "ÉäéùôéêÞ Ìåôáãëþôôéóç: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6180,7 +6160,7 @@ msgstr ""
 "Áíïßãåé ôï Ýããñáöï ìå ôéò óçìåéþóåéò åêäüóåùò\n"
 "Óçìåéþóåéò Åêäüóåùò"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6189,272 +6169,272 @@ msgstr ""
 "Áíïßãåé ôçí éóôïóåëßäá ôùí ìåôáöñÜóåùí\n"
 "ÌåôáöñÜóåéò"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Ñõèìßóåéò ÁñèñùìÜôùí"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "×ùñßò ðñïåðåîåñãáóßá äéáöïñþí"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Ðñïåðåîåñãáóßá äéáöïñþí åß äõíáôüí"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "Ôï ÐåñéâÜëëïí Äéåñìçíåßáò Windows (WSH) äå âñÝèçêå - ç ÷ñÞóç áñ÷åßùí äÝóìçò åíåñãåéþí .sct åßíáé áðåíåñãïðïéçìÝíç"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<ÏõäÝí>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Áõôüìáôï>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "¢íïéãìá ôïõ áñ÷åßïõ ìå ôçí áíôéóôïé÷éóìÝíç åöáñìïãÞ"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "¢íïéãìá ôïõ áñ÷åßïõ ìå Üëëç åöáñìïãÞ"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "¢íïéãìá ôïõ áñ÷åßïõ ìå óõãêåêñéìÝíç åöáñìïãÞ"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "×ùñßò åðéóÞìáíóç ìåôáêéíçèÝíôùí ôìçìÜôùí"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "ÅðéóÞìáíóç ðÜíôùí ôùí ìåôáêéíçèÝíôùí ôìçìÜôùí"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "ÅðéóÞìáíóç ìåôáêéíçèÝíôùí ôìçìÜôùí ìüíï áðü ôçí ôñÝ÷ïõóá äéáöïñÜ"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "ÌåôÜâáóç óôç äéáöïñÜ üðïõ âñßóêåôáé ï äñïìÝáò"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "ÌåôÜâáóç óôç &ÄéáöïñÜ %1 áðü %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "ÌåôÜ&âáóç óôç ÃñáììÞ %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "ÁðåíåñãïðïéçìÝíç"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Áðü Áñ÷åéïóýóôçìá"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Áðü ÊáôÜëïãï ðñïóöÜôùò ÷ñçóéìïðïéçèÝíôùí"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "×ùñßò ×ñùìáôéóìü Êþäéêá"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr ""
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr ""
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr ""
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr ""
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr ""
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr ""
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr ""
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr ""
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr ""
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr ""
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr ""
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr ""
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr ""
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr ""
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr ""
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr ""
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr ""
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr ""
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr ""
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr ""
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr ""
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr ""
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr ""
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr ""
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr ""
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr ""
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr ""
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr ""
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr ""
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Áðüêñõøç ÃñáììÞò Åñãáëåßùí"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "ÅìöÜíéóç ÌéêñÞò ÃñáììÞò Åñãáëåßùí"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "ÅìöÜíéóç ÌåãÜëçò ÃñáììÞò Åñãáëåßùí"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 0916577..8d4931c 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -1030,7 +1030,7 @@ msgid "&Scripts"
 msgstr "&Szkriptek"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Üres >"
@@ -1471,7 +1471,7 @@ msgid "&Versioning System:"
 msgstr "&Verzió Rendszer:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "A &cleartool.exe elérési útvonala:"
@@ -1672,7 +1672,7 @@ msgid "Replace &All"
 msgstr "&Mindet"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2580,7 +2580,7 @@ msgid "Files:"
 msgstr "Fájlok:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Különbözõ"
@@ -2617,7 +2617,7 @@ msgid "Right:"
 msgstr "Jobb:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Egyezõ"
@@ -2817,7 +2817,7 @@ msgid "A&ppend timestamp"
 msgstr "Idõpecsét hozzáfûzése"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Másolás megerõsítése"
@@ -2895,7 +2895,7 @@ msgstr ""
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Könyvtár"
@@ -3497,7 +3497,7 @@ msgid "Version Control"
 msgstr "Verzió Kontroll"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Eltérések"
@@ -3620,87 +3620,67 @@ msgstr ""
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr ""
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr ""
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr ""
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr ""
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Teljes tartalmak"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Átfutott tartalmak"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Módosítási dátum"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr ""
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Méret"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Név"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Hely"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Szûrõk"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr ""
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Leírás"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Válassz fájlnevet az új szûrõhöz"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Fájl szûrõk (*.flt)|*.flt|Minden fájl (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3709,7 +3689,7 @@ msgid ""
 "%2."
 msgstr ""
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3718,7 +3698,7 @@ msgid ""
 "Please make sure the folder exists and is writable."
 msgstr ""
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3726,7 +3706,7 @@ msgid ""
 "Please select filter folder in Options/System."
 msgstr ""
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3735,12 +3715,12 @@ msgid ""
 "Maybe the file is read-only?"
 msgstr ""
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr ""
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3748,258 +3728,258 @@ msgid ""
 "Could not copy new filter file to filter folder."
 msgstr ""
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr ""
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Reguláris kifejezés"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
 msgstr ""
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr ""
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Könyvtár összehasonlítási eredmények"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Fájl összehasonlítás"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Névtelen bal oldal"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Névtelen jobb oldal"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr ""
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr ""
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Fájlok vizsgálata..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Kijelölés megnyitása"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Másolás balról jobbra"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Másolás balról jobbra"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Másolás mindent balra"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Másolás mindent jobbra"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Fájlok másolása..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Fájlok törlése..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Fájlok áthelyezése..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Jelentés készítése..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Utolsó mûvelet visszavonása..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "Elõzõ mûvelet újbóli alkalmazása..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Sor: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Olvasztás"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Ennyi különség: %1 ennyibõl: %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 különbséget találtam"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "1 különbséget találtam"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr ""
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "%1 elem ennyibõl: %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "%1 elem"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Válassz ki két összehasonlítandó fájlt vagy könyvtárat"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Könytár kiválasztás"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Válassz ki két összehasonlítandó fájlt vagy könyvtárat."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "A bal oldali elérési út érvénytelen!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "A jobb oldali elérési út érvénytelen!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Mindkét elérési út érvénytelen!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Válassz ki két fájlt a kicsomagoló kijelöléshez."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Nem lehet fájlt könyvtárral összehasonlítani!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Ez a fájl nem található: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "A fájl nincs kicsomagolva: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4012,42 +3992,42 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Hiba a konfliktusfájl értelmezésekor."
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid "The file\n%1\nis not a conflict file."
 msgstr "A fájl\n%1\nnem egy konfliktus fájl."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Mentés másként"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Mentsem a változtatásokat %1 néven?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "Ez a fájl: %1 csak olvasható. Szeretnéd ezt megváltoztatni? (Kattints a Nem gombra a fájl új néven való mentéséhez.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Hiba a cél írhatóságának ellenõrzésekor"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Hiba a fájl biztonsági másolatának készítésekor"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4060,7 +4040,7 @@ msgstr ""
 "\n"
 "Folytatni akarod?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4077,7 +4057,7 @@ msgstr ""
 "\t-másik fájlnév választása (Ok)\n"
 "\t-a jelenlegi folyamat megszakítása (Mégsem)?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4092,7 +4072,7 @@ msgstr ""
 "\n"
 "Szeretnéd menteni a kicsomagolt változatot egy másik fájlba?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4107,7 +4087,7 @@ msgstr ""
 "\n"
 "Szeretnéd menteni a kicsomagolt változatot egy másik fájlba?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4122,7 +4102,7 @@ msgstr ""
 "\n"
 "Felülírjuk a megváltoztatott fájlt?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4131,32 +4111,32 @@ msgstr ""
 "%1\n"
 "csak olvasható. Szeretnéd ezt megváltoztatni?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
 msgstr "Egy másik alkalmazás módosította a fájlt\n%1\nmióta a WinMerge utoljára vizsgálta.\n\nSzeretné újra betölteni a fájlt?"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Bal oldali fájl mentése más néven"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Jobb oldali fájl mentése más néven"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
 msgstr "A fájl\n%1\neltûnt. A folytatáshoz mentse el a fájlt."
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4167,42 +4147,42 @@ msgstr ""
 "\n"
 "Frissítsd a dokumentumokat, mielõtt folytatnád."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Meg kell adnod a SourceSafe projekt elérési útvonalát a folytatáshoz (pl.:  $/MyProject)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Fájlok ellenõrzése VSS-bõl..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "A Verzió Rendszer hibát adott vissza a fájl ellenõrzése közben. Nem lehet folytatni..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Hiba a Verzió Rendszer futtatása közben."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "A VSS Munka Könyvtár és a jelenlegi fájl útvonala nem egyezik. Folytassuk?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Nem található VSS adatbázis!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Hiba a VSS-bõl:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4210,176 +4190,176 @@ msgid ""
 " Undo checkout operation?"
 msgstr ""
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, 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:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr ""
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (régebbi mint 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 vagy újabb)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Megállás szóközöknél"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Megállás szóközöknél vagy írásjeleknél"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr ""
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr ""
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Kijelölt bal oldali elem törlése"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Kijelölt jobb oldali elem törlése"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Kijelölt elem(ek) törlése mindkét oldalon"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Kijelölt elem(ek) rejtése (gyors szûrés)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr ""
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Jobbról balra (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Balról jobbra (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Jobbról balra (%1 of %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Balról jobbra (%1 of %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Balról... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Jobbról... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Balról... (%1 of %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Jobbról... (%1 of %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Bal (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Jobb (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Mindkettõ (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Bal (%1 ennyibõl: %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Jobb (%1 ennyibõl: %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Mindkettõ (%1 ennyibõl: %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Válassz célkönyvtárat"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Bal oldal - válassz úticél mappát:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Jobb oldal - válassz úticél mappát:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr ""
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr ""
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4390,17 +4370,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr ""
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr ""
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4412,613 +4392,613 @@ msgid ""
 "Please refresh the compare."
 msgstr ""
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr ""
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr ""
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "Mozgatás megerõsítése"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Bal oldali fájl megnyitása"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Bal oldali fájl megnyitása a belsõ szerkesztõvel"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Bal oldali fájl megnyitása a(z) ..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Jobb oldali fájl megnyitása"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Jobb oldali fájl megnyitása a belsõ szerkesztõvel"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Jobb oldali fájl megnyitása a(z) ..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Nem sikerült elindítani a külsõ szerkesztõt: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr ""
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Fájlnevek másolása a vágólapra"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Bal oldali fájlok útvonalainak másolása a vágólapra"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Jobb oldali fájlok útvonalainak másolása a vágólapra"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Mindkét oldali fájlok útvonalainak másolása a vágólapra"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr ""
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr ""
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Ismeretlen archívum formátum"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Bal oldali fájlok hozzáadása az archívumhoz"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Jobb oldali fájlok hozzáadása az archívumhoz"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Mindkét oldali fájlok hozzáadása az archívumhoz"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Különbözõ elemek hozzáadása az archívumhoz (mindkét oldalról)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "A kijelölt bal oldali fájlok áthelyezése tetszõleges könyvtárba"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "A kijelölt jobb oldali fájlok áthelyezése tetszõleges könyvtárba"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Összehasonlítási eredmények"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Bal oldali dátum"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Jobb oldali dátum"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Kiterjesztés"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Bal oldali méret"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Jobb oldali méret"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr ""
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr ""
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Bal oldali létrehozási idõ"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Jobb oldali létrehozási idõ"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Újabb fájl"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Bal oldali fájl verzió"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Jobb oldali fájl verzió"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Rövid eredmények"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Bal oldali attribútumok"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Jobb oldali attribútumok"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr ""
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr ""
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Bal oldali kódolás"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Jobb oldali kódolás"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr ""
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Bináris"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Nem lehett összehasonlítani a fájlokat"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr ""
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "A fájl kihagyva"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "A könyvtár kihagyva"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Csak bal: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Csak jobb: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "A bináris fájlok megegyezõek"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "A bináris fájlok különbözõek"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "A fájlok különbözõek"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr "A könyvtárak különböznek"
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Csak bal oldal"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Csak jobb oldal"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Hiba"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr "A szövegfájlok megegyeznek"
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr "A szövegfájlok különböznek"
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Eltelt idõ: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 elem kiválasztva"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 elem kiválasztva"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "fájlnév vagy könyvtárnév."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Alkönyvtár neve ha az alkönyvtárak is ki vannak választva."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Összehasonlítási eredmény bõvebb formában."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Bal oldali módosítási dátum."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Jobb oldali módosítási dátum."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Fájlok kiterjesztése."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Bal oldali fájl mérete bájtokban."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Jobb oldali fájl mérete bájtokban."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Bal oldal létrehozási ideje."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Jobb oldal létrehozási ideje."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Megmutatja, melyik oldalnak újabb a létrehozási dátuma."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Bal oldali fájl verziója, csak bizonyos fájloknál."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Jobb oldali fájl verziója, csak bizonyos fájloknál."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Rövid összehasonlítási eredmények."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Bal oldali attribútumok."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Jobb oldali attribútumok."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr ""
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr ""
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Bal oldali kódolás."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Jobb oldali kódolás."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Mellõzött különbségek száma a fájlban. Ezeket a különbségeket a WinMerge mellõzte és nem olvaszthatók."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Különbségek száma a fájlban. Ez a szám nem tartalmazza a mellõzött különbségeket."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "(*) látható, ha a fájl bináris."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "%1 összehasonlítása ezzel: %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Vesszõvel elválasztott lista"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Tabulált lista"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "Egyszerû HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "Egyszerû XML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "A jelentés fájl már létezik. Szeretnéd felülírni a létezõ fájlt?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5027,32 +5007,32 @@ msgstr ""
 "Hiba a jelentés készítése közben:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "A jelentés sikeresen elkészült."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Ugyanaz a fájl van megnyitva mindkét panelen."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "A kijelölt fájlok ugyanazok."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Hiba történt a fájlok összehasonlításakor."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Nem lehetett létrehozni az ideiglenes fájlokat. Ellenõrizd az ideiglenes könyvtár beállításait."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5067,32 +5047,32 @@ msgstr ""
 "\n"
 "Megjegyzés: Amennyiben minden esetben ezt az opciót szeretnéd használni, kapcsold be a 'Sortörési eltérések kihagyása' opciót az Összehasonlítás menüpontban (a Szerkesztés/Opciók menüpont alatt találod meg)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, 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:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Hiba történt ennek a fájlnak az elõvizsgálata közben: '%1' ebben a bõvítményben: '%2'. Az elõvizsgálat ezután nem fog mûködni."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr ""
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr ""
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, 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:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5103,148 +5083,148 @@ msgstr ""
 "A különbözõ kódlapokkal történõ kijelzés könnyebben áttekinthetõ de az olvasztás/törlés kockázatos lehet.\n"
 "Would you like to treat both files as being in the default windows codepage (recommended)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr ""
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr ""
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Nincs eltérés"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Sor eltérés"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Cserélve lett %1 sztring."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Nem található ez: \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Teljes elérési út másolása"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Fájlnév másolása"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr ""
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr ""
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "A Patch fájl sikeresen elkészült."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "Az 1. elem nem található vagy az egy könyvtár!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "A 2. elem nem található vagy az egy könyvtár!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "A patch fájl már létezik. Szeretnéd felülírni azt?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 kijelölt fájl]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Normál"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Környezeti"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Egységesített"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr ""
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Nem lehetett ebbe a fájlba írni: %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "A megadott kimeneti útvonal nem abszolút elérési út: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Adj meg egy kimeneti fájlt"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Nem lehet patch fájlt létrehozni bináris fájlokból."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Nem lehet patch fájlt létrehozni könyvtárakból."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5255,17 +5235,17 @@ msgstr ""
 "\n"
 "A patch létrehozásához elengedhetetlen, hogy ne legyenek el nem mentett változtatások a fájlokban."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "A mappa nem létezik."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "A jelenlegi könyvtár összehasonlítási eredmények törlõdnek."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5276,51 +5256,51 @@ msgstr ""
 "Az ehhez szükséges összetevõk (7-zip és/vagy Merge7z*.dll) nem találhatóak.\n"
 "Olvasd el a kézikönyv archívum támogatásról szóló részét."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
 "Note: 7-Zip integration is disabled in WinMerge settings."
 msgstr ""
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
 "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings."
 msgstr ""
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr ""
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr ""
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr ""
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr ""
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr ""
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr ""
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5331,261 +5311,261 @@ msgstr ""
 "\n"
 "Biztosan folytatja?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Reguláris kifejezés hiba"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Nincs találat"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Érvénytelen reguláris kifejezés"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Érvénytelen egyeztetõ karakter"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Érvénytelen karakter osztály név"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Felesleges backslash karakter"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Érvénytelen visszautalás"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Lezáratlan [ vagy [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Lezáratlan ( vagy \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Lezáratlan \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Érvénytelen tartalmú \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Érvénytelen tartomány"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Nincs elég memória"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Érvénytelen megelõzõ reguláris kifejezés"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Korán lezárt reguláris kifejezés"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Túl nagy reguláris kifejezés"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Lezáratlan ) vagy \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr ""
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr ""
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr ""
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr ""
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr ""
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr ""
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr ""
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr ""
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr ""
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr ""
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr ""
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr ""
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr ""
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr ""
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr ""
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr ""
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr ""
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Bal oldali fájl mentése"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Jobb oldali fájl mentése"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Bal oldali fájl mentése mint ..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Jobb oldali fájl mentése mint ..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr ""
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr ""
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr ""
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Váltás olvasztó és szerkesztõ mód között"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
 "File encoding properties"
 msgstr ""
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr ""
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
 "Difference in the Current Line"
 msgstr ""
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5594,7 +5574,7 @@ msgstr ""
 "Ugrás sorra vagy eltérésre\n"
 "Ugrás (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5603,7 +5583,7 @@ msgstr ""
 "A program beállítása\n"
 "Beállítások"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5612,79 +5592,79 @@ msgstr ""
 "Kijezõ frissítése\n"
 "Frissítés (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "A kijelölt sorok vágólapra másolása a sorok elejéhez a sorszámokat hozzáfûzve"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Könyvjelzõ ki/be"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Ugrás a következõ könyvjelzõre"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Ugrás az elõzõ könyvjelzõre"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Összes könyvjelzõ törlése"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
 "Show Identical Items"
 msgstr ""
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
 "Show Different Items"
 msgstr ""
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
 "Show Left Unique Items"
 msgstr ""
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
 "Show Right Unique Items"
 msgstr ""
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
 "Show Binary Files"
 msgstr ""
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
 "Show Skipped Items"
 msgstr ""
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5693,7 +5673,7 @@ msgstr ""
 "Válaszd ki a kívánt betûtípust\n"
 "Nézet betûtípusának választása"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5702,163 +5682,163 @@ msgstr ""
 "Visszatérés az eredeti rendszer-betûtípushoz megjelenítéshez\n"
 "Alapért. betûtípus"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Szóköz karakterek mutatása"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Eltérés panel mutatása/rejtése"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "A Pozíció panel vizuális képet ad az összehasonlított fájlokról"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr ""
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid "Select the current user interface language\nLanguage"
 msgstr ""
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid "Shows differences inside lines with different colors\nShow Line Difference"
 msgstr ""
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr ""
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
 "Show Line Numbers"
 msgstr ""
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
 "Wrap Lines"
 msgstr ""
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
 "Show Selection Margins"
 msgstr ""
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr ""
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr ""
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr ""
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
 msgstr ""
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
 msgstr ""
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
 msgstr ""
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
 msgstr ""
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid "Scroll to the last difference\nLast Difference (Alt+End)"
 msgstr ""
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -5867,7 +5847,7 @@ msgstr ""
 "A kijelölt szöveg másolása a jobb oldali fájlba\n"
 "Másolás jobbra (Alt+Right)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -5876,7 +5856,7 @@ msgstr ""
 "A kijelölt szöveg másolása a bal oldali fájlba\n"
 "Másolás balra (Alt+Left)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -5885,7 +5865,7 @@ msgstr ""
 "Az eltérés másolása jobbra és ugrás tovább\n"
 "Másolás jobbra és Ugrás (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -5894,7 +5874,7 @@ msgstr ""
 "Az eltérés másolása balra és ugrás tovább\n"
 "Másolás balra és Ugrás (Ctrl+Alt+Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -5903,7 +5883,7 @@ msgstr ""
 "Az összes eltérés másolása jobbra\n"
 "Mind jobbra"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -5912,382 +5892,382 @@ msgstr ""
 "Az összes eltérés másolása jobbra\n"
 "Mind balra"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "A kijelölt elemek törlése mindkét könyvtárból"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Kijelölt elem összehasonlítása (elõször az elsõé, ha több elem is ki van jelölve)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Könyvtár összehasonlítási oszlopok kijelölése és újrarendezése"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Patch-file generálása"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Szûrõk kijelölése és módosítása"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Jelentés készítése az összehasonlítási eredményekbõl"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr ""
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "A felhasználó adja meg a kicsomagolót (nincs kicsomagolás könyvtárak összehasonlításakor)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "A választott kicsomagoló lesz használva mindkét fájlnál (az egyik fájlnak csak a kiterjesztése lényeges)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Válassz kicsomagolót a fájl szerkesztéséhez"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Nincs elõvizsgálat (normális)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Javasolt bõvítmények"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Egyéb bõvítmények"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Az összes bõvítmény betöltése újra (fejlesztõknek)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid "Activates next visible file\nActivate next File"
 msgstr ""
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Minden megnyitott ablak bezárása"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid "Opens the WinMerge Help\nWinMerge Help"
 msgstr ""
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "A jelenlegi WinMerge verziószámának és egyéb adatainak fájlba mentése"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr ""
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr ""
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid "Opens the release notes document\nRelease Notes"
 msgstr ""
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid "Opens the translations website\nTranslations"
 msgstr ""
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Bõvítmény beállítások"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Nincs elõvizsgálat"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Elõvizsgálat ha lehetséges"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "A WSH nem található - Az .sct szkriptek le lesznek tiltva"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Nincs>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Automatikus>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "A fájl megnyitása a társított alkalmazással"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "A fájl megnyitása a külsõ szerkesztõvel"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "A fájl megnyitása a kiválasztott programmal"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Ne mutassa a mozgatott blokkokat"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr ""
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Mutassa a kijelölt blokkokat a jelenlegi eltéréstõl kezdve"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Ugrás a kurzor alatt eltérésre"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "&Ugrás a(z) %1. számú eltérésre ennyibõl: %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "&Ugrás a(z) %1. sorra"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr ""
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr ""
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr ""
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr ""
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr ""
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr ""
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr ""
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr ""
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr ""
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr ""
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr ""
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr ""
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr ""
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr ""
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr ""
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr ""
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr ""
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr ""
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr ""
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr ""
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr ""
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr ""
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr ""
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr ""
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr ""
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr ""
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr ""
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr ""
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr ""
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr ""
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr ""
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr ""
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr ""
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr ""
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr ""
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr ""
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr ""
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr ""
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 1d2ce0e..33de38a 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -1030,7 +1030,7 @@ msgid "&Scripts"
 msgstr "&Script"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Vuoto >"
@@ -1471,7 +1471,7 @@ msgid "&Versioning System:"
 msgstr "Sistema per il &versioning"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Percorso di cleartool.exe:"
@@ -1672,7 +1672,7 @@ msgid "Replace &All"
 msgstr "Sost&ituisci tutto"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2582,7 +2582,7 @@ msgid "Files:"
 msgstr "File:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Diversi"
@@ -2619,7 +2619,7 @@ msgid "Right:"
 msgstr "Destra:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Identici"
@@ -2819,7 +2819,7 @@ msgid "A&ppend timestamp"
 msgstr "Aggiungi il &timestamp"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Conferma la copia"
@@ -2897,7 +2897,7 @@ msgstr ""
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Cartella"
@@ -3530,7 +3530,7 @@ msgid "Version Control"
 msgstr "Controllo versioni"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Differenze"
@@ -3659,87 +3659,67 @@ msgstr "File XML (*.xml)|*.xml|Tutti i file (*.*)|*.*||"
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr ""
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr ""
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr ""
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr ""
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Contenuti completi"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Contenuti rapidi"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Data ultima modifica"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Data ultima modifica e dimens."
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Dimensioni"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Nome"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Percorso"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filtri"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Descrizione"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Inserisci il nome del file per il nuovo filtro"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Filtri di file (*.flt)|*.flt|Tutti i file (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3752,7 +3732,7 @@ msgstr ""
 "Copia per favore il file %1 nella cartella WinMerge/Filters :\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3765,7 +3745,7 @@ msgstr ""
 "\n"
 "Assicurati che questa cartella esista e si abbiano i permessi di scrittura."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3776,7 +3756,7 @@ msgstr ""
 "\n"
 "Scegli per favore una cartella per i filtri in Opzioni->Sistema."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3789,12 +3769,12 @@ msgstr ""
 "\n"
 "Il file potrebbe essere di sola lettura."
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Scegli il file con il filtro da installare"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3805,258 +3785,258 @@ msgstr ""
 "\n"
 "Impossibile copiare il nuovo file nella cartella dei filtri."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Il file del filtro esiste già.  Desideri sovrascrivere il file esistente?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Espressione regolare"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
 msgstr ""
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr ""
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Risultati del confronto tra cartelle"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Confronto tra file"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "File di sinistra senza titolo"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "File di destra senza titolo"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "Loro file"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "Miei file"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Scansione file in corso..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Apertura selezione"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Copia da sinistra a destra in corso"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Copia da destra a sinistra in corso"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Copia completa a sinistra in corso"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Copia completa a destra in corso"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Copia dei file in corso..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Eliminazione dei file in corso..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Spostamento dei file in corso..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Creazione del rapporto in corso..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr ""
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr ""
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Linea: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Unione"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Differenza %1 su %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 differenze trovate"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "1 differenza trovata"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "SL"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Elemento %1 su %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Elementi: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Seleziona due cartelle o file esistenti da confrontare"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Selezione cartella"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Seleziona due cartelle o due file da confrontare."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "Il percorso di sinistra non è valido!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Il percorso di destra non è valido!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Entrambi i percorsi non sono validi!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Seleziona due file per attivare la selezione dello scompattatore."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Impossibile confrontare file e cartelle!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "File non trovato: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "File non scompattato: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4069,12 +4049,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr ""
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4085,32 +4065,32 @@ msgstr ""
 "%1\n"
 "non è un file di conflitto."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Salva con nome"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Vuoi salvare le modifiche in %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 è marcato come di sola lettura. Desideri non tenere conto di questa impostazione? (Premi No per salvare con un nuovo nome.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Errore nel controllo sui permessi di scrittura della destinazione"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Errore durante il salvataggio di una copia di backup del file"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4123,7 +4103,7 @@ msgstr ""
 "\n"
 "Continuare comunque?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4140,7 +4120,7 @@ msgstr ""
 "\t-utilizzare un nome diverso per il file (Premi OK)\n"
 "\t-annullare l'operazione corrente (Premi Annulla)?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4155,7 +4135,7 @@ msgstr ""
 "\n"
 "Desideri salvare la versione non compattata in un altro file?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4170,7 +4150,7 @@ msgstr ""
 "\n"
 "Desideri salvare la versione non compattata in un altro file?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4185,7 +4165,7 @@ msgstr ""
 "\n"
 "Sovrascrivere il file modificato?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4194,32 +4174,32 @@ msgstr ""
 "%1\n"
 "è marcato come di sola lettura. Desideri non tenere conto della voce di Sola lettura?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
 msgstr ""
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Salva il file di sinistra con nome"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Salva il file di destra con nome"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
 msgstr ""
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4230,42 +4210,42 @@ msgstr ""
 "\n"
 "Aggiorna i documenti prima di continuare."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "E' necessario specificare il percorso di un progetto SourceSafe per continuare (Es.:  $/MioProgetto)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Estrazione dei file da VSS in corso..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "SourceSafe ha generato un errore tentando di estrarre il file. Impossibile continuare..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Errore nell'esecuzione di un comando del sistema di versioning."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "La cartella di lavoro di VSS e la posizione del file corrente non coincidono. Continuare?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Nessun database di VSS trovato!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Errore di VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4276,7 +4256,7 @@ msgstr ""
 " Controlla per favore la configurazione della vista utilizzata.\n"
 " Annullare l'operazione di estrazione?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4285,169 +4265,169 @@ msgstr ""
 "Il sistema di versioning ha restituito un errore tentando di annullare l'estrazione del file.\n"
 " Controlla per favore la configurazione della vista utilizzata."
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Nessuno"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (precedente a 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 e superiore)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Interrompi agli spazi bianchi"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Interrompi agli spazi bianchi o punteggiatura"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Copia elemento selezionato in una cartella specifica"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Copia elemento selezionato in una cartella personalizzata"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Elimina la voce selezionata sulla sinistra"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Elimina la voce selezionata sulla destra"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Elimina gli elementi selezionati in entrambi i lati"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Nascondi gli elementi selezionati (filtro al volo)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Rinomina gli elementi selezionati su entrambi i lati"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Da Destra a Sinistra (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Da Sinistra a Destra (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Da Destra a Sinistra  (%1 su %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Da Sinistra a Destra (%1 su %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Sinistra in... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Destra in... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Sinistra in... (%1 su %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Destra in... (%1 su %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Sinistra (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Destra (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Entrambi (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Sinistra (%1 su %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Destra (%1 su %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Entrambi (%1 su %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Scegli cartella di destinazione"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Lato sinistro - scegli cartella di destinazione:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Lato destro - scegli cartella di destinazione:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 file coinvolti)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 file su %2 coinvolti)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4458,17 +4438,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Sei sicuro di voler copiare:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Sei sicuro di voler copiare %d elementi:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4487,613 +4467,613 @@ msgstr ""
 "\n"
 "Aggiorna per favore il confronto."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr ""
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr ""
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr ""
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Apre il file di sinistra"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Apre il file di sinistra con l'editor esterno"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Apre il file di sinistra con..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Apre il file di destra"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Apre il file di destra con l'editor esterno"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Apre il file di destra con..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Impossibile lanciare l'editor esterno: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Estensione sconosciuta per l'editor esterno: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Copia i nomi dei file negli appunti"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Copia i percorsi del lato sinistro negli appunti"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Copia i percorsi del lato destro negli appunti"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Copia i percorsi di entrambi i lati negli appunti"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr ""
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr ""
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Formato dell'archivio sconosciuto"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Aggiunge elementi del lato sinistro a un archivio"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Aggiunge elementi del lato destro a un archivio"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Aggiunge elementi di entrambi i lati a un archivio"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Aggiunge gli elementi diversi a un archivio (entrambi i lati)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Sposta il file selezionato sulla sinistra in una cartella personalizzata"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Sposta il file selezionato sulla destra in una cartella personalizzata"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Nome del file"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Risultato del confronto"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Data file di sinistra"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Data file di destra"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Estensione"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Dimensioni file di sinistra"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Dimensioni file di destra"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Dim. file destra (breve)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Dim. file destra (breve)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Data creazione file sinistra"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Data creazione file destra"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "File più recente"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Versione file sinistra"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Versione file destra"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Risultato breve"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Attributi sinistra"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Attributi destra"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "EOL di sinistra"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "EOL di destra"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Codifica di sinistra"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Codifica di destra"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Diff. ignorate"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binario"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Impossibile confrontare i file"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Elemento annullato"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "File saltato"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Cartella saltata"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Solo sinistra: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Solo destra: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "I file binari sono identici"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "I file non di testo contengono delle differenze"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "I file contengono delle differenze"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr ""
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Solo a sinistra"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Solo a destra"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Errore"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr ""
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr ""
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Tempo trascorso: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 elemento selezionato"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 elementi selezionati"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Nome del file o della cartella."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Nome della sottocartella quando le sottocartelle sono incluse."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Risultato del confronto nella forma completa."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Data ultima modifica del file di sinistra."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Data ultima modifica del file di destra."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Estensione del file."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Dimensioni del file di sinistra in byte."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Dimensioni del file di destra in byte."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Dimensioni abbreviate del file di sinistra."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Dimensioni abbreviate del file di destra."
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Data e ora di creazione del file di sinistra."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Data e ora di creazione del file di destra."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Mostra quale file ha la data dell'ultima modifica più recente."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Versione del file di sinistra, solo per alcuni tipi di file."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Versione del file di destra, solo per alcuni tipi di file."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Risultato del confronto nella forma breve."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Attributi del file di sinistra."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Attributi del file di destra."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Tipo di fine linea nel file di sinistra"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Tipo di fine linea nel file di destra"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Codifica del file di sinistra."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Codifica del file di destra."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Numero di differenze ignorate nel file. Queste differenze sono ignorate da WinMerge e non possono venire unite."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Numero di differenze nel file. Questo numero non include le differenze ignorate."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Mostra un asterisco (*) se il file è binario."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Confronto di %1 con %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Lista separata da virgole"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Lista separata da Tab"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "HTML semplice"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "XML semplice"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Il file di rapporto esiste già. Vuoi sovrascrivere il file esistente?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5102,32 +5082,32 @@ msgstr ""
 "Errore nella creazione del rapporto:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Il rapporto è stato creato con successo."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Lo stesso file è aperto in entrambi i pannelli."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "I file selezionati sono identici."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Si è verificato un errore durante il confronto dei file."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Impossibile creare file temporanei. Controlla le impostazioni del percorso per i file temporanei."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5142,7 +5122,7 @@ msgstr ""
 "\n"
 "Nota: Se vuoi sempre trattare tutti i tipi di carriage return come equivalenti, imposta l'opzione 'Ignora le differenze di carriage return' nella linguetta Confronto delle Opzioni (raggiungibile dal menu Modifica->Opzioni)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5153,22 +5133,22 @@ msgstr ""
 "Con le opzioni correnti, saranno unificati al tipo principale.\n"
 "Vuoi cambiare le opzioni e conservare il differente fine riga ?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "C'è stato un errore nel prediffing del file '%1' con il plugin '%2'. Il prediffing non verrà più applicato."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "La cartella selezionata non è valida."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Impossibile aprire il file binario nell'editor."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5183,7 +5163,7 @@ msgstr ""
 "%1\n"
 "dall'altro lato ed aprirle entrambe?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5194,148 +5174,148 @@ msgstr ""
 "La visualizzazione di ciascun file con il proprio codice di pagina fornirà una migliore visualizzazione ma l'unione/copia sarà pericolosa.\n"
 "Desideri trattare entrambi i file come se avessero il codice di pagina predefinito di Windows (raccomandato)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Attenzione: i file usano codifiche differenti, sinistra=%s e destra=%s, e l'unione può causare una perdita di informazioni."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Informazioni perse a causa di errori nella codifica: entrambi i file"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Nessuna differenza"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Differenza della linea"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "%1 stringhe sostituite."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Impossibile trovare la stringa '%s'"
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Copia percorso completo"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Copia nome del file"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Pannello della locazione"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Pannello delle differenze"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "File di patch scritto con successo."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "Prima voce non trovata o è una cartella!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "Seconda voce non trovata o è una cartella!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Il file di patch esiste già. Desideri sovrascriverlo?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 file selezionati]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Normale"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Contesto"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Unificato"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Impossibile scrivere nel file %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Il percorso di output specificato non è un percorso assoluto: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Specifica un file di output"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Impossibile creare un file di patch da file binari."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Impossibile creare un file di patch da cartelle."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5346,17 +5326,17 @@ msgstr ""
 "\n"
 "La creazione di una patch richiede che non ci siano cambiamenti non salvati nei file."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "La cartella non esiste."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Gli attuali risultati del confronto tra cartelle verranno cancellati."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5367,7 +5347,7 @@ msgstr ""
 "Nessuno dei componenti necessari (7-zip e/o Merge7z*.dll) per il supporto sono stati trovati.\n"
 "Guarda il manuale per ulteriori informazioni sugli archivi e come attivare il supporto per essi."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5376,7 +5356,7 @@ msgstr ""
 "\n"
 "Nota: l'integrazione con 7-Zip è stata disattivata nelle opzioni di WinMerge."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5385,37 +5365,37 @@ msgstr ""
 "\n"
 "Note: l'integrazione con 7-Zip è limitata a una installazione indipendente nelle opzioni di WinMerge."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Scegli file per l'esportazione"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Scegli file per l'importazione"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Opzioni importate dal file."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Opzioni esportate nel file."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Impossibile importare le opzioni dal file."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Impossibile esportare le opzioni nel file."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5426,242 +5406,242 @@ msgstr ""
 "\n"
 "Sei sicuro di voler proseguire?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Errore nell'espressione regolare"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Nessuna corrispondenza"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Espressione regolare non valida"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Carattere di collazione non valido"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Carattere del nome della classe non valido"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Backslash che seguono"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Referenza inversa non valida"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Parentesi [ o [^ isolata"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Parentesi ( o \\( isolata"
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Parentesi \\{ isolata"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Contenuto di \\{\\} non valido"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Conclusione del range non valida"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Out of memory"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Espressione regolare precedente non valida"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Conclusione prematura dell'espressione regolare"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Espressione regolare troppo grande"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Parentesi ) o \\) isolata"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Mescolato"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr ""
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr ""
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr ""
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr ""
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr ""
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr ""
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr ""
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Salva il file di sinistra"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Salva il file di destra"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Salva il file di sinistra con nome..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Salva il file di destra con nome..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Converte EOL nella modalità Windows"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Converte EOL nella modalità Unix"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Converte EOL nella modalità Mac"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Passa dalla modalità di editing a quella di 'Unione', in cui l'integrazione delle differenzeè più rapida"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5670,12 +5650,12 @@ msgstr ""
 "Visualizza e regola le proprietà della codifica dei file\n"
 "Proprietà della codifica dei file"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr ""
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5684,7 +5664,7 @@ msgstr ""
 "Seleziona l'area della differenza nella linea corrente\n"
 "Differenza nella linea corrente"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5693,7 +5673,7 @@ msgstr ""
 "Vai a una linea o una differenza\n"
 "Vai a (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5702,7 +5682,7 @@ msgstr ""
 "Imposta le opzioni del programma\n"
 "Opzioni"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5711,37 +5691,37 @@ msgstr ""
 "Aggiorna la visualizzazione\n"
 "Aggiorna (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Copia le linee selezionate negli Appunti aggiungendo i numeri di linea all'inizio"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Imposta un segnalibro"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Va al segnalibro successivo"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Va al segnalibro precedente"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Cancella tutti i segnalibri"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5750,7 +5730,7 @@ msgstr ""
 "Mostra gli elementi che sono completamente identici\n"
 "Mostra elementi identici"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5759,7 +5739,7 @@ msgstr ""
 "Mostra gli elementi che hanno delle differenze\n"
 "Mostra elementi differenti"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5768,7 +5748,7 @@ msgstr ""
 "Mostra gli elementi che esistono solo sul lato sinistro\n"
 "Mostra elementi unici a sinistra"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5777,7 +5757,7 @@ msgstr ""
 "Mostra gli elementi che esistono solo sul lato destro\n"
 "Mostra elementi unici a destra"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5786,7 +5766,7 @@ msgstr ""
 "Mostra i file binari\n"
 "Mostra i file binari"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5795,7 +5775,7 @@ msgstr ""
 "Mostra gli elementi saltati\n"
 "Mostra gli elementi saltati"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5804,7 +5784,7 @@ msgstr ""
 "Seleziona il carattere per la visualizzazione\n"
 "Seleziona carattere visualizzazione"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5813,27 +5793,27 @@ msgstr ""
 "Ripristina il carattere predefinito del sistema per la visualizzazione\n"
 "Carattere predefinito"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Mostra gli spazi bianchi"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Mostra il pannello delle differenze"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Il pannello della locazione mostra un'immagine complessiva dei file"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Mostra la finestra con le statistiche del confronto tra cartelle"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5842,7 +5822,7 @@ msgstr ""
 "Scegli la lingua dell'interfaccia per l'utente corrente\n"
 "Lingua"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5851,12 +5831,12 @@ msgstr ""
 "Mostra le differenze fra le righe con colori differenti\n"
 "Mostra differenze fra righe"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Scambia le posizioni dei due pannelli"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5865,7 +5845,7 @@ msgstr ""
 "Mostra i numeri delle righe\n"
 "Mostra numeri delle righe"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5874,7 +5854,7 @@ msgstr ""
 "Vai a capo automaticamente\n"
 "Va a capo automaticamente (word wrap)"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5883,22 +5863,22 @@ msgstr ""
 "Mostra i margini di selezione per entrambi i pannelli\n"
 "Mostra margini di selezione"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Aumenta la dimensione del testo"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Riduci la dimensione del testo"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Ripristina la dimensione predefinita del testo"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5907,7 +5887,7 @@ msgstr ""
 "Scorri alla differenza precedente\n"
 "Differenza precedente (Alt+Su)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5916,67 +5896,67 @@ msgstr ""
 "Scorri alla differenza successiva\n"
 "Differenza successiva(Alt+Giù)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -5985,7 +5965,7 @@ msgstr ""
 "Scorri alla prima differenza\n"
 "Prima differenza (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -5994,7 +5974,7 @@ msgstr ""
 "Passa alla differenza corrente\n"
 "Differenza corrente (Alt+Invio)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6003,7 +5983,7 @@ msgstr ""
 "Scorri all'ultima differenza\n"
 "Ultima differenza (Alt+Fine)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6012,7 +5992,7 @@ msgstr ""
 "Copia il testo selezionato dal file di sinistra a quello di destra\n"
 "Copia a destra (Freccia destra)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6021,7 +6001,7 @@ msgstr ""
 "Copia il testo selezionato dal file di destra a quello di sinistra\n"
 "Copia a sinistra (Freccia sinistra)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6030,7 +6010,7 @@ msgstr ""
 "Copia la differenza a destra e avanza alla prossima\n"
 "Copia a destra e avanza (Ctrl+Alt+Destra)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6039,7 +6019,7 @@ msgstr ""
 "Copia la differenza a sinistra e avanza alla prossima\n"
 "Copia a sinistra e avanza (Ctrl+Alt+Sinistra)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6048,7 +6028,7 @@ msgstr ""
 "Copia tutte le differenze dal file di sinistra a quello di destra\n"
 "Tutto a destra"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6057,77 +6037,77 @@ msgstr ""
 "Copia tutte le differenze dal file di destra a quello di sinistra\n"
 "Tutto a sinistra"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Elimina gli elementi selezionati da entrambe le cartelle"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Confronta l'elemento selezionato (confronta il primo elemento se ne sono stati selezionati più di uno)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Seleziona e riordina le colonne da visualizzare nei confronti tra cartelle"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Crea un file di patch"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Seleziona e modifica i filtri"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Genera un rapporta con i risultati del confronto"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr ""
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "L'utente seleziona lo scompattore (nessuna scompattazione nel confronto tra cartelle)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Lo scompattatore adatto è applicato a entrambi i file (è sufficiente che uno dei file abbia l'estensione)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Seleziona uno scomapattatore per modificare questo file"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "No prediffer (normale)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Plugin suggeriti"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Altri plugin"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Scarica tutti i plugin e ricaricali (per sviluppatori)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6136,12 +6116,12 @@ msgstr ""
 "Attiva il prossimo file visibile\n"
 "Attiva prossimo file"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Chiude tutte le finestre aperte"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6150,22 +6130,22 @@ msgstr ""
 "Apri la Guida di WinMerge\n"
 "Guida WinMerge"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Invia le informazioni sulla versione e la configurazione corrente di WinMerge a un file di testo"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "Mostra la GNU General Public License"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Build privata: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6174,7 +6154,7 @@ msgstr ""
 "Apri il documento delle note di rilascio\n"
 "Note di rilascio"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6183,272 +6163,272 @@ msgstr ""
 "Apri il sito per le traduzioni\n"
 "Traduzioni"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Impostazioni plugin"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "No prediffer"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Prediff se possibile"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH non trovato - script .sct disattivati"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Nessuno>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Automatico>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Apri il file con l'applicazione registrata per esso"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Apri il file con l'editor esterno"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Apri il file con un programma specifico"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Non visualizzare i blocchi spostati"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Mostra tutti i blocchi spostati"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Visualizza i blocchi spostati solo dalla differenza corrente"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Vai alla differenza all'altezza del cursore"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "Vai alla &differenza %1 su %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "Vai alla &linea %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Disattivato"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Dal file system"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Dalla lista dei file recenti"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr ""
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Batch"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Oggetto portabile"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr ""
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Risorse"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr ""
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Nascondi la barra degli strumenti"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Mostra barra degli strumenti piccola"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Mostra barra degli strumenti grande"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index e0b6ea3..d1db2e4 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -1029,7 +1029,7 @@ msgid "&Scripts"
 msgstr "\83X\83N\83\8a\83v\83g(&S)"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< \82È\82µ >"
@@ -1470,7 +1470,7 @@ msgid "&Versioning System:"
 msgstr "\83o\81[\83W\83\87\83\93\83V\83X\83e\83\80(&V):"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "cleartool.exe\82Ö\82Ì\83p\83X(&P):"
@@ -1671,7 +1671,7 @@ msgid "Replace &All"
 msgstr "\82·\82×\82Ä\92u\8a·(&A)"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2594,7 +2594,7 @@ msgid "Files:"
 msgstr "\83t\83@\83C\83\8b:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "\8d·\88Ù"
@@ -2631,7 +2631,7 @@ msgid "Right:"
 msgstr "\89E\91¤:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "\93¯\88ê"
@@ -2831,7 +2831,7 @@ msgid "A&ppend timestamp"
 msgstr "\83^\83C\83\80\83X\83^\83\93\83v\82ð\92Ç\89Á\82·\82é(&P)"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "\83R\83s\81[\82Ì\8am\94F"
@@ -2909,7 +2909,7 @@ msgstr "
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "\83t\83H\83\8b\83_"
@@ -3553,7 +3553,7 @@ msgid "Version Control"
 msgstr "\83o\81[\83W\83\87\83\93\8aÇ\97\9d"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "\8d·\88Ù\90\94"
@@ -3682,87 +3682,67 @@ msgstr "XML 
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "\83t\83\8b\83R\83\93\83e\83\93\83c"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "\83N\83C\83b\83N\83R\83\93\83e\83\93\83c"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "\8dX\90V\93ú\8e\9e"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "\8dX\90V\93ú\8e\9e\82Æ\83T\83C\83Y"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "\83T\83C\83Y"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "\96¼\8fÌ"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "\8fê\8f\8a"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "\83t\83B\83\8b\83^"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "\90à\96¾"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "\90V\82µ\82¢\83t\83B\83\8b\83^\82Ì\83t\83@\83C\83\8b\96¼\82ð\8ew\92è\82µ\82Ä\82­\82¾\82³\82¢"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "\83t\83@\83C\83\8b\83t\83B\83\8b\83^ (*.flt)|*.flt|All Files (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3775,7 +3755,7 @@ msgstr ""
 "\83t\83@\83C\83\8b %1 \82ð\88È\89º\82Ì WinMerge/Filters \83t\83H\83\8b\83_\82É\83R\83s\81[\82µ\82Ä\82­\82¾\82³\82¢:\n"
 "%2"
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3787,7 +3767,7 @@ msgstr ""
 "\n"
 "\83t\83H\83\8b\83_\82Ì\91¶\8dÝ\82Ü\82½\82Í\8f\91\82«\8d\9e\82Ý\89Â\94\\82Å\82 \82é\82©\8am\94F\82µ\82Ä\82­\82¾\82³\82¢\81B"
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3798,7 +3778,7 @@ msgstr ""
 "\n"
 "[\83I\83v\83V\83\87\83\93/\83V\83X\83e\83\80]\82Å\83t\83B\83\8b\83^\83t\83H\83\8b\83_\82ð\8ew\92è\82µ\82Ä\82­\82¾\82³\82¢\81B"
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3810,12 +3790,12 @@ msgstr ""
 "\n"
 "\82»\82Ì\83t\83@\83C\83\8b\82Í\93Ç\82Ý\8eæ\82è\90ê\97p\82Å\82Í\82 \82è\82Ü\82¹\82ñ\82©?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "\83C\83\93\83X\83g\81[\83\8b\82·\82é\83t\83B\83\8b\83^\83t\83@\83C\83\8b\82Ì\88Ê\92u"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3826,17 +3806,17 @@ msgstr ""
 "\n"
 "\90V\82µ\82¢\83t\83B\83\8b\83^\83t\83@\83C\83\8b\82ð\83t\83B\83\8b\83^\83t\83H\83\8b\83_\82É\83R\83s\81[\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½\81B"
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "\83t\83B\83\8b\83^\83t\83@\83C\83\8b\82Í\8aù\82É\91¶\8dÝ\82µ\82Ü\82·\81B\91¶\8dÝ\82µ\82Ä\82¢\82é\83t\83@\83C\83\8b\82ð\8fã\8f\91\82«\82µ\82Ü\82·\82©?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "\90³\8bK\95\\8c»"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3847,243 +3827,243 @@ msgstr ""
 "\n"
 "\82à\82µ\81A\82¢\82Ü\82Í\82·\82×\82Ä\82Ì\94ä\8ar\83E\83C\83\93\83h\83E\82ð\8dX\90V\82µ\82½\82­\82È\82¢\8fê\8d\87\81A\82¢\82¢\82¦\82ð\91I\91ð\82µ\81A\8cã\82Å\94ä\8ar\83E\83C\83\93\83h\83E\82ð\8dX\90V\82µ\82Ä\82­\82¾\82³\82¢\81B"
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "SS.EXE\82Ö\82Ì\83p\83X(&P):"
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "\83t\83H\83\8b\83_\94ä\8ar\8c\8b\89Ê"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "\83t\83@\83C\83\8b\94ä\8ar"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "\8d¶\96³\91è"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr "\92\86\96³\91è"
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "\89E\96³\91è"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "Theirs File"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "Mine File"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "\83t\83@\83C\83\8b\82ð\83X\83L\83\83\83\93\82µ\82Ä\82¢\82Ü\82·..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "\91I\91ð\82³\82ê\82½\83t\83@\83C\83\8b\82ð\8aJ\82¢\82Ä\82¢\82Ü\82·"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "\8d¶\82©\82ç\89E\82É\83R\83s\81[\82µ\82Ä\82¢\82Ü\82·"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "\89E\82©\82ç\8d¶\82É\83R\83s\81[\82µ\82Ä\82¢\82Ü\82·"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr "\8d¶\82©\82ç\92\86\89\9b\82É\83R\83s\81[\82µ\82Ä\82¢\82Ü\82·"
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr "\89E\82©\82ç\92\86\89\9b\82É\83R\83s\81[\82µ\82Ä\82¢\82Ü\82·"
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "\91S\82Ä\82ð\8d¶\82É\83R\83s\81[\82µ\82Ä\82¢\82Ü\82·"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "\91S\82Ä\82ð\89E\82É\83R\83s\81[\82µ\82Ä\82¢\82Ü\82·"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "\83t\83@\83C\83\8b\82ð\83R\83s\81[\82µ\82Ä\82¢\82Ü\82·..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "\83t\83@\83C\83\8b\82ð\8dí\8f\9c\82µ\82Ä\82¢\82Ü\82·..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "\83t\83@\83C\83\8b\82ð\88Ú\93®\82µ\82Ä\82¢\82Ü\82·..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "\83\8c\83|\81[\83g\82ð\90¶\90¬\82µ\82Ä\82¢\82Ü\82·..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "\8dÅ\8cã\82Ì\91\80\8dì\82ð\8c³\82É\96ß\82µ\82Ä\82¢\82Ü\82·..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "\91O\82Ì\91\80\8dì\82ð\82â\82è\92¼\82µ\82Ä\82¢\82Ü\82·..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr "\8ds: %s  \97ñ: %d/%d  \95¶\8e\9a: %d/%d  EOL: %s  \83R\81[\83h\83y\81[\83W: %d(%s)"
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "\8ds: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr "\8ds: %s  \97ñ: %d/%d  \95¶\8e\9a: %d/%d  \83R\81[\83h\83y\81[\83W: %d(%s)"
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "\83}\81[\83W"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "\8d·\88Ù %1/%2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1\8cÂ\82Ì\8d·\88Ù\82ª\8c©\82Â\82©\82è\82Ü\82µ\82½"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "1\8cÂ\82Ì\8d·\88Ù\82ª\8c©\82Â\82©\82è\82Ü\82µ\82½"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "RO"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "\8d\80\96Ú %1/%2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "\8d\80\96Ú: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "\91¶\8dÝ\82·\82é\83t\83H\83\8b\83_\82Ü\82½\82Í\81A\83t\83@\83C\83\8b\82ð\91I\91ð\82µ\82Ä\82­\82¾\82³\82¢"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Folder Selection"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "2\82Â\82Ì\83t\83H\83\8b\83_\82Ü\82½\82Í\81A2\82Â\82Ì\83t\83@\83C\83\8b\82ð\91I\91ð\82µ\82Ä\82­\82¾\82³\82¢\81B"
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "\8d¶\91¤\82Ì\83p\83X\82Í\95s\90³\82È\83p\83X\82Å\82·!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr "\92\86\89\9b\82Ì\83p\83X\82Í\95s\90³\82È\83p\83X\82Å\82·!"
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "\89E\91¤\82Ì\83p\83X\82Í\95s\90³\82È\83p\83X\82Å\82·!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "\97¼\91¤\82Ì\83p\83X\82Í\95s\90³\82È\83p\83X\82Å\82·!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr "\8d¶\91¤\82Æ\92\86\89\9b\82Ì\83p\83X\82Í\95s\90³\82È\83p\83X\82Å\82·!"
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr "\8d¶\91¤\82Æ\89E\91¤\82Ì\83p\83X\82Í\95s\90³\82È\83p\83X\82Å\82·!"
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr "\92\86\89\9b\82Æ\89E\91¤\82Ì\83p\83X\82Í\95s\90³\82È\83p\83X\82Å\82·!"
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr "\91S\82Ä\82Ì\83p\83X\82ª\95s\90³\82È\83p\83X\82Å\82·!"
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "\93W\8aJ\83v\83\89\83O\83C\83\93\91I\91ð\82ð\97L\8cø\82É\82·\82é\82É\82Í\83t\83@\83C\83\8b\82ð\93ñ\82Â\91I\91ð\82µ\82Ä\82­\82¾\82³\82¢\81B"
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "\83t\83@\83C\83\8b\82Æ\83t\83H\83\8b\83_\82Í\94ä\8ar\82Å\82«\82Ü\82¹\82ñ!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "\83t\83@\83C\83\8b\82ª\8c©\82Â\82©\82è\82Ü\82¹\82ñ: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "\83t\83@\83C\83\8b\82ª\93W\8aJ\82³\82ê\82Ä\82¢\82Ü\82¹\82ñ: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4096,12 +4076,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "\83R\83\93\83t\83\8a\83N\83g\83t\83@\83C\83\8b\82Ì\89ð\90Í\82É\8e¸\94s\82µ\82Ü\82µ\82½\81B"
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4112,34 +4092,34 @@ msgstr ""
 "%1\n"
 "\82Í\83R\83\93\83t\83\8a\83N\83g\83t\83@\83C\83\8b\82Å\82Í\82 \82è\82Ü\82¹\82ñ\81B"
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "\96¼\91O\82ð\95t\82¯\82Ä\95Û\91¶"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr ""
 "\83t\83@\83C\83\8b %1 \82Ì\93à\97e\82Í\95Ï\8dX\82³\82ê\82Ä\82¢\82Ü\82·\81B\n"
 "\95Ï\8dX\82ð\95Û\91¶\82µ\82Ü\82·\82©?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1\82Í\93Ç\82Ý\8eæ\82è\90ê\97p\83t\83@\83C\83\8b\82Å\82·\81B \93Ç\82Ý\8eæ\82è\90ê\97p\83t\83@\83C\83\8b\82ð\8fã\8f\91\82«\82µ\82Ü\82·\82©? (\90V\82µ\82¢\83t\83@\83C\83\8b\96¼\82Å\82Í\95Û\91¶\82µ\82Ü\82¹\82ñ\81B)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "\83t\83@\83C\83\8b\8f\91\82«\8d\9e\82Ý\89Â\83`\83F\83b\83N\83G\83\89\81["
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "\83t\83@\83C\83\8b\83o\83b\83N\83A\83b\83v\83G\83\89\81["
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4152,7 +4132,7 @@ msgstr ""
 "\82ð\83o\83b\83N\83A\83b\83v\82Å\82«\82Ü\82¹\82ñ\81B\n"
 "\96³\8e\8b\82µ\82Ä\91±\82¯\82Ü\82·\82©?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4168,7 +4148,7 @@ msgstr ""
 "\95Ê\96¼\82Å\95Û\91¶\82·\82é\8fê\8d\87\82ÍOk\82ð\81A\n"
 "\92\86\8e~\82·\82é\8fê\8d\87\82Í\81A\83L\83\83\83\93\83Z\83\8b\82ð\89\9f\82µ\82Ä\82­\82¾\82³\82¢"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4183,7 +4163,7 @@ msgstr ""
 "\n"
 "\93W\8aJ\82³\82ê\82½\82à\82Ì\82ð\95Ê\83t\83@\83C\83\8b\82É\95Û\91¶\82µ\82Ü\82·\82©?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4198,7 +4178,7 @@ msgstr ""
 "\n"
 "\93W\8aJ\82³\82ê\82½\82à\82Ì\82ð\95Ê\83t\83@\83C\83\8b\82É\95Û\91¶\82µ\82Ü\82·\82©?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4210,7 +4190,7 @@ msgstr ""
 "%1\n"
 "\82±\82Ì\83t\83@\83C\83\8b\82Í WinMerge \88È\8aO\82Ì\83A\83v\83\8a\83P\81[\83V\83\87\83\93\82Å\8fC\90³\82³\82ê\82Ä\82¢\82Ü\82·\81B\8fC\90³\82³\82ê\82½\83t\83@\83C\83\8b\82É\8fã\8f\91\82«\82µ\82Ü\82·\82©?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4219,7 +4199,7 @@ msgstr ""
 "%1\n"
 "\82Í\81A\93Ç\82Ý\8eæ\82è\90ê\97p\82Å\82·\81B \93Ç\82Ý\8eæ\82è\90ê\97p\82Ì\8d\80\96Ú\82ð\8fã\8f\91\82«\82µ\82Ü\82·\82©?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4233,22 +4213,22 @@ msgstr ""
 "\82ð\8dX\90V\82µ\82Ü\82µ\82½\81B\n"
 "\83t\83@\83C\83\8b\82ð\8aJ\82«\82È\82¨\82µ\82Ü\82·\82©?"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "\96¼\91O\82ð\95t\82¯\82Ä\8d¶\91¤\82Ì\83t\83@\83C\83\8b\82ð\95Û\91¶"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr "\96¼\91O\82ð\95t\82¯\82Ä\92\86\89\9b\82Ì\83t\83@\83C\83\8b\82ð\95Û\91¶"
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "\96¼\91O\82ð\95t\82¯\82Ä\89E\91¤\82Ì\83t\83@\83C\83\8b\82ð\95Û\91¶"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid ""
 "The file\n"
@@ -4259,7 +4239,7 @@ msgstr ""
 "%1\n"
 "\82Í\8fÁ\96Å\82µ\82Ü\82µ\82½\81B\91±\8ds\82·\82é\82½\82ß\82É\83t\83@\83C\83\8b\82Ì\83R\83s\81[\82ð\95Û\91¶\82µ\82Ä\82­\82¾\82³\82¢\81B"
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4270,42 +4250,42 @@ msgstr ""
 "\n"
 "\91±\8ds\82·\82é\91O\82É\83h\83L\83\85\83\81\83\93\83g\82ðF5\83L\81[\82Å\8dÅ\90V\82É\82µ\82Ä\82­\82¾\82³\82¢\81B"
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "\91±\8ds\82·\82é\82½\82ß\82É\82Í\81ASourceSafe\83v\83\8d\83W\83F\83N\83g\83p\83X\82ð\8ew\92è\82µ\82Ä\82­\82¾\82³\82¢\81B (\97á:  $/MyProject)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "VSS\82©\82ç\83t\83@\83C\83\8b\82ð\83`\83F\83b\83N\83A\83E\83g\82µ\82Ä\82¢\82Ü\82·..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "\83t\83@\83C\83\8b\82Ì\83`\83F\83b\83N\83A\83E\83g\82Å\83G\83\89\81[\82ª\94­\90¶\82µ\82Ü\82µ\82½\81B  \8cp\91±\82Å\82«\82Ü\82¹\82ñ..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "\83o\81[\83W\83\87\83\93\83V\83X\83e\83\80\83R\83}\83\93\83h\82Ì\8eÀ\8ds\83G\83\89\81[\81B"
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "VSS\8dì\8bÆ\83t\83H\83\8b\83_\82Æ\8c»\8dÝ\82Ì\83t\83@\83C\83\8b\88Ê\92u\82Í\88ê\92v\82µ\82Ä\82¢\82Ü\82¹\82ñ\81B\91±\8ds\82µ\82Ü\82·\82©?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "VSS\82Ì\83f\81[\83^\83x\81[\83X\82ª\82Ý\82Â\82©\82è\82Ü\82¹\82ñ!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "VSS\82©\82ç\82Ì\83G\83\89\81[:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4316,7 +4296,7 @@ msgstr ""
 " \8eg\97p\82µ\82Ä\82¢\82é\83r\83\85\81[\82Ì\90Ý\92è\82ð\8am\94F\82µ\82Ä\82­\82¾\82³\82¢\81B\n"
 " \83`\83F\83b\83N\83A\83E\83g\82ð\83L\83\83\83\93\83Z\83\8b\82µ\82Ü\82·\82©?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4325,169 +4305,169 @@ msgstr ""
 "\83o\81[\83W\83\87\83\93\8aÇ\97\9d\83V\83X\83e\83\80\82Í\81A\83t\83@\83C\83\8b\82Ì\83`\83F\83b\83N\83A\83E\83g\83L\83\83\83\93\83Z\83\8b\8e\9e\82É\83G\83\89\81[\82ð\95Ô\82µ\82Ü\82µ\82½\81B\n"
 " \8eg\97p\82µ\82Ä\82¢\82é\83r\83\85\81[\82Ì\90Ý\92è\82ð\8am\94F\82µ\82Ä\82­\82¾\82³\82¢\81B "
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "\82È\82µ"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (5.0 \96¢\96\9e)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 \88È\8fã)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "\8bó\94\92\82Å\8bæ\90Ø\82é"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "\8bó\94\92\82©\8bå\93Ç\93_\82Å\8bæ\90Ø\82é"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "\91I\91ð\82³\82ê\82½\8d\80\96Ú\82ð\8ew\92è\83t\83H\83\8b\83_\82É\83R\83s\81[\82µ\82Ü\82·"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "\91I\91ð\82³\82ê\82½\8d\80\96Ú\82ð\91I\91ð\82³\82ê\82½\83t\83H\83\8b\83_\82É\83R\83s\81[\82µ\82Ü\82·"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "\8d¶\82Ì\91I\91ð\82³\82ê\82½\8d\80\96Ú\82ð\8dí\8f\9c\82µ\82Ü\82·"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "\89E\82Ì\91I\91ð\82³\82ê\82½\8d\80\96Ú\82ð\8dí\8f\9c\82µ\82Ü\82·"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "\97¼\91¤\82Ì\91I\91ð\82³\82ê\82½\8d\80\96Ú\82ð\8dí\8f\9c\82µ\82Ü\82·"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "\91I\91ð\82³\82ê\82½\8d\80\96Ú\82ð\94ñ\95\\8e¦\82É\82µ\82Ü\82·(\83I\83\93\83U\83t\83\89\83C \83t\83B\83\8b\83^)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "\97¼\91¤\82Ì\91I\91ð\82³\82ê\82½\8d\80\96Ú\82Ì\96¼\91O\82ð\95Ï\8dX\82µ\82Ü\82·"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "\89E\82©\82ç\8d¶ (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "\8d¶\82©\82ç\89E (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "\89E\82ð\8d¶\82É (%1 / %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "\8d¶\82ð\89E\82É (%1 / %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "\8d¶\82ð... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "\89E\82ð... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "\8d¶\82ð... (%1/%2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "\89E\82ð... (%1/%2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "\8d¶ (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "\89E (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "\97¼\91¤ (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "\8d¶ (%1 / %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "\89E (%1 / %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "\97¼\91¤ (%1 / %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "\91Î\8fÛ\83t\83H\83\8b\83_\82ð\91I\91ð\82µ\82Ä\82­\82¾\82³\82¢"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "\8d¶\91¤ - \83R\83s\81[/\88Ú\93®\90æ\83t\83H\83\8b\83_\82Ì\8ew\92è:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "\89E\91¤ - \83R\83s\81[/\88Ú\93®\90æ\83t\83H\83\8b\83_\82Ì\8ew\92è:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 \8cÂ\82Ì\83t\83@\83C\83\8b\82É\8dì\97p)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1/%2 \8cÂ\82Ì\83t\83@\83C\83\8b\82É\8dì\97p)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4499,17 +4479,17 @@ msgstr ""
 "%1\n"
 "\82ð\8dí\8f\9c\82µ\82Ü\82·\82©?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "\96{\93\96\82É\83R\83s\81[\82µ\82Ü\82·\82©?:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "\96{\93\96\82É%d\8d\80\96Ú\82ð\83R\83s\81[\82µ\82Ü\82·\82©?:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4528,613 +4508,613 @@ msgstr ""
 "\n"
 "\8dÄ\93x\94ä\8ar\82µ\82Ä\82­\82¾\82³\82¢\81B"
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "\8d\80\96Ú\82ð\88Ú\93®\82µ\82Ü\82·\82©?: "
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "%d\8cÂ\82Ì\8d\80\96Ú\82ð\88Ú\93®\82µ\82Ü\82·\82©?: "
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "\88Ú\93®\82Ì\8am\94F"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "\8d¶\82Ì\83t\83@\83C\83\8b\82ð\8aJ\82«\82Ü\82·"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "\8aO\95\94\83G\83f\83B\83^\82Å\8d¶\82Ì\83t\83@\83C\83\8b\82ð\8aJ\82«\82Ü\82·"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "\8d¶\82Ì\83t\83@\83C\83\8b\82ð\91I\91ð\82µ\82½\83A\83v\83\8a\83P\81[\83V\83\87\83\93\82Å\8aJ\82«\82Ü\82·..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "\89E\82Ì\83t\83@\83C\83\8b\82ð\8aJ\82«\82Ü\82·"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "\8aO\95\94\83G\83f\83B\83^\82Å\89E\82Ì\83t\83@\83C\83\8b\82ð\8aJ\82«\82Ü\82·"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "\89E\82Ì\83t\83@\83C\83\8b\82ð\91I\91ð\82µ\82½\83A\83v\83\8a\83P\81[\83V\83\87\83\93\82Å\8aJ\82«\82Ü\82·..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "\8aO\95\94\83G\83f\83B\83^\82Ì\8eÀ\8ds\82É\8e¸\94s\82µ\82Ü\82µ\82½: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "\8aO\95\94\83G\83f\83B\83^\82Ì\8ag\92£\8eq\82ª\96¢\92m\82Ì\8ag\92£\8eq\82Å\82·: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "\83N\83\8a\83b\83v\83{\81[\83h\82É\83t\83@\83C\83\8b\96¼\82ð\83R\83s\81[\82µ\82Ü\82·"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "\8d¶\91¤\82Ì\83p\83X\96¼\82ð\83N\83\8a\83b\83v\83{\81[\83h\82É\83R\83s\81[\82µ\82Ü\82·"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "\89E\91¤\82Ì\83p\83X\96¼\82ð\83N\83\8a\83b\83v\83{\81[\83h\82É\83R\83s\81[\82µ\82Ü\82·"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "\97¼\91¤\82Ì\83p\83X\96¼\82ð\83N\83\8a\83b\83v\83{\81[\83h\82É\83R\83s\81[\82µ\82Ü\82·"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr "\91I\91ð\82µ\82½\8d\80\96Ú\82Ì\8d¶\91¤\82ð\83N\83\8a\83b\83v\83{\81[\83h\82É\83R\83s\81[\82µ\82Ü\82·"
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr "\91I\91ð\82µ\82½\8d\80\96Ú\82Ì\89E\91¤\82ð\83N\83\8a\83b\83v\83{\81[\83h\82É\83R\83s\81[\82µ\82Ü\82·"
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr "\8d¶\91¤\83V\83F\83\8b\83\81\83j\83\85\81["
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr "\92\86\89\9b\83V\83F\83\8b\83\81\83j\83\85\81["
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr "\89E\91¤\83V\83F\83\8b\83\81\83j\83\85\81["
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "\96¢\92m\82Ì\83A\81[\83J\83C\83u\8c`\8e®\82Å\82·"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "\83A\81[\83J\83C\83u\82É\8d¶\91¤\82Ì\8d\80\96Ú\82ð\92Ç\89Á\82µ\82Ü\82·"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "\83A\81[\83J\83C\83u\82É\89E\91¤\82Ì\8d\80\96Ú\82ð\92Ç\89Á\82µ\82Ü\82·"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "\83A\81[\83J\83C\83u\82É\97¼\91¤\82Ì\8d\80\96Ú\82ð\92Ç\89Á\82µ\82Ü\82·"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "\83A\81[\83J\83C\83u\82É\8d·\88Ù\82Ì\82 \82é\97¼\91¤\82Ì\8d\80\96Ú\82ð\92Ç\89Á\82µ\82Ü\82·"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "\8d¶\91¤\82Ì\91I\91ð\82³\82ê\82½\83t\83@\83C\83\8b\82ð\8ew\92è\82µ\82½\83t\83H\83\8b\83_\82É\88Ú\93®\82µ\82Ü\82·"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "\89E\91¤\82Ì\91I\91ð\82³\82ê\82½\83t\83@\83C\83\8b\82ð\8ew\92è\82µ\82½\83t\83H\83\8b\83_\82É\88Ú\93®\82µ\82Ü\82·"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "\83t\83@\83C\83\8b\96¼"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "\94ä\8ar\8c\8b\89Ê"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "\8d¶\93ú\95t"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "\89E\93ú\95t"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr "\92\86\93ú\95t"
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "\8ag\92£\8eq"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "\8d¶\83T\83C\83Y"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "\89E\83T\83C\83Y"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr "\92\86\83T\83C\83Y"
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "\89E\83T\83C\83Y (\92Z\8fk)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "\8d¶\83T\83C\83Y (\92Z\8fk)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr "\92\86\83T\83C\83Y (\92Z\8fk)"
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "\8d¶\8dì\90¬\93ú\8e\9e"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "\89E\8dì\90¬\93ú\8e\9e"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr "\92\86\8dì\90¬\93ú\8e\9e"
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "\90V\82µ\82¢\83t\83@\83C\83\8b"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "\8d¶\83t\83@\83C\83\8b\83o\81[\83W\83\87\83\93"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "\89E\83t\83@\83C\83\8b\83o\81[\83W\83\87\83\93"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr "\92\86\83t\83@\83C\83\8b\83o\81[\83W\83\87\83\93"
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "\8aÈ\88Õ\8c\8b\89Ê\95\\8e¦"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "\8d¶\91®\90«"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "\89E\91®\90«"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr "\92\86\91®\90«"
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "\8d¶EOL"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr "\92\86EOL"
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "\89EEOL"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "\8d¶\83G\83\93\83R\81[\83f\83B\83\93\83O"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "\89E\83G\83\93\83R\81[\83f\83B\83\93\83O"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr "\92\86\83G\83\93\83R\81[\83f\83B\83\93\83O"
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "\96³\8e\8b\82³\82ê\82½\8d·\88Ù\90\94"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "\83o\83C\83i\83\8a"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "\83t\83@\83C\83\8b\82ð\94ä\8ar\82Å\82«\82Ü\82¹\82ñ"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "\92\86\92f\82³\82ê\82½\8d\80\96Ú"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "\83X\83L\83b\83v\82³\82ê\82½\83t\83@\83C\83\8b"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "\83X\83L\83b\83v\82³\82ê\82½\83t\83H\83\8b\83_"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "\8d¶\91¤\82Ì\82Ý: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr "\92\86\89\9b\82Ì\82Ý: %1"
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "\89E\91¤\82Ì\82Ý: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr "%1 \93à\82Ì\82Ý\91¶\8dÝ\82µ\82Ü\82¹\82ñ"
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "\83o\83C\83i\83\8a\83t\83@\83C\83\8b\82Í\93¯\88ê\82Å\82·"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "\83o\83C\83i\83\8a\83t\83@\83C\83\8b\82Í\88Ù\82È\82Á\82Ä\82¢\82Ü\82·"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "\83t\83@\83C\83\8b\82Í\88Ù\82È\82Á\82Ä\82¢\82Ü\82·"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr "\83t\83H\83\8b\83_\82Í\88Ù\82È\82Á\82Ä\82¢\82Ü\82·"
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "\8d¶\91¤\82Ì\82Ý"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "\89E\91¤\82Ì\82Ý"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr "\92\86\89\9b\82Ì\82Ý"
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr "\8d¶\91¤\82É\82È\82¢"
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr "\89E\91¤\82É\82È\82¢"
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr "\92\86\89\9b\82É\82È\82¢"
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "\83G\83\89\81["
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr "\83e\83L\83X\83g\83t\83@\83C\83\8b\82Í\93¯\88ê\82Å\82·"
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr "\83e\83L\83X\83g\83t\83@\83C\83\8b\82Í\88Ù\82È\82è\82Ü\82·"
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "\8co\89ß\8e\9e\8aÔ: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1\8cÂ\82Ì\8d\80\96Ú\82ð\91I\91ð"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1\8cÂ\82Ì\8d\80\96Ú\82ð\91I\91ð"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "\83t\83@\83C\83\8b\96¼\82Ü\82½\82Í\81A\83t\83H\83\8b\83_\96¼"
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "\83T\83u\83t\83H\83\8b\83_\82ª\8aÜ\82Ü\82ê\82½\82Æ\82«\82Ì\83T\83u\83t\83H\83\8b\83_\96¼"
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "\92·\82¢\8c`\8e®\82Ì\94ä\8ar\8c\8b\89Ê\95\\8e¦"
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "\8d¶\91¤\82Ì\8dX\90V\93ú\95t"
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "\89E\91¤\82Ì\8dX\90V\93ú\95t"
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr "\92\86\89\9b\82Ì\8dX\90V\93ú\95t"
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "\83t\83@\83C\83\8b\8ag\92£\8eq"
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "\8d¶\91¤\83t\83@\83C\83\8b\82Ì\83o\83C\83g\90\94"
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "\89E\91¤\83t\83@\83C\83\8b\82Ì\83o\83C\83g\90\94"
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr "\92\86\89\9b\83t\83@\83C\83\8b\82Ì\83o\83C\83g\90\94"
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "\8d¶\91¤\83t\83@\83C\83\8b\82Ì\83o\83C\83g\90\94(\92Z\8fk\8c`)"
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "\89E\91¤\83t\83@\83C\83\8b\82Ì\83o\83C\83g\90\94(\92Z\8fk\8c`)"
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr "\92\86\89\9b\83t\83@\83C\83\8b\82Ì\83o\83C\83g\90\94(\92Z\8fk\8c`)"
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "\8d¶\91¤\82Ì\8dì\90¬\8e\9e\8d\8f"
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "\89E\91¤\82Ì\8dì\90¬\8e\9e\8d\8f"
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr "\92\86\89\9b\82Ì\8dì\90¬\8e\9e\8d\8f"
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "\82Ç\82¿\82ç\82ª\8dÅ\90V\82Ì\95Ï\8dX\93ú\95t\82©\82ð\8e¦\82µ\82Ü\82·\81B"
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "\8d¶\91¤\83t\83@\83C\83\8b\82Ì\83o\81[\83W\83\87\83\93, \8cÀ\82ç\82ê\82½\83t\83@\83C\83\8b\83^\83C\83v\82Ì\82Ý"
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "\89E\91¤\83t\83@\83C\83\8b\82Ì\83o\81[\83W\83\87\83\93, \8cÀ\82ç\82ê\82½\83t\83@\83C\83\8b\83^\83C\83v\82Ì\82Ý"
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr "\92\86\89\9b\83t\83@\83C\83\8b\82Ì\83o\81[\83W\83\87\83\93, \8cÀ\82ç\82ê\82½\83t\83@\83C\83\8b\83^\83C\83v\82Ì\82Ý"
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "\92Z\82¢\8c`\8e®\82Ì\94ä\8ar\8c\8b\89Ê\95\\8e¦"
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "\8d¶\91¤\82Ì\91®\90«"
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "\89E\91¤\82Ì\91®\90«"
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr "\92\86\89\9b\82Ì\91®\90«"
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "\8d¶\91¤\82ÌEOL\83^\83C\83v"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "\89E\91¤\82ÌEOL\83^\83C\83v"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr "\92\86\89\9b\82ÌEOL\83^\83C\83v"
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "\8d¶\91¤\83G\83\93\83R\81[\83f\83B\83\93\83O"
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "\89E\91¤\83G\83\93\83R\81[\83f\83B\83\93\83O"
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr "\92\86\89\9b\83G\83\93\83R\81[\83f\83B\83\93\83O"
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "\83t\83@\83C\83\8b\93à\82Å\96³\8e\8b\82³\82ê\82½\8d·\88Ù\90\94\81B\82±\82Ì\8d·\88Ù\82ÍWinMerge\82É\82æ\82Á\82Ä\96³\8e\8b\82³\82ê\81A\83}\81[\83W\82³\82ê\82Ü\82¹\82ñ\81B"
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "\83t\83@\83C\83\8b\93à\8d·\88Ù\90\94\81B\82±\82Ì\8d·\88Ù\90\94\82Í\96³\8e\8b\82³\82ê\82½\8d·\88Ù\90\94\82ð\8aÜ\82Ý\82Ü\82¹\82ñ\81B"
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "\82à\82µ\81A\83o\83C\83i\83\8a\83t\83@\83C\83\8b\82È\82ç\83A\83X\83^\83\8a\83X\83N(*)\82ð\95\\8e¦\82µ\82Ü\82·\81B"
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "%1 \82Æ %2 \82Ì\94ä\8ar"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "CSV\8c`\8e®"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "TAB\8bæ\90Ø\82è\8c`\8e®"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "\83V\83\93\83v\83\8bHTML\8c`\8e®"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "\83V\83\93\83v\83\8bXML\8c`\8e®"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "\83\8c\83|\81[\83g\83t\83@\83C\83\8b\82Í\8aù\82É\91¶\8dÝ\82µ\82Ä\82¢\82Ü\82·\81B\91¶\8dÝ\82µ\82Ä\82¢\82é\83t\83@\83C\83\8b\82ð\8fã\8f\91\82«\82µ\82Ü\82·\82ª?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5143,32 +5123,32 @@ msgstr ""
 "\83\8c\83|\81[\83g\90¶\90¬\83G\83\89\81[:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "\83\8c\83|\81[\83g\90¶\90¬\82É\90¬\8c÷\82µ\82Ü\82µ\82½\81B"
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "\93¯\82¶\83t\83@\83C\83\8b\82ª\97¼\91¤\82Ì\83p\83l\83\8b\82Å\8aJ\82©\82ê\82Ä\82¢\82Ü\82·\81B"
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "\91I\91ð\82³\82ê\82½\83t\83@\83C\83\8b\82Í\93¯\88ê\82Å\82·\81B"
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "\83t\83@\83C\83\8b\82Ì\94ä\8ar\8e\9e\82É\83G\83\89\81[\82ª\94­\90¶\82µ\82Ü\82µ\82½\81B"
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "\83e\83\93\83|\83\89\83\8a\83t\83@\83C\83\8b\82ª\8dì\90¬\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½\81B\83e\83\93\83|\83\89\83\8a\83p\83X\90Ý\92è\82ð\8am\94F\82µ\82Ä\82­\82¾\82³\82¢\81B"
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5185,7 +5165,7 @@ msgstr ""
 "[\95Ò\8fW]\81¨[\90Ý\92è]\81¨[\94ä\8ar]\82Ì'\89ü\8ds\95¶\8e\9a\82Ì\88á\82¢\82ð\96³\8e\8b\82·\82é'\83I\83v\83V\83\87\83\93\82ð\n"
 "\83Z\83b\83g\82µ\82Ä\82­\82¾\82³\82¢\81B"
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5196,22 +5176,22 @@ msgstr ""
 " \8c»\8dÝ\82Ì\83I\83v\83V\83\87\83\93\90Ý\92è\82Å\82Í\81A\8eå\82ÈEOL\82É\93\9d\88ê\82³\82ê\82Ü\82·\81B\n"
 " \83I\83v\83V\83\87\83\93\82ð\95Ï\8dX\82µ\82Ä\81A\88Ù\82È\82éEOL\82ð\95Û\8e\9d\82·\82é\82æ\82¤\82É\82µ\82Ü\82·\82©?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "\83v\83\89\83O\83C\83\93'%2'\82Å\83t\83@\83C\83\8b'%1'\82Ì\94ä\8ar\91O\8f\88\97\9d\82Ì\8eÀ\8ds\92\86\82É\83G\83\89\81[\82ª\94­\90¶\82µ\82Ü\82µ\82½\81B\94ä\8ar\91O\8f\88\97\9d\82Í\88È\8d~\8ds\82È\82í\82ê\82Ü\82¹\82ñ\81B"
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "\91I\91ð\82³\82ê\82½\83t\83H\83\8b\83_\82Í\96³\8cø\82Å\82·\81B"
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "\83o\83C\83i\83\8a\83t\83@\83C\83\8b\82ð\83G\83f\83B\83^\82Å\8aJ\82­\82±\82Æ\82Í\82Å\82«\82Ü\82¹\82ñ\81B"
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5225,7 +5205,7 @@ msgstr ""
 "\91¼\95û\82É\83}\83b\83`\82·\82é\88È\89º\82Ì\83t\83H\83\8b\83_\82ð\8dì\90¬\82µ\81A\83t\83H\83\8b\83_\82ð\8aJ\82«\82Ü\82·\82©?:\n"
 "%1"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5236,148 +5216,148 @@ msgstr ""
 "\8ae\81X\82Ì\83t\83@\83C\83\8b\82ð\82»\82Ì\83R\81[\83h\83y\81[\83W\82Å\95\\8e¦\82·\82ê\82Î\81A\90³\82µ\82­\95\\8e¦\82³\82ê\82Ü\82·\82ª\81A\83}\81[\83W\82â\83R\83s\81[\82ª\8aë\8c¯\82É\82È\82è\82Ü\82·\81B\n"
 "\83R\81[\83h\83y\81[\83W\82ð\83f\83t\83H\83\8b\83g\83R\81[\83h\83y\81[\83W\82Æ\82µ\82Ä\88µ\82¢\82Ü\82·\82ª\81A\82æ\82ë\82µ\82¢\82Å\82·\82©(\90\84\8f§)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "\8cx\8d\90: \8cÝ\82¢\82É\88Ù\82È\82Á\82½\83G\83\93\83R\81[\83f\83B\83\93\83O\82Ì\83t\83@\83C\83\8b\82Å\82·\81B \8d¶\91¤=%s \89E\91¤=%s \83}\81[\83W\82·\82é\8fê\8d\87\81A\8fî\95ñ\82ª\8e¸\82í\82ê\82é\82©\82à\82µ\82ê\82Ü\82¹\82ñ\81B"
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "\83G\83\93\83R\81[\83f\83B\83\93\83O\83G\83\89\81[\82É\82æ\82è\8fî\95ñ\82ª\8e¸\82í\82ê\82Ä\82¢\82Ü\82·\81B(\97¼\91¤\82Ì\83t\83@\83C\83\8b)"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr "\83G\83\93\83R\81[\83f\83B\83\93\83O\83G\83\89\81[\82É\82æ\82è\8fî\95ñ\82ª\8e¸\82í\82ê\82Ä\82¢\82Ü\82·\81B(\88ê\94Ô\96Ú\82Ì\83t\83@\83C\83\8b)"
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr "\83G\83\93\83R\81[\83f\83B\83\93\83O\83G\83\89\81[\82É\82æ\82è\8fî\95ñ\82ª\8e¸\82í\82ê\82Ä\82¢\82Ü\82·\81B(\93ñ\94Ô\96Ú\82Ì\83t\83@\83C\83\8b)"
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr "\83G\83\93\83R\81[\83f\83B\83\93\83O\83G\83\89\81[\82É\82æ\82è\8fî\95ñ\82ª\8e¸\82í\82ê\82Ä\82¢\82Ü\82·\81B(\8eO\94Ô\96Ú\82Ì\83t\83@\83C\83\8b)"
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "\8d·\88Ù\82Í\82 \82è\82Ü\82¹\82ñ"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "\8ds\82Ì\8d·\88Ù"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "%1\8cÂ\82Ì\95¶\8e\9a\97ñ\82ð\92u\8a·\82µ\82Ü\82µ\82½"
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "\95¶\8e\9a\97ñ\"%s\"\82ª\8c\9f\8dõ\82Å\82«\82Ü\82¹\82ñ"
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "\83t\83\8b\83p\83X\82ð\83R\83s\81[\82µ\82Ü\82·"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "\83t\83@\83C\83\8b\96¼\82ð\83R\83s\81[\82µ\82Ü\82·"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr "\83}\81[\83W\83\82\81[\83h\82É\93ü\82è\82Ü\82·\81B\83}\81[\83W\83\82\81[\83h\82Í\83J\81[\83\\83\8b\83L\81[\82Ì\82Ý\82Å\83}\81[\83W\82µ\82½\82è\81A\8e\9f\82â\91O\82Ì\8d·\88Ù\82É\88Ú\93®\82Å\82«\82é\83\82\81[\83h\82Å\82·\81B\83}\81[\83W\83\82\81[\83h\82ð\83I\83t\82É\82µ\82½\82¢\8fê\8d\87\82Í\81AF9\83L\81[\82ð\89\9f\82µ\82Ä\82­\82¾\82³\82¢\81B"
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Location Pane"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Diff Pane"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "\83p\83b\83`\83t\83@\83C\83\8b\82Ì\8f\91\82«\8d\9e\82Ý\82É\90¬\8c÷\82µ\82Ü\82µ\82½\81B"
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. \8d\80\96Ú\82ª\82Ý\82Â\82©\82ç\82È\82¢\82©\81A\83t\83H\83\8b\83_\82Å\82·!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. \8d\80\96Ú\82ª\82Ý\82Â\82©\82ç\82È\82¢\82©\81A\83t\83H\83\8b\83_\82Å\82·!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "\8fo\97Í\8c\8b\89Ê\83t\83@\83C\83\8b\82Í\8aù\82É\91¶\8dÝ\82µ\82Ü\82·\81B \8fã\8f\91\82«\82µ\82Ü\82·\82©?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 \8cÂ\82Ì\83t\83@\83C\83\8b\82ª\91I\91ð\82³\82ê\82Ä\82¢\82Ü\82·]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "\83m\81[\83}\83\8b"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "\83R\83\93\83e\83L\83X\83g"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "\83\86\83j\83t\83@\83C\83h"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "\83t\83@\83C\83\8b %1\82É\8f\91\82«\8d\9e\82ß\82Ü\82¹\82ñ\81B"
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "\8ew\92è\82µ\82½\8fo\97Í\83p\83X\82Í\81A\90â\91Î\83p\83X\82Å\82Í\82 \82è\82Ü\82¹\82ñ: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "\8fo\97Í\83p\83X\82ð\8ew\92è\82µ\82Ä\82­\82¾\82³\82¢"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "\83o\83C\83i\83\8a\83t\83@\83C\83\8b\82©\82ç\83p\83b\83`\83t\83@\83C\83\8b\82Í\90¶\90¬\82Å\82«\82Ü\82¹\82ñ\81B"
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "\83t\83H\83\8b\83_\82©\82ç\83p\83b\83`\83t\83@\83C\83\8b\82Í\90¶\90¬\82Å\82«\82Ü\82¹\82ñ\81B"
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5388,17 +5368,17 @@ msgstr ""
 "\n"
 "\83p\83b\83`\90¶\90¬\82É\82Í\81A\95Ï\8dX\82ª\91S\82Ä\95Û\91¶\82³\82ê\82Ä\82¢\82é\95K\97v\82ª\82 \82è\82Ü\82·\81B"
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "\83t\83H\83\8b\83_\82Í\91¶\8dÝ\82µ\82Ü\82¹\82ñ\81B"
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "\8c»\8dÝ\82Ì\83t\83H\83\8b\83_\94ä\8ar\8c\8b\89Ê\82Í\83N\83\8a\83A\82³\82ê\82Ü\82·\81B"
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5409,7 +5389,7 @@ msgstr ""
 "\83A\81[\83J\83C\83u\83T\83|\81[\83g\82Ì\88×\82É\95K\97v\82È\83R\83\93\83|\81[\83l\83\93\83g(7-zip \82Æ Merge7z*.dll) \82ª\8c©\82Â\82©\82è\82Ü\82¹\82ñ\81B\n"
 "\83A\81[\83J\83C\83u\83T\83|\81[\83g\82Æ\82»\82ê\82ð\97L\8cø\82É\82·\82é\95û\96@\82É\82Â\82¢\82Ä\82Ì\8fî\95ñ\82Í\81A\83}\83j\83\85\83A\83\8b\82ð\8eQ\8fÆ\82µ\82Ä\82­\82¾\82³\82¢\81B"
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5418,7 +5398,7 @@ msgstr ""
 "\n"
 "\92\8d\88Ó: 7-Zip \93\9d\8d\87\82Í\81AWinMerge\82Ì\90Ý\92è\82É\82æ\82è\96³\8cø\82É\82È\82Á\82Ä\82¢\82Ü\82·\81B"
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5427,37 +5407,37 @@ msgstr ""
 "\n"
 "\92\8d\88Ó: 7-Zip \93\9d\8d\87\82Í\81AWinMerge\82Ì\90Ý\92è\82É\82æ\82è\83X\83^\83\93\83h\83A\83\8d\83\93\91\80\8dì\82É\90§\8cÀ\82³\82ê\82Ä\82¢\82Ü\82·\81B"
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "\83G\83N\83X\83|\81[\83g\82·\82é\83t\83@\83C\83\8b\82ð\8ew\92è\82µ\82Ä\82­\82¾\82³\82¢"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "\83C\83\93\83|\81[\83g\82·\82é\83t\83@\83C\83\8b\82ð\91I\91ð\82µ\82Ä\82­\82¾\82³\82¢"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "\90Ý\92è\8fî\95ñ\82ª\83t\83@\83C\83\8b\82©\82ç\83C\83\93\83|\81[\83g\82³\82ê\82Ü\82µ\82½\81B"
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "\90Ý\92è\8fî\95ñ\82ð\83t\83@\83C\83\8b\82É\83G\83N\83X\83|\81[\83g\82µ\82Ü\82µ\82½\81B"
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "\83t\83@\83C\83\8b\82©\82ç\90Ý\92è\8fî\95ñ\82Ì\83C\83\93\83|\81[\83g\82É\8e¸\94s\82µ\82Ü\82µ\82½\81B"
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "\83t\83@\83C\83\8b\82Ö\82Ì\90Ý\92è\8fî\95ñ\82Ì\8f\91\82«\8d\9e\82Ý\82É\8e¸\94s\82µ\82Ü\82µ\82½\81B"
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5468,242 +5448,242 @@ msgstr ""
 "\n"
 "\91±\8ds\82µ\82Ü\82·\82©?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "\90³\8bK\95\\8c»\83G\83\89\81["
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "\83}\83b\83`\82µ\82Ü\82¹\82ñ"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "\96³\8cø\82È\90³\8bK\95\\8c»\82Å\82·"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "\96³\8cø\82È\8fÆ\8d\87\95¶\8e\9a\82Å\82·"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "\96³\8cø\82È\83L\83\83\83\89\83N\83^\83N\83\89\83X\96¼\82Å\82·"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "\\ \82Å\8fI\82í\82Á\82Ä\82¢\82Ü\82·"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "\96³\8cø\82È\8cã\95û\8eQ\8fÆ\89\89\8eZ\8eq\82Å\82·"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "[ \82© [^ \82Ì\91Î\89\9e\82ª\82Æ\82ê\82Ä\82¢\82Ü\82¹\82ñ"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "( \82© \\( \82Ì\91Î\89\9e\82ª\82Æ\82ê\82Ä\82¢\82Ü\82¹\82ñ"
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "\\{ \82Ì\91Î\89\9e\82ª\82Æ\82ê\82Ä\82¢\82Ü\82¹\82ñ"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "\\{\\} \82Ì\93à\97e\82ª\96³\8cø\82Å\82·"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "\96³\8cø\82È\94Í\88Í\82Ì\8fI\97¹\88Ê\92u\82Å\82·"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "\83\81\83\82\83\8a\82ª\95s\91«\82µ\82Ä\82¢\82Ü\82·"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "\8cJ\82è\95Ô\82µ\89\89\8eZ\8eq\82ª\96³\8cø\82È\88Ê\92u\82É\82 \82è\82Ü\82·"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "\90³\8bK\95\\8c»\82ª\88Ù\8fí\82Å\82·"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "\90³\8bK\95\\8c»\82ª\91å\82«\82·\82¬\82Ü\82·"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr ") \82© \\) \82Ì\91Î\89\9e\82ª\82Æ\82ê\82Ä\82¢\82Ü\82¹\82ñ"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Mixed"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "\83^\83C\83v"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "\93W\8aJ\83v\83\89\83O\83C\83\93"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr "\94ä\8ar\91O\8f\88\97\9d\83v\83\89\83O\83C\83\93"
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "\83G\83f\83B\83^\83X\83N\83\8a\83v\83g"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "\8d¶\91¤\82Ì\83t\83@\83C\83\8b\82ð\95Û\91¶\82µ\82Ü\82·"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr "\92\86\89\9b\82Ì\83t\83@\83C\83\8b\82ð\95Û\91¶\82µ\82Ü\82·"
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "\89E\91¤\82Ì\83t\83@\83C\83\8b\82ð\95Û\91¶\82µ\82Ü\82·"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "\8d¶\91¤\82Ì\83t\83@\83C\83\8b\82ð\96¼\91O\82ð\95t\82¯\82Ä\95Û\91¶\82µ\82Ü\82·..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr "\92\86\89\9b\82Ì\83t\83@\83C\83\8b\82ð\96¼\91O\82ð\95t\82¯\82Ä\95Û\91¶\82µ\82Ü\82·..."
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "\89E\91¤\82Ì\83t\83@\83C\83\8b\82ð\96¼\91O\82ð\95t\82¯\82Ä\95Û\91¶\82µ\82Ü\82·..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr "\8d¶\91¤\83t\83@\83C\83\8b/\83t\83H\83\8b\83_\82Ì\93Ç\82Ý\8eæ\82è\90ê\97p\8fó\91Ô\82ð\95Ï\8dX\82·\82é"
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr "\92\86\89\9b\83t\83@\83C\83\8b/\83t\83H\83\8b\83_\82Ì\93Ç\82Ý\8eæ\82è\90ê\97p\8fó\91Ô\82ð\95Ï\8dX\82·\82é"
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr "\89E\91¤\83t\83@\83C\83\8b/\83t\83H\83\8b\83_\82Ì\93Ç\82Ý\8eæ\82è\90ê\97p\8fó\91Ô\82ð\95Ï\8dX\82·\82é"
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "EOL\82ðWindows\83^\83C\83v\82É\95Ï\8a·\82µ\82Ü\82·"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "EOL\82ðUnix\83^\83C\83v\82É\95Ï\8a·\82µ\82Ü\82·"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "EOL\82ðMac\83^\83C\83v\82É\95Ï\8a·\82µ\82Ü\82·"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "\8c»\8dÝ\82Ì\83\82\81[\83h\82©\82ç\95Ò\8fW\83\82\81[\83h\82Ü\82½\82Í\83}\81[\83W\83\82\81[\83h\82ð\90Ø\82è\91Ö\82¦\82Ü\82·"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5712,12 +5692,12 @@ msgstr ""
 "\83t\83@\83C\83\8b\83G\83\93\83R\81[\83f\83B\83\93\83O\8fî\95ñ\82Ì\95\\8e¦\82Æ\90Ý\92è\82ð\8ds\82¢\82Ü\82·\81B\n"
 "\83t\83@\83C\83\8b\83G\83\93\83R\81[\83f\83B\83\93\83O\83v\83\8d\83p\83e\83B"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "\83R\83\93\83t\83\8a\83N\83g\83t\83@\83C\83\8b\82ð\8aJ\82¢\82Ä\8b£\8d\87\82ð\89ð\8fÁ\82µ\82Ü\82·"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5726,7 +5706,7 @@ msgstr ""
 "\8c»\8dÝ\8ds\82Ì\8d·\88Ù\95\94\95ª\82ð\91I\91ð\82µ\82Ü\82·\n"
 "\8c»\8dÝ\82Ì\8ds\93à\8d·\88Ù"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5735,7 +5715,7 @@ msgstr ""
 "\8ew\92è\82µ\82½\8ds\82Ü\82½\82Í\81A\8d·\88Ù\82Ö\88Ú\93®\82µ\82Ü\82·\n"
 "\88Ú\93®(Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5744,7 +5724,7 @@ msgstr ""
 "\83v\83\8d\83O\83\89\83\80\83I\83v\83V\83\87\83\93\82ð\90Ý\92è\82µ\82Ü\82·\n"
 "\83I\83v\83V\83\87\83\93"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5753,37 +5733,37 @@ msgstr ""
 "\8dÅ\90V\82Ì\8fî\95ñ\82É\8dX\90V\82µ\82Ü\82·\n"
 "\95\\8e¦\8dX\90V (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "\91I\91ð\82³\82ê\82½\8ds\82Ì\90æ\93ª\82É\8ds\94Ô\8d\86\82ð\95t\89Á\82µ\82Ä\83N\83\8a\83b\83v\83{\81[\83h\82Ö\83R\83s\81[\82µ\82Ü\82·"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr "\91I\91ð\82µ\82½\8d\80\96Ú\82ð\8dÅ\90V\82Ì\8fó\91Ô\82É\8dX\90V\82·\82é"
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "\83u\83b\83N\83}\81[\83N\82Ì\8dì\90¬\81E\8dí\8f\9c\82ð\8ds\82¢\82Ü\82·"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "\8e\9f\82Ì\83u\83b\83N\83}\81[\83N\82É\88Ú\93®\82µ\82Ü\82·"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "\91O\82Ì\83u\83b\83N\83}\81[\83N\82É\88Ú\93®\82µ\82Ü\82·"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "\91S\82Ä\82Ì\83u\83b\83N\83}\81[\83N\82ð\8dí\8f\9c\82µ\82Ü\82·"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5792,7 +5772,7 @@ msgstr ""
 "\90³\8am\82É\88ê\92v\82µ\82Ä\82¢\82é\8d\80\96Ú\82ð\95\\8e¦\82µ\82Ü\82·\n"
 "\93¯\88ê\8d\80\96Ú\82Ì\95\\8e¦"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5801,7 +5781,7 @@ msgstr ""
 "\8d·\88Ù\82Ì\82 \82é\8d\80\96Ú\82ð\95\\8e¦\82µ\82Ü\82·\n"
 "\8d·\88Ù\8d\80\96Ú\82Ì\95\\8e¦"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5810,7 +5790,7 @@ msgstr ""
 "\89E\91¤\82É\82Ì\82Ý\91¶\8dÝ\82·\82é\8d\80\96Ú\82ð\95\\8e¦\82µ\82Ü\82·\n"
 "\8d¶\82Ì\82Ý\82É\91¶\8dÝ\82·\82é\8d\80\96Ú\82Ì\95\\8e¦"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5819,7 +5799,7 @@ msgstr ""
 "\89E\91¤\82É\82Ì\82Ý\91¶\8dÝ\82·\82é\8d\80\96Ú\82ð\95\\8e¦\82µ\82Ü\82·\n"
 "\89E\82Ì\82Ý\82É\91¶\8dÝ\82·\82é\8d\80\96Ú\82Ì\95\\8e¦"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5828,7 +5808,7 @@ msgstr ""
 "\83o\83C\83i\83\8a\83t\83@\83C\83\8b\82ð\95\\8e¦\82µ\82Ü\82·\n"
 "\83o\83C\83i\83\8a\83t\83@\83C\83\8b\82Ì\95\\8e¦"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5837,7 +5817,7 @@ msgstr ""
 "\83X\83L\83b\83v\82³\82ê\82½\8d\80\96Ú\82ð\95\\8e¦\82µ\82Ü\82·\n"
 "\83X\83L\83b\83v\82³\82ê\82½\8d\80\96Ú\82Ì\95\\8e¦"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5846,7 +5826,7 @@ msgstr ""
 "\95\\8e¦\82Ì\82½\82ß\82Ì\83t\83H\83\93\83g\82ð\91I\91ð\82µ\82Ü\82·\n"
 "\95\\8e¦\83t\83H\83\93\83g\91I\91ð"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5855,27 +5835,27 @@ msgstr ""
 "\95\\8e¦\83t\83H\83\93\83g\82ð\83f\83t\83H\83\8b\83g\83V\83X\83e\83\80\83t\83H\83\93\83g\82É\96ß\82µ\82Ü\82·\n"
 "\83f\83t\83H\83\8b\83g\83t\83H\83\93\83g"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "\8bó\94\92\95¶\8e\9a\82ð\95\\8e¦\82µ\82Ü\82·"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Diff\83y\83C\83\93\82Ì\95\\8e¦/\94ñ\95\\8e¦\82ð\90Ø\82è\91Ö\82¦\82Ü\82·"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "\83\8d\83P\81[\83V\83\87\83\93\83y\83C\83\93\82Í\83t\83@\83C\83\8b\82Ì\93à\97e\91S\91Ì\82ð\83s\83N\83`\83\83\82Æ\82µ\82Ä\95\\8e¦\82µ\82Ü\82·"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "\83t\83H\83\8b\83_\94ä\8ar\93\9d\8cv\83_\83C\83A\83\8d\83O\82ð\95\\8e¦\82µ\82Ü\82·\81B"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5884,7 +5864,7 @@ msgstr ""
 "\8c»\8dÝ\82Ì\83\86\81[\83U\81[\83C\83\93\83^\81[\83t\83F\81[\83X\8c¾\8cê\82ð\91I\91ð\82µ\82Ü\82·\n"
 "\8c¾\8cê"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5893,12 +5873,12 @@ msgstr ""
 "\8ds\93à\82Ì\8d·\88Ù\82ð\90F\82ð\95Ï\82¦\82Ä\95\\8e¦\82µ\82Ü\82·\n"
 "\8ds\93à\82Ì\8d·\88Ù\82ð\95\\8e¦"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "2\82Â\82Ì\83y\83C\83\93\82Ì\88Ê\92u\82ð\8cð\8a·\82µ\82Ü\82·"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5907,7 +5887,7 @@ msgstr ""
 "\8ds\94Ô\8d\86\82ð\95\\8e¦\82µ\82Ü\82·\n"
 "\8ds\94Ô\8d\86\82ð\95\\8e¦"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5916,7 +5896,7 @@ msgstr ""
 "\8ds\82ð\89E\92[\82Å\90Ü\82è\95Ô\82µ\82Ü\82·\81B\n"
 "\8ds\82ð\89E\92[\82Å\90Ü\95Ô\82·"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5925,22 +5905,22 @@ msgstr ""
 "\97¼\91¤\82Ì\83y\83C\83\93\82É\83Z\83\8c\83N\83V\83\87\83\93\83}\81[\83W\83\93\82ð\95\\8e¦\82µ\82Ü\82·\81B\n"
 "\83Z\83\8c\83N\83V\83\87\83\93\83}\81[\83W\83\93\82Ì\95\\8e¦"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "\83e\83L\83X\83g\83T\83C\83Y\82ð\91å\82«\82­\82·\82é"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "\83e\83L\83X\83g\83T\83C\83Y\82ð\8f¬\82³\82­\82·\82é"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "\8ag\91å\82µ\82½\83t\83H\83\93\83g\82ð\83f\83t\83H\83\8b\83g\83T\83C\83Y\82É\83\8a\83Z\83b\83g\82µ\82Ü\82·"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5949,7 +5929,7 @@ msgstr ""
 "\91O\82Ì\8d·\88Ù\82Ö\88Ú\93®\82µ\82Ü\82·\n"
 "\91O\82Ì\8d·\88Ù (Alt+Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5958,7 +5938,7 @@ msgstr ""
 "\8e\9f\82Ì\8d·\88Ù\82Ö\88Ú\93®\82µ\82Ü\82·\n"
 "\8e\9f\82Ì\8d·\88Ù (Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid ""
 "Scroll to the previous difference between left and middle\n"
@@ -5967,7 +5947,7 @@ msgstr ""
 "\91O\82Ì\8d¶\91¤\82Æ\92\86\89\9b\82Ì\8d·\88Ù\82Ö\88Ú\93®\82µ\82Ü\82·\n"
 "\91O\82Ì\8d¶\91¤\82Æ\92\86\89\9b\82Ì\8d·\88Ù(Alt+Shift+1)"
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid ""
 "Scroll to the next difference between left and middle\n"
@@ -5976,7 +5956,7 @@ msgstr ""
 "\8e\9f\82Ì\8d¶\91¤\82Æ\92\86\89\9b\82Ì\8d·\88Ù\82Ö\88Ú\93®\82µ\82Ü\82·\n"
 "\8e\9f\82Ì\8d¶\91¤\82Æ\92\86\89\9b\82Ì\8d·\88Ù(Alt+1)"
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid ""
 "Scroll to the previous difference between left and right\n"
@@ -5985,7 +5965,7 @@ msgstr ""
 "\91O\82Ì\8d¶\91¤\82Æ\89E\91¤\82Ì\8d·\88Ù\82Ö\88Ú\93®\82µ\82Ü\82·\n"
 "\91O\82Ì\8d¶\91¤\82Æ\89E\91¤\82Ì\8d·\88Ù(Alt+Shift+2)"
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid ""
 "Scroll to the next difference between left and right\n"
@@ -5994,7 +5974,7 @@ msgstr ""
 "\8e\9f\82Ì\8d¶\91¤\82Æ\89E\91¤\82Ì\8d·\88Ù\82Ö\88Ú\93®\82µ\82Ü\82·\n"
 "\8e\9f\82Ì\8d¶\91¤\82Æ\89E\91¤\82Ì\8d·\88Ù(Alt+2)"
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid ""
 "Scroll to the previous difference between middle and right\n"
@@ -6003,7 +5983,7 @@ msgstr ""
 "\91O\82Ì\92\86\89\9b\82Æ\89E\91¤\82Ì\8d·\88Ù\82Ö\88Ú\93®\82µ\82Ü\82·\n"
 "\91O\82Ì\92\86\89\9b\82Æ\89E\91¤\82Ì\8d·\88Ù(Alt+Shift+3)"
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid ""
 "Scroll to the next difference between middle and Difference\n"
@@ -6012,7 +5992,7 @@ msgstr ""
 "\8e\9f\82Ì\92\86\89\9b\82Æ\89E\91¤\82Ì\8d·\88Ù\82Ö\88Ú\93®\82µ\82Ü\82·\n"
 "\8e\9f\82Ì\92\86\89\9b\82Æ\89E\91¤\82Ì\8d·\88Ù(Alt+3)"
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid ""
 "Scroll to the previous left only difference\n"
@@ -6021,7 +6001,7 @@ msgstr ""
 "\91O\82Ì\8d¶\91¤\82Ì\82Ý\82Ì\8d·\88Ù\82Ö\88Ú\93®\82µ\82Ü\82·\n"
 "\91O\82Ì\8d¶\91¤\82Ì\82Ý\82Ì\8d·\88Ù(Alt+Shift+7)"
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid ""
 "Scroll to the next left only difference\n"
@@ -6030,7 +6010,7 @@ msgstr ""
 "\8e\9f\82Ì\8d¶\91¤\82Ì\82Ý\82Ì\8d·\88Ù\82Ö\88Ú\93®\82µ\82Ü\82·\n"
 "\8e\9f\82Ì\8d¶\91¤\82Ì\82Ý\82Ì\8d·\88Ù(Alt+7)"
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid ""
 "Scroll to the previous middle only difference\n"
@@ -6039,7 +6019,7 @@ msgstr ""
 "\91O\82Ì\92\86\89\9b\82Ì\82Ý\82Ì\8d·\88Ù\82Ö\88Ú\93®\82µ\82Ü\82·\n"
 "\91O\82Ì\92\86\89\9b\82Ì\82Ý\82Ì\8d·\88Ù(Alt+Shift+8)"
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid ""
 "Scroll to the next middle only difference\n"
@@ -6048,7 +6028,7 @@ msgstr ""
 "\8e\9f\82Ì\92\86\89\9b\82Ì\82Ý\82Ì\8d·\88Ù\82Ö\88Ú\93®\82µ\82Ü\82·\n"
 "\8e\9f\82Ì\92\86\89\9b\82Ì\82Ý\82Ì\8d·\88Ù(Alt+8)"
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid ""
 "Scroll to the previous right only difference\n"
@@ -6057,7 +6037,7 @@ msgstr ""
 "\91O\82Ì\89E\91¤\82Ì\82Ý\82Ì\8d·\88Ù\82Ö\88Ú\93®\82µ\82Ü\82·\n"
 "\91O\82Ì\89E\91¤\82Ì\82Ý\82Ì\8d·\88Ù(Alt+Shift+9)"
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid ""
 "Scroll to the next right only difference\n"
@@ -6066,7 +6046,7 @@ msgstr ""
 "\8e\9f\82Ì\89E\91¤\82Ì\82Ý\82Ì\8d·\88Ù\82Ö\88Ú\93®\82µ\82Ü\82·\n"
 "\8e\9f\82Ì\89E\91¤\82Ì\82Ý\82Ì\8d·\88Ù(Alt+9)"
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -6075,7 +6055,7 @@ msgstr ""
 "\8dÅ\8f\89\82Ì\8d·\88Ù\82É\88Ú\93®\82µ\82Ü\82·\n"
 "\8dÅ\8f\89\82Ì\8d·\88Ù (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6084,7 +6064,7 @@ msgstr ""
 "\8c»\8dÝ\82Ì\8d·\88Ù\82É\88Ú\93®\82µ\82Ü\82·\n"
 "\8c»\8dÝ\82Ì\8d·\88Ù (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6093,7 +6073,7 @@ msgstr ""
 "\8dÅ\8cã\82Ì\8d·\88Ù\82É\88Ú\93®\82µ\82Ü\82·\n"
 "\8dÅ\8cã\82Ì\8d·\88Ù (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6102,7 +6082,7 @@ msgstr ""
 "\91I\91ð\82³\82ê\82½\83e\83L\83X\83g\82ð\89E\82Ì\83t\83@\83C\83\8b\82É\83R\83s\81[\82µ\82Ü\82·\n"
 "\89E\82Ö\83R\83s\81[ (Alt+Right)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6111,7 +6091,7 @@ msgstr ""
 "\91I\91ð\82³\82ê\82½\83e\83L\83X\83g\82ð\8d¶\82Ì\83t\83@\83C\83\8b\82É\83R\83s\81[\82µ\82Ü\82·\n"
 "\8d¶\82Ö\83R\83s\81[ (Alt+Left)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6120,7 +6100,7 @@ msgstr ""
 "\8d·\88Ù\82ð\89E\82É\83R\83s\81[\82µ\81A\8e\9f\82Ì\8d·\88Ù\82É\90i\82Ý\82Ü\82·\n"
 "\89E\82É\83R\83s\81[\82µ\8e\9f\82Ö (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6129,7 +6109,7 @@ msgstr ""
 "\8d·\88Ù\82ð\8d¶\82É\83R\83s\81[\82µ\81A\8e\9f\82Ì\8d·\88Ù\82É\90i\82Ý\82Ü\82·\n"
 "\8d¶\82É\83R\83s\81[\82µ\8e\9f\82Ö (Ctrl+Alt+Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6138,7 +6118,7 @@ msgstr ""
 "\82·\82×\82Ä\82Ì\8d·\88Ù\82ð\89E\82Ì\83t\83@\83C\83\8b\82É\83R\83s\81[\82µ\82Ü\82·\n"
 "\89E\82·\82×\82Ä"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6147,77 +6127,77 @@ msgstr ""
 "\82·\82×\82Ä\82Ì\8d·\88Ù\82ð\8d¶\82Ì\83t\83@\83C\83\8b\82É\83R\83s\81[\82µ\82Ü\82·\n"
 "\8d¶\82·\82×\82Ä"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "\97¼\91¤\82Ì\83t\83H\83\8b\83_\82©\82ç\91I\91ð\82³\82ê\82½\8d\80\96Ú\82ð\8dí\8f\9c\82µ\82Ü\82·"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "\91I\91ð\82³\82ê\82½\8d\80\96Ú\82ð\94ä\8ar\82µ\82Ü\82· (\95¡\90\94\82Ì\8d\80\96Ú\82ª\91I\91ð\82³\82ê\82Ä\82¢\82½\8fê\8d\87\81A\8dÅ\8f\89\82Ì\8d\80\96Ú\82ð\94ä\8ar\82µ\82Ü\82·)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "\83t\83H\83\8b\83_\94ä\8ar\95\\8e¦\82Ì\97ñ\82ð\91I\91ð\82Ü\82½\82Í\95À\82×\91Ö\82¦\82Ü\82·"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "\83p\83b\83`\83t\83@\83C\83\8b\90¶\90¬\82µ\82Ü\82·"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "\83t\83B\83\8b\83^\82Ì\91I\91ð\82Æ\95Ï\8dX\82ð\82µ\82Ü\82·"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "\94ä\8ar\8c\8b\89Ê\82©\82ç\83\8c\83|\81[\83g\82ð\90¶\90¬\82µ\82Ü\82·"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "\97\98\97p\89Â\94\\82È\83v\83\89\83O\83C\83\93\82Ì\83\8a\83X\83g\82ð\95\\8e¦\82µ\82Ü\82·"
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "\93W\8aJ\83v\83\89\83O\83C\83\93\82ð\83\86\81[\83U\81[\82ª\91I\91ð\82µ\82Ü\82· (\83t\83H\83\8b\83_\94ä\8ar\82Ì\82Æ\82«\82Í\93W\8aJ\82µ\82Ü\82¹\82ñ)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "\8e©\93®\93I\82É\93W\8aJ\83v\83\89\83O\83C\83\93\82ð\91I\91ð\82µ\81A\97¼\91¤\82Ì\83t\83@\83C\83\8b\82É\93K\97p\82µ\82Ü\82· (\82Ç\82¿\82ç\82©\82Ì\83t\83@\83C\83\8b\82É\82Í\81A\8ag\92£\8eq\82ª\95K\97v\82Å\82·)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "\82±\82Ì\83t\83@\83C\83\8b\82ð\95Ò\8fW\82·\82é\82½\82ß\82Ì\93W\8aJ\83v\83\89\83O\83C\83\93\82ð\91I\91ð\82µ\82Ü\82·"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "\94ä\8ar\91O\8f\88\97\9d\83v\83\89\83O\83C\83\93\82ð\8eg\97p\82µ\82È\82¢ (\95W\8f\80)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "\8aÖ\98A\82·\82é\83v\83\89\83O\83C\83\93"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "\82»\82Ì\91¼\82Ì\83v\83\89\83O\83C\83\93"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "\91S\82Ä\82Ì\83v\83\89\83O\83C\83\93\82ð\8dÄ\93Ç\8d\9e\82Ý\82µ\82Ü\82· (\8aJ\94­\8eÒ\97p)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6226,12 +6206,12 @@ msgstr ""
 "\8e\9f\82Ì\83t\83@\83C\83\8b\82ð\83A\83N\83e\83B\83u\82É\82µ\82Ü\82·\n"
 "\8e\9f\82Ì\83t\83@\83C\83\8b\82ð\91I\91ð"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "\8aJ\82¢\82Ä\82¢\82é\91S\82Ä\82Ì\83E\83C\83\93\83h\83E\82ð\95Â\82¶\82Ü\82·"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6240,22 +6220,22 @@ msgstr ""
 "WinMerge\83w\83\8b\83v\82ð\8aJ\82­\n"
 "WinMerge\83w\83\8b\83v"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "\8c»\8dÝ\82Ì WinMerge \82Ì\83o\81[\83W\83\87\83\93\8fî\95ñ\82Æ\90Ý\92è\82ð\83e\83L\83X\83g\83t\83@\83C\83\8b\82É\8fo\97Í\82µ\82Ü\82·"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "GNU General Public License\82ð\95\\8e¦\82µ\82Ü\82·"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Private Build: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6264,7 +6244,7 @@ msgstr ""
 "\83\8a\83\8a\81[\83X\83m\81[\83g\82ð\8aJ\82­\n"
 "\83\8a\83\8a\81[\83X\83m\81[\83g"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6273,272 +6253,272 @@ msgstr ""
 "\96|\96ó\8fó\8bµ Web\83T\83C\83g\82ð\8aJ\82«\82Ü\82·\n"
 "\96|\96ó"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "\83v\83\89\83O\83C\83\93\90Ý\92è"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "\94ä\8ar\91O\8f\88\97\9d\83v\83\89\83O\83C\83\93\82ð\8eg\97p\82µ\82Ü\82¹\82ñ"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "\89Â\94\\82È\82ç\82Î\94ä\8ar\91O\8f\88\97\9d\82ð\8ds\82È\82¢\82Ü\82·"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH \82ª\82Ý\82Â\82©\82è\82Ü\82¹\82ñ - .sct \83X\83N\83\8a\83v\83g\82Í\96³\8cø\89»\82³\82ê\82Ü\82µ\82½"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<\82È\82µ>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<\8e©\93®>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "\93o\98^\82³\82ê\82½\83A\83v\83\8a\83P\81[\83V\83\87\83\93\82Å\83t\83@\83C\83\8b\82ð\8aJ\82«\82Ü\82·"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "\8aO\95\94\83G\83f\83B\83^\82Å\83t\83@\83C\83\8b\82ð\8aJ\82«\82Ü\82·"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "\93Á\92è\82Ì\83v\83\8d\83O\83\89\83\80\82Å\8aJ\82«\82Ü\82·"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "\88Ú\93®\83u\83\8d\83b\83N\82ð\95\\8e¦\82µ\82Ü\82¹\82ñ"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "\91S\82Ä\82Ì\88Ú\93®\83u\83\8d\83b\83N\82ð\95\\8e¦\82µ\82Ü\82·"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "\8c»\8dÝ\82Ì\8d·\88Ù\82É\91Î\89\9e\82·\82é\88Ú\93®\83u\83\8d\83b\83N\82Ì\82Ý\82ð\95\\8e¦\82µ\82Ü\82·"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "\83J\81[\83\\83\8b\92¼\89º\82Ì\8d·\88Ù\82Ö\88Ú\93®\82µ\82Ü\82·"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "\8d·\88Ù%1/%2\82É\88Ú\93®(&O)"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "\8ds%1\82É\88Ú\93®(&O)"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "\96³\8cø"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "\83t\83@\83C\83\8b\83V\83X\83e\83\80"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "\8dÅ\8bß\8eg\82Á\82½\83\8a\83X\83g"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "\83n\83C\83\89\83C\83g\82È\82µ"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Batch"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Portable Object(.po)"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Resources"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr "Verilog"
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "\83c\81[\83\8b\83o\81[\82ð\94ñ\95\\8e¦\82É\82µ\82Ü\82·"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "\8f¬\82³\82¢\83A\83C\83R\83\93\82Ì\83c\81[\83\8b\83o\81[\82ð\95\\8e¦\82µ\82Ü\82·"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "\91å\82«\82¢\83A\83C\83R\83\93\82Ì\83c\81[\83\8b\83o\81[\82ð\95\\8e¦\82µ\82Ü\82·"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr "frhed(http://frhed.sourceforge.net/) \82ª\83C\83\93\83X\83g\81[\83\8b\82³\82ê\82Ä\82¢\82Ü\82¹\82ñ"

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index a2c7bca..3a5e63c 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -1031,7 +1031,7 @@ msgid "&Scripts"
 msgstr "½ºÅ©¸³Æ®(&S)"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< ºñ¾î ÀÖÀ½ >"
@@ -1472,7 +1472,7 @@ msgid "&Versioning System:"
 msgstr "Çü»ó °ü¸® ½Ã½ºÅÛ(&V) :"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "cleartool.exe °æ·Î(&P) :"
@@ -1673,7 +1673,7 @@ msgid "Replace &All"
 msgstr "¸ðµÎ ¹Ù²Ù±â(&A)"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2583,7 +2583,7 @@ msgid "Files:"
 msgstr "ÆÄÀÏ:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "´Ù¸§"
@@ -2620,7 +2620,7 @@ msgid "Right:"
 msgstr "¿À¸¥ÂÊ:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "µ¿ÀÏ"
@@ -2820,7 +2820,7 @@ msgid "A&ppend timestamp"
 msgstr "ÆÄÀÏ ½Ã°£ Ãß°¡(&P)"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "º¹»ç È®ÀÎ"
@@ -2898,7 +2898,7 @@ msgstr ""
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "µð·ºÅ丮"
@@ -3538,7 +3538,7 @@ msgid "Version Control"
 msgstr "Çü»ó °ü¸®"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Â÷ÀÌÁ¡"
@@ -3667,87 +3667,67 @@ msgstr "XML 
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Àüü ³»¿ë ºñ±³"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "ºü¸¥ ³»¿ë ºñ±³"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "º¯°æµÈ ³¯Â¥"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "º¯°æµÈ ³¯Â¥ ¹× ÆÄÀÏ Å©±â"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "ÆÄÀÏ Å©±â"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "À̸§"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "°æ·Î"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "ÇÊÅÍ"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "¼³¸í"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "»ý¼ºÇÒ ÇÊÅÍÀÇ ÆÄÀϸíÀ» ÀÔ·ÂÇϽʽÿÀ."
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "ÆÄÀÏ ÇÊÅÍ (*.flt)|*.flt|¸ðµç ÇÊÅÍ (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3759,7 +3739,7 @@ msgstr ""
 "\n"
 "%1 ÆÄÀÏÀ» WinMerge/Filters -Æú´õ·Î º¹»çÇϽʽÿÀ."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3772,7 +3752,7 @@ msgstr ""
 "\n"
 "Æú´õ°¡ Á¸ÀçÇÏ°í ¾²±â °¡´ÉÀÎÁö È®ÀÎÇϽʽÿÀ."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3783,7 +3763,7 @@ msgstr ""
 "\n"
 "¼³Á¤/½Ã½ºÅÛ ¸Þ´º¿¡¼­ ÇÊÅÍ Æú´õ¸¦ ¼±ÅÃÇϽʽÿÀ."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3796,12 +3776,12 @@ msgstr ""
 "\n"
 "Ȥ½Ã Àбâ Àü¿ë ÆÄÀÏÀÌ ¾Æ´Ñ°¡¿ä?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "¼³Ä¡ÇÒ ÇÊÅÍ ÆÄÀÏ À§Ä¡"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3812,258 +3792,258 @@ msgstr ""
 "\n"
 "»õ ÇÊÅÍ ÆÄÀÏÀ» ÇÊÅÍ Æú´õ·Î º¹»çÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "ÇÊÅÍ ÆÄÀÏÀÌ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾²±â ÇϽðڽÀ´Ï±î?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Á¤±Ô Ç¥Çö½Ä"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
 msgstr ""
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr ""
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "µð·ºÅ丮 ºñ±³ °á°ú"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "ÆÄÀÏ ºñ±³"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "À̸§¾ø´Â ¹®¼­"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "À̸§¾ø´Â ¹®¼­"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "±× ÆÄÀÏ"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "¸¶ÀÎ ÆÄÀÏ"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "´Ù½Ã ½ºÄµ ÁßÀÔ´Ï´Ù..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "¼±Åà ÆÄÀÏ ¿­±â"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "¿ÞÂÊ¿¡¼­ ¿À¸¥ÂÊÀ¸·Î º¹»ç"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "¿À¸¥ÂÊ¿¡¼­ ¿ÞÂÊÀ¸·Î º¹»ç"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "¿ÞÂÊÀ¸·Î ¸ðµÎ º¹»ç"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "¿À¸¥ÂÊÀ¸·Î ¸ðµÎ º¹»ç"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "ÆÄÀÏ º¹»ç Áß..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "ÆÄÀÏ »èÁ¦ Áß..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "ÆÄÀÏ À̵¿ Áß..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "º¸°í¼­ »ý¼º Áß..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr ""
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr ""
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "¶óÀÎ: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "º´ÇÕ"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "´Ù¸¥ ÆÄÀÏ(%1 of %2)"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1°³ÀÇ Â÷ÀÌÁ¡ Á¸Àç"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "1°³ÀÇ Â÷ÀÌÁ¡ Á¸Àç"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "RO"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Ç׸ñ %1 / %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Ç׸ñ: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "ºñ±³ÇÒ µð·ºÅ丮 ¶Ç´Â ÆÄÀÏÀ» ¼±ÅÃÇϽʽÿÀ."
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "µð·ºÅ丮 ¼±ÅÃ"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "ºñ±³ÇÒ µð·ºÅ丮/ÆÄÀÏ ¼±ÅÃ"
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "¿ÞÂÊÀº À߸øµÈ °æ·ÎÀÔ´Ï´Ù!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "¿À¸¥ÂÊÀº À߸øµÈ °æ·ÎÀÔ´Ï´Ù!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "¾çÂÊ ¸ðµÎ À߸øµÈ °æ·ÎÀÔ´Ï´Ù!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "¾ðÆÑÄ¿ ¼±Åà Ȱ¼ºÈ­¸¦ À§ÇØ µÎ ÆÄÀÏÀ» ¼±ÅÃÇϽʽÿÀ."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "µð·ºÅ丮/ÆÄÀÏÀ» ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "ÇØ´çÇÏ´Â ÆÄÀÏÀÌ ¾ø½À´Ï´Ù : %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "unpack µÈ ÆÄÀÏ: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4076,12 +4056,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "ºÒÀÏÄ¡ ÆÄÀÏ ÆÄ½Ì ½ÇÆÐ."
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4092,32 +4072,32 @@ msgstr ""
 "%1 ÆÄÀÏÀº\n"
 "ºÒÀÏÄ¡ ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "%1 ÀÇ º¯°æµÈ ºÎºÐÀ» ÀúÀåÇÒ±î¿ä?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 (Àº)´Â Àбâ Àü¿ë ÆÄÀÏÀÔ´Ï´Ù. µ¤¾î ¾µ±î¿ä? (´Ù¸¥ À̸§À¸·Î ÀúÀåÇÏ·Á¸é ¾Æ´Ï¿À¸¦ ¼±ÅÃÇϼ¼¿ä.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "º¹»ç °¡´É üũ ½ÇÆÐ"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "ÆÄÀÏ ¹é¾÷À» ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4130,7 +4110,7 @@ msgstr ""
 "\n"
 "°è¼Ó ÁøÇàÇÒ±î¿ä?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4146,7 +4126,7 @@ msgstr ""
 "\t- ´Ù¸¥ À̸§À¸·Î ÀúÀå(È®ÀÎ)\n"
 "\t- ÀúÀå Ãë¼Ò(Ãë¼Ò)?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4156,7 +4136,7 @@ msgid ""
 "Do you want to save the unpacked version to another file?"
 msgstr ""
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4166,7 +4146,7 @@ msgid ""
 "Do you want to save the unpacked version to another file?"
 msgstr ""
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4180,7 +4160,7 @@ msgstr ""
 "\n"
 "µ¤¾î¾µ±î¿ä?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4189,32 +4169,32 @@ msgstr ""
 "%1\n"
 "Àбâ Àü¿ë ÆÄÀÏÀÔ´Ï´Ù. µ¤¾î¾²½Ã°Ú½À´Ï±î?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
 msgstr ""
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "¿ÞÂÊ ÆÄÀÏ ´Ù¸¥ À̸§À¸·Î ÀúÀå"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "¿À¸¥ÂÊ ÆÄÀÏ ´Ù¸¥ À̸§À¸·Î ÀúÀå"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
 msgstr ""
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4225,42 +4205,42 @@ msgstr ""
 "\n"
 "°è¼ÓÇϱâ Àü¿¡ »õ·Î °íħÀ» ÇØ ÁÖ¼¼¿ä."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "°è¼ÓÇÏ·Á¸é ¼Ò½º¼¼ÀÌÇÁ ÇÁ·ÎÁ§Æ® °æ·Î¸¦ ¼³Á¤ÇØ¾ß ÇÕ´Ï´Ù (¿¹:  $/MyProject)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "VSS üũ¾Æ¿ô ÆÄÀÏ..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "üũ¾Æ¿ô ½ÇÇà Áß ¿À·ù°¡ ¹ß»ýÇÏ¿´½À´Ï´Ù.  ´õ ÀÌ»ó ÁøÇàÇÒ ¼ö ¾ø½À´Ï´Ù..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "¹öÀü °ü¸®½Ã½ºÅÛ ¸í·É ½ÇÇà ½ÇÆÐ."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "VSS ¿öÅ· Æú´õ¿Í ÇöÀç ÆÄÀÏÀÇ °æ·Î°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù. °è¼ÓÇÏ°Ú½À´Ï±î?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "VSS µ¥ÀÌÅͺ£À̽º°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "VSS ¿À·ù:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4268,176 +4248,176 @@ msgid ""
 " Undo checkout operation?"
 msgstr ""
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, 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:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "»ç¿ë ¾È ÇÔ"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (5.0 ÀÌÇÏ)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 ÀÌ»ó)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "°ø¹é ¹ß°ß½Ã ¸ØÃã"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "°ø¹é ¶Ç´Â ±¸µÎÁ¡ ¹ß°ß½Ã ¸ØÃã"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "¼±Åà ÆÄÀÏÀ» ¿À¸¥ÂÊ µð·ºÅ丮·Î º¹»çÇÕ´Ï´Ù."
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "¼±Å ÆÄÀÏÀ» ƯÁ¤ µð·ºÅ丮·Î º¹»çÇÕ´Ï´Ù."
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "¼±ÅÃÇÑ ÆÄÀÏ Áß ¿ÞÂÊ ÆÄÀϸ¸ »èÁ¦ÇÕ´Ï´Ù."
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "¼±ÅÃÇÑ ÆÄÀÏ Áß ¿À¸¥ÂÊ ÆÄÀϸ¸ »èÁ¦ÇÕ´Ï´Ù."
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "¼±ÅÃÇÑ ÆÄÀÏÀ» ¾çÂÊ ¸ðµÎ¿¡¼­ »èÁ¦ÇÕ´Ï´Ù."
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "¼±Åà ÆÄÀÏÀ» °¨Ãä´Ï´Ù (on the fly filter)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "¾çÂÊÀÇ ¼±Åà ÆÄÀÏ ¸ðµÎ À̸§À» ¹Ù²ß´Ï´Ù."
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "¿ÞÂÊÀ¸·Î (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "¿À¸¥ÂÊÀ¸·Î (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "¿ÞÂÊÀ¸·Î (%1 / %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "¿À¸¥ÂÊÀ¸·Î (%1 / %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "¿ÞÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "¿ÞÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1 / %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1 / %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "¿ÞÂÊ (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "¿À¸¥ÂÊ (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "¸ðµÎ (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "¿ÞÂÊ (%1 / %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "¿À¸¥ÂÊ (%1 / %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "¸ðµÎ (%1 / %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "µð·ºÅ丮 ¼±ÅÃ"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "¿ÞÂÊ - À̵¿ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "¿À¸¥ÂÊ - À̵¿ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 ÆÄÀÏ º¯°æµÊ)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 / %2 ÆÄÀÏ º¯°æµÊ)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4448,17 +4428,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Á¤¸» º¹»çÇϽðڽÀ´Ï±î:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Á¤¸» %d Ç׸ñÀ» º¹»çÇϽðڽÀ´Ï±î:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4470,613 +4450,613 @@ msgid ""
 "Please refresh the compare."
 msgstr ""
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr ""
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr ""
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr ""
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "¿ÞÂÊ ÆÄÀÏÀ» ¿±´Ï´Ù."
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "¿ÜºÎ ¿¡µðÅ͸¦ ÀÌ¿ëÇؼ­ ¿ÞÂÊ ÆÄÀÏÀ» ¿±´Ï´Ù"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "¿ÞÂÊ ÆÄÀÏÀ» ¿¬°á ÇÁ·Î±×·¥À» ¼±ÅÃÇؼ­ ¿±´Ï´Ù..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "¿À¸¥ÂÊ ÆÄÀÏÀ» ¿±´Ï´Ù."
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "¿ÜºÎ ¿¡µðÅ͸¦ ÀÌ¿ëÇؼ­ ¿À¸¥ÂÊ ÆÄÀÏÀ» ¿±´Ï´Ù"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "¿À¸¥ÂÊ ÆÄÀÏÀ» ¿¬°á ÇÁ·Î±×·¥À» ¼±ÅÃÇؼ­ ¿±´Ï´Ù ..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "¿ÜºÎ ÆíÁý±â ½ÇÇà ½ÇÆÐ: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "¾Ë ¼ö ¾ø´Â È®ÀåÀÚ: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "ÆÄÀϸíÀ» Ŭ¸³º¸µå¿¡ º¹»çÇÕ´Ï´Ù"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "¿ÞÂÊ °æ·Î¸¦ Ŭ¸³º¸µå¿¡ º¹»çÇÕ´Ï´Ù"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "¿À¸¥ÂÊ °æ·Î¸¦ Ŭ¸³º¸µå¿¡ º¹»çÇÕ´Ï´Ù"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "¾çÂÊ °æ·Î¸¦ ¸ðµÎ Ŭ¸³º¸µå¿¡ º¹»çÇÕ´Ï´Ù"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr ""
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr ""
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "¾Ë ¼ö ¾ø´Â ¾ÐÃà Çü½Ä"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "¿ÞÂÊ ÆÄÀÏÀ» ¾ÐÃà ÆÄÀÏ¿¡ Ãß°¡"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "¿À¸¥ÂÊ ÆÄÀÏÀ» ¾ÐÃà ÆÄÀÏ¿¡ Ãß°¡"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "¾çÂÊ ÆÄÀÏÀ» ¸ðµÎ ¾ÐÃà ÆÄÀÏ¿¡ Ãß°¡"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "´Ù¸¥ ÆÄÀÏ ¾ÐÃà ÆÄÀÏ¿¡ Ãß°¡ (¾çÂÊ)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "¿ÞÂÊ ¼±ÅÃÆÄÀÏ À§Ä¡ÁöÁ¤ À̵¿"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "¿À¸¥ÂÊ ¼±ÅÃÆÄÀÏ À§Ä¡ÁöÁ¤ À̵¿"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "À̸§"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "ºñ±³ °á°ú"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "¿ÞÂÊ ³¯Â¥"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "¿À¸¥ÂÊ ³¯Â¥"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "È®ÀåÀÚ"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "¿ÞÂÊ Å©±â"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "¿À¸¥ÂÊ Å©±â"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "¿À¸¥ÂÊ Å©±â (ª°Ô)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "¿ÞÂÊ Å©±â (ª°Ô)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "¿ÞÂÊ »ý¼º ½Ã°£"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "¿À¸¥ÂÊ »ý¼º ½Ã°£"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "ÃֽŠÆÄÀÏ"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "¿ÞÂÊ ÆÄÀÏ ¹öÀü"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "¿À¸¥ÂÊ ÆÄÀÏ ¹öÀü"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "¿ä¾à °á°ú"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "¿ÞÂÊ ¼Ó¼º"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "¿À¸¥ÂÊ ¼Ó¼º"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "¿ÞÂÊ EOL"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "¿À¸¥ÂÊ EOL"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "¿ÞÂÊ ÀÎÄÚµù"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "¿À¸¥ÂÊ ÀÎÄÚµù"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "ºñ±³ÇÏÁö ¾ÊÀº Â÷ÀÌÁ¡"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "¹ÙÀ̳ʸ®"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "ÆÄÀÏÀ» ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "ºñ±³ ÁßÁöµÈ ÆÄÀÏ"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "ÇÊÅ͸µµÈ ÆÄÀÏ"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "ÇÊÅ͸µµÈ µð·ºÅ丮"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "¿ÞÂʸ¸: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "¿À¸¥Âʸ¸: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "µ¿ÀÏÇÑ ÆÄÀÏ(¹ÙÀ̳ʸ® ÆÄÀÏ)"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "µ¿ÀÏÇÏÁö ¾ÊÀº ÆÄÀÏ(¹ÙÀ̳ʸ® ÆÄÀÏ)"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "µ¿ÀÏÇÏÁö ¾ÊÀº ÆÄÀÏ"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr ""
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "¿ÞÂʸ¸ Á¸Àç"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "¿À¸¥Âʸ¸ Á¸Àç"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "¿À·ù"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr ""
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr ""
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "¼Ò¿ä ½Ã°£: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 Ç׸ñ ¼±ÅÃ"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 Ç׸ñ ¼±ÅÃ"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "µð·ºÅ丮¸í ¶Ç´Â ÆÄÀϸí."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "ÇÏÀ§ µð·ºÅ丮°¡ ÀÖÀ»¶§ ÇÏÀ§ µð·ºÅ丮 À̸§."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "ÀÚ¼¼ÇÑ ºñ±³ °á°ú."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "¿ÞÂÊ ¼öÁ¤ ½Ã°£."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "¿À¸¥ÂÊ ¼öÁ¤ ½Ã°£."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "ÆÄÀÏ È®ÀåÀÚ."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "¿ÞÂÊ ÆÄÀÏ Å©±â(byte)."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "¿À¸¥ÂÊ ÆÄÀÏ Å©±â(byte)."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "¿ÞÂÊ ÆÄÀÏ Å©±â(ª°Ô)"
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "¿À¸¥ÂÊ ÆÄÀÏ Å©±â(ª°Ô)"
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "¿ÞÂÊ »ý¼º ½Ã°£."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "¿À¸¥ÂÊ »ý¼º ½Ã°£."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "¾î´À ÂÊÀÌ ´õ ÃÖ±Ù¿¡ ¼öÁ¤µÇ¾ú´ÂÁö ¾Ë·ÁÁÝ´Ï´Ù."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "¿ÞÂÊ ÆÄÀÏ ¹öÀü(¸ðµç ÆÄÀÏ Á¾·ù¿¡ ´ëÇؼ­ ¾Ë ¼ö´Â ¾ø½À´Ï´Ù)."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "¿À¸¥ÂÊ ÆÄÀÏ ¹öÀü(¸ðµç ÆÄÀÏ Á¾·ù¿¡ ´ëÇؼ­ ¾Ë ¼ö´Â ¾ø½À´Ï´Ù)."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "°£·«ÇÑ ¿ä¾à °á°ú."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "¿ÞÂÊ ¼Ó¼º."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "¿À¸¥ÂÊ ¼Ó¼º."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "¿ÞÂÊ EOL"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "¿À¸¥ÂÊ EOL"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "¿ÞÂÊ ÀÎÄÚµù."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "¿À¸¥ÂÊ ÀÎÄÚµù."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "ÆÄÀÏ ³» ºñ±³ÇÏÁö ¾ÊÀº ºÎºÐÀÇ °³¼ö. Winmerg ¿¡¼­ ÀÌ ºÎºÐÀº ¹«½ÃµÇ¸ç, º´ÇÕµÇÁö ¾Ê½À´Ï´Ù."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "ÆÄÀÏ ³» Â÷ÀÌÁ¡ÀÇ °³¼ö. ÀÌ´Â ºñ±³ÇÏÁö ¾ÊÀº ºÎºÐÀÇ °³¼ö¸¦ Æ÷ÇÔÇÏÁö ¾Ê½À´Ï´Ù."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "¹ÙÀ̳ʸ® ÆÄÀÏÀ̸é * Ç¥½Ã."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "%1 & %2 ºñ±³"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "½°Ç¥·Î ºÐ¸®µÈ ¸ñ·Ï"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "ÅÇÀ¸·Î ºÐ¸®µÈ ¸ñ·Ï"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "´Ü¼ø HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "´Ü¼ø XML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "º¸°í¼­ ÆÄÀÏÀÌ Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾µ±î¿ä?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5085,32 +5065,32 @@ msgstr ""
 "º¸°í¼­ »ý¼º ½ÇÆÐ:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "º¸°í¼­ »ý¼º ¼º°ø"
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "¾çÂÊ Ã¢¿¡ µ¿ÀÏÇÑ ÆÄÀÏÀÌ ¿­·Á ÀÖ½À´Ï´Ù."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "¼±ÅÃÇÑ ÆÄÀϵéÀº ³»¿ëÀÌ µ¿ÀÏÇÕ´Ï´Ù."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "ÆÄÀÏ ºñ±³ Áß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Àӽà ÆÄÀÏÀ» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù. Àӽà ÆÄÀÏ ¼³Á¤À» È®ÀÎÇϼ¼¿ä."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5125,7 +5105,7 @@ msgstr ""
 "\n"
 "Âü°í: ¸ðµç ij¸®Áö ¸®ÅÏÀ» Ç×»ó µ¿ÀÏÇÏ°Ô ÀÛ¾÷ÇÏ·Á¸é, ºñ±³ÅÇ¿¡¼­ 'ij¸®Áö ¸®ÅÏ ¹«½Ã' ¼³Á¤À» ¼±ÅÃÇÏ¸é µË´Ï´Ù (ÆíÁý/¼³Á¤¿¡¼­ ¼±Åà °¡´É)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5133,22 +5113,22 @@ msgid ""
 " Do you want to change the options and preserve the different EOL ?"
 msgstr ""
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "'%2' Ç÷¯±×ÀÎÀ¸·Î '%1' (À»)À» prediff ÇÏ´Â Áß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù. ´õ ÀÌ»ó prediff°¡ ¼öÇàµÇÁö ¾Ê½À´Ï´Ù."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "¼±Åà µð·ºÅ丮 °æ·Î ¿À·ùÀÔ´Ï´Ù."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "¹ÙÀ̳ʸ® ÆÄÀÏÀº ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5163,7 +5143,7 @@ msgstr ""
 "%1\n"
 "?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5174,148 +5154,148 @@ msgstr ""
 "°¢°¢ÀÇ ÄÚµåÆäÀÌÁö¸¦ À¯ÁöÇÏ´Â °ÍÀÌ ÀÛ¾÷½Ã º¸±â´Â ÁÁÀ¸³ª À§ÇèÇÒ ¼ö ÀÖ½À´Ï´Ù.\n"
 "±âÁ¸ À©µµ¿ì ÄÚµåÆäÀÌÁö¸¦ »ç¿ëÇÒ±î¿ä(Ãßõ)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "°æ°í: ¾çÂÊ ÆÄÀÏÀÌ ÀÎÄÚµùÀÌ ´Ù¸¨´Ï´Ù, ¿ÞÂÊ=%s and ¿À¸¥ÂÊ=%s, º´ÇÕ ÀÛ¾÷ ÁøÇà½Ã Á¤º¸¸¦ ÀÒ¾î¹ö¸± ¼ö ÀÖ½À´Ï´Ù."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "ÀÎÄÚµù ¿À·ù·Î Á¤º¸ ¼Õ½Ç: ¾çÂÊ ÆÄÀÏ"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "µ¿ÀÏÇÔ"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "¶óÀÎ ºñ±³"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "¸ðµÎ %1 °³¸¦ ¹Ù²Ù¾ú½À´Ï´Ù."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "ÇØ´çÇÏ´Â ¹®ÀÚ¿­À» ãÀ» ¼ö ¾ø½À´Ï´Ù : \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Àüü °æ·Î º¹»ç"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "ÆÄÀÏ À̸§ º¹»ç"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "À§Ä¡Ã¢"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "ºñ±³Ã¢"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "ÆÐÄ¡ ÆÄÀÏÀÌ ÀÛ¼ºµÇ¾ú½À´Ï´Ù."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. ÆÄÀÏÀÌ ¾ø°Å³ª µð·ºÅ丮ÀÔ´Ï´Ù!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. ÆÄÀÏÀÌ ¾ø°Å³ª µð·ºÅ丮ÀÔ´Ï´Ù!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "°°Àº À̸§ÀÇ ÆÐÄ¡°¡ Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾µ±î¿ä?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 °³ÀÇ ÆÄÀÏ ¼±ÅõÊ]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Ç¥ÁØ"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "ÄÁÅؽºÆ®"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "ÅëÀϵÊ"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "%1 ÆÄÀÏ¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Àý´ë °æ·Î°¡ ¾Æ´Õ´Ï´Ù: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Ãâ·Â ÆÄÀÏ ÁöÁ¤"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "¹ÙÀ̳ʸ® ÆÄÀÏ¿¡¼­´Â ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "µð·ºÅ丮¿¡¼­´Â ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5326,17 +5306,17 @@ msgstr ""
 "\n"
 "ÀúÀå ¾È µÈ ÆÄÀÏÀÌ ÀÖÀ¸¸é ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Á¸ÀçÇÏÁö ¾Ê´Â µð·ºÅ丮ÀÔ´Ï´Ù."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "ÇöÀç µð·ºÅ丮 ºñ±³ °á°ú°¡ ´ÝÈü´Ï´Ù."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5348,7 +5328,7 @@ msgstr ""
 "¾ÐÃà Áö¿ø ±â´É¿¡ ÇÊ¿äÇÑ ÄÄÆ÷³ÍÆ®(7-zip and/or Merge7z*.dll)°¡ ¾ø½À´Ï´Ù. \n"
 "¾ÐÃà Áö¿ø ±â´É¿¡ ´ëÇØ ´õ ¸¹Àº Á¤º¸¸¦ ¿øÇÏ½Ã¸é ¸Þ´º¾óÀ» ÂüÁ¶Çϼ¼¿ä."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5357,7 +5337,7 @@ msgstr ""
 "\n"
 "¾Ë¸²: WinMerge ¼³Á¤¿¡¼­ 7-Zip ÅëÇÕÀÌ ÇØÁ¦µÇ¾ú½À´Ï´Ù."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5366,37 +5346,37 @@ msgstr ""
 "\n"
 "¾Ë¸²: WinMerge ¼³Á¤¿¡¼­ 7-Zip ÅëÇÕÀÌ µ¶¸³ ½ÇÇàÀ¸·Î Á¦ÇѵǾú½À´Ï´Ù."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "³»º¸³¾ ÆÄÀÏ ¼±ÅÃ"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "°¡Á®¿Ã ÆÄÀÏ ¼±ÅÃ"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "ÆÄÀϷκÎÅÍ °¡Á®¿Â ¼³Á¤."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "ÆÄÀÏ·Î ³»º¸³½ ¼³Á¤."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "ÆÄÀϷκÎÅÍ ¼³Á¤ °¡Á®¿À±â ½ÇÆÐÇÔ."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "ÆÄÀϷκÎÅÍ ¼³Á¤ ³»º¸³»±â ½ÇÆÐÇÔ."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5407,242 +5387,242 @@ msgstr ""
 "\n"
 "°è¼Ó ÇϽðڽÀ´Ï±î?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Á¤±Ô Ç¥Çö½Ä ¿À·ù"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "µ¿ÀÏÇÏÁö ¾ÊÀ½"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "À߸øµÈ Á¤±Ô Ç¥Çö½Ä"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "À߸øµÈ ´ëÁ¶ ¹®ÀÚ"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "À߸øµÈ ¹®ÀÚ Å¬·¡½º¸í"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "¹é½½·¡½¬ ¶¼¾î³»±â"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "À߸øµÈ ÈÄÂüÁ¶"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "ÀÏÄ¡ÇÏÁö ¾Ê´Â [ ¶Ç´Â [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "ÀÏÄ¡ÇÏÁö ¾Ê´Â ( ¶Ç´Â \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "ÀÏÄ¡ÇÏÁö ¾Ê´Â \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "\\{\\} ³»¿ë ¿À·ù"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "À߸øµÈ ¹üÀ§"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "¸Þ¸ð¸® ºÎÁ·"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "À߸øµÈ ¼±Çà Á¤±Ô Ç¥Çö½Ä"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Á¶±â Á¤±Ô Ç¥Çö½Ä Á¾°á"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "³Ê¹« Å« Á¤±Ô Ç¥Çö½Ä"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "ÀÏÄ¡ÇÏÁö ¾Ê´Â ) ¶Ç´Â \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "È¥ÇÕµÊ"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr ""
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr ""
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr ""
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr ""
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "¿ÞÂÊ ÆÄÀÏ ÀúÀå"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "¿À¸¥ÂÊ ÆÄÀÏ ÀúÀå"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "¿ÞÂÊ ÆÄÀÏ ´Ù¸¥ À̸§À¸·Î ÀúÀå..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "¿À¸¥ÂÊ ÆÄÀÏ ´Ù¸¥ À̸§À¸·Î ÀúÀå..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "EOLÀ» À©µµ¿ìÁî ¸ðµå·Î º¯È¯"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "EOLÀ» À¯´Ð½º ¸ðµå·Î º¯È¯"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "EOLÀ» ¸Æ ¸ðµå·Î º¯È¯"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "ÆíÁý ¸ðµå/º´ÇÕ ¸ðµå Àüȯ"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5651,12 +5631,12 @@ msgstr ""
 "ÆÄÀÏ ÀÎÄÚµù ¼Ó¼º º¸±â/Á¶Á¤\n"
 "ÆÄÀÏ ÀÎÄÚµù ¼Ó¼º"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "ºÒÀÏÄ¡ ÆÄÀÏ ¿­±â & ºÐÇØ"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5665,7 +5645,7 @@ msgstr ""
 "ÇöÀç ¶óÀο¡¼­ Â÷ÀÌÁ¡À» ¼±ÅÃÇÕ´Ï´Ù\n"
 "ÇöÀç ¶óÀο¡¼­ Â÷ÀÌÁ¡"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5674,7 +5654,7 @@ msgstr ""
 "¼±Åà ¶óÀÎÀ̳ª Â÷ÀÌÁ¡À¸·Î À̵¿ÇÕ´Ï´Ù\n"
 "À̵¿ (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5683,7 +5663,7 @@ msgstr ""
 "¼³Á¤À» ¼³Á¤ÇÕ´Ï´Ù.\n"
 "¼³Á¤"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5692,37 +5672,37 @@ msgstr ""
 "»õ·Î °íħ\n"
 "»õ·Î °íħ (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "ÇöÀç ¶óÀÎ ¾Õ¿¡ Çà ¹øÈ£¸¦ ºÙ¿©¼­ Ŭ¸³º¸µå·Î º¹»çÇÕ´Ï´Ù"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "ºÏ¸¶Å© Åä±Û"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "´ÙÀ½ ºÏ¸¶Å©·Î À̵¿"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "ÀÌÀü ºÏ¸¶Å©·Î À̵¿"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "¸ðµç ºÏ¸¶Å© »èÁ¦"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5731,7 +5711,7 @@ msgstr ""
 "µ¿ÀÏÇÑ ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n"
 "µ¿ÀÏÇÑ ÆÄÀÏ º¸À̱â"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5740,7 +5720,7 @@ msgstr ""
 "´Ù¸¥ ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n"
 "´Ù¸¥ ÆÄÀÏ º¸À̱â"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5749,7 +5729,7 @@ msgstr ""
 "¿ÞÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n"
 "¿ÞÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏ º¸À̱â"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5758,7 +5738,7 @@ msgstr ""
 "¿À¸¥ÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n"
 "¿À¸¥ÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏ º¸À̱â"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5767,7 +5747,7 @@ msgstr ""
 "¹ÙÀ̳ʸ® ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n"
 "¹ÙÀ̳ʸ® ÆÄÀÏ º¸À̱â"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5776,7 +5756,7 @@ msgstr ""
 "ºñ±³ÇÏÁö ¾ÊÀº ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n"
 "ºñ±³ÇÏÁö ¾ÊÀº ÆÄÀÏ º¸À̱â"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5785,7 +5765,7 @@ msgstr ""
 "±Û²ÃÀ» ¼±ÅÃÇÕ´Ï´Ù\n"
 "±Û²Ã ¼±ÅÃ"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5794,27 +5774,27 @@ msgstr ""
 "½Ã½ºÅÛ ±âº» ±Û²Ã·Î ¼³Á¤ÇÕ´Ï´Ù.\n"
 "±âº» ±Û²Ã"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "°ø¹é ¹®ÀÚ¸¦ Ç¥½ÃÇÕ´Ï´Ù."
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "¼±Åà ºñ±³Ã¢À» º¸°Å³ª ¼û±é´Ï´Ù."
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "À§Ä¡ Ç¥½ÃâÀº Àüü ºñ±³ »óȲÀ» À̹ÌÁö·Î º¸¿©ÁÝ´Ï´Ù."
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "µð·ºÅ丮 ºñ±³ »óȲÀ» Ç¥½ÃÇÕ´Ï´Ù."
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5823,7 +5803,7 @@ msgstr ""
 "ÇöÀç »ç¿ëÀÚ ¾ð¾î ¹Ù²Ù±â\n"
 "¾ð¾î"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5832,12 +5812,12 @@ msgstr ""
 "³»ºÎ ¶óÀÎ Â÷ÀÌÁ¡ »ö»ó ´Ù¸£°Ô º¸À̱â\n"
 "¶óÀÎ Â÷ÀÌÁ¡ º¸À̱â"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "µÎ âÀÇ À§Ä¡¸¦ ¼­·Î ¹Ù²ß´Ï´Ù."
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5846,7 +5826,7 @@ msgstr ""
 "Çà ¹øÈ£¸¦ Ç¥½ÃÇÕ´Ï´Ù.\n"
 "Çà ¹øÈ£ º¸À̱â"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5855,7 +5835,7 @@ msgstr ""
 "ÀÚµ¿ ÁÙ¹Ù²Þ ±â´ÉÀ» »ç¿ëÇÕ´Ï´Ù.\n"
 "ÀÚµ¿ ÁٹٲÞ"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5864,22 +5844,22 @@ msgstr ""
 "¾çÂÊ Ã¢¿¡ ¼±Åà ¿©¹é º¸À̱â\n"
 "¼±Åà ¿©¹é º¸À̱â"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "ÅؽºÆ® Å©±â Å©°Ô"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "ÅؽºÆ® Å©±â ÀÛ°Ô"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "±âº»°ªÀ¸·Î ÅؽºÆ® Å©±â ÃʱâÈ­"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5888,7 +5868,7 @@ msgstr ""
 "ÀÌÀü Â÷ÀÌÁ¡ ºÎºÐÀ¸·Î ½ºÅ©·Ñ\n"
 "ÀÌÀü Â÷ÀÌÁ¡ ºÎºÐ (Alt+Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5897,67 +5877,67 @@ msgstr ""
 "´ÙÀ½ Â÷ÀÌÁ¡ ºÎºÐÀ¸·Î ½ºÅ©·Ñ\n"
 "´ÙÀ½ Â÷ÀÌÁ¡ ºÎºÐ (Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -5966,7 +5946,7 @@ msgstr ""
 "óÀ½ Â÷ÀÌÁ¡ ºÎºÐÀ¸·Î ½ºÅ©·Ñ\n"
 "óÀ½ Â÷ÀÌÁ¡ ºÎºÐ (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -5975,7 +5955,7 @@ msgstr ""
 "ÇöÀç Â÷ÀÌÁ¡ ºÎºÐÀ¸·Î ½ºÅ©·Ñ\n"
 "ÇöÀç Â÷ÀÌÁ¡ ºÎºÐ (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -5984,7 +5964,7 @@ msgstr ""
 "¸¶Áö¸· Â÷ÀÌÁ¡ ºÎºÐÀ¸·Î ½ºÅ©·Ñ\n"
 "¸¶Áö¸· Â÷ÀÌÁ¡ ºÎºÐ (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -5993,7 +5973,7 @@ msgstr ""
 "¼±Åà ºÎºÐÀ» ¿À¸¥ÂÊÀ¸·Î º¹»çÇÕ´Ï´Ù.\n"
 "¿À¸¥ÂÊÀ¸·Î º¹»ç (Alt Right)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6002,7 +5982,7 @@ msgstr ""
 "¼±Åà ºÎºÐÀ» ¿ÞÂÊÀ¸·Î º¹»çÇÕ´Ï´Ù.\n"
 "¿ÞÂÊÀ¸·Î º¹»ç (Alt Left)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6011,7 +5991,7 @@ msgstr ""
 "Â÷ÀÌÁ¡À» ¿À¸¥ÂÊÀ¸·Î º¹»çÇÏ°í, ´ÙÀ½ Â÷ÀÌÁ¡À¸·Î À̵¿ÇÕ´Ï´Ù\n"
 "¿À¸¥ÂÊÀ¸·Î º¹»ç - °í±Þ (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6020,7 +6000,7 @@ msgstr ""
 "Â÷ÀÌÁ¡À» ¿ÞÂÊÀ¸·Î º¹»çÇÏ°í, ´ÙÀ½ Â÷ÀÌÁ¡À¸·Î À̵¿ÇÕ´Ï´Ù\n"
 "¿ÞÂÊÀ¸·Î º¹»ç - °í±Þ (Ctrl+Alt+Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6029,7 +6009,7 @@ msgstr ""
 "¸ðµç Â÷ÀÌÁ¡À» ¿À¸¥ÂÊ ÆÄÀÏ·Î º¹»çÇÕ´Ï´Ù.\n"
 "¸ðµÎ ¿À¸¥ÂÊÀ¸·Î"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6038,77 +6018,77 @@ msgstr ""
 "¸ðµç Â÷ÀÌÁ¡À» ¿ÞÂÊ ÆÄÀÏ·Î º¹»çÇÕ´Ï´Ù.\n"
 "¸ðµÎ ¿ÞÂÊÀ¸·Î"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "¾çÂÊ ÆÄÀÏÀ» ¸ðµÎ »èÁ¦ÇÕ´Ï´Ù."
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "¼±ÅÃµÈ ÆÄÀϵéÀ» ºñ±³ÇÕ´Ï´Ù (¿©·¯ °³°¡ ¼±ÅõǾî ÀÖÀ¸¸é ù¹ø° ÆÄÀÏÀ» ¸ÕÀú ºñ±³ÇÕ´Ï´Ù)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "µð·ºÅ丮 ºñ±³ ¼³Á¤ ¼±ÅÃ/¼ø¼­ º¯°æ"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "ÆÐÄ¡ ÆÄÀÏ »ý¼º"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "ÇÊÅÍ ¼±ÅÃ/¼öÁ¤"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "ºñ±³°á°ú º¸°í¼­ ¸¸µé±â"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr ""
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "¾ðÆÑÄ¿¸¦ ¼±ÅÃÇÕ´Ï´Ù (µð·ºÅ丮 ºñ±³¿¡´Â ¾ðÆÑÇÏÁö ¾Ê½À´Ï´Ù)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "¾çÂÊ ÆÄÀÏ ¸ðµÎ¿¡ ¾ðÆÑÄ¿°¡ Àû¿ëµË´Ï´Ù (ÇÑ ÆÄÀϸ¸ÀÌ È®ÀåÀÚ°¡ ÇÊ¿äÇÔ)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "ÀÌ ÆÄÀÏÀÇ ÆíÁýÀ» À§ÇÑ ¾ðÆÑÄ¿ ¼±ÅÃ"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "prediffer »ç¿ë ¾È ÇÔ(Ç¥ÁØ)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "±ÇÀåÇÏ´Â Ç÷¯±×ÀÎ"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "´Ù¸¥ Ç÷¯±×ÀÎ"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "¸ðµç Ç÷¯±×ÀÎÀ» ´Ý°í ´Ù½Ã ¿­±â (for °³¹ßÀÚ)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6117,12 +6097,12 @@ msgstr ""
 "´ÙÀ½ °¡½Ã ÆÄÀÏ È°¼ºÈ­\n"
 "´ÙÀ½ °¡½Ã ÆÄÀÏ"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "¸ðµç ⠴ݱâ"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6131,22 +6111,22 @@ msgstr ""
 "WinMerge µµ¿ò¸» ¿­±â\n"
 "WinMerge µµ¿ò¸»"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "WinMerge ¹öÀü Á¤º¸ ¹× ¼³Á¤À» ÅؽºÆ® ÆÄÀÏ·Î Ãâ·ÂÇÕ´Ï´Ù"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "GNU ¶óÀ̼¾½º Ç¥½Ã"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "°³ÀÎ ºôµå: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6155,7 +6135,7 @@ msgstr ""
 "¸±¸®Áî ³ëÆ® ¹®¼­ ¿­±â\n"
 "¸±¸®Áî ³ëÆ®"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6164,272 +6144,272 @@ msgstr ""
 "¹ø¿ª À¥ »çÀÌÆ® ¿­±â\n"
 "¹ø¿ª"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Ç÷¯±×ÀÎ ¼¼ÆÃ"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "prediffer »ç¿ë ¾È ÇÔ"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "prediff »ç¿ë °¡´ÉÇÏ¸é »ç¿ëÇϱâ"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH Á¸ÀçÇÏÁö ¾ÊÀ½ - .sct ½ºÅ©¸³Æ®¸¦ »ç¿ëÇÏÁö ¾ÊÀ½"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<»ç¿ë ¾È ÇÔ>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<ÀÚµ¿>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "¼³Á¤µÈ ÇÁ·Î±×·¥À¸·Î ÆÄÀÏÀ» ¿±´Ï´Ù"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "¿ÜºÎ ÆíÁý±â·Î ÆÄÀÏÀ» ¿±´Ï´Ù"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "ÆÄÀÏÀ» ¿­ ƯÁ¤ ÇÁ·Î±×·¥À» ¼±ÅÃÇÕ´Ï´Ù"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "À̵¿¿µ¿ªÀ» Ç¥½ÃÇÏÁö ¾ÊÀ½"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "À̵¿¿µ¿ª ¸ðµÎ Ç¥½Ã"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "ÇöÀç ¼±ÅÃµÈ À̵¿¿µ¿ª¸¸ Ç¥½ÃÇÕ´Ï´Ù."
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Ä¿¼­°¡ ÀÖ´Â Â÷ÀÌÁ¡À¸·Î À̵¿ÇÕ´Ï´Ù."
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "Â÷ÀÌÁ¡À¸·Î À̵¿ÇÕ´Ï´Ù. (%1 / %2)"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "%1 ÁÙ·Î À̵¿"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "»ç¿ë ¾È ÇÔ"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "ÆÄÀÏ ½Ã½ºÅÛ ÀÌ¿ë"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "ÃÖ±Ù ÆÄÀÏ ¸ñ·Ï(MRU) »ç¿ë"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr ""
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "񃧯"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "¹èÄ¡"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "À̵¿Çü °´Ã¼"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "ÀÚ¿ø"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "½©"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr ""
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "µµ±¸ ¸ðÀ½ ¼û±â±â"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "µµ±¸ ¸ðÀ½ ÀÛ°Ô Ç¥½Ã"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "µµ±¸ ¸ðÀ½ Å©°Ô Ç¥½Ã"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index e2bff35..2ac9724 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -1029,7 +1029,7 @@ msgid "&Scripts"
 msgstr "&Skript"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Tom >"
@@ -1470,7 +1470,7 @@ msgid "&Versioning System:"
 msgstr "&Versjonsstyringssystem"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Sti til cleartool.exe:"
@@ -1671,7 +1671,7 @@ msgid "Replace &All"
 msgstr "Erstatt &alt"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr ""
@@ -2573,7 +2573,7 @@ msgid "Files:"
 msgstr ""
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Forskjellig"
@@ -2610,7 +2610,7 @@ msgid "Right:"
 msgstr ""
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Identiske"
@@ -2810,7 +2810,7 @@ msgid "A&ppend timestamp"
 msgstr ""
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr ""
@@ -2888,7 +2888,7 @@ msgstr ""
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Mappe"
@@ -3488,7 +3488,7 @@ msgid "Version Control"
 msgstr ""
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr ""
@@ -3611,87 +3611,67 @@ msgstr ""
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr ""
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr ""
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr ""
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr ""
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Fullt innhold"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Raskt innhold"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Endringsdato"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr ""
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr ""
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Navn"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Plassering"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filter"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr ""
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Velg navn for nytt filter"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Filfiltere (*.flt)|*.flt|Alle filer (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3700,7 +3680,7 @@ msgid ""
 "%2."
 msgstr ""
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3709,7 +3689,7 @@ msgid ""
 "Please make sure the folder exists and is writable."
 msgstr ""
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3717,7 +3697,7 @@ msgid ""
 "Please select filter folder in Options/System."
 msgstr ""
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3726,12 +3706,12 @@ msgid ""
 "Maybe the file is read-only?"
 msgstr ""
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr ""
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3739,258 +3719,258 @@ msgid ""
 "Could not copy new filter file to filter folder."
 msgstr ""
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr ""
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr ""
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
 msgstr ""
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr ""
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Resultat av sammenligning av mapper"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Filsammenligning"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Venstre uten tittel"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Høyre uten tittel"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr ""
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr ""
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Skanner filer..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Åpner valgte"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Kopierer venstre til høyre"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Kopierer høyre til venstre"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Kopierer alt til venstre"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Kopierer alt til høyre"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Kopierer filer..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Sletter filer..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Flytter filer..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr ""
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr ""
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr ""
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Linje: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Flette"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Forskjell %1 av %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 forskjeller funnet"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "1 forskjell funnet"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr ""
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr ""
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr ""
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Velg to eksisterende mapper eller filer for å sammenligne"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Mappe valg"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Velg to mapper eller filer for sammenligning."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "Venstre sti er ugyldig!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Høyre sti er ugyldig!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Begge stier er ugyldig!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Velg to filer for aktivere utpakkervalg."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Kan ikke sammenligne fil og mappe!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Fil ikke funnet: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Fil ikke pakket ut: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4003,42 +3983,42 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr ""
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid "The file\n%1\nis not a conflict file."
 msgstr ""
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Lagre som"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Lagre endringer til %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 er markert som skrivebeskyttet. Vil du lagre filen under et annet navn?"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Sjekk skrivebeskyttelsen på destinasjonen"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Feil under backup av filen"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4047,7 +4027,7 @@ msgid ""
 "Continue anyway?"
 msgstr ""
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4058,7 +4038,7 @@ msgid ""
 "\t-abort the current operation (Press Cancel)?"
 msgstr ""
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4073,7 +4053,7 @@ msgstr ""
 "\n"
 "Vil du lagre den upakkede versjonen fil en annen fil?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4088,7 +4068,7 @@ msgstr ""
 "\n"
 "Vil du lagre den upakkede versjonen fil en annen fil?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4103,7 +4083,7 @@ msgstr ""
 "\n"
 "Skriv over endret fil?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4112,32 +4092,32 @@ msgstr ""
 "%1\n"
 "er markert skrivebeskyttet. Vil du overstyre det skrivebeskyttede elementet?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
 msgstr ""
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Lagre venstre fil som"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Lagre høyre fil som"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
 msgstr ""
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4145,42 +4125,42 @@ msgid ""
 "Refresh documents before continuing."
 msgstr ""
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Du skal angi en SourceSafe prosjektsti for å fortsette (ie:  $/MittProjekt)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr ""
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "Versjonsstyringssystemet returnerte en feil under forsøket på å sjekke filen ut. Kan ikke fortsette..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Feil under utførelse av versjonsstyringssystemkommando."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "VSS Working Folder og plassering av gjeldende fil stemmer ikke overens. Fortsett?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Ingen VSS database(r) funnet!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Feil fra VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4188,176 +4168,176 @@ msgid ""
 " Undo checkout operation?"
 msgstr ""
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, 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:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Ingen"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (eldre enn 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 og nyere)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr ""
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr ""
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr ""
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr ""
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Slett valgte elementer til venstre"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Slett valgte elementer til høyre"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Slett de valgte element(er) på begge sider"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Skjul valgte element(er) (i farta filter)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr ""
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Høyre til venstre (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Venstre til høyre (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Høyre til venstre (%1 av %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Venstre til høyre (%1 av %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Venstre til... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Høyre til... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Venstre til... (%1 av %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Høyre til... (%1 av %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Venstre (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Høyre (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Begge (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Venstre (%1 av %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Høyre (%1 av %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Begge (%1 av %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Velg målmappe"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr ""
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr ""
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr ""
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr ""
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4368,17 +4348,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr ""
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr ""
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4390,645 +4370,645 @@ msgid ""
 "Please refresh the compare."
 msgstr ""
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr ""
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr ""
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr ""
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Åpne venstre fil"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Åpne venstre fil i ekstern editor"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Åpne venstre fil med ..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Åpne høyre fil"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Åpne høyre fil i ekstern editor"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Åpne høyre fil med ..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr ""
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr ""
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Kopier filnavn til utklippstavle "
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Kopier stinavn på venstre side til utklippstavle"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Kopier stinavn på høyreside til utklippstavle"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Kopier stinavn på begge sider til utklippstavle"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr ""
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr ""
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Ukjent arkivformat"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Legg til element fra venstre side til arkiv"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Legg til element fra høyre side til arkiv"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Legg til element fra begge sider til arkiv"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Legg til forskjellige elementer til arkiv (begge sider)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Flytt valgte filer på venstre side til tilpasset mappe"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Flytt valgte filer på høyre side til tilpasset mappe"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Filnavn"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Resultat av sammenligningen"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Venstre dato"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Høyre dato"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Filtype"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Venstre størrelse"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Høyre størrelse"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr ""
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr ""
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Venstre opprettelsestid"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Høyre opprettelsestid"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Nyere fil"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Venstre filversjon"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Høyre filversjon"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Kort resultat"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Venstre attributter"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Høyre attributter"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr ""
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr ""
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Venstre koding"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Høyre koding"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr ""
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binær"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Kan ikke sammenligne filer"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr ""
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Fil hoppet over"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Mappe hoppet over"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr ""
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr ""
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Binære filer er identiske"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Binære filer er forskjellige"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Filer er forskjellige"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr ""
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Bare venstre"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Bare høyre"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr ""
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr ""
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr ""
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Forløpt tid: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 element valgt"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 elementer valgt"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Fil elle mappe navn."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Undermappenavn når undermapper er inkludert."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Sammenligningsresultat, lang form."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Venstre side endringsdato."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Høyre side endringsdato."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Filtype."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Venstre filstørrelse i byte."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Høyre filstørrelse i byte."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Venstre side opprettelsestid."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Høyre side opprettelsestid."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Forteller hvilken side som sist ble endret."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Venstre side filversjon, bare for noen filtyper."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Høyre side filversjon, bare for noen filetyper."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Kort sammenligningsresultat."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Venstre side attributter."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Høyre side attributter."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr ""
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr ""
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Venstre side koding."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Høyre side koding."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr ""
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr ""
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Viser asterisk (*) hvis filen er binær."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Sammenligning %1 med %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr ""
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr ""
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr ""
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr ""
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr ""
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
 "%1"
 msgstr ""
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr ""
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Samme filen er åpen i begge panel."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "De valgte filene er identiske."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Det skjedde en feil under sammenligning av filene."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Midlertidige filer kan ikke opprettes. Sjekk sti til den TMP/TEMP-mappe."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5043,32 +5023,32 @@ msgstr ""
 "\n"
 "Merknad: Hvis du alltid vil behandle linjeskifttypene likt, velg innstillingen 'Ignorer forskjell i linjeskift' i sammenligningsarket i innstillingsdialogen (tilgjengelig under Rediger/Innstillinger)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, 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:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "En feil oppstod under forhåndsforskjell for filen '%1' med programtillegget '%2'. Forhåndsforskjellen blir ikke brukt mer."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr ""
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr ""
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, 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:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5079,148 +5059,148 @@ msgstr ""
 "Visning av filene i hvert sin tegntabell ser best ut, men fletting/flytting er farlig.\n"
 "Would you like to treat both files as being in the default windows codepage (recommended)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr ""
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr ""
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Ingen forskjell"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Linjeforskjell"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Erstattet %1 streng(er)."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Kan ikke finne strengen \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Kopier full sti"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Kopier filnavn"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr ""
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr ""
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Fil med rettelser vellykket skrevet."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. element ikke funnet eller er mappe!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. element ikke funnet eller er mappe!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Rettelsesfilen eksisterer allerede. Vil du overskrive den?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 filer valgt]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr ""
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr ""
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr ""
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr ""
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Kunne ikke skrive til fil %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr ""
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr ""
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Kan ikke opprette en fil med rettelser for binære filer."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Kan ikke opprette en fil med rettelser for mapper."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5228,17 +5208,17 @@ msgid ""
 "Creating a patch requires that there are no unsaved changes in files."
 msgstr ""
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr ""
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Gjeldende resultat for mappesammenligning vil bli slettet."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5249,51 +5229,51 @@ msgstr ""
 "Alle nødvendig komponenter (7-zip og/eller Merge7z*.dll) for arkivstøtte ble ikke funnet.\n"
 "Se manualen for mer informasjon om arkivstøtte og hvordan aktivere den."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
 "Note: 7-Zip integration is disabled in WinMerge settings."
 msgstr ""
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
 "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings."
 msgstr ""
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr ""
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr ""
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr ""
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr ""
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr ""
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr ""
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5301,261 +5281,261 @@ msgid ""
 "Do you want to continue?"
 msgstr ""
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Feil i regulært uttrykk"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Ingen treff"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Ugyldig regulært uttrykk"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Ugyldig collation tegn"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Ugyldig tegnklassenavn"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Etterfølgende omvendt skråstrek"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Ugyldig tilbakereferanse"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Ubalansert [ eller [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Ubalansert ( eller \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Ubalansert \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Ugyldig i innhold i \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Ugyldig område slutt"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Tom for minne"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Ugyldig foregående regulært uttrykk"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Fortidlig slutt på regulært uttrykk"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "For stort regulært uttrykk"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Ubalansert ) eller \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr ""
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr ""
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr ""
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr ""
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr ""
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr ""
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr ""
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr ""
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr ""
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr ""
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr ""
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr ""
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr ""
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr ""
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr ""
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr ""
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr ""
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Lagre venstre fil"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Lagre høyre fil"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Lagre venstre fil med navn..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Lagre høyre fil med navn..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr ""
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr ""
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr ""
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Veksle mellom redigerings- og flettemodus"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
 "File encoding properties"
 msgstr ""
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr ""
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
 "Difference in the Current Line"
 msgstr ""
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5564,7 +5544,7 @@ msgstr ""
 "Gå til linje eller forskjell\n"
 "Gå til (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5573,7 +5553,7 @@ msgstr ""
 "Sett programinnstillinger\n"
 "Innstillinger"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5582,79 +5562,79 @@ msgstr ""
 "Oppdater visning\n"
 "Oppdater (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Kopier valgte linjer til utklippstavle med linjenummer foran"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr ""
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr ""
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr ""
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr ""
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
 "Show Identical Items"
 msgstr ""
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
 "Show Different Items"
 msgstr ""
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
 "Show Left Unique Items"
 msgstr ""
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
 "Show Right Unique Items"
 msgstr ""
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
 "Show Binary Files"
 msgstr ""
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
 "Show Skipped Items"
 msgstr ""
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5663,7 +5643,7 @@ msgstr ""
 "Velg skrifttype for visningen\n"
 "Velg skrifttype"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5672,163 +5652,163 @@ msgstr ""
 "Bruk standard skrifttype for visningen\n"
 "Standard skrifttype"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Viser et tegn for mellomrom"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Veksle forskjellsvindu"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Plasseringsvindu viser oversiktbilde av filene"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr ""
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid "Select the current user interface language\nLanguage"
 msgstr ""
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid "Shows differences inside lines with different colors\nShow Line Difference"
 msgstr ""
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr ""
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
 "Show Line Numbers"
 msgstr ""
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
 "Wrap Lines"
 msgstr ""
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
 "Show Selection Margins"
 msgstr ""
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr ""
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr ""
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr ""
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
 msgstr ""
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
 msgstr ""
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
 msgstr ""
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
 msgstr ""
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid "Scroll to the last difference\nLast Difference (Alt+End)"
 msgstr ""
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -5837,7 +5817,7 @@ msgstr ""
 "Kopier den valgte teksten til den høyre filen\n"
 "Kopier høyre (Alt Høyre)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -5846,7 +5826,7 @@ msgstr ""
 "Kopier den valgte teksten til den venstre filen\n"
 "Kopier venstre (Alt Venstre)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -5855,7 +5835,7 @@ msgstr ""
 "Kopier forskjell til høyre og gå videre til neste\n"
 "Kopier høyre og gå videre (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -5864,7 +5844,7 @@ msgstr ""
 "Kopier forskjell til høyre og gå videre til neste\n"
 "Kopier venstre og gå videre (Ctrl+Alt+Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -5873,7 +5853,7 @@ msgstr ""
 "Kopier alle forskjeller til den høyre filen\n"
 "Alt til høyre"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -5882,382 +5862,382 @@ msgstr ""
 "Kopier alle forskjeller til den venstre filen\n"
 "Alt til venstre"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr ""
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr ""
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Velg og endre rekkefølge for kolonner for mappesammenligning"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Generer en fil med rettelser"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Velg og endre filter"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr ""
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr ""
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "Brukeren velger utpakker (ingen utpakker ved sammenligning av mapper)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Den tilpassede utpakkeren brukes på begge filer (en filtype må kunne bestemmes)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Velg en utpakker for denne filen"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Ingen forhåndforskjellviser (normal)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Foreslåtte programtillegg"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Andre programtillegg"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Fjern og laste på nytt alle programtillegg (for utviklere)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid "Activates next visible file\nActivate next File"
 msgstr ""
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr ""
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid "Opens the WinMerge Help\nWinMerge Help"
 msgstr ""
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Skriver gjeldende versjon av WinMerge og konfigurasjon til en tekstfil"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr ""
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Kompilert privat: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid "Opens the release notes document\nRelease Notes"
 msgstr ""
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid "Opens the translations website\nTranslations"
 msgstr ""
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Instillinger for programtillegg"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Ingen forhåndsforskjell"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Forhåndsforskjell hvis mulig"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH ikke funnet - .sct skript ikke aktivert"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Ingen>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Automatisk>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr ""
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr ""
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr ""
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Ikke vis flyttede blokker"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr ""
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Vis flyttede blokker bare fra gjeldende forskjell"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Gå til forskjell under markør"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "G&å til forskjell %1 av %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "G&å til linje %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr ""
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr ""
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr ""
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr ""
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr ""
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr ""
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr ""
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr ""
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr ""
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr ""
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr ""
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr ""
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr ""
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr ""
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr ""
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr ""
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr ""
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr ""
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr ""
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr ""
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr ""
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr ""
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr ""
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr ""
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr ""
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr ""
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr ""
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr ""
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr ""
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr ""
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr ""
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr ""
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr ""
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr ""
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr ""
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr ""
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr ""
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr ""
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index 9d81bf1..74dd7e8 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -1029,7 +1029,7 @@ msgid "&Scripts"
 msgstr "&S ÏÓÊ äæíÓåÇ "
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "<ÎÇáí>"
@@ -1470,7 +1470,7 @@ msgid "&Versioning System:"
 msgstr "&V  äÓÎå \90ÐÇÑí ÓíÓÊã "
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&P   cleartool.exe ãÓíÑ : "
@@ -1671,7 +1671,7 @@ msgid "Replace &All"
 msgstr "&A ÌÇí\90Òíäí åã\90í"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr " ÑÔäÇá \98áÑ\98íÓ "
@@ -2587,7 +2587,7 @@ msgid "Files:"
 msgstr " \81ÑæäÏå åÇ : "
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr " ãÊãÇíÒ"
@@ -2624,7 +2624,7 @@ msgid "Right:"
 msgstr " ÑÇÓÊ : "
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr " í\98ÓÇä "
@@ -2824,7 +2824,7 @@ msgid "A&ppend timestamp"
 msgstr "&p \81íæäÏ ãåÑ ÒãÇä "
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr " ÊÇííÏ ÑæäæÔÊ ÈÑÏÇÑí "
@@ -2902,7 +2902,7 @@ msgstr "&S 
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr " \81æÔå "
@@ -3540,7 +3540,7 @@ msgid "Version Control"
 msgstr " ÈÇÒÈíäí æíÑÇíÔ "
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr " ÊÝÇæÊåÇ "
@@ -3668,87 +3668,67 @@ msgstr "XML  
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr " ãÍÊæíÇÊ ãÔÑæÍ "
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr " ãÍÊæíÇÊ \98æÊÇå  "
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr " ÊÇÑíÎ ÇÕáÇÍ ÔÏå "
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr " ÊÇÑíÎ æ ÇäÏÇÒå ÇÕáÇÍ ÔÏå "
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr " ÇäÏÇÒå "
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr " äÇã "
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr " ãÍá "
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr " ÕÇÝíåÇ "
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr " ÔÑÍ "
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr " ÇäÊÎÇÈ äÇã \81ÑæäÏå ÈÑÇí ÕÇÝí ÌÏíÏ "
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr " \81ÑæäÏå ÕÇÝíåÇ  (*.flt)|*.flt|åãå \81ÑæäÏå åÇ  (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3761,7 +3741,7 @@ msgstr ""
 " áØÝÇ \81ÑæäÏå ÑæÈÑæ Èå \81æÔå ÕÇÝíåÇí æíäãÑÌ (ÒíÑ) ÑæäæÔÊ ÈÑÏÇÑí ÔæÏ : %1 \n"
 "%2"
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3773,7 +3753,7 @@ msgstr ""
 "%1\n"
 " áØÝÇ ÇØãíäÇä ÍÇÕá ÔæÏ \98å \81æÔå æÌæÏ ÏÇÑÏ æ ÞÇÈá äæÔÊä ÇÓÊ "
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3784,7 +3764,7 @@ msgstr ""
 "\n"
 " áØÝÇ ÏÑ ÎíÇÑÇÊ > ÓíÓÊã  \81æÔå ÕÇÝí ÑÇ ÇäÊÎÇÈ äãÇííÏ "
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3797,12 +3777,12 @@ msgstr ""
 "\n"
 "ãã\98ä ÇÓÊ \98å \81ÑæäÏå   ÝÞØ ÎæÇäÏäí   ÈÇÔÏ¿ "
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr " ÊÚííä \81ÑæäÏå ÕÇÝí ÈÑÇí äÕÈ "
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3813,17 +3793,17 @@ msgstr ""
 "\n"
 " äãí ÊæÇä \81ÑæäÏå ÕÇÝí ÌÏíÏ ÑÇ Èå \81æÔå ÕÇÝí ÑæäæÔÊ ÈÑÏÇÑí äãæÏ "
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr " \81ÑæäÏå ÕÇÝí \81íÔ ÇÒ Çíä æÌæÏ ÏÇÑÏ. ÂíÇ ÕÇÝí ãæÌæÏ ÏæÈÇÑå äæíÓí ÔæÏ¿ "
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr " ÚÈÇÑÊ ãäÙã / ÞÇÚÏå ãäÏ "
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3834,243 +3814,243 @@ msgstr ""
 "\n"
 "  Ç\90Ñ äãí ÎæÇåíÏ ÊãÇã åãÓäÌíåÇí ÈÇÒÓÇÒí ÔæÏ¡ ãí ÊæÇäíÏ ÎíÑ ÑÇ ÇäÊÎÇÈ \98ÑÏå æ åãÓäÌíåÇ ÑÇ ÈÚÏÇ ÈÇÒÓÇÒí äãÇííÏ "
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "&P ãÓíÑ SS.EXE : "
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr " äÊÇíÌ åãÓäÌí \81æÔå åÇ "
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr " åãÓäÌí \81ÑæäÏå "
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr " \8d\81 ÈÏæä ÚäæÇä "
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr " ÑÇÓÊ ÈÏæä ÚäæÇä "
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr " \81ÑæäÏå Ïí\90ÑÇä "
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr " \81ÑæäÏå ÎæÏã "
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr " \81æíÔ \81ÑæäÏå åÇ ... "
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr " ÈÇÒ\98ÑÏä \90Òíäå "
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr " ÑæäæÔÊ ÈÑÏÇÑí \8d\81 Èå ÑÇÓÊ "
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr " ÑæäæÔÊ ÈÑÏÇÑí ÑÇÓÊ Èå \8d\81 "
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr " ÑæäæÔÊ ÈÑÏÇÑí åã\90í Èå \8d\81 "
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr " ÑæäæÔÊ ÈÑÏÇÑí åã\90í Èå ÑÇÓÊ "
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr " ÑæäæÔÊ ÈÑÏÇÑí \81ÑæäÏå åÇ ... "
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr " ÍÐÝ \81ÑæäÏå åÇ ... "
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr " ÌÇÈÌÇíí \81ÑæäÏå åÇ ... "
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr " ÇíÌÇÏ \90ÒÇÑÔ ... "
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr " Èí ÇËÑ \98ÑÏä ÂÎÑíä Úãá ... "
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr " Ê\98ÑÇÑ Úãá ÞÈáí ... "
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr " ÎØ : %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr " \81íæäÏ ÒÏä  "
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr " ÊÝÇæÊ %1 ÇÒ %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr " ÊÝÇæÊåÇí \81íÏÇ ÔÏå = %1"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr " í\98 ÊÝÇæÊ \81íÏÇ ÔÏ "
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "RO"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "  ãæÑÏ %1 ÇÒ %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr " ãæÇÑÏ : %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr " ÇäÊÎÇÈ Ïæ \81æÔå íÇ \81ÑæäÏå ãæÌæÏ ÈÑÇí ãÞÇíÓå "
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr " ÇäÊÎÇÈ \81æÔå "
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr " ÇäÊÎÇÈ \98ÑÏä Ïæ \81æÔå íÇ Ïæ \81ÑæäÏå ÈÑÇí ãÞÇíÓå "
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr " ãÓíÑ \8d\81 æÌæÏ äÏÇÑÏ ! "
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr " ãÓíÑ ÑÇÓÊ æÌæÏ äÏÇÑÏ ! "
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr " åÑ Ïæ ãÓíÑ æÌæÏ äÏÇÑäÏ ! "
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr " Ïæ \81ÑæäÏå ÑÇ ÇäÊÎÇÈ äãÇííÏ ÊÇ ÇäÊÎÇÈ   ÈÇÒ\98ääÏå ÈÓÊå    ÝÚÇá \90ÑÏÏ "
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr " äãíÊæÇä \81æÔå æ \81ÑæäÏå ÑÇ ãÞÇíÓå \98ÑÏ ! "
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr " \81ÑæäÏå ÑæÈÑæ \81íÏÇ äÔÏ : %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr " ÈÓÊå \81ÑæäÏå ÑæÈÑæ ÈÇÒ äÔÏ : %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4083,12 +4063,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr " äÇãæÝÞ ÈæÏä ÊÌÒíå æ ÊÍáíá \81ÑæäÏå ÊÚÇÑÖ "
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4099,32 +4079,32 @@ msgstr ""
 "%1\n"
 "í\98 \81ÑæäÏå ÊÚÇÑÖ¡ äãí ÈÇÔÏ "
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr " ÐÎíÑå \98ÑÏä Èå ÕæÑÊ "
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr " ÂíÇ ÊÛííÑÇÊ ÏÑ %1 ÐÎíÑå ÔæÏ¿"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "\81ÑæäÏå  %1 ÈÕæÑÊ ÝÞØ ÎæÇäÏäí ÚáÇãÊ ÒÏå ÔÏå ÇÓÊ. ÂíÇ ãÇíá åÓÊíÏ   \81ÑæäÏå ÝÞØ ÎæÇäÏäí   ÈÇØá \90ÑÏÏ¿ - ÈÇ äÇã ÌÏíÏ ÐÎíÑå ä\90ÑÏÏ "
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr " ÈÑÑÓí ÎØÇí ÞÇÈá äæÔÊä ÈæÏä ãÞÕÏ "
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr " ÎØÇ ÏÑ Êåíå \81ÑæäÏå \81ÔÊíÈÇä "
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4137,7 +4117,7 @@ msgstr ""
 "\n"
 " Èå åÑ ÍÇá \98ÇÑ ÇÏÇãå íÇÈÏ¿ "
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4154,7 +4134,7 @@ msgstr ""
 "\t- í\98 äÇã \81ÑæäÏå ãÊÝÇæÊ ÇÓÊÝÇÏå \98äíÏ - ÊÇííÏ ÑÇ ÈÝÔÇÑíÏ \n"
 "\t- Úãá ÌÇÑí áÛæ ÔæÏ - áÛæ ÑÇ ÈÝÔÇÑíÏ ¿"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4169,7 +4149,7 @@ msgstr ""
 "\n"
 " ÂíÇ ãí ÎæÇåíÏ \98å äÓÎå ÈÇ ÈÓÊå ÈÇÒÔÏå Èå ÕæÑÊ \81ÑæäÏå Ïí\90Ñí ÐÎíÑå ÔæÏ¿ "
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4184,7 +4164,7 @@ msgstr ""
 "\n"
 " ÂíÇ ãí ÎæÇåíÏ \98å äÓÎå ÈÇ ÈÓÊå ÈÇÒÔÏå Èå ÕæÑÊ \81ÑæäÏå Ïí\90Ñí ÐÎíÑå ÔæÏ¿ "
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4199,7 +4179,7 @@ msgstr ""
 "\n"
 "  \81ÑæäÏå ÊÛííÑ íÇÝÊå ÏæÈÇÑå äæíÓí ÔæÏ¿"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4208,7 +4188,7 @@ msgstr ""
 "%1\n"
 " ÈÕæÑÊ ÝÞØ ÎæÇäÏäí ÚáÇãÊ ÏÇÑ ÔÏå ÇÓÊ. ÂíÇ ãÇíá åÓÊíÏ \98å ãæÑÏ ÝÞØ ÎæÇäÏäí ÈÇØá \90ÑÏÏ¿ "
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4223,22 +4203,22 @@ msgstr ""
 "\n"
 " ÂíÇ ãÇíá åÓÊíÏ \98å \81ÑæäÏå ÏæÈÇÑå ÈÇÑ\90íÑí ÔæÏ¿"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr " ÐÎíÑå \81ÑæäÏå \8d\81 Èå ÕæÑÊ "
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr " ÐÎíÑå \81ÑæäÏå ÑÇÓÊ Èå ÕæÑÊ "
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid ""
 "The file\n"
@@ -4249,7 +4229,7 @@ msgstr ""
 "%1\n"
 " äÇ\81ÏíÏ ÔÏå ÇÓÊ. áØÝÇ í\98 ÑæäæÔÊ ÇÒ \81ÑæäÏå ÑÇ ÐÎíÑå äãÇííÏ ÊÇ \98ÇÑ ÇÏÇãå íÇÈÏ "
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4260,42 +4240,42 @@ msgstr ""
 "\n"
 " ÇÓäÇÏ ÞÈá ÇÒ ÇÏÇãå \98ÇÑ ÈÇÒÓÇÒí / ÊÇÒå ÔæäÏ "
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr " $/MyProject ÔãÇ ÈÇíÓÊí í\98 ãÓíÑ ÈÑÇí \81Ñæ\8eå ÓæÑÓ ÓíÝ ãÔÎÕ äãÇííÏ ÊÇ \98ÇÑ ÇÏÇãå íÇÈÏ - ÈØæÑãËÇá"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr " ...  VSS æÇÑÓí \81ÑæäÏå åÇ ÇÒ "
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr " ÏÑ ÒãÇäí \98å ãÈÇÏÑÊ Èå æÇÑÓí \81ÑæäÏå \90ÑÏíÏ¡ äÓÎå \90ÐÇÑí ÓíÓÊã ÈÇ ÎØÇ ãæÇÌå ÔÏ. ÚÇÌÒ ÇÒ ÇÏÇãå \98ÇÑ ... "
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr " ÎØÇ ÏÑ ÇÌÑÇí ÝÑãÇä äÓÎå \90ÐÇÑí ÓíÓÊã "
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr " \81æÔå \98ÇÑí æ ã\98Çä \81ÑæäÏå ÌÇÑí ÊØÈíÞ äÏÇÑäÏ. \98ÇÑ ÇÏÇãå íÇÈÏ¿ VSS "
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "VSS  \81Çí\90Çå(åÇí) ÏÇÏå \81íÏÇ äÔÏ ! "
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "  : VSS  ÎØÇ ÇÒ  "
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4306,7 +4286,7 @@ msgstr ""
 "  áØÝÇ ãÔÎÕÇÊ \81í\98ÑÈäÏí äãÇíÔ ÇÓÊÝÇÏå ÔÏå¡ ÈÑÑÓí ÔæÏ \n"
 "  ÏÓÊæÑÇáÚãá æÇÑÓí Èí ÇËÑ \90ÑÏÏ ¿"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4316,169 +4296,169 @@ msgstr ""
 "  áØÝÇ ãÔÎÕÇÊ \81í\98ÑÈäÏí äãÇíÔ ÇÓÊÝÇÏå ÔÏå¡ ÈÑÑÓí ÔæÏ \n"
 " "
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr " åí\8dí\98 "
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr " æí\8eæÇá ÓæÑÓ ÓíÝ - äÓÎå \81Çííä ÊÑ ÇÒ 5.0 "
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr " æí\8eæÇá ÓæÑÓ ÓíÝ - äÓÎå 5.0 æ ÈÇáÇÊÑ "
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr " ÊæÞÝ ÏÑ ÝÇÕáå ÓÝíÏ"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "ÊæÞÝ ÏÑ ÝÇÕáå ÓÝíÏ íÇ äÞØå / äÔÇä \90ÐÇÑì   "
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr " ÑæäæÔÊ ÈÑÏÇÑí ãæÑÏ ÇäÊÎÇÈ ÔÏå Èå ÝåÑÓÊ ÑÇåäãÇí äÇãÈÑÏå  "
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr " ÑæäæÔÊ ÈÑÏÇÑí ãæÑÏ ÇäÊÎÇÈ ÔÏå Èå ÝåÑÓÊ ÑÇåäãÇí ÓÝÇÑÔí  "
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr " ÍÐÝ ãæÑÏ ÇäÊÎÇÈ ÔÏå ÏÑ \8d\81 "
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr " ÍÐÝ ãæÑÏ ÇäÊÎÇÈ ÔÏå ÏÑ ÑÇÓÊ "
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr " ÍÐÝ äãæÏä ãæÑÏ (åÇí) ÇäÊÎÇÈ ÔÏå ÏÑ åÑ Ïæ ØÑÝ "
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr " \81äåÇä äãæÏä ãæÑÏ (åÇí) ÇäÊÎÇÈ ÔÏå - ÈÇ ÕÇÝí ÝÚÇá "
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr " ÊÛííÑ äÇã ãæÑÏ ÇäÊÎÇÈ ÔÏå ÏÑ åÑ Ïæ ÓãÊ "
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr " ÑÇÓÊ Èå \8d\81 - %1"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr " \8d\81 Èå ÑÇÓÊ - %1"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "  ÑÇÓÊ  Èå \8d\81 - %1 ÇÒ %2 "
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "  \8d\81 Èå ÑÇÓÊ - %1 ÇÒ %2 "
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr " \8d\81 Èå ... - %1"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr " ÑÇÓÊ Èå ... - %1"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "  \8d\81 Èå ... - %1 ÇÒ %2 "
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "  ÑÇÓÊ Èå ... - %1 ÇÒ %2 "
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr " \8d\81 - %1"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr " ÑÇÓÊ - %1"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr " åÑ Ïæ ÓãÊ - %1"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr " \8d\81 - %1 ÇÒ %2"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr " ÑÇÓÊ - %1 ÇÒ %2"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr " åÑ Ïæ ÓãÊ - %1 ÇÒ %2"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr " ÇäÊÎÇÈ \81æÔå ãÞÕÏ "
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr " ØÑÝ \8d\81 - ÇäÊÎÇÈ \81æÔå ãÞÕÏ : "
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr " ØÑÝ ÑÇÓÊ - ÇäÊÎÇÈ \81æÔå ãÞÕÏ : "
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "{  \81ÑæäÏå åÇí ÊÍÊ ÊÇËíÑ æÇÞÚ ÔÏå:  %1 }"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "{  \81ÑæäÏå åÇí ÊÍÊ ÊÇËíÑ æÇÞÚ ÔÏå: %1 ÇÒ %2  }"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4489,17 +4469,17 @@ msgstr ""
 "\n"
 " ÑÇ ÍÐÝ äãÇííÏ %1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr " ÂíÇ ãØãÆä åÓÊíÏ \98å ãíÎæÇåíÏ ÑæäæÔÊ ÈÑÏÇÑí äãÇííÏ ÇÒ : "
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr " ÝÞÑå ÑæäæÔÊ ÈÑÏÇÑí ÔæÏ¿ %d ÂíÇ ãØãÆä åÓÊíÏ \98å ãí ÎæÇåíÏ ÇÒ "
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4517,613 +4497,613 @@ msgstr ""
 " \81íÏÇ äÔÏ \n"
 " áØÝÇ ãÞÇíÓå ÑÇ ÊÌÏíÏ äãÇííÏ "
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr " ÂíÇ ãØãÆä åÓÊíÏ \98å ãíÎæÇåíÏ Çíä ÑÇ ÌÇÈÌÇ äãÇííÏ: "
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr " ãæÑÏ ÌÇÈÌÇ ÔæÏ¿ %d"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr " ÊÇííÏ ÌÇÈÌÇíí "
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr " ÈÇÒ\98ÑÏä \81ÑæäÏå \8d\81 "
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr " ÈÇÒ\98ÑÏä \81ÑæäÏå \8d\81í ÈÇ æíÑÇÓÊÇÑ ÎÇÑÌí "
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr " ÈÇÒ\98ÑÏä \81ÑæäÏå \8d\81 ÈÇ ... "
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr " ÈÇÒ\98ÑÏä \81ÑæäÏå ÑÇÓÊ "
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr " ÈÇÒ\98ÑÏä \81ÑæäÏå ÑÇÓÊí ÏÑ æíÑÇÓÊÇÑ ÎÇÑÌí "
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr " ÈÇÒ\98ÑÏä \81ÑæäÏå ÑÇÓÊ ÈÇ ... "
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr " ÇÌÑÇí äÇãæÝÞ æíÑÇÓÊÇÑ ÎÇÑÌí : %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr " ÊæÓÚå äÇÔäÇÓ ÈÑÇí æíÑÇÓÊÇÑ ÎÇÑÌí : %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr " ÑæäæÔÊ ÈÑÏÇÑí äÇã \81ÑæäÏå åÇ Èå \98áí\81 ÈæÑÏ / ÍÇÝÙå íÇÏÏÇÔÊ "
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr " ÑæäæÔÊ ÈÑÏÇÑí äÇã ãÓíÑåÇí ÓãÊ \8d\81 Èå ÍÇÝÙå íÇÏÏÇÔÊ / \98áí\81 ÈæÑÏ "
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr " ÑæäæÔÊ ÈÑÏÇÑí äÇã ãÓíÑåÇí ÓãÊ ÑÇÓÊ Èå ÍÇÝÙå íÇÏÏÇÔÊ / \98áí\81 ÈæÑÏ "
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr " ÑæäæÔÊ ÈÑÏÇÑí äÇã ãÓíÑåÇí åÑ Ïæ ØÑÝ Èå ÍÇÝÙå íÇÏÏÇÔÊ / \98áí\81 ÈæÑÏ "
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr " \90Òíä\90Çä / ÝåÑÓÊ \81æÓÊå \8d\81 "
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr " \90Òíä\90Çä / ÝåÑÓÊ \81æÓÊå ÑÇÓÊ "
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr " ÈÇí\90Çäí ÈÇ ÞÇáÈ ÈäÏí äÇÔäÇÓ "
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr " ÇÝÒæÏä ãæÇÑÏ ÇÒ ÓãÊ \8d\81 Èå ÈÇí\90Çäí "
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr " ÇÝÒæÏä ãæÇÑÏ ÇÒ ÓãÊ ÑÇÓÊ Èå ÈÇí\90Çäí "
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr " ÇÝÒæÏä ãæÇÑÏ ÇÒ åÑ Ïæ ØÑÝ Èå ÈÇí\90Çäí "
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr " ÇÝÒæÏä ãæÇÑÏ ãÊÝÇæÊ Èå ÈÇí\90Çäí åÑ Ïæ ÓãÊ "
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr " \81ÑæäÏå ÇäÊÎÇÈ ÔÏå ÏÑ ÓãÊ \8d\81 Èå ÝåÑÓÊ ÑÇåäãÇí ÓÝÇÑÔí ÌÇÈÌÇ ÔæÏ "
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr " \81ÑæäÏå ÇäÊÎÇÈ ÔÏå ÏÑ ÓãÊ ÑÇÓÊ Èå ÝåÑÓÊ ÑÇåäãÇí ÓÝÇÑÔí ÌÇÈÌÇ ÔæÏ "
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr " äÇã \81ÑæäÏå "
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr " äÊíÌå ãÞÇíÓå "
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr " ÊÇÑíÎ \8d\81 "
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr " ÊÇÑíÎ ÑÇÓÊ "
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr " ÊæÓÚå "
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr " ÇäÏÇÒå \8d\81 "
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr " ÇäÏÇÒå ÑÇÓÊ "
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr " ÓãÊ ÑÇÓÊ - ãÎÊÕÑ "
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr " ÓãÊ \8d\81 - ãÎÊÕÑ "
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr " ÒãÇä ÇíÌÇÏ \8d\81í "
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr " ÒãÇä ÇíÌÇÏ ÑÇÓÊí "
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr " \81ÑæäÏå ÌÏíÏÊÑ "
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr " äÓÎå \81ÑæäÏå \8d\81 "
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr " äÓÎå \81ÑæäÏå ÑÇÓÊ "
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr " äÊíÌå \98æÊÇå "
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr " ÎÕíÕå åÇí \8d\81í "
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr " ÎÕíÕå åÇí ÑÇÓÊí "
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr " \8d\81  EOL "
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "  ÑÇÓÊ  EOL "
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr " \98ÏÈäÏí \8d\81 "
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr " \98ÏÈäÏí ÑÇÓÊ "
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr " ÊÝÇæÊ \8dÔã \81æÔí ÔÏå "
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr " Ïæ\90Çäí/ ÈÇíäÇÑí "
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr " äÇÊæÇä ÇÒ åãÓäÌí \81ÑæäÏå åÇÓÊ"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr " ãæÑÏ ÇäÕÑÇÝí "
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr " \81ÑæäÏå ÇÒ Þáã ÇÝÊÇÏå "
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr " \81æÔå ÇÒ Þáã ÇÝÊÇÏå "
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr " ÝÞØ \8d\81 : %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr " ÝÞØ ÑÇÓÊ : %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr " \81ÑæäÏå åÇí Ïæ\90Çäí / ÈÇíäÇÑí åãÓÇä åÓÊäÏ "
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr " \81ÑæäÏå åÇí Ïæ\90Çäí / ÈÇíäÇÑí ãÊÝÇæÊ åÓÊäÏ "
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr " \81ÑæäÏå åÇ ãÊÝÇæÊ åÓÊäÏ "
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr " \81æÔå åÇ ãÊÝÇæÊ åÓÊäÏ "
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr " ÝÞØ \8d\81 "
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr " ÝÞØ ÑÇÓÊ "
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr " ÎØÇ "
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr " \81ÑæäÏå åÇí ãÊäí åãÓÇä åÓÊäÏ "
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr " \81ÑæäÏå åÇí ãÊäí ãÊÝÇæÊ åÓÊäÏ "
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr " ÒãÇä Ó\81Ñí ÔÏå - ãíáí ËÇäíå : %ld"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr " í\98 ãæÑÏ ÇäÊÎÇÈ ÔÏ "
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "ãæÇÑÏ ÇäÊÎÇÈ ÔÏå = %1"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr " äÇã \81ÑæäÏå íÇ \81æÔå "
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr " äÇã ÒíÑ\81æÔå ãæÞÚí \98å ÒíÑ\81æÔå åÇ ÔÇãá åÓÊäÏ "
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr " Ô\98á ãÈÓæØ äÊÇíÌ åãÓäÌí / ãÞÇíÓå "
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr " ÊÇÑíÎ ÊÛííÑ ÓãÊ \8d\81í "
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr " ÊÇÑíÎ ÊÛííÑ ÓãÊ ÑÇÓÊí "
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr " ÊæÓÚå \81ÑæäÏå "
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr " ÇäÏÇÒå \81ÑæäÏå \8d\81 Èå ÈÇíÊ "
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr " ÇäÏÇÒå \81ÑæäÏå ÑÇÓÊ Èå ÈÇíÊ "
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr " ÇäÏÇÒå \81ÑæäÏå ÓãÊ \8d\81 ÈÕæÑÊ ãÎÊÕÑ äãÇíÔ ÏÇÏå ãí ÔæÏ "
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr " ÇäÏÇÒå \81ÑæäÏå ÓãÊ ÑÇÓÊ ÈÕæÑÊ ãÎÊÕÑ äãÇíÔ ÏÇÏå ãí ÔæÏ "
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr " ÒãÇä ÇíÌÇÏ ØÑÝ \8d\81 "
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr " ÒãÇä ÇíÌÇÏ ØÑÝ ÑÇÓÊ "
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr " ãí \90æíÏ \98å ÊÇÑíÎ ÊÛííÑ \98ÏÇã ÓãÊ ÌÏíÏÊÑ ÇÓÊ "
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr " ä\90ÇÑÔ \81ÑæäÏå ÓãÊ \8d\81¡ ÝÞØ ÈÑÇí ÈÑÎí ÇÒ ÇäæÇÚ \81ÑæäÏå åÇ "
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr " ä\90ÇÑÔ \81ÑæäÏå ÓãÊ ÑÇÓÊ¡ ÝÞØ ÈÑÇí ÈÑÎí ÇÒ ÇäæÇÚ \81ÑæäÏå åÇ "
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr " äÊíÌå åãÓäÌí ÈØæÑ \98æÊÇå "
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr " ÎÕíÕå åÇí ÓãÊ \8d\81 "
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr " ÎÕíÕå åÇí ÓãÊ ÑÇÓÊ "
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "  \81ÑæäÏå ÓãÊ \8d\81 EOL äæÚ "
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "  \81ÑæäÏå ÓãÊ ÑÇÓÊ EOL äæÚ "
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr " \98ÏÈäÏí ÓãÊ \8d\81 "
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr " \98ÏÈäÏí ÓãÊ ÑÇÓÊ "
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr " ÔãÇÑå ÊÝÇæÊåÇí \8dÔã \81æÔí ÔÏå ÏÑ \81ÑæäÏå. Çíä ÊÝÇæÊåÇ ÊæÓØ æíäãÑÌ \8dÔã \81æÔí ÔÏå ÇÓÊ æ ÞÇÈá \81íæäÏ ÒÏä äíÓÊ "
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr " ÔãÇÑå ÊÝÇæÊåÇ ÏÑ \81ÑæäÏå. Çíä ÔãÇÑå ÔÇãá ÊÝÇæÊåÇí \8dÔã \81æÔí ÔÏå äãí ÔæÏ "
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr " äãÇíÔ í\98 ÓÊÇÑå * ÏÑ ÕæÑÊí\98å \81ÑæäÏå Ïæ\90Çäí / ÈÇíäÇÑí ÈÇÔÏ "
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr " åãÓäÌí  %1 ÈÇ  %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr " ÝåÑÓÊí \98å ÈÇ \98ÇãÇ ÌÏÇ ÔÏå ÈÇÔÏ "
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr " ÝåÑÓÊ ÌÏÇÔÏå ÈÇ \98áíÏ ÌåÔ "
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr " ÓÇÏå HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr " ÓÇÏå XML "
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr " \81íÔ ÇÒ Çíä¡ \81ÑæäÏå \90ÒÇÑÔ æÌæÏ ÏÇÔÊå ÇÓÊ. ÂíÇ ãÇíáíÏ \98å \81ÑæäÏå ÌÇí\90Òíä ÔæÏ ¿ "
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5132,32 +5112,32 @@ msgstr ""
 " ÎØÇ ÏÑ ÇíÌÇÏ \90ÒÇÑÔ : \n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr " \90ÒÇÑÔ ÈÇ ãæÝÞíÊ ÇíÌÇÏ ÔÏå ÇÓÊ  "
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "  í\98  \81ÑæäÏå ÏÑ åÑ Ïæ ÊÇÈáæ ÈÇÒ ÔÏå ÇÓÊ"
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr " \81ÑæäÏå åÇí ÇäÊÎÇÈ ÔÏå åãÓÇä åÓÊäÏ  "
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr " Èå åä\90Çã åãÓäÌí \81ÑæäÏå åÇ ÎØÇíí ÑÎ ÏÇÏ "
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr " \81ÑæäÏå åÇí ãæÞÊí ÑÇ äãí ÊæÇä ÇíÌÇÏ äãæÏ. ÊäÙíãÇÊ ãÓíÑ ãæÞÊ ÈÑÑÓí \90ÑÏÏ "
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5172,7 +5152,7 @@ msgstr ""
 "\n"
 "ÊæÌå: ÏÑ ÕæÑÊí\98å ãí ÎæÇåíÏ ÈÑÇí åãíÔå ÊãÇã ÇäæÇÚ ÚáÇãÊåÇí ÈÇÒ\90ÔÊ Èå ÓÑ ÓØÑ í\98ÓÇä ÏÑ äÙÑ \90ÑÝÊå ÔæäÏ¡ ÇäÊÎÇÈ \"äÇÏíÏå \90ÑÝÊä ÊÝÇæÊ ÚáÇãÊåÇí ÈÇÒ\90ÔÊ Èå ÓÑ ÓØÑ ...\" ÏÑ ÈÎÔ ãÞÇíÓå / åãÓäÌí \81äÌÑå ãÍÇæÑå ÎíÇÑÇÊ {ãæÌæÏ ÒíÑ æíÑÇíÔ>ÎíÇÑÇÊ} ÚáÇãÊ ÒÏå ÔæÏ "
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5183,22 +5163,22 @@ msgstr ""
 " ÈÇ ÎíÇÑÇÊ ÝÚáí¡ ÂäåÇ ÈÇ äæÚ ÇÕáí í\98\81ÇÑ\8då ÎæÇåäÏ ÔÏ \n"
 " ãÊÝÇæÊ ÑÇ ä\90åÏÇÑíÏ¿ EOL ÂíÇ ãÇíá åÓÊíÏ ÊÇ ÎíÇÑÇÊ ÑÇ ÊÛííÑ ÏåíÏ æ  "
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr " ÏÑ ÒãÇä \81íÔ ÝÑÞ \90ÐÇÑí \81ÑæäÏå '%1' ÈÇ æÕá ÔÏäí '%2'¡ ÎØÇ ÑÎ ÏÇÏ. ÈíÔ ÇÒ Çíä \81íÔ ÝÑÞ \90ÐÇÑí È\98ÇÑ ÈÓÊå äÎæÇåÏ ÔÏ "
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr " \81æÔå ÇäÊÎÇÈ ÔÏå æÌæÏ äÏÇÑÏ  "
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr " äãí ÊæÇäÏ ÝÇíá Ïæ\90Çäí / ÈÇíäÇÑí ÑÇ ÏÑ æíÑÇÓÊÇÑ ÈÇÒ äãÇíÏ "
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5213,7 +5193,7 @@ msgstr ""
 "%1\n"
 "Èå ÓãÊ Ïí\90Ñ æ ÈÇÒÔÏä Çíä \81æÔå åÇ ¿ "
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5224,148 +5204,148 @@ msgstr ""
 " äãÇíÔ åÑ \81ÑæäÏå ÏÑ ÕÝÍå \98Ï ÎæÏÔ Ìáæå ÈåÊÑí ÏÇÑÏ ÇãÇ ÑæäæÔÊ ÈÑÏÇÑí / \81íæäÏ Òäí ÎØÑäÇ\98 ÎæÇåÏ ÈæÏ \n"
 " ÂíÇ ãÇíá åÓÊíÏ ÊÇ ÈÇ åÑ Ïæ \81ÑæäÏå Èå Ô\98áí \98å ÏÑ ÕÝÍå \98Ï \81íÔ ÝÑÖ æíäÏæÒ ãí ÈÇÔÏ¡ \98ÇÑ ÔæÏ - Çíä\90æäå ÊæÕíå ãíÔæÏ - ¿"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr " %s = æ ÑÇÓÊ  %s = åÔÏÇÑ : \81ÑæäÏå åÇ ÇÒ \98ÏÈäÏíåÇí ãÊÝÇæÊí ÇÓÊÝÇÏå ãí \98ääÏ¡ æ \81íæäÏ ÒÏä ãã\98ä ÇÓÊ ãäÌÑ Èå ÇÒ ÏÓÊ ÑÝÊä ÇØáÇÚÇÊ ÔæÏ ¡ \8d\81 "
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "  ÇØáÇÚÇÊ Èå Ïáíá ÎØÇåÇí \98ÏÈäÏí ÇÒ ÏÓÊ ÑÝÊ : ÏÑ \81ÑæäÏå åÑ Ïæ ÓãÊ "
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr " ÈÏæä ÝÑÞ"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr " ÊÝÇæÊ ÎØ Èå ÎØ "
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "  ÑÔÊå {åÇí} ÌÇí\90Òíä ÔÏå : %1"
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr " äãí ÊæÇä ÑÔÊå ÑæÈÑæ ÑÇ \81íÏÇ \98ÑÏ :  \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr " ÑæäæÔÊ ÈÑÏÇÑí ÇÒ ÊãÇã ãÓíÑ"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr " ÑæäæÔÊ ÈÑÏÇÑí ÇÒ äÇã \81ÑæäÏå "
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr " \8dåÇÑ\90æÔ ã\98Çä "
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr " \8dåÇÑ\90æÔ ÊÝÇæÊ "
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr " \81ÑæäÏå æÕáå /\98\8eäå ÈÇ ãæÝÞíÊ äæÔÊå ÔÏ "
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr " ãæÑÏ \81íÏÇ äÔÏ íÇ ÝåÑÓÊ äÔÏå ÇÓÊ !     -1"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr " ãæÑÏ \81íÏÇ äÔÏ íÇ ÝåÑÓÊ äÔÏå ÇÓÊ !     -2"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr " \81ÑæäÏå æÕáå / \98\8eäå ÏÑ ÍÇá ÍÇÖÑ ãæÌæÏ ãí ÈÇÔÏ. ÂíÇ ãí ÎæÇåíÏ ÊÇ ÈÇÒäæíÓí ÔæÏ¿ "
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "{  \81ÑæäÏå åÇí ÇäÊÎÇÈ ÔÏå:   %1 }"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr " ÚÇÏí "
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr " ãÊä "
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr " í\98\81ÇÑ\8då ÔÏå "
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "äãí ÊæÇäÏ ÏÑ \81ÑæäÏå 1%  ÈäæíÓÏ "
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr " ãÓíÑ ÎÑæÌí ãÔÎÕ ÔÏå í\98 ãÓíÑ ãØáÞ äãí ÈÇÔÏ : %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr " í\98 \81ÑæäÏå ÎÑæÌí ÑÇ ãÔÎÕ äãÇííÏ "
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr " äãí ÊæÇä í\98 æÕáå / \98\8eäå \81ÑæäÏå ÇÒ \81ÑæäÏå åÇí Ïæ\90Çäí / ÈÇíäÇÑí Êåíå äãæÏ "
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr " äãí ÊæÇä í\98 æÕáå / \98\8eäå \81ÑæäÏå ÇÒ ÝåÑÓÊåÇí ÑÇåäãÇ ÇíÌÇÏ äãæÏ "
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5376,17 +5356,17 @@ msgstr ""
 "\n"
 "ÇíÌÇÏ í\98 æÕáå / \98\8eäå äíÇÒãäÏ ÇíäÓÊ \98å åí\8d ÊÛííÑ ÐÎíÑå äÔÏå Çí ÏÑ \81ÑæäÏå åÇ æÌæÏ äÏÇÔÊå ÈÇÔÏ "
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr " \81æÔå æÌæÏ äÏÇÑÏ "
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr " äÊÇíÌ ãÞÇíÓå ãÓíÑ ÌÇÑí \81Ç\98 ÎæÇåÏ ÔÏ  "
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5397,7 +5377,7 @@ msgstr ""
 " ÊãÇã ÇÌÒÇÁ ãæÑÏ äíÇÒ  ÈÑÇí \81ÔÊíÈÇäí ÇÒ ÈÇí\90Çäí ÑÇ äãí ÊæÇä íÇÝÊ - Merge7z*.dll &/ 7-zip   - \n"
 " ÈÑÇí ÇØáÇÚ ÈíÔÊÑ ÇÒ \81ÔÊíÈÇäí ÈÇí\90Çäí æ \8d\90æä\90í ÝÚÇáÓÇÒí Âä¡ \98ÊÇÈ\8då ÑÇåäãÇ ÑÇ ÈÈíäíÏ"
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5406,7 +5386,7 @@ msgstr ""
 "\n"
 " ÊæÌå: í\98\81ÇÑ\8d\90ì Óæä Òí\81 ÏÑ ÊäÙíãÇÊ æíäãÑÌ ÛíÑÝÚÇá ÔÏå ÇÓÊ "
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5415,37 +5395,37 @@ msgstr ""
 "\n"
 " ÊæÌå: í\98\81ÇÑ\8d\90ì Óæä Òí\81 ãäÍÕÑ Èå Úãá\98ÑÏ ãÓÊÞá ÏÑ ÊäÙíãÇÊ æíäãÑÌ ãí ÈÇÔÏ "
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr " ÇäÊÎÇÈ \81ÑæäÏå ÈÑÇí ÕÏæÑ "
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr " ÇäÊÎÇÈ \81ÑæäÏå ÈÑÇí æÑæÏ "
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr " ÎíÇÑÇÊ ÇÒ \81ÑæäÏå æÇÑÏ ÔÏ "
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr " ÎíÇÑÇÊ Èå \81ÑæäÏå ÕÇÏÑ ÔÏ "
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr " æÑæÏ ÎíÇÑÇÊ ÇÒ \81ÑæäÏå äÇãæÝÞ ÈæÏ "
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr " ä\90ÇÑÔ ÎíÇÑÇÊ ÏÑ \81ÑæäÏå äÇãæÝÞ ÈæÏ "
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5456,242 +5436,242 @@ msgstr ""
 "\n"
 "ÂíÇ ãÇíá Èå ÇÏÇãå åÓÊíÏ ¿ "
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr " ÎØÇí ÚÈÇÑÊ ÞÇÚÏå ãäÏ "
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr " ÈÏæä ãØÇÈÞÊ "
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr " ÚÈÇÑÊ ÞÇÚÏå ãäÏ äÇãÚÊÈÑ "
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "  ÍÑÝ ÊØÈíÞ äÇãÚÊÈÑ "
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr " äÇã ÏÓÊå ÏÎÔå / \98ÇÑ\98ÊÑ äÇãÚÊÈÑ ãí ÈÇÔÏ "
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr " È\98 ÇÓáÔ ÚÞÈí "
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr " ÇÑÌÇÚ ÚÞÈ äÇãÚÊÈÑ "
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr " Èí åãÊÇ  [  /  [^ "
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr " Èí åãÊÇ  (  /  \\( "
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr " Èí åãÊÇ   \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr " ãÍÊæÇí äÇãÚÊÈÑ -  \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr " \90ÓÊÑå ÈÇ \81ÇíÇä äÇãÚÊÈÑ "
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr " ÈíÑæä ÇÒ ÍÇÝÙå "
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr " ÚÈÇÑÊ  ÞÇÚÏå ãäÏ   ÞÈáí äÇãÚÊÈÑ ãí ÈÇÔÏ "
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr " \81ÇíÇä äÇ Èåä\90Çã  ÚÈÇÑÊ ÞÇÚÏå ãäÏ "
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr " ÚÈÇÑÊ ÞÇÚÏå ãäÏ  Îíáí ÈÒÑ\90 ÇÓÊ "
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr " Èí åãÊÇ   )  /  \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr " íæäí\98Ó "
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr " ãÎáæØ "
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr " äæÚ "
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr " ÈÇÒ \98ääÏå ÈÓÊå "
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr " \81íÔ ÝÑÞ \90ÐÇÑ "
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "ÏÓÊ äæÔÊå ÈÑÇí æíÑÇÓÊÇÑ   "
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr " ÐÎíÑå \81ÑæäÏå ØÑÝ \8d\81 "
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr " ÐÎíÑå \81ÑæäÏå ØÑÝ ÑÇÓÊ "
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr " ÐÎíÑå \81ÑæäÏå ÓãÊ \8d\81 ÈÇ äÇã ... "
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr " ÐÎíÑå \81ÑæäÏå ÓãÊ ÑÇÓÊ ÈÇ äÇã ... "
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "   Windows Èå EOL  ÊÈÏíá ÓÈ\98"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "   Unix Èå EOL  ÊÈÏíá ÓÈ\98"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "   Mac Èå EOL  ÊÈÏíá ÓÈ\98"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr " ÊÚæíÖ Èíä ÓÈ\98åÇí æíÑÇíÔ æ \81íæäÏ "
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5700,12 +5680,12 @@ msgstr ""
 " äãÇíÔ æ ÊäÙíã æí\8e\90íåÇí \98ÏÈäÏí \81ÑæäÏå \n"
 " æí\8e\90íåÇí \98ÏÈäÏí \81ÑæäÏå "
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr " ÈÇÒ \98ÑÏä æ ÊÌÒíå æ ÊÍáíá äãæÏä \81ÑæäÏå ÊÚÇÑÖ "
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5714,7 +5694,7 @@ msgstr ""
 " ÇäÊÎÇÈ äÇÍíå ãÊÝÇæÊ ÏÑ ÎØ ÌÇÑí \n"
 " ÊÝÇæÊ ÏÑ ÎØ ÌÇÑí "
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5723,7 +5703,7 @@ msgstr ""
 " ÈÑæ Èå ÎØ íÇ ÊÝÇæÊ \n"
 " ÈÑæ Èå (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5732,7 +5712,7 @@ msgstr ""
 " ÊäÙíã ÎíÇÑÇÊ ÈÑäÇãå \n"
 " ÎíÇÑÇÊ "
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5741,37 +5721,37 @@ msgstr ""
 " ÈÇÒÓÇÒí ÕÝÍå äãÇíÔ \n"
 " ÈÇÒÓÇÒí F5"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "   ÑæäæÔÊ ÈÑÏÇÑí ÎØæØ ÇäÊÎÇÈ ÔÏå Èå \98áí\81 ÈæÑÏ / ÍÇÝÙå íÇÏÏÇÔÊ ÈÇ ÇÖÇÝå \98ÑÏä ÔãÇÑå ÎØæØ Èå ÎØ ÂÛÇÒíä"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr " ÊÛííÑ æÖÚíÊ äÔÇä "
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr " ÈÑæ Èå äÔÇä ÈÚÏí "
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr " ÈÑæ Èå äÔÇä ÞÈáí "
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr " \81Ç\98 \98ÑÏä åãå äÔÇäåÇ "
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5780,7 +5760,7 @@ msgstr ""
 " äãÇíÔ ãæÇÑÏí \98å ÈØæÑ ÏÞíÞ í\98ÓÇääÏ \n"
 "äãÇíÔ ãæÇÑÏ í\98ÓÇä "
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5789,7 +5769,7 @@ msgstr ""
 " äãÇíÔ ãæÇÑÏí \98å ÊÝÇæÊ ÏÇÑäÏ \n"
 "äãÇíÔ ãæÇÑÏ ãÊÝÇæÊ "
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5798,7 +5778,7 @@ msgstr ""
 " äãÇíÔ ãæÇÑÏí \98å ÝÞØ ÏÑ ÓãÊ \8d\81 æÌæÏ ÏÇÑÏ \n"
 "äãÇíÔ ãæÇÑÏ ÈíãÇääÏ \8d\81 "
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5807,7 +5787,7 @@ msgstr ""
 " äãÇíÔ ãæÇÑÏí \98å ÝÞØ ÏÑ ÓãÊ ÑÇÓÊ æÌæÏ ÏÇÑÏ \n"
 "äãÇíÔ ãæÇÑÏ ÈíãÇääÏ ÑÇÓÊ "
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5816,7 +5796,7 @@ msgstr ""
 " äãÇíÔ \81ÑæäÏå åÇí Ïæ\90Çäí / ÈÇíäÇÑí \n"
 " äãÇíÔ \81ÑæäÏå åÇí Ïæ\90Çäí / ÈÇíäÇÑí "
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5825,7 +5805,7 @@ msgstr ""
 " äãÇíÔ ãæÇÑÏ ÌÇÇÝÊÇÏå \n"
 "äãÇíÔ ãæÇÑÏ ÌÇÇÝÊÇÏå "
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5834,7 +5814,7 @@ msgstr ""
 " ÇäÊÎÇÈ Þáã ÈÑÇí äãÇíÔ \n"
 " ÇäÊÎÇÈ Þáã äãÇíÔ "
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5843,27 +5823,27 @@ msgstr ""
 " ÈÑ\90ÔÊ Èå ÇÓÊÝÇÏå ÇÒ Þáã \81íÔ ÝÑÖ ÓíÓÊã / ãÌãæÚå ÈÑÇí äãÇíÔ \n"
 " Þáã \81íÔ ÝÑÖ "
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "  ÏÎÔå / \98ÇÑ\98ÊÑ ÝÇÕáå ÓÝíÏ ÑÇ äãÇíÔ ÈÏå "
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr " ÊÛííÑ æÖÚíÊ \8dåÇÑ\90æÔ ÊÝÇæÊ "
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr " ã\98Çä \8dåÇÑ\90æÔ ÊÕæíÑ \98áí ÇÒ \81ÑæäÏå åÇ ÑÇ äãÇíÔ ãí ÏåÏ "
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr " \81äÌÑå ãÍÇæÑå ÂãÇÑ ãÞÇíÓå / åãÓäÌí \81æÔå ÑÇ äãÇíÔ ÈÏå "
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5872,7 +5852,7 @@ msgstr ""
 " ÇäÊÎÇÈ ÒÈÇä ÑÇÈØ \98ÇÑÈÑ ÝÚáí \n"
 " ÒÈÇä "
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5881,12 +5861,12 @@ msgstr ""
 " äãÇíÔ ÊÝÇæÊåÇí ÏÇÎá ÎØæØ ÈÇ Ñä\90åÇí ãÊÝÇæÊ \n"
 " äãÇíÔ ÊÝÇæÊ ÎØ "
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr " ã\98Çä Ïæ \8dåÇÑ\90æÔ ãÚÇæÖå ÔæÏ "
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5895,7 +5875,7 @@ msgstr ""
 " äãÇíÔ ÔãÇÑå ÎØæØ \n"
 " äãÇíÔ ÔãÇÑå ÎØæØ "
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5904,7 +5884,7 @@ msgstr ""
 " ÝÚÇá ÓÇÒí ÓØÑÈäÏí ÍÑÝí \n"
 " ÓØÑÈäÏí ÎØæØ "
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5913,22 +5893,22 @@ msgstr ""
 " ÍÇÔíå åÇí ÇäÊÎÇÈ ÑÇ ÈÑÇí åÑ Ïæ \8dåÇÑ\90æÔ äãÇíÔ ÈÏå \n"
 " äãÇíÔ ÍÇÔíå åÇí ÇäÊÎÇÈ "
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr " ÇÝÒÇíÔ ÇäÏÇÒå ãÊä "
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr " \98ÇåÔ ÇäÏÇÒå ãÊä "
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr " ÈÇÒ\90ÑÏÇäÏä ÈÒÑ\90äãÇíí ãÊä Èå ÍÇáÊ \81íÔ ÝÑÖ "
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5937,7 +5917,7 @@ msgstr ""
 " ÇäÊÞÇá Èå ÊÝÇæÊ ÞÈáí \n"
 " ÊÝÇæÊ ÞÈáí  (Alt+Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5946,67 +5926,67 @@ msgstr ""
 " ÇäÊÞÇá Èå ÊÝÇæÊ ÈÚÏí \n"
 " ÊÝÇæÊ ÈÚÏí  (Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -6015,7 +5995,7 @@ msgstr ""
 " ÇäÊÞÇá Èå äÎÓÊíä ÊÝÇæÊ \n"
 " äÎÓÊíä ÊÝÇæÊ (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6024,7 +6004,7 @@ msgstr ""
 " ÇäÊÞÇá Èå ÊÝÇæÊ ÌÇÑí \n"
 "ÊÝÇæÊ ÌÇÑí (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6033,7 +6013,7 @@ msgstr ""
 "  ÇäÊÞÇá Èå ÊÝÇæÊ ÂÎÑ \n"
 " ÂÎÑíä ÊÝÇæÊ (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6042,7 +6022,7 @@ msgstr ""
 " ÑæäæÔÊ ÈÑÏÇÑí ãÊä ÇäÊÎÇÈ ÔÏå Èå \81ÑæäÏå ÓãÊ ÑÇÓÊ \n"
 " ÑæäæÔÊ ÈÑÏÇÑí Èå ÑÇÓÊ (Alt+Right)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6051,7 +6031,7 @@ msgstr ""
 " ÑæäæÔÊ ÈÑÏÇÑí ãÊä ÇäÊÎÇÈ ÔÏå Èå \81ÑæäÏå ÓãÊ \8d\81 \n"
 " ÑæäæÔÊ ÈÑÏÇÑí \8d\81 (Alt+Left)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6060,7 +6040,7 @@ msgstr ""
 " ÑæäæÔÊ ÈÑÏÇÑí ÊÝÇæÊ Èå ÑÇÓÊ æ \81íÔÑæí Èå ÊÝÇæÊ ÈÚÏí \n"
 " ÑæäæÔÊ ÈÑÏÇÑí ÑÇÓÊ æ \81íÔÑæí (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6069,7 +6049,7 @@ msgstr ""
 " ÑæäæÔÊ ÈÑÏÇÑí ÊÝÇæÊ Èå \8d\81 æ \81íÔÑæí Èå ÊÝÇæÊ ÈÚÏí \n"
 "ÑæäæÔÊ ÈÑÏÇÑí \8d\81 æ \81íÔÑæí (Ctrl+Alt+Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6078,7 +6058,7 @@ msgstr ""
 " ÑæäæÔÊ ÈÑÏÇÑí ÇÒ åãå ÊÝÇæÊåÇ Ñæí \81ÑæäÏå ÓãÊ ÑÇÓÊ \n"
 " ÊãÇã ÑÇÓÊ"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6087,77 +6067,77 @@ msgstr ""
 " ÑæäæÔÊ ÈÑÏÇÑí ÇÒ åãå ÊÝÇæÊåÇ Ñæí \81ÑæäÏå ÓãÊ \8d\81 \n"
 " ÊãÇã \8d\81 "
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr " ÍÐÝ ãæÇÑÏ ÇäÊÎÇÈ ÔÏå ÇÒ åÑ Ïæ ÝåÑÓÊ ÑÇåäãÇ / ÏÇíÑ\98ÊæÑí "
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr " åãÓäÌí / ãÞÇíÓå ãæÑÏ ÇäÊÎÇÈ ÔÏå - åãÓäÌí äÎÓÊíä ãæÑÏ ÏÑÕæÑÊí\98å \8däÏ ãæÑÏ ÇäÊÎÇÈ ÔÏå ÈÇÔÏ "
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr " ÇäÊÎÇÈ æ ãÑÊÈ \98ÑÏä ÏæÈÇÑå ÓÊæäåÇí åãÓäÌí ÝåÑÓÊ ÑÇåäãÇ / ÏÇíÑ\98ÊæÑí "
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr " ÊæáíÏ í\98 æÕáå / \98\8eäå \81ÑæäÏå "
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr " ÇäÊÎÇÈ æ ÇÕáÇÍ ÕÇÝíåÇ "
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr " ÊæáíÏ í\98 \90ÒÇÑÔ ÇÒ äÊÇíÌ åãÓäÌí "
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr " äãÇíÔ ÝåÑÓÊí ÇÒ æÕá ÔÏäíåÇí ãæÌæÏ "
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr " \98ÇÑÈÑ ÈÇÒ\98ääÏå ÈÓÊå ÑÇ ÇäÊÎÇÈ ãí \98äÏ - Èå åä\90Çã åãÓäÌí ÝåÑÓÊ ÈÓÊå Çí ÈÇÒ äãí ÔæÏ "
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr " ÈÇÒ\98ääÏå ÈÓÊå ÊØÈíÞ ÏÇÏå ÔÏå Ñæí åÑ Ïæ \81ÑæäÏå åÇ È\98ÇÑ ÈÓÊå ãí ÔæÏ "
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr " ÇäÊÎÇÈ í\98 ÈÇÒ\98ääÏå ÈÓÊå ÈÑÇí æíÑÇíÔ Çíä \81ÑæäÏå "
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr " ÈÏæä \81íÔ ÝÑÞ \90ÐÇÑ - ÚÇÏí "
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr " æÕá ÔÏäíåÇí \81íÔäåÇÏí "
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr " ÓÇíÑ æÕá ÔÏäíåÇ "
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr " ÊÎáíå åãå æÕá ÔÏäíåÇ æ äÕÈ ãÌÏÏ ÂäåÇ - ÈÑÇí \98ÇÑÈÑÇä \81íÔÑÝÊå / ÊæÓÚå ÏåäÏå "
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6166,12 +6146,12 @@ msgstr ""
 " ÝÚÇá \98ÑÏä \81ÑæäÏå ÞÇÈá ÑæÆíÊ ÈÚÏí \n"
 " ÝÚÇá \98ÑÏä \81ÑæäÏå ÈÚÏí "
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr " ÈÓÊä åãå \81äÌÑå åÇí ÈÇÒ "
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6180,22 +6160,22 @@ msgstr ""
 " ÈÇÒ\98ÑÏä ÑÇåäãÇí æíäãÑÌ \n"
 " ÑÇåäãÇí æíäãÑÌ "
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr " ÇÓÊÎÑÇÌ ÇØáÇÚÇÊ æíÑÇíÔ æ \81í\98ÑÈäÏí æíäãÑÌ ÝÚáí Èå \81ÑæäÏå ãÊäí "
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr " äãÇíÔ ãÌæÒ Úãæãí \98áí Ìí Çä íæ "
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr " ÓÇÎÊ ÔÎÕí : %1 "
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6204,7 +6184,7 @@ msgstr ""
 " ÈÇÒ\98ÑÏä íÇÏÏÇÔÊåÇí äÔÑ \n"
 " íÇÏÏÇÔÊåÇí äÔÑ"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6213,272 +6193,272 @@ msgstr ""
 " ÈÇÒ\98ÑÏä æÈ ÓÇíÊ ÊÑÌãå åÇ  \n"
 " ÊÑÌãå åÇ "
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr " ÞÑÇÑ\90ÇååÇí æÕá ÔÏäí åÇ"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr " ÈÏæä \81íÔ ÝÑÞ \90ÐÇÑ  "
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr " \81íÔ ÝÑÞ ÏÑ ÕæÑÊ Çã\98Çä "
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr " .sct \81íÏÇ äÔÏ -  ÏÓÊ äæÔÊå åÇ ÛíÑ ÝÚÇá ÔÏ WSH  "
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<åí\8d\98ÏÇã>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<ÎæÏ\98ÇÑ>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr " ÈÇÒ\98ÑÏä \81ÑæäÏå ÈÇ ÈÑäÇãå \98ÇÑÈÑÏí ÑÓãí "
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr " ÈÇÒ\98ÑÏä \81ÑæäÏå ÈÇ æíÑÇÓÊÇÑ ÈíÑæäí "
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr " ÈÇÒ\98ÑÏä \81ÑæäÏå ÈÇ ÈÑäÇãå æí\8eå "
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr " äãÇíÔ äÏÇÏä \98äÏå åÇí (Èáæ\98åÇí)  ÌÇÈÌÇ ÔÏå "
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr " äãÇíÔ åãå \98äÏå åÇí (Èáæ\98åÇí) ÌÇÈÌÇ ÔÏå "
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr " äãÇíÔ \98äÏå åÇí (Èáæ\98åÇí) ÌÇÈÌÇ ÔÏå ÇÒ ãÍá ÊÝÇæÊ ÌÇÑí "
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr " ÈÑæ Èå ãÍá ÊÝÇæÊ ÏÑ ãæÞÚíÊ ã\98Çä äãÇ "
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr " &o    ÈÑæ Èå ÊÝÇæÊ %1 ÇÒ %2 "
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "&G   ÈÑæ Èå ÎØ  %1 "
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr " ÛíÑ ÝÚÇá "
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr " ÇÒ ÏÓÊ\90Çå (ÓíÓÊã) \81ÑæäÏå åÇ  "
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr " ÇÒ ÝåÑÓÊ ÂÎÑíä \81ÑæäÏå åÇ "
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr " ãÔÎÕ ä\98ÑÏä "
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr " ÈíÓí\98 "
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr " ÏÓÊå "
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr " ÝæÑÊÑä "
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr " Çíääæ ÓÊÇ\81 "
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr " ÇíäÓÊÇá ÔíáÏ "
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr " ÌÇæÇ "
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr " ÇæÊæáíÓ\81 "
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr " \81ÇÓ\98Çá "
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr " \81Ñá "
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr " ÔíÆ Íãá ÔÏäí "
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr " \81ÇæÑÔá "
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr " \81íÊæä "
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr " ãäÇÈÚ "
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr " ÑÇÈí "
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr " \81æÓÊå "
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr " æÑíáæ\90 "
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr " \81äåÇä \98ÑÏä ãíáå ÇÈÒÇÑ "
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr " äãÇíÔ ãíáå ÇÈÒÇÑ \98æ\8d\98 "
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr " äãÇíÔ ãíáå ÇÈÒÇÑ ÈÒÑ\90 "
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index 5b64aba..2689ed1 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -1031,7 +1031,7 @@ msgid "&Scripts"
 msgstr "&Skrypty"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< pusty >"
@@ -1472,7 +1472,7 @@ msgid "&Versioning System:"
 msgstr "\8cledzenie &wersji:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "S&cie¿ka do cleartool.exe:"
@@ -1673,7 +1673,7 @@ msgid "Replace &All"
 msgstr "&Wszystkie"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Racjonalne dopasowanie wielko\9cci"
@@ -2589,7 +2589,7 @@ msgid "Files:"
 msgstr "Pliki:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "ró¿nych"
@@ -2626,7 +2626,7 @@ msgid "Right:"
 msgstr "Prawa:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Identyczne"
@@ -2826,7 +2826,7 @@ msgid "A&ppend timestamp"
 msgstr "Dodaj czas utworzenia kopii"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Potwierd\9f kopiowanie"
@@ -2904,7 +2904,7 @@ msgstr "Dodaj menu &pow
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Folder"
@@ -3544,7 +3544,7 @@ msgid "Version Control"
 msgstr "Kontrola wersji"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Ró¿nice"
@@ -3673,87 +3673,67 @@ msgstr "Pliki XML (*.xml)|*.xml|Wszystkie pliki (*.*)|*.*||"
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Pe³na zawarto\9cæ"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Skrócona zawarto\9cæ"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Data modyfikacji"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Data modyfikacji i wielko\9cæ"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Wielko\9cæ"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Nazwa"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "lokalizacja"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filtry"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Opis"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Wybierz nazwê dla nowego filtru"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Filtry plików(*.flt)|*.flt|Wszystkie pliki (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3766,7 +3746,7 @@ msgstr ""
 "Proszê skopiowaæ plik %1 do folderu WinMerge/Filters:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3779,7 +3759,7 @@ msgstr ""
 "\n"
 "Upewnij siê, ¿e folder taki istnieje i jest zapisywalny."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3790,7 +3770,7 @@ msgstr ""
 "\n"
 "Proszê wybraæ folder filtrów w opcje/System."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3803,12 +3783,12 @@ msgstr ""
 "\n"
 "Byæ mo¿e plik ten jest tylko do odczytu?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Lokalizuj plik fitra do instalacji"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3819,17 +3799,17 @@ msgstr ""
 "\n"
 "Nie mo¿na skopiowaæ pliku do foldera filtrów."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Plik filtra ju¿ istnieje. Czy nadpisaæ istniej¹cy plik?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Wyra¿enia regularne"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3840,243 +3820,243 @@ msgstr ""
 "\n"
 "Je¿eli nie chcesz od\9cwierzaæ okien porównañ teraz, wybierz Nie i od\9cwie¿ okna pó\9fniej."
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "\8ccie¿ka do SS.EXE"
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Wyniki porównania folderów"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Porównywanie plików"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Lewy bez tytu³u"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Prawy bez tytu³u"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "Ich plik"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "Mój plik"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Skanowanie plików..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Otwieranie wybranych"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Kopiowanie lewej na praw¹"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Kopiowanie prawej na lew¹"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Kopiowanie wszystkich na lew¹"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Kopiowanie wszystkich na praw¹"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Kopiowanie plików..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Usuwanie plików..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Przenoszenie plików..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Tworzenie raportu..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Cofanie ostatniej operacji..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "Przywracanie ostatniej operacji..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Linia: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Scal"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Ró¿nica %1 z %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "Znaleziono ró¿nic: %1"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "Znaleziono 1 ró¿nicê"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "Tylko odczyt"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Element %1 z %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Elementy: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Wybierz dwa istniej¹ce foldery lub pliki do porównania"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Wybór katalogu"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Wybierz dwa foldery lub pliki do porównania."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "Lewa \9ccie¿ka nieprawid³owa!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Prawa \9ccie¿ka nieprawid³owa!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Obie \9ccie¿ki nieprawid³owe!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Wybierz dwa pliki, aby umo¿liwiæ wybór programu rozpakowuj¹cego."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Nie mo¿na porównaæ pliku i folderu!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Nie znaleziono pliku: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Plik nie rozpakowany: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4089,12 +4069,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "B³¹d parsowania pliku konflitku"
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4105,32 +4085,32 @@ msgstr ""
 "%1\n"
 "nie jest plikiem konfliktu"
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Zapisz jako"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Zapisaæ zmiany w %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 tylko do odczytu. Czy chcesz zachowaæ plik pod inn¹ nazw¹?"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "B³¹d sprawdzania mo¿liwo\9cci zapisu w miejscu docelowym"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "B³¹d przy tworzeniu kopii zapasowej pliku"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4143,7 +4123,7 @@ msgstr ""
 "\n"
 "Kontynuowaæ ?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4160,7 +4140,7 @@ msgstr ""
 "\t-u¿yæ innej nazwy pliku (wybierz Ok)\n"
 "\t-anulowaæ operacjê (wybierz Anuluj)?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4175,7 +4155,7 @@ msgstr ""
 "\n"
 "Czy zachowaæ rozpakowan¹ wersjê w innym pliku?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4190,7 +4170,7 @@ msgstr ""
 "\n"
 "Czy zachowaæ rozpakowan¹ wersjê w innym pliku?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4205,7 +4185,7 @@ msgstr ""
 "\n"
 "Nadpisaæ zmieniony plik?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4214,7 +4194,7 @@ msgstr ""
 "%1\n"
 "jest oznaczony jako tylko do odczytu. Czy zignorowaæ status tylko do odczytu?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4229,22 +4209,22 @@ msgstr ""
 "\n"
 "Czy prze³adowaæ plik?"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Zapisz lewy plik jako"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Zapisz prawy plik jako"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid ""
 "The file\n"
@@ -4255,7 +4235,7 @@ msgstr ""
 "%1\n"
 "zosta³ usuniêty. Aby kontynuowaæ proszê zapisaæ jego kopiê"
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4266,42 +4246,42 @@ msgstr ""
 "\n"
 "Przed kontynuacj¹ od\9cwie¿ dokumenty."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Musisz wskazaæ scie¿kê projektu SourceSafe aby kontynuowaæ (tj.:  $/MyProject)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Pobie¿ pliki z VSS..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "System \9cledzenia wersji zwróci³ b³¹d podczas próby pobrania pliku. Nie mo¿na kontynuowaæ..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "B³¹d wykonania polecenia systemu wersjonowania."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "Katalog roboczy VSS oraz lokalizacja bie¿acego pliku nie zgadzaj¹ siê. Kontynuowaæ?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Nie znaleziono bazy VSS!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "B³¹d VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4312,7 +4292,7 @@ msgstr ""
 " Proszê sprawdziæ config_spec u¿ywanego widoku.\n"
 " Cofn¹æ operacjê checkout?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4321,169 +4301,169 @@ msgstr ""
 "System \9cledzenia wersji zwróci³ b³¹d podczas operacji uncheckout.\n"
 " Proszê sprawdziæ config_spec u¿ywanego widoku."
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Brak"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "(Visual SourceSafe (poni¿ej 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 i wy¿ej)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Zatrzymaj na przerwie"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Zatrzymaj na przerwie lub punktorze"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Kopiuj wybrany plik do wskazanego katalogu"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Kopiuj wybrany plik do katalogu"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Usuñ wybran¹ pozycjê z lewej"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Usuñ wybran¹ pozycjê z prawej"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Usuñ wybrane pozycje po obu stronach"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Ukryj wybrane elementy (filtr roboczy)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Zmieñ nazwê wybranej pozycji na obu stronach"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Prawa na lew¹ (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Lewa na praw¹ (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Prawa na lew¹ (%1 z %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Lewa na praw¹ (%1 z %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Lewa na... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Prawa na... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Lewa na... (%1 z %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Prawa na... (%1 z %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Lewa (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Prawa (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Obie (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Lewa (%1 z %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Prawa (%1 z %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Obie (%1 z %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Wybierz folder docelowy"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Lewa strona - wybierz folder docelowy:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Prawa strona - wybierz folder docelowy:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 objêtych plików)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 z %2 objêtych plików)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4494,17 +4474,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Czy na pewno skopiowaæ:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Czy na pewno skopiowaæ %d elementów:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4523,613 +4503,613 @@ msgstr ""
 "\n"
 "Proszê od\9cwie¿yæ porównanie."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "Czy na pewno przenie\9cæ:"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "Czy na pewno przenie\9cæ %d elementów:"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "Potwierdzenie przenoszenia"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Otwórz lewy plik"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Otwórz lewy plik w zewnêtrznym edytorze"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Otwórz lewy plik w..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Otwórz prawy plik"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Otwórz prawy plik w zewnêtrznym edytorze"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Otwórz prawy plik w..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Nie mo¿na uruchomiæ zewnêtrznego edytora: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Nieznane rozszerzenie dla zewnêtrznego edytora: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Kopiuj nazwy plików do schowka"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Kopiuj \9ccie¿ki z lewej do schowka"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Kopiuj \9ccie¿ki z prawej do schowka"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Kopiuj \9ccie¿ki z obu stron do schowka"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr "Menu pow³oki pliku po lewej"
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr "Menu pow³oki pliku po prawej"
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Nieznany format archiwum"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Dodaj elementy z lewej do archiwum"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Dodaj elementy z prawej do archiwum"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Dodaj elementy z obu stron do archiwum"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Dodaj ró¿ne elementy do archiwum (z obu stron)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Kopiuj wybrany plik z lewej do katalogu"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Kopiuj wybrany plik z prawej do katalogu"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Plik"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Wynik porównania"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Data pliku po lewej"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Data pliku po prawej"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Rozszerzenie"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Rozmiar w lewym panelu"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Rozmiar w prawym panelu"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Rozmiar po prawej (krótki)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Rozmiar po lewej (krótki)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Czas utworzenia po lewej"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Czas utworzenia po prawej"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Nowszy plik"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Wersja pliku po lewej"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Wersja pliku po prawej"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Skrócony wynik"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Atrybuty po lewej"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Atrybuty pliku po prawej"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "Lewe ZKL"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "Prawe ZKL"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Lewe kodowanie"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Prawe kodowanie"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Ignorowane ró¿n."
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binarne"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Nie mo¿na porównaæ plików"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Anulowany"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Plik pominiêty"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Folder pominiêty"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Tylko po lewej: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Tylko po prawej: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Pliki binarne s¹ identyczne"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Pliki binarne s¹ ró¿ne"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Pliki s¹ ró¿ne"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr "Foldery different"
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Tylko po lewej"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Tylko po prawej"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "B³¹d"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr "Pliki tekstowe s¹ identyczne"
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr "Pliki tekstowe s¹ ró¿ne"
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Up³ynê³o: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "wybrano 1 element"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "wybrano %1 elementów"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Plik lub katalog."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Nazwa podkatalogu, gdy podkatalogi s¹ przetwarzane."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Wynik porównania \96 wersja pe³na."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Data modyfikacji lewej strony."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Data modyfikacji prawej strony."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Rozszerzenie pliku."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Rozmiar lewego pliku w bajtach."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Rozmiar prawego pliku w bajtach."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Lewa wielko\9cæ pliku skrócona."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Prawa wielko\9cæ pliku skrócona."
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Czas utworzenia lewej strony."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Czas utworzenia prawej strony."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Pokazuje, która strona zosta³a pó\9fniej zmodyfikowana."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Wersja pliku z lewej - tylko dla niektórych typów."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Wersja pliku z prawej - tylko dla niektórych typów."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Skrócony wynik porównania."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Atrybuty lewej strony."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Atrybuty prawej strony."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Typ znaków koñca linii z lewej"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Typ znaków koñca linii z prawej"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Kodowanie lewej strony."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Kodowanie prawej strony."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Liczba ró¿nic zignorowanych w pliku. Ró¿nice te zosta³y zignorowane przez WinMerge i nie mog¹ zostaæ po³¹czone."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Liczba ró¿nic w pliku. Liczba ta nie zawiera zignorowanych ró¿nic."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Pokazuje gwiazdkê (*) je\9cli plik binarny."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Porównaj %1 z %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Lista z przecinkami"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Lista z tabulatorami"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "Prosty HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "Prosty XML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Plik raportu ju¿ istnieje. Czy chcesz nadpisaæ istniej¹cy plik ?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5138,32 +5118,32 @@ msgstr ""
 "B³¹d przy tworzeniu raportu:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Raport zosta³ pomy\9clnie utworzony."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Ten sam plik otwierany w obu panelach."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Wybrane pliki s¹ identyczne."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "B³¹d podczas porównywania plików."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Nie mo¿na utworzyæ plików tymczasowych. Sprawd\9f ustawienie \9ccie¿ki tymczasowej."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5178,7 +5158,7 @@ msgstr ""
 "\n"
 "Uwaga: Je\9cli odmienne znaki koñca linii maj¹ zawsze byæ traktowane jako równowa¿ne, ustaw opcjê 'Ignoruj ró¿nice koñca linii...' na zak³adce porównania w oknie opcji (dostêpne w Edycja/Opcje)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5189,22 +5169,22 @@ msgstr ""
 "Przy pomocy tej opcji zostan¹ zunifikowane do g³ównego typu.\n"
 "Czy chcesz zmieniæ opcjê i pozostawiæ ró¿ne znaki koñca linii?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "B³¹d przy wstêpnym porównaniu pliku '%1' za pomoc¹ wtyczki '%2'. Wstêpne porównanie nie zostanie zastosowane."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "Wybrany folder jest nieprawid³owy."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Nie mo¿na otworzyæ w edytorze pliku binarnego."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5219,7 +5199,7 @@ msgstr ""
 "%1\n"
 "na drugiej stronie i otworzyæ te foldery?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5230,148 +5210,148 @@ msgstr ""
 "Wy\9cwietlanie ka¿dego pliku w odpowiedniej stronie kodowej da lepsze wyniki, ale scalenie/skopiowanie bêdzie niebezpieczne.\n"
 "Would you like to treat both files as being in the default windows codepage (recommended)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Ostrze¿enie: Pliki u¿ywaj¹ ró¿nego kodowania, lewy=%s a prawy=%s, a ich po³¹czenie mo¿e spowodowaæ utratê informacji."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Utrata informacji z powodu b³êdów kodowania: oba pliki"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Brak ró¿nic"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Ró¿nice wierszy"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Zast¹piono %1 sekwencji znaków."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Nie mo¿na znale\9fæ sekwencji znaków \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Kopiuj pe³n¹ \9ccie¿kê"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Kopiuj nazwê pliku"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Okno lokacji"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Okno Diff"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Utworzono ³atkê.."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. element nie zosta³ znaleziony albo jest katalogiem!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. element nie zosta³ znaleziony albo jest katalogiem!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Plik patch ju¿ istnieje. Czy napisaæ plik?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[wybrano %1 plików]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Normalny"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Kontekst"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Zunifikowany"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Nie mo¿na zapisaæ do pliku %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Wybrana \9ccie¿ka docelowa nie jest absolutna: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Wybierz plik docelowy"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Nie mo¿na utworzyæ patcha z plików binarnych."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Nie mo¿na utworzyæ patcha z katalogów."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5382,17 +5362,17 @@ msgstr ""
 "\n"
 "Tworzenie patcha wymaga zapisania wszystkich zmian w plikach."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Folder nie istnieje."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Wyniki bie¿¹cego porównania katalogów zostan¹ usuniête."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5403,7 +5383,7 @@ msgstr ""
 "Nie znaleziono komponentów (7-zip i/lub Merge7z*.dll) wymaganych do obs³ugi archiwów.\n"
 "Informacje o obs³udze archiwów zawiera podrêcznik."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5412,7 +5392,7 @@ msgstr ""
 "\n"
 "Uwaga: Integracja 7-Zip jest wy³¹czona w ustawieniach programu."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5421,37 +5401,37 @@ msgstr ""
 "\n"
 "Uwaga: Integracja 7-Zip ograniczona jest do podstawowych operacji w ustawieniach programu."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Wybierz plik do eksportu"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Wybierz plik do importu"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Zaimportowano opcje z pliku."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Wyeksportowano opcje do pliku."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "B³¹d podczas importu opcji z pliku."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "B³¹d podczas eksportu opcji do pliku."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5462,242 +5442,242 @@ msgstr ""
 "\n"
 "Czy na pewno kontynuowaæ?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "B³¹d w wyra¿eniu regularnych"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Brak trafienia"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Niepoprawne wyra¿enie regularne"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Niepoprawny znak kolacjonowania"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Niepoprawna nazwa klasy znaków"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Uko\9cnik nastêpczy"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Niepoprawne odniesienie wsteczne"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Brakuj¹ce [ lub [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Brakuj¹ce ( lub \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Brakuj¹ce \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Niepoprawna zawarto\9cæ \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Niepoprawne zakoñczenie zakresu"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Brak pamiêci"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Niepoprawne poprzedzaj¹ce wyra¿enie regularne"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Przedwczesne zakoñczenie wyra¿enia regularnego"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Wyra¿enie regularne zbyt du¿e"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Brakuj¹ce ) lub \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "£¹czone"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Typ"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "Program rozpakowuj¹cy"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr "Ró¿nicowanie wstêpne"
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "Skrypt edytora"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Zapisz lewy plik"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Zapisz prawy plik"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Zapisz lewy plik pod nazw¹..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Zapisz prawy plik pod nazw¹..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Konwertuj ZKL na Windows"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Konwertuj ZKL na Unix"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Konwertuj ZKL na Mac"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Prze³¹cz miêdzy trybami edycji i scalania"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5706,12 +5686,12 @@ msgstr ""
 "Poka¿ i dostosuj w³a\9cciwo\9cci kodowania pliku\n"
 "W³a\9cciwo\9cci kodowania pliku"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "Otwórz i rozwi¹¿ plik konfliktu"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5720,7 +5700,7 @@ msgstr ""
 "Zaznacz obszar ró¿nicy w bie¿¹cej linii\n"
 "Ró¿nica w bie¿¹cej linii"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5729,7 +5709,7 @@ msgstr ""
 "Przejd\9f do linii lub ró¿nicy\n"
 "Id\9f do (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5738,7 +5718,7 @@ msgstr ""
 "Ustaw opcje programu\n"
 "Opcje"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5747,79 +5727,79 @@ msgstr ""
 "Od\9cwie¿ podgl¹d\n"
 "Od\9cwie¿ (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Kopiuj wybrane linie do schowka dodaj¹c numeracjê wierszy"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Dodaj zak³adkê"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Id\9f do nastêpnej zak³adki"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Id\9f do poprzedniej zak³adki"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Wyczy\9cæ wszystkie zak³adki"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
 "Show Identical Items"
 msgstr "Wy\9cwietla pliki, które s¹ dok³adnie identyczne"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
 "Show Different Items"
 msgstr "Wyswietla pliki z ró¿nicami"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
 "Show Left Unique Items"
 msgstr "Wyswietla pliki istniej¹ce tylko po lewej"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
 "Show Right Unique Items"
 msgstr "Wyswietla pliki istniej¹ce tylko po prawej"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
 "Show Binary Files"
 msgstr "Wy\9cwietla pliki binarne"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
 "Show Skipped Items"
 msgstr "Wy\9cwietla pominiête pliki"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5828,7 +5808,7 @@ msgstr ""
 "Wybierz czcionkê podgl¹du\n"
 "Wybierz czcionkê podgl¹du"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5837,27 +5817,27 @@ msgstr ""
 "Przywróæ domy\9cln¹ czcionkê systemow¹ podgl¹du\n"
 "Czcionka domy\9clna"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Pokazuje bia³e znaki"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Prze³¹cz panel ró¿nic"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Panel pokazuje ogólny obraz z plików"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Poka¿ okno statystyk porównania folderu"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5866,7 +5846,7 @@ msgstr ""
 "Wybierz jêzyk interfejsu u¿ytkownika\n"
 "Jêzyk"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5875,12 +5855,12 @@ msgstr ""
 "Pokazuj ró¿nice wewn¹trz linii ró¿nymi kolorami\n"
 "Pokazuj ró¿nicê linii"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Zamieñ pozycje dwóch okien"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5889,7 +5869,7 @@ msgstr ""
 "Poka¿ numery linii\n"
 "Poka¿ numery linii"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5898,7 +5878,7 @@ msgstr ""
 "W³¹cz zawijanie s³ów\n"
 "Zawijaj linie"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5907,22 +5887,22 @@ msgstr ""
 "Pokazuje marginesy zaznaczenie dla obu paneli\n"
 "Poka¿ marginesy zaznaczenia"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Zwiêksz rozmiar tekstu"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Zmniejsz rozmiar tekstu"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Resetuj powiêkszenie"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5931,7 +5911,7 @@ msgstr ""
 "Id\9f do poprzedniej ró¿nicy\n"
 "Poprzednia ró¿nica (Alt+Góra)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5940,67 +5920,67 @@ msgstr ""
 "Id\9f do nastêpnej ró¿nicy\n"
 "Nastêpna ró¿nica (Alt+Dó³)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -6009,7 +5989,7 @@ msgstr ""
 "Id\9f do pierwszej ró¿nicy\n"
 "Pierwsza ró¿nica (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6018,7 +5998,7 @@ msgstr ""
 "Id\9f do bie¿¹cej ró¿nicy\n"
 "Bie¿¹ca ró¿nica (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6027,7 +6007,7 @@ msgstr ""
 "Id\9f do ostatnej ró¿nicy\n"
 "Ostatnia ró¿nica (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6036,7 +6016,7 @@ msgstr ""
 "Kopiuj wybrany tekst do prawego pliku\n"
 "Kopiuj na prawo (Alt+Prawo)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6045,7 +6025,7 @@ msgstr ""
 "Kopiuj wybrany tekst do lewego pliku\n"
 "Kopiuj na lewo (Alt+Lewo)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6054,7 +6034,7 @@ msgstr ""
 "Kopiuj ró¿nicê na prawo i przejd\9f do nastêpnej\n"
 "Kopiuj na prawo i nastêpna (Ctrl+Alt+Prawo)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6063,7 +6043,7 @@ msgstr ""
 "Kopiuj ró¿nicê na lewo i przejd\9f do nastêpnej\n"
 "Kopiuj na lewo i nastêpna (Ctrl+Alt+Lewo)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6072,7 +6052,7 @@ msgstr ""
 "Kopiuj wszystkie ró¿nice do prawego pliku\n"
 "Wszystkie na prawo"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6081,77 +6061,77 @@ msgstr ""
 "Kopiuj wszystkie ró¿nice do lewego pliku\n"
 "Wszystkie na lewo"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Usuñ zaznaczone elementy z obu folderów"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Porównaj zaznaczony element (porównaj pierwszy element je\9cli zaznaczono wiele elementów)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Wybierz i ponownie uporz¹dkuj kolumny porównania katalogów"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Generuj ³atkê"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Wybierz i modyfikuj filtry"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Generuje raport z wyników porównania"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "Pokazuje listê dostêpnych wtyczek"
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "U¿ytkownik wybiera program rozpakowuj¹cy (bez rozpakowywania podczas porównania katalogów)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Program rozpakowuj¹cy zostanie uruchomiony dla obu plików (jeden plik wymaga rozszerzenia)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Wybierz program rozpakowuj¹cy, by edytowaæ plik"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Bez ró¿nicowania wstêpnego (normalne)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Sugerowane wtyczki"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Inne wtyczki"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Od³¹cz i ponownie pod³¹cz wszystkie wtyczki (dla programistów)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6160,12 +6140,12 @@ msgstr ""
 "Aktywuje nastêpny widoczny plik\n"
 "Aktywuj nastêpny plik"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Zamyka wszystkie otwarte okna"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6174,22 +6154,22 @@ msgstr ""
 "Otwiera pomoc WinMerge\n"
 "Pomoc WinMerge"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Wy\9cwietla bie¿¹c¹ wersjê WinMerge oraz tekstowy plik konfiguracji"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "Wy\9cwietla licencjê GNU General Public License"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Kompilacja prywatna: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6198,7 +6178,7 @@ msgstr ""
 "Otwiera dokument z informacjami o wydaniu\n"
 "Informacje o wydaniu"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6207,272 +6187,272 @@ msgstr ""
 "Otwiera witrynê t³umaczeñ\n"
 "T³umacznia"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Ustawienia wtyczki"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Bez ró¿nicowania wstêpnego"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Ró¿nicuj wstêpnie, je\9cli mo¿na"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "Nie znaleziono WSH \96 skrypty .sct wy³¹czone"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<brak>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<automatycznie>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Otwórz plik w zarejestrowanej aplikacji"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Otwórz plik w zewnêtrznym edytorze"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Otwórz plik w wybranym programie"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Nie wy\9cwietlaj przenoszonych bloków"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Wy\9cwietl wszystkie przeniesione bloki"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Wy\9cwietl przeniesione bloki tylko od bie¿¹cej ró¿nicy"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Id\9f do ró¿nicy pod kursorem"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "Id\9f &do ró¿nicy %1 z %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "&Id\9f do linii %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Wy³¹czone"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Z systemu plików"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Z listy MRU"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "Bez pod\9cwietlenia"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Batch"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Portable Object"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Zasoby"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr "Verilog"
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Ukryj pasek narzêdzi"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Poka¿ ma³y pasek narzêdzi"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Poka¿ du¿y pasek narzêdzi"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index 71aa8d3..ba7cf1a 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -1029,7 +1029,7 @@ msgid "&Scripts"
 msgstr "Scripts"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Vazio >"
@@ -1470,7 +1470,7 @@ msgid "&Versioning System:"
 msgstr "Sistema de versão:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "Destino de cleartool.exe:"
@@ -1671,7 +1671,7 @@ msgid "Replace &All"
 msgstr "Substituir todos"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Alteração lógica de maiúsculas/minúsculas"
@@ -2567,7 +2567,7 @@ msgid "Files:"
 msgstr "Ficheiros:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Diferente"
@@ -2604,7 +2604,7 @@ msgid "Right:"
 msgstr "Direita:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Idêntico"
@@ -2804,7 +2804,7 @@ msgid "A&ppend timestamp"
 msgstr ""
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr ""
@@ -2882,7 +2882,7 @@ msgstr ""
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Pasta"
@@ -3362,7 +3362,7 @@ msgid "Version Control"
 msgstr "Controlo de versão"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Diferenças"
@@ -3479,2462 +3479,2442 @@ msgstr ""
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr ""
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr ""
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr ""
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr ""
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr ""
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Conteúdo essencial"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Data de modificação"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Data de modificação e tamanho"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Tamanho"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Nome"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Localização"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filtros"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F]"
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Descrição"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Seleccionar nome de ficheiro para novo filtro"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Ficheiros de filtros (*.ini)|*.ini|Todos os ficheiros (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2."
 msgstr ""
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, 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:2210
+#: Merge.rc:2201
 #, c-format
 msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System."
 msgstr ""
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
 msgstr ""
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Localizar filtro a instalar"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
 msgstr ""
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr ""
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr ""
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
 msgstr ""
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr ""
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Relatório de comparação de arquivos"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Comparação de ficheiros"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Sem título esquerda"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Sem título direita"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr ""
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr ""
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Analisando ficheiros..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "A abrir selecção"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "A copiar da esquerda para a direita"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "A copiar da direita para a esquerda"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "A copiar tudo para a esquerda"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "A copiar tudo para a direita"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "A copiar ficheiros..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "A eliminar ficheiros..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "A mover ficheiros..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "A criar relatório..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr ""
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr ""
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Linha: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Combinar"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Diferença %1 de %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 diferenças encontradas"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "1 diferença encontrada"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr ""
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Item %1 de %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Item %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Seleccione dois arquivos ou ficheiros existentes para comparar"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Selecção de pasta"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Seleccione dois arquivos ou ficheiros para comparar."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "A pasta de destino da esquerda é inválido!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "A pasta de destino da direita é inválida!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Ambas as pastas de destino são inválidas!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Seleccione dois ficheiros para activar a selecção de extractor."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Impossível comparar ficheiro ou arquivo!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Ficheiro não encontrado: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Ficheiro não extraído: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid "Cannot open file\n%1\n\n%2"
 msgstr "Impossível abrir ficheiro\n%1\n\n%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr ""
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid "The file\n%1\nis not a conflict file."
 msgstr ""
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Guardar como"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Guardar alterações em %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 é apenas de leitura. Deseja substituir o ficheiro apenas de leitra ? (Não, para guardar com novo nome.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Erro na verificação de escrita na pasta de destino"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Erro ao criar cópia de segurança"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
 msgstr ""
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, 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 "Erro ao guardar ficheiro.\n%1\n%2\nDeseja:\n\t-usar um nome diferente para o ficheiro (Prima Ok)\n\t-abortar a acção actual (Prima Cancelar)?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, 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 "Plugin '%2' impossível comprimir as suas alterações no ficheiro esquerdo em '%1'.\n\nO ficheiro original não será alterado.\n\nDeseja guardar a versão não comprimida em outro ficheiro?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, 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 "Plugin '%2' impossível comprimir as suas alterações no ficheiro direito em '%1'.\n\nO ficheiro original não será alterado.\n\nDeseja guardar a versão não comprimida em outro ficheiro?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?"
 msgstr "Outra aplicação actualizou o ficheiro\n%1\ndesde a incialização de WinMerge.\n\nSubstituir ficheiro modificado?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid "%1\nis marked read-only. Would you like to override the read-only item?"
 msgstr "%1\né apenas de leitura. Deseja substituir o item apenas de leitura?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
 msgstr ""
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Guardar ficheiro esquerdo como..."
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Guardar ficheiro direito como..."
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
 msgstr ""
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
 msgstr "Impossível combinar diferenças quando os documentos não estão sincronizados.\n\nActualizar documentos antes de continuar."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Tem de especificar o destino de um projecto SourceSafe para continuar (ex: $/OMeuProjecto)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Desproteger ficheiros de VSS..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "Sistema de versões apresentou erro ao tentar desproteger ficheiro. Impossível contiuar..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Erro ao executar comando do sistema de versões."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "O ficheiro de trabalho de VSS e o destino do ficheiro actual não coincidem. Continuar?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Base(s) de dados VSS não encontrada(s)!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Erro no VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, 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 "O sistema de versões apresentou um erro ao tentar desproteger o ficheiro.\n Verifique a configuração da visualização utilizada.\n Anular a operação de desprotecção?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. "
 msgstr "O sistema de versões apresentou um erro ao tentar anular a desprotecção do ficheiro.\n Verifique a configuração da visualização utilizada."
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Nenhum"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (inferior a 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 e superior)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Quebra de linha nos espaços"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Quebra de linha nos espaços ou pontuação"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Copiar o item seleccionado para a directoria nomeada"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Copiar o item seleccionado para a directoria personalizada"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Eliminar item seleccionado à esquerda"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Eliminar item seleccionado à direita"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Eliminar item(s) seleccionado(s) em ambos os lados"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Ocultar item(s) seleccionado(s) (no filtro)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Renomear o item seleccionado em ambos os lados"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Da direita para a esquerda (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Da esquerda para a direita (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Da direita para a esquerda (%1 de %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Da esquerda para a direita (%1 de %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Da esquerda para... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Da direita para... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Da esquerda para... (%1 de %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Da direita para... (%1 de %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Esquerda (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Direita (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Ambos (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Esquerda (%1 de 2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Direita (%1 de 2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Ambos (%1 de %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Seleccione pasta de destino"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Lado esquerdo - seleccione pasta de destino:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Lado direito - seleccione pasta de destino:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 ficheiros afectados)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 de %2 ficheiros afectados)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid "Are you sure you want to delete\n\n%1 ?"
 msgstr "Tem certeza que deseja eliminar\n\n%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr ""
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr ""
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, 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:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr ""
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr ""
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr ""
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Abrir ficheiro esquerdo"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Abrir ficheiro esquerdo no editor externo"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Abrir ficheiro esquerdo com..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Abrir ficheiro direito"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Abrir ficheiro direito no editor externo"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Abrir ficheiro direito com..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Erro ao executar editor externo: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Extensão desconhecida do editor externo: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Copiar nomes dos ficheiros para a Área de Transferência"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Copiar destino do lado esquerdo para a Área de Transferência"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Copiar destino do lado direito para a Área de Transferência"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Copiar destino de ambos os lados para a Área de Transferência"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr ""
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr ""
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Formato de arquivo desconhecido"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Adicionar itens do lado esquerdo ao arquivo"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Adicionar itens do lado direito ao arquivo"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Adicionar itens de ambos os lados ao arquivo"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Adicionar outros itens ao arquivo (ambos os lados)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr ""
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr ""
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Resultado da comparação"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Data da esquerda"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Data da direita"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Extensão"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Lado esquerdo"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Lado direito"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Lado direito (Curto)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Lado esquerdo (Curto)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Data de criação - Esq"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Data de criação - Dta"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Ficheiro mais recente"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Versão do ficheiro esquerdo"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Versão do ficheiro direito"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Resultado resumido"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Atributos esq"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Atributos dta"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "EOL esq"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "EOL dta"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Codificação esq"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Codificação dta"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Diferença ignorada."
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binário"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Impossível comparar ficheiros"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Item abortado"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Ficheiro omitido"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Arquivo omitido"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr ""
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr ""
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Os ficheiros binários são idênticos"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Os ficheiros binários são diferentes"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Os ficheiros são diferentes"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr ""
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Apenas esquerda"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Apenas direita"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr ""
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr ""
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr ""
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Tempo decorrido: %Id ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 item seleccionado"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 itens seleccionado"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Nome do ficheiro ou pasta."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Nome de sub-ficheiro quando sub-ficheiros incluídos."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Resultado da comparação, forma extensa."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Data de modificação do lado esquerdo."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Data de modificação do lado direito."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Extensão do ficheiro."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Tamanho do ficheiro em bytes."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Tamanho do ficheiro direito em bytes."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Tamanho do ficheiro esquerdo abreviado."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Tamanho do ficheiro direito abreviado."
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Data de criação do lado esquerdo."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Data de criação do lado direito."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Indica o lado com a data de modificação mais recente."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Versão do ficheiro do lado esquerdo, apenas para alguns tipos de ficheiros."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Versão do ficheiro do lado direito, apenas para alguns tipos de ficheiros."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Resultado resumido da comparação."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Atributos do lado esquerdo."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Atributos do lado direito."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Tipo de ficheiro EOL do lado esquerdo"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Tipo de ficheiro EOL do lado direito"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Codificação do lado esquerdo."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Codificação do lado direito."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Número de diferenças ignoradas no ficheiro. Estas diferenças são ignoradas pelo WinMerge e não podem ser combinadas."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Número de diferenças no ficheiro. Este número não inclui diferenças ignoradas."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Apresenta um asterisco (*) se ficheiro for binário."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Comparar %1 com %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Lista separada por vírgulas"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Lista separada por tabulações"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "HTML simples"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "HTML simples"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr ""
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid "Error creating the report:\n%1"
 msgstr "Erro ao criar relatório:\n%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "O relatório foi criado com sucesso."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "O mesmo ficheiro está aberto em ambas as janelas."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Os ficheiros seleccionados são idênticos."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Ocorreu um ero ao comparar os ficheiros."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Impossível criar ficheiros temporários. Verifique as suas definições de ficheiros temporários."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, 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:2625
+#: Merge.rc:2616
 #, 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:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Ocorreu um erro ao pré-diferenciar o ficheiro %1' com o plugin %2'. A pré-diferenciação não será aplicada."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "O arquivo seleccionado é inválido."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Impossível abrir ficheiro binário no editor."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, 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:2635
+#: Merge.rc:2626
 #, 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 "Encontrados páginas de código diferentes nos ficheiros da esquerda (cp%d) e direita (cp%d). \nApresentar cada ficheiro na sua página de código terá melhor visualização, mas combinar/copiar poderá ser arriscado.\Deseja tratar os dois ficheiros como tendo as páginas de código predefinidas para as janelas?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Atenção: Os ficheiros utilizam codificações diferentes, esquerda=%s e direita=%s e combinar poderá causar perda de informação."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Informações perdidas devido a erros de codificação: ambos os ficheiros"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Sem diferenças"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Diferença de linha"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Substituída(s) %1 string(s)."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Imposível localizar string \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Copiar localização completa"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Copiar nome de ficheiro"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Janela de localização"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Janela de diferenças"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Ficheiro patch escrito com sucesso."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. item não encontrado ou é uma directoria!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. item não encontrado ou é uma directoria!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "O ficheiro patch já existe. Deseja substituí-lo?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 itens seleccionados]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr ""
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Contexto"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Unificado"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr ""
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Impossível escrever no ficheiro %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "A localização de destino não é uma localização absoluta: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Especifique o ficheiro de destino"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Impossível criar ficheiro patch a partir de ficheiros binários."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Impossível criar ficheiro patch a partir de directorias."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files."
 msgstr "Por favor, guarde todos os ficheiros antes.\n\nCiar um ficheiro patch requer a inexistência de alterações por guardar nos ficheiros."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "O arquivo não existe."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Os resultados de comparação da directoria actual serão eliminados."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, 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:2702
+#: Merge.rc:2693
 #, c-format
 msgid "\nNote: 7-Zip integration is disabled in WinMerge settings."
 msgstr "\nNota: integração 7-Zip desactivada nas definições do WinMerge."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings."
 msgstr "\nNota: integração 7-Zip está restricta a operação autónoma nas definições do WinMerge."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Seleccione ficheiro a exportar"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Seleccione ficheiro a importar"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Opções importadas do ficheiro."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Opções exportadas para o ficheiro."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Importação de opções do ficheiro falhou."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Escrita de opções para o ficheiro falhou."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid "You are about to close several compare windows.\n\nDo you want to continue?"
 msgstr ""
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Erro de expressão regular"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Sem coincidências"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Expressão regular inválida"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Caracter de intercalação inválido"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Nome de classe de caracter inválido"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr ""
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Referência anterior inválida"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Sem coincidências [ ou [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Sem coincidências ( ou \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Sem coincidências \\("
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Conteúdo inválido de \\(\\)"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Fim de zona inválido"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Sem memória"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Expressão regular anterior inválida"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Fim prematuro da expressão regular"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Expressão regular demasiado extensa"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Sem coincidências ) ou \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr ""
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr ""
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr ""
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Misturado"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr ""
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr ""
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr ""
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr "B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr "KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr "MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr "GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr "TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr "PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr ""
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr ""
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr ""
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr ""
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Guardar ficheiro esquerdo"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Guardar ficheiro direito"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Guardar ficheiro com o nome..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Guardar ficheiro direito com o nome..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr ""
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr ""
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr ""
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Alternar entre modos de edição e combinação"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid "View and adjust file encoding properties\nFile encoding properties"
 msgstr "Ver e ajustar propriedades de codificação\nPropriedades de codificação do ficheiro"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr ""
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid "Select difference area in the current line\nDifference in the Current Line"
 msgstr "Seleccionar área de diferenças na linha actual\nDiferença na linha actual"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid "Go to line or difference\nGo to (Ctrl+G)"
 msgstr "Ir para linha ou diferença\nIr para (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid "Set program options\nOptions"
 msgstr "Definir opções do programa\nOpções"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid "Refresh display\nRefresh (F5)"
 msgstr "Actualizar visualização\nActualizar (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Copiar linhas seleccionadas para a Área de Transferência adicionando nºs de linha ao início de linha"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Alternar marcações"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Ir para a próxima marcação"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Ir para a marcação anterior"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Eliminar todos os marcadores"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid "Displays items that are exactly the same\nShow Identical Items"
 msgstr "Mostrar itens exactamente iguais\nMostrar itens idênticos"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid "Displays items that have differences\nShow Different Items"
 msgstr "Mostra itens com diferenças\nMostra itens diferentes"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid "Displays items that exist in only on the left side\nShow Left Unique Items"
 msgstr "Mostra itens exstentes apenas no lado esquerdo\nMostra itens únicos da esquerda"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid "Displays items that exist in only on the right side\nShow Right Unique Items"
 msgstr "Mostra itens exstentes apenas no lado direito\nMostra itens únicos da direita"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid "Displays binary files\nShow Binary Files"
 msgstr "Mostra ficheiros binários\nMostra ficheiros binários"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid "Displays skipped items\nShow Skipped Items"
 msgstr "Mostra itens omitidos\nMostra itens omitidos"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid "Select the font for the view\nSelect View Font"
 msgstr "Selecciona a fonte de visualização\nSelecciona fonte de visualização"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid "Revert to using the default system font for view\nDefault Font"
 msgstr "Repor fonte do sistema predefinida de visualização\nFonte predefinida"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Mostra espaços em branco"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Mostrar/Ocultar janela de diferenças"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Janela de localização mostra visão geral dosficheiros"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Mostra estatísticas da comparação de arquivos"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid "Select the current user interface language\nLanguage"
 msgstr ""
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid "Shows differences inside lines with different colors\nShow Line Difference"
 msgstr ""
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Troca a posição das duas janelas"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid "Shows line numbers\nShow Line Numbers"
 msgstr "Mostra os números de linha\nMostra números de linha"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid "Enable word wrap\nWrap Lines"
 msgstr "Ajustar comprimento de linhas à largura da janela\nAjustar linhas"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid "Shows selection margins for both panes\nShow Selection Margins"
 msgstr ""
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr ""
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr ""
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr ""
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
 msgstr ""
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
 msgstr ""
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
 msgstr ""
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
 msgstr ""
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid "Scroll to the last difference\nLast Difference (Alt+End)"
 msgstr ""
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)"
 msgstr "Copiar o texto seleccionado para oficheiro esquerdo\nCopiar à direita (Alt+Direita)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)"
 msgstr "Copiar o texto seleccionado para o ficheiro esquerdo\nCopiar à esquerda (Alt+Esquerda)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)"
 msgstr "Copiar diferença para a direita e avançar para a próxima\nCopiar à direita e avançar (Ctrl+Alt+Direita)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)"
 msgstr "Copiar diferença para a esquerda e avançar para a próxima\nCopiar à esquerda e avançar (Ctrl+Alt+Esquerda)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid "Copy all differences to the right file\nAll Right"
 msgstr "Copiar todas as diferenças para o ficheiro da direita\nTodas à direita"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid "Copy all differences to the left file\nAll Left"
 msgstr "Copiar todas as diferenças para o ficheiro da esquerda\nTodas à esquerda"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Eliminar itens seleccionados de ambas as directorias"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Comparar o item seleccionado (comparar primeiro item, se vários itens seleccionados)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Seleccionar e reordenar colunas de comparação da directoria"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Gerar ficheiro patch"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Seleccionar e modificar filtros"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Gera um relatório dos resultados de comparação"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr ""
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "O utilizador selecciona o extractor (sem extracção quando comparando dir)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "O extractor adoptado aplica-se a ambos ficheiros (apenas um ficheiro necessita de extensão)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Seleccione um extractor para editar este ficheiro"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Não pré-diferenciar (normal)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Plugins sugeridos"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Outros plugins"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Descarregar todos os plugins e recarregá-los (para developers)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid "Activates next visible file\nActivate next File"
 msgstr ""
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Fecha todas as janelas abertas"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid "Opens the WinMerge Help\nWinMerge Help"
 msgstr ""
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Exporta a versão actual de WinMerge e a configuração para um ficheiro de texto"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr ""
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Compilação privada: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid "Opens the release notes document\nRelease Notes"
 msgstr ""
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid "Opens the translations website\nTranslations"
 msgstr ""
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Definições de plugin"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Não pré-diferenciar"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Pré-diferenciar, se possível"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH não encontrado - scripts .sct desactivados"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Nenhum>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Automático>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Abrir ficheiro com a aplicação registada"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Abrir ficheiro com editor externo"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Abrir ficheiro com programa específico"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Não mostrar blocos movidos"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr ""
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Mostrar blocos movidos apenas da diferença actual"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Ir para a diferença sob o cursor"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "Ir para diferença %1 de %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "Ir para linha %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Do sistema de ficheiros"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Da lista MRU"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr ""
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr ""
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr ""
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr ""
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr ""
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr ""
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr ""
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr ""
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr ""
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr ""
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr ""
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr ""
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr ""
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr ""
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr ""
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr ""
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr ""
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr ""
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr ""
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr ""
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr ""
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr ""
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr ""
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr ""
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr ""
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr ""
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr ""
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr ""
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr ""
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr ""
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr ""
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr ""
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr ""
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr ""
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr ""
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index bfc8b20..756164e 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -1030,7 +1030,7 @@ msgid "&Scripts"
 msgstr "&Script-uri"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Gol >"
@@ -1471,7 +1471,7 @@ msgid "&Versioning System:"
 msgstr "Sistem de &versionare:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "Ca&lea cãtre cleartool.exe"
@@ -1672,7 +1672,7 @@ msgid "Replace &All"
 msgstr "Înlocuieºte t&ot"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2585,7 +2585,7 @@ msgid "Files:"
 msgstr "Fiºiere:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Diferite"
@@ -2622,7 +2622,7 @@ msgid "Right:"
 msgstr "Dreapta:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Identice"
@@ -2822,7 +2822,7 @@ msgid "A&ppend timestamp"
 msgstr "Adaugã timp"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Confirmã copierea"
@@ -2900,7 +2900,7 @@ msgstr ""
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Director"
@@ -3540,7 +3540,7 @@ msgid "Version Control"
 msgstr "Control versiuni"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Diferenþe"
@@ -3669,87 +3669,67 @@ msgstr "Fi
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Conþinut întreg"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Conþinut rapid"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Datã modificare"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Datã modificare ºi mãrime"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Mãrime"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Nume"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Locaþie"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filtre"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Descriere"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Selecteazã numele fiºierului pentru noul filtru"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Fiºiere filtru (*.flt)|*.flt|Toate fiºierele (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3762,7 +3742,7 @@ msgstr ""
 "Vã rugãm copiaþi fiºierul %1 în directorul WinMerge/Filters :\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3775,7 +3755,7 @@ msgstr ""
 "\n"
 "Vã rugãm verificaþi cã fiºierul existã ºi este editabil."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3786,7 +3766,7 @@ msgstr ""
 "\n"
 "Vã rugãm selectaþi directorul filtru în Opþiuni.../Sistem."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, fuzzy, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3799,12 +3779,12 @@ msgstr ""
 "\n"
 "Este posibil ca fiºierul sã nu poatã fi editat (numai-citire)?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Selectaþi fiºierul filtru pentru instalare"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3815,258 +3795,258 @@ msgstr ""
 "\n"
 "Nu s-a putut copia noul fiºier filtru în directorul filtru."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Fiºierul filtru deja existã. Suprascrie?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Expresie regulatã"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
 msgstr ""
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr ""
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Rezultate comparare directoare"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Comparare fiºiere"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, fuzzy, c-format
 msgid "Untitled left"
 msgstr "Nedenumit stânga"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, fuzzy, c-format
 msgid "Untitled right"
 msgstr "Nedenumit dreapta"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, fuzzy, c-format
 msgid "Theirs File"
 msgstr "Fiºierul lor"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, fuzzy, c-format
 msgid "Mine File"
 msgstr "Fiºierul meu"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Scanare fiºiere..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Deschidere selecþie"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Copiere stânga cãtre dreapta"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Copiere dreapta cãtre stânga"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Copiere toate la stânga"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Copiere toate la dreapta"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Copiere fiºiere..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "ªtergere fiºiere..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Mutare fiºiere..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Creare raport..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr ""
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr ""
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Linie: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Fuziune"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Deferenþa %1 din %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 diferenþe gãsite"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "O diferenþã gãsitã"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, fuzzy, c-format
 msgid "RO"
 msgstr "RO"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Element %1 din %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Elemente: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Selectaþi douã directoare sau fiºiere existente pentru comparare"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Selectare directoare"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Selectaþi douã directoare sau douã fiºiere pentru comparare."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "Calea din stânga este nevalidã!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Calea din dreapta este nevalidã!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Ambele cãi sunt nevalide!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, fuzzy, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Alegeþi douã fiºiere pentru a activa selecþia cu dezarhivatorul."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Nu se poate compara un fiºier cu un director!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Fiºier negãsit: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Fiºier nedezarhivat: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4079,12 +4059,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Analizarea fiºierului de conflicte a eºuat."
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4095,32 +4075,32 @@ msgstr ""
 "%1\n"
 "nu e un fiºier de conflicte."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Salveazã ca"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, fuzzy, c-format
 msgid "Save changes to %1?"
 msgstr "Salveazã schimbãrile în %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, fuzzy, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 este marcat ca numai-citire. Doriþi suprascrierea fiºierului numai-citire? (Apãsaþi nu ca sã forþaþi redenumirea.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, fuzzy, c-format
 msgid "Error checking destination writeability"
 msgstr "Eroare la verificarea posibilitãþii de a scrie în locaþia destinaþie"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, fuzzy, c-format
 msgid "Error backing up file"
 msgstr "Eroare la salvarea copiei de siguranþã a fiºierului"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4133,7 +4113,7 @@ msgstr ""
 "\n"
 "Continuaþi oricum?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4150,7 +4130,7 @@ msgstr ""
 "\t- folosiþi un alt nume de fiºier (apãsaþi Ok)\n"
 "\t- renunþaþi la operaþia curentã (apãsaþi Renunþã)?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4165,7 +4145,7 @@ msgstr ""
 "\n"
 "Doriþi sã salvaþi versiunea nearhivatã în alt fiºier?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4180,7 +4160,7 @@ msgstr ""
 "\n"
 "Doriþi sã salvaþi versiunea nearhivatã în alt fiºier?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4195,7 +4175,7 @@ msgstr ""
 "\n"
 "Suprascrieþi fiºierul modificat?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, fuzzy, c-format
 msgid ""
 "%1\n"
@@ -4204,32 +4184,32 @@ msgstr ""
 "%1\n"
 "este marcat ca numai-citire. Doriþi sã suprascrieþi elementul numai-citire?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
 msgstr ""
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Salveazã fiºierul din stânga ca"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Salveazã fiºierul din dreapta ca"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
 msgstr ""
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, fuzzy, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4240,42 +4220,42 @@ msgstr ""
 "\n"
 "Reîmprospãtaþi documentele înainte de a continua."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Trebuie sã specificaþi calea unui proiect SourceSafe pentru a continua (ex.:  $/MyProject)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Extrage fiºierele din VSS.."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, fuzzy, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "Sistemul de versionare a returnat o eroare încercând sã extragã fiºierul. Imposibil de continuat..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Eroare la execuþia comenzii sistemului de versionare."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, fuzzy, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "Directorul de lucru VSS ºi locaþia fiºierului curent nu se potrivesc. Continuaþi?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Nu s-a gãsit nicio bazã de date VSS!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Eroare de la VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, fuzzy, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4286,7 +4266,7 @@ msgstr ""
 " Vã rugãm, verificaþi specificaþiile scopului folosit.\n"
 " Anuleazã operaþia de extragere?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, fuzzy, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4295,169 +4275,169 @@ msgstr ""
 "Sistemul de versionare a returnat o eroare încercând sã anuleze extragerea fiºierului.\n"
 " Vã rugãm, verificaþi specificaþiile scopului folosit."
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Nici unul"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (mai vechi de 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 sau mai nou)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, fuzzy, c-format
 msgid "Break at whitespace"
 msgstr "Întrerupe la blanc"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, fuzzy, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Întrerupe la blanc sau semn de punctuaþie"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Copie elementul selectat în directorul specificat"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Copie elementul selectat în directorul preferinþã"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "ªterge elementul selectat din stânga"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "ªterge elementul selectat din dreapta"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "ªterge elementul(ele) selectat(e) din ambele pãrþi"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, fuzzy, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Ascunde elementul(ele) selectat(e) (filtru din-zbor)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Redenumeºte elementele selectate în ambele pãrþi"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, fuzzy, c-format
 msgid "Right to Left (%1)"
 msgstr "De la dreapta la stânga (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, fuzzy, c-format
 msgid "Left to Right (%1)"
 msgstr "De la stânga la dreapta (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "De la dreapta la stânga (%1 din %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "De la stânga la dreapta (%1 din %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Stânga la... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Dreapta la... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Stânga la... (%1 din %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Dreapta la... (%1 din %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Stânga (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Dreapta (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Ambele (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Stânga (%1 din %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Dreapta (%1 din %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Ambele (%1 din %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Selectare director destinaþie"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Partea stângã - selectare director destinaþie:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Partea dreaptã - selectare director destinaþie:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 fiºiere afectate)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 din %2 fiºiere afectate)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4468,17 +4448,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Sunteþi sigur cã vreþi sã copiaþi:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Sunteþi sigur cã vreþi sã copiaþi %d elemente:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, fuzzy, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4497,613 +4477,613 @@ msgstr ""
 "\n"
 "Vã rugãm reîmprospãtaþi compararea."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr ""
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr ""
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr ""
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Deschide fiºier stânga"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Deschide fiºierul stânga în editor extern"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Deschide fiºier stânga cu..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Deschide fiºier dreapta"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Deschide fiºierul dreapta cu editor extern"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Deschide fiºier dreapta cu..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Execuþia editorului extern a eºuat: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, fuzzy, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Extensie necunoscutã în editorul extern: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Copie numele fiºierelor în memorie"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Copie cãile din partea stângã în memorie"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Copie cãile din partea dreaptã în memorie"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Copie cãile din ambele pãrþi în memorie"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr ""
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr ""
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Format arhivã necunoscut"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Adaugã elementele din partea stângã la arhivã"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Adaugã elementele din partea dreaptã la arhivã"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Adaugã elementele din ambele pãrþi la arhivã"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Adaugã elementele diferite la arhivã (ambele pãrþi)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Mutã fiºierul selectat din stânga cãtre director specificat"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Mutã fiºierul selectat din dreapta cãtre director specificat"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Nume fiºier"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Rezultat comparare"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Datã stânga"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Datã dreapta"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Extensie"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Mãrime stânga"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Mãrime dreapta"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Mãrime dreapta (scurt)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Mãrime stânga (scurt)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, fuzzy, c-format
 msgid "Left Creation Time"
 msgstr "Timp creare stânga"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, fuzzy, c-format
 msgid "Right Creation Time"
 msgstr "Timp creare dreapta"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Fiºier mai nou"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Versiune fiºier stânga"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Versiune fiºier dreapta"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, fuzzy, c-format
 msgid "Short Result"
 msgstr "Rezultat scurt"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Atribute stânga"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Atribute dreapta"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, fuzzy, c-format
 msgid "Left EOL"
 msgstr "SDL stânga"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, fuzzy, c-format
 msgid "Right EOL"
 msgstr "SDL dreapta"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Set de caractere stânga"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Set de caractere dreapta"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, fuzzy, c-format
 msgid "Ignored Diff."
 msgstr "Diferenþe ignorate"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binar"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Imposibil de comparat fiºierele"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, fuzzy, c-format
 msgid "Item aborted"
 msgstr "Element întrerupt"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Fiºier omis"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Director omis"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Numai stânga: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Numai dreapta: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Fiºierele binare sunt identice"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Fiºierele binare sunt diferite"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Fiºierele sunt diferite"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr ""
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Numai stânga"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Numai dreapta"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Eroare"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr ""
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr ""
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Timp scurs: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "Un element selectat"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 elemente selectate"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Nume de fiºier sau director."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, fuzzy, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Nume de sub-director pentru când sub-directoarele sunt incluse."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, fuzzy, c-format
 msgid "Comparison result, long form."
 msgstr "Rezultate comparare, forma lungã."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Data modificãrii pãrþii stângi."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Data modificãrii pãrþii drepte."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Extensia fiºierului."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Dimensiune fiºier stânga în octeþi."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Dimensiune fiºier dreapta în octeþi."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Dimensiune fiºier stânga prescurtatã."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Dimensiune fiºier dreapta prescurtatã."
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Timp creare stânga."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Timp creare dreapta."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Spune care parte are o datã a modificãrii mai recentã."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Versiune fiºier stânga, numai pentru unele tipuri de fiºiere."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Versiune fiºier dreapta, numai pentru unele tipuri de fiºiere."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, fuzzy, c-format
 msgid "Short comparison result."
 msgstr "Rezultat comparare pe scurt."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Atribute partea stângã."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Atribute partea dreaptã."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Tip SDL fiºier partea stângã."
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Tip SDL fiºier partea dreaptã."
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Set de caractere partea stângã."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Set de caractere partea dreaptã."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Numãr de diferenþe ignorate în fiºier. Aceste diferenþe sunt ignorate de WinMerge ºi nu pot fi fuzionate."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Numãr de diferenþe în fiºier. Acest numãr nu include diferenþele ignorate."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Aratã un asterisc (*) dacã fiºierul este binar."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Comparã %1 cu %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, fuzzy, c-format
 msgid "Comma-separated list"
 msgstr "Listã separatã-de-virgule"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, fuzzy, c-format
 msgid "Tab-separated list"
 msgstr "Listã separatã-de-tab-uri"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "HTML simplu"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "XML simplu"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Fiºierul raport existã deja. Doriþi sã suprascrieþi fiºierul existent?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5112,32 +5092,32 @@ msgstr ""
 "Eroare la creare raport:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Raportul a fost creat cu succes."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Acelaºi fiºier este deschis în ambele panouri."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Fiºierele selectate sunt identice."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "A fost întâlnitã o eroare în timpul comparãrii fiºierelor."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, fuzzy, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Fiºierele temporare nu au putut fi create. Verificaþi setarea cãii cãtre locaþia temporarã."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, fuzzy, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5152,7 +5132,7 @@ msgstr ""
 "\n"
 "Notã: Dacã întotdeauna doriþi tratarea ca ºi echivalentã a tuturor caracterelor de sfârºit de linie (SDL), setaþi opþiunea 'Ignorã diferenþele de sfârºit de linie..' în fila Comparare a dialogului de opþiuni (disponibilã sub meniul Editare/Opþiuni)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5163,22 +5143,22 @@ msgstr ""
 " Conform setãrilor curente, aceastea vor fi unificate la tipul principal.\n"
 " Doriþi sã schimbaþi preferinþele ºi ca sã pãstraþi SDL diferite?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "O eroare a fost întâlnitã în timpul prediferenþierii fiºierului '%1' utilizând plug-in-ul '%2'. Prediferenþierea nu va fi utilizatã în continuare."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "Directorul selectat este invalid."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Nu se poate deschide în editor un fiºier binar."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5193,7 +5173,7 @@ msgstr ""
 "%1\n"
 "în partea cealaltã ºi sã deschideþi ambele directoare?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5204,148 +5184,148 @@ msgstr ""
 "Afiºarea în setul de caractere propriu este mai potrivitã dar fuziunea/copierea este periculoasã.\n"
 "Doriþi tratarea ambelor fiºiere ca ºi cum ar fi în setul de caractere implicit din Windows (recomandat)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Atenþie: Fiºierele folosesc seturi de caractere diferite, stânga=%s ºi dreapta=%s, iar fuziunea poate duce la pierdere de informaþie."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Pierdere de informaþie datoritã incompatibilitãþii seturilor de caractere: ambele fiºiere"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Nicio diferenþã"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Diferenþã pe linie"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "S-a(u) înlocuit %1 ºir(uri)."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Nu s-a gãsit ºirul \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Copie calea întreagã"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Copie numele fiºierului"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, fuzzy, c-format
 msgid "Location Pane"
 msgstr "Panou locaþie"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Panou diferenþe"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Fiºierul petic a fost scris cu succes."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. elementul nu a fost gãsit sau este un director!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. elementul nu a fost gãsit sau este un director!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Fiºierul petic deja existã. Doriþi suprascrierea lui?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, fuzzy, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 fiºier(e) selectat(e)]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Context"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Unificat"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Nu s-a reuºit scrierea în fiºierul %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, fuzzy, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Locaþia destinaþie nu este o cale absolutã: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Specificaþi un fiºier destinaþie"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Nu s-a reuºit crearea unui fiºier petic din fiºiere binare."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Nu s-a reuºit crearea unui fiºier petic din directoare."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, fuzzy, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5356,17 +5336,17 @@ msgstr ""
 "\n"
 "Crearea unui petic necesitã ca fiºierele sã nu aibã conþinut nesalvat."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Directorul nu existã."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Rezultatele comparãrii curente de directoare vor fi ºterse."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5377,7 +5357,7 @@ msgstr ""
 "Componentele necesare (7-zip ºi/sau Merge7z*.dll) pentru dezarhivare nu au fost gãsite.\n"
 "Vedeþi manualul pentru mai multe informaþii despre suportul de dezarhivare ºi despre cum sã-l activaþi."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5386,7 +5366,7 @@ msgstr ""
 "\n"
 "Notã: integrarea 7-Zip este dezactivatã în setãrile WinMerge."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5395,37 +5375,37 @@ msgstr ""
 "\n"
 "Notã: integrarea 7-Zip este restricþionatã la operare de sine stãtãtoare în setãrile WinMerge."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Selectaþi fiºierul pentru export"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Selectaþi fiºierul pentru import"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Opþiuni importate din fiºier."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Opþiuni exportate cãtre fiºier."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "A eºuat importul opþiunilor din fiºier."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "A eºuat scrierea opþiunilor cãtre fiºier."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5436,242 +5416,242 @@ msgstr ""
 "\n"
 "Doriþi sã continuaþi?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, fuzzy, c-format
 msgid "Regular expression error"
 msgstr "Eroare la expresia regulatã"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Nicio potrivire"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Expresie regulatã nevalidã"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, fuzzy, c-format
 msgid "Invalid collation character"
 msgstr "Caracter cu colaþie nevalidã"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Nume de clasã de caractere nevalid"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, fuzzy, c-format
 msgid "Trailing backslash"
 msgstr "Backslash de sfârºit"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Referinþã inversã nevalidã"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "[ sau [^ fãrã corespondent"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "( sau \\( fãrã corespondent"
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "\\{ fãrã corespondent"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Conþinut nevalid al \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Sfârºit de ºir nevalid"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, fuzzy, c-format
 msgid "Out of memory"
 msgstr "Eroare de resurse de memorie"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Expresie regulatã anterioarã nevalidã"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Sfârºit prematur al expresiei regulate"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Expresie regulatã prea lungã"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr ") sau \\) fãrã corespondent"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Amestecat"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " O"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KO"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MO"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GO"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TO"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PO"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr ""
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr ""
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr ""
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr ""
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Salveazã fiºierul stâng"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Salveazã fiºierul drept"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Salveazã fiºierul stâng cu numele..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Salveazã fiºierul drept cu numele..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Converteºte SDL cãtre modul Windows"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Converteºte SDL cãtre modul Unix"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Converteºte SDL cãtre modul Mac"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Interschimbã între modurile editare ºi fuziune"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5680,12 +5660,12 @@ msgstr ""
 "Verificã ºi ajusteazã proprietãþile de codare ale fiºierelor.\n"
 "Proprietãþile de codare ale fiºierelor"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, fuzzy, c-format
 msgid "Open and resolve conflict file"
 msgstr "Deschide ºi rezolvã fiºierul conflict"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5694,7 +5674,7 @@ msgstr ""
 "Selecteazã zona diferenþã de pe linia curentã\n"
 "Diferenþa de pe linia curentã"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5703,7 +5683,7 @@ msgstr ""
 "Mergi la linie sau la diferenþã\n"
 "Mergi la (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5712,7 +5692,7 @@ msgstr ""
 "Seteazã opþiunile programului\n"
 "Opþiuni"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5721,37 +5701,37 @@ msgstr ""
 "Reîmprospãteazã afiºarea\n"
 "Reîmprospãteazã (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Copie liniile selectate în memorie adãugând numerele de linie la începutul fiecãrei linii"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Basculeazã semnul de carte"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Mergi la urmãtorul semn de carte"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Mergi la precedentul semn de carte"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Curãþã toate semnele de carte"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5760,7 +5740,7 @@ msgstr ""
 "Afiºeazã elementele care sunt identice\n"
 "Aratã elementele identice"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5769,7 +5749,7 @@ msgstr ""
 "Afiºeazã elementele care conþin diferenþe\n"
 "Aratã elementele cu diferenþe"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5778,7 +5758,7 @@ msgstr ""
 "Afiºeazã elementele care existã numai în partea stângã\n"
 "Aratã elementele care sunt numai în stânga"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5787,7 +5767,7 @@ msgstr ""
 "Afiºeazã elementele care existã numai în partea dreaptã\n"
 "Aratã elementele care sunt numai în dreapta"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5796,7 +5776,7 @@ msgstr ""
 "Afiºeazã fiºierele binare\n"
 "Aratã fiºierele binare"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5805,7 +5785,7 @@ msgstr ""
 "Afiºeazã fiºierele omise\n"
 "Aratã fiºierele omise"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5814,7 +5794,7 @@ msgstr ""
 "Selecteazã fontul pentru vizualizare\n"
 "Selecteazã fontul vizualizare"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5823,27 +5803,27 @@ msgstr ""
 "Revinã la folosirea fontului implicit de sistem pentru vizualizare\n"
 "Font implicit"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Aratã blancurile"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Basculeazã panoul de diferenþe"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Panoul locaþie aratã o imagine cu locaþia curentã în contextul fiºierelor"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Aratã dialogul cu statisticile de comparare a directoarelor"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, fuzzy, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5852,7 +5832,7 @@ msgstr ""
 "Selecteazã limba curentã pentru interfaþã\n"
 "Limbã"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5861,12 +5841,12 @@ msgstr ""
 "Aratã diferenþele în interiorul liniei utilizând culori diferite\n"
 "Aratã diferenþele pe linie"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, fuzzy, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Interschimbã poziþiile celor douã panouri"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5875,7 +5855,7 @@ msgstr ""
 "Aratã numerele de linie\n"
 "Aratã numerele de linie"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5884,7 +5864,7 @@ msgstr ""
 "Activeazã înfãºurarea liniilor lungi\n"
 "Înfãºoarã liniile"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5893,22 +5873,22 @@ msgstr ""
 "Aratã marginile de selecþie pentru ambele panouri\n"
 "Aratã marginile de selecþie"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Mãreºte dimensiunea textului"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Micºoreazã dimensiunea textului"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Reseteazã dimensiunea textului la valoarea implicitã"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5917,7 +5897,7 @@ msgstr ""
 "Desfãºoarã la diferenþa anterioarã\n"
 "Diferenþa anterioarã (Alt+Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5926,67 +5906,67 @@ msgstr ""
 "Desfãºoarã la diferenþa urmãtoare\n"
 "Diferenþa urmãtoare (Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -5995,7 +5975,7 @@ msgstr ""
 "Desfãºoarã la prima diferenþã\n"
 "Prima diferenþã (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6004,7 +5984,7 @@ msgstr ""
 "Desfãºoarã la diferenþa curentã\n"
 "Diferenþa curentã (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6013,7 +5993,7 @@ msgstr ""
 "Desfãºoarã la ultima diferenþã\n"
 "Ultima diferenþã (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6022,7 +6002,7 @@ msgstr ""
 "Copie textul selectat cãtre fiºierul din dreapta\n"
 "Copie la dreapta (Alt+Right)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6031,7 +6011,7 @@ msgstr ""
 "Copie textul selectat cãtre fiºierul din stânga\n"
 "Copie la stânga (Alt+Left)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6040,7 +6020,7 @@ msgstr ""
 "Copie diferenþa cãtre dreapta ºi avanseazã la urmãtoarea\n"
 "Copie la dreapta ºi avanseazã (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6049,7 +6029,7 @@ msgstr ""
 "Copie diferenþa cãtre stânga ºi avanseazã la urmãtoarea\n"
 "Copie la stânga ºi avanseazã (Ctrl+Alt+Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6058,7 +6038,7 @@ msgstr ""
 "Copie toate diferenþele cãtre fiºierul din dreapta\n"
 "Toate la dreapta"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6067,77 +6047,77 @@ msgstr ""
 "Copie toate diferenþele cãtre fiºierul din stânga\n"
 "Toate la stânga"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "ªterge elementele selectate din ambele directoare"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Comparã elementele selectate (comparã doar primul element dacã mai multe elemente sunt selectate)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Selecteazã ºi reordoneazã coloanele pentru compararea de directoare"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Genereazã un fiºier petic"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Selecteazã ºi modificã filtre"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Genereazã un raport din rezultatele comparãrii"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr ""
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, fuzzy, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "Utilizatorul selecteazã dezarhivatorul (nu este suportatã dezarhivarea la compararea de directoare)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Dezarhivatorul potrivit este aplicat la ambele fiºiere (este suficient ca doar un fiºier sã conþinã extensie)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Selectaþi un dezarhivator pentru a edita acest fiºier"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Nu folosi prediferenþiatorul (normal)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Plug-in-uri recomandate"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Alte plug-in-uri"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Descarcã toate plug-in-urile ºi le reîncarcã (pentru dezvoltatori)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6146,12 +6126,12 @@ msgstr ""
 "Activeazã urmãtorul fiºier vizibil\n"
 "Activeazã urmãtorul fiºier"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Închide toate ferestrele deschise"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6160,22 +6140,22 @@ msgstr ""
 "Deschide documentaþia WinMerge\n"
 "Documentaþia WinMerge"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Extrage versiunea curentã ºi configuraþia WinMerge într-un fiºier text"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "Afiºeazã Licenþa Publicã Generalã GNU"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Numãr de asamblare privat: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6184,7 +6164,7 @@ msgstr ""
 "Deschide documentul cu notele versiunii\n"
 "Notele Versiunii"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6193,272 +6173,272 @@ msgstr ""
 "Deschide saitul cu traduceri\n"
 "Traduceri"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Setãri pentru plug-in-uri"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Nu folosi prediferenþiator"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Foloseºte prediferenþiator dacã este posibil"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "Nu s-a gãsit WSH - scripurile .sct sunt dezactivate"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, fuzzy, c-format
 msgid "<None>"
 msgstr "<Deloc>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, fuzzy, c-format
 msgid "<Automatic>"
 msgstr "<Automat>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Deschide fiºierul cu aplicaþia înregistratã"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Deschide fiºierul cu un editor extern"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Deschide fiºierul cu un anume program"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Nu afiºa blocurile mutate"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Aratã toate blocurile mutate"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Aratã doar blocurile mutate din diferenþa curentã"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Mergi la diferenþa din dreptul cursorului"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "&Mergi la diferenþa %1 din %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "&Mergi la linia %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Inactiv"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Din sistemul de fiºiere"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Din lista de recent utilizate"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr ""
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Batch"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Portable Object"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Resurse"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr ""
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Ascunde bara de unelte"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Aratã bara de unelte format mic"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Aratã bara de unelte format mare"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index 5a6131e..e7a8a5c 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -1031,7 +1031,7 @@ msgid "&Scripts"
 msgstr "&Ñêðèïòû"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Íåò >"
@@ -1472,7 +1472,7 @@ msgid "&Versioning System:"
 msgstr "&Ñèñòåìà êîíòðîëÿ âåðñèé:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Ïóòü ê cleartool.exe:"
@@ -1673,7 +1673,7 @@ msgid "Replace &All"
 msgstr "Ç&àìåíèòü âñå"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2581,7 +2581,7 @@ msgid "Files:"
 msgstr "Ôàéëû:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Îòëè÷àþòñÿ"
@@ -2618,7 +2618,7 @@ msgid "Right:"
 msgstr "Ñïðàâà:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Îäèíàêîâûå"
@@ -2818,7 +2818,7 @@ msgid "A&ppend timestamp"
 msgstr "Äîáàâèòü äàòó"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Ïîäòâåðæäåíèÿ"
@@ -2896,7 +2896,7 @@ msgstr ""
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Êàòàëîã"
@@ -3536,7 +3536,7 @@ msgid "Version Control"
 msgstr "Êîíòðîëü âåðñèé"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Îòëè÷èÿ"
@@ -3665,87 +3665,67 @@ msgstr "
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Ïîëíûé ïîèñê ïî ñîäåðæèìîìó"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Áûñòðûé ïîèñê ïî ñîäåðæèìîìó"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Ïî ðàçëè÷èÿì â äàòå"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Ïî äàòå èçìåíåíèÿ è ðàçìåðó"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Ïî ðàçìåðó"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Èìÿ"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Ìåñòîïîëîæåíèå"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Ôèëüòðû"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Îïèñàíèå"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Óêàæèòå èìÿ ôàéëà äëÿ íîâîãî ôèëüòðà"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Ôàéëû ôèëüòðîâ (*.flt)|*.flt|Âñå ôàéëû (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3758,7 +3738,7 @@ msgstr ""
 "Ñêîïèðóéòå ôàéë %1 â ïàïêó ñ ôèëüòðàìè:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3771,7 +3751,7 @@ msgstr ""
 "\n"
 "Óáåäèòåñü, ÷òî ïàïêà ñóùåñòâóåò è äîñòóïíà äëÿ çàïèñè."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3782,7 +3762,7 @@ msgstr ""
 "\n"
 "Óêàæèòå ïàïêó ñ ôèëüòðàìè íà âêëàäêå Ñèñòåìà â Íàñòðîéêàõ."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3795,12 +3775,12 @@ msgstr ""
 "\n"
 "Âîçìîæíî ôàéë èñïîëüçóåòñÿ."
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Óêàçàòü ôàéë ôèëüòðà"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3811,17 +3791,17 @@ msgstr ""
 "\n"
 "Íåâîçìîæíî ñêîïèðîâàòü ôàéë ôèëüòðà â ïàïêó ñ ôèëüòðàìè."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Ôèëüòð óæå ñóùåñòâóåò. Ïåðåçàïèñàòü?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Ðåãóëÿðíîå âûðàæåíèå"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3831,243 +3811,243 @@ msgstr ""
 "Ôèëüòðû áûëè îáíîâëåíû. Õîòèòå îáíîâèòü âñå îòêðûòûå ñðàâíèâàåìûå ïàïêè?\n"
 "Åñëè íå õîòèòå îáíîâëÿòü ñåé÷àñ, òî ìîæåòå íàæàòü \"Íåò\" è îáíîâèòü ïîçæå."
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr ""
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Ðåçóëüòàòû ñðàâíåíèÿ êàòàëîãîâ"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Ñðàâíåíèå ôàéëîâ"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Áåçûìÿííûé ñëåâà"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Áåçûìÿííûé ñïðàâà"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "Èõ ôàéë"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "Ìîé ôàéë"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Ñêàíèðîâàíèå ôàéëîâ..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Îòêðûâàþ âûáðàííîå"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Êîïèðîâàíèå Ñëåâà Íàïðàâî"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Êîïèðîâàíèå Ñïðàâà Íàëåâî"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Êîïèðîâàíèå âñåõ ôàéëîâ íàëåâî"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Êîïèðîâàíèå âñåõ ôàéëîâ íàïðàâî"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Êîïèðîâàíèå ôàéëîâ..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Óäàëåíèå ôàéëîâ..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Ïåðåìåùåíèå ôàéëîâ..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Ñîçäàåòñÿ îò÷åò..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Îòìåíà ïîñëåäíåé îïåðàöèè"
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "Ïîâòîðåíèå ïðåäûäóùåé îïåðàöèè"
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Ñòðîêà: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Îáúåäèíåíèå"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Îòëè÷èå %1 èç %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 îòëè÷èé íàéäåíî"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "Íàéäåíî âñåãî îäíî îòëè÷èå"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "RO"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Ýëåìåíò %1 èç %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Ýëåìåíòîâ: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Âûáåðèòå äâà ÑÓÙÅÑÒÂÓÞÙÈÕ êàòàëîãà èëè ôàéëà äëÿ ñðàâíåíèÿ"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Âûáîð êàòàëîãà"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Âûáåðèòå äëÿ ñðàâíåíèÿ äâà êàòàëîãà èëè ôàéëà"
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "Ïóòü ñëåâà óêàçàí íåâåðíî"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Ïóòü ñïðàâà óêàçàí íåâåðíî"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Îáà ïóòè óêàçàíû íåâåðíî"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Âûáåðèòå äâà ôàéëà, ÷òîáû âêëþ÷èòü âûáîð ðàñïàêîâùèêà"
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Íåâîçìîæíî ñðàâíåíèå ôàéëà è êàòàëîãà!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Ôàéë íå íàéäåí: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Ôàéë íå ðàñïàêîâàí: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4080,12 +4060,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Îøèáêà ðàçáîðà ôàéëà êîíôëèêòîâ"
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4096,32 +4076,32 @@ msgstr ""
 "%1\n"
 "íå ÿâëÿåòñÿ ôàéëîì êîíôëèêòîâ"
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Ñîõðàíèòü êàê..."
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Ñîõðàíèòü èçìåíåíèÿ â %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 ïîìå÷åí êàê òîëüêî äëÿ ÷òåíèÿ. Ñîãëàñíû ëè âû çàìåíèòü ýòîò ôàéë ? (Íåò ïîçâîëÿåò çàäàòü íîâîå èìÿ ôàéëà)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Îøèáêà ïðîâåðêè âîçìîæíîñòè çàïèñè â óêàçàííîå ìåñòî"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Îøèáêà ñîçäàíèÿ ðåçåðâíîé êîïèè"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4134,7 +4114,7 @@ msgstr ""
 "\n"
 "Ïðîäîëæèòü â ëþáîì ñëó÷àå?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4151,7 +4131,7 @@ msgstr ""
 "\t-èñïîëüçîâàòü äðóãîå èìÿ ôàéëà (Íàæìèòå Ok)\n"
 "\t-îòìåíèòü òåêóùóþ îïåðàöèþ (Íàæìèòå Îòìåíà)?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4166,7 +4146,7 @@ msgstr ""
 "\n"
 "Õîòèòå ñîõðàíèòü ðàñïàêîâàííóþ âåðñèþ â äðóãîé ôàéë?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4181,7 +4161,7 @@ msgstr ""
 "\n"
 "Õîòèòå ñîõðàíèòü ðàñïàêîâàííóþ âåðñèþ â äðóãîé ôàéë?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4196,39 +4176,39 @@ msgstr ""
 "\n"
 "Ïåðåçàïèñàòü èçìåíåííûé ôàéë?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
 "is marked read-only. Would you like to override the read-only item?"
 msgstr "%1 ïîìå÷åí êàê òîëüêî äëÿ ÷òåíèÿ. Ñîãëàñíû ëè âû çàìåíèòü ýòîò ôàéë?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
 msgstr ""
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Ñîõðàíèòü ôàéë ñëåâà êàê..."
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Ñîõðàíèòü ôàéë ñïðàâà êàê..."
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
 msgstr ""
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4239,42 +4219,42 @@ msgstr ""
 "\n"
 "Îáíîâèòå äîêóìåíòû ïåðåä ïðîäîëæåíèåì."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "×òîáû ïðîäîëæèòü, Âû äîëæíû óêàçàòü ïóòü ê ïðîåêòó SourceSafe (íàïðèìåð:  $/MyProject)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Ïîëó÷àåì ôàéëû èç VSS..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "Ñèñòåìà êîíòðîëÿ âåðñèé âåðíóëà îøèáêó ïðè ïîïûòêå âçÿòü ôàéë ïîä êîíòðîëü.  Íåò âîçìîæíîñòè ïðîäîëæàòü..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Îøèáêà âûïîëíåíèÿ ñèñòåìíîé êîìàíäû Ñèñòåìû êîíòðîëÿ âåðñèé."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "Ðàáî÷àÿ ïàïêà VSS è ìåñòîïîëîæåíèå òåêóùåãî ôàéëà íå ñîâïàäàþò. Ïðîäîëæèòü ?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Íå íàéäåíà áàçà äàííûõ VSS!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Îøèáêà VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4285,7 +4265,7 @@ msgstr ""
 " Ïðîâåðüòå êîíôèãóðàöèþ.\n"
 " Ñäåëàòü îòêàò?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4294,169 +4274,169 @@ msgstr ""
 "VSS âåðíóëà îøèáêó ïðè ïîïûòêå îòêàòà èçìåíåíèé.\n"
 " Ïðîâåðüòå êîíôèãóðàöèþ. "
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Íåò"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (ìëàäøå, ÷åì 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 è âûøå)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Ðàçáèâàòü ïî íåâèäèìûì"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Ðàçáèâàòü ïî íåâèäèìûì è çíàêàì ïóíêòóàöèè"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Ñêîïèðîâàòü âûáðàííûå ôàéëû â óêàçàííóþ ïàïêó"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Ñêîïèðîâàòü âûáðàííûå ôàéëû â óêàçàííóþ ïàïêó"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Óäàëèòü âûáðàííûé ýëåìåíò ñëåâà"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Óäàëèòü âûáðàííûé ýëåìåíò ñïðàâà"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Óäàëèòü âûáðàííûå ýëåìåíòû ñ îáîèõ ñòîðîí"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Ñêðûòü âûáðàííûå ýëåìåíòû (áûñòðûé ôèëüòð)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Ïåðåèìåíîâàòü âûáðàííûå ýëåìåíòû íà îáîèõ ñòîðîíàõ"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Ñêîïèðîâàòü íà ëåâóþ ñòîðîíó %1 èç %2 âûáðàííûõ ýëåìåíòîâ"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Ñêîïèðîâàòü íà ïðàâóþ ñòîðîíó %1 èç %2 âûáðàííûõ ýëåìåíòîâ"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Ñïðàâà íàëåâî (%1 èç %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Ñëåâà íàïðàâî (%1 èç %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Ñëåâà íà... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Ñïðàâà íà... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Ñëåâà íà... (%1 èç %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Ñïðàâà íà... (%1 èç %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Ñëåâà (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Óäàëèòü %1 èç %2 âûáðàííûõ ýëåìåíòîâ ñ ïðàâîé ñòîðîíû"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Óäàëèòü ñ îáåèõ ñòîðîí %1 èç %2 âûáðàííûõ ýëåìåíòîâ"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Ñëåâà (%1 èç %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Ñïðàâà (%1 èç %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Âìåñòå (%1 èç %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Âûáåðèòå ïàïêó íàçíà÷åíèÿ"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Ëåâàÿ ñòîðîíà - âûáîð ïàïêè íàçíà÷åíèÿ:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Ïðàâàÿ ñòîðîíà - âûáîð ïàïêè íàçíà÷åíèÿ:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 ôàéëîâ îáðàáîòàíî)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 èç %2 ôàéëîâ îáðàáîòàíî)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4467,17 +4447,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Âû óâåðåíû, ÷òî õîòèòå ñêîïèðîâàòü:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Âû óâåðåíû, ÷òî õîòèòå ñêîïèðîâàòü %d ýëåìåíòîâ:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4496,613 +4476,613 @@ msgstr ""
 "\n"
 "Îáíîâèòå ñðàâíåíèå."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "Óâåðåíû, ÷òî õîòèòå ïåðåìåñòèòü:"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "Óâåðåíû, ÷òî õîòèòå ïåðåìåñòèòü %d ýëåìåíòîâ:"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "Ïîäòâåðäèòå ïåðåìåùåíèå"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Îòêðûòü ôàéë ñëåâà"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Îòêðûòü ôàéë ñëåâà âî âíåøíåì ðåäàêòîðå"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Îòêðûòü ôàéë ñëåâà ñ ïîìîùüþ..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Îòêðûòü ôàéë ñïðàâà"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Îòêðûòü ôàéë ñïðàâà âî âíåøíåì ðåäàêòîðå"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Îòêðûòü ôàéë ñïðàâà ñ ïîìîùüþ..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Íåâîçìîæíî âûïîëíèòü %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Íåèçâåñòíîå ðàñøèðåíèå äëÿ âíåøíåãî ðåäàêòîðà: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Ñêîïèðîâàòü èìåíà ôàéëîâ â áóôåð îáìåíà"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Ñêîïèðîâàòü èìåíà ôàéëîâ èç ëåâîé ÷àñòè â áóôåð îáìåíà"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Ñêîïèðîâàòü èìåíà ôàéëîâ èç ïðàâîé ÷àñòè â áóôåð îáìåíà"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Ñêîïèðîâàòü èìåíà ôàéëîâ ñ îáîèõ ïàíåëåé â áóôåð îáìåíà"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr ""
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr ""
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Íåèçâåñòíûé ôîðìàò àðõèâà"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Çààðõèâèðîâàòü ýëåìåíòû ñ ëåâîé ñòîðîíû"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Çààðõèâèðîâàòü ýëåìåíòû ñ ïðàâîé ñòîðîíû"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Çààðõèâèðîâàòü ýëåìåíòû ñ îáîèõ ñòîðîí"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Çààðõèâèðîâàòü ïðîèçâîëüíûå ýëåìåíòû ñ îáîèõ ñòîðîí"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Ïåðåìåñòèòü âûáðàííûå ñëåâà ôàéëû â äðóãóþ ïàïêó"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Ïåðåìåñòèòü âûáðàííûå ñïðàâà ôàéëû â äðóãóþ ïàïêó"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Èìÿ ôàéëà"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Ðåçóëüòàò ñðàâíåíèÿ"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Äàòà Ñëåâà"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Äàòà Ñïðàâà"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Ðàñøèðåíèå"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Ðàçìåð ñëåâà"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Ðàçìåð ñïðàâà"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Ðàçìåð ñïðàâà (ñîêð.)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Ðàçìåð ñëåâà (ñîêð.)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñëåâà"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñïðàâà"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Áîëåå íîâûé ôàéë"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Âåðñèÿ ôàéëà ñëåâà"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Âåðñèÿ ôàéëà ñïðàâà"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Óïðîùåííûé ðåçóëüòàò"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Àòðèáóòû ôàéëà ñëåâà"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Àòðèáóòû ôàéëà ñïðàâà"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "Ëåâûé EOL"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "Ïðàâûé EOL"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Êîäèðîâàíèå ôàéëà ñëåâà"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Êîäèðîâàíèå ôàéëà ñïðàâà"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Èãíîð. îòëè÷èÿ"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Äâîè÷íûé"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Íåâîçìîæíî ñðàâíèòü ôàéëû"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Ñðàâíåíèå ïðåðâàíî"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Ôàéë ïðîïóùåí"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Êàòàëîã ïðîïóùåí"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Òîëüêî ñëåâà: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Òîëüêî ñïðàâà: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Áèíàðíûå ôàéëû íå èìåþò îòëè÷èé"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Áèíàðíûå ôàéëû îòëè÷àþòñÿ"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Ôàéëû îòëè÷àþòñÿ"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr ""
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Òîëüêî ñëåâà"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Òîëüêî ñïðàâà"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Îøèáêà"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr ""
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr ""
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Ïðîøëî âðåìåíè: %ld ìñ"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "Âûáðàí 1 ýëåìåíò"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "Âûáðàíî ýëåìåíòîâ: %1"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Èìÿ ôàéëà èëè êàòàëîãà"
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Èìåíà ïîäïàïîê, åñëè ïîäïàïêè âêëþ÷åíû"
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Ðåçóëüòàò ñðàâíåíèÿ, äëèííàÿ ôîðìà."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Âðåìÿ èçìåíåíèÿ ôàéëà ñëåâà"
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Âðåìÿ èçìåíåíèÿ ôàéëà ñïðàâà"
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Ðàñøèðåíèå ôàéëà"
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Ðàçìåð ôàéëà ñëåâà â áàéòàõ"
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Ðàçìåð ôàéëà ñïðàâà â áàéòàõ"
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Ðàçìåð ëåâîãî ôàéëà (ñîêð.)"
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Ðàçìåð ïðàâîãî ôàéëà (ñîêð.)"
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñëåâà"
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñïðàâà"
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Ïîêàçàòü ñ êàêîé èç ñòîðîí äàòà èçìåíåíèÿ ôàéëà íîâåå"
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Âåðñèÿ ôàéëà ñëåâà, òîëüêî äëÿ íåêîòîðûõ òèïîâ ôàéëîâ."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Âåðñèÿ ôàéëà ñïðàâà, òîëüêî äëÿ íåêîòîðûõ òèïîâ ôàéëîâ."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Ðåçóëüòàò áûñòðîãî ñðàâíåíèÿ"
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Àòðèáóòû ôàéëà ñëåâà"
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Àòðèáóòû ôàéëà ñïðàâà"
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Ìàðêåð êîíöà ñòðîêè äëÿ ëåâîãî ôàéëà"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Ìàðêåð êîíöà ñòðîêè äëÿ ïðàâîãî ôàéëà"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Êîäèðîâàíèå ôàéëà ñëåâà"
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Êîäèðîâàíèå ôàéëà ñïðàâà"
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Êîëè÷åñòâî èãíîðèðîâàííûõ îòëè÷èé â ôàéëå. Ýòè îòëè÷èÿ áûëè èãíîðèðîâàííû WinMerge è íå ìîãóò áûòü îáðàáîòàíû."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Êîëè÷åñòâî îòëè÷èé â ôàéëå. Ýòî ÷èñëî íå âêëþ÷àåò â ñåáÿ èãíîðèðîâàííûå îòëè÷èÿ."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Ïîêàçàòü çâåçäî÷êó (*) åñëè ôàéë áèíàðíûé."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Ñðàâíèâàíèå %1 ñ %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Ñïèñîê ñ ðàçäåëÿþùèìè çàïÿòûìè"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Ñïèñîê ñ ðàçäåëÿþùèìè òàáóëÿòîðàìè"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "Ïðîñòîé HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "Ïðîñòîé XML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Ôàéë îò÷åòà óæå ñóùåñòâóåò. Ïåðåçàïèñàòü??"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5111,32 +5091,32 @@ msgstr ""
 "Îøèáêà ïðè ñîçäàíèè îò÷åòà:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Îò÷åò óñïåøíî ñîçäàí"
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Íà îáîèõ ïàíåëÿõ îòêðûò îäèí è òîò æå ôàéë"
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Âûáðàííûå ôàéëû íå èìåþò îòëè÷èé"
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Ïðè ñðàâíåíèè ôàéëîâ ïðîèçîøëà îøèáêà."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Âðåìåííûå ôàéëû íå ìîãóò áûòü ñîçäàíû. Ïðîâåðüòå íàñòðîéêè ïóòåé äëÿ âðåìåííûõ ôàéëîâ"
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5151,7 +5131,7 @@ msgstr ""
 "\n"
 "Âíèìàíèå: Åñëè âàñ íå èíòåðåñóþò ðàçëè÷èÿ â EOL, óñòàíîâèòå îïöèþ 'Èãíîðèðîâàòü ðàçëè÷èÿ â EOL' íà âêëàäêå Ñðàâíåíèå â Íàñòðîéêàõ."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5162,22 +5142,22 @@ msgstr ""
 " Ñ òåêóùèìè íàñòðîéêàìè îíè áóäóò ïðèâåäåíû ê îñíîâíîìó òèïó.\n"
 " Õîòèòå èçìåíèòü íàñòðîéêè, ÷òî áû ñîõðàíÿòü EOL êàê åñòü, òî åñòü ðàçëè÷íûìè?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Îøèáêà ïðåäñðàâíåíèÿ ôàéëà '%1' ñ äîïîëíåíèåì '%2'. Ïðåäñðàâíåíèå äàëåå ïðèìåíÿòüñÿ íå áóäåò."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "Íåâîçìîæíî îòêðûòü âûáðàííóþ ïàïêó."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Íåâîçìîæíî îòîáðàçèòü áèíàðíûé ôàéë â ðåäàêòîðå."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5192,7 +5172,7 @@ msgstr ""
 "%1\n"
 "íà äðóãîé ñòîðîíå è îáå îòêðûòü èõ?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5203,148 +5183,148 @@ msgstr ""
 "Êàæäûé èç ôàéëîâ ìîæåò áûòü îòîáðàæåí â ñâîåé êîäèðîâêå, íî èõ ñëèÿíèå èëè êîïèðîâàíèå ìîæåò ïîâðåäèòü èíôîðìàöèþ.\n"
 "Îòîáðàçèòü îáà ôàéëà â ñèñòåìíîé êîäèðîâêå (ðåêîìåíäóåòñÿ)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Âíèìàíèå: Ôàéëû â ðàçëè÷íûõ êîäèðîâêàõ, ëåâûé=%s, ïðàâûé=%s. Èíôîðìàöèÿ ìîæåò áûòü ïîâðåæäåíà."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Èíôîðìàöèÿ ïîòåðÿíà èç-çà îøèáî÷íîé êîäèðîâêè: îáà ôàéëà"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Íåò îòëè÷èé"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Ñòðîêà îòëè÷èé"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Çàìåíåíî %1 ñòðîê."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Íåâîçìîæíî íàéòè ñòðîêó \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Ñêîïèðîâàòü ïîëíûé ïóòü"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Ñêîïèðîâàòü èìÿ ôàéëà"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Ìåñòîïîëîæåíèÿ"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Îòëè÷èÿ"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Ïàò÷ óñïåøíî çàïèñàí."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. Ýëåìåíò íå íàéäåí èëè ýòî êàòàëîã"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. Ýëåìåíò íå íàéäåí èëè ýòî êàòàëîã"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Ïàò÷ óæå ñóùåñòâóåò. Õîòèòå ïåðåçàïèñàòü åãî ?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 ôàéëîâ âûáðàíî]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Íîðìàëüíûé"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Êîíòåêñò"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Óíèôèöèðîâàííûé"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Íåò âîçìîæíîñòè çàïèñàòü â ôàéë %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Óêàçàííûé ïóòü äëÿ âûâîäà íå ÿâëÿåòñÿ àáñîëþòíûì: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Óêàçàòü âûõîäíîé ôàéë"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Íåâîçìîæíî ñîçäàòü ïàò÷ èç áèíàðíûõ ôàéëîâ"
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Íåâîçìîæíî ñîçäàòü ïàò÷ èç êàòàëîãîâ"
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5355,17 +5335,17 @@ msgstr ""
 "\n"
 "Ñîçäàíèå ïàò÷à òðåáóåò ÷òîáû â ôàéëàõ íå áûëî íåñîõðàíåííûõ èçìåíåíèé"
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Ïàïêà íå ñóùåñòâóåò"
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Òåêóùèå ðåçóëüòàòû ñðàâíåíèÿ êàòàëîãîâ áóäóò î÷èùåíû."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5377,7 +5357,7 @@ msgstr ""
 "Íå íàéäåíû âñå íåîáõîäèìûå êîìïîíåíòû (7-zip è/èëè Merge7z*.dll) . \n"
 "Ïîñìîòðèòå èíñòðóêöèþ, ÷òî áû óçíàòü áîëüøå ïðî ïîääåðæêó àðõèâîâ è êàê åå âêëþ÷èòü."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5386,7 +5366,7 @@ msgstr ""
 "\n"
 "Âíèìàíèå: Èíòåãðàöèÿ ñ 7-Zip îòêëþ÷åíà â íàñòðîéêàõ WinMerge."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5395,37 +5375,37 @@ msgstr ""
 "\n"
 "Âíèìàíèå: Çàäåéñòâîâàí òîëüêî ëîêàëüíûé ìîäóëü 7-Zip."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Âûáðàòü ôàéë äëÿ ýêñïîðòà"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Âûáðàòü ôàéë äëÿ èìïîðòà"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Îïöèè, èìïîðòèðîâàííûå èç ôàéëà."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Îïöèè, ýêñïîðòèðóåìûå â ôàéë."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Îøèáêà èìïîðòà îïöèé èç ôàéëà."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Îøèáêà ýêñïîðòà îïöèé â ôàéë."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5436,242 +5416,242 @@ msgstr ""
 "\n"
 "Ïðîäîëæèòü?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Îøèáêà â ðåãóëÿðíîì âûðàæåíèè"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Ñîâïàäåíèé íåò"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Íåâåðíîå ðåãóëÿðíîå âûðàæåíèå"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Íåâåðíûé ñèìâîë îáúåäèíåíèÿ"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Íåâåðíîå èìÿ ñèìâîëüíîãî êëàññà"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Çàìûêàþùèé îáðàòíûé ñëýø"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Íåâåðíàÿ îáðàòíàÿ ññûëêà"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Íå èìåþùèå ïàðó [ èëè [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Íå èìåþùèå ïàðó ( èëè \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Íå èìåþùèå ïàðó \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Íåâåðíîå ñîäåðæèìîå \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Íåâåðíîå îêîí÷àíèå äèàïàçîíà"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Íå õâàòàåò ïàìÿòè"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Íåâåðíîå ïðåäøåñòâóþùåå ðåãóëÿðíîå âûðàæåíèå"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Íåîæèäàííîå îêîí÷àíèå ðåãóëÿðíîãî âûðàæåíèÿ"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Ñëèøêîì áîëüøîå ðåãóëÿðíîå âûðàæåíèå"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Íå èìåþùèå ïàðó ) èëè \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Ñìåøàííûé"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " Á"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr "Êá"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr "Ìá"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr "Ãá"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr "Òá"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr "Ïá"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Òèï"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "Ðàñïàêîâùèê"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr "Ïðåäñðàâíåíèå"
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "Ðåäàêòîð ñêðèïòîâ"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Ñîõðàíèòü ôàéë ñëåâà"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Ñîõðàíèòü ôàéë ñïðàâà"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Ñîõðàíèòü ôàéë ñëåâà êàê..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Ñîõðàíèòü ôàéë ñïðàâà êàê..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Ïðåîáðàçîâàòü EOL ê ïðèíÿòûì â Windows"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Ïðåîáðàçîâàòü EOL ê ïðèíÿòûì â Unix"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Ïðåîáðàçîâàòü EOL ê ïðèíÿòûì â Mac"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Ïåðåêëþ÷åíèå ìåæäó ðåæèìàìè ðåäàêòèðîâàíèÿ è ñëèÿíèÿ"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5680,12 +5660,12 @@ msgstr ""
 "Ïðîñìîòðåòü è îòðåäàêòèðîâàòü êîäèðîâêó\n"
 "File encoding properties"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "Îòêðûòü è ðåøèòü êîíôëèêòíûé ôàéë"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5694,7 +5674,7 @@ msgstr ""
 "Âûäåëèòü îòëè÷èå â òåêóùåé ñòðîêå\n"
 "Difference in the Current Line"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5703,7 +5683,7 @@ msgstr ""
 "Ïåðåéòè íà ñòðîêó èëè îòëè÷èå\n"
 "Go to (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5712,7 +5692,7 @@ msgstr ""
 "Óñòàíîâèòü ïðîãðàììíûå íàñòðîéêè\n"
 "Íàñòðîéêè"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5721,37 +5701,37 @@ msgstr ""
 "Îáíîâèòü ýêðàí\n"
 "Refresh (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Ñêîïèðîâàòü âûáðàííûå ñòðîêè â áóôåð îáìåíà, äîáàâëÿÿ â íà÷àëå ñòðîêè åå íîìåð"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Çàêëàäêà"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Ïåðåéòè ê ñëåäóþùåé çàêëàäêå"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Ïåðåéòè ê ïðåäûäóùåé çàêëàäêå"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Óäàëèòü âñå çàêëàäêè"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5760,7 +5740,7 @@ msgstr ""
 "Ïîêàçûâàòü îäèíàêîâûå\n"
 "Show Identical Items"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5769,7 +5749,7 @@ msgstr ""
 "Ïîêàçûâàòü ðàçëè÷àþùèåñÿ\n"
 "Show Different Items"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5778,7 +5758,7 @@ msgstr ""
 "Ïîêàçûâàòü ïðèñóòñòâóþùèå òîëüêî ñëåâà\n"
 "Show Left Unique Items"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5787,7 +5767,7 @@ msgstr ""
 "Ïîêàçûâàòü ïðèñóòñòâóþùèå òîëüêî ñïðàâà\n"
 "Show Right Unique Items"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5796,7 +5776,7 @@ msgstr ""
 "Ïîêàçûâàòü áèíàðíûå ôàéëû\n"
 "Show Binary Files"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5805,7 +5785,7 @@ msgstr ""
 "Ïîêàçûâàòü ïðîïóùåííûå\n"
 "Show Skipped Items"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5814,7 +5794,7 @@ msgstr ""
 "Âûáðàòü øðèôò äëÿ îòîáðàæåíèÿ îòëè÷èé\n"
 "Select Diff Font"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5823,27 +5803,27 @@ msgstr ""
 "Èñïîëüçîâàòü ñèñòåìíûé øðèôò ïî óìîë÷àíèþ äëÿ îòîáðàæåíèÿ îòëè÷èé \n"
 "Default Font"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Ïîêàçûâàòü íåâèäèìûå çíàêè ðàçìåòêè"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Ïåðåêëþ÷èòü ïàíåëü îòëè÷èé"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Ïàíåëü ëîêàöèé ïîêàçûâàåò ïîëíóþ êàðòèíó îòëè÷èé ìåæäó ôàéëàìè"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Ïîêàçàòü äèàëîã ñðàâíåíèÿ ñòàòèñòèê ïàïîê"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5852,7 +5832,7 @@ msgstr ""
 "Âûáåðèòå ÿçûê èíòåðôåéñà äëÿ òåêóùåãî ïîëüçîâàòåëÿ\n"
 "ßçûê"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5861,12 +5841,12 @@ msgstr ""
 "Ïîêàçàòü îòëè÷èÿ âíóòðè ñòðîê äðóãèìè öâåòàìè\n"
 "Ïîêàçàòü îòëè÷èÿ â ñòðîêå"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Ïîìåíÿòü ïàíåëè ìåñòàìè"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5875,7 +5855,7 @@ msgstr ""
 "Ïîêàçûâàòü íîìåðà ñòðîê\n"
 "Show Line Numbers"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5884,7 +5864,7 @@ msgstr ""
 "Âêëþ÷èòü ïåðåíîñ ñòðîê\n"
 "Wrap Lines"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5893,22 +5873,22 @@ msgstr ""
 "Ïîêàçàòü ïîëÿ íà îáåèõ ïàíåëÿõ\n"
 "Show Selection Margins"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Óâåëè÷èòü ðàçìåð òåêñòà"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Óìåíüøèòü ðàçìåð òåêñòà"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Ñáðîñèòü ìàñøòàá òåêñòà ê çíà÷åíèþ ïî óìîë÷àíèþ"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5917,7 +5897,7 @@ msgstr ""
 "Ïåðåéòè ê ïðåäûäóùåìó îòëè÷èþ\n"
 "Ïðåäûäóþùåå îòëè÷èå (Alt+Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5926,67 +5906,67 @@ msgstr ""
 "Ïåðåéòè ê ñëåäóþùåìó îòëè÷èþ\n"
 "Ñëåäóþùåå îòëè÷èå (Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -5995,7 +5975,7 @@ msgstr ""
 "Ïåðåéòè ê ïåðâîìó îòëè÷èþ\n"
 "Ïåðâîå îòëè÷èå (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6004,7 +5984,7 @@ msgstr ""
 "Ïåðåéòè ê òåêóùåìó îòëè÷èþ\n"
 "Òåêóùåå îòëè÷èå (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6013,7 +5993,7 @@ msgstr ""
 "Ïåðåéòè ê ïîñëåäíåìó îòëè÷èþ\n"
 "Ïîñëåäíåå îòëè÷èå (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6022,7 +6002,7 @@ msgstr ""
 "Ñêîïèðîâàòü âûáðàííûé òåêñò â ôàéë ñïðàâà\n"
 "Copy Right (Alt Right)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6031,7 +6011,7 @@ msgstr ""
 "Ñêîïèðîâàòü âûáðàííûé òåêñò â ôàéë ñëåâà\n"
 "Copy Left (Alt Left)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6040,7 +6020,7 @@ msgstr ""
 "Ñêîïèðîâàòü îòëè÷èå íà ëåâóþ ïàíåëü è ïåðåéòè ê ñëåäóþùåìó\n"
 "Copy Right and advance (Ctrl Alt Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6049,7 +6029,7 @@ msgstr ""
 "Ñêîïèðîâàòü îòëè÷èå íà ïðàâóþ ïàíåëü è ïåðåéòè ê ñëåäóþùåìó\n"
 "Copy Left and advance (Ctrl Alt Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6058,7 +6038,7 @@ msgstr ""
 "Ñêîïèðîâàòü âñå îòëè÷èÿ â ôàéë ñïðàâà\n"
 "All Right"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6067,77 +6047,77 @@ msgstr ""
 "Ñêîïèðîâàòü âñå îòëè÷èÿ â ôàéë ñëåâà\n"
 "All Left"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Óäàëèòü âûáðàííûå ýëåìåíòû èç îáîèõ êàòàëîãîâ"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Ñðàâíèòü âûäåëåííûå ýëåìåíòû (ñðàâíèòü ïåðâûé ýë-ò, åñëè âûäåëåíî áîëåå îäíîãî)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Âûáðàòü è ïåðåñòàâèòü ìåñòàìè êîëîíêè ñðàâíåíèÿ êàòàëîãîâ"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Ñîçäàòü ïàò÷"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Âûáîð è ðåäàêòèðîâàíèå ôèëüòðîâ"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Ñîçäàòü îò÷åò èç ðåçóëüòàòîâ ñðàâíåíèÿ"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "Ïîêàçàòü ñïèñîê äîñòóïíûõ äîïîëíåíèé"
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "Âûáðàííûé ïîëüçîâàòåëåì ðàñïàêîâùèê (íå äåéñòâóåò ïðè ñðàâíåíèè êàòàëîãîâ)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Àâòîìàòè÷åñêèé ïîäîáîð ðàñïàêîâùèêà (óêàæèòå ðàñøèðåíèå õîòÿ áû ó îäíîãî èç ôàéëîâ)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Âûáåðèòå ðàñïàêîâùèê äëÿ ðåäàêòèðîâàíèÿ ýòîãî ôàéëà"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Áåç ïðåäñðàâíåíèÿ (normal)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Ñîâåòóåìûå äîïîëíåíèÿ"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Äðóãèå äîïîëíåíèÿ"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Âûãðóçèòü âñå äîïîëíåíèÿ è çàãðóçèòü èõ ñíîâà (äëÿ ðàçðàáîò÷èêîâ)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6146,12 +6126,12 @@ msgstr ""
 "Àêòèâèðóåò ñëåäóþùèé âèäèìûé ôàéë\n"
 "Àêòèâèðîâàòü ñëåäóþùèé ôàéë"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Çàêðûòü âñå îòêðûòûå îêíà"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6160,22 +6140,22 @@ msgstr ""
 "Îòêðûòü ñïðàâêó WinMerge\n"
 "Ñïðàâêà WinMerge"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Âûâåñòè èíôîðìàöèþ î òåêóùåé âåðñèè WinMerge è íàñòðîéêàõ â òåêñòîâûé ôàéë"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "Ïîêàçàòü ëèöåíçèþ GNU General Public License"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "×àñòíûé áèëä: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6184,7 +6164,7 @@ msgstr ""
 "Îòêðûòü äîêóìåíò ñ çàìå÷àíèÿìè ê ðåëèçó\n"
 "Çàìå÷àíèÿ ê ðåëèçó"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6193,272 +6173,272 @@ msgstr ""
 "Ïåðåéòè íà ñòðàíèöó ñ ïåðåâîäàìè\n"
 "Ïåðåâîäû"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Íàñòðîéêè äîïîëíåíèÿ"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Ïðåäñðàâíåíèå îòñóòñòâóåò"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Åñëè âîçìîæíî, òî ïðåäñðàâíåíèå áóäåò ïðîèçâåäåíî"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH íå íàéäåí - .sct ñêðèïòû îòêëþ÷åíû"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Íåò>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Àâòîìàòè÷åñêè>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Îòêðûòü ôàéë çàðåãèñòðèðîâàííûì ïðèëîæåíèåì"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Îòêðûòü ôàéë âíåøíèì ðåäàêòîðîì"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Îòêðûòü ôàéë âûáðàííîé ïðîãðàììîé"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Íå îòîáðàæàòü ïåðåìåùåííûå áëîêè"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Îòîáðàæàòü âñå ïåðåìåùåííûå áëîêè"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Îòîáðàæàòü ïåðåìåùåííûå áëîêè äëÿ òåêóùåãî îòëè÷èÿ"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Ïåðåéòè ê îòëè÷èþ ïîä êóðñîðîì"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "Ïåðåéòè ê &îòëè÷èþ %1 èç %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "Ïåðåéòè ê &ñòðîêå %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Îòêëþ÷åíî"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Êàê íà äèñêå"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Êàê â ñïèñêå íåäàâíèõ äîêóìåíòîâ"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "Íåò âûäåëåííîãî"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Áåéñèê"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Batch"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Ôîðòðàí"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Ïàñêàëü"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Portable Object"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Ðåñóðñû"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr ""
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Ñêðûòü ïàíåëü èíñòðóìåíòîâ"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Ìàëåíüêèå çíà÷êè"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Áîëüøèå çíà÷êè"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index a8d0ea7..c3fcfc3 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -1029,7 +1029,7 @@ msgid "&Scripts"
 msgstr "&Ñêðèïòå "
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Ïðàçàí >"
@@ -1470,7 +1470,7 @@ msgid "&Versioning System:"
 msgstr "&Èçáîð ïðîãðàìà"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Ïóòà\9cà äî cleartool.exe"
@@ -1671,7 +1671,7 @@ msgid "Replace &All"
 msgstr "Çàìåíè ñâ&å"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Ïðàêòè÷íî ¼àñàí ñëó÷à¼"
@@ -2587,7 +2587,7 @@ msgid "Files:"
 msgstr "Äàòîòåêå"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Ðàçëèêà"
@@ -2624,7 +2624,7 @@ msgid "Right:"
 msgstr "Äåñíà:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Èñòå"
@@ -2824,7 +2824,7 @@ msgid "A&ppend timestamp"
 msgstr "Äî&ä༠äàòóì/âðåìå"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Ïîòâðäè êîïèðà\9cå"
@@ -2902,7 +2902,7 @@ msgstr "
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Ôàñöèêëà"
@@ -3542,7 +3542,7 @@ msgid "Version Control"
 msgstr "Ïðîãðàìè"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Ðàçëèêå"
@@ -3671,87 +3671,67 @@ msgstr "XML 
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Öåî ñàäðæà¼"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Ñêðà\9eåíè ñàäðæà¼"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Äàòóì ïðîìåíå"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Èçìå\9cåí äàòóì è âåëè÷èíà"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Âåëè÷èíà"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Èìå"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Ïîëîæà¼"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Ôèëòåðè"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F]"
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Îïèñ"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Èçàáåðè äàòîòåêó çà íîâè ôèëòåð"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Äàòîòåêà ôèëòåðà (*.flt)|*.flt|All Files (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3764,7 +3744,7 @@ msgstr ""
 "Ìîëèì óìíîæèòå äàòîòåêó %1 ó WinMerge/Ôèëòåð -ôàñöèêëó:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3777,7 +3757,7 @@ msgstr ""
 "\n"
 "Ìîëèì, ïðîâåðèòå äà ëè ïîñòî¼è ôàñöèêëà è \9cåíó äîñòóïíîñò"
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3788,7 +3768,7 @@ msgstr ""
 "\n"
 "Ìîëèì, èçàáåðèòå ôàñöèêëó ôèëòåðà ó /Ïîñòàâêå/Ñèñòåì/"
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3801,12 +3781,12 @@ msgstr ""
 "\n"
 "Ìîæäà ¼å äàòîòåêà ñàìî çà ÷èòà\9cå?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Ïðîíà\90è ôàñöèêëó ôèëòåðà çà èíñòàëàöè¼ó"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3817,17 +3797,17 @@ msgstr ""
 "\n"
 "Íå ìîãó óìíîæèòè íîâè ôèëòåð ó ôàñöèêëè ôèëòåðà"
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Ôèëòåð âå\9e ïîñòî¼è.Çàìåíè ïîñòî¼å\9eè ôèëòåð"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Ïðàâèëàí èçðàç"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3838,243 +3818,243 @@ msgstr ""
 "\n"
 "Àêî èçàáåðåòå /Íå/ òî ìîæåòå è êàñíè¼å óðàäèòè"
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "&Ïóòà\9cà äî SS.EXE:"
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Èñõîäè ïîðå\90å\9cà ôàñöèêëè"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Óïîðåäè äàòîòåêå"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Íåèìåíîâàíà ëåâà"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Íåèìåíîâàíà äåñíà"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "\8cèõîâå äàòîòåêå"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "Ìî¼å äàòîòåêå"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Ïðåòðàæèâà\9cå äàòîòåêå"
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Îòâàðà\9cå îäàáðàíîã"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Óìíîæèòå ëåâó ó äåñíî"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Óìíîæèòå äåñíó ó ëåâî"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Óìíîæèòå ñâå ó ëåâî"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Óìíîæèòå ñâå ó äåñíî"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Óìíîæèòå äàòîòåêå"
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Áðèñà\9cå äàòîòåêå"
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Ïðåìåøòà\9cå äàòîòåêà"
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Ïðàâ\9aå\9cå èçâåøòà¼à"
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Ïîíèøòàâà\9cå çàä\9cå ðàä\9cå..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "Ïîíàâ\9aà\9cå ïðåòõîäíå ðàä\9cå..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Ðåä: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Óïîðåäè"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Ðàçëèêå %1 îä %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "Íà\90åíî ðàçëèêà %1"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "Íà\90åíî ðàçëèêà 1"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "RO"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Ñòàâêå %1 îä %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Ñòàâêå: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Îäàáåðè äâå ïîñòî¼å\9eå äàòîòåêå èëè ôàñöèêëå çà ïîðå\90å\9cå"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Èçàáåðè ôàñöèêëó"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Îäàáåðè äâå ôàñöèêëå èëè äàòîòåêå çà ïîðå\90å\9cå"
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "Ëåâà ïóòà\9cà ¼å íåâàæå\9eà!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Äåñíà ïóòà\9cà ¼å íåâàæå\9eà!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Îáå ïóòà\9cå ñó íåâàæå\9eå!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Îäàáåðèòå äâå äàòîòåêå êî¼å ïðèõâàòà àðõèâåð"
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Íå ìîãó óïîðåäèòè äàòîòåêó è ôàñöèêëó!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Äàòîòåêà íè¼å ïðîíà\90åíà"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Äàòîòåêà íè¼å ðàñïàêîâàíà: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4087,12 +4067,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Íå ìîãó ðàø÷ëàíèòè ïðîáëåìàòè÷íó äàòîòåêó"
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4103,32 +4083,32 @@ msgstr ""
 "%1\n"
 "íè¼å ïðîáëåìàòè÷íà"
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Ñà÷óâ༠êàî"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Ñà÷óâ༠èçìåíå %1? "
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 ¼å îçíà÷åíà ñàìî çà ÷èòà\9cå.Æåëèòå ëè äà ¼å ïîíèøòèòå?(Íå, ñà÷óâàíà ¼å ïîä íîâèì èìåíîì)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Ãðåøêà ïðè ïðîâåðè óïèñèâà\9cà íà îäðåäèøòó "
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Ãðåøêà ïðè ïðàâ\9aå\9có ðåçåðâíå äàòîòåêå"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4141,7 +4121,7 @@ msgstr ""
 "\n"
 "Íàñòàâèòe?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4158,7 +4138,7 @@ msgstr ""
 "\t-je çàïàìòèòå ïîä äðóãèì èìåíîì, ïðèòèñíèòå /Ó ðåäó/\n"
 "\t- èëè ïðèòèñíèòå /Èçà\90è/çà ïðåêèä ïîñòóïêà?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4173,7 +4153,7 @@ msgstr ""
 "\n"
 "Äà ëè æåëèòå äà ñà÷óâàòå íåðàñïàêîâàíî èçäà\9cå êàî äàòîòåêó?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4188,7 +4168,7 @@ msgstr ""
 "\n"
 "Äà ëè æåëèòå äà ñà÷óâàòå íåðàñïàêîâàíî èçäà\9cå êàî äàòîòåêó?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4203,7 +4183,7 @@ msgstr ""
 "\n"
 "Çàìåíèòå èçìå\9cåíó äàòîòåêó?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4212,7 +4192,7 @@ msgstr ""
 "%1\n"
 "¼å îçíà÷åíà ñàìî çà ÷èòà\9cå.Æåëèòå ëè äà ¼å çàìåíèòå?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4225,22 +4205,22 @@ msgstr ""
 "%1\n"
 "îä çàä\9cåã ïðåãëåäà WinMerge-à.Æåëèòå ëè ïîíîâî ó÷èòàòè äàòîòåêó?"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Ñà÷óâ༠ëåâó äàòîòåêó êàî"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Ñà÷óâ༠äåñíó äàòîòåêó êàî"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid ""
 "The file\n"
@@ -4251,7 +4231,7 @@ msgstr ""
 "%1\n"
 "¼å íåñòàëà.Ìîëèìî Âàñ äà ñà÷óâàòå óìíîæåíó äàòîòåêó äà áèñòå íàñòàâèëè"
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4262,42 +4242,42 @@ msgstr ""
 "\n"
 "Îñâåæè äîêóìåíòå ïðå íàñòàâêà"
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Ìîðàòå îäðåäèòè ñèãóðíó èçâîðíó ïóòà\9có àêî æåëèòå íàñòàâèòè (ie:  $/MyProject)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Ïîâåðà äàòîòåêà íà VSS..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "Ñèñòåì ¼å ïîêàçàî ãðåøêó äîê ¼å ïîêóøàâàî äà ïðîâåðè äàòîòåêó.Íå ìîæå äà íàñòàâè..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Ãðåøêà ïðè èçâðøå\9có ñèñòåìñêå íàðåäáå"
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "VSS ðàäíà ôàñöèêëa è ïîëîæ༠òðåíóòå äàòîòåêå ñå íå ïîêëàïà¼ó.Íàñòàâèòå?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Íåìà VSS áàçå ïîäàòàêà"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Ãðåøêà èç VSS"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4308,7 +4288,7 @@ msgstr ""
 "Ìîëèìî, ïîãëåäà¼òå ïîäåøåíîñò êîðèñíè÷êîã èçãëåäà.\n"
 "Îïîçîâè ïðîâåðó?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4317,169 +4297,169 @@ msgstr ""
 "Ñèñòåì ïðèêàçó¼å ãðåøêó äîê ïîêóøàâà äà îïîçîâå ïðîâåðó äàòîòåêå.\n"
 "Ìîëèìî, ïîãëåäà¼òå ïîäåøåíîñò êîðèñíè÷êîã èçãëåäà"
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Íèøòà"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (ìà\9cè îä 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 è âèøè)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Ñòàíè íà ðàçìàêó"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Ñòàíè íà ðàçìàêó èëè èíòåðïóêöè¼è"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Óìíîæè îäàáðàíó ñòàâêó ó èìåíîâàíî¼ ôàñöèêëè"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Óìíîæè îäàáðàíó ñòàâêó ó ïðèëàãî\90åíî¼ ôàñöèêëè"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Èçáðèøè îäàáðàíó ñòàâêó ñ ëåâà"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Èçáðèøè îäàáðàíó ñòàâêó ñ äåñíà"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Èçáðèøè îäàáðàíó ñòàâêó íà îáå ñòðàíå "
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Ñàêðè¼ îäàáðàíó ñòàâêó (ôèëòåð ó õîäó)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Ïðåèìåíó¼ îäàáðàíó ñòàâêó íà îáå ñòðàíå"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Äåñíà ó ëåâî (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Ëåâà ó äåñíî (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Äåñíà ó ëåâî (%1 îä %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Ëåâà ó äåñíî (%1 îä %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Ëåâà ó... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Äåñíà ó... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Ëåâà ó... (%1 îä %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Äåñíà ó... (%1 îä %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Ëåâà (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Äåñíà (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Îáå (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Ëåâà (%1 îä %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Äåñíà (%1 îä %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Îáå(%1 îä %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Îäàáåðè ôàñöèêëó îäðåäèøòà:"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Ëåâà ñòðàíà - îäàáåðè ôàñöèêëó îäðåäèøòà:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Äåñíà ñòðàíà - îäàáåðè ôàñöèêëó îäðåäèøòà:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 óñìåðåíèõ äàòîòåêà)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 îä %2 óñìåðåíèõ äàòîòåêà)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4490,17 +4470,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà óìíîæèòå:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà óìíîæèòå %d ñòàâêè:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4519,613 +4499,613 @@ msgstr ""
 "\n"
 "Ìîëèì, îñâåæèòå ïîðå\90å\9cå."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà ¼å ïðåìåñòèòå:"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà ïðåìåñòèòå %d ñòàâêè:"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "Ïîòâðäè ïðåìåøòà¼"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Îòâîðè ëåâó äàòîòåêó"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Îòâîðè ëåâó äàòîòåêó ó äðóãîì óðå\90èâà÷ó"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Îòâîðè ëåâó äàòîòåêó ñà..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Îòâîðè äåñíó äàòîòåêó"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Îòâîðè äåñíó äàòîòåêó ó äðóãîì óðå\90èâà÷ó"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Îòâîðè äåñíó äàòîòåêó ñà..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Íè¼å óñïåëî ïîêðåòà\9cå äðóãîã óðå\90èâà÷à: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Íåïîçíàòà âðñòà äàòîòåêå çà äðóãè óðå\90èâà÷: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Ñà÷óâ༠èìå äàòîòåêå ó îñòàâè"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Ñà÷óâ༠èìå ïóòà\9cå ëåâå ñòðàíå ó îñòàâè"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Ñà÷óâ༠èìå ïóòà\9cå äåñíå ñòðàíå ó îñòàâè"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Ñà÷óâ༠èìå ïóòà\9cå îáå ñòðàíå ó îñòàâè"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr "Ëåâè èçáîðíèê /\9aóñêå/"
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr "Äåñíè èçáîðíèê /\9aóñêå/"
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Íåïîçíàò îáëèê àðõèâå"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Äîä༠ñòàâêå ñà ëåâå ñòðàíå ó àðõèâó"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Äîä༠ñòàâêå ñà äåñíå ñòðàíå ó àðõèâó"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Äîä༠ñòàâêå îáå ñòðàíå ó àðõèâó"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Äîä༠ðàçëè÷èòå ñòàâêå ó àðõèâó (îáå ñòðàíå)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Ïðåìåñòè îäàáðàíó äàòîòåêó ñ ëåâà ó èçàáðàíó ôàñöèêëó"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Ïðåìåñòè îäàáðàíó äàòîòåêó ñ äåñíà ó èçàáðàíó ôàñöèêëó"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Èìå äàòîòåêå"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Ðåçóëòàò ïîðå\90å\9cà"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Äàòóì ëåâî"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Äàòóì äåñíî"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Íàñòàâàê"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Âåëè÷èíà ëåâî"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Âåëè÷èíà äåñíî"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Âåëè÷èíà äåñíî (ñêðà\9eåíî)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Âåëè÷èíà ëåâî (ñêðà\9eåíî)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Âðåìå ñòâàðà\9cà ëåâå"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Âðåìå ñòâàðà\9cà äåñíå"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Íîâè¼à äàòîòåêà"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Èçäà\9cå ëåâå äàòîòåêå"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Èçäà\9cå äåñíå äàòîòåêå"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Ñêðà\9eåíè èñõîä"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Îñîáèíå ëåâå"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Îñîáèíå äåñíå"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "Çàâðøåòàê ðåäà ëåâå äàòîòåêå"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "Çàâðøåòàê ðåäà äåñíå äàòîòåêå"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Êîäèðà\9cå ëåâå"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Êîäèðà\9cå äåñíå"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Çàíåìàðè ðàçëèêå"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Áèíàðíè"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Íå ìîãó óïîðåäèòè äàòîòåêå"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Îäáà÷åíà ñòàâêà"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Èçîñòàâ\9aåíà äàòîòåêà"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Èçîñòàâ\9aåíà ôàñöèêëà"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Ñàìî ëåâà: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Ñàìî äåñíà: %"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Áèíàðíå äàòîòåêå ñó èñòå"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Áèíàðíå äàòîòåêå ñó ðàçëè÷èòå"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Äàòîòåêå ñó ðàçëè÷èòå"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr "Ôàñöèêëå ñó ðàçëè÷èòå"
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Ñàìî ëåâà"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Ñàìî äåñíà"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Ãðåøêà"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr "Òåêñòîâè äàòîòåêà ñó èñòè"
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr "Òåêñòîâè äàòîòåêà ñó ðàçëè÷èòè"
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Ïðîòåêëî âðåìå: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 ñòàâêà ¼å îäàáðàíà"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 ñòàâêà ¼å îäàáðàíà"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Èìå äàòîòåêå èëè ôàñöèêëå"
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Èìå ïîòôàñöèêëå êàä ñó ïîòôàñöèêëå óê\9aó÷åíå"
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Èçõîä ïîðå\90å\9cà,äóæè îáëèê"
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Äàòóì ïðîìåíå ëåâå ñòðàíå"
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Äàòóì ïðîìåíå äåñíå ñòðàíå"
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "/Íàñòàâàê/ äàòîòåêå"
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Âåëè÷èíà ëåâå äàòîòåêå ó áà¼òèìà"
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Âåëè÷èíà äåñíå äàòîòåêå ó áà¼òèìà"
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Ñêðà\9eåíà ëåâà äàòîòåêà"
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Ñêðà\9eåíà äåñíà äàòîòåêà"
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Âðåìå ñòâàðà\9cà ëåâå ñòðàíå"
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Âðåìå ñòâàðà\9cà äåñíå ñòðàíå"
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Êî¼à ñòðàíà èìà íîâè¼è äàòóì ïðîìåíå"
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Èçäà\9cå íà ëåâî¼ ñòðàíè ¼å ñàìî çà íåêå âðñòå äàòîòåêå"
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Èçäà\9cå íà äåñíî¼ ñòðàíè ¼å ñàìî çà íåêå âðñòå äàòîòåêå"
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Êðà\9eè ðåçóëòàò ïîðå\90å\9cà"
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Îñîáèíå ëåâå ñòðàíå"
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Îñîáèíå äåñíå ñòðàíå"
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Íà÷èí çàâðøåòêà ðåäà ëåâå äàòîòåêå"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Íà÷èí çàâðøåòêà ðåäà äåñíå äàòîòåêå"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Êîäèðà\9cå ëåâå ñòðàíå"
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Êîäèðà\9cå äåñíå ñòðàíå"
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Áðî¼ çàíåìàðåíèõ ðàçëèêà ó äàòîòåöè.Îâå ðàçëèêå ¼å çàíåìàðèî WinMerge è íå ìîãó áèòè îá¼åäè\9cåíå"
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Áðî¼ ðàçëèêà ó äàòîòåöè.Îâ༠áðî¼ íå óê\9aó÷ó¼å çàíåìàðåíå ðàçëèêå"
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Ïðèêàçó¼å çâåçäèöó (*), àêî ¼å äàòîòåêà áèíàðíà"
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Óïîðåäè %1 ñà %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Ñïèñàê ¼å îäâî¼åí çàðåçîì"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Ñïèñàê ¼å îäâî¼åí ¼åçè÷êîì"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "£åäíîñòàâíè HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "£åäíîñòàâíè XML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Äàòîòåêà èçâåøòà¼à âå\9e ïîñòî¼è.Äà ëè æåëèòå çàìåíèòè ïîñòî¼å\9eó äàòîòåêó"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5134,32 +5114,32 @@ msgstr ""
 "Ãðåøêà ïðè ïðàâ\9aå\9có èçâåøòà¼à:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Èçâåøò༠¼å óñïåøíî íàïðàâ\9aåí"
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Èñòà äàòîòåêà ¼å îòâîðåíà ó îáå òàáëå"
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Èçàáðàíå äàòîòåêå ñó èñòå"
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Äîøëî ¼å äî ãðåøêå ïðè ïîðå\90å\9có"
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Ïðèâðåìåíà äàòîòåêà íå ìîæå áèòè ñòâîðåíà.Ïðîâåðèòå è ïîäåñèòå ïðèâðåìåíó ïóòà\9có"
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5174,7 +5154,7 @@ msgstr ""
 "\n"
 "Íàïîìåíà:Æåëèòå ëè óâåê çàäðæàòè ðàçëè÷èòå ïðåëàñêà ó äðóãè ðåä, îäàáåðèòå 'Çàíåìàðè ðàçëè÷èòå ïðåëàñêå ó äðóãè ðåä..' ó äè¼àëîøêî¼ êàðòèöè ïîðå\90å\9cå ïðîçîðà (Óðå\90èâà\9cå/Ïîñòàâêå)"
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5185,22 +5165,22 @@ msgstr ""
 "Ïðåìà ïîñòàâêàìà ïðîìåíè\9eå ñå êàêî ¼å îäàáðàíî.\n"
 "Äà ëè æåëèòå äà ïðîìåíèòå ïîñòàâêå è î÷óâà\9cå ðàçëè÷èòèõ íà÷èíà ïðåëàçàêà?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Ãðåøêà ïðèëèêîì ïîðå\90å\9cà äàòîòåêå '%1' ñà äîäàòêîì'%2'.Äåôèíèñàíî ïîðå\90å\9cå ñå íå ïðèìå\9có¼å âèøå. "
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "Îäàáðàíà ôàñöèêëà ¼å íåóïîòðåá\9aèâà"
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Íå ìîãó îòâîðèòè áèíàðíó äàòîòåêó ó óðå\90èâà÷ó"
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5215,7 +5195,7 @@ msgstr ""
 "%1\n"
 "íà äðóãî¼ ñòðàíè è îòâîðèòè ¼å?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5226,148 +5206,148 @@ msgstr ""
 "Ïðèêàç ñâàêå äàòîòåêå ó êîäíî¼ ñòðàíèöè ¼å áî\9aè àëè ñïà¼à\9cå/óìíîæàâà\9cå íîñè îïàñíîñò.\n"
 "Æåëèòå ëè äà óçìåòå îáå äàòîòåêå êàî ó ïîäðàçóìåâàíîì ïðîçîðó êîäíå ñòðàíèöå (ïðåïîðó÷åíî)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Ïàæ\9cà:Äàòîòåêå ñó ðàçëè÷èòî êîäèðàíå, ëåâà=%s è äåñíà=%s,è ñïà¼à\9cå ìîæå äîâåñòè äî ãóáèòêà ïîäàòàêà. "
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Ïîäàöè ñó èçãóá\9aåíè çáîã ãðåøêå ïðè êîäèðà\9có: îáå äàòîòåêå"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Íåìà ðàçëèêå"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Ðàçëè÷èòè ðåä"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Çàìå\9cåí %1 ïî¼àì(à)"
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Íå ìîãó íà\9eè ïî¼àì \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Óìíîæè ïóòà\9có"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Óìíîæè èìå äàòîòåêå"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Ïîëîæ༠òàáëè"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Ðàçëè÷èòå òàáëå"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Äàòîòåêà ðàçëèêà ¼å óñïåøíî ñà÷óâàíà"
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. ñòàâêà èëè ôàñöèêëà íè¼å ïðîíà\90åíà!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. ñòàâêà èëè ôàñöèêëà íè¼å ïðîíà\90åíà!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Äàòîòåêà ðàçëèêà âå\9e ïîñòî¼è.Äà ëè æåëèòå äà je çàìåíèòå?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 îäàáðàíà äàòîòåêà"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Óîáè÷à¼åí"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Ó îêâèðó"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Îá¼åäè\9cåí"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Íå ìîãó ñà÷óâàòè ó äàòîòåöè %1"
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Íàâåäåíà èçëàçíà ïóòà\9cà íè¼å ïîòïóíà ïóòà\9cà: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Îäðåäèòå èçëàçíó äàòîòåêó"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Íå ìîæå ñòâîðèòè äàòîòåêó ðàçëèêà èç áèíàðíèõ äàòîòåêà"
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Íå ìîæå ïîïðàâèòè äàòîòåêó èç ôàñöèêëè"
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5378,17 +5358,17 @@ msgstr ""
 "\n"
 "Ñòâàðà\9cå äàòîòåêå ðàçëèêà çàõòåâà äà ïîñòî¼å ïðîìåíå êî¼å íèñó ñà÷óâàíå ó äàòîòåêàìà"
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Ôàñöèêëà íå ïîñòî¼è"
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Ðåçóëòàòè ïîðå\90å\9cà ôàñöèêëè \9eå áèòè óêëî\9cåíè"
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5399,7 +5379,7 @@ msgstr ""
 "Ñâå ïîòðåáíå êîìïîíåíòå (7-zip è/èëè Merge7z*.dll)çà àðõèâó íå ìîãó áèòè íà\90åíå.\n"
 "Ïîãëåäà¼òå óïóòñòâî êàêî îìîãó\9eèòè ðàä ñà àðõèâàìà"
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5408,7 +5388,7 @@ msgstr ""
 "\n"
 "Çàáåëåøêà:Èíòåãðàöè¼à 7-Zip ¼å îíåìîãó\9eåíà ó  ïîäåøàâà\9cèìà WinMerge-à"
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5417,37 +5397,37 @@ msgstr ""
 "\n"
 "Çàáåëåøêà:Èíòåãðàöè¼à 7-Zip ¼å îãðàíè÷åíà íà ñàìîñòàëíî äåëîâà\9cå ó ïîäåøàâà\9cèìà WinMerge-à "
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Îäàáåðè äàòîòåêó çà èçâîç"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Îäàáåðè äàòîòåêó çà óâîç"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Óâîç ïîñòàâêè ó äàòîòåêó"
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Èçâîç ïîñòàâêè ó äàòîòåêó"
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Íè¼å óñïåî äà óâåçå ïîñòàâêå èç äàòîòåêå"
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Íè¼å óñïåî äà çàïàìòè ïîñòàâêå ó äàòîòåöè"
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5458,242 +5438,242 @@ msgstr ""
 "\n"
 "Äà ëè æåëèòå íàñòàâèòè?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Ïðàâè èçðàç ãðåøêå"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Íåìà"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Íåâàæå\9eè ïðàâè èçðàç"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Íåâàæå\9eè óïîðåäíè çíàê"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Íåâàæå\9eè çíàê íàçèâà âðñòå"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Çíàê îáðíóòà êîñà öðòà"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Ëîøà ïðåïîðóêà"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Íåïîäåñíà [ èëè [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Íåïîäåñíà ( èëè \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Íåïîäåñíà \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Íåâàæå\9eè ñàäðæ༠\\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Íåâàæå\9eè îïñåã äå¼ñòâà"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Èçâàí ïàì\9eå\9cà"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Íåâàæå\9eè ïðåòõîäíè ïðàâè èçðàç"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Ïðåðàíè êð༠ïðàâîã èçðàçà "
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Ïðàâè èçðàç ¼å ïðåâåëèê"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Íåîäãîâàðà¼ó\9eà ) èëè \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Mixed"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr "B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr "KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr "MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr "GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr "TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr "PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Âðñòà"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "Ðàñïàêèâà\9cå"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr "Äåôèíèñàíî ïîðå\90å\9cå"
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "Óðå\90èâà÷ ðóêîïèñà"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Ñà÷óâ༠ëåâó äàòîòåêó"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Ñà÷óâ༠äåñíó äàòîòåêó"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Ñà÷óâ༠ëåâó äàòîòåêó ñà íàçèâîì"
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Ñà÷óâ༠äåñíó äàòîòåêó ñà íàçèâîì"
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Ïðîìåíè êð༠ðåäà íà Windows íà÷èí"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Ïðîìåíè êð༠ðåäà íà Unix íà÷èí"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Ïðîìåíè êð༠ðåäà íà Mac íà÷èí"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Áèð༠èçìå\90ó óðå\90èâà\9cà è óïîðå\90èâà\9cà"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5702,12 +5682,12 @@ msgstr ""
 "Ïðèêàæè è ïîäåñè ñâî¼ñòâà êîäèðà\9cà äàòîòåêå\n"
 "Ñâî¼ñòâà êîäèðà\9cà äàòîòåêå"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "Îòâîðè è ðåøè ïðîáëåìàòè÷íå äàòîòåêå"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5716,7 +5696,7 @@ msgstr ""
 "Èçàáåðè ðàçëèêå ó òðåíóòíîì ðåäó\n"
 "Ðàçëèêå ó òðåíóòíîì ðåäó"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5725,7 +5705,7 @@ msgstr ""
 "Èäè íà ðåä èëè ðàçëèêó\n"
 "Èäè íà (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5734,7 +5714,7 @@ msgstr ""
 "Ïîäåñè ïðîãðàìñêå ïîñòàâêå\n"
 "Ïîñòàâêå"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5743,37 +5723,37 @@ msgstr ""
 "Îñâåæè ïðèêàç\n"
 "Îñâåæè (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Óìíîæè îäàáðàíå ðåäîâå ó îñòàâó äîäà¼ó\9eè îä ïî÷åòêà áðî¼åâå ðåäîâèìà "
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Çàìåíè çàáåëåøêå"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Èäè íà ñëåäå\9eó çàáåëåøêó"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Èäè íà ïðåòõîäíó çàáåëåøêó"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Óêëîíè ñâå çàáåëåøêå"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5782,7 +5762,7 @@ msgstr ""
 "Ïðèêàçó¼å ñòàâêå êî¼å ñó ïîòïóíî èñòå\n"
 "Ïðèêàæè èñòå ñòàâêå"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5791,7 +5771,7 @@ msgstr ""
 "Ïðèêàçó¼å ñòàâêå êî¼å ñå ðàçëèêó¼ó\n"
 "Ïðèêàæè ðàçëè÷èòå ñòàâêå"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5800,7 +5780,7 @@ msgstr ""
 "Ïðèêàçó¼å ñòàâêå êî¼å ïîñòî¼å ñàìî íà ëåâî¼ ñòðàíè\n"
 "Ïðèêàæè ëåâó ¼åäèíñòâåíó ñòàâêó"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5809,7 +5789,7 @@ msgstr ""
 "Ïðèêàçó¼å ñòàâêå êî¼å ïîñòî¼å ñàìî íà äåñíî¼ ñòðàíè\n"
 "Ïðèêàæè äåñíó ¼åäèíñòâåíó ñòàâêó"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5818,7 +5798,7 @@ msgstr ""
 "Ïðèêàçó¼å áèíàðíå äàòîòåêå\n"
 "Ïðèêàæè áèíàðíå äàòîòåêå"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5827,7 +5807,7 @@ msgstr ""
 "Ïðèêàçó¼å ïðåñêî÷åíå ñòàâêå\n"
 "Ïðèêàæè ïðåñêî÷åíå ñòàâêå"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5836,7 +5816,7 @@ msgstr ""
 "Èçàáåðèòå ñëîâà çà ïðèêàç\n"
 "Èçàáåðè ñëîâà"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5845,27 +5825,27 @@ msgstr ""
 "Âðàòè ñå è êîðèñòè ïîäðàçóìåâàíà ñëîâà çà ïðèêàç\n"
 "Ïîäðàçóìåâàíà ñëîâà "
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Ïðèêàçó¼å ðàçìàêå è çíàêîâå"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Çàìåíè ñòðàíå"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Ïîëîæ༠òàáëå ïðèêàçó¼å óêóïíó ñëèêó î äàòîòåöè"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Ïðèêàæè ñòàòèñòè÷êî ïîðå\90å\9cå ôàñöèêëè"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5874,7 +5854,7 @@ msgstr ""
 "Èçàáåðèòå âàø ¼åçèê ñó÷å\9aà\n"
 "£åçèê"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5883,12 +5863,12 @@ msgstr ""
 "Ïîêàçó¼å ðàçëèêå óíóòàð ðåäîâà ñà ðàçëè÷èòèì áî¼àìà\n"
 "Ïðèêàæè ðàçëè÷èòå ðåäîâå"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Çàìåíè ìåñòà òàáëàìà"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5897,7 +5877,7 @@ msgstr ""
 "Ïðèêàçó¼å áðî¼åâå ðåäîâà\n"
 "Ïðèêàæè áðî¼åâå ðåäîâà"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5906,7 +5886,7 @@ msgstr ""
 "Îìîãó\9eè ïðåëîì òåêñòà\n"
 "Ïðåëàç ó íîâè ðåäà"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5915,22 +5895,22 @@ msgstr ""
 "Ïîêàçó¼å èçáîð ðóáà çà îáå òàáëå\n"
 "Ïðèêàæè èçáîð ðóáîâà"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Ïîâå\9e༠âåëè÷èíó òåêñòà"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Óìà\9cè âåëè÷èíó òåêñòà"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Èçâîðíà âåëè÷èíà òåêñòà"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5939,7 +5919,7 @@ msgstr ""
 "Ïîìåðè äî ïðåòõîäíå ðàçëèêå\n"
 "Ïðåòõîäíà ðàçëèêà (Alt+Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5948,67 +5928,67 @@ msgstr ""
 "Ïîìåðè äî ñëåäå\9eå ðàçëèêå\n"
 "Ñëåäå\9eà ðàçëèêà (Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -6017,7 +5997,7 @@ msgstr ""
 "Ïîìåðè äî ïðâå ðàçëèêå\n"
 "Ïðâà ðàçëèêà(Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6026,7 +6006,7 @@ msgstr ""
 "Ïîìåðè äî òðåíóòíå ðàçëèêå\n"
 "Òðåíóòíà ðàçëèêà (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6035,7 +6015,7 @@ msgstr ""
 "Ïîìåðè äî ñëåäå\9eå ðàçëèêå\n"
 "Ïîñëåä\9cà ðàçëèêà (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6044,7 +6024,7 @@ msgstr ""
 "Óìíîæè îçíà÷åíè òåêñò ó äåñíó äàòîòåêó\n"
 "Óìíîæè ó äåñíó (Alt+Right)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6053,7 +6033,7 @@ msgstr ""
 "Óìíîæè îçíà÷åíè òåêñò ó ëåâó äàòîòåêó\n"
 "Óìíîæè ó ëåâó (Alt+Left)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6062,7 +6042,7 @@ msgstr ""
 "Óìíîæè ðàçëèêå ó äåñíó è ïðå\90è íà ñëåäå\9eå\n"
 "Óìíîæè ó äåñíó è íàñòàâè (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6071,7 +6051,7 @@ msgstr ""
 "Óìíîæè ðàçëèêå ó ëåâó è ïðå\90è íà ñëåäå\9eå\n"
 "Óìíîæè ó ëåâó è íàñòàâè (Ctrl+Alt+Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6080,7 +6060,7 @@ msgstr ""
 "Óìíîæè ñâå ðàçëèêå ó äåñíó äàòîòåêó\n"
 "Ñâå ó äåñíó"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6089,89 +6069,89 @@ msgstr ""
 "Óìíîæè ñâå ðàçëèêå ó ëåâó äàòîòåêó\n"
 "Ñâå ó ëåâó"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Èçáðèøè èçàáðàíå ñòàâêå èç îáå ôàñöèêëå"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Óïîðåäè îçíà÷åíå ñòàâêå (óïîðåäèòå ïðâå ñòàâêå, àêî ¼å âèøå ñòàâêè îäàáðàíî)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Èçáîð è ðàçìåøò༠ôàñöèêëè ïðåìà óïîðå\90åíèì ñòóáöèìà"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Ïðàâè ïîïðàâêå äàòîòåêà "
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Èçàáåðèòå è ïðîìåíèòå ôèëòåðå"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Ïðàâè èçâåøòà¼å ïîðå\90å\9cà "
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "Ïðèêàçó¼å ñïèñàê äîñòóïíèõ äîäàòàêà"
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "Êîðèñíèê áèðà ðàñïàêèâà\9cå (íå ðàñïàêó¼ êàä ñå óïîðå\90ó¼ó ôàñöèêëå)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Ïðèëàãî\90åíî ðàñïàêèâà\9cå \9eå ñå êîðèñòèòè çà îáå äàòîòåêå (¼åäíà äàòîòåêà òðåáà íàñòàâàê)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Èçàáåðèòå àðõèâåð äà ïðîìåíèòå îâó äàòîòåêó"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Íåìà äåôèíèñàíîã ïîðå\90å\9cà (óîáè÷à¼åíî)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Ïðåïîðó÷åíè äîäàöè"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Îñòàëè äîäàöè"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Óêëîíè è ïîíîâî ó÷èò༠ñâå äîäàòêå (çà íàïðåäíå)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
 "Activate next File"
 msgstr "Ïîêðåíè ñëåäå\9eó âèä\9aèâó äàòîòåêó"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Çàòâîðè ñâå ïðîçîðå"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6180,22 +6160,22 @@ msgstr ""
 "Îòâàðà WinMerge ïîìî\9e\n"
 "WinMerge /ïîìî\9e/"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Èçëàçè îáàâåøòå\9cå î òðåíóòíîì èçäà\9có WinMerge-à è ïîäåøåíîñòè ó òåêñòóàëíî¼ äàòîòåöè"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "Ïðèêàç GNU ¼àâíå ëèöåíöå"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Ëè÷íà èçðàäà: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6204,7 +6184,7 @@ msgstr ""
 "Îòâàðà áåëåøêå î èçäà\9có äîêóìåíòa\n"
 "Áåëåøêå î èçäà\9có"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6213,272 +6193,272 @@ msgstr ""
 "Îòâîðè âåá ñà¼ò ïðåâîäà\n"
 "Ïðåâîäè"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Ïîäåøàâà\9cà äîäàòàêà"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Íåìà äåôèíèñàíîã ïîðå\90å\9cà"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Äåôèíèøè ïîðå\90å\9cå,àêî ¼å ìîãó\9eå"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH íè¼å íà\90åí - .sct ñêðèïòå ñó îíåìîãó\9eåíå"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Íèøòà>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Àóòîìàòñêè>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Îòâîðè äàòîòåêó ñà ðåãèñòðîâàíèì ïðîãðàìîì"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Îòâîðè äàòîòåêó ñà äðóãèì óðå\90èâà÷åì"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Îòâîðè äàòîòåêó ñà ïîñåáíèì ïðîãðàìîì"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Íå ïðèêàçó¼ ïðåìåøòåíå ãðóïå"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Ïðèêàæè ñâå ïðåìåøòåíå ãðóïå"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Ïðèêàæè ïðåìåøòåíå ãðóïå ñàìî òðåíóòíèõ ðàçëèêà"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Èäè íà ðàçëèêå ïîä /ïîêàçèâà÷åì/"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "È&äè íà ðàçëèêå %1 îä %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "È&äè íà ðåä %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Îíåìîãó\9eè"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Îä ñèñòåìà"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Èç MRU ñïèñêà"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "Íè¼å îçíà÷åíî"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Batch"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Ïðåíîñíè îá¼åêàò"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Resources"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr "Verilog"
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Ñàêðè¼ òðàêó àëàòà"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Ìàëå èêîíå òðàêå àëàòà"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Âåëèêå èêîíå òðàêå àëàòà"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index 26e9077..12b389b 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -1030,7 +1030,7 @@ msgid "&Scripts"
 msgstr "&Skripty"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Prázdne >"
@@ -1471,7 +1471,7 @@ msgid "&Versioning System:"
 msgstr "Systém pre správu &verzií:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Cesta ku cleartool.exe:"
@@ -1672,7 +1672,7 @@ msgid "Replace &All"
 msgstr "Nahraïi\9d v\9aetko"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2580,7 +2580,7 @@ msgid "Files:"
 msgstr "Súbory:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Odli\9ané"
@@ -2617,7 +2617,7 @@ msgid "Right:"
 msgstr "Vpravo:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Identické"
@@ -2817,7 +2817,7 @@ msgid "A&ppend timestamp"
 msgstr "P&rida\9d èasovú známku"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Potvrdi\9d kopírovanie"
@@ -2895,7 +2895,7 @@ msgstr ""
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Adresár"
@@ -3517,7 +3517,7 @@ msgid "Version Control"
 msgstr "Kontrola verzií"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Rozdiely"
@@ -3646,87 +3646,67 @@ msgstr "XML s
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr ""
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr ""
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr ""
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr ""
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Plný obsah"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Rýchly obsah"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Dátum zmeny"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Dátum zmeny a ve¾kos\9d"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Ve¾kos\9d"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Názov"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Umiestnenie"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filtre"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Popis"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Zvo¾te názov súboru pre nový filter"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Filtre súborov (*.flt)|*.flt|V\9aetky súbory (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3739,7 +3719,7 @@ msgstr ""
 "Prosím, skopírujte súbor %1 do adresára WinMerge/Filters :\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3752,7 +3732,7 @@ msgstr ""
 "\n"
 "Prosím, uistite sa, \9ee adresár existuje a dá sa doòho zapisova\9d."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3763,7 +3743,7 @@ msgstr ""
 "\n"
 "Prosím, vyberte adresár pre filtre v dialógu Nastavienia/Systém."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3776,12 +3756,12 @@ msgstr ""
 "\n"
 "Mo\9eno je filter len na èítanie?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Nájs\9d súbor filtra, ktorý sa nain\9ataluje"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3792,258 +3772,258 @@ msgstr ""
 "\n"
 "Nepodarilo sa skopírova\9d nový súbor do adresára s filtrami."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Filter u\9e existuje. Prepísa\9d existujúci filter?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Regulárny výraz"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
 msgstr ""
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr ""
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Výsledok porovnania adresárov"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Porovnávanie súborov"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Nepomenovaný ¾avý"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Nepomenovaný pravý"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "Ich súbor"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "Môj súbor"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Preh¾adávam súbory..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Otváranie výberu"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Kopírujem ¾avý do pravého"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Kopírujem pravý do ¾avého"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Kopírujem v\9aetko do ¾avého"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Kopírujem v\9aetko do pravého"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Kopírujem súbory..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Ma\9eem súbory..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Presúvam súbory..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Vytváram správu..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr ""
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr ""
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Riadok: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Zlúèi\9d"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Rozdiel %1 z %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "nájdených %1 rozdielov"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "nájdený jeden rozdiel"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "na èítanie"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Polo\9eka %1 of %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Polo\9eky: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Vyberte 2 existujúce súbory alebo adresáre na porovnanie"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Výber adresára"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Vyberte dva adresáre na porovnanie."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "¼avá cesta je neplatná!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Pravá cesta je neplatná!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Obe cesty sú neplatné!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Zvo¾te si dva súbory pre zapnutie rozba¾ovaèa súborov."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Nemô\9eem porovna\9d súbor a adresár!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Súbor nenájdený: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Súbor nerozbalený: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4056,12 +4036,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Nepodarilo sa spracova\9d súbor konfliktov."
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4072,32 +4052,32 @@ msgstr ""
 "%1\n"
 "nie je súbor konfliktov."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Ulo\9ei\9d ako"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Ulo\9ei\9d zmeny do %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 je oznaèený len na èítanie. Chcete aj tak prepísa\9d súbor len na èítanie? (Stlaète Nie ak ho chcete zapísa\9d po novým názvom.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Chyba pri zis\9dovaní mo\9enosti zápisu"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Chyba pri zálohovaní súboru"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4110,7 +4090,7 @@ msgstr ""
 "\n"
 "Pokraèova\9d napriek tomu?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4127,7 +4107,7 @@ msgstr ""
 "\t-pou\9ei\9d iný názov súbory (Stlaète Ok)\n"
 "\t-zru\9ai\9d prebiehajúcu operáciu (Stlaète Zru\9ai\9d)?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4142,7 +4122,7 @@ msgstr ""
 "\n"
 "\8eeláte si ulo\9ei\9d rozbalenú verziu do iného súboru?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4157,7 +4137,7 @@ msgstr ""
 "\n"
 "\8eeláte si ulo\9ei\9d rozbalenú verziu do iného súboru?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4172,7 +4152,7 @@ msgstr ""
 "\n"
 "Prepísa\9d zmenený súbor?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4181,32 +4161,32 @@ msgstr ""
 "%1\n"
 "je oznaèený len na èítanie. \8eeláte si prepísa\9d polo\9eku len na èítanie?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
 msgstr ""
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Ulo\9ei\9d ¾avý súbor ako"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Ulo\9ei\9d pravý súbor ako"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
 msgstr ""
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4217,42 +4197,42 @@ msgstr ""
 "\n"
 "Obnovte dokumenty, ne\9e budete pokraèova\9d."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Musíte nastavi\9d cestu k projektu SourceSafe (napr.: $/MojProjekt)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Checkout súborov z VSS..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "SourceSafe vrátil chybu pri pokuse skontrolova\9d súbor. Nemo\9eno pokraèova\9d..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Chyba pri spú\9a\9daní príkazu zo Systému Verzií (CVS a pod)."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "pracovný adresár VSS Working Folder a umiestnenie aktuálneho súboru sa nezhodujú. Pokraèova\9d?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Nebola nájdená databáza VSS!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Chyba VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4263,7 +4243,7 @@ msgstr ""
 " Prosím, skontrolujte konfiguráciu zvoleného poh¾adu.\n"
 " Vráti\9d operáciu checkout?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4272,169 +4252,169 @@ msgstr ""
 "Systém pre správu verzií vrátil chybu pri pokuse vráti\9d (checkout) súbor.\n"
 " Prosím, skontrolujte konfiguráciu zvoleného poh¾adu. "
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "\8eiadny"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (men\9aie ako 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 a vy\9a\9aie)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Preru\9ai\9d na netlaèite¾nom znaku"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Preru\9ai\9d na netlaèite¾nom znaku alebo vetnej diakritike"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Kopírova\9d oznaèenú polo\9eku do pomenovaného adresára"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Kopírova\9d oznaèenú polo\9eku do vlastného adresára"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Zma\9e oznaèené polo\9eky v¾avo"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Zma\9e oznaèené polo\9eky vpravo"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Zma\9e oznaèené polo\9eky na oboch stranách"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Skry oznaèené polo\9eky (filter poèas behu)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Premenova\9d oznaèenú polo\9eku na oboch stranách"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Kopíruj do ¾avej strany %1 z %2 vybraných polo\9eiek"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Kopíruj do pravej strany %1 z %2 vybraných polo\9eiek"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Sprava do¾ava (%1 z %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Z¾ava doprava (%1 z %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Z¾ava... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Sprava... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Z¾ava... (%1 z %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Sprava... (%1 z %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "¼avý (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Zma\9e %1 z %2 vybraných polo\9eiek z pravej strany"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Zmaza\9d z oboch strán %1 z %2 vybraných polo\9eiek"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "¼avý (%1 z %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Pravý (%1 z %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Oba (%1 z %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Vyberte cie¾ový adresár"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "¼avá strana - vyberte cie¾ový adresár:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Pravá strana - vyberte cie¾ový adresár:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 ovplyvnených súborov)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 ovplyvnených súborov z %2)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4445,17 +4425,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Naozaj chcete skopírova\9d:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Naozaj chcete skopírova\9d %d polo\9eiek:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4474,613 +4454,613 @@ msgstr ""
 "\n"
 "Prosím, obnovte porovnanie."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr ""
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr ""
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr ""
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Otvori\9d ¾avý súbor"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Otvori\9d súbor v¾avo v externom editore"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Otvori\9d ¾avý súbor s..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Otvori\9d pravý súbor"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Otvori\9d pravý súbor v externom editore"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Otvori\9d pravý súbor s..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Nepodarilo sa spusti\9d externý editor: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Neznáma prípona (external editor): %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Skopírova\9d názvy súborov do schránky"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Skopírova\9d názvy cesty na ¾avej strane do schránky"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Skopírova\9d názvy cesty na pravej strane do schránky"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Skopírova\9d názvy ciest z oboch strán do schránky"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr ""
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr ""
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Neznámy formát archívu"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Prida\9d polo\9eky z ¾avej strany do archívu"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Prida\9d polo\9eky z pravej strany do archívu"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Prida\9d polo\9eky z oboch strán do archívu"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Prida\9d rozdielne polo\9eky do archívu (obe strany)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Presunú\9d vybraný súbor na ¾avej strane do adresára, ktorý zadám"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Presunú\9d vybraný súbor na pravej strane do adresára, ktorý zadám"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Názov súboru"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Výsledok porovnania"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Dátum v¾avo"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Dátum vpravo"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Prípona"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Ve¾kos\9d v¾avo"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Ve¾kos\9d vpravo"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Ve¾kos\9d vpravo (krátka)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Ve¾kos\9d v¾avo (krátka)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Èas vzniku v¾avo"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Èas vzniku vpravo"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Nov\9aí súbor"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Verzia súboru v¾avo"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Verzia súboru vpravo"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Krátky výsledok"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Atribúty v¾avo"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Atribúty vpravo"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "Konce riadkov v¾avo"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "Konce riadkov vpravo"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Kódovanie v¾avo"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Kódovanie vpravo"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Ignorovaný rozdiel"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binárny"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Nemo\9eno porovna\9d súbory"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Polo\9eka zru\9aená"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Súbor preskoèený"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Adresár preskoèený"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Iba v¾avo: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Iba vpravo: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Binárne súbory sú identické"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Binárne súbory sú rozdielne"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Súbory sú rozdielne"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr ""
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Iba v¾avo"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Iba vpravo"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Chyba"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr ""
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr ""
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Uplynulý èas: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "jedna vybraná polo\9eka"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 vybraných polo\9eiek"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Názov súboru alebo adresára."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Názov podadresára, keï obsahuje aj podadresáre."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Výsledok porovnania, dlhý tvar."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Dátum poslednej zmeny na ¾avej strane."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Dátum poslednej zmeny na pravej strane."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Prípona súboru."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Ve¾kos\9d súboru na ¾avej strane v bajtoch."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Ve¾kos\9d súboru na pravej strane v bajtoch."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Ve¾kos\9d súboru na ¾avej strane skrátená."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Ve¾kos\9d súboru na pravej strane skrátená."
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Dátum vytvorenia na ¾avej strane."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Dátum vytvorenia na pravej strane."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "ktorý zo súborov má nov\9aí èas poslednej zmeny."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Verzia súboru na ¾avej strane, iba pre rovneký typ súboru."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Verzia súboru na pravej strane, iba pre rovneký typ súboru."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Krátky výsledok porovnania."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Atribúty na ¾avej strane."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Atribúty na pravej strane."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Typ zakonèenia riadka súboru na ¾avej strane"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Typ zakonèenia riadka súboru na pravej strane"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Kódovanie na ¾avej strane."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Kódovanie na pravej strane."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Poèet ignorovaných rozdielov v súbore. Tieto rozdiely WinMerge ignoruje a nie je schopný ich zlúèi\9d."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Poèet rozdielov v súbore. V tomto èísle nie sú zahrnuté ignorované rozdiely."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Zobrazí hviezdièku (*) ak je súbor binárny."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Porovna\9d %1 s %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Zoznam oddelený èiarkami"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Zoznam oddelený tabulátormi"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "Jednoduché HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "Jednoduché XML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Súbor so správou u\9e existuje. Chcete prepísa\9d existujúci súbor?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5089,32 +5069,32 @@ msgstr ""
 "Chyba pri vytváraní správy:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Správa bola úspe\9ane vytvorená."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Rovnaký súbor je otvorený v boch paneloch."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Vybrané súbory sú rovnaké."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Poèas porovnávania sa vyskytla chyba."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Doèasné súobry nebolo mo\9ené vytvori\9d. Skontrolujte nastavenie odkladacieho adresára."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5129,27 +5109,27 @@ msgstr ""
 "\n"
 "Pozn.: Ak chcete, aby som v\9edy pova\9eoval v\9aetky zakonèenia riadkov za ekvivalentné, nastavte vo¾bu 'Ignorova\9d rozdiely zakonèenia riadkov..' v zálo\9eke Porovnávanie dialógu Nastavenia (nájdete v Úpravy/Nastavenia)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, 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:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Poèas predspracovana súboru '%1' zásuvným modulom '%2' sa vyskytla chyba. Predspracovanie sa u\9e nepou\9eije."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "Zvolený adresár je neplatný."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Nemô\9eem otvori\9d binárny súbor v editore."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5164,7 +5144,7 @@ msgstr ""
 "%1\n"
 "na druhej strane a otvori\9d tieto adresáre?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5175,148 +5155,148 @@ msgstr ""
 "Zobrazenie ka\9edého súboru v jeho kódovej stránke lep\9aie zobrazuje, ale zluèovanie/kopírovanie bude nebezpeèné.\n"
 "Chcete precova\9d s oboma stránkami akoby boli v predvolenej kódovej stránke Windows (odporúèa sa)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Varovanie: Súbory pou\9eívajú rozlièné kódovania, ¾avý=%s a pravý=%s, a zlúèenie mô\9ee vies\9d ku strate informácií."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Informácie sa stratili kvôli chybám v kódovaní: oba súbory"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Bez rozdielu"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Rozdiely v riadkoch"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Nahradených %1 re\9dazcov."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Nemô\9eem nájs\9d re\9dazec \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Kopírova\9d úplnú cestu"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Kopírova\9d názov súboru"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Lokaèný panel"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Panel rozdielu"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Súbor so záplatou bol úspe\9ane zapísaný."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. polo\9eka nenájdená alebo je to adresár!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. polo\9eka nenájdená alebo je to adresár!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Súbor so záplatou u\9e existuje. Chcete ho prepísa\9d?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 súbor zvolený]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Normálny"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Kontextový"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Zjednotený"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Nedalo sa zapisova\9d do súboru %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Uvedená výstupná cesta nie je absolútna cesta: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "uveïte výstupný súbor"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Nemohol som vytvori\9d súbor so záplatou z binárnych súborov."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Nemohol som vytvori\9d súbor so záplatou z adresárov."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5327,17 +5307,17 @@ msgstr ""
 "\n"
 "vytvorenie záplaty vy\9eaduje, aby v súboroch neboli neulo\9eené zmeny."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Adresár neexistuje."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Aktuálne výsledky porovnania adresárov budú zmazané."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5348,7 +5328,7 @@ msgstr ""
 "Niektoré z komponentov (7-zip a/alebo Merge7z*.dll) potrebných pre podporu archívov neboli nájdené.\n"
 "Pozri viac informácií o podpore archávov a ako ju zapnú\9d v Príruèke."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5357,7 +5337,7 @@ msgstr ""
 "\n"
 "Pozn.: integrácia 7-Zip je vyonutá v Nastaveniach WinMerge."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5366,37 +5346,37 @@ msgstr ""
 "\n"
 "Pozn.: integrácia 7-Zip je obmedzená na samostatnú (standalone) prevádzku v Nastaveniach WinMerge."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Vyberte súbor pre export"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Vyberte súbor pre import"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Nastavenia importované zo súboru."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Options exportované do súboru."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Nepodarilo sa importova\9d nastavenia zo súboru."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Nepodarilo sa zapísa\9d nastavenia do súboru."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5407,242 +5387,242 @@ msgstr ""
 "\n"
 "Chcete pokraèova\9d?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Chyba regulárneho výrazu"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Bez zhody"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Neplatný regulárny výraz"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Neplatný znak porovnávania"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Neplatný názov triedy znakov"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Spätná lomka na konci"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Neplatný spätný odkaz"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "[ alebo [^ bez náprotivku"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "( alebo \\( bez náprotivku"
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "\\{ bez náprotivku"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Neplatný obsah \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "neplatný koniec rozsahu"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "nedostatok pamäte"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Neplatný predchádzajúci regulárny výraz"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Predèasný koniec regulárneho výrazu"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Regulárny výraz je príli\9a ve¾ký"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr ") alebo \\) bez náprotivku"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Zmie\9aaný"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr ""
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr ""
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr ""
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr ""
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr ""
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr ""
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr ""
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Ulo\9eí súbor v¾avo"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Ulo\9eí súbor vpravo"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Ulo\9eí ¾avý súbor pod názvom..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Ulo\9eí pravý súbor pod názvom..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr ""
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr ""
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr ""
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Prepne medzi re\9eimami upravovania a spájania"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5651,12 +5631,12 @@ msgstr ""
 "Zobrazí a nastaví vlastnosti kódovania súborov\n"
 "Vlastnosti kódovania súborov"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "Otvori\9d a vyrie\9ai\9d súbor konfliktov"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5665,7 +5645,7 @@ msgstr ""
 "Vyberie oblas\9d rozdielu na aktuálnom riadku\n"
 "Rozdiel na aktuálnom riadku"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5674,7 +5654,7 @@ msgstr ""
 "Prejde na riadok alebo rozdiel\n"
 "Prejs\9d na (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5683,7 +5663,7 @@ msgstr ""
 "Nastaví mo\9enosti programu\n"
 "Mo\9enosti"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5692,37 +5672,37 @@ msgstr ""
 "Obnoví zobrazenie\n"
 "Obnovi\9d (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Skopíruje vybrané riadky do schránky s pridaným èíslom riadka na zaèiatok"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Prepne zálo\9eku"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Ide na ïal\9aiu zálo\9eku"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Ide na predo\9alú zálo\9eku"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Vyma\9ee v\9aetky zálo\9eky"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5731,7 +5711,7 @@ msgstr ""
 "Zobrazí polo\9eky, ktoré sú presne rovnaké\n"
 "Zobrazi\9d identické polo\9eky"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5740,7 +5720,7 @@ msgstr ""
 "Zobrazí polo\9eky, ktoré majú rozdiely\n"
 "Zobrazi\9d rozdielne polo\9eky"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5749,7 +5729,7 @@ msgstr ""
 "Zobrazí polo\9eky, ktoré existujú iba na ¾avej strane\n"
 "Zobrazi\9d polo\9eky jedineèné v¾avo"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5758,7 +5738,7 @@ msgstr ""
 "Zobrazí polo\9eky, ktoré existujú iba na pravej strane\n"
 "Zobrazi\9d polo\9eky jedineèné vpravo"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5767,7 +5747,7 @@ msgstr ""
 "Zobrazí binárne súbory\n"
 "Zobrazi\9d binárne súbory"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5776,7 +5756,7 @@ msgstr ""
 "Zobrazí preskoèené polo\9eky\n"
 "Zobrazi\9d preskoèené polo\9eky"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5785,7 +5765,7 @@ msgstr ""
 "Vyberie font pre zobrazenie\n"
 "Font pre zobrazenie"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5794,42 +5774,42 @@ msgstr ""
 "Vráti sa k pou\9eívaniu predvoleného systémového fontu pre zobrazenie\n"
 "Predvolený font"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Zobrazí prázdne znaky"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Prepne panel rozdielov"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Lokaèný panel zobrazí celkový obraz súborov"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Zobrazí dialóg \9atatistika porovnania adresárov"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid "Select the current user interface language\nLanguage"
 msgstr ""
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid "Shows differences inside lines with different colors\nShow Line Difference"
 msgstr ""
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Vymení polohu dvoch panelov"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5838,7 +5818,7 @@ msgstr ""
 "Zobrazí èísla riadkov\n"
 "Zobrazi\9d èísla riadkov"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5847,7 +5827,7 @@ msgstr ""
 "Zapne zalamovanie riadkov na hranici slov\n"
 "Zalamova\9d riadky"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5856,107 +5836,107 @@ msgstr ""
 "Zobrazí okraje výberu v oboch paneloch\n"
 "Zobrazi\9d okraje výberu"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Zväè\9ai\9d ve¾kos\9d písma"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Zmen\9ai\9d ve¾kos\9d písma"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Nastavi\9d písmo na \9atandardnú ve¾kos\9d"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
 msgstr ""
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
 msgstr ""
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
 msgstr ""
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
 msgstr ""
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid "Scroll to the last difference\nLast Difference (Alt+End)"
 msgstr ""
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -5965,7 +5945,7 @@ msgstr ""
 "Skopíruje vybraný text do súboru vpravo\n"
 "Kopírova\9d vpravo (->)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -5974,7 +5954,7 @@ msgstr ""
 "Skopíruje vybraný text do súboru v¾avo\n"
 "Kopírova\9d v¾avo (<-)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -5983,7 +5963,7 @@ msgstr ""
 "Skopíruje rozdiel napravo a prejde na ïal\9aí\n"
 "Skopírova\9d doprava a na ïal\9aí (Ctrl+Alt+vpravo)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -5992,7 +5972,7 @@ msgstr ""
 "Skopíruje rozdiel na¾avo a prejde na ïal\9aí\n"
 "Skopírova\9d do¾ava a na ïal\9aí (Ctrl+Alt+v¾avo)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6001,7 +5981,7 @@ msgstr ""
 "Skopíruje v\9aetky rozdiely do súboru vpravo\n"
 "V\9aetko vpravo"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6010,107 +5990,107 @@ msgstr ""
 "Skopírujde v\9aetky rozdiely do súboru v¾avo\n"
 "V\9aetko v¾avo"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Zma\9ee vybrané polo\9eky z oboch adresárov"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Porovná vybrané polo\9eky (ak sú zvolené viaceré polo\9eky, porovná prvú polo\9eku)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Vyberie a zmení poradie ståpcov pre porovnanie adresárov"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Vytvorí súbor so záplatou"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Vyberie a modifikuje filtre"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Vytvorí správu z výsledkov porovnania"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr ""
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "Pou\9eívate¾ zvolí rozba¾ovací program (bez rozba¾ovania, keï sa otvára adresár)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Rozba¾ovací program sa pou\9eije na oba súbory (pri jednom súbore staèí prípona)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Zvo¾te rozba¾ovací program, ktorým sa bude upravova\9d tento súbor"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Bez predspracovania (be\9ené)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Odporúèané zásuvné moduly"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Iné zásuvné moduly"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Odoberie z pamäte v\9aetky zásuvné moduly a znovu ich naèíta (pre vývojárov)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid "Activates next visible file\nActivate next File"
 msgstr ""
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Zatvorí v\9aetky otvorené okná"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid "Opens the WinMerge Help\nWinMerge Help"
 msgstr ""
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Vypí\9ae aktuálne informácie o verzii a konfigurácii WinMerge do textového súboru"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr ""
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Súkromné zostavenie: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6119,7 +6099,7 @@ msgstr ""
 "Otvorí dokument Poznámky k vydaniu\n"
 "Poznámky k vydaniu"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6128,272 +6108,272 @@ msgstr ""
 "Otvorí webstránku prekladov\n"
 "Preklady"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Nastavenia zásuvných modulov"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Bez preprocesora"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Preprocessing, ak sa dá"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH nenájdené - .sct skripty vypnuté"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<\8eiadny>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Automatické>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Otvorí súbor registrovanou aplikáciou"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Otvorí súbor externým editorom"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Otvorí súbor konkrétnym programom"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Nezobrazuje presunuté bloky"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Zobrazí v\9aetky posunuté bloky"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Zobrazuje presunuté bloky iba z aktuálneho rozdielu"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Ide na rozdiel, ktorý je pod kurzorom"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "Ch&oï na rozdiel %1 z %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "Ch&oï na riadok %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Vypnuté"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Zo súborového systému"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Zo zoznamu nedávno pou\9eitých"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr ""
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Dávkový"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Portable Object"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Zdroje"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr ""
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Skry\9d panel nástrojov"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Zobrazi\9d malý panel nástrojov"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Zobrazi\9d ve¾ký panel nástrojov"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index dd4b306..8f5e8eb 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -1030,7 +1030,7 @@ msgid "&Scripts"
 msgstr "&Skripte"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Prazno >"
@@ -1471,7 +1471,7 @@ msgid "&Versioning System:"
 msgstr "&Versioning System:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Pot do cleartool.exe:"
@@ -1674,7 +1674,7 @@ msgid "Replace &All"
 msgstr "Zamenjaj &vse"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2591,7 +2591,7 @@ msgid "Files:"
 msgstr "Datoteke:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Razlika"
@@ -2628,7 +2628,7 @@ msgid "Right:"
 msgstr "Desno:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Enako"
@@ -2828,7 +2828,7 @@ msgid "A&ppend timestamp"
 msgstr "&Dodaj datum in èas "
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Potrdi kopiranje"
@@ -2906,7 +2906,7 @@ msgstr "Dodaj meni lupine k &raz
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Mapa"
@@ -3546,7 +3546,7 @@ msgid "Version Control"
 msgstr "Version Control"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Razlike"
@@ -3676,87 +3676,67 @@ msgstr "XML datoteke (*.xml)|*.xml|Vse datoteke (*.*)|*.*||"
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Popolna vsebina"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Hitra vsebina"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Spremenjen datum"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Spremenjen datum in velikost"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Velikost"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Ime"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Lokacija"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filtri"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Opis"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Izberite ime datoteke za nov filter"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Datoteke filtrov (*.flt)|*.flt|Vse datoteke (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3769,7 +3749,7 @@ msgstr ""
 "Prosimo, kopirajte datoteko %1 v \"WinMerge/Filters\" mapo:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3782,7 +3762,7 @@ msgstr ""
 "\n"
 "Prosim preverite, èe mapa obstaja in je zapisljiva."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3793,7 +3773,7 @@ msgstr ""
 "\n"
 "Prosim izberite filter mape v Mo\9enosti/Sistem."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3806,12 +3786,12 @@ msgstr ""
 "\n"
 "Morda je datoteka za\9aèitena - samo za branje."
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Poi\9aèi filter datoteko za namestitev"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3822,17 +3802,17 @@ msgstr ""
 "\n"
 "Ni mogoèe kopirati nove filter datoteke v filter mapo."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Filter datoteka \9ee obstaja. Prepi\9aem obstojeèi filter."
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Regularni izraz"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3843,243 +3823,243 @@ msgstr ""
 "\n"
 "Èe jih ne \9eelite osve\9eiti sedaj, lahko izberete Ne in osve\9eite primerjave kasneje."
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "&Pot do SS.EXE:"
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Rezultati primerjanja map"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Primerjanje map"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Levi neimenovan"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Desni neimenovan"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "Njihova datoteka"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "Va\9aa datoteka"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Pregledovanje datoteko ..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Odpiranje izbora"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Kopiraj z leve na desno"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Kopiraj iz desne na levo"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Kopiraj vse na levo"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Kopiraj vse na desno"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Kopiranje datotek ..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Brisanje datotek ..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Premikanje datotek ..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Izdelava poroèila ..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Razveljavi zadnje dejanje ..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "Ponovi zadnje dejanje ..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Vrstica: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Zdru\9ei"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Razlika %1 od %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 najdenih razlik"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "1 najdena razlika"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "SZB"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Predmet %1 od %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Predmetov: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Izberite dve obstojeèi mapi ali datoteki za primerjavo"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Izbira map"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Izberite dve mapi ali dve datoteki za primerjavo."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "Leva pot je neveljavna!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Desna pot je neveljavna!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Obe poti sta neveljavni!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Izberite dve datoteki, da boste omogoèili izbiro pretvornika."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Ne morem primerjati datoteke in mape!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Datoteka ni najdena: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Datoteka ni pretvorjena: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4092,12 +4072,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Ne morem razèleniti konfliktne datoteke."
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4108,32 +4088,32 @@ msgstr ""
 "%1\n"
 "ni konfliktna datoteka."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Shrani kot"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Shrani spremembe v %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 je oznaèena samo za branje. Ali jo kljub temu \9eelite prepisati? ( Ne, za shranjevanje pod novim imenom)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Napaka pri preverjanju mo\9enosti zapisovanja cilja"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Napaka pri shranjevanju arhiva"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4146,7 +4126,7 @@ msgstr ""
 "\n"
 "Vseeno nadaljujem?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4163,7 +4143,7 @@ msgstr ""
 "\t- uporabiti drugaèno ime datoteke (pritisnite V redu)\n"
 "\t- preklicati trenutno operacijo (pritisnite Preklièi)?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4178,7 +4158,7 @@ msgstr ""
 "\n"
 "Ali \9eelite shraniti nezapakirano razlièico v drugo datoteko?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4193,7 +4173,7 @@ msgstr ""
 "\n"
 "Ali \9eelite shraniti nezapakirano razlièico v drugo datoteko?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4208,7 +4188,7 @@ msgstr ""
 "\n"
 "Prepi\9ai spremenjeno datoteko?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4217,7 +4197,7 @@ msgstr ""
 "%1\n"
 "je oznaèena samo za branje. Ali jo kljub temu \9eelite prepisati?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4232,22 +4212,22 @@ msgstr ""
 "\n"
 "Ali \9eelite posodobljeno ponovno nalo\9eiti?"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Shrani levo datoteko kot"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Shrani desno datoteko kot"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid ""
 "The file\n"
@@ -4258,7 +4238,7 @@ msgstr ""
 "%1\n"
 "ne najdem veè. Prosim shranite kopijo datoteke za nadaljevanje."
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4269,42 +4249,42 @@ msgstr ""
 "\n"
 "Prosim, osve\9eite dokumente pred nadaljujete."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Navesti morate pot SourceSafe projekta èe \9eelite nadaljevati (npr: $/MyProject)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "CheckOut datotek iz VSS ..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "Versioning System je vrnil napako medtem ko je posku\9aal dostopati do datoteke. Ni mogoèe nadaljevati ..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Napaka pri izvr\9aevanju Versioning System ukaza."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "VSS delovna mapa in lokacija trenutne datoteke se ne ujemata. Nadaljujem?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Ne morem najti VSS podatkovne baze!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Napaka od VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4315,7 +4295,7 @@ msgstr ""
 "Prosim preverite nastavitvene specifikacije uporabljenega pogleda.\n"
 "Zavrzi pregledno operacijo?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4324,169 +4304,169 @@ msgstr ""
 "Sistem za verzije vraèa napako med preverjanjem datoteke.\n"
 "Prosim preverite nastavitvene specifikacije uporabljenega pogleda"
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Brez"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (manj\9ai od 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 in vi\9aji)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Prelom na praznem znaku"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Prelom na praznem znaku ali loèilu"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Kopiraj izbran predmet v imenovano mapo"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Kopiraj izbran predmet v izbrano mapo"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Izbri\9ai izbran predmet na levi"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Izbri\9ai izbran predmet na desni"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Izbri\9ai izbran(e) predmet(e) na obeh straneh"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Skrij izbran(e) predmet(e) (takoj\9anji filter)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Preimenuj izbran predmet na obeh straneh"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Z desne proti levi (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Z leve proti desni (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Z desne proti levi (%1 od %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Z leve proti desni (%1 od %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Leva do ... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Desna do ... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Leva do ... (%1 od%2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Desna do ... (%1 od%2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Leva (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Desna (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Obe (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Leva (%1 of %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Desna (%1 of %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Obe (%1 of %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Izberite ciljno mapo"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Leva stran - izberite ciljno mapo:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Desna stran - izberite ciljno mapo:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 vpletenih datotek)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 of %2 vpletenih datotek)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4497,17 +4477,17 @@ msgstr ""
 "\n"
 "%1?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Ali ste preprièani da \9eelite kopirati:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Ali ste preprièani, da \9eelite kopirati %d predmetov:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4526,613 +4506,613 @@ msgstr ""
 "\n"
 "Prosim, osve\9eite primerjavo."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "Ali ste preprièani, da \9eelite premakniti:"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "Ali ste preprièani, da \9eelite premakniti: %d predmetov"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "Potrdi premik"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Odpri levo datoteko"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Odpri levo datoteko v zunanjem urejevalniku"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Odpri levo datoteko z ..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Odpri desno datoteko"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Odpri desno datoteko v zunanjem urejevalniku"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Odpri desno datoteko z .."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Ni bilo mogoèe zagnati zunanjega urejevalnika: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Nepoznana konènica datoteke na zunanjem urejevalniku: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Kopiraj imena datotek v odlo\9ei\9aèe"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Kopiraj levo stran poti v odlo\9ei\9aèe"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Kopiraj desno stran poti v odlo\9ei\9aèe"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Kopiraj pot obeh strani v odlo\9ei\9aèe"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr "Levi raz\9airitveni meni"
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr "Desni raz\9airitveni meni"
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Nepoznan format arhiva"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Dodaj predmete iz leve strani v arhiv"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Dodaj predmete iz desne strni v arhiv"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Dodaj predmete obeh strani v arhiv"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Dodaj razliène predmete v arhiv ( obe strani)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Premakni izbrano datoteko na levi v izbrano mapo"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Premakni izbrano datoteko na desni v izbrano mapo "
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Ime datoteke"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Rezultat primerjave"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Levi datum"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Desni datum"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Konènica"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Leva velikost"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Desna velikost"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Desna velikost (kratko)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Leva velikost (kratko)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Datum nastanka leve datoteke"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Datum nastanka desne datoteke"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Novej\9aa datoteka"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Verzija leve datoteke"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Verzija desne datoteke"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Kratek rezultat"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Levi atributi"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Desni atributi"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "Znake za konec vrstice (EOL) na levi datoteki"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "Znake za konec vrstice (EOL) na desni datoteki"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Kodiranje levo"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Kodiranje desno"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Zanemarjene razlike."
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binarno"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Nisem mogel primerjati datotek"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Pregled predmeta prekinjen"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Preskoèena datoteka"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Preskoèena mapa"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Samo leva: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Samo desna: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Binarni datoteki sta enaki"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Binarni datoteki sta razlièni"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Datoteki sta razlièni"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr "Mapi sta razlièni"
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Samo leva"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Samo desna"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Napaka"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr "Tekstovni datoteki sta enaki"
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr "Tekstovni datoteki sta razlièni"
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Minilo je: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 predmet oznaèen"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 predmetov oznaèenih"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Ime datoteke ali mape"
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Imena podmap ko so vkljuèene podmape."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Rezultat primerjave, dolga oblika."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Datum spremembe datoteke na levi strani."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Datum spremembe datoteke na desni strani."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Datoteèna konènica."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Velikost leve datoteke v bajtih."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Velikost desne datoteke v bajtih."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Skraj\9aana velikost leve datoteke."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Skraj\9aana velikost desne datoteke."
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Datum nastanka na levi strani."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Datum nastanka na desni strani."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Pove katera stran ni \9ae nikoli modificirala datuma"
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Verzija leve datoteke, samo za nekatere datoteène tipe."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Verzija desne datoteke, samo za nekatere datoteène tipe."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Kratki rezultati primerjave."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Atributi leve strani."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Atributi desne strani."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Tip znakov za konec vrstice (EOL) na levi datoteki"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Tip znakov za konec vrstice (EOL) na desni datoteki"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Kodna stran leve strani."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Kodna stran desne strani."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "\8atevilo ignoriranih razlik v datoteki. Te razlike program WinMerge ignorira in ne morejo biti zdru\9eene."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "\8atevilo razlik v datoteki. Ta \9atevilka ne vsebuje ignoriranih razlik."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Prika\9ee zvezdico (*) èe je datoteka binarna"
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Primerjaj %1 z %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Seznam, loèen z vejicami"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Seznam, loèen s tabulatorji"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "Enostavni HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "Enostavni XML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Datoteka s poroèilom \9ee obstaja. Ali jo \9eelite prepisati?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5141,32 +5121,32 @@ msgstr ""
 "Napaka med ustvarjanjem poroèila:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Poroèilo je bilo uspe\9ano izdelano."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Ista datoteka je odprta v obeh okvirih"
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Izbrani datoteki sta enaki."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Pri\9alo je do napake med primerjanjem datotek"
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Zaèasne datoteko ne morejo biti ustvarjene. Preverite nastavitve za va\9ao pot zanje (PATH)."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5181,7 +5161,7 @@ msgstr ""
 "\n"
 "Opomba: Èe jih \9eelite vedno obravnavati kot enake, nastavite mo\9enost 'Prezri razliènost tipa znakov za zakljuèke vrstic (EOL)' na listièu Primerjave dialoga nastavitev (dostopen pod Urejanje/Nastavitve)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5192,22 +5172,22 @@ msgstr ""
 "S trenutno nastavitvijo, bodo poenotene v glavnem tipu.\n"
 "Ali \9eelite spremeniti mo\9enosti in ohraniti razliène zakljuèke vrstic?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Pojavila se je napaka med predpregledom razlik datoteke '%1' z raz\9airitvijo '%2'. Predpregled razlik se ne bo veè izvajal."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "Izbrana mapa ni veljavna."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "V urejevalniku ne morem odpreti binarne datoteke."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5222,7 +5202,7 @@ msgstr ""
 "%1\n"
 "na drugi strani in jo odpreti?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5233,148 +5213,148 @@ msgstr ""
 "Prikaz posamezne datoteke v svoji kodni tabeli bo omogoèilo bolj\9ai prikaz, a zdru\9eevanje/kopiranje bo nevarno.\n"
 "Ali \9eelite obravnavati obe datoteki kot da sta v isti privzeti windows kodni tabeli (priporoèljivo)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Opozorilo: Datoteki uporabljata razlièni kodiranji, levo=%s in desno=%s. Zdru\9eevanje lahko povzroèi izgubo informacije."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Informacija izgubljena pri kodiranju: Obe datatoteki"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Ni razlik"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Razlika v vrstici"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Zamenjan %1 niz(i)."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Ne morem najti niza \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Kopiraj celotno pot"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Kopiraj ime datoteke"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Polo\9eajni okvir"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Okvir razlik"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Datoteka s popravki je bila uspe\9ano zapisana"
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. predmet ni najden ali pa je mapa"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. predmet ni najden ali pa je mapa"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Datoteka s popravki \9ee obstaja. Jo \9eelite prepisati?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 izbranih datotek]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Normalno"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Pomen"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Poenoteno"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Ne morem pisati v datoteko %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Navedena izhodna pot ni absolutna pot: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Doloèite izhodno datoteko"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Iz binarnih datotek ne morem izdelati datoteke s popravki."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Iz map ne morem izdelati datoteke s popravki."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5385,17 +5365,17 @@ msgstr ""
 " \n"
 "Izdelava datoteke s popravki zahteva, da so vse datoteke predhodno shranjene."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Mapa ne obstaja"
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Trenutni rezultati primerjave map bodo izbrisani"
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5406,7 +5386,7 @@ msgstr ""
 "Vseh potrebnih komponent (7-zip in/ali Merge7z*.dll) za to ne morem najti.\n"
 "Za veè informacij poglejte v rubriko pomoè o podpori arhivskih datotek in kako jo omogoèiti."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5415,7 +5395,7 @@ msgstr ""
 "\n"
 "Sporoèilo: 7-Zip integracija je onemogoèena v WinMerge nastavitvah."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5424,37 +5404,37 @@ msgstr ""
 "\n"
 "Sporoèilo: 7-Zip funkcionalnost je omejena na samostojno operacijo v WinMerge nastavitvah."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Izberite datoteko za izvoz"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Izberite datoteko za uvoz"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Mo\9enosti uvo\9eene iz datoteke"
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Mo\9enosti izvo\9eene v datoteko"
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Uva\9eanje mo\9enosti iz datoteke ni uspelo"
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Izva\9eanje mo\9enosti v datoteko ni uspelo"
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5465,242 +5445,242 @@ msgstr ""
 "\n"
 "Ali \9eelite nadaljevati?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Napaka regularnega izraza"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Ni ujemanja"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Neveljaven regularni izraz"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Neveljaven nadomestni znak"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Neveljaven znak imena klase"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Leva po\9aevnica: \"\""
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Neveljavno zadnje priporoèilo"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Neujemajoèe [ ali [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Neujemajoèe ( ali \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Neujemajoèe \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Neveljavna vsebina \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Nepravilno konèno obmoèje"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Pomanjkanje pomnilnika"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Napaèen predhodni regularni izraz"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Predèasen konec regularnega izraza"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Regularni izraz je prevelik"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Neujemajoèe ) ali \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Me\9aano"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr "B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr "KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr "MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr "GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Tip"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "Pretvornik"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr "Predpregled razlik"
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "Script urejevalnika"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Shrani levo datoteko"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Shrani desno datoteko"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Shrani levo datoteko z imenom.."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Shrani desno datoteko z imenom ..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Pretvori znake za konec vrstice (EOL) v Windows naèin"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Pretvori znake za konec vrstice (EOL) v Unix naèin"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Pretvori znake za konec vrstice (EOL) v Mac naèin"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Preklopi med urejevalnim in zdru\9eevalnim naèinom"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5709,12 +5689,12 @@ msgstr ""
 "Prika\9ei in nastavi lastnosti datoteènega kodiranja\n"
 "Datoteène lastnosti kodiranja"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "Odpri in razre\9ai konfliktno datoteko"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5723,7 +5703,7 @@ msgstr ""
 "Izberi razlièna polja v izbrani vrstici\n"
 "Razlike v izbrani vrstici."
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5732,7 +5712,7 @@ msgstr ""
 "Pojdi na vrstico razlike\n"
 "Pojdi na (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5741,7 +5721,7 @@ msgstr ""
 "Nastavi mo\9enosti programa\n"
 "Mo\9enosti "
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5750,37 +5730,37 @@ msgstr ""
 "Osve\9ei prikaz\n"
 "Osve\9ei (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Kopiraj izbrane vrstico v odlo\9ei\9aèe z dodajanjem \9atevilk vrstic na zaèetku vrstice"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Preklopi med oznakami"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Pojdi na naslednjo oznako"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Pojdi na prej\9anjo oznako"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Poèisti vse oznake"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5789,7 +5769,7 @@ msgstr ""
 "Prika\9ei predmete, ki so popolnoma enaki\n"
 "Prika\9ei enake predmete"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5798,7 +5778,7 @@ msgstr ""
 "Prika\9ei predmete, ki se razlikujeta\n"
 "Prika\9ei razliène predmete"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5807,7 +5787,7 @@ msgstr ""
 "Prika\9ei predmete, ki obstajajo samo na levi strani\n"
 "Prika\9ei leve unikatne predmete"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5816,7 +5796,7 @@ msgstr ""
 "Prika\9ei predmete, ki obstajajo samo na desni strani\n"
 "Prika\9ei desne unikatne predmete"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5825,7 +5805,7 @@ msgstr ""
 "Prikazovanje binarnih datotek\n"
 "Prika\9ei binarne datoteke"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5834,7 +5814,7 @@ msgstr ""
 "Prikazovanje preskoèenih predmetov\n"
 "Prika\9ei preskoèene predmete"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5843,7 +5823,7 @@ msgstr ""
 "Izberite pisavo za pogled\n"
 "Izberite pogled pisave"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5852,27 +5832,27 @@ msgstr ""
 "Vraèanje na uporabo privzete sistemske pisave pogled\n"
 "Privzeta pisava"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Prika\9ei prazne znake"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Preklopi na drug okvir razlik"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Polo\9eajni okvir prikazuje polo\9eaj razlike v datoteki"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Prika\9ei primerjalno mapo statistiènega okna"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5881,7 +5861,7 @@ msgstr ""
 "Izberite trenutni uporabni\9aki jezik vmesnika\n"
 "Jezik"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5890,12 +5870,12 @@ msgstr ""
 "Prika\9ei razlike znotraj vrstic z razliènimi barvami\n"
 "Prika\9ei vrstiène razlike"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Zamenjaj pozicije okvirov med seboj"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5904,7 +5884,7 @@ msgstr ""
 "Prika\9ei \9atevilke vrstic\n"
 "Prikaz \9atevilke vrstic"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5913,7 +5893,7 @@ msgstr ""
 "Omogoèi prelom vrstic\n"
 "Prelom vrsrtic"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5922,22 +5902,22 @@ msgstr ""
 "Prika\9ei izbiro robov za oba okvira\n"
 "Prika\9ei izbrane robove"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Poveèaj pisavo besedila"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Zmanj\9aaj pisavo besedila"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Ponastavi poveèavo besedila na privzeto velikost"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5946,7 +5926,7 @@ msgstr ""
 "Skoèi na prej\9anjo razliko\n"
 "Prej\9anja razlika (Alt+up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5955,67 +5935,67 @@ msgstr ""
 "Skoèi na naslednjo razliko \n"
 "Naslednja razlika (Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -6024,7 +6004,7 @@ msgstr ""
 "Skoèi na prvo razliko\n"
 "Prva razlika (alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6033,7 +6013,7 @@ msgstr ""
 "Pojdi na trenutno razliko\n"
 "Trenutna razlika (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6042,7 +6022,7 @@ msgstr ""
 "Pojdi na zadnjo tazliko\n"
 "Zadnja razlika (alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6051,7 +6031,7 @@ msgstr ""
 "Kopiraj izbrano besedilo v desno datoteko\n"
 "Kopiraj desno(Alt+Right)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6060,7 +6040,7 @@ msgstr ""
 "Kopiraj izbrano besedilo v levo datoteko\n"
 "Kopiraj levo(Alt+Left)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6069,7 +6049,7 @@ msgstr ""
 "Kopiraj razliko na desno in se pomakni na naslednjo\n"
 "Kopiraj Desno in pomakni (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6078,7 +6058,7 @@ msgstr ""
 "Kopiraj razliko na levo in se pomakni na naslednjo\n"
 "Kopiraj levo in pomakni(Ctrl+Ald+left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6087,7 +6067,7 @@ msgstr ""
 "Kopiraj vse razlike v desno datoteko \n"
 "Vse v desno"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6096,77 +6076,77 @@ msgstr ""
 "Kopiraj vse razlike v levo datoteko\n"
 "Vse v levo"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Izbri\9ai izbrane predmete iz obeh map"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Primerjaj izbrane predmete (primerjaj prvega, èe jih je izbranih veè)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Izberi in ponovno razvrsti mape primerjalnih stolpcev"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Izdelaj datoteko s popravki"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Izberi in spremeni filtre"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Izdelaj poroèilo iz rezultatov primerjave"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "Prika\9ei seznam raz\9airitev, ki so na voljo"
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "Uporabnik izbere pretvornik (brez pretvarjanja med primerjanjem map)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Izbran pretvornik je uporabljen na obeh datotekah (samo ena datoteka potrebuje konènico)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Izberite pretvornik za urejanje te datoteke"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Brez predpregleda razlik (obièajno)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Priporoèene raz\9airitve"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Ostale raz\9airitve"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Ponovno nalo\9ei vse raz\9airitve (za razvijalce)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6175,12 +6155,12 @@ msgstr ""
 "Aktivira naslednjo vidno datoteko\n"
 "Aktiviraj naslednjo datoteko"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Zapri vsa odprta okna"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6189,22 +6169,22 @@ msgstr ""
 "Odpre WinMerge Pomoè\n"
 "WinMerge Pomoè"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Zapi\9ai verzijo programa WinMerge in nastavitve v tekstovno datoteko"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "Prika\9ei GNU javno licenco"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Zasebna gradnja:%1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6213,7 +6193,7 @@ msgstr ""
 "Odpri dokument z opombami izdaje\n"
 "Opombe izdaje"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6222,272 +6202,272 @@ msgstr ""
 "Odpri spletno stran za prevode\n"
 "Prevodi"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Nastavitve raz\9airitev"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Brez predpregleda razlik"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Predpregled razlik, èe je mogoèe"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH ni najden - .sct skripte onemogoèene"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Niè>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Samodejno>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Odpri datoteko z registrirano aplikacijo "
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Odpri datoteko z zunanjim urejevalnikom"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Odpri datoteko z doloèenim programom"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Ne prikazuj premaknjenih blokov"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Prika\9ei vse premaknjene bloke"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Prika\9ei premaknjene bloke samo iz trenutnih razlik"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Pojdi na razliko pod kazalcem"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "Pojdi &na razliko %1 od %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "Pojdi &na vrstico %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Onemogoèeno"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Iz datoteènega sistema"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "IZ MRU seznama"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "Brez osvetljevanja"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Paket (Batch)"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Portable Object"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Resources"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr "Verilog"
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Skrij orodno vrstico"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Poka\9ei malo orodno vrstico"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Poka\9ei veliko orodno vrstico"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index afe3720..db80e72 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -1031,7 +1031,7 @@ msgid "&Scripts"
 msgstr "Scri&pts"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Vacío >"
@@ -1472,7 +1472,7 @@ msgid "&Versioning System:"
 msgstr "Sistema de &versionado:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Ruta a cleartool.exe:"
@@ -1673,7 +1673,7 @@ msgid "Replace &All"
 msgstr "Reempl. Tod&o"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2589,7 +2589,7 @@ msgid "Files:"
 msgstr "Archivos:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Diferentes"
@@ -2626,7 +2626,7 @@ msgid "Right:"
 msgstr "Derecha:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Iguales"
@@ -2826,7 +2826,7 @@ msgid "A&ppend timestamp"
 msgstr "Agregar &fecha"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Confirmar copia"
@@ -2904,7 +2904,7 @@ msgstr "&Agregar al men
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Carpeta"
@@ -3544,7 +3544,7 @@ msgid "Version Control"
 msgstr "Control de Versiones"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Diferencias"
@@ -3673,87 +3673,67 @@ msgstr "Archivos XML (*.xml)|*.xml|Todos los archivos (*.*)|*.*||"
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Todo el contenido"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Contenido rápido"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Fecha de modificación"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Fecha de modificación y Tamaño"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Tamaño"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Nombre"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Ubicación"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filtos"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Descripción"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Seleccione nombre de archivo para el nuevo filtro"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Archivo de filtros (*.flt)|*.flt|Todos los archivos(*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3766,7 +3746,7 @@ msgstr ""
 "Por favor copie el archivo %1 a la carpeta WinMerge/Filters:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3779,7 +3759,7 @@ msgstr ""
 "\n"
 "Por favor, compruebe que la carpeta existe y que tiene permisos de escritura en ella."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3790,7 +3770,7 @@ msgstr ""
 "\n"
 "Por favor, seleccione la carpeta de filtros en Configuración/Sistema."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3803,12 +3783,12 @@ msgstr ""
 "\n"
 "¿Quiza el archivo es de solo lectura?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Seleccione el archivo de filtros a instalar."
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3819,17 +3799,17 @@ msgstr ""
 "\n"
 "No se pudo copiar el archivo de filtros a la carpeta de filtros."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "El archivo de filtros ya existe. ¿Desea sobreescribirlo?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Expresión regular"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3840,243 +3820,243 @@ msgstr ""
 "\n"
 "Si no quiere actualizar todas las comparaciones puede elegir No y actualizar las comparaciones después."
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "R&uta a SS.EXE:"
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Resultado de la comparación de carpetas"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Comparación de archivos"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Sin título izquierda"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Sin título derecha"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "Archivo externo"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "Archivo interno"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Escaneando archivos..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Abriendo la selección"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Copiando lado Izquierdo a lado Derecho"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Copiando lado Derecho a lado Izquierdo"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Copiando todo al lado Izquierdo"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Copiando todo al lado Derecho"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Copiando archivos..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Eliminando archivos..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Moviendo archivos..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Creando el informe..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Deshaciendo la última operación..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "Rehaciendo la operación anterior..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Línea: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Combinar"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Diferencia %1 de %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 Diferencias encontradas"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "1 Diferencia encontrada"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "SL"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Archivo %1 de %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Elementos: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Seleccione dos carpetas o archivos existentes a comparar"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Selección de carpeta"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Seleccione dos carpetas o archivos a comparar."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "¡La ruta del lado Izquierdo no es válida!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "¡La ruta del lado Derecho no es válida!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "¡Ninguna ruta es válida!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Elija dos archivos para habilitar selección de desempaquetador."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "¡Imposible comparar un archivo y una carpeta!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Archivo no encontrado: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Archivo no desempaquetado: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4089,12 +4069,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Falló al corregir archivo conflictivo."
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4105,32 +4085,32 @@ msgstr ""
 "%1\n"
 "no es conflictivo."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Guardar Como"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "¿Guardar los cambios a %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 es de sólo lectura. Desea sobreescribirlo de modos modos ? (No salvarlo con un nuevo nombre.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Error comprobando la posibilidad de escritura en destino"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Error haciendo copia de seguridad del archivo"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4143,7 +4123,7 @@ msgstr ""
 "\n"
 "¿Continuar de todas formas?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4160,7 +4140,7 @@ msgstr ""
 "\t-usar un nombre diferente (Aceptar)\n"
 "\t-cancelar la operación (Cancelar)"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4175,7 +4155,7 @@ msgstr ""
 "\n"
 "¿Desea guardar la versión sin empaquetar en otro archivo?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4190,7 +4170,7 @@ msgstr ""
 "\n"
 "¿Desea guardar la versión sin empaquetar en otro archivo?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4205,7 +4185,7 @@ msgstr ""
 "\n"
 "¿Desea sobreescribir el archivo cambiado?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4214,7 +4194,7 @@ msgstr ""
 "%1\n"
 "es de sólo lectura. ¿Desea sobreescribirlo de todos modos?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4229,22 +4209,22 @@ msgstr ""
 "\n"
 "¿Desea recargar el archivo?"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Guardar lado izquierdo como"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Guardar lado derecho como"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid ""
 "The file\n"
@@ -4255,7 +4235,7 @@ msgstr ""
 "%1\n"
 "ha desaparecido. Por favor, guarde una copia del archivo para continuar."
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4266,42 +4246,42 @@ msgstr ""
 "\n"
 "Actualize los documentos antes de continuar."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Debe especificar la ruta del proyecto de SourceSafe para continuar (ej. $/MiProyecto)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Desproteger archivos de VSS..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "El sistema de versionado devolvío un error mientras trataba de desproteger el archivo.  Imposible continuar..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Error ejecutando el comando del sistema de versionado."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "La carpeta de trabajo de VSS y la ubicación del archivo actual no coinciden. ¿Continuar?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "¡No se encontraron base(s) de datos de VSS!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Error de VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4312,7 +4292,7 @@ msgstr ""
 " Por favor, compruebe la configuración de la vista utilizada.\n"
 " ¿Desea deshacer la desprotección?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4321,169 +4301,169 @@ msgstr ""
 "El sistema de versionado devolvió un error cuando se intentaba deshacer la desprotección del archivo.\n"
 " Por favor, compruebe la configuración de la vista utilizada. "
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Ninguno"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (menor que 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 y superior)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Detener en espacio en blanco"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Detener en espacio en blanco o puntuación"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Copiar elemento seleccionado a la carpeta"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Copiar elemento seleccionado a la carpeta elegida"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Eliminar elemento selecionado del lado izquierdo"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Eliminar elemento selecionado del lado derecho"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Eliminar elementos seleccionados de ambos lados"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Ocultar elementos seleccionados (filtro al vuelo)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Renombrar el elemento seleccionado en ambos lados"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Lado derecho a lado izquierdo (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Lado izquierdo a lado derecho (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Lado derecho a lado izquierdo (%1 de %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Lado izquierdo a lado derecho (%1 de %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Lado izquierdo a... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Lado derecho a... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Lado izquierdo a... (%1 de %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Lado derecho a... (%1 de %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Lado izquierdo (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Lado derecho (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Ambos lados (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Lado izquierdo (%1 de %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Lado derecho (%1 de %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Ambos lados (%1 de %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Seleccione carpeta de destino"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Izquierda - Seleccione carpeta destino:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Derecha - Seleccione carpeta destino:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 Archivos Afectados)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 de %2 Archivos Afectados)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4494,17 +4474,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Está seguro de copiar:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Está seguro de copiar %d elementos:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4523,613 +4503,613 @@ msgstr ""
 "\n"
 "Por favor actualice la comparación."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "Está seguro de mover:"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "Está seguro de mover %d elementos:"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "Confirmar Movimiento"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Abrir archivo del lado izquierdo"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Abrir archivo del lado izquierdo con editor externo"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Abrir archivo del lado izquierdo con..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Abrir archivo del lado derecho"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Abrir archivo del lado derecho con editor externo"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Abrir archivo del lado derecho con..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Error al ejecutar editor externo: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Extension del editor externa desconocida: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Copiar nombres de archivo al portapapeles"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Copiar rutas del lado izquierdo al portapapeles"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Copiar rutas del lado derecho al portapapeles"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Copiar rutas del ambos lados al portapapeles"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr "Menú Izquierda"
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr "Menú Derecha"
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Formato de archivo desconocido"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Agregar elementos del lado izquierdo al archivo"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Agregar elementos del lado derecho al archivo"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Agregar elementos de ambos lados al archivo"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Agregar elementos diferentes al archivo (ambos lados)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Seleccionar carpeta donde mover archivo selecionado del lado izquierdo"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Seleccionar carpeta donde mover archivo selecionado del lado derecho"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Nombre"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Resultado"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Fecha izq."
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Fecha dcha."
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Extensión"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Tamaño izq."
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Tamaño dcha."
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Tamaño dcha. (Corto)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Tamaño izq. (Corto)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Fecha de creacion izq."
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Fecha de creacion dcha."
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Archivo más reciente"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Versión archivo izq."
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Versión archivo dcha."
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Resultados abreviados"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Atributos izq."
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Atributos dcha."
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "EOL izq."
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "EOL dcha."
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Codificación izq."
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Codificación dcha."
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Difs. ignoradas"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binario"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "No se pueden comparar los archivos"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Elemento cancelado"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Archivo omitido"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Carpeta omitida"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Sólo Izquierda: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Sólo Derecha: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Los archivos binarios son iguales"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Los archivos binarios son diferentes"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Los archivos son diferentes"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr "Las carpetas son diferentes"
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Sólo Izquierda"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Sólo Derecha"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Error"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr "Los archivos son iguales"
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr "Los archivos son diferentes"
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Tiempo transcurrido: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 elemento seleccionado"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 elementos seleccionados"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Nombre de archivo o carpeta."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Nombre de subcarpeta cuando se incluyen las subcarpetas."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Resultados de la comparacion, formato largo."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Fecha de modificación del archivo del lado izquierdo."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Fecha de modificación del archivo del lado derecho."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Extensión del archivo."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Tamaño del archivo del lado izquierdo en bytes."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Tamaño del archivo del lado derecho en bytes."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Tamaño del archivo del lado izquierdo abreviado."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Tamaño del archivo del lado derecho abreviado."
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Fecha de creación del archivo del lado izquierdo."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Fecha de creación del archivo del lado derecho."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Indica que lado tiene la fecha de modificación más reciente."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Versión del archivo del lado izquierdo, sólo para algunos tipos de archivo."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Versión del archivo del lado derecho, sólo para algunos tipos de archivo."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Resultados de la comparación abreviados."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Attributos del archivo del lado izquierdo."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Attributos del archivo del lado derecho."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Tipo de EOL del archivo del lado izquierdo."
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Tipo de EOL del archivo del lado derecho."
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Codificación del lado izquierdo."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Codificación del lado derecho."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Número de diferencias ignoradas en el archivo. Estas diferencias son ignoradas por WinMerge y no se pueden combinar."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Número de diferencias en el archivo. Este número no incluye las diferencias ignoradas."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Muestra un asterisco (*) si el archivo es binario."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Comparar %1 con %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Lista separada por comas"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Lista separada por tabuladores"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "HTML Simple"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "XML Simple "
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "El archivo de informe ya existe. ¿Desea sobreescribir el archivo?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5138,32 +5118,32 @@ msgstr ""
 "Error al crear el informe:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "El informe se ha creado correctamente."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "El mismo archivo está abierto en ambos paneles."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Los archivos seleccionados son iguales"
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Ocurrió un error cuando se estaban comparando los archivos"
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Los archivos temporales no se pudieron crear. Compruebe su ruta para archivos temporales."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5178,7 +5158,7 @@ msgstr ""
 "\n"
 "Nota: si desea tratar siempre todos los tipos de saltos de línea como equivalentes, seleccione la opción 'Ignorar saltos de línea diferentes..' en la pestaña Comparar del dialogo Configuración (disponible en Editar/Configuración)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5189,22 +5169,22 @@ msgstr ""
 " Con la configuración actual, serán unificados al tipo principal.\n"
 " ¿Desea cambiar las opciones y preservar los EOL diferentes?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Ocurrió un error mientras se precomparaba el archivo '%1' con el plugin '%2'. La precomparación no será aplicada de nuevo."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "La carpeta seleccionada no es válida."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "No se puede abrir un archivo binario en el editor."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5219,7 +5199,7 @@ msgstr ""
 "%1\n"
 "al otro lado y abrir éstas carpetas?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5230,148 +5210,148 @@ msgstr ""
 "Mostrar cada archivo en su página de códigos dará una mejor visualización, pero combinar/copiar sería peligroso.\n"
 "¿Le gustaría tratar ambos archivos con la página de códigos predeterminada de windows (recomendado)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Atención: los archivos utilizan codificaciones diferentes, izquierdo=%s y derecho=%s, y la combinación podría provocar perdida de información."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Información perdida debido a errores de codificación: ambos archivos"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "No hay diferencia"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Diferencia de línea"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Reemplazada(s) %1 cadena(s)."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Imposible encontrar la cadena \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Copiar ruta completa"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Copiar nombre de archivo"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Panel de ubicación"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Panel de diferencias"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Archivo de corrección escrito correctamente."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. ¡elemento no encontrado o es una carpeta!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. ¡elemento no encontrado o es una carpeta!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "El archivo de corrección ya existe. ¿Desea sobreescribirlo?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 archivo(s) selecionado(s)]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Contexto"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Unificado"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "No se pudo escibir en el archivo %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "La ruta de salida especificada no es absoluta: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Especifique un archivo de salida"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "No se puede crear un archivo de corrección a partir de un archivo binario."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "No se puede crear un archivo de corrección a partir de una carpeta."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5382,17 +5362,17 @@ msgstr ""
 "\n"
 "Crear una corrección requiere que no haya cambios pendientes de ser guardados."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "La carpeta no existe."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Los resultados de comparación de carpetas actuales serán eliminados."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5403,7 +5383,7 @@ msgstr ""
 "Los componentes necesarios(7-zip y/o Merge7z*.dll) para el archivo no están disponibles.\n"
 "Vea el manual para más información acerca del soporte de archivos y cómo habilitarlo."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5412,7 +5392,7 @@ msgstr ""
 "\n"
 "Nota: La integración con 7-Zip está deshabilitada en la configuracion de WinMerge."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5421,37 +5401,37 @@ msgstr ""
 "\n"
 "Nota: La integración con 7-Zip está restringida a operación en solitario en la configuracion de WinMerge."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Seleccione archivo a exportar"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Seleccione archivo a importar"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Configuración importada del archivo."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Configuración exportada al archivo."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Fallo al importar la configuración del archivo."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Fallo al exportar la configuración al archivo."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5462,242 +5442,242 @@ msgstr ""
 "\n"
 "¿Desea continuar?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Error en expresión regular"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "No hay coincidencias"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Expresión regular no válida."
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Carácter de intercalación no válido."
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Nombre de clase de carácter inválida"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Barra invertida"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Referencia trasera inválida"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Falta carácter final de [ o [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Falta carácter final de ( o \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Falta carácter final de \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Contenido no válido en \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Fin de rango no válido"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Memoria insuficiente"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Expresión regular precedente no válida"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Fin de expresión regular prematuro"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Expresión regular demasiado grande"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Falta carácter inicial de ) o \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Mezclado"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Tipo"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "Descompactador"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr "Precomparación"
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "Editor de script"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Guardar el archivo del lado izquierdo"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Guardar el archivo del lado derecho"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Guardar el archivo del lado izquierdo como..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Guardar el archivo del lado derecho como..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Convertir EOL a formato Windows"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Convertir EOL a formato Unix"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Convertir EOL a formato Mac"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Cambiar entre modo edición y modo combinación"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5706,12 +5686,12 @@ msgstr ""
 "Ver y ajustar propiedades de codificación del archivo\n"
 "Propiedades de codificación del archivo"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "Abrir y corregir archivo conflictivo"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5720,7 +5700,7 @@ msgstr ""
 "Selecciona el área diferente de la línea actual\n"
 "Diferencias de línea actual"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5729,7 +5709,7 @@ msgstr ""
 "Ir a línea o diferencia\n"
 "Ir a (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5738,7 +5718,7 @@ msgstr ""
 "Configurar las opciones del programa\n"
 "Configuración"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5747,37 +5727,37 @@ msgstr ""
 "Actualizar la pantalla\n"
 "Actualizar (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Copiar las líneas seleccionadas al portapapeles añadiendo números de línea al principio de cada una de ellas"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Alternar marcador"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Ir al siguiente marcador"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Ir al marcador anterior"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Quitar todos los marcadores"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5786,7 +5766,7 @@ msgstr ""
 "Muestra los elementos que son exactamente iguales\n"
 "Mostrar elementos iguales"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5795,7 +5775,7 @@ msgstr ""
 "Muestra los elementos que tienen diferencias\n"
 "Mostrar elementos diferentes"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5804,7 +5784,7 @@ msgstr ""
 "Muestra los elementos que existen solo en la parte izquierda\n"
 "Mostrar elementos únicos en lado izquierdo"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5813,7 +5793,7 @@ msgstr ""
 "Muestra los elementos que existen sólo en la parte derecha\n"
 "Mostrar elementos únicos en lado derecho"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5822,7 +5802,7 @@ msgstr ""
 "Muestra los archivos binarios\n"
 "Mostrar archivos binarios"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5831,7 +5811,7 @@ msgstr ""
 "Muestra los elementos ignorados durante la comparación\n"
 "Mostrar elementos ignorados"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5840,7 +5820,7 @@ msgstr ""
 "Seleccione la fuente\n"
 "Seleccionar fuente"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5849,27 +5829,27 @@ msgstr ""
 "Usar la fuente del sistema\n"
 "Fuente predeterminada"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Muestra los espacios en blanco"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Muestra el panel de diferencias"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Muestra el panel de ubicación con una imagen global de los archivos"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Muestra el diálogo de estadísticas de comparación de carpetas"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5878,7 +5858,7 @@ msgstr ""
 "Permite seleccionar el idioma de la interfaz de usuario\n"
 "Idioma"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5887,12 +5867,12 @@ msgstr ""
 "Muestra las diferencias en las líneas en un color diferente\n"
 "Mostrar diferencias de línea"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Intercambia la posición de los dos paneles"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5901,7 +5881,7 @@ msgstr ""
 "Muestra los números de línea\n"
 "Mostrar números de línea"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5910,7 +5890,7 @@ msgstr ""
 "Ajusta la longitud de las líneas al ancho del panel\n"
 "Ajuste de línea"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5919,22 +5899,22 @@ msgstr ""
 "Muestra los márgenes en ambos paneles\n"
 "Mostrar los márgenes"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Aumentar tamaño de texto"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Disminuir tamaño de texto"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Restablecer el zoom de texto al tamaño predeterminado"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5943,7 +5923,7 @@ msgstr ""
 "Ir a la diferencia anterior\n"
 "Diferencia anterior (Alt Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5952,67 +5932,67 @@ msgstr ""
 "Ir a la diferencia siguiente\n"
 "Diferencia siguiente (Alt Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -6021,7 +6001,7 @@ msgstr ""
 "Ir a la primer diferencia\n"
 "Primera diferencia (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6030,7 +6010,7 @@ msgstr ""
 "Ir a la diferencia actual\n"
 "Diferencia actual (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6039,7 +6019,7 @@ msgstr ""
 "Ir a la última diferencia\n"
 "Última diferencia (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6048,7 +6028,7 @@ msgstr ""
 "Copiar el texto seleccionado al lado derecho\n"
 "Copiar a la derecha (Alt Derecha)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6057,7 +6037,7 @@ msgstr ""
 "Copiar el texto seleccionado al lado izquierdo\n"
 "Copiar a la izquierda (Alt Izquierda)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6066,7 +6046,7 @@ msgstr ""
 "Copiar diferencia al lado derecho e ir a la siguiente\n"
 "Copiar a la derecha y avanzar (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6075,7 +6055,7 @@ msgstr ""
 "Copiar diferencia al lado izquierdo e ir a la siguiente\n"
 "Copiar a la izquierda y avanzar (Ctrl+Alt+Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6084,7 +6064,7 @@ msgstr ""
 "Copiar todas las diferencias al lado derecho\n"
 "Todas a la derecha"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6093,77 +6073,77 @@ msgstr ""
 "Copiar todas las diferencias al lado izquierdo\n"
 "Todas a la izquierda"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Elimina los elementos seleccionados de ambas carpetas"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Compara el elemento seleccionado (compara el primero si hay múltiples elementos seleccionados)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Seleccionar y reordenar las columnas de la comparación de carpetas"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Generar un archivo de corrección"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Seleccionar y modificar filtros"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Genera un informe con los resultados de la comparación"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "Mostrar una lista de plugins disponibles"
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "El usuario selecciona el desempaquetador (no se desempaqueta cuando se comparan carpetas)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "El desempaquetador elegido se aplica a ambos archivos (sólo un archivo necesita tener la extensión)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Seleccione un desempaquetador para editar éste archivo"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Sin precomparación (normal)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Plugins sugeridos"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Otros plugins"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Descargar todos los plugins y actualizarlos (para desarrolladores)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6172,12 +6152,12 @@ msgstr ""
 "Cambia al siguiente archivo visible\n"
 "Cambia al siguiente archivo"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Cierra todas las ventanas abiertas"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6186,22 +6166,22 @@ msgstr ""
 "Abre la Ayuda de WinMerge\n"
 "Ayuda de WinMerge"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Escribe la información de la versión actual de Winmerge y la configuración a un archivo de texto"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "Muestra la Licencia Pública General GNU"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Compilación Privada: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6210,7 +6190,7 @@ msgstr ""
 "Abre los documentos de las notas de versiones\n"
 "Notas de la Versión"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6219,272 +6199,272 @@ msgstr ""
 "Abre el sitio web de las traducciones\n"
 "Traducciones"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Configuración de plugin"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Sin precomparación"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Precomparación si es posible"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH no encontrado - scripts .sct deshabilitados"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Ninguno>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Automático>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Abre el archivo con la aplicación registrada"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Abre el archivo con un editor externo"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Abre el archivo con un programa en particular"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "No mostrar bloques movidos"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Mostrar todos los bloques movidos"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Mostrar sólo bloques movidos a partir de la diferencia actual"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Ir a la diferencia bajo el cursor"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "Ir &a diferencia %1 de %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "Ir a &línea %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Del sistema de archivos"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "De la lista MRU"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "No Seleccionado"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Batch"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Portable Object"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Resources"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr "Comprobación"
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Ocultar la barra de herramientas"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Mostrar barra pequeña de herramientas"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Mostrar barra grande de herramientas"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index 469a31d..d704677 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -1030,7 +1030,7 @@ msgid "&Scripts"
 msgstr "&Script"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Inga >"
@@ -1471,7 +1471,7 @@ msgid "&Versioning System:"
 msgstr "&Versionsstyrningssystem:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Sökväg till Cleartool.exe:"
@@ -1672,7 +1672,7 @@ msgid "Replace &All"
 msgstr "Ersätt &alla"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2588,7 +2588,7 @@ msgid "Files:"
 msgstr "Filer:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Olika"
@@ -2625,7 +2625,7 @@ msgid "Right:"
 msgstr "Höger:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Identisk"
@@ -2825,7 +2825,7 @@ msgid "A&ppend timestamp"
 msgstr "L&ägg till tidsmarkering"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Bekräfta kopiering"
@@ -2903,7 +2903,7 @@ msgstr "L
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Katalog"
@@ -3543,7 +3543,7 @@ msgid "Version Control"
 msgstr "Versionskontroll"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Skillnader"
@@ -3672,87 +3672,67 @@ msgstr "XML-filer (*.xml)|*.xml|Alla filer (*.*)|*.*||"
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Total jämförelse"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Snabb jämförelse"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Datum för förändring"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Ändrat Datum och Storlek"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Filstorlek"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Namn"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Sökväg"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filter"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Beskrivning"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Välj filnamn för nytt filter"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Filfilter (*.flt)|*.flt|Alla Filer (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3765,7 +3745,7 @@ msgstr ""
 "Var god och kopiera filen %1 till WinMerges Filterkatalog:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3778,7 +3758,7 @@ msgstr ""
 "\n"
 "Var god och verifiera att katalogen finns och att den är skrivbar."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3789,7 +3769,7 @@ msgstr ""
 "\n"
 "Var god och välj filterkatalog i Inställningar/System."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3802,12 +3782,12 @@ msgstr ""
 "\n"
 "Kanske är filen bara läsbar?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Ange sökväg för filterfil att installera"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3818,17 +3798,17 @@ msgstr ""
 "\n"
 "Kunde inte kopiera ny filterfil till filterkatalogen."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Filterfilen är redan installerad. Vill du skriva över existerande filterfil?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Reguljärt uttryck"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3839,243 +3819,243 @@ msgstr ""
 "\n"
 "Om du inte vill uppdatera alla jämförelser nu kan du välja Nej och uppdatera jämförelser senare."
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "&Sökväg till SS.EXE"
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Resultat för jämförda kataloger"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Filjämförelse"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Namnlös vänster"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Namnlös höger"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "Deras fil"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "Min fil"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Söker filer..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Öppnar val"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Kopiera vänster till höger"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Kopiera höger till vänster"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Kopiera allt till vänster"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Kopiera allt till höger"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Kopierar filer..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Tar bort filer..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Flyttar filer..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Skapar rapport..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Ångrar den sista åtgärden..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "Gör om den tidigare åtgärden..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Rad: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Mergemod"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "Skillnad %1 av %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 skillnader funna"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "1 skillnad funnen"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "RO"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Objekt %1 av %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Objekt: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Välj två existerande kataloger eller filer att jämföra"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Val av katalog"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Välj två kataloger eller två filer att jämföra."
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "Vänster sökväg är felaktig!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Höger sökväg är felaktig!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Båda sökvägarna är felaktiga!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Välj två filer för att starta valet av uppackare."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Kan inte jämföra en fil med en katalog!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Kan inte hitta: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Filen är inte uppackad: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4088,12 +4068,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Kunde inte tolka Konfliktfilen."
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4104,32 +4084,32 @@ msgstr ""
 "%1\n"
 "är inte en Konfliktfil."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Spara som"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Spara ändringar i %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 är skrivskyddad. Vill du skriva över filen (välj Nej för att spara filen med ett annat namn)?"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Fel vid kontroll av skrivbarhet på destinationen!"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Fel vid backup av filen"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4142,7 +4122,7 @@ msgstr ""
 "\n"
 "Vill du fortsätta i alla fall?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4159,7 +4139,7 @@ msgstr ""
 "\t-använda ett annat filnamn (Tryck Ok)\n"
 "\t-avbryta sparande av fil (Tryck Avbryt)?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4174,7 +4154,7 @@ msgstr ""
 "\n"
 "Vill du spara den uppackade versionen till en annan fil?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4189,7 +4169,7 @@ msgstr ""
 "\n"
 "Vill du spara den uppackade versionen till en annan fil?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4204,7 +4184,7 @@ msgstr ""
 "\n"
 "Vill du skriva över den förändrade filen?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4213,7 +4193,7 @@ msgstr ""
 "%1\n"
 "är markerad bara läsbar. Vill du ändå ändra i den?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4228,22 +4208,22 @@ msgstr ""
 "\n"
 "Vill du öppna filen igen?"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Spara vänster fil som"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Spara höger fil som"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid ""
 "The file\n"
@@ -4254,7 +4234,7 @@ msgstr ""
 "%1\n"
 "finns inte nu. Var god och spara en kopia av filen för att fortsätta."
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4265,42 +4245,42 @@ msgstr ""
 "\n"
 "Uppdatera filerna innan du fortsätter."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Du måste ange sökvägen till ett SourceSafe-projekt för att fortsätta (t.ex.:  $/MittProjekt)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Hämtar filer från VSS..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "Versionshanteringssystemet (VSS) returnerade ett fel under försöket att checka ut filen. Det går inte att fortsätta..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Fel vid utförande av kommando för versionshanteringssystem."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "VSS-arbetskatalogen och läget på den aktuella filen matchar inte. Vill du fortsätta ändå?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Ingen VSS databas hittad!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Fel från VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4311,7 +4291,7 @@ msgstr ""
 " Var god och, kontrollera konfigurationsspecifikation på använd markering.\n"
 " Ångra checka ut åtgärd?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4320,169 +4300,169 @@ msgstr ""
 "Versionshanteringssystemet (VSS) returnerade ett fel under försöket att ångra checka ut av filen.\n"
 " Var god och, kontrollera konfigurationsspecifikation på använd markering. "
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Inget"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (lägre än 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 eller högre)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Radbryt på mellanslag"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Radbryt på mellanslag eller punkt"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Kopiera valt objekt till angiven katalog"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Kopiera valt objekt till anpassad katalog"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Ta bort valda objekt på vänster sida"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Ta bort valda objekt på höger sida"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Ta bort valda objekt på båda sidor"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Dölj valda objekt (realtidsfilter)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Byt namn på valt objekt på båda sidor"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Höger till vänster (%1)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Vänster till höger (%1)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Höger till vänster (%1 av %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Vänster till höger (%1 av %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Vänster till... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Höger till... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Vänster till... (%1 av %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Höger till... (%1 av %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Vänster (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Höger (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Båda (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Vänster (%1 av %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Höger (%1 av %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Båda (%1 av %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Välj destinationskatalog"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Vänster sida - välj destinationskatalog:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Höger sida - välj destinationskatalog:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 filer påverkade)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 av %2 filer påverkade)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4494,17 +4474,17 @@ msgstr ""
 "%1\n"
 "?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Är du säker på att du vill kopiera:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Är du säker på att du vill kopiera %d objekt:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4523,613 +4503,613 @@ msgstr ""
 "\n"
 "Var god och uppdatera jämförelsen."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "Är du säker att du vill flytta:"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "Är du säker att du vill flytta % objekt:"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "Bekräfta flyttning"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Öppna den vänstra filen"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Öppna den vänstra filen med en extern editor"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Öppna den vänstra filen med ..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Öppna den högra filen"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Öppna den högra filen med en extern editor"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Öppna den högra filen med ..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Kunde inte starta den externa editorn %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Okänt suffix för extern editor: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Kopiera filnamn till klippbordet"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Kopiera vänster sidas sökvägar till klippbordet"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Kopiera höger sidas sökvägar till klippbordet"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Kopiera båda sidors sökvägar till klippbordet"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr "Vänster Gränssnittsmeny"
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr "Höger Gränssnittsmeny"
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Okänt arkivformat"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Lägg till objekt från vänster sida till arkivet"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Lägg till objekt från höger sida till arkivet"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Lägg till objekt från båda sidor till arkivet"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Lägg till olika objekt till arkivet (från båda sidor)"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Flytta vald fil till vänster till anpassad katalog"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Flytta vald fil till höger till anpassad katalog"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Filnamn"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Resultat av jämförelsen"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Vänster datum"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Höger datum"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Filsuffix"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Vänster storlek"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Höger storlek"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Höger Filstorlek (Förkortad)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Vänster Filstorlek (Förkortad)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Vänster skapaddatum"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Höger skapaddatum"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Nyare filer"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Filversion på vänster fil"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Filversion på höger fil"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Kort resultat"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Vänster attribut"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Höger attribut"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "Vänster radslutstyp"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "Höger radslutstyp"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Vänster kodning"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Höger kodning"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Ignorerade skillnader"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binär"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Kan inte jämföra filerna"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Objekt avbrutet"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Hoppat över filen"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Hoppat över katalogen"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Bara vänster: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Bara höger: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "De binära filerna är identiska"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "De binära filerna är olika"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Filerna är olika"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr "Katalogerna är olika"
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Endast vänster"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Endast höger"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Fel"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr "Textfilerna är identiska"
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr "Textfilerna är olika"
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Förfluten tid: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 objekt valt"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 objekt valda"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Filnamn eller katalognamn."
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Underkatalognamn när underkataloger inkluderas."
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Jämförelseresultat, lång version."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Vänster sidas ändringsdatum."
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Höger sidas ändringsdatum."
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Filsuffix."
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Vänster fils storlek i bytes."
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Höger fils storlek i bytes."
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Vänster filstorlek är förkortad."
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Höger filstorlek är förkortad."
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Vänster sidas skapelsetid."
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Höger sidas skapelsetid."
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Visar vilken sida som har ett nyare ändringsdatum."
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Vänster sidas filversion, bara för några filtyper."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Höger sidas filversion, bara för några filtyper."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Kortfattat jämförelseresultat."
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Vänster sidas attribut."
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Höger sidas attribut."
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Vänster sidas filradslutstyp"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Höger sidas filradslutstyp"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Vänster sidas kodning."
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Höger sidas kodning."
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Antal ignorerade skillnader i filen. Dessa skillnader ignorerades av WinMerge och kan inte läggas samman."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Antal skillnader i filen. Detta antal inkluderar inte ignorerade skillnader."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Visar stjärna (*) om filen är binär."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Jämför %1 med %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Komma-separerad lista"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Tabb-separerad lista"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "Enkel HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "Enkel XML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Rapportfilen finns redan. Vill du skriva över denna fil?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5138,32 +5118,32 @@ msgstr ""
 "Fel vid skapande av rapport:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Rapporten har skapats."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Samma fil är öppnad i vänster och höger panel."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "De valda filerna är identiska."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Ett fel inträffade under jämförelsen av filerna."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Temporära filer kunde inte skapas. Kontrollera inställningarna för dina temporära sökvägar."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5178,7 +5158,7 @@ msgstr ""
 "\n"
 "OBS: Om du alltid vill betrakta alla radslutstyper som likvärdiga, markera alternativet 'Ignorera skillnader i radslut (WINDOWS,UNIX,MAC)' i Jämför-fliken i Inställningar-dialogen (finns under Redigera/Inställningar)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5189,22 +5169,22 @@ msgstr ""
 " Med de aktuella inställningarna, kommer de att bli till den vanligaste typen.\n"
 " Vill du ändra inställningarna och bevara de olika radsluten ?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Ett fel uppstod vid prediffing av filen '%1' med plugin '%2'. Prediffing används inte mer."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "Den valda katalogen är ogiltig."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Kan inte öppna en binär fil för att editera."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5219,7 +5199,7 @@ msgstr ""
 "%1\n"
 "på andra sidan och öppna dessa kataloger?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5230,148 +5210,148 @@ msgstr ""
 "Att visa varje fil i dess egen Codepage ger en bättre visning men sammanfogning/kopierande blir farligt.\n"
 "Vi föreslår att du glömmer Codepage informationen. Önskar du detta ?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Varning: Filerna använder olika filkodningar, vänster=%s och höger=%s, och sammanfogning kan leda till förlust av information."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Information förlorades på grund av kodningsfel i: båda filerna"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Ingen skillnad"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Radskillnad"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Ersatt %1 sträng(ar)."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Kan inte hitta strängen \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Kopiera hela sökvägen"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Kopiera filnamn"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Skillnadsfält"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Skillnadsbild"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Patchfilen sparad."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "Det gick inte att hitta första filen, eller så är det en katalog!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "Det gick inte att hitta andra filen, eller så är det en katalog!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Patchfilen finns redan. Vill du skriva över den?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 fil(er) valda]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Sammanhang"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Förenad"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Kunde inte spara filen %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Den specificerade resultatsökvägen är inte en absolut sökväg: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Välj ett filnamn för resultatet"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Kan inte skapa en patchfil från binära filer."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Kan inte skapa en patchfil från kataloger."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5382,17 +5362,17 @@ msgstr ""
 "\n"
 "Att skapa en patch kräver att det inte finns några osparade förändringar i filerna."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Katalogen finns inte."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Aktuella katalogjämförelseresultat kommer att tas bort."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5403,7 +5383,7 @@ msgstr ""
 "Alla krävda komponenter (7-zip och/eller Merge7z*.dll) för arkivstöd kan inte hittas.\n"
 "Se manualen för mer information om arkivstöd och hur man startar det."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5412,7 +5392,7 @@ msgstr ""
 "\n"
 "Notera: 7-Zip integration är avstängd i WinMerges inställningar."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5421,37 +5401,37 @@ msgstr ""
 "\n"
 "Notera: 7-Zip integration är begränsad till fristående användning i WinMerges inställningar."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Välj fil att exportera"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Välj fil att importera"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Inställningar importerades från filen."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Inställningar exporterades till filen."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Det gick inte att importera inställningar från filen."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Det gick inte att spara inställningar till filen."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5462,242 +5442,242 @@ msgstr ""
 "\n"
 "Vill du göra detta?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Fel i reguljärt uttryck"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Ingen träff"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Ogiltigt reguljärt uttryck"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Ogiltigt repetitionstecken"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Ogiltigt teckenklassnamn"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Bakåtlutat snedstreck sist på en rad"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Felaktig bakåtreferens"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Inte matchande [ eller [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Inte matchande ( eller \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Inte matchande \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Felaktigt innehåll av \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Felaktigt intervallslut"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Ogiltigt föregående reguljärt uttryck"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "För tidigt slut på reguljärt uttryck"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Reguljärt uttryck är för stort"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Inte matchande ) eller \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "DOS"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "MAC"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "UNIX"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Blandad"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Typ"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "Uppackare"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr "Prediffer"
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "Editorscript"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Sparar den vänstra filen"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Sparar den högra filen"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Sparar den vänstra filen som..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Sparar den högra filen som..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Konverterar radslut till Windows-format"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Konverterar radslut till Unix-format"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Konverterar radslut till Mac-format"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Växlar mellan Editeramod och Mergemod"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5706,12 +5686,12 @@ msgstr ""
 "Visar och ändrar filkodningsegenskaper\n"
 "Filkodningsegenskaper"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "Öppna och fixa Konfliktfilen"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5720,7 +5700,7 @@ msgstr ""
 "Markerar skillnad på aktuell rad\n"
 "Skillnad på aktuell rad"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5729,7 +5709,7 @@ msgstr ""
 "Går till rad eller skillnad\n"
 "Gå till (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5738,7 +5718,7 @@ msgstr ""
 "Ändrar programinställningar\n"
 "Inställningar"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5747,37 +5727,37 @@ msgstr ""
 "Uppdaterar innehållet\n"
 "Uppdatera (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Kopierar valda rader till klippboken och lägger till radnummer i början på raderna"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Växlar Bokmärke"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Går till nästa Bokmärke"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Går till tidigare Bokmärke"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Tar bort alla Bokmärken"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5786,7 +5766,7 @@ msgstr ""
 "Visar objekt som är exakt lika\n"
 "Visa identiska objekt"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5795,7 +5775,7 @@ msgstr ""
 "Visar objekt som har skillnader\n"
 "Visa skillnader i objekt"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5804,7 +5784,7 @@ msgstr ""
 "Visar objekt som bara finns på vänster sida\n"
 "Visa vänsterunika objekt"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5813,7 +5793,7 @@ msgstr ""
 "Visar objekt som bara finns på höger sida\n"
 "Visa högerunika objekt"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5822,7 +5802,7 @@ msgstr ""
 "Visar binära filer\n"
 "Visa binära filer"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5831,7 +5811,7 @@ msgstr ""
 "Visar överhoppade objekt\n"
 "Visa överhoppade objekt"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5840,7 +5820,7 @@ msgstr ""
 "Väljer typsnitt för fönstren\n"
 "Välj typsnitt"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5849,27 +5829,27 @@ msgstr ""
 "Väljer standardtypsnitt för fönstren\n"
 "Välj standardtypsnitt"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Visar ett tecken för mellanslag"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Växla skillnadsbilden"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Skillnadsbilden visar en övergripande bild av filerna"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Visar dialog med katalogjämförelsestatistik"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5878,7 +5858,7 @@ msgstr ""
 "Väljer språk för användargränssnittet\n"
 "Språk"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5887,12 +5867,12 @@ msgstr ""
 "Visar skillnader inom rader med olika färg\n"
 "Visa radskillnad"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Växlar placering på de två filerna"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5901,7 +5881,7 @@ msgstr ""
 "Visar radnummer\n"
 "Visa radnummer"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5910,7 +5890,7 @@ msgstr ""
 "Startar radbrytning\n"
 "Radbrytning"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5919,22 +5899,22 @@ msgstr ""
 "Visar marginaler för båda filerna\n"
 "Visa filmarginaler"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Öka textstorlek"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Minska textstorlek"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Återställ textzoomning till standardstorlek"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5943,7 +5923,7 @@ msgstr ""
 "Går till föregående skillnad\n"
 "Föregående skillnad (Alt+Upp)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5952,67 +5932,67 @@ msgstr ""
 "Går till nästa skillnad\n"
 "Nästa skillnad (Alt+Ner)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -6021,7 +6001,7 @@ msgstr ""
 "Går till första skillnaden\n"
 "Första skillnad (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6030,7 +6010,7 @@ msgstr ""
 "Går till aktuell skillnad\n"
 "Aktuell skillnad (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6039,7 +6019,7 @@ msgstr ""
 "Går till sista skillnaden\n"
 "Sista skillnad (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6048,7 +6028,7 @@ msgstr ""
 "Kopierar den valda texten till den högra filen\n"
 "Kopiera höger (Alt+Höger)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6057,7 +6037,7 @@ msgstr ""
 "Kopierar den valda texten till den vänstra filen\n"
 "Kopiera vänster (Alt+Vänster)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6066,7 +6046,7 @@ msgstr ""
 "Kopierar skillnad till höger och går fram till nästa\n"
 "Kopiera höger och gå framåt (Ctrl+Alt+Höger)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6075,7 +6055,7 @@ msgstr ""
 "Kopierar skillnad till vänster och går fram till nästa\n"
 "Kopiera vänster och gå framåt (Ctrl+Alt+Vänster)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6084,7 +6064,7 @@ msgstr ""
 "Kopierar alla skillnader till den högra filen\n"
 "Kopiera allt till höger"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6093,77 +6073,77 @@ msgstr ""
 "Kopierar alla skillnader till den vänstra filen\n"
 "Kopiera allt till vänster"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Tar bort valda objekt från båda katalogerna"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Jämför valt objekt (jämför första objektet om flera objekt är valda)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Välj och sortera om kolumnerna för katalogjämförelse"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Skapar en patchfil"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Väljer och ändrar filter"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Genererar en rapport för jämförresultat"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "Visar en lista på tillgängliga Plugins"
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "Användaren väljer uppackare (ingen uppackning när man jämför kataloger)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Den valda uppackaren används för båda filerna (bara en fil behöver ha filsuffixet)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Välj en uppackare för att ändra i denna fil"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Ingen prediffer (standard)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Föreslagna plugins"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Andra plugins"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Stäng alla plugins och öppna dem igen (för utvecklare)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6172,12 +6152,12 @@ msgstr ""
 "Aktiverar nästa synliga fil\n"
 "Aktivera nästa fil"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Stänger alla öppna fönster"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6186,22 +6166,22 @@ msgstr ""
 "Öppnar WinMerge Hjälp\n"
 "WinMerge Hjälp"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Sparar aktuell WinMerge Versionsinfo och Konfiguration till en textfil"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "Visar GNU General Public License"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Privat Kompilering: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6210,7 +6190,7 @@ msgstr ""
 "Öppnar Releasenoteringsdokumentet\n"
 "Releasenoteringar"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6219,272 +6199,272 @@ msgstr ""
 "Öppnar Översättningssidan\n"
 "Översättningar"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Plugin-inställningar"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Ingen prediffer"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Prediffer om möjligt"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "Windows Script Host ('wscript.exe') hittades inte - .sct script är avstängda"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Ingen>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Automatisk>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Öppna filen med registerat program"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Öppna filen med extern editor"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Öppna filen med ett speciellt program"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Visa inte flyttade block"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Visa alla flyttade block"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Visa flyttade block bara från aktuell skillnad"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Gå till skillnad under cursor"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "G&å till skillnad %1 av %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "G&å till rad %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Avstängd"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Från Filsystem"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Från Senast Använda filer"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "Ingen markering"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Batch"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Portabelt Objekt"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Resurser"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr "Verilog"
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Dölj verktygsraden"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Visa liten verktygsrad"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Visa stor verktygsrad"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index 34d94cb..8478386 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -1030,7 +1030,7 @@ msgid "&Scripts"
 msgstr "Yazý Düzeni"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Boþ >"
@@ -1471,7 +1471,7 @@ msgid "&Versioning System:"
 msgstr "Sürümleme Sistemi:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "'cleartool.exe' Dizini:"
@@ -1675,7 +1675,7 @@ msgid "Replace &All"
 msgstr "Tümünü Deðiþtir"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2592,7 +2592,7 @@ msgid "Files:"
 msgstr "Dosyalar:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "Farklýlýk"
@@ -2629,7 +2629,7 @@ msgid "Right:"
 msgstr "Sað:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Ayný"
@@ -2829,7 +2829,7 @@ msgid "A&ppend timestamp"
 msgstr "Sonuna Tarih Damgasý Ekle"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "Kopyayý Doðrula"
@@ -2907,7 +2907,7 @@ msgstr "
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Klasör"
@@ -3547,7 +3547,7 @@ msgid "Version Control"
 msgstr "Sürüm Kontrolü"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "Farklýlýklar"
@@ -3676,87 +3676,67 @@ msgstr "XML Dosyalar
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Tüm Ýçerik"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Hýzlý Ýçerik"
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Deðiþtirilme Tarihi"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Deðiþtirilme Tarihi ve Boyutu"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Boyut"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "Ýsim"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "Yer"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Filtreler"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Taným"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Yeni Filtre Ýçin Bir isim Seç"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Dosya Filtreleri (*.flt)|*.flt|Tüm Dosyalar (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3769,7 +3749,7 @@ msgstr ""
 "Lütfen %1 Dosyasýný, WinMerge/Filters Klasörüne Kopyalayýnýz:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3782,7 +3762,7 @@ msgstr ""
 "\n"
 "Lütfen Klasörün Mevcut ve Yazýlabilir Olduðundan Emin Olunuz."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3793,7 +3773,7 @@ msgstr ""
 "\n"
 "Lütfen 'Ayarlar/Sistem' Ýçinden Filtre Klasörü Seçiniz."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3806,12 +3786,12 @@ msgstr ""
 "\n"
 "Acaba Bu Salt Okunur Bir Dosya mý?"
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Kurulacak Filtreyi Yerleþtir"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3822,17 +3802,17 @@ msgstr ""
 "\n"
 "Yeni Filtre, Filtre Klasörüne Kopyalanamadý."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Bu Filtre Zaten Var. Üzerine Yazýlsýn mý?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Kurallý Ýfade"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3843,243 +3823,243 @@ msgstr ""
 "\n"
 "Þimdi Ýstemezseniz, Tüm Karþýlaþtýrmalarý Daha Sonra da Tazeleyebilirsiniz."
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "'SS.EXE' Dizini:"
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Klasör Karþýlaþtýrýlmasý Sonuçlarý"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Dosya Karþýlaþtýrýlmasý"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Ýsimsiz Sol"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Ýsimsiz Sað"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, fuzzy, c-format
 msgid "Theirs File"
 msgstr "Onlarýn Dosyasý"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, fuzzy, c-format
 msgid "Mine File"
 msgstr "Benim Dosyam"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Dosyalarý Taramak..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "Seçileni Açmak"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Soldakini, Saða Kopyalamak"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Saðdakini, Sola Kopyalamak"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Tümünü Sola Kopyalamak"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Tümünü Saða Kopyalamak"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Dosyalarý Kopyalamak..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Dosyalarý Silmek..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Dosyalarý Taþýmak..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Rapor Hazýrlamak..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Son Ýþlemi Geri Almak..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "Önceki Ýþlemi Tekrarlamak..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Satýr: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Birleþtir"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "%2 Farktan %1. Fark"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 Farklýlýk Bulundu"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "1 Farklýlýk Bulundu"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "SO"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "%2 Dosyanýn %1. Ögesi"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Ögeler: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Karþýlaþtýrmak Ýçin Mevcut Ýki Klasör veya Dosya Seç"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Klasör Seçimi"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Karþýlaþtýrmak Ýçin Ýki Klasör veya Ýki Dosya Seç"
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "Sol Dizin Geçersiz!"
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Sað Dizin Geçersiz!"
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Ýki Dizin de Geçersiz!"
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Çýkartýcýnýn Etkinleþmesi Ýçin Ýki Dosya Seçmelisiniz."
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Dosya ve Klasör Karþýlaþtýrýlamaz!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "%1 Dosyasý Bulunamadý"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "%1 Dosyasý Çýkartýlamadý"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4092,12 +4072,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Fark Dosyasýnýn Ayrýþtýrýlmasý Baþarýsýz Oldu."
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4108,32 +4088,32 @@ msgstr ""
 "%1\n"
 "Bir Fark Dosyasý Deðil."
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Farklý Kaydet"
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "%1 Ýçindeki Deðiþiklikler Kaydedilsin mi? "
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 Salt Okunur Olarak Ýþaretli. Üzerine Yazmak Ýster misiniz ? (Ýstemezseniz, Yeni Bir Ýsimle Farklý Kaydedebilirsiniz.)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Hedefin Yazýlabilirliðini Engelleme Hatasý"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Dosya Yedekleme Hatasý"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4146,7 +4126,7 @@ msgstr ""
 "\n"
 "Devam Etmek Ýster misiniz?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4163,7 +4143,7 @@ msgstr ""
 "\t-Farklý Bir Ýsim Kullan (Tamam'a Bas)\n"
 "\t-Ýþlem Ýptal Edilsin mi? (Evetse Ýptal'e Bas)"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4178,7 +4158,7 @@ msgstr ""
 "\n"
 "Çýkartýlmýþ Sürümü Baþka Bir Dosyaya Kaydetmek Ýster misiniz?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4193,7 +4173,7 @@ msgstr ""
 "\n"
 "Çýkartýlmýþ Sürümü Baþka Bir Dosyaya Kaydetmek Ýster misiniz?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4208,7 +4188,7 @@ msgstr ""
 "\n"
 "Dosya Deðiþtirilsin mi?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
@@ -4217,7 +4197,7 @@ msgstr ""
 "%1\n"
 "Salt Okunur Olarak Ýþaretli. Üzerine Yazmak Ýstediðinize Emin misiniz?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4232,22 +4212,22 @@ msgstr ""
 "\n"
 "Dosyayý Yeniden Yüklemek Ýster misiniz?"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Soldakini Farklý Kaydet"
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Saðdakini Farklý Kaydet"
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid ""
 "The file\n"
@@ -4258,7 +4238,7 @@ msgstr ""
 "%1\n"
 "Kaldýrýldý. Lütfen Devam Etmek Ýçin Bir Kopyasýný Kaydedin."
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4269,42 +4249,42 @@ msgstr ""
 "\n"
 "Devam Etmeden Önce Belgeleri Tazeleyin."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Devam Etmek Ýçin Bir SourceSafe Projesi Yolunu Açýkça Belirtmelisiniz (Örn:  $/Projem)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Dosyalarý VSS Projesinden Çýkart..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "Dosya Çýkýþý Yapýlmak Ýstenirken Sürümleme Sisteminde Bir Hata Oluþtu. Devam Edilemez..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Sürümleme Sistemi Komut Uygulama Hatasý"
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "VSS Etkin Klasörü Ýle Þu Anki Dosyanýn Konumu Eþleþmiyor. Devam Edilsin mi?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "VSS Veritabaný Bulunamadý!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "VSS Kaynaklý Hata:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4315,7 +4295,7 @@ msgstr ""
 " Lütfen Yapýlandýrmanýzý Kontrol Ediniz.\n"
 " Çýkýþ Ýþlemi Geri Alýnsýn mý?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4324,169 +4304,169 @@ msgstr ""
 "Dosya Çýkýþý Geri Alýnmak Ýstenirken Sürümleme Sisteminde Bir Hata Oluþtu.\n"
 " Lütfen Yapýlandýrmanýzý Kontrol Ediniz. "
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Yok"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (5.0'dan Önceki Sürüm)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 ve Üstü)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Boþluðu Kaldýr"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Boþluðu Ve Noktalama Ýþaretini Kaldýr"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Seçili Ögeyi Adlandýrýlan Dizine Kopyala"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Seçili Ögeyi Özel Dizine Kopyala"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Soldaki Seçili Ögeyi Sil"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Saðdaki Seçili Ögeyi Sil"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Her Ýki Taraftaki Seçili Ögeleri Sil"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Seçilen(ler)i Gizle (Anýnda Filtresi)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Her Ýki Taraftaki Seçili Ögeyi Yeniden Adlandýr"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Saðdakini Sola (%1 Tane)"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Soldakini Saða (%1 Tane)"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Saðdakini Sola (%2 Ögenin %1 Tanesi)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Soldakini Saða (%2 Ögenin %1 Tanesi)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Soldakini Þuraya... (%1 Tane)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Saðdakini Þuraya... (%1 Tane)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Soldakini Þuraya... (%2 Ögenin %1 Tanesi)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Saðdakini Þuraya... (%2 Ögenin %1 Tanesi)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "Soldakini (%1 Tane)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Saðdakini (%1 Tane)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Her Ýkisini de (%1 Tane)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "Soldakini (%2 Ögenin %1 Tanesi)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Saðdakini (%2 Ögenin %1 Tanesi)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Her Ýki Tarafta da Olaný (%2 Ögenin %1 Tanesi)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Hedef Klasör Seç"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Sol Tarafýn Hedef Klasörü'nü Seç:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Sað Tarafýn Hedef Klasörü'nü Seç:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 Dosya Etkilendi)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(Toplam %2 Taneden %1 Dosya Etkilendi)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4497,17 +4477,17 @@ msgstr ""
 "\n"
 "%1"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Bunu Kopyalamak Ýstediðinize Emin misiniz:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "%d Ögeyi Kopyalamak Ýstediðinize Emin misiniz:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4526,613 +4506,613 @@ msgstr ""
 "\n"
 "Lütfen Karþýlaþtýrmayý Tazeleyin."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "Bunu Taþýmak Ýstediðinize Emin misiniz:"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "%d Ögeyi Taþýmak Ýstediðinize Emin misiniz:"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "Taþýmayý Doðrula"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "Sol Dosyayý Aç"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "Sol Dosyayý Harici Düzenleyici Ýle Aç"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "Sol Dosyayý Birlikte Aç..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "Sað Dosyayý Aç"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "Sað Dosyayý Harici Düzenleyici Ýle Aç"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "Sað Dosyayý Birlikte Aç..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Bu Düzenleyici Çalýþtýrýlamadý: %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Harici Düzenleyici Bu Uzantýyý Tanýmýyor: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Dosya Adlarýný Panoya Kopyala"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Soldaki Dizin Adlarýný Panoya Kopyala"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Saðdaki Dizin Adlarýný Panoya Kopyala"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Ýki Taraftaki Dizin Adlarýný Panoya Kopyala"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr "Sol Ýçin Sað Tuþ Menüsü"
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr "Sað Ýçin Sað Tuþ Menüsü"
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Tanýnmayan Sýkýþtýrma Formatý"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Soldakileri Sýkýþtýrma Dosyasýna Ekle"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Saðdakileri Sýkýþtýrma Dosyasýna Ekle"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Ýki Taraftakileri Sýkýþtýrma Dosyasýna Ekle"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "(Ýki Taraftaki) Farklý Ögeleri Sýkýþtýrma Dosyasýna Ekle"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Soldaki Seçili Dosyayý Özel Dizine Taþý"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Saðdaki Seçili Dosyayý Özel Dizine Taþý"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "Dosya Adý"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Karþýlaþtýrma Sonucu"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Soldakinin Tarihi"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Saðdakinin Tarihi"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Uzantý"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Soldakinin Boyutu"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Saðdakinin Boyutu"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Saðdakinin Boyutu (Kýsa)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Soldakinin Boyutu (Kýsa)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "Soldakinin Oluþturulma Zamaný"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "Saðdakinin Oluþturulma Zamaný"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "En Yeni Dosya"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Soldaki Dosyanýn Sürümü"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Saðdaki Dosyanýn Sürümü"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Sonuç Özeti"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Soldakinin Öznitelikleri"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Saðdakinin Öznitelikleri"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "Sol SS (SatýrSonu)"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "Sað SS (SatýrSonu)"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Soldaki Kodlama"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Saðdaki Kodlama"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Yok Sayýlan Farklýlýklar"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Binary"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Dosyalar Karþýlaþtýrýlamaz"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Öge Ýptal Edildi"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Dosya Atlandý"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Klasör Atlandý"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Sadece Solda Var: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Sadece Saðda Var: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Binary Dosyalarý Birbiri Ýle Ayný"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Binary Dosyalarý Birbirinden Farklý"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Dosyalar Birbirinden Farklý"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr "Klasörler Birbirinden Farklý"
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Sadece Soldaki"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Sadece Saðdaki"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Hata"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr "Metin Dosyalarý Birbiri Ýle Ayný"
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr "Metin Dosyalarý Birbirinden Farklý"
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Geçen Süre: %ld ms"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "1 Öge Seçildi"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "%1 Öge Seçildi"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "Dosya veya Klasör Adý"
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "Alt Klasörler Eklendiðinde Alt Klasör Adý"
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Karþýlaþtýrma Sonucu (Uzun Sonuç)"
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "Soldakinin Deðiþtirilme Tarihi"
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "Saðdakinin Deðiþtirilme Tarihi"
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Dosyanýn Uzantýsý"
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Soldaki Dosyanýn Byte Olarak Boyutu"
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Saðdaki Dosyanýn Byte Olarak Boyutu"
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Soldaki Dosyanýn Kýsaca Boyutu"
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Saðdaki Dosyanýn Kýsaca Boyutu"
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "Soldakinin Oluþturulma Zamaný"
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "Saðdakinin Oluþturulma Zamaný"
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "En Yeni Deðiþtirilme Tarihine Sahip Olan Taraf"
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Soldaki Dosya Sürümü, Sadece Bazý Dosya Türleri Ýçindir"
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Saðdaki Dosya Sürümü, Sadece Bazý Dosya Türleri Ýçindir"
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Karþýlaþtýrma Sonucu (Özet)"
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Soldaki Dosyanýn Öznitelikleri"
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Saðdaki Dosyanýn Öznitelikleri"
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Soldaki Dosyanýn Satýr Sonu (SS) Türü"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Saðdaki Dosyanýn Satýr Sonu (SS) Türü"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Sol Taraftaki Kodlama"
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Sað Taraftaki Kodlama"
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "Yok Sayýlan Farklýlýklarýn Sayýsý. Bunlar, WinMerge Tarafýndan Yok Sayýlan Veya Birleþtirilemeyen Farklýlýklardýr."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "Farklýlýklarýn Sayýsý. Yok Sayýlan Farklýlýklar, Bu Sayýya Dahil Deðildir."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Eðer Binary Dosyasý Ýse Yýldýz (*) Ýþareti Koy"
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "%1 Ýle %2 Ögesini Karþýlaþtýr"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Virgül Ýle Ayrýlmýþ Liste"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Girinti Ýle Ayrýlmýþ Liste"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "Basit HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "Basit XML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Rapor Dosyasý Zaten Var. Üzerine Yazmak Ýstiyor musunuz?"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5141,32 +5121,32 @@ msgstr ""
 "Rapor Hazýrlama Hatasý:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Rapor Baþarýyla Hazýrlandý."
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Ýki Panelde de Ayný Dosya Açýldý."
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Seçili Dosyalar Birbiri Ýle Ayný."
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Dosyalar Karþýlaþtýrýlýrken Bir Hata Oluþtu."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Geçici Klasör Oluþturulamadý. Geçici Dizin Ayarlarýnýzý Kontrol Ediniz."
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5181,7 +5161,7 @@ msgstr ""
 "\n"
 "Not: Eðer Her Zaman Tüm Satýrbaþý Türlerine Eþit Davranmak Ýstiyorsanýz, 'Ayarlar'dan 'Karþýlaþtýr' a Girerek, 'Satýrbaþý Farklýlýklarýný Yok Say..' Seçeneðini Ýþaretleyiniz (Düzen/Ayarlar Altýndan Ulaþabilirsiniz)."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5192,22 +5172,22 @@ msgstr ""
 " Bunlar Mevcut Ayarlarla, Temel Türe Dönüþtürülecek.\n"
 " Ayarlarýnýzý Deðiþtirmek ve SatýrSonu (SS) Farklýlýklarýný Korumak Ýster misiniz ?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, fuzzy, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "'%2' Eklentisi Ýle '%1' Dosyasý Öncelikli Farklýlaþtýrýlýrken Bir Hata Oluþtu. Öncelikli Farklýlaþtýrma Daha Fazla Uygulanamayacak."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "Seçili Klasör Geçersiz."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Binary Dosyasý Düzenleyicide Açýlamaz."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5222,7 +5202,7 @@ msgstr ""
 "%1\n"
 "Oluþturmak ve Bu Klasörleri Açmak Ýstiyor musunuz?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5233,148 +5213,148 @@ msgstr ""
 "Her Bir Dosyayý Kendi Kod Sayfasýnda Görüntülemek Daha Ýyi Bir Görüntü Saðlar Ama Birleþtirme/Kopyalama Riskli Hale Gelir.\n"
 "Her Ýki Dosyaya da Varsayýlan Windows Kod Sayfasýna Sahipmiþ Gibi Davranmak Ýster misiniz? (Önerilen)"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Uyarý: Dosyalar Farklý Kodlama Kullanýyor, Sol=%s ve Sað=%s. Birleþtirmek Bilgi Kayýplarýný Doðurabilir."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, fuzzy, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "Hatalarý Kodlamak Bilgi Kaybýný Doðurur: Her Ýki Dosyada"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Farklýlýk Yok"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, fuzzy, c-format
 msgid "Line difference"
 msgstr "Satýr Farký"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "%1 Dizgi Deðiþtirildi."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "\"%s\" Dizgisi Bulunamýyor"
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Tam Yolu Kopyala"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Dosya Adýný Kopyala"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "Durum Penceresi"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "Farklýlýk Penceresi"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Yama Dosyasý Baþarýyla Yazýldý."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. Öge Yok Veya Bu Dizinde Deðil!"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. Öge Yok Veya Bu Dizinde Deðil!"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Yama Dosyasý Zaten Var. Üzerine Yazmak Ýstiyor musunuz?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 Dosya Seçildi]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, fuzzy, c-format
 msgid "Context"
 msgstr "Sýnýrlý"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Birleþik"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "%1 Dosyaya Yazýlamadý."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Belirtilen Çýktý Dizini Kabul Edilebilir Bir Dizin Deðil: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Bir Çýktý Dosyasý Belirtin"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Binary Dosyalarýndan, Yama Dosyasý Hazýrlanamaz."
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Dizinlerden Yama Dosyasý Hazýrlanamaz."
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5385,17 +5365,17 @@ msgstr ""
 "\n"
 "Bir Yama Hazýrlamak, Dosyalardaki Tüm Deðiþikliklerin Kaydedilmiþ Olmasýný gerektirir."
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Klasör Bulunamýyor."
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Þu Anki Dizin Karþýlaþtýrma Sonuçlarý Silinecek."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5406,7 +5386,7 @@ msgstr ""
 "Sýkýþtýrýlmýþ Dosya Desteði Ýçin Gereken (7-zip ve/veya Merge7z*.dll) Hiçbir Ýçerik Bulunamadý.\n"
 "Sýkýþtýrýlmýþ Dosya Desteði Ve Nasýl Yüklenebileceði Ýle Ýlgili Ayrýntýlý Bilgi Ýçin Yardým'a Bakýnýz."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5415,7 +5395,7 @@ msgstr ""
 "\n"
 "Not: Ayarlar'da 7-Zip Bütünleþmesi Ýptal Edilmiþ."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5424,37 +5404,37 @@ msgstr ""
 "\n"
 "Not: Ayarlar'da 7-Zip Baðýmsýz Çalýþacak Þekilde Sýnýrlanmýþtýr."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Dýþa Aktarmak Ýçin Dosya Seç"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Ýçe Aktarmak Ýçin Dosya Seç"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Ayarlar Ýçe Aktarýldý."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Ayarlar Dýþa Aktarýldý."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Ayarlarýn Ýçe Aktarýlmasý Ýptal edildi."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Ayarlarýn Dosyaya Yazýlmasý Ýptal Edildi."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5465,242 +5445,242 @@ msgstr ""
 "\n"
 "Devam Etmek Ýstiyor musunuz?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Kurallý Ýfade Hatasý"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Eþleþme Yok"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Geçersiz Kurallý Ýfade"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Geçersiz Karþýlaþtýrma Karakteri"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Geçersiz Sýnýf Ýsmi Karakteri"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, fuzzy, c-format
 msgid "Trailing backslash"
 msgstr "Ters Eðik Çizgi Takibi"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, fuzzy, c-format
 msgid "Invalid back reference"
 msgstr "Geçersiz Geri Referans"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Eþleþmeyen [ Veya [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Eþleþmeyen ( Veya \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Eþleþmeyen \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "\\{\\} Ýçeriði Geçersiz"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, fuzzy, c-format
 msgid "Invalid range end"
 msgstr "Geçersiz Dizi Sonu"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Bellek Aþýmý"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, fuzzy, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Önceki Kurallý Ýfade Geçersiz"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, fuzzy, c-format
 msgid "Premature end of regular expression"
 msgstr "Kurallý Ýfadenin Zamansýz Sonu"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Kurallý Ýfade Çok Büyük"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Eþleþmeyen ) Veya \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "Karma"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " B"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr " KB"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr " MB"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr " GB"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr " TB"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr " PB"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Tür"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "Çýkartýcý"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, fuzzy, c-format
 msgid "Prediffer"
 msgstr "Öncelikli Fark"
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "Düzenleyici Yazý Düzeni"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Sol Dosyayý Kaydet"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Sað Dosyayý Kaydet"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Sol Dosyayý Þu Ýsimle Kaydet..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Sað Dosyayý Þu Ýsimle Kaydet..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "SatýrSonu (SS) 'nu Windows Moduna Dönüþtür"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "SatýrSonu (SS) 'nu Unix Moduna Dönüþtür"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "SatýrSonu (SS) 'nu Mac Moduna Dönüþtür"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Düzenleme Ve Birleþtirme Modlarý Birbirine Geçiþ Anahtarý"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5709,12 +5689,12 @@ msgstr ""
 "Dosya Kodlama Özelliklerine Bak ve Ayarla\n"
 "Dosya Kodlama Özellikleri"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "Fark Dosyasýný Aç Ve Deðiþiklik Yap"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5723,7 +5703,7 @@ msgstr ""
 "Þu Anki Satýrda Farklýlýk Alanýný Seç\n"
 "Þu Anki Satýrdaki Farklýlýk"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5732,7 +5712,7 @@ msgstr ""
 "Satýra Veya Farklýlýða Git\n"
 "Git (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5741,7 +5721,7 @@ msgstr ""
 "Program Ayarlarýný Yap\n"
 "Ayarlar"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5750,37 +5730,37 @@ msgstr ""
 "Görüntüyü Tazele\n"
 "Tazele (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Seçili Satýrlarý Satýr Numaralarýný da Ekleyerek Panoya Kopyala"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Sýk Kullanýlanlarý Aç-Kapa"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Sonraki Sýk Kullanýlana Git"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Önceki Sýk Kullanýlana Git"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Sýk Kullanýlanlarý Temizle"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5789,7 +5769,7 @@ msgstr ""
 "Týpatýp Ayný Olan Ögeleri Gösterir\n"
 "Ayný Ögeleri Göster"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5798,7 +5778,7 @@ msgstr ""
 "Farklý Olan Ögeleri Gösterir\n"
 "Farklý Ögeleri Göster"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5807,7 +5787,7 @@ msgstr ""
 "Yalnýzca Sol Tarafta Olan, Saðda Olmayan Ögeleri Gösterir\n"
 "Soldaki Benzersiz Ögeleri Göster"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5816,7 +5796,7 @@ msgstr ""
 "Yalnýzca Sað Tarafta Olan, Solda Olmayan Ögeleri Gösterir\n"
 "Saðdaki Benzersiz Ögeleri Göster"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5825,7 +5805,7 @@ msgstr ""
 "Binary Dosyalarýný Gösterir\n"
 "Binary Dosyalarýný Göster"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5834,7 +5814,7 @@ msgstr ""
 "Atlanan Ögeleri Gösterir\n"
 "Atlanan Ögeleri Göster"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5843,7 +5823,7 @@ msgstr ""
 "Ekran Ýçin Yazý Tipi Seç\n"
 "Ekran Yazý Tipini Seç"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5852,27 +5832,27 @@ msgstr ""
 "Ekran Yazý Tipini Varsayýlan Sistem Yazý Tipine Geri Döndür\n"
 "Varsayýlan Yazý Tipi"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Boþluk Karakterlerini Göster"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Farklýlýk Penceresi'ni Aç-Kapat"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Durum Penceresi Dosyalarýn Tamamýnýn Görüntüsünü Görmenizi Saðlar"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Klasör Karþýlaþtýrma Verileri Ýletiþim Kutusunu Göster"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5881,7 +5861,7 @@ msgstr ""
 "Geçerli Kullanýcý Arayüz Dilini Seç\n"
 "Dil"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5890,12 +5870,12 @@ msgstr ""
 "Satýr Ýçlerindeki Farklýlýklarý, Farklý Renklerle Göster\n"
 "Satýr Farklýlýklarýný Göster"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Ýki Paneli Yer Deðiþtir"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5904,7 +5884,7 @@ msgstr ""
 "Satýr Numaralarýný Gösterir\n"
 "Satýr Numaralarýný Göster"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5913,7 +5893,7 @@ msgstr ""
 "Sözcük Kaydýrmayý Yükle\n"
 "Satýrlarý Kaydýr"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, fuzzy, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5922,22 +5902,22 @@ msgstr ""
 "Her Ýki Panelin Seçim Sýnýrlarýný Gösterir\n"
 "Seçim Sýnýrlarýný Göster"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Metin Boyutunu Artýr"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Metin Boyutunu Azalt"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Metin Yakýnlaþtýrmasýný Varsayýlan Boyuta Geri Döndür"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5946,7 +5926,7 @@ msgstr ""
 "Önceki Farklýlýða Git\n"
 "Önceki Farklýlýk (Alt+Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5955,67 +5935,67 @@ msgstr ""
 "Sonraki Farklýlýða Git\n"
 "Sonraki Farklýlýk (Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -6024,7 +6004,7 @@ msgstr ""
 "Ýlk Farklýlýða Git\n"
 "Ýlk Farklýlýk"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6033,7 +6013,7 @@ msgstr ""
 "Þu Anki Farklýlýða Git\n"
 "Þu Anki Farklýlýk"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6042,7 +6022,7 @@ msgstr ""
 "Son Farklýlýða Git\n"
 "Son Farklýlýk (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6051,7 +6031,7 @@ msgstr ""
 "Seçili Metni Saðdaki Dosyaya Kopyala\n"
 "Saða Kopyala (Alt+Right)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6060,7 +6040,7 @@ msgstr ""
 "Seçili Metni Soldaki Dosyaya Kopyala\n"
 "Sola Kopyala (Alt+Right)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6069,7 +6049,7 @@ msgstr ""
 "Farklýlýðý Saða Kopyala ve Sonrakine Ýlerle\n"
 "Saða Kopyala ve Ýlerle (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6078,7 +6058,7 @@ msgstr ""
 "Farklýlýðý Sola Kopyala ve Sonrakine Ýlerle\n"
 "Sola Kopyala ve Ýlerle (Ctrl+Alt+Right)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6087,7 +6067,7 @@ msgstr ""
 "Tüm Farklýlýklarý Saðdaki Dosyaya Kopyala\n"
 "Tümünü Saða"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6096,77 +6076,77 @@ msgstr ""
 "Tüm Farklýlýklarý Soldaki Dosyaya Kopyala\n"
 "Tümünü Sola"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Her Ýki Dizinden Seçili Ögeleri  Sil"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Seçili Ögeyi Karþýlaþtýr (Eðer Birçok Öge Seçilmiþse Ýlk Ögeyi Karþýlaþtýr)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, fuzzy, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Dizin Karþýlaþtýrma Sütunlarýný Seç ve Yeniden Göster"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Bir Yama Dosyasý Oluþtur"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Filtreleri Seç Ve Deðiþtir"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Karþýlaþtýrma Sonuçlarýndan Bir Rapor Çýkartýr"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "Yüklenebilir Eklentilerin Listesini Göster"
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, fuzzy, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "Çýkartýcýyý Kullanýcý Seçer (Dizin Karþýlaþtýrýlýrken Çýkartma Yapýlamaz)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, fuzzy, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Adapte Edilen Çýkartýcý Her Ýki Dosyaya da Uygulandý (Sadece Bir Dosya Bu Uzantýya Ýhtiyaç Duyuyor)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Bu Dosyayý Düzenlemek Ýçin Bir Çýkartýcý Seç"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, fuzzy, c-format
 msgid "No prediffer (normal)"
 msgstr "Öncelikli Fark Yok (Normal)"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Önerilen Eklentiler"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "Diðer Eklentiler"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Tüm Eklentileri Kaldýr ve Yeniden Yükle (Geliþtiriciler Ýçin)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6175,12 +6155,12 @@ msgstr ""
 "Sonraki Görülebilir Dosyayý Aktifleþtir\n"
 "Sonraki Dosyayý Aktifleþtir"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Tüm Açýk Pencereleri Kapatýr"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6189,22 +6169,22 @@ msgstr ""
 "WinMerge Yardým'ý Açar\n"
 "WinMerge Yardým"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, fuzzy, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Þimdiki WinMerge Sürüm Bilgisini ve Ayarlarý Metin Dosyasýna Çýkart"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "GNU General Public Lisansýný Göster"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Özel Yapým: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6213,7 +6193,7 @@ msgstr ""
 "Sürüm Notlarý Belgesini Açar\n"
 "Sürüm Notlarý"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6222,272 +6202,272 @@ msgstr ""
 "Çeviriler Web Sitesini Açar\n"
 "Çeviriler"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Eklenti Ayarlarý"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, fuzzy, c-format
 msgid "No prediffer"
 msgstr "Öncelikli Fark Yok"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, fuzzy, c-format
 msgid "Prediff if possible"
 msgstr "Mümkünse Öncelikli Fark"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH (Windows Script Host) Bulunamadý  - .sct Betikleri Ýptal Edildi"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<YOK>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Otomatik>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "Dosyayý Kayýtlý Uygulama Ýle Aç"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "Dosyayý Harici Düzenleyici Ýle Aç"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "Dosyayý Özel Bir Programla Aç"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Taþýnan Bloklarý Gösterme!"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Taþýnan Tüm Bloklarý Göster"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Sadece Þu Anki Farklýlýktan Taþýnan Bloklarý Göster"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Ýmlecin Altýndaki Farklýlýða Git"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "%2 Farktan %1. Farka Git"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "%1. Satýra Git"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Ýptal"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "Dosya Sisteminden"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "Sýk Kullanýlanlar Listesinden"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "Vurgulama Yok"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Basic"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Batch"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Fortran"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Pascal"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Portable Object"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Resources"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr "Verilog"
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Araç Çubuðunu Gizle"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Küçük Araç Çubuðu Göster"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Büyük Araç Çubuðu Göster"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index b171af0..a89a4d9 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -1031,7 +1031,7 @@ msgid "&Scripts"
 msgstr "Ñ&öåíàð³¿"
 
 #: Merge.rc:516
-#: Merge.rc:2917
+#: Merge.rc:2908
 #, c-format
 msgid "< Empty >"
 msgstr "< Íåìà >"
@@ -1472,7 +1472,7 @@ msgid "&Versioning System:"
 msgstr "&Ñèñòåìà êîíòðîëþ âåðñ³é:"
 
 #: Merge.rc:819
-#: Merge.rc:2235
+#: Merge.rc:2226
 #, c-format
 msgid "&Path to cleartool.exe:"
 msgstr "&Øëÿõ äî cleartool.exe:"
@@ -1673,7 +1673,7 @@ msgid "Replace &All"
 msgstr "Ç&àì³íèòè âñþäè"
 
 #: Merge.rc:957
-#: Merge.rc:2366
+#: Merge.rc:2357
 #, c-format
 msgid "Rational ClearCase"
 msgstr "Rational ClearCase"
@@ -2585,7 +2585,7 @@ msgid "Files:"
 msgstr "Ôàéëè:"
 
 #: Merge.rc:1598
-#: Merge.rc:2537
+#: Merge.rc:2528
 #, c-format
 msgid "Different"
 msgstr "³äð³çíÿþòüñÿ"
@@ -2622,7 +2622,7 @@ msgid "Right:"
 msgstr "Ïðàâîðó÷:"
 
 #: Merge.rc:1621
-#: Merge.rc:2527
+#: Merge.rc:2518
 #, c-format
 msgid "Identical"
 msgstr "Îäíàêîâ³"
@@ -2822,7 +2822,7 @@ msgid "A&ppend timestamp"
 msgstr "Äîäàòè äàòó"
 
 #: Merge.rc:1769
-#: Merge.rc:2422
+#: Merge.rc:2413
 #, c-format
 msgid "Confirm Copy"
 msgstr "ϳäòâåðäæåííÿ"
@@ -2900,7 +2900,7 @@ msgstr "
 
 #: Merge.rc:1820
 #: Merge.rc:2122
-#: Merge.rc:2471
+#: Merge.rc:2462
 #, c-format
 msgid "Folder"
 msgstr "Òåêà"
@@ -3540,7 +3540,7 @@ msgid "Version Control"
 msgstr "Êîíòðîëü âåðñ³é"
 
 #: Merge.rc:2120
-#: Merge.rc:2511
+#: Merge.rc:2502
 #, c-format
 msgid "Differences"
 msgstr "³äì³ííîñò³"
@@ -3669,87 +3669,67 @@ msgstr "
 
 #: Merge.rc:2179
 #, c-format
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: Merge.rc:2180
-#, c-format
-msgid "UTF-8 (B)"
-msgstr "UTF-8 (B)"
-
-#: Merge.rc:2181
-#, c-format
-msgid "UCS-2 LE"
-msgstr "UCS-2 LE"
-
-#: Merge.rc:2182
-#, c-format
-msgid "UCS-2 BE"
-msgstr "UCS-2 BE"
-
-#: Merge.rc:2188
-#, c-format
 msgid "Full Contents"
 msgstr "Ïîâíèé ïîøóê çà âì³ñòîì"
 
-#: Merge.rc:2189
+#: Merge.rc:2180
 #, c-format
 msgid "Quick Contents"
 msgstr "Øâèäêèé ïîøóê çà âì³ñòîì "
 
-#: Merge.rc:2190
+#: Merge.rc:2181
 #, c-format
 msgid "Modified Date"
 msgstr "Çà ðîçõîäæåííÿìè â äàò³"
 
-#: Merge.rc:2191
+#: Merge.rc:2182
 #, c-format
 msgid "Modified Date and Size"
 msgstr "Çà äàòîþ çì³íè ³ ðîçì³ðó"
 
-#: Merge.rc:2192
+#: Merge.rc:2183
 #, c-format
 msgid "Size"
 msgstr "Çà ðîçì³ðîì"
 
-#: Merge.rc:2198
-#: Merge.rc:2766
+#: Merge.rc:2189
+#: Merge.rc:2757
 #, c-format
 msgid "Name"
 msgstr "²ì'ÿ"
 
-#: Merge.rc:2199
+#: Merge.rc:2190
 #, c-format
 msgid "Location"
 msgstr "̳ñöå ðîçòàøóâàííÿ"
 
-#: Merge.rc:2200
+#: Merge.rc:2191
 #, c-format
 msgid "Filters"
 msgstr "Ô³ëüòðè"
 
-#: Merge.rc:2201
+#: Merge.rc:2192
 #, c-format
 msgid "[F] "
 msgstr "[F] "
 
-#: Merge.rc:2202
-#: Merge.rc:2768
+#: Merge.rc:2193
+#: Merge.rc:2759
 #, c-format
 msgid "Description"
 msgstr "Îïèñ"
 
-#: Merge.rc:2203
+#: Merge.rc:2194
 #, c-format
 msgid "Select filename for new filter"
 msgstr "Âêàæ³òü ³ì'ÿ ôàéëó äëÿ íîâîãî ô³ëüòðà"
 
-#: Merge.rc:2204
+#: Merge.rc:2195
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
 msgstr "Ôàéëè ô³ëüòð³â (*.flt)|*.flt|Âñ³ ôàéëè (*.*)|*.*||"
 
-#: Merge.rc:2206
+#: Merge.rc:2197
 #, c-format
 msgid ""
 "Cannot find file filter template file!\n"
@@ -3762,7 +3742,7 @@ msgstr ""
 "Ñêîï³þéòå ôàéë %1 ó òåêó ç ô³ëüòðàìè:\n"
 "%2."
 
-#: Merge.rc:2208
+#: Merge.rc:2199
 #, c-format
 msgid ""
 "Cannot copy filter template file to filter folder:\n"
@@ -3775,7 +3755,7 @@ msgstr ""
 "\n"
 "Ïåðåêîíàéòåñÿ, ùî òåêà ³ñíóº ³ äîñòóïíà äëÿ çàïèñóâàííÿ."
 
-#: Merge.rc:2210
+#: Merge.rc:2201
 #, c-format
 msgid ""
 "User's filter file folder is not defined!\n"
@@ -3786,7 +3766,7 @@ msgstr ""
 "\n"
 "Âêàæ³òü òåêó ç ô³ëüòðàìè íà âêëàäö³ Ñèñòåìà â Íàëàøòóâàííÿõ."
 
-#: Merge.rc:2212
+#: Merge.rc:2203
 #, c-format
 msgid ""
 "Failed to delete the filter file:\n"
@@ -3799,12 +3779,12 @@ msgstr ""
 "\n"
 "Ìîæëèâî ôàéë âèêîðèñòîâóºòüñÿ."
 
-#: Merge.rc:2213
+#: Merge.rc:2204
 #, c-format
 msgid "Locate filter file to install"
 msgstr "Âêàçàòè  ôàéë ô³ëüòðà"
 
-#: Merge.rc:2215
+#: Merge.rc:2206
 #, c-format
 msgid ""
 "Installing filter file failed.\n"
@@ -3815,17 +3795,17 @@ msgstr ""
 "\n"
 "Íåìîæëèâî ñêîï³þâàòè ôàéë ô³ëüòðà â òåêó ç ô³ëüòðàìè."
 
-#: Merge.rc:2217
+#: Merge.rc:2208
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
 msgstr "Ô³ëüòð óæå ³ñíóº. Ïåðåçàïèñàòè?"
 
-#: Merge.rc:2223
+#: Merge.rc:2214
 #, c-format
 msgid "Regular expression"
 msgstr "Ðåãóëÿðíèé âèðàç"
 
-#: Merge.rc:2229
+#: Merge.rc:2220
 #, c-format
 msgid ""
 "Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3836,243 +3816,243 @@ msgstr ""
 "\n"
 "ßêùî âè íå õî÷åòå ïîíîâëþâàòè âñ³ ïîð³âíÿííÿ çàðàç, Âè ìîæåòå âèáðàòè ͳ ³ ïîíîâèòè ¿õ çãîäîì."
 
-#: Merge.rc:2236
+#: Merge.rc:2227
 #, c-format
 msgid "&Path to SS.EXE:"
 msgstr "&Øëÿõ äî SS.EXE:"
 
-#: Merge.rc:2242
+#: Merge.rc:2233
 #, c-format
 msgid "Folder Comparison Results"
 msgstr "Ðåçóëüòàòè ïîð³âíÿííÿ òåê"
 
-#: Merge.rc:2243
+#: Merge.rc:2234
 #, c-format
 msgid "File Comparison"
 msgstr "Ïîð³âíÿííÿ ôàéë³â"
 
-#: Merge.rc:2244
+#: Merge.rc:2235
 #, c-format
 msgid "Untitled left"
 msgstr "Áåç³ìåííèé ë³âîðó÷"
 
-#: Merge.rc:2245
+#: Merge.rc:2236
 #, c-format
 msgid "Untitled middle"
 msgstr ""
 
-#: Merge.rc:2246
+#: Merge.rc:2237
 #, c-format
 msgid "Untitled right"
 msgstr "Áåç³ìåííèé ïðàâîðó÷"
 
-#: Merge.rc:2247
+#: Merge.rc:2238
 #, c-format
 msgid "Theirs File"
 msgstr "¯õé ôàéë"
 
-#: Merge.rc:2248
+#: Merge.rc:2239
 #, c-format
 msgid "Mine File"
 msgstr "̳é ôàéë"
 
-#: Merge.rc:2254
+#: Merge.rc:2245
 #, c-format
 msgid "Scanning files..."
 msgstr "Ñêàíóâàííÿ ôàéë³â..."
 
-#: Merge.rc:2255
+#: Merge.rc:2246
 #, c-format
 msgid "Opening selection"
 msgstr "³äêðèâàþ âèáðàíå"
 
-#: Merge.rc:2256
+#: Merge.rc:2247
 #, c-format
 msgid "Copying Left to Right"
 msgstr "Êîï³þâàííÿ çë³âà ïðàâîðó÷"
 
-#: Merge.rc:2257
+#: Merge.rc:2248
 #, c-format
 msgid "Copying Right to Left"
 msgstr "Êîï³þâàííÿ ñïðàâà ë³âîðó÷"
 
-#: Merge.rc:2258
+#: Merge.rc:2249
 #, c-format
 msgid "Copying Left to Middle"
 msgstr ""
 
-#: Merge.rc:2259
+#: Merge.rc:2250
 #, c-format
 msgid "Copying Right to Middle"
 msgstr ""
 
-#: Merge.rc:2260
+#: Merge.rc:2251
 #, c-format
 msgid "Copying All to Left"
 msgstr "Êîï³þâàííÿ âñ³õ ôàéë³â ë³âîðó÷"
 
-#: Merge.rc:2261
+#: Merge.rc:2252
 #, c-format
 msgid "Copying All to Right"
 msgstr "Êîï³þâàííÿ âñ³õ ôàéë³â ïðàâîðó÷"
 
-#: Merge.rc:2262
+#: Merge.rc:2253
 #, c-format
 msgid "Copying files..."
 msgstr "Êîï³þâàííÿ ôàéë³â..."
 
-#: Merge.rc:2263
+#: Merge.rc:2254
 #, c-format
 msgid "Deleting files..."
 msgstr "Âèëó÷åííÿ ôàéë³â..."
 
-#: Merge.rc:2264
+#: Merge.rc:2255
 #, c-format
 msgid "Moving files..."
 msgstr "Ïåðåì³ùåííÿ ôàéë³â..."
 
-#: Merge.rc:2265
+#: Merge.rc:2256
 #, c-format
 msgid "Creating the report..."
 msgstr "Ñòâîðþºòüñÿ çâ³ò..."
 
-#: Merge.rc:2266
+#: Merge.rc:2257
 #, c-format
 msgid "Undoing the last operation..."
 msgstr "Ñêàñóâàííÿ îñòàííüî¿ ä³¿..."
 
-#: Merge.rc:2267
+#: Merge.rc:2258
 #, c-format
 msgid "Redoing the previous operation..."
 msgstr "Ïîâòîðåííÿ îñòàííüî¿ ä³¿..."
 
-#: Merge.rc:2273
+#: Merge.rc:2264
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2274
+#: Merge.rc:2265
 #, c-format
 msgid "Line: %s"
 msgstr "Ðÿäîê: %s"
 
-#: Merge.rc:2275
+#: Merge.rc:2266
 #, c-format
 msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
 msgstr ""
 
-#: Merge.rc:2276
+#: Merge.rc:2267
 #, c-format
 msgid "Merge"
 msgstr "Îá'ºäíàííÿ"
 
-#: Merge.rc:2277
+#: Merge.rc:2268
 #, c-format
 msgid "Difference %1 of %2"
 msgstr "³äì³íí³ñòü %1 ç %2"
 
-#: Merge.rc:2278
+#: Merge.rc:2269
 #, c-format
 msgid "%1 Differences Found"
 msgstr "%1 â³äì³ííîñòåé çíàéøëîñÿ"
 
-#: Merge.rc:2279
+#: Merge.rc:2270
 #, c-format
 msgid "1 Difference Found"
 msgstr "Çíàéäåíà âñüîãî îäíà â³äì³íí³ñòü"
 
 #. Abbreviation from "Read Only"
-#: Merge.rc:2280
+#: Merge.rc:2271
 #, c-format
 msgid "RO"
 msgstr "RO"
 
-#: Merge.rc:2286
+#: Merge.rc:2277
 #, c-format
 msgid "Item %1 of %2"
 msgstr "Åëåìåíò %1 ç %2"
 
-#: Merge.rc:2287
+#: Merge.rc:2278
 #, c-format
 msgid "Items: %1"
 msgstr "Åëåìåíò³â: %1"
 
-#: Merge.rc:2293
+#: Merge.rc:2284
 #, c-format
 msgid "Select two existing folders or files to compare"
 msgstr "Âèáåð³òü äâ³ ²ÑÍÓÞײ òåêè àáî ôàéëè äëÿ ïîð³âíÿííÿ"
 
-#: Merge.rc:2294
+#: Merge.rc:2285
 #, c-format
 msgid "Folder Selection"
 msgstr "Âèá³ð òåêè"
 
-#: Merge.rc:2295
+#: Merge.rc:2286
 #, c-format
 msgid "Select two folders or two files to compare."
 msgstr "Âèáåð³òü äëÿ ïîð³âíÿííÿ äâ³ òåêè àáî ôàéëè"
 
-#: Merge.rc:2296
+#: Merge.rc:2287
 #, c-format
 msgid "Left path is invalid!"
 msgstr "Øëÿõ çë³âà çàçíà÷åíèé íåïðàâèëüíî "
 
-#: Merge.rc:2297
+#: Merge.rc:2288
 #, c-format
 msgid "Middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2298
+#: Merge.rc:2289
 #, c-format
 msgid "Right path is invalid!"
 msgstr "Øëÿõ ñïðàâà çàçíà÷åíèé íåïðàâèëüíî "
 
-#: Merge.rc:2299
+#: Merge.rc:2290
 #, c-format
 msgid "Both paths are invalid!"
 msgstr "Îáèäâà øëÿõè çàçíà÷åí³ íåïðàâèëüíî "
 
-#: Merge.rc:2300
+#: Merge.rc:2291
 #, c-format
 msgid "Left and middle path is invalid!"
 msgstr ""
 
-#: Merge.rc:2301
+#: Merge.rc:2292
 #, c-format
 msgid "Left and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2302
+#: Merge.rc:2293
 #, c-format
 msgid "Middle and right path is invalid!"
 msgstr ""
 
-#: Merge.rc:2303
+#: Merge.rc:2294
 #, c-format
 msgid "All paths are invalid!"
 msgstr ""
 
-#: Merge.rc:2304
+#: Merge.rc:2295
 #, c-format
 msgid "Choose two files to enable unpacker selection."
 msgstr "Âèáåð³òü äâà ôàéëè, ùîá ââ³ìêíóòè âèá³ð ðîçïàêóâàëüíèêà"
 
-#: Merge.rc:2305
+#: Merge.rc:2296
 #, c-format
 msgid "Cannot compare file and folder!"
 msgstr "Íåìîæëèâå ïîð³âíÿííÿ ôàéëó ³ òåêè!"
 
-#: Merge.rc:2311
+#: Merge.rc:2302
 #, c-format
 msgid "File not found: %1"
 msgstr "Ôàéë íå çíàéäåíèé: %1"
 
-#: Merge.rc:2312
+#: Merge.rc:2303
 #, c-format
 msgid "File not unpacked: %1"
 msgstr "Ôàéë íå ðîçïàêîâàíèé: %1"
 
-#: Merge.rc:2313
+#: Merge.rc:2304
 #, c-format
 msgid ""
 "Cannot open file\n"
@@ -4085,12 +4065,12 @@ msgstr ""
 "\n"
 "%2"
 
-#: Merge.rc:2314
+#: Merge.rc:2305
 #, c-format
 msgid "Failed to parse conflict file."
 msgstr "Ïîìèëêà ðîçáèðàííÿ ôàéëó êîíôë³êò³â"
 
-#: Merge.rc:2315
+#: Merge.rc:2306
 #, c-format
 msgid ""
 "The file\n"
@@ -4101,32 +4081,32 @@ msgstr ""
 "%1\n"
 "íå º ôàéëîì êîíôë³êò³â"
 
-#: Merge.rc:2321
+#: Merge.rc:2312
 #, c-format
 msgid "Save As"
 msgstr "Çáåðåãòè ÿê..."
 
-#: Merge.rc:2322
+#: Merge.rc:2313
 #, c-format
 msgid "Save changes to %1?"
 msgstr "Çáåðåãòè çì³íè â %1?"
 
-#: Merge.rc:2323
+#: Merge.rc:2314
 #, c-format
 msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
 msgstr "%1 ïîçíà÷åíèé ÿê ëèøå äëÿ ÷èòàííÿ. ×è çãîäí³ âè çàì³íèòè öåé ôàéë ? (Íå äîçâîëÿº âêàçàòè íîâå ³ì'ÿ ôàéëó)"
 
-#: Merge.rc:2324
+#: Merge.rc:2315
 #, c-format
 msgid "Error checking destination writeability"
 msgstr "Ïîìèëêà ïåðåâ³ðêè ìîæëèâîñò³ çàïèñóâàííÿ â çàçíà÷åíå ðîçòàøóâàííÿ"
 
-#: Merge.rc:2325
+#: Merge.rc:2316
 #, c-format
 msgid "Error backing up file"
 msgstr "Ïîìèëêà ñòâîðåííÿ ðåçåðâíî¿ êîﳿ"
 
-#: Merge.rc:2327
+#: Merge.rc:2318
 #, c-format
 msgid ""
 "Unable to backup original file:\n"
@@ -4139,7 +4119,7 @@ msgstr ""
 "\n"
 "Ïðîäîâæèòè â áóäü-ÿêîìó âèïàäêó?"
 
-#: Merge.rc:2328
+#: Merge.rc:2319
 #, c-format
 msgid ""
 "Saving file failed.\n"
@@ -4156,7 +4136,7 @@ msgstr ""
 "\t-âèêîðèñòàòè ³íøå ³ì'ÿ ôàéëó (Íàòèñí³òü OÊ)\n"
 "\t-ñêàñóâàòè ïîòî÷íó îïåðàö³þ (Íàòèñí³òü Ñêàñóâàòè)?"
 
-#: Merge.rc:2329
+#: Merge.rc:2320
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -4171,7 +4151,7 @@ msgstr ""
 "\n"
 "Õî÷åòå çáåðåãòè ðîçïàêîâàíó âåðñ³þ â ³íøèé ôàéë?"
 
-#: Merge.rc:2330
+#: Merge.rc:2321
 #, c-format
 msgid ""
 "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -4186,7 +4166,7 @@ msgstr ""
 "\n"
 "Õî÷åòå çáåðåãòè ðîçïàêîâàíó âåðñ³þ â ³íøèé ôàéë?"
 
-#: Merge.rc:2331
+#: Merge.rc:2322
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4201,14 +4181,14 @@ msgstr ""
 "\n"
 "Ïåðåçàïèñàòè çì³íåíèé ôàéë?"
 
-#: Merge.rc:2332
+#: Merge.rc:2323
 #, c-format
 msgid ""
 "%1\n"
 "is marked read-only. Would you like to override the read-only item?"
 msgstr "%1 ïîçíà÷åíèé ÿê ëèøå äëÿ ÷èòàííÿ. ×è çãîäí³ âè çàì³íèòè öåé ôàéë?"
 
-#: Merge.rc:2333
+#: Merge.rc:2324
 #, c-format
 msgid ""
 "Another application has updated file\n"
@@ -4223,22 +4203,22 @@ msgstr ""
 "\n"
 "Âè õî÷åòå ïåðåçàâàíòàæèòè ôàéë?"
 
-#: Merge.rc:2334
+#: Merge.rc:2325
 #, c-format
 msgid "Save Left File As"
 msgstr "Çáåðåãòè ôàéë ë³âîðó÷ ÿê..."
 
-#: Merge.rc:2335
+#: Merge.rc:2326
 #, c-format
 msgid "Save Middle File As"
 msgstr ""
 
-#: Merge.rc:2336
+#: Merge.rc:2327
 #, c-format
 msgid "Save Right File As"
 msgstr "Çáåðåãòè ôàéë ïðàâîðó÷ ÿê..."
 
-#: Merge.rc:2337
+#: Merge.rc:2328
 #, c-format
 msgid ""
 "The file\n"
@@ -4249,7 +4229,7 @@ msgstr ""
 "%1\n"
 "âèëó÷àºòüñÿ. Çáåðåæ³òü êîï³þ ôàéëó äëÿ ïðîäîâæåííÿ."
 
-#: Merge.rc:2343
+#: Merge.rc:2334
 #, c-format
 msgid ""
 "Cannot merge differences when documents are not in synch.\n"
@@ -4260,42 +4240,42 @@ msgstr ""
 "\n"
 "Îíîâ³òü äîêóìåíòè ïåðåä ïðîäîâæåííÿì."
 
-#: Merge.rc:2349
+#: Merge.rc:2340
 #, c-format
 msgid "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 msgstr "Ùîá ïðîäîâæèòè, Âè ìàºòå âêàçàòè øëÿõ äî ïðîåêòó SourceSafe (íàïðèêëàä:  $/MyProject)"
 
-#: Merge.rc:2350
+#: Merge.rc:2341
 #, c-format
 msgid "Checkout files from VSS..."
 msgstr "Îòðèìóºìî ôàéëè ç VSS..."
 
-#: Merge.rc:2351
+#: Merge.rc:2342
 #, c-format
 msgid "Versioning System returned an error while attempting to check out the file.  Unable to continue..."
 msgstr "Ñèñòåìà êîíòðîëþ âåðñ³é âèÿâèëà ïîìèëêó ïðè ñïðîá³ âçÿòè ôàéë ï³ä êîíòðîëü.  Íåìà ìîæëèâîñò³ ïðîäîâæóâàòè..."
 
-#: Merge.rc:2352
+#: Merge.rc:2343
 #, c-format
 msgid "Error executing versioning system command."
 msgstr "Ïîìèëêà âèêîíàííÿ ñèñòåìíî¿ êîìàíäè Ñèñòåìè êîíòðîëþ âåðñ³é."
 
-#: Merge.rc:2353
+#: Merge.rc:2344
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
 msgstr "Ðîáî÷à òåêà VSS ³ ðîçòàøóâàííÿ ì³ñöå ïîòî÷íîãî ôàéëó íå ñï³âïàäàþòü. Ïðîäîâæèòè ?"
 
-#: Merge.rc:2354
+#: Merge.rc:2345
 #, c-format
 msgid "No VSS database(s) found!"
 msgstr "Íå çíàéäåíà áàçà äàíèõ VSS!"
 
-#: Merge.rc:2355
+#: Merge.rc:2346
 #, c-format
 msgid "Error from VSS:"
 msgstr "Ïîìèëêà VSS:"
 
-#: Merge.rc:2356
+#: Merge.rc:2347
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to check in the file.\n"
@@ -4306,7 +4286,7 @@ msgstr ""
 " Ïåðåâ³ðòå íàëàøòóâàííÿ.\n"
 " Ñêàñóâàòè ä³þ?"
 
-#: Merge.rc:2357
+#: Merge.rc:2348
 #, c-format
 msgid ""
 "Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -4315,169 +4295,169 @@ msgstr ""
 "VSS çíàéøëà ïîìèëêó ïðè ñïðîá³ ñêàñóâàííÿ 䳿.\n"
 "Ïåðåâ³ðòå íàëàøòóâàííÿ. "
 
-#: Merge.rc:2363
-#: Merge.rc:2750
+#: Merge.rc:2354
+#: Merge.rc:2741
 #, c-format
 msgid "None"
 msgstr "Íåìà"
 
-#: Merge.rc:2364
+#: Merge.rc:2355
 #, c-format
 msgid "Visual SourceSafe (less than 5.0)"
 msgstr "Visual SourceSafe (ìåíøå, í³æ 5.0)"
 
-#: Merge.rc:2365
+#: Merge.rc:2356
 #, c-format
 msgid "Visual SourceSafe (5.0 and above)"
 msgstr "Visual SourceSafe (5.0 ³ âèùå)"
 
-#: Merge.rc:2367
+#: Merge.rc:2358
 #, c-format
 msgid "Break at whitespace"
 msgstr "Ðîçáèâàòè çà ïðîïóñêàìè"
 
-#: Merge.rc:2368
+#: Merge.rc:2359
 #, c-format
 msgid "Break at whitespace or punctuation"
 msgstr "Ðîçáèâàòè çà ïðîïóñêàìè ³ ñèìâîëàìè ïóíêòóàö³¿"
 
-#: Merge.rc:2374
-#: Merge.rc:2376
+#: Merge.rc:2365
+#: Merge.rc:2367
 #, c-format
 msgid "Copy selected item to named directory"
 msgstr "Ñêîï³þâàòè âèáðàí³ ôàéëè â çàçíà÷åíó òåêó"
 
-#: Merge.rc:2375
-#: Merge.rc:2377
+#: Merge.rc:2366
+#: Merge.rc:2368
 #, c-format
 msgid "Copy selected item to custom directory"
 msgstr "Ñêîï³þâàòè âèáðàí³ ôàéëè â çàçíà÷åíó òåêó"
 
-#: Merge.rc:2378
+#: Merge.rc:2369
 #, c-format
 msgid "Delete selected item on left"
 msgstr "Âèëó÷èòè âèáðàíèé åëåìåíò ë³âîðó÷"
 
-#: Merge.rc:2379
+#: Merge.rc:2370
 #, c-format
 msgid "Delete selected item on right"
 msgstr "Âèëó÷èòè âèáðàíèé åëåìåíò ïðàâîðó÷"
 
-#: Merge.rc:2380
+#: Merge.rc:2371
 #, c-format
 msgid "Delete selected item(s) on both sides"
 msgstr "Âèëó÷èòè âèáðàí³ åëåìåíòè ç îáîõ ñòîð³í"
 
-#: Merge.rc:2381
+#: Merge.rc:2372
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
 msgstr "Ñõîâàòè âèáðàí³ åëåìåíòè (øâèäêèé ô³ëüòð)"
 
-#: Merge.rc:2382
+#: Merge.rc:2373
 #, c-format
 msgid "Rename selected item on both sides"
 msgstr "Ïåðåéìåíóâàòè âèáðàí³ åëåìåíòè ç îáîõ ñòîð³í"
 
-#: Merge.rc:2383
+#: Merge.rc:2374
 #, c-format
 msgid "Right to Left (%1)"
 msgstr "Ñêîï³þâàòè íà ë³âó ñòîðîíó %1 ç %2 âèáðàíèõ åëåìåíò³â"
 
-#: Merge.rc:2384
+#: Merge.rc:2375
 #, c-format
 msgid "Left to Right (%1)"
 msgstr "Ñêîï³þâàòè íà ïðàâó ñòîðîíó %1 ç %2 âèáðàíèõ åëåìåíò³â"
 
-#: Merge.rc:2385
+#: Merge.rc:2376
 #, c-format
 msgid "Right to Left (%1 of %2)"
 msgstr "Ñïðàâà ë³âîðó÷ (%1 ç %2)"
 
-#: Merge.rc:2386
+#: Merge.rc:2377
 #, c-format
 msgid "Left to Right (%1 of %2)"
 msgstr "Çë³âà ïðàâîðó÷ (%1 ç %2)"
 
-#: Merge.rc:2387
-#: Merge.rc:2403
+#: Merge.rc:2378
+#: Merge.rc:2394
 #, c-format
 msgid "Left to... (%1)"
 msgstr "Çë³âà... (%1)"
 
-#: Merge.rc:2388
-#: Merge.rc:2404
+#: Merge.rc:2379
+#: Merge.rc:2395
 #, c-format
 msgid "Right to... (%1)"
 msgstr "Ñïðàâà... (%1)"
 
-#: Merge.rc:2389
-#: Merge.rc:2405
+#: Merge.rc:2380
+#: Merge.rc:2396
 #, c-format
 msgid "Left to... (%1 of %2)"
 msgstr "Çë³âà... (%1 ç %2)"
 
-#: Merge.rc:2390
-#: Merge.rc:2406
+#: Merge.rc:2381
+#: Merge.rc:2397
 #, c-format
 msgid "Right to... (%1 of %2)"
 msgstr "Ñïðàâà... (%1 ç %2)"
 
-#: Merge.rc:2396
+#: Merge.rc:2387
 #, c-format
 msgid "Left (%1)"
 msgstr "˳âîðó÷ (%1)"
 
-#: Merge.rc:2397
+#: Merge.rc:2388
 #, c-format
 msgid "Right (%1)"
 msgstr "Ïðàâîðó÷ (%1)"
 
-#: Merge.rc:2398
+#: Merge.rc:2389
 #, c-format
 msgid "Both (%1)"
 msgstr "Îáèäâà (%1)"
 
-#: Merge.rc:2399
+#: Merge.rc:2390
 #, c-format
 msgid "Left (%1 of %2)"
 msgstr "˳âîðó÷ (%1 ç %2)"
 
-#: Merge.rc:2400
+#: Merge.rc:2391
 #, c-format
 msgid "Right (%1 of %2)"
 msgstr "Ïðàâîðó÷ (%1 ç %2)"
 
-#: Merge.rc:2401
+#: Merge.rc:2392
 #, c-format
 msgid "Both (%1 of %2)"
 msgstr "Ðàçîì (%1 ç %2)"
 
-#: Merge.rc:2402
+#: Merge.rc:2393
 #, c-format
 msgid "Select destination folder"
 msgstr "Âèáåð³òü òåêó ïðèçíà÷åííÿ"
 
-#: Merge.rc:2407
+#: Merge.rc:2398
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "˳âà ñòîðîíà - âèá³ð òåêè ïðèçíà÷åííÿ:"
 
-#: Merge.rc:2408
+#: Merge.rc:2399
 #, c-format
 msgid "Right side - select destination folder:"
 msgstr "Ïðàâà ñòîðîíà - âèá³ð òåêè ïðèçíà÷åííÿ:"
 
-#: Merge.rc:2409
+#: Merge.rc:2400
 #, c-format
 msgid "(%1 Files Affected)"
 msgstr "(%1 ôàéë³â îïðàöüîâàí³)"
 
-#: Merge.rc:2410
+#: Merge.rc:2401
 #, c-format
 msgid "(%1 of %2 Files Affected)"
 msgstr "(%1 ç %2 ôàéë³â îïðàöüîâàí³)"
 
-#: Merge.rc:2416
+#: Merge.rc:2407
 #, c-format
 msgid ""
 "Are you sure you want to delete\n"
@@ -4488,17 +4468,17 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#: Merge.rc:2417
+#: Merge.rc:2408
 #, c-format
 msgid "Are you sure you want to copy:"
 msgstr "Âè âïåâíåí³, ùî õî÷åòå ñêîï³þâàòè:"
 
-#: Merge.rc:2418
+#: Merge.rc:2409
 #, c-format
 msgid "Are you sure you want to copy %d items:"
 msgstr "Âè âïåâíåí³, ùî õî÷åòå ñêîï³þâàòè %d åëåìåíò³â:"
 
-#: Merge.rc:2419
+#: Merge.rc:2410
 #, c-format
 msgid ""
 "Operation aborted!\n"
@@ -4517,613 +4497,613 @@ msgstr ""
 "\n"
 "Îíîâ³òü ïîð³âíÿííÿ."
 
-#: Merge.rc:2420
+#: Merge.rc:2411
 #, c-format
 msgid "Are you sure you want to move:"
 msgstr "Âè ä³éñíî õî÷åòå ïåðåì³ñòèòè:"
 
-#: Merge.rc:2421
+#: Merge.rc:2412
 #, c-format
 msgid "Are you sure you want to move %d items:"
 msgstr "Âè ä³éñíî õî÷åòå ïåðåì³ñòèòè %d åëåìåíò³â:"
 
-#: Merge.rc:2423
+#: Merge.rc:2414
 #, c-format
 msgid "Confirm Move"
 msgstr "ϳäòâåðäæåííÿ ïåðåì³ùåííÿ"
 
-#: Merge.rc:2429
+#: Merge.rc:2420
 #, c-format
 msgid "Open left file"
 msgstr "³äêðèòè ôàéë ë³âîðó÷"
 
-#: Merge.rc:2430
+#: Merge.rc:2421
 #, c-format
 msgid "Open the left file to external editor"
 msgstr "³äêðèòè ôàéë ë³âîðó÷ â çîâí³øíüîìó ðåäàêòîð³"
 
-#: Merge.rc:2431
+#: Merge.rc:2422
 #, c-format
 msgid "Open left file with ..."
 msgstr "³äêðèòè ôàéë ë³âîðó÷ çà äîïîìîãîþ ..."
 
-#: Merge.rc:2432
+#: Merge.rc:2423
 #, c-format
 msgid "Open right file"
 msgstr "³äêðèòè ôàéë ïðàâîðó÷"
 
-#: Merge.rc:2433
+#: Merge.rc:2424
 #, c-format
 msgid "Open the right file to external editor"
 msgstr "³äêðèòè ôàéë ïðàâîðó÷ â çîâí³øíüîìó ðåäàêòîð³"
 
-#: Merge.rc:2434
+#: Merge.rc:2425
 #, c-format
 msgid "Open right file with..."
 msgstr "³äêðèòè ôàéë ïðàâîðó÷ çà äîïîìîãîþ..."
 
-#: Merge.rc:2435
+#: Merge.rc:2426
 #, c-format
 msgid "Failed to execute external editor: %1"
 msgstr "Íåìîæëèâî âèêîíàòè %1"
 
-#: Merge.rc:2436
+#: Merge.rc:2427
 #, c-format
 msgid "Unknown extension on external editor: %1"
 msgstr "Íåâ³äîìå ðîçøèðåííÿ äëÿ çîâí³øíüîãî ðåäàêòîðà: %1"
 
-#: Merge.rc:2437
+#: Merge.rc:2428
 #, c-format
 msgid "Copy filenames to clipboard"
 msgstr "Ñêîï³þâàòè ³ìåíà ôàéë³â â áóôåð îáì³íó"
 
-#: Merge.rc:2438
+#: Merge.rc:2429
 #, c-format
 msgid "Copy left side pathnames to clipboard"
 msgstr "Ñêîï³þâàòè ³ìåíà ôàéë³â ç ë³âî¿ ÷àñòèíè â áóôåð îáì³íó"
 
-#: Merge.rc:2439
+#: Merge.rc:2430
 #, c-format
 msgid "Copy right side pathnames to clipboard"
 msgstr "Ñêîï³þâàòè ³ìåíà ôàéë³â ç ïðàâî¿ ÷àñòèíè â áóôåð îáì³íó"
 
-#: Merge.rc:2440
+#: Merge.rc:2431
 #, c-format
 msgid "Copy both sides pathnames to clipboard"
 msgstr "Ñêîï³þâàòè ³ìåíà ôàéë³â ç îáîõ ïàíåëåé ó áóôåð îáì³íó"
 
-#: Merge.rc:2441
+#: Merge.rc:2432
 #, c-format
 msgid "Copy selected left item to clipboard"
 msgstr ""
 
-#: Merge.rc:2442
+#: Merge.rc:2433
 #, c-format
 msgid "Copy selected right item to clipboard"
 msgstr ""
 
-#: Merge.rc:2448
+#: Merge.rc:2439
 #, c-format
 msgid "Left Shell menu"
 msgstr "˳âå ìåíþ îáîëîíêè"
 
-#: Merge.rc:2449
+#: Merge.rc:2440
 #, c-format
 msgid "Middle Shell menu"
 msgstr ""
 
-#: Merge.rc:2450
+#: Merge.rc:2441
 #, c-format
 msgid "Right Shell menu"
 msgstr "Ïðàâå ìåíþ îáîëîíêè"
 
-#: Merge.rc:2456
+#: Merge.rc:2447
 #, c-format
 msgid "Unknown archive format"
 msgstr "Íåâ³äîìèé ôîðìàò àðõ³âó"
 
-#: Merge.rc:2457
+#: Merge.rc:2448
 #, c-format
 msgid "Add items from left side to archive"
 msgstr "Çààðõ³âóâàòè åëåìåíòè ç ë³âî¿ ñòîðîíè"
 
-#: Merge.rc:2458
+#: Merge.rc:2449
 #, c-format
 msgid "Add items from right side to archive"
 msgstr "Çààðõ³âóâàòè åëåìåíòè ç ïðàâî¿ ñòîðîíè"
 
-#: Merge.rc:2459
+#: Merge.rc:2450
 #, c-format
 msgid "Add items from both sides to archive"
 msgstr "Çààðõ³âóâàòè åëåìåíòè ç îáîõ ñòîð³í"
 
-#: Merge.rc:2460
+#: Merge.rc:2451
 #, c-format
 msgid "Add different items to archive (both sides)"
 msgstr "Çààðõ³âóâàòè äîâ³ëüí³ åëåìåíòè ç îáîõ ñòîð³í"
 
-#: Merge.rc:2462
+#: Merge.rc:2453
 #, c-format
 msgid "Move selected file on left to custom directory"
 msgstr "Ïåðåì³ñòèòè âèáðàí³ ë³âîðó÷ ôàéëè â ³íøó òåêó"
 
-#: Merge.rc:2464
+#: Merge.rc:2455
 #, c-format
 msgid "Move selected file on right to custom directory"
 msgstr "Ïåðåì³ñòèòè âèáðàí³ ïðàâîðó÷ ôàéëè â ³íøó òåêó"
 
-#: Merge.rc:2470
+#: Merge.rc:2461
 #, c-format
 msgid "Filename"
 msgstr "²ì'ÿ ôàéëó"
 
-#: Merge.rc:2472
+#: Merge.rc:2463
 #, c-format
 msgid "Comparison result"
 msgstr "Ðåçóëüòàò ïîð³âíÿííÿ"
 
-#: Merge.rc:2473
+#: Merge.rc:2464
 #, c-format
 msgid "Left Date"
 msgstr "Äàòà ë³âîðó÷"
 
-#: Merge.rc:2474
+#: Merge.rc:2465
 #, c-format
 msgid "Right Date"
 msgstr "Äàòà ïðàâîðó÷"
 
-#: Merge.rc:2475
+#: Merge.rc:2466
 #, c-format
 msgid "Middle Date"
 msgstr ""
 
-#: Merge.rc:2476
+#: Merge.rc:2467
 #, c-format
 msgid "Extension"
 msgstr "Ðîçøèðåííÿ"
 
-#: Merge.rc:2477
+#: Merge.rc:2468
 #, c-format
 msgid "Left Size"
 msgstr "Ðîçì³ð ë³âîðó÷"
 
-#: Merge.rc:2478
+#: Merge.rc:2469
 #, c-format
 msgid "Right Size"
 msgstr "Ðîçì³ð ïðàâîðó÷"
 
-#: Merge.rc:2479
+#: Merge.rc:2470
 #, c-format
 msgid "Middle Size"
 msgstr ""
 
-#: Merge.rc:2480
+#: Merge.rc:2471
 #, c-format
 msgid "Right Size (Short)"
 msgstr "Ðîçì³ð ïðàâîðó÷ (ñêîð.)"
 
-#: Merge.rc:2481
+#: Merge.rc:2472
 #, c-format
 msgid "Left Size (Short)"
 msgstr "Ðîçì³ð ë³âîðó÷ (ñêîð.)"
 
-#: Merge.rc:2482
+#: Merge.rc:2473
 #, c-format
 msgid "Middle Size (Short)"
 msgstr ""
 
-#: Merge.rc:2488
+#: Merge.rc:2479
 #, c-format
 msgid "Left Creation Time"
 msgstr "×àñ ñòâîðåííÿ ôàéëó ë³âîðó÷"
 
-#: Merge.rc:2489
+#: Merge.rc:2480
 #, c-format
 msgid "Right Creation Time"
 msgstr "×àñ ñòâîðåííÿ ôàéëó ïðàâîðó÷"
 
-#: Merge.rc:2490
+#: Merge.rc:2481
 #, c-format
 msgid "Middle Creation Time"
 msgstr ""
 
-#: Merge.rc:2491
+#: Merge.rc:2482
 #, c-format
 msgid "Newer File"
 msgstr "Íîâ³øèé ôàéë"
 
-#: Merge.rc:2492
+#: Merge.rc:2483
 #, c-format
 msgid "Left File Version"
 msgstr "Âåðñ³ÿ ôàéëó ë³âîðó÷"
 
-#: Merge.rc:2493
+#: Merge.rc:2484
 #, c-format
 msgid "Right File Version"
 msgstr "Âåðñ³ÿ ôàéëó ïðàâîðó÷"
 
-#: Merge.rc:2494
+#: Merge.rc:2485
 #, c-format
 msgid "Middle File Version"
 msgstr ""
 
-#: Merge.rc:2495
+#: Merge.rc:2486
 #, c-format
 msgid "Short Result"
 msgstr "Ñïðîùåíèé ðåçóëüòàò"
 
-#: Merge.rc:2496
+#: Merge.rc:2487
 #, c-format
 msgid "Left Attributes"
 msgstr "Àòðèáóòè ôàéëó ë³âîðó÷"
 
-#: Merge.rc:2497
+#: Merge.rc:2488
 #, c-format
 msgid "Right Attributes"
 msgstr "Àòðèáóòè ôàéëó ïðàâîðó÷"
 
-#: Merge.rc:2498
+#: Merge.rc:2489
 #, c-format
 msgid "Middle Attributes"
 msgstr ""
 
-#: Merge.rc:2499
+#: Merge.rc:2490
 #, c-format
 msgid "Left EOL"
 msgstr "˳âå çàê³í÷åííÿ ðÿäêà"
 
-#: Merge.rc:2500
+#: Merge.rc:2491
 #, c-format
 msgid "Middle EOL"
 msgstr ""
 
-#: Merge.rc:2501
+#: Merge.rc:2492
 #, c-format
 msgid "Right EOL"
 msgstr "Ïðàâå çàê³í÷åííÿ ðÿäêà"
 
-#: Merge.rc:2507
+#: Merge.rc:2498
 #, c-format
 msgid "Left Encoding"
 msgstr "Êîäóâàííÿ ôàéëó ë³âîðó÷"
 
-#: Merge.rc:2508
+#: Merge.rc:2499
 #, c-format
 msgid "Right Encoding"
 msgstr "Êîäóâàííÿ ôàéëó ïðàâîðó÷"
 
-#: Merge.rc:2509
+#: Merge.rc:2500
 #, c-format
 msgid "Middle Encoding"
 msgstr ""
 
-#: Merge.rc:2510
+#: Merge.rc:2501
 #, c-format
 msgid "Ignored Diff."
 msgstr "Çíåõ. â³äì³ííîñò³"
 
-#: Merge.rc:2512
-#: Merge.rc:2746
+#: Merge.rc:2503
+#: Merge.rc:2737
 #, c-format
 msgid "Binary"
 msgstr "Á³íàðíèé"
 
-#: Merge.rc:2518
+#: Merge.rc:2509
 #, c-format
 msgid "Unable to compare files"
 msgstr "Íåìîæëèâî ïîð³âíÿòè ôàéëè"
 
-#: Merge.rc:2519
+#: Merge.rc:2510
 #, c-format
 msgid "Item aborted"
 msgstr "Ïîð³âíÿííÿ ïåðåðâàíå"
 
-#: Merge.rc:2520
+#: Merge.rc:2511
 #, c-format
 msgid "File skipped"
 msgstr "Ôàéë ïðîïóùåíèé"
 
-#: Merge.rc:2521
+#: Merge.rc:2512
 #, c-format
 msgid "Folder skipped"
 msgstr "Òåêà ïðîïóùåíà"
 
-#: Merge.rc:2522
+#: Merge.rc:2513
 #, c-format
 msgid "Left only: %1"
 msgstr "Ëèøå ë³âîðó÷: %1"
 
-#: Merge.rc:2523
+#: Merge.rc:2514
 #, c-format
 msgid "Middle only: %1"
 msgstr ""
 
-#: Merge.rc:2524
+#: Merge.rc:2515
 #, c-format
 msgid "Right only: %1"
 msgstr "Ëèøå ïðàâîðó÷: %1"
 
-#: Merge.rc:2525
+#: Merge.rc:2516
 #, c-format
 msgid "Does not exist in %1"
 msgstr ""
 
-#: Merge.rc:2526
+#: Merge.rc:2517
 #, c-format
 msgid "Binary files are identical"
 msgstr "Á³íàðí³ ôàéëè íå ìàþòü â³äì³ííîñòåé"
 
-#: Merge.rc:2528
+#: Merge.rc:2519
 #, c-format
 msgid "Binary files are different"
 msgstr "Á³íàðí³ ôàéëè â³äð³çíÿþòüñÿ"
 
-#: Merge.rc:2529
+#: Merge.rc:2520
 #, c-format
 msgid "Files are different"
 msgstr "Ôàéëè â³äð³çíÿþòüñÿ"
 
-#: Merge.rc:2530
+#: Merge.rc:2521
 #, c-format
 msgid "Folders are different"
 msgstr "Òåêè ð³çí³"
 
-#: Merge.rc:2531
+#: Merge.rc:2522
 #, c-format
 msgid "Left Only"
 msgstr "Ëèøå ë³âîðó÷"
 
-#: Merge.rc:2532
+#: Merge.rc:2523
 #, c-format
 msgid "Right Only"
 msgstr "Ëèøå ïðàâîðó÷"
 
-#: Merge.rc:2533
+#: Merge.rc:2524
 #, c-format
 msgid "Middle Only"
 msgstr ""
 
-#: Merge.rc:2534
+#: Merge.rc:2525
 #, c-format
 msgid "No item in left"
 msgstr ""
 
-#: Merge.rc:2535
+#: Merge.rc:2526
 #, c-format
 msgid "No item in right"
 msgstr ""
 
-#: Merge.rc:2536
+#: Merge.rc:2527
 #, c-format
 msgid "No item in middle"
 msgstr ""
 
-#: Merge.rc:2538
+#: Merge.rc:2529
 #, c-format
 msgid "Error"
 msgstr "Ïîìèëêà"
 
-#: Merge.rc:2539
+#: Merge.rc:2530
 #, c-format
 msgid "Text files are identical"
 msgstr "Òåêñòîâ³ ôàéëè îäíàêîâ³"
 
-#: Merge.rc:2544
+#: Merge.rc:2535
 #, c-format
 msgid "Text files are different"
 msgstr "Òåêñòîâ³ ôàéëè ð³çí³"
 
-#: Merge.rc:2550
+#: Merge.rc:2541
 #, c-format
 msgid "Elapsed time: %ld ms"
 msgstr "Ïðîéøëî ÷àñó: %ld ìñ"
 
-#: Merge.rc:2551
+#: Merge.rc:2542
 #, c-format
 msgid "1 item selected"
 msgstr "Âèáðàíèé 1 åëåìåíò"
 
-#: Merge.rc:2552
+#: Merge.rc:2543
 #, c-format
 msgid "%1 items selected"
 msgstr "Âèáðàí³ åëåìåíòè: %1"
 
-#: Merge.rc:2558
+#: Merge.rc:2549
 #, c-format
 msgid "Filename or folder name."
 msgstr "²ì'ÿ ôàéëó àáî òåêè"
 
-#: Merge.rc:2559
+#: Merge.rc:2550
 #, c-format
 msgid "Subfolder name when subfolders are included."
 msgstr "²ìåíà ï³äòåê, ÿêùî ï³äòåêè âêëþ÷åí³"
 
-#: Merge.rc:2560
+#: Merge.rc:2551
 #, c-format
 msgid "Comparison result, long form."
 msgstr "Ðåçóëüòàò ïîð³âíÿííÿ, äîâãà ôîðìà."
 
-#: Merge.rc:2561
+#: Merge.rc:2552
 #, c-format
 msgid "Left side modification date."
 msgstr "×àñ çì³íè ôàéëó ë³âîðó÷"
 
-#: Merge.rc:2562
+#: Merge.rc:2553
 #, c-format
 msgid "Right side modification date."
 msgstr "×àñ çì³íè ôàéëó ïðàâîðó÷"
 
-#: Merge.rc:2563
+#: Merge.rc:2554
 #, c-format
 msgid "Middle side modification date."
 msgstr ""
 
-#: Merge.rc:2564
+#: Merge.rc:2555
 #, c-format
 msgid "File's extension."
 msgstr "Ðîçøèðåííÿ ôàéëó"
 
-#: Merge.rc:2565
+#: Merge.rc:2556
 #, c-format
 msgid "Left file size in bytes."
 msgstr "Ðîçì³ð ôàéëó ë³âîðó÷ ó áàéòàõ"
 
-#: Merge.rc:2566
+#: Merge.rc:2557
 #, c-format
 msgid "Right file size in bytes."
 msgstr "Ðîçì³ð ôàéëó ïðàâîðó÷ ó áàéòàõ"
 
-#: Merge.rc:2567
+#: Merge.rc:2558
 #, c-format
 msgid "Middle file size in bytes."
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2559
 #, c-format
 msgid "Left file size abbreviated."
 msgstr "Ðîçì³ð ë³âîãî ôàéëó (ñêîð.)"
 
-#: Merge.rc:2569
+#: Merge.rc:2560
 #, c-format
 msgid "Right file size abbreviated."
 msgstr "Ðîçì³ð ïðàâîãî ôàéëó (ñêîð.)"
 
-#: Merge.rc:2570
+#: Merge.rc:2561
 #, c-format
 msgid "Middle file size abbreviated."
 msgstr ""
 
-#: Merge.rc:2576
+#: Merge.rc:2567
 #, c-format
 msgid "Left side creation time."
 msgstr "×àñ ñòâîðåííÿ ôàéëó ë³âîðó÷"
 
-#: Merge.rc:2577
+#: Merge.rc:2568
 #, c-format
 msgid "Right side creation time."
 msgstr "×àñ ñòâîðåííÿ ôàéëó ïðàâîðó÷"
 
-#: Merge.rc:2578
+#: Merge.rc:2569
 #, c-format
 msgid "Middle side creation time."
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2570
 #, c-format
 msgid "Tells which side has newer modification date."
 msgstr "Ïîêàçàòè, ç ÿêî¿ ç³ ñòîð³í äàòà çì³íè ôàéëó íîâ³øà"
 
-#: Merge.rc:2580
+#: Merge.rc:2571
 #, c-format
 msgid "Left side file version, only for some filetypes."
 msgstr "Âåðñ³ÿ ôàéëó ë³âîðó÷, ëèøå äëÿ äåÿêèõ òèï³â ôàéë³â."
 
-#: Merge.rc:2581
+#: Merge.rc:2572
 #, c-format
 msgid "Right side file version, only for some filetypes."
 msgstr "Âåðñ³ÿ ôàéëó ïðàâîðó÷, ëèøå äëÿ äåÿêèõ òèï³â ôàéë³â."
 
-#: Merge.rc:2582
+#: Merge.rc:2573
 #, c-format
 msgid "Middle side file version, only for some filetypes."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2574
 #, c-format
 msgid "Short comparison result."
 msgstr "Ðåçóëüòàò øâèäêîãî ïîð³âíÿííÿ"
 
-#: Merge.rc:2584
+#: Merge.rc:2575
 #, c-format
 msgid "Left side attributes."
 msgstr "Àòðèáóòè ôàéëó ë³âîðó÷"
 
-#: Merge.rc:2585
+#: Merge.rc:2576
 #, c-format
 msgid "Right side attributes."
 msgstr "Àòðèáóòè ôàéëó ïðàâîðó÷"
 
-#: Merge.rc:2586
+#: Merge.rc:2577
 #, c-format
 msgid "Middle side attributes."
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2578
 #, c-format
 msgid "Left side file EOL type"
 msgstr "Ïîçíà÷êà çàê³í÷åííÿ ðÿäêà äëÿ ë³âîãî ôàéëó"
 
-#: Merge.rc:2588
+#: Merge.rc:2579
 #, c-format
 msgid "Right side file EOL type"
 msgstr "Ïîçíà÷êà çàê³í÷åííÿ ðÿäêà äëÿ ïðàâîãî ôàéëó"
 
-#: Merge.rc:2589
+#: Merge.rc:2580
 #, c-format
 msgid "Middle side file EOL type"
 msgstr ""
 
-#: Merge.rc:2595
+#: Merge.rc:2586
 #, c-format
 msgid "Left side encoding."
 msgstr "Êîäóâàííÿ ôàéëó ë³âîðó÷"
 
-#: Merge.rc:2596
+#: Merge.rc:2587
 #, c-format
 msgid "Right side encoding."
 msgstr "Êîäóâàííÿ ôàéëó ïðàâîðó÷"
 
-#: Merge.rc:2597
+#: Merge.rc:2588
 #, c-format
 msgid "Middle side encoding."
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2589
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
 msgstr "ʳëüê³ñòü ³ãíîðîâàíèõ â³äì³ííîñòåé ó ôàéë³. Ö³ â³äì³ííîñò³ áóëè ³ãíîðîâàí³ WinMerge ³ íå ìîæóòü áóòè îïðàöüîâàí³."
 
-#: Merge.rc:2599
+#: Merge.rc:2590
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
 msgstr "ʳëüê³ñòü â³äì³ííîñòåé ó ôàéë³. ²ãíîðîâàí³ â³äì³ííîñò³ íå âðàõîâàí³."
 
-#: Merge.rc:2600
+#: Merge.rc:2591
 #, c-format
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "Ïîêàçàòè ç³ðî÷êó (*) ÿêùî ôàéë á³íàðíèé."
 
-#: Merge.rc:2606
+#: Merge.rc:2597
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "Ïîð³âíÿííÿ %1 ç %2"
 
-#: Merge.rc:2607
+#: Merge.rc:2598
 #, c-format
 msgid "Comma-separated list"
 msgstr "Ñïèñîê, ðîçä³ëåíèé êîìàìè"
 
-#: Merge.rc:2608
+#: Merge.rc:2599
 #, c-format
 msgid "Tab-separated list"
 msgstr "Ñïèñîê, ðîçä³ëåíèé òàáóëÿòîðàìè"
 
-#: Merge.rc:2609
+#: Merge.rc:2600
 #, c-format
 msgid "Simple HTML"
 msgstr "Ïðîñòèé HTML"
 
-#: Merge.rc:2610
+#: Merge.rc:2601
 #, c-format
 msgid "Simple XML"
 msgstr "Ïðîñòèé XML"
 
-#: Merge.rc:2612
+#: Merge.rc:2603
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
 msgstr "Ôàéë çâ³òó âæå ³ñíóº. Ïåðåçàïèñàòè??"
 
-#: Merge.rc:2613
+#: Merge.rc:2604
 #, c-format
 msgid ""
 "Error creating the report:\n"
@@ -5132,32 +5112,32 @@ msgstr ""
 "Ïîìèëêà ïðè ñòâîðåíí³ çâ³òó:\n"
 "%1"
 
-#: Merge.rc:2614
+#: Merge.rc:2605
 #, c-format
 msgid "The report has been created successfully."
 msgstr "Çâ³ò óñï³øíî ñòâîðåíèé"
 
-#: Merge.rc:2620
+#: Merge.rc:2611
 #, c-format
 msgid "The same file is opened in both panels."
 msgstr "Íà îáîõ ïàíåëÿõ â³äêðèòèé òîé ñàìèé ôàéë"
 
-#: Merge.rc:2621
+#: Merge.rc:2612
 #, c-format
 msgid "The selected files are identical."
 msgstr "Âèáðàí³ ôàéëè íå ìàþòü â³äì³ííîñòåé"
 
-#: Merge.rc:2622
+#: Merge.rc:2613
 #, c-format
 msgid "An error occurred while comparing the files."
 msgstr "Ïðè ïîð³âíÿíí³ ôàéë³â âèíèêëà ïîìèëêà."
 
-#: Merge.rc:2623
+#: Merge.rc:2614
 #, c-format
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Òèì÷àñîâ³ ôàéëè íå ìîæóòü áóòè ñòâîðåí³. Ïåðåâ³ðòå íàëàøòóâàííÿ øëÿõ³â äëÿ òèì÷àñîâèõ ôàéë³â"
 
-#: Merge.rc:2624
+#: Merge.rc:2615
 #, c-format
 msgid ""
 "These files use different carriage return types.\n"
@@ -5172,7 +5152,7 @@ msgstr ""
 "\n"
 "Óâàãà: ßêùî âàñ íå ö³êàâëÿòü ðîçõîäæåííÿ â çàê³í÷åííÿõ ðÿäêà, íàëàøòóéòå îïö³þ 'Íåõòóâàòè ð³çíèöåþ â çàê³í÷åííÿõ ðÿäê³â' íà âêëàäö³ Ïîð³âíÿííÿ â Íàëàøòóâàííÿõ."
 
-#: Merge.rc:2625
+#: Merge.rc:2616
 #, c-format
 msgid ""
 "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
@@ -5183,22 +5163,22 @@ msgstr ""
 " Ç ïîòî÷íèìè íàëàøòóâàííÿìè âîíè áóäóòü çì³íåí³ íà îñíîâíèé òèï.\n"
 " Õî÷åòå çì³íèòè íàëàøòóâàííÿ, ùîá çáåð³ãàòè ê³íö³ ðÿäê³â ÿê º, òîáòî ð³çíèìè?"
 
-#: Merge.rc:2626
+#: Merge.rc:2617
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
 msgstr "Ïîìèëêà çàñòîñóâàííÿ ïîïåðåäíüîãî ïîð³âíÿííÿ '%2' äî ôàéëó '%1'. Öå ïîâòîðíå ïîð³âíÿííÿ äàë³ çàñòîñîâóâàòèñÿ íå áóäå."
 
-#: Merge.rc:2627
+#: Merge.rc:2618
 #, c-format
 msgid "The selected folder is invalid."
 msgstr "Íåìîæëèâî â³äêðèòè âèáðàíó òåêó."
 
-#: Merge.rc:2628
+#: Merge.rc:2619
 #, c-format
 msgid "Cannot open a binary file to editor."
 msgstr "Íåìîæëèâî â³äêðèòè á³íàðíèé ôàéë ó ðåäàêòîð³."
 
-#: Merge.rc:2629
+#: Merge.rc:2620
 #, c-format
 msgid ""
 "The folder exists only in other side and cannot be opened.\n"
@@ -5213,7 +5193,7 @@ msgstr ""
 "%1\n"
 "ç ³íøî¿ ñòîðîíè ³ â³äêðèòè îáèäâ³?"
 
-#: Merge.rc:2635
+#: Merge.rc:2626
 #, c-format
 msgid ""
 "Different codepages found in left (cp%d) and right (cp%d) files. \n"
@@ -5224,148 +5204,148 @@ msgstr ""
 "Êîæíèé ç ôàéë³â ìîæå áóòè ïîêàçàíèé â ñâîºìó êîäóâàíí³, àëå ¿õíº çëèòòÿ àáî êîï³þâàííÿ ìîæå ïîøêîäèòè ³íôîðìàö³þ.\n"
 "Ïîêàçàòè îáèäâà ôàéëè â ñèñòåìíîìó êîäóâàíí³ (ðåêîìåíäóºòüñÿ)?"
 
-#: Merge.rc:2636
+#: Merge.rc:2627
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
 msgstr "Óâàãà: Ôàéëè â ð³çíèõ êîäóâàííÿõ, ë³âèé=%s, ïðàâèé=%s. ²íôîðìàö³ÿ ìîæå áóòè ïîøêîäæåíà."
 
-#: Merge.rc:2637
+#: Merge.rc:2628
 #, c-format
 msgid "Information lost due to encoding errors: both files"
 msgstr "²íôîðìàö³ÿ âòðà÷åíà ÷åðåç ïîìèëêîâå êîäóâàííÿ: îáèäâà ôàéëè"
 
-#: Merge.rc:2638
+#: Merge.rc:2629
 #, c-format
 msgid "Information lost due to encoding errors: first file"
 msgstr ""
 
-#: Merge.rc:2639
+#: Merge.rc:2630
 #, c-format
 msgid "Information lost due to encoding errors: second file"
 msgstr ""
 
-#: Merge.rc:2640
+#: Merge.rc:2631
 #, c-format
 msgid "Information lost due to encoding errors: third file"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2637
 #, c-format
 msgid "No difference"
 msgstr "Íåìà â³äì³ííîñòåé"
 
-#: Merge.rc:2647
+#: Merge.rc:2638
 #, c-format
 msgid "Line difference"
 msgstr "Ðÿäîê â³äì³ííîñòåé"
 
-#: Merge.rc:2653
+#: Merge.rc:2644
 #, c-format
 msgid "Replaced %1 string(s)."
 msgstr "Çàì³íåíî %1 ðÿäê³â."
 
-#: Merge.rc:2654
+#: Merge.rc:2645
 #, c-format
 msgid "Cannot find string \"%s\""
 msgstr "Íå âäàëîñÿ çíàéòè ðÿäîê \"%s\""
 
-#: Merge.rc:2660
+#: Merge.rc:2651
 #, c-format
 msgid "Copy Full Path"
 msgstr "Ñêîï³þâàòè ïîâíèé øëÿõ"
 
-#: Merge.rc:2661
+#: Merge.rc:2652
 #, c-format
 msgid "Copy Filename"
 msgstr "Ñêîï³þâàòè ³ì'ÿ ôàéëó"
 
-#: Merge.rc:2667
+#: Merge.rc:2658
 #, c-format
 msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2664
 #, c-format
 msgid "Location Pane"
 msgstr "̳ñöÿ ðîçòàøóâàííÿ"
 
-#: Merge.rc:2674
+#: Merge.rc:2665
 #, c-format
 msgid "Diff Pane"
 msgstr "³äì³ííîñò³"
 
-#: Merge.rc:2680
+#: Merge.rc:2671
 #, c-format
 msgid "Patch file successfully written."
 msgstr "Ëàòêà óñï³øíî çàïèñàíà."
 
-#: Merge.rc:2681
+#: Merge.rc:2672
 #, c-format
 msgid "1. item is not found or is directory!"
 msgstr "1. Åëåìåíò íå çíàéäåíèé àáî öå òåêà"
 
-#: Merge.rc:2682
+#: Merge.rc:2673
 #, c-format
 msgid "2. item is not found or is directory!"
 msgstr "2. Åëåìåíò íå çíàéäåíèé àáî öå òåêà"
 
-#: Merge.rc:2683
+#: Merge.rc:2674
 #, c-format
 msgid "The patch file already exists. Do you want to overwrite it?"
 msgstr "Ëàòêà âæå ³ñíóº. Õî÷åòå ïåðåçàïèñàòè ¿¿?"
 
-#: Merge.rc:2684
+#: Merge.rc:2675
 #, c-format
 msgid "[%1 files selected]"
 msgstr "[%1 ôàéë³â âèáðàí³]"
 
-#: Merge.rc:2685
+#: Merge.rc:2676
 #, c-format
 msgid "Normal"
 msgstr "Íîðìàëüíèé"
 
-#: Merge.rc:2686
+#: Merge.rc:2677
 #, c-format
 msgid "Context"
 msgstr "Êîíòåêñò"
 
-#: Merge.rc:2687
+#: Merge.rc:2678
 #, c-format
 msgid "Unified"
 msgstr "Óí³ô³êîâàíèé"
 
-#: Merge.rc:2688
-#: Merge.rc:2962
+#: Merge.rc:2679
+#: Merge.rc:2953
 #, c-format
 msgid "HTML"
 msgstr "HTML"
 
-#: Merge.rc:2689
+#: Merge.rc:2680
 #, c-format
 msgid "Could not write to file %1."
 msgstr "Íåìà ìîæëèâîñò³ çàïèñàòè ó ôàéë %1."
 
-#: Merge.rc:2690
+#: Merge.rc:2681
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Çàçíà÷åíèé øëÿõ äëÿ ê³íöåâîãî ôàéëó íå º àáñîëþòíèì: %1"
 
-#: Merge.rc:2691
+#: Merge.rc:2682
 #, c-format
 msgid "Specify an output file"
 msgstr "Âêàçàòè ê³íöåâèé ôàéë"
 
-#: Merge.rc:2692
+#: Merge.rc:2683
 #, c-format
 msgid "Cannot create a patch file from binary files."
 msgstr "Íåìîæëèâî ñòâîðèòè ëàòêó ç á³íàðíèõ ôàéë³â"
 
-#: Merge.rc:2693
+#: Merge.rc:2684
 #, c-format
 msgid "Cannot create a patch file from directories."
 msgstr "Íåìîæëèâî ñòâîðèòè ëàòêó ç òåê"
 
-#: Merge.rc:2694
+#: Merge.rc:2685
 #, c-format
 msgid ""
 "Please save all files first.\n"
@@ -5376,17 +5356,17 @@ msgstr ""
 "\n"
 "Ñòâîðåííÿ ëàòêè âèìàãàº, ùîá â ôàéëàõ íå áóëî íå çáåðåæåíèõ çì³í"
 
-#: Merge.rc:2695
+#: Merge.rc:2686
 #, c-format
 msgid "Folder does not exist."
 msgstr "Òåêà íå ³ñíóº"
 
-#: Merge.rc:2700
+#: Merge.rc:2691
 #, c-format
 msgid "Current directory comparison results will be cleared."
 msgstr "Ïîòî÷í³ ðåçóëüòàòè ïîð³âíÿííÿ òåê áóäóòü î÷èùåí³."
 
-#: Merge.rc:2701
+#: Merge.rc:2692
 #, c-format
 msgid ""
 "Archive support is not enabled.\n"
@@ -5398,7 +5378,7 @@ msgstr ""
 "Íå çíàéäåí³ âñ³ íåîáõ³äí³ êîìïîíåíòè (7-zip ³/àáî Merge7z*.dll) . \n"
 "Ïîäèâ³òüñÿ ³íñòðóêö³þ, ùîá äîâ³äàòèñÿ á³ëüøå ïðî ï³äòðèìêó àðõ³â³â ³ ÿê ¿¿ ââ³ìêíóòè."
 
-#: Merge.rc:2702
+#: Merge.rc:2693
 #, c-format
 msgid ""
 "\n"
@@ -5407,7 +5387,7 @@ msgstr ""
 "\n"
 "Óâàãà: ²íòåãðàö³ÿ ç 7-Zip âèìêíóòà â íàëàøòóâàííÿõ WinMerge."
 
-#: Merge.rc:2703
+#: Merge.rc:2694
 #, c-format
 msgid ""
 "\n"
@@ -5416,37 +5396,37 @@ msgstr ""
 "\n"
 "Óâàãà: Çàä³ÿíèé ëèøå ëîêàëüíèé ìîäóëü 7-Zip."
 
-#: Merge.rc:2704
+#: Merge.rc:2695
 #, c-format
 msgid "Select file for export"
 msgstr "Âèáðàòè ôàéë äëÿ åêñïîðòó"
 
-#: Merge.rc:2705
+#: Merge.rc:2696
 #, c-format
 msgid "Select file for import"
 msgstr "Âèáðàòè ôàéë äëÿ ³ìïîðòó"
 
-#: Merge.rc:2706
+#: Merge.rc:2697
 #, c-format
 msgid "Options imported from the file."
 msgstr "Îïö³¿, ³ìïîðòîâàí³ ç ôàéëó."
 
-#: Merge.rc:2707
+#: Merge.rc:2698
 #, c-format
 msgid "Options exported to the file."
 msgstr "Îïö³¿, åêñïîðòîâàí³ â ôàéë."
 
-#: Merge.rc:2708
+#: Merge.rc:2699
 #, c-format
 msgid "Failed to import options from the file."
 msgstr "Ïîìèëêà ³ìïîðòó îïö³é ç ôàéëó."
 
-#: Merge.rc:2709
+#: Merge.rc:2700
 #, c-format
 msgid "Failed to write options to the file."
 msgstr "Ïîìèëêà åêñïîðòó îïö³é â ôàéë."
 
-#: Merge.rc:2710
+#: Merge.rc:2701
 #, c-format
 msgid ""
 "You are about to close several compare windows.\n"
@@ -5457,242 +5437,242 @@ msgstr ""
 "\n"
 "Ïðîäîâæèòè?"
 
-#: Merge.rc:2716
+#: Merge.rc:2707
 #, c-format
 msgid "Regular expression error"
 msgstr "Ïîìèëêà â ðåãóëÿðíîìó âèðàç³"
 
-#: Merge.rc:2717
+#: Merge.rc:2708
 #, c-format
 msgid "No match"
 msgstr "Çá³ã³â íåìà"
 
-#: Merge.rc:2718
+#: Merge.rc:2709
 #, c-format
 msgid "Invalid regular expression"
 msgstr "Íåïðàâèëüíèé ðåãóëÿðíèé âèðàç"
 
-#: Merge.rc:2719
+#: Merge.rc:2710
 #, c-format
 msgid "Invalid collation character"
 msgstr "Íåïðàâèëüíèé ñèìâîë îá'ºäíàííÿ"
 
-#: Merge.rc:2720
+#: Merge.rc:2711
 #, c-format
 msgid "Invalid character class name"
 msgstr "Íåïðàâèëüíå ³ì'ÿ ñèìâîëüíîãî êëàñó"
 
-#: Merge.rc:2721
+#: Merge.rc:2712
 #, c-format
 msgid "Trailing backslash"
 msgstr "Çàìèêàþ÷èé çâîðîòí³é ñëåø"
 
-#: Merge.rc:2722
+#: Merge.rc:2713
 #, c-format
 msgid "Invalid back reference"
 msgstr "Íåïðàâèëüíèé çâîðîòí³é ë³íê"
 
-#: Merge.rc:2723
+#: Merge.rc:2714
 #, c-format
 msgid "Unmatched [ or [^"
 msgstr "Íå ìàþòü ïàðè [ àáî [^"
 
-#: Merge.rc:2724
+#: Merge.rc:2715
 #, c-format
 msgid "Unmatched ( or \\("
 msgstr "Íå ìàþòü ïàðè ( àáî \\("
 
-#: Merge.rc:2725
+#: Merge.rc:2716
 #, c-format
 msgid "Unmatched \\{"
 msgstr "Íå ìàþòü ïàðè \\{"
 
-#: Merge.rc:2726
+#: Merge.rc:2717
 #, c-format
 msgid "Invalid content of \\{\\}"
 msgstr "Íåïðàâèëüíèé âì³ñò \\{\\}"
 
-#: Merge.rc:2727
+#: Merge.rc:2718
 #, c-format
 msgid "Invalid range end"
 msgstr "Íåïðàâèëüíå çàê³í÷åííÿ ä³àïàçîíó"
 
-#: Merge.rc:2728
+#: Merge.rc:2719
 #, c-format
 msgid "Out of memory"
 msgstr "Íå âèñòà÷ຠïàì'ÿò³"
 
-#: Merge.rc:2729
+#: Merge.rc:2720
 #, c-format
 msgid "Invalid preceding regular expression"
 msgstr "Íåïðàâèëüíèé ïîïåðåäí³é ðåãóëÿðíèé âèðàç"
 
-#: Merge.rc:2730
+#: Merge.rc:2721
 #, c-format
 msgid "Premature end of regular expression"
 msgstr "Íåî÷³êóâàíå çàê³í÷åííÿ ðåãóëÿðíîãî âèðàçó"
 
-#: Merge.rc:2731
+#: Merge.rc:2722
 #, c-format
 msgid "Regular expression too big"
 msgstr "Çàíàäòî âåëèêèé ðåãóëÿðíèé âèðàç"
 
-#: Merge.rc:2736
+#: Merge.rc:2727
 #, c-format
 msgid "Unmatched ) or \\)"
 msgstr "Íå ìàþòü ïàðè ) àáî \\)"
 
-#: Merge.rc:2742
+#: Merge.rc:2733
 #, c-format
 msgid "Win"
 msgstr "Win"
 
-#: Merge.rc:2743
+#: Merge.rc:2734
 #, c-format
 msgid "Mac"
 msgstr "Mac"
 
-#: Merge.rc:2744
+#: Merge.rc:2735
 #, c-format
 msgid "Unix"
 msgstr "Unix"
 
-#: Merge.rc:2745
+#: Merge.rc:2736
 #, c-format
 msgid "Mixed"
 msgstr "̳øàíèé"
 
-#: Merge.rc:2747
+#: Merge.rc:2738
 #, c-format
 msgid "LF"
 msgstr "LF"
 
-#: Merge.rc:2748
+#: Merge.rc:2739
 #, c-format
 msgid "CR"
 msgstr "CR"
 
-#: Merge.rc:2749
+#: Merge.rc:2740
 #, c-format
 msgid "CRLF"
 msgstr "CRLF"
 
-#: Merge.rc:2756
+#: Merge.rc:2747
 #, c-format
 msgid " B"
 msgstr " Á"
 
-#: Merge.rc:2757
+#: Merge.rc:2748
 #, c-format
 msgid " KB"
 msgstr "Êá"
 
-#: Merge.rc:2758
+#: Merge.rc:2749
 #, c-format
 msgid " MB"
 msgstr "Ìá"
 
-#: Merge.rc:2759
+#: Merge.rc:2750
 #, c-format
 msgid " GB"
 msgstr "Ãá"
 
-#: Merge.rc:2760
+#: Merge.rc:2751
 #, c-format
 msgid " TB"
 msgstr "Òá"
 
-#: Merge.rc:2761
+#: Merge.rc:2752
 #, c-format
 msgid " PB"
 msgstr "Ïá"
 
-#: Merge.rc:2767
+#: Merge.rc:2758
 #, c-format
 msgid "Type"
 msgstr "Òèï"
 
-#: Merge.rc:2769
+#: Merge.rc:2760
 #, c-format
 msgid "Unpacker"
 msgstr "Ðîçïàêóâàëüíèê"
 
-#: Merge.rc:2770
+#: Merge.rc:2761
 #, c-format
 msgid "Prediffer"
 msgstr "Íåõòóâà÷"
 
-#: Merge.rc:2771
+#: Merge.rc:2762
 #, c-format
 msgid "Editor script"
 msgstr "Ñöåíàð³é ðåäàêòîðà"
 
-#: Merge.rc:2778
+#: Merge.rc:2769
 #, c-format
 msgid "Save the left file"
 msgstr "Çáåðåãòè ë³âèé ôàéë"
 
-#: Merge.rc:2779
+#: Merge.rc:2770
 #, c-format
 msgid "Save the middle file"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2771
 #, c-format
 msgid "Save the right file"
 msgstr "Çáåðåãòè ïðàâèé ôàéë"
 
-#: Merge.rc:2781
+#: Merge.rc:2772
 #, c-format
 msgid "Save the left file with name..."
 msgstr "Çáåðåãòè ë³âèé ôàéë ÿê..."
 
-#: Merge.rc:2782
+#: Merge.rc:2773
 #, c-format
 msgid "Save the middle file with name..."
 msgstr ""
 
-#: Merge.rc:2783
+#: Merge.rc:2774
 #, c-format
 msgid "Save the right file with name..."
 msgstr "Çáåðåãòè ïðàâèé ôàéë ÿê..."
 
-#: Merge.rc:2784
+#: Merge.rc:2775
 #, c-format
 msgid "Change left file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2785
+#: Merge.rc:2776
 #, c-format
 msgid "Change middle file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2777
 #, c-format
 msgid "Change right file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2778
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr "Ïåðåòâîðèòè çàê³í÷åííÿ ðÿäê³â äî ïðèéíÿòèõ â Windows"
 
-#: Merge.rc:2788
+#: Merge.rc:2779
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr "Ïåðåòâîðèòè çàê³í÷åííÿ ðÿäê³â äî ïðèéíÿòèõ â Unix"
 
-#: Merge.rc:2789
+#: Merge.rc:2780
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr "Ïåðåòâîðèòè çàê³í÷åííÿ ðÿäê³â äî ïðèéíÿòèõ â Mac"
 
-#: Merge.rc:2790
+#: Merge.rc:2781
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr "Ïåðåìèêàííÿ ì³æ ðåæèìàìè ðåäàãóâàííÿ ³ çëèòòÿ"
 
-#: Merge.rc:2791
+#: Merge.rc:2782
 #, c-format
 msgid ""
 "View and adjust file encoding properties\n"
@@ -5701,12 +5681,12 @@ msgstr ""
 "Ïåðåãëÿíóòè ³ â³äðåäàãóâàòè êîäóâàííÿ\n"
 "Ðåãóëþâàííÿ êîäóâàííÿ"
 
-#: Merge.rc:2792
+#: Merge.rc:2783
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr "³äêðèòè ³ âèð³øèòè êîíôë³êòíèé ôàéë"
 
-#: Merge.rc:2798
+#: Merge.rc:2789
 #, c-format
 msgid ""
 "Select difference area in the current line\n"
@@ -5715,7 +5695,7 @@ msgstr ""
 "³äçíà÷èòè â³äì³íí³ñòü ó ïîòî÷íîìó ðÿäêó\n"
 "³äì³íí³ñòü ó ïîòî÷íîìó ðÿäêó"
 
-#: Merge.rc:2799
+#: Merge.rc:2790
 #, c-format
 msgid ""
 "Go to line or difference\n"
@@ -5724,7 +5704,7 @@ msgstr ""
 "Ïåðåéòè äî ðÿäêó àáî â³äì³ííîñò³\n"
 "Ïåðåéòè äî (Ctrl+G)"
 
-#: Merge.rc:2800
+#: Merge.rc:2791
 #, c-format
 msgid ""
 "Set program options\n"
@@ -5733,7 +5713,7 @@ msgstr ""
 "Âñòàíîâèòè ïðîãðàìí³ íàëàøòóâàííÿ\n"
 "Íàëàøòóâàííÿ"
 
-#: Merge.rc:2801
+#: Merge.rc:2792
 #, c-format
 msgid ""
 "Refresh display\n"
@@ -5742,37 +5722,37 @@ msgstr ""
 "Ïîíîâèòè åêðàí\n"
 "Ïîíîâèòè (F5)"
 
-#: Merge.rc:2802
+#: Merge.rc:2793
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr "Ñêîï³þâàòè âèáðàí³ ðÿäêè â áóôåð îáì³íó, äîäàþ÷è íà ïî÷àòêó ðÿäêà éîãî íîìåð"
 
-#: Merge.rc:2803
+#: Merge.rc:2794
 #, c-format
 msgid "Refresh/Reload selected items"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2795
 #, c-format
 msgid "Toggle bookmark"
 msgstr "Çàêëàäêà"
 
-#: Merge.rc:2805
+#: Merge.rc:2796
 #, c-format
 msgid "Go to next bookmark"
 msgstr "Ïåðåéòè äî íàñòóïíî¿ çàêëàäêè"
 
-#: Merge.rc:2806
+#: Merge.rc:2797
 #, c-format
 msgid "Go to previous bookmark"
 msgstr "Ïåðåéòè äî ïîïåðåäíüî¿ çàêëàäêè"
 
-#: Merge.rc:2807
+#: Merge.rc:2798
 #, c-format
 msgid "Clear all bookmarks"
 msgstr "Âèëó÷èòè âñ³ çàêëàäêè"
 
-#: Merge.rc:2813
+#: Merge.rc:2804
 #, c-format
 msgid ""
 "Displays items that are exactly the same\n"
@@ -5781,7 +5761,7 @@ msgstr ""
 "Ïîêàçóâàòè îäíàêîâ³ åëåìåíòè\n"
 "Åëåìåíòè ç ³äåíòè÷íîñòÿìè"
 
-#: Merge.rc:2814
+#: Merge.rc:2805
 #, c-format
 msgid ""
 "Displays items that have differences\n"
@@ -5790,7 +5770,7 @@ msgstr ""
 "Ïîêàçóâàòè åëåìåíòè ç â³äì³ííîñòÿìè\n"
 "Åëåìåíòè ç â³äì³ííîñòÿìè"
 
-#: Merge.rc:2815
+#: Merge.rc:2806
 #, c-format
 msgid ""
 "Displays items that exist in only on the left side\n"
@@ -5799,7 +5779,7 @@ msgstr ""
 "Ïîêàçóâàòè ïðèñóòí³ ëèøå ë³âîðó÷\n"
 "Óí³êàëüí³ åëåìåíòè çë³âà"
 
-#: Merge.rc:2816
+#: Merge.rc:2807
 #, c-format
 msgid ""
 "Displays items that exist in only on the right side\n"
@@ -5808,7 +5788,7 @@ msgstr ""
 "Ïîêàçóâàòè ïðèñóòí³ ëèøå ïðàâîðó÷\n"
 "Óí³êàëüí³ åëåìåíòè ñïðàâà"
 
-#: Merge.rc:2817
+#: Merge.rc:2808
 #, c-format
 msgid ""
 "Displays binary files\n"
@@ -5817,7 +5797,7 @@ msgstr ""
 "Ïîêàçóâàòè á³íàðí³ ôàéëè\n"
 "Á³íàðí³ ôàéëè"
 
-#: Merge.rc:2818
+#: Merge.rc:2809
 #, c-format
 msgid ""
 "Displays skipped items\n"
@@ -5826,7 +5806,7 @@ msgstr ""
 "Ïîêàçóâàòè ïðîïóùåí³ åëåìåíòè\n"
 "Ïðîïóùåí³ åëåìåíòè"
 
-#: Merge.rc:2824
+#: Merge.rc:2815
 #, c-format
 msgid ""
 "Select the font for the view\n"
@@ -5835,7 +5815,7 @@ msgstr ""
 "Âèáðàòè øðèôò äëÿ â³äîáðàæåííÿ â³äì³ííîñòåé\n"
 "Øðèôò â³äì³ííîñòåé"
 
-#: Merge.rc:2825
+#: Merge.rc:2816
 #, c-format
 msgid ""
 "Revert to using the default system font for view\n"
@@ -5844,27 +5824,27 @@ msgstr ""
 "Âèêîðèñòîâóâàòè çâè÷àéíèé ñèñòåìíèé øðèôò äëÿ â³äîáðàæåííÿ â³äì³ííîñòåé \n"
 "Çâè÷àéíèé øðèôò"
 
-#: Merge.rc:2826
+#: Merge.rc:2817
 #, c-format
 msgid "Shows whitespace characters"
 msgstr "Ïîêàçóâàòè ïðîïóñêè"
 
-#: Merge.rc:2827
+#: Merge.rc:2818
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr "Ïåðåìêíóòè ïàíåëü â³äì³ííîñòåé"
 
-#: Merge.rc:2828
+#: Merge.rc:2819
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr "Ïàíåëü ëîêàö³é ïîêàçóº ïîâíó êàðòèíó â³äì³ííîñòåé ì³æ ôàéëàìè"
 
-#: Merge.rc:2829
+#: Merge.rc:2820
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr "Ïîêàçàòè ä³àëîã ïîð³âíÿííÿ ñòàòèñòèê òåê"
 
-#: Merge.rc:2830
+#: Merge.rc:2821
 #, c-format
 msgid ""
 "Select the current user interface language\n"
@@ -5873,7 +5853,7 @@ msgstr ""
 "Âèáåð³òü ìîâó ³íòåðôåéñó äëÿ ïîòî÷íîãî êîðèñòóâà÷à\n"
 "Ìîâà"
 
-#: Merge.rc:2831
+#: Merge.rc:2822
 #, c-format
 msgid ""
 "Shows differences inside lines with different colors\n"
@@ -5882,12 +5862,12 @@ msgstr ""
 "Ïîêàçàòè â³äì³ííîñò³ âñåðåäèí³ ðÿäê³â ³íøèìè êîëüîðàìè\n"
 "Ïîêàçàòè â³äì³ííîñò³ â ðÿäêó"
 
-#: Merge.rc:2832
+#: Merge.rc:2823
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr "Ïîì³íÿòè ïàíåë³ ì³ñöÿìè"
 
-#: Merge.rc:2833
+#: Merge.rc:2824
 #, c-format
 msgid ""
 "Shows line numbers\n"
@@ -5896,7 +5876,7 @@ msgstr ""
 "Ïîêàçóâàòè íîìåðà ðÿäê³â\n"
 "Íîìåðà ðÿäê³â"
 
-#: Merge.rc:2834
+#: Merge.rc:2825
 #, c-format
 msgid ""
 "Enable word wrap\n"
@@ -5905,7 +5885,7 @@ msgstr ""
 "Ââ³ìêíóòè ïåðåíåñåííÿ ðÿäê³â\n"
 "Ïåðåíåñåííÿ ðÿäê³â"
 
-#: Merge.rc:2835
+#: Merge.rc:2826
 #, c-format
 msgid ""
 "Shows selection margins for both panes\n"
@@ -5914,22 +5894,22 @@ msgstr ""
 "Ïîêàçàòè ïîëÿ íà îáîõ ïàíåëÿõ\n"
 "³äçíà÷åí³ ïîëÿ"
 
-#: Merge.rc:2836
+#: Merge.rc:2827
 #, c-format
 msgid "Increase text size"
 msgstr "Çá³ëüøèòè ðîçì³ð òåêñòó"
 
-#: Merge.rc:2837
+#: Merge.rc:2828
 #, c-format
 msgid "Decrease text size"
 msgstr "Çìåíøèòè ðîçì³ð òåêñòó"
 
-#: Merge.rc:2838
+#: Merge.rc:2829
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr "Ñêèíóòè ìàñøòàá òåêñòó äî çâè÷àéíîãî çíà÷åííÿ"
 
-#: Merge.rc:2844
+#: Merge.rc:2835
 #, c-format
 msgid ""
 "Scroll to the previous difference\n"
@@ -5938,7 +5918,7 @@ msgstr ""
 "Ïåðåéòè äî ïîïåðåäíüî¿ â³äì³ííîñò³\n"
 "Ïîïåðåäíÿ â³äì³íí³ñòü (Alt+Up)"
 
-#: Merge.rc:2845
+#: Merge.rc:2836
 #, c-format
 msgid ""
 "Scroll to the next difference\n"
@@ -5947,67 +5927,67 @@ msgstr ""
 "Ïåðåéòè äî íàñòóïíî¿ â³äì³ííîñò³\n"
 "Íàñòóïíà â³äì³íí³ñòü (Alt+Down)"
 
-#: Merge.rc:2846
+#: Merge.rc:2837
 #, c-format
 msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2838
 #, c-format
 msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2839
 #, c-format
 msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2840
 #, c-format
 msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2841
 #, c-format
 msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2842
 #, c-format
 msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2843
 #, c-format
 msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2844
 #, c-format
 msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2845
 #, c-format
 msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2846
 #, c-format
 msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2847
 #, c-format
 msgid "Scroll to the previous right only difference\nPrevious  Right Difference (Alt+Shift+9)"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2848
 #, c-format
 msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2849
 #, c-format
 msgid ""
 "Scroll to the first difference\n"
@@ -6016,7 +5996,7 @@ msgstr ""
 "Ïåðåéòè äî ïåðøî¿ â³äì³ííîñò³\n"
 "Ïåðøà â³äì³íí³ñòü (Alt+Home)"
 
-#: Merge.rc:2859
+#: Merge.rc:2850
 #, c-format
 msgid ""
 "Scroll to the current difference\n"
@@ -6025,7 +6005,7 @@ msgstr ""
 "Ïåðåéòè äî ïîòî÷íî¿ â³äì³ííîñò³\n"
 "Ïîòî÷íà â³äì³íí³ñòü (Alt+Enter)"
 
-#: Merge.rc:2860
+#: Merge.rc:2851
 #, c-format
 msgid ""
 "Scroll to the last difference\n"
@@ -6034,7 +6014,7 @@ msgstr ""
 "Ïåðåéòè äî îñòàííüî¿ â³äì³ííîñò³\n"
 "Îñòàííÿ â³äì³íí³ñòü (Alt+End)"
 
-#: Merge.rc:2861
+#: Merge.rc:2852
 #, c-format
 msgid ""
 "Copy the selected text to the right file\n"
@@ -6043,7 +6023,7 @@ msgstr ""
 "Ñêîï³þâàòè âèáðàíèé òåêñò â ôàéë ïðàâîðó÷\n"
 "Ñêîï³þâàòè â ôàéë ïðàâîðó÷ (Alt+Right)"
 
-#: Merge.rc:2862
+#: Merge.rc:2853
 #, c-format
 msgid ""
 "Copy the selected text to the left file\n"
@@ -6052,7 +6032,7 @@ msgstr ""
 "Ñêîï³þâàòè âèáðàíèé òåêñò â ôàéë ë³âîðó÷\n"
 "Ñêîï³þâàòè â ôàéë ë³âîðó÷ (Alt+Left)"
 
-#: Merge.rc:2863
+#: Merge.rc:2854
 #, c-format
 msgid ""
 "Copy difference to right and advance to next\n"
@@ -6061,7 +6041,7 @@ msgstr ""
 "Ñêîï³þâàòè â³äì³íí³ñòü íà ïðàâó ïàíåëü ³ ïåðåéòè äî íàñòóïíî¿\n"
 "Ñêîï³þâàòè âïðàâî ³ äàë³ (Ctrl+Alt+Right)"
 
-#: Merge.rc:2864
+#: Merge.rc:2855
 #, c-format
 msgid ""
 "Copy difference to left and advance to next\n"
@@ -6070,7 +6050,7 @@ msgstr ""
 "Ñêîï³þâàòè â³äì³íí³ñòü íà ë³âó ïàíåëü ³ ïåðåéòè äî íàñòóïíî¿\n"
 "Ñêîï³þâàòè âë³âî ³ äàë³ (Ctrl+Alt+Left)"
 
-#: Merge.rc:2865
+#: Merge.rc:2856
 #, c-format
 msgid ""
 "Copy all differences to the right file\n"
@@ -6079,7 +6059,7 @@ msgstr ""
 "Ñêîï³þâàòè âñ³ â³äì³ííîñò³ â ôàéë ïðàâîðó÷\n"
 "Âñå âïðàâî"
 
-#: Merge.rc:2866
+#: Merge.rc:2857
 #, c-format
 msgid ""
 "Copy all differences to the left file\n"
@@ -6088,77 +6068,77 @@ msgstr ""
 "Ñêîï³þâàòè âñ³ â³äì³ííîñò³ â ôàéë ë³âîðó÷\n"
 "Âñå âë³âî"
 
-#: Merge.rc:2867
+#: Merge.rc:2858
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr "Âèëó÷èòè âèáðàí³ åëåìåíòè ç îáîõ òåê"
 
-#: Merge.rc:2868
+#: Merge.rc:2859
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr "Ïîð³âíÿòè âèáðàí³ åëåìåíòè (ïîð³âíÿòè ïåðøèé åëåìåíò, ÿêùî âèáðàíî á³ëüøå îäíîãî)"
 
-#: Merge.rc:2874
+#: Merge.rc:2865
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr "Âèáðàòè ³ ïåðåñòàâèòè ì³ñöÿìè ñòîâï÷èêè ïîð³âíÿííÿ òåê"
 
-#: Merge.rc:2875
+#: Merge.rc:2866
 #, c-format
 msgid "Generate a patch-file"
 msgstr "Ñòâîðèòè ëàòêó"
 
-#: Merge.rc:2876
+#: Merge.rc:2867
 #, c-format
 msgid "Select and modify filters"
 msgstr "Âèá³ð ³ ðåäàãóâàííÿ ô³ëüòð³â"
 
-#: Merge.rc:2877
+#: Merge.rc:2868
 #, c-format
 msgid "Generates a report from compare results"
 msgstr "Ñòâîðèòè çâ³ò ç ðåçóëüòàò³â ïîð³âíÿííÿ"
 
-#: Merge.rc:2883
+#: Merge.rc:2874
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr "Ïîêàçóº ñïèñîê äîñòóïíèõ äîïîâíåíü äî ïðîãðàìè"
 
-#: Merge.rc:2884
+#: Merge.rc:2875
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr "Âèáðàíèé êîðèñòóâà÷åì ðîçïàêóâàëüíèê (íå ïðàöþº ïðè ïîð³âíÿíí³ òåê)"
 
-#: Merge.rc:2885
+#: Merge.rc:2876
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr "Àâòîìàòè÷íèé ï³äá³ð ðîçïàêóâàëüíèêà (âêàæ³òü ðîçøèðåííÿ õî÷à á îäíîãî ç ôàéë³â)"
 
-#: Merge.rc:2886
+#: Merge.rc:2877
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr "Âèáåð³òü ðîçïàêóâàëüíèê äëÿ ðåäàãóâàííÿ öüîãî ôàéëó"
 
-#: Merge.rc:2887
+#: Merge.rc:2878
 #, c-format
 msgid "No prediffer (normal)"
 msgstr "Áåç ïîïåðåäíüîãî ïîð³âíÿííÿ"
 
-#: Merge.rc:2888
+#: Merge.rc:2879
 #, c-format
 msgid "Suggested plugins"
 msgstr "Ðåêîìåíäîâàí³ äîïîâíåííÿ"
 
-#: Merge.rc:2889
+#: Merge.rc:2880
 #, c-format
 msgid "Other plugins"
 msgstr "²íø³ äîïîâíåííÿ"
 
-#: Merge.rc:2890
+#: Merge.rc:2881
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr "Âèâàíòàæèòè âñ³ äîïîâíåííÿ ³ çàâàíòàæèòè ¿õ çíîâó (äëÿ ðîçðîáíèê³â)"
 
-#: Merge.rc:2896
+#: Merge.rc:2887
 #, c-format
 msgid ""
 "Activates next visible file\n"
@@ -6167,12 +6147,12 @@ msgstr ""
 "Àêòèâóº íàñòóïíèé âèäèìèé ôàéë\n"
 "Àêòèâóâàòè íàñòóïíèé ôàéë"
 
-#: Merge.rc:2897
+#: Merge.rc:2888
 #, c-format
 msgid "Closes all open windows"
 msgstr "Çàêðèòè âñ³ â³äêðèò³ â³êíà"
 
-#: Merge.rc:2903
+#: Merge.rc:2894
 #, c-format
 msgid ""
 "Opens the WinMerge Help\n"
@@ -6181,22 +6161,22 @@ msgstr ""
 "³äêðèòè äîâ³äêó WinMerge\n"
 "Äîâ³äêà WinMerge"
 
-#: Merge.rc:2904
+#: Merge.rc:2895
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr "Âèâåñòè ³íôîðìàö³þ ïðî ïîòî÷íó âåðñ³þ WinMerge ³ íàëàøòóâàííÿ ó òåêñòîâèé ôàéë"
 
-#: Merge.rc:2905
+#: Merge.rc:2896
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr "Ïîêàçàòè ë³öåíç³þ GNU General Public License"
 
-#: Merge.rc:2906
+#: Merge.rc:2897
 #, c-format
 msgid "Private Build: %1"
 msgstr "Ïðèâàòíèé á³ëä: %1"
 
-#: Merge.rc:2907
+#: Merge.rc:2898
 #, c-format
 msgid ""
 "Opens the release notes document\n"
@@ -6205,7 +6185,7 @@ msgstr ""
 "³äêðèòè äîêóìåíò ç çàóâàæåííÿìè äî ðåë³çó\n"
 "Çàóâàæåííÿ äî ðåë³çó"
 
-#: Merge.rc:2908
+#: Merge.rc:2899
 #, c-format
 msgid ""
 "Opens the translations website\n"
@@ -6214,272 +6194,272 @@ msgstr ""
 "Ïåðåéòè íà ñòîð³íêó ç ïåðåêëàäàìè\n"
 "Ïåðåêëàäè"
 
-#: Merge.rc:2914
+#: Merge.rc:2905
 #, c-format
 msgid "Plugin Settings"
 msgstr "Íàëàøòóâàííÿ äîïîâíåííÿ"
 
-#: Merge.rc:2915
+#: Merge.rc:2906
 #, c-format
 msgid "No prediffer"
 msgstr "Ïîïåðåäíº ïîð³âíÿííÿ â³äñóòíº"
 
-#: Merge.rc:2916
+#: Merge.rc:2907
 #, c-format
 msgid "Prediff if possible"
 msgstr "Ïî ìîæëèâîñò³ ïîïåðåäíº ïîð³âíÿííÿ áóäå âèêîíàíèì"
 
-#: Merge.rc:2918
+#: Merge.rc:2909
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH íå çíàéäåíèé - .sct ñöåíà𳿠âèìêíóò³"
 
-#: Merge.rc:2919
+#: Merge.rc:2910
 #, c-format
 msgid "<None>"
 msgstr "<Íåìà>"
 
-#: Merge.rc:2920
+#: Merge.rc:2911
 #, c-format
 msgid "<Automatic>"
 msgstr "<Àâòîìàòè÷íî>"
 
-#: Merge.rc:2926
+#: Merge.rc:2917
 #, c-format
 msgid "Open the file with registered application"
 msgstr "³äêðèòè ôàéë çàðåºñòðîâàíèì çàñòîñóíêîì"
 
-#: Merge.rc:2927
+#: Merge.rc:2918
 #, c-format
 msgid "Open the file with external editor"
 msgstr "³äêðèòè ôàéë çîâí³øí³ì ðåäàêòîðîì"
 
-#: Merge.rc:2928
+#: Merge.rc:2919
 #, c-format
 msgid "Open the file with a particular program"
 msgstr "³äêðèòè ôàéë âèáðàíîþ ïðîãðàìîþ"
 
-#: Merge.rc:2934
+#: Merge.rc:2925
 #, c-format
 msgid "Do not display moved blocks"
 msgstr "Íå ïîêàçóâàòè ïåðåì³ùåí³ áëîêè"
 
-#: Merge.rc:2935
+#: Merge.rc:2926
 #, c-format
 msgid "Display all moved blocks"
 msgstr "Ïîêàçóâàòè âñ³ ïåðåì³ùåí³ áëîêè"
 
-#: Merge.rc:2936
+#: Merge.rc:2927
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr "Ïîêàçóâàòè ïåðåì³ùåí³ áëîêè äëÿ ïîòî÷íî¿ â³äì³ííîñò³"
 
-#: Merge.rc:2937
+#: Merge.rc:2928
 #, c-format
 msgid "Go to diff under cursor"
 msgstr "Ïåðåéòè äî â³äì³ííîñò³ ï³ä âêàç³âíèêîì"
 
-#: Merge.rc:2938
+#: Merge.rc:2929
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr "Ïåðåéòè äî &â³äì³ííîñò³ %1 ç %2"
 
-#: Merge.rc:2939
+#: Merge.rc:2930
 #, c-format
 msgid "G&oto Line %1"
 msgstr "Ïåðåéòè äî &ðÿäêà %1"
 
-#: Merge.rc:2945
+#: Merge.rc:2936
 #, c-format
 msgid "Disabled"
 msgstr "Âèìêíóòèé"
 
-#: Merge.rc:2946
+#: Merge.rc:2937
 #, c-format
 msgid "From file system"
 msgstr "ßê íà äèñêó"
 
-#: Merge.rc:2947
+#: Merge.rc:2938
 #, c-format
 msgid "From MRU list"
 msgstr "ßê â ñïèñêó íåùîäàâí³õ äîêóìåíò³â"
 
-#: Merge.rc:2953
+#: Merge.rc:2944
 #, c-format
 msgid "No Highlighting"
 msgstr "Íå ï³äñâ³÷óâàòè"
 
-#: Merge.rc:2954
+#: Merge.rc:2945
 #, c-format
 msgid "ASP"
 msgstr "ASP"
 
-#: Merge.rc:2955
+#: Merge.rc:2946
 #, c-format
 msgid "Basic"
 msgstr "Áåéñ³ê"
 
-#: Merge.rc:2956
+#: Merge.rc:2947
 #, c-format
 msgid "Batch"
 msgstr "Áåò÷"
 
-#: Merge.rc:2957
+#: Merge.rc:2948
 #, c-format
 msgid "C/C++"
 msgstr "C/C++"
 
-#: Merge.rc:2958
+#: Merge.rc:2949
 #, c-format
 msgid "C#"
 msgstr "C#"
 
-#: Merge.rc:2959
+#: Merge.rc:2950
 #, c-format
 msgid "CSS"
 msgstr "CSS"
 
-#: Merge.rc:2960
+#: Merge.rc:2951
 #, c-format
 msgid "DCL"
 msgstr "DCL"
 
-#: Merge.rc:2961
+#: Merge.rc:2952
 #, c-format
 msgid "Fortran"
 msgstr "Ôîðòðàí"
 
-#: Merge.rc:2963
+#: Merge.rc:2954
 #, c-format
 msgid "INI"
 msgstr "INI"
 
-#: Merge.rc:2964
+#: Merge.rc:2955
 #, c-format
 msgid "InnoSetup"
 msgstr "InnoSetup"
 
-#: Merge.rc:2965
+#: Merge.rc:2956
 #, c-format
 msgid "InstallShield"
 msgstr "InstallShield"
 
-#: Merge.rc:2966
+#: Merge.rc:2957
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: Merge.rc:2967
+#: Merge.rc:2958
 #, c-format
 msgid "AutoLISP"
 msgstr "AutoLISP"
 
-#: Merge.rc:2968
+#: Merge.rc:2959
 #, c-format
 msgid "NSIS"
 msgstr "NSIS"
 
-#: Merge.rc:2969
+#: Merge.rc:2960
 #, c-format
 msgid "Pascal"
 msgstr "Ïàñêàëü"
 
-#: Merge.rc:2970
+#: Merge.rc:2961
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: Merge.rc:2971
+#: Merge.rc:2962
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: Merge.rc:2972
+#: Merge.rc:2963
 #, c-format
 msgid "Portable Object"
 msgstr "Portable Object"
 
-#: Merge.rc:2973
+#: Merge.rc:2964
 #, c-format
 msgid "PowerShell"
 msgstr "PowerShell"
 
-#: Merge.rc:2974
+#: Merge.rc:2965
 #, c-format
 msgid "Python"
 msgstr "ϳòîí"
 
-#: Merge.rc:2975
+#: Merge.rc:2966
 #, c-format
 msgid "REXX"
 msgstr "REXX"
 
-#: Merge.rc:2976
+#: Merge.rc:2967
 #, c-format
 msgid "Resources"
 msgstr "Ðåñóðñè"
 
-#: Merge.rc:2977
+#: Merge.rc:2968
 #, c-format
 msgid "Ruby"
 msgstr "Ruby"
 
-#: Merge.rc:2978
+#: Merge.rc:2969
 #, c-format
 msgid "SGML"
 msgstr "SGML"
 
-#: Merge.rc:2979
+#: Merge.rc:2970
 #, c-format
 msgid "Shell"
 msgstr "Shell"
 
-#: Merge.rc:2980
+#: Merge.rc:2971
 #, c-format
 msgid "SIOD"
 msgstr "SIOD"
 
-#: Merge.rc:2981
+#: Merge.rc:2972
 #, c-format
 msgid "SQL"
 msgstr "SQL"
 
-#: Merge.rc:2982
+#: Merge.rc:2973
 #, c-format
 msgid "TCL"
 msgstr "TCL"
 
-#: Merge.rc:2983
+#: Merge.rc:2974
 #, c-format
 msgid "TEX"
 msgstr "TEX"
 
-#: Merge.rc:2984
+#: Merge.rc:2975
 #, c-format
 msgid "Verilog"
 msgstr "Verilog"
 
-#: Merge.rc:2985
+#: Merge.rc:2976
 #, c-format
 msgid "XML"
 msgstr "XML"
 
-#: Merge.rc:2990
+#: Merge.rc:2981
 #, c-format
 msgid "Hide the toolbar"
 msgstr "Ñõîâàòè ïàíåëü ³íñòðóìåíò³â"
 
-#: Merge.rc:2991
+#: Merge.rc:2982
 #, c-format
 msgid "Show small toolbar"
 msgstr "Ìàëåíüê³ ï³êòîãðàìè"
 
-#: Merge.rc:2992
+#: Merge.rc:2983
 #, c-format
 msgid "Show big toolbar"
 msgstr "Âåëèê³ ï³êòîãðàìè"
 
-#: Merge.rc:2997
+#: Merge.rc:2988
 #, c-format
 msgid "frhed(http://frhed.sourceforge.net/) not installed"
 msgstr ""